diff options
24 files changed, 376 insertions, 120 deletions
diff --git a/eclipse/buildConfig/allElements.xml b/eclipse/buildConfig/allElements.xml index 7512fde17..efca2139c 100644 --- a/eclipse/buildConfig/allElements.xml +++ b/eclipse/buildConfig/allElements.xml @@ -39,7 +39,7 @@ <property name="id" value="com.android.ide.eclipse.traceview" /> </ant> - <antcall target="buildInternalFeatures"/> + <antcall target="buildInternalFeatures"/> </target> @@ -71,6 +71,10 @@ <!-- Add one target for each root element and each configuration --> <!-- Replace element.id with the id of the top level element being built --> <!-- ===================================================================== --> + <target name="assemble.com.android.ide.eclipse.base"> + <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> + </target> + <target name="assemble.com.android.ide.eclipse.adt"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> </target> diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml index d62ddad80..0e631d6d4 100644 --- a/eclipse/features/com.android.ide.eclipse.adt/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.adt/feature.xml @@ -111,6 +111,7 @@ This Agreement is governed by the laws of the State of New York and the intellec </url> <requires> + <import plugin="com.android.ide.eclipse.base" match="perfect"/> <import plugin="com.android.ide.eclipse.ddms" match="perfect"/> <import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/> <import plugin="org.eclipse.core.resources"/> diff --git a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml index 8ac4802ba..b8593cfbe 100644 --- a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml @@ -238,6 +238,13 @@ </requires> <plugin + id="com.android.ide.eclipse.base" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin id="com.android.ide.eclipse.ddms" download-size="0" install-size="0" diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath index d8d5c9b4a..f874a9e91 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath +++ b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath @@ -1,32 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry excluding="Makefile|resources/" kind="src" path="src"/> - <classpathentry kind="lib" path="libs/commons-codec-1.4.jar"/> - <classpathentry kind="lib" path="libs/commons-logging-1.1.1.jar"/> - <classpathentry kind="lib" path="libs/httpclient-4.1.1.jar"/> - <classpathentry kind="lib" path="libs/httpcore-4.1.jar"/> - <classpathentry kind="lib" path="libs/httpmime-4.1.1.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="lib" path="libs/androidprefs.jar" sourcepath="/AndroidPrefs"/> - <classpathentry kind="lib" path="libs/commons-compress-1.0.jar"/> <classpathentry kind="lib" path="libs/kxml2-2.3.0.jar"/> <classpathentry kind="lib" path="libs/layoutlib_api.jar"/> <classpathentry kind="lib" path="libs/ide_common.jar" sourcepath="/ide_common"/> <classpathentry kind="lib" path="libs/ninepatch.jar" sourcepath="/ninepatch"/> - <classpathentry kind="lib" path="libs/sdklib.jar" sourcepath="/SdkLib"/> - <classpathentry kind="lib" path="libs/sdkstats.jar" sourcepath="/SdkStatsService"/> <classpathentry kind="lib" path="libs/sdkuilib.jar" sourcepath="/SdkUiLib"/> - <classpathentry kind="lib" path="libs/common.jar" sourcepath="/common"/> <classpathentry kind="lib" path="libs/rule_api.jar" sourcepath="/rule_api"/> <classpathentry kind="lib" path="libs/lint_api.jar" sourcepath="/lint-api"/> <classpathentry kind="lib" path="libs/lint_checks.jar" sourcepath="/lint-checks"/> <classpathentry kind="lib" path="libs/assetstudio.jar" sourcepath="/assetstudio"/> <classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/> <classpathentry combineaccessrules="false" kind="src" path="/ddmuilib"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-tree-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-10.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/lombok-ast/lombok-ast-0.2.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/lombok-ast/src.zip"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-tree-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/lombok-ast/lombok-ast-0.2.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/lombok-ast/src.zip"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF index e0689b040..0b40004ac 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF @@ -4,33 +4,22 @@ Bundle-Name: Android Development Toolkit Bundle-SymbolicName: com.android.ide.eclipse.adt;singleton:=true Bundle-Version: 19.0.0.qualifier Bundle-ClassPath: ., - libs/androidprefs.jar, - libs/sdklib.jar, libs/sdkuilib.jar, libs/ninepatch.jar, - libs/sdkstats.jar, - libs/commons-compress-1.0.jar, libs/kxml2-2.3.0.jar, libs/layoutlib_api.jar, libs/ide_common.jar, - libs/common.jar, libs/rule_api.jar, libs/assetstudio.jar, libs/lint_api.jar, libs/lint_checks.jar, libs/lombok-ast-0.2.jar, - libs/httpclient-4.1.1.jar, - libs/httpcore-4.1.jar, - libs/httpmime-4.1.1.jar, - libs/httpclient-4.1.1.jar, libs/asm-4.0.jar, - libs/asm-tree-4.0.jar, - libs/guava-10.0.1.jar, - libs/commons-logging-1.1.1.jar, - libs/commons-codec-1.4.jar + libs/asm-tree-4.0.jar Bundle-Activator: com.android.ide.eclipse.adt.AdtPlugin Bundle-Vendor: The Android Open Source Project -Require-Bundle: com.android.ide.eclipse.ddms, +Require-Bundle: com.android.ide.eclipse.base, + com.android.ide.eclipse.ddms, org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.debug.core, @@ -60,9 +49,7 @@ Require-Bundle: com.android.ide.eclipse.ddms, org.eclipse.ltk.ui.refactoring, org.eclipse.core.expressions Eclipse-LazyStart: true -Export-Package: com.android, - com.android.annotations;x-friends:="com.android.ide.eclipse.tests", - com.android.ide.common.layout;x-friends:="com.android.ide.eclipse.tests", +Export-Package: com.android.ide.common.layout;x-friends:="com.android.ide.eclipse.tests", com.android.ide.common.log;x-friends:="com.android.ide.eclipse.tests", com.android.ide.common.rendering;x-friends:="com.android.ide.eclipse.tests", com.android.ide.common.rendering.api;x-friends:="com.android.ide.eclipse.tests", @@ -122,21 +109,8 @@ Export-Package: com.android, com.android.ide.eclipse.adt.internal.wizards.newproject;x-friends:="com.android.ide.eclipse.tests", com.android.ide.eclipse.adt.internal.wizards.newxmlfile;x-friends:="com.android.ide.eclipse.tests", com.android.ide.eclipse.adt.io;x-friends:="com.android.ide.eclipse.tests", - com.android.io;x-friends:="com.android.ide.eclipse.tests", com.android.layoutlib.api;x-friends:="com.android.ide.eclipse.tests", com.android.ninepatch;x-friends:="com.android.ide.eclipse.tests", - com.android.prefs;x-friends:="com.android.ide.eclipse.tests", - com.android.resources;x-friends:="com.android.ide.eclipse.tests", - com.android.sdklib;x-friends:="com.android.ide.eclipse.tests", - com.android.sdklib.build;x-friends:="com.android.ide.eclipse.tests", - com.android.sdklib.internal.avd;x-friends:="com.android.ide.eclipse.tests", - com.android.sdklib.internal.build;x-friends:="com.android.ide.eclipse.tests", - com.android.sdklib.internal.project;x-friends:="com.android.ide.eclipse.tests", - com.android.sdklib.internal.repository;x-friends:="com.android.ide.eclipse.tests", - com.android.sdklib.repository;x-friends:="com.android.ide.eclipse.tests", - com.android.sdklib.util;x-friends:="com.android.ide.eclipse.tests", - com.android.sdklib.xml;x-friends:="com.android.ide.eclipse.tests", - com.android.sdkstats;x-friends:="com.android.ide.eclipse.tests", com.android.sdkuilib.internal.repository;x-friends:="com.android.ide.eclipse.tests", com.android.sdkuilib.internal.repository.icons;x-friends:="com.android.ide.eclipse.tests", com.android.sdkuilib.internal.tasks;x-friends:="com.android.ide.eclipse.tests", @@ -146,18 +120,6 @@ Export-Package: com.android, com.android.tools.lint.checks;x-friends:="com.android.ide.eclipse.tests", com.android.tools.lint.client.api;x-friends:="com.android.ide.eclipse.tests", com.android.tools.lint.detector.api;x-friends:="com.android.ide.eclipse.tests", - com.android.util;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.archivers;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.archivers.ar;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.archivers.cpio;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.archivers.jar;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.archivers.tar;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.archivers.zip;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.changes;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.compressors;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.compressors.bzip2;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.compressors.gzip;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.utils;x-friends:="com.android.ide.eclipse.tests", org.kxml2.io;x-friends:="com.android.ide.eclipse.tests", org.kxml2.kdom;x-friends:="com.android.ide.eclipse.tests", org.kxml2.wap;x-friends:="com.android.ide.eclipse.tests", diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/build.properties b/eclipse/plugins/com.android.ide.eclipse.adt/build.properties index a82e7797b..9eb0d29c9 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/build.properties +++ b/eclipse/plugins/com.android.ide.eclipse.adt/build.properties @@ -7,13 +7,7 @@ bin.includes = plugin.xml,\ libs/,\ about.properties,\ NOTICE,\ - about.html,\ - libs/common.jar,\ - libs/httpclient-4.1.1.jar,\ - libs/httpcore-4.1.jar,\ - libs/httpmime-4.1.1.jar,\ - libs/commons-logging-1.1.1.jar,\ - libs/commons-codec-1.4.jar + about.html source.. = src/ output.. = bin/ bin.excludes = libs/.gitignore diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml b/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml index f7fd52596..6d609367f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml +++ b/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml @@ -394,12 +394,6 @@ name="Launch" /> <page category="com.android.ide.eclipse.preferences.main" - class="com.android.ide.eclipse.adt.internal.preferences.UsagePreferencePage" - id="com.android.ide.eclipse.common.preferences.UsagePreferencePage" - name="Usage Stats"> - </page> - <page - category="com.android.ide.eclipse.preferences.main" class="com.android.ide.eclipse.adt.internal.preferences.EditorsPage" id="com.android.ide.eclipse.adt.preferences.EditorsPage" name="Editors"> diff --git a/eclipse/plugins/com.android.ide.eclipse.base/.classpath b/eclipse/plugins/com.android.ide.eclipse.base/.classpath new file mode 100644 index 000000000..9b4ea2f12 --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.base/.classpath @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry exported="true" kind="lib" path="libs/androidprefs.jar"/> + <classpathentry exported="true" kind="lib" path="libs/common.jar"/> + <classpathentry exported="true" kind="lib" path="libs/commons-codec-1.4.jar"/> + <classpathentry exported="true" kind="lib" path="libs/commons-compress-1.0.jar"/> + <classpathentry exported="true" kind="lib" path="libs/commons-logging-1.1.1.jar"/> + <classpathentry exported="true" kind="lib" path="libs/guava-10.0.1.jar"/> + <classpathentry exported="true" kind="lib" path="libs/httpclient-4.1.1.jar"/> + <classpathentry exported="true" kind="lib" path="libs/httpcore-4.1.jar"/> + <classpathentry exported="true" kind="lib" path="libs/httpmime-4.1.1.jar"/> + <classpathentry exported="true" kind="lib" path="libs/sdklib.jar"/> + <classpathentry exported="true" kind="lib" path="libs/sdkstats.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-10.0.1.jar" sourcepath="ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/eclipse/plugins/com.android.ide.eclipse.base/.project b/eclipse/plugins/com.android.ide.eclipse.base/.project new file mode 100644 index 000000000..55fe3ee2f --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.base/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>base</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/eclipse/plugins/com.android.ide.eclipse.base/.settings/org.eclipse.jdt.core.prefs b/eclipse/plugins/com.android.ide.eclipse.base/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..5381a0e16 --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.base/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,93 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.nonnull=com.android.annotations.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=com.android.annotations.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled +org.eclipse.jdt.core.compiler.annotation.nullable=com.android.annotations.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=warning +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nullReference=error +org.eclipse.jdt.core.compiler.problem.nullSpecInsufficientInfo=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.potentialNullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF new file mode 100644 index 000000000..7c2bfc8fd --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF @@ -0,0 +1,102 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Common Android Utilities +Bundle-SymbolicName: com.android.ide.eclipse.base;singleton:=true +Bundle-Version: 19.0.0.qualifier +Bundle-Activator: com.android.ide.eclipse.base.BasePlugin +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime +Bundle-ActivationPolicy: lazy +Bundle-Vendor: The Android Open Source Project +Bundle-ClassPath: ., + libs/androidprefs.jar, + libs/common.jar, + libs/commons-codec-1.4.jar, + libs/commons-compress-1.0.jar, + libs/commons-logging-1.1.1.jar, + libs/guava-10.0.1.jar, + libs/httpclient-4.1.1.jar, + libs/httpcore-4.1.jar, + libs/httpmime-4.1.1.jar, + libs/sdklib.jar, + libs/sdkstats.jar +Export-Package: com.android, + com.android.annotations, + com.android.ide.eclipse.base, + com.android.io, + com.android.prefs, + com.android.resources, + com.android.sdklib, + com.android.sdklib.build, + com.android.sdklib.internal.avd, + com.android.sdklib.internal.build, + com.android.sdklib.internal.project, + com.android.sdklib.internal.repository, + com.android.sdklib.io, + com.android.sdklib.repository, + com.android.sdklib.util, + com.android.sdklib.xml, + com.android.sdkstats, + com.android.util, + com.google.common.annotations, + com.google.common.base, + com.google.common.base.internal, + com.google.common.cache, + com.google.common.collect, + com.google.common.eventbus, + com.google.common.io, + com.google.common.net, + com.google.common.primitives, + com.google.common.util.concurrent, + org.apache.commons.codec, + org.apache.commons.codec.binary, + org.apache.commons.codec.digest, + org.apache.commons.codec.language, + org.apache.commons.codec.net, + org.apache.commons.compress.archivers, + org.apache.commons.compress.archivers.ar, + org.apache.commons.compress.archivers.cpio, + org.apache.commons.compress.archivers.jar, + org.apache.commons.compress.archivers.tar, + org.apache.commons.compress.archivers.zip, + org.apache.commons.compress.changes, + org.apache.commons.compress.compressors, + org.apache.commons.compress.compressors.bzip2, + org.apache.commons.compress.compressors.gzip, + org.apache.commons.compress.utils, + org.apache.commons.logging, + org.apache.commons.logging.impl, + org.apache.http, + org.apache.http.annotation, + org.apache.http.auth, + org.apache.http.auth.params, + org.apache.http.client, + org.apache.http.client.entity, + org.apache.http.client.methods, + org.apache.http.client.params, + org.apache.http.client.protocol, + org.apache.http.client.utils, + org.apache.http.conn, + org.apache.http.conn.params, + org.apache.http.conn.routing, + org.apache.http.conn.scheme, + org.apache.http.conn.ssl, + org.apache.http.conn.util, + org.apache.http.cookie, + org.apache.http.cookie.params, + org.apache.http.entity, + org.apache.http.entity.mime, + org.apache.http.entity.mime.content, + org.apache.http.impl, + org.apache.http.impl.auth, + org.apache.http.impl.client, + org.apache.http.impl.conn, + org.apache.http.impl.conn.tsccm, + org.apache.http.impl.cookie, + org.apache.http.impl.entity, + org.apache.http.impl.io, + org.apache.http.io, + org.apache.http.message, + org.apache.http.params, + org.apache.http.protocol, + org.apache.http.util diff --git a/eclipse/plugins/com.android.ide.eclipse.base/build.properties b/eclipse/plugins/com.android.ide.eclipse.base/build.properties new file mode 100644 index 000000000..6dcdd7602 --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.base/build.properties @@ -0,0 +1,17 @@ +output.. = bin/ +bin.includes = .,\ + META-INF/,\ + plugin.xml,\ + libs/androidprefs.jar,\ + libs/common.jar,\ + libs/commons-codec-1.4.jar,\ + libs/commons-compress-1.0.jar,\ + libs/commons-logging-1.1.1.jar,\ + libs/guava-10.0.1.jar,\ + libs/httpclient-4.1.1.jar,\ + libs/httpcore-4.1.jar,\ + libs/httpmime-4.1.1.jar,\ + libs/sdklib.jar,\ + libs/sdkstats.jar +jars.compile.order = . +source.. = src/ diff --git a/eclipse/plugins/com.android.ide.eclipse.base/libs/.gitignore b/eclipse/plugins/com.android.ide.eclipse.base/libs/.gitignore new file mode 100644 index 000000000..d392f0e82 --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.base/libs/.gitignore @@ -0,0 +1 @@ +*.jar diff --git a/eclipse/plugins/com.android.ide.eclipse.base/plugin.xml b/eclipse/plugins/com.android.ide.eclipse.base/plugin.xml new file mode 100644 index 000000000..6e298b769 --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.base/plugin.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.4"?> +<plugin> + <extension + point="org.eclipse.ui.preferencePages"> + <page + category="com.android.ide.eclipse.preferences.main" + class="com.android.ide.eclipse.base.internal.preferences.UsagePreferencePage" + id="com.android.ide.eclipse.common.preferences.UsagePreferencePage" + name="Usage Stats"> + </page> + </extension> + +</plugin> diff --git a/eclipse/plugins/com.android.ide.eclipse.base/src/com/android/ide/eclipse/base/BasePlugin.java b/eclipse/plugins/com.android.ide.eclipse.base/src/com/android/ide/eclipse/base/BasePlugin.java new file mode 100644 index 000000000..bbc127c0f --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.base/src/com/android/ide/eclipse/base/BasePlugin.java @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ide.eclipse.base; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +public class BasePlugin extends AbstractUIPlugin { + public static final String PLUGIN_ID = "com.android.ide.eclipse.base"; //$NON-NLS-1$ + + private static BasePlugin sPlugin; + + public BasePlugin() { + } + + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + sPlugin = this; + } + + @Override + public void stop(BundleContext context) throws Exception { + sPlugin = null; + super.stop(context); + } + + public static BasePlugin getDefault() { + return sPlugin; + } +} diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/preferences/UsagePreferencePage.java b/eclipse/plugins/com.android.ide.eclipse.base/src/com/android/ide/eclipse/base/internal/preferences/UsagePreferencePage.java index 470b4c0fc..c8b70e1a3 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/preferences/UsagePreferencePage.java +++ b/eclipse/plugins/com.android.ide.eclipse.base/src/com/android/ide/eclipse/base/internal/preferences/UsagePreferencePage.java @@ -1,11 +1,11 @@ /* - * Copyright (C) 2008 The Android Open Source Project + * Copyright (C) 2012 The Android Open Source Project * - * Licensed under the Eclipse Public License, Version 1.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.eclipse.org/org/documents/epl-v10.php + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ide.eclipse.adt.internal.preferences; +package com.android.ide.eclipse.base.internal.preferences; import com.android.sdkstats.DdmsPreferenceStore; import com.android.sdkstats.SdkStatsPermissionDialog; diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/.classpath b/eclipse/plugins/com.android.ide.eclipse.gldebugger/.classpath index 39c418569..ac403f089 100755 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/.classpath +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/.classpath @@ -1,12 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="lib" path="libs/ddmlib.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="lib" path="libs/host-libprotobuf-java-2.3.0-lite.jar"/> <classpathentry kind="lib" path="libs/liblzf.jar"/> - <classpathentry kind="lib" path="libs/sdklib.jar"/> - <classpathentry kind="lib" path="libs/guava-10.0.1.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF index 2b6fafe98..884b4b6cd 100644 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF @@ -6,17 +6,15 @@ Bundle-Version: 19.0.0.qualifier Bundle-Activator: com.android.ide.eclipse.gldebugger.GlTracePlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - com.android.ide.eclipse.ddms, org.eclipse.ui.ide, org.eclipse.core.resources, org.eclipse.core.filesystem, - org.eclipse.ui.console + org.eclipse.ui.console, + com.android.ide.eclipse.ddms, + com.android.ide.eclipse.base Bundle-ActivationPolicy: lazy Bundle-ClassPath: libs/host-libprotobuf-java-2.3.0-lite.jar, libs/liblzf.jar, - libs/sdklib.jar, - libs/ddmlib.jar, - libs/guava-10.0.1.jar, . Bundle-Vendor: The Android Open Source Project Export-Package: com.android.ide.eclipse.gldebugger;x-friends:="com.android.ide.eclipse.gldebugger.tests", diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/.classpath b/eclipse/plugins/com.android.ide.eclipse.monitor/.classpath index 09137cb41..9642053d8 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/.classpath +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/.classpath @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="lib" path="libs/androidprefs.jar"/> - <classpathentry exported="true" kind="lib" path="libs/sdkstats.jar"/> - <classpathentry exported="true" kind="lib" path="libs/sdklib.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF index 3043908f5..d2b74fe53 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF @@ -8,10 +8,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, com.android.ide.eclipse.ddms, com.android.ide.eclipse.gldebugger, - com.android.ide.eclipse.traceview + com.android.ide.eclipse.traceview, + com.android.ide.eclipse.base Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor -Bundle-ClassPath: libs/androidprefs.jar, - libs/sdklib.jar, - libs/sdkstats.jar, - . +Bundle-ClassPath: . diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/build.properties b/eclipse/plugins/com.android.ide.eclipse.monitor/build.properties index e60d358df..97144a189 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/build.properties +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/build.properties @@ -4,8 +4,6 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ libs/,\ - libs/sdkstats.jar,\ - libs/androidprefs.jar,\ plugin_customization.ini,\ plugin.properties,\ images/ diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/monitor.product b/eclipse/plugins/com.android.ide.eclipse.monitor/monitor.product index a07889ecd..1ca7b7c98 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/monitor.product +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/monitor.product @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="monitor" uid="com.android.ide.eclipse.monitor.product.config" id="com.android.ide.eclipse.monitor.product" application="com.android.ide.eclipse.monitor.Application" version="0.01" useFeatures="false" includeLaunchers="true"> - +<product name="monitor" uid="com.android.ide.eclipse.monitor.product.config" id="com.android.ide.eclipse.monitor.product" application="com.android.ide.eclipse.monitor.Application" version="19.0.0" useFeatures="false" includeLaunchers="true"> <configIni use="default"> </configIni> @@ -20,12 +19,11 @@ </win> </launcher> - <vm> </vm> - <plugins> + <plugin id="com.android.ide.eclipse.base"/> <plugin id="com.android.ide.eclipse.ddms"/> <plugin id="com.android.ide.eclipse.gldebugger"/> <plugin id="com.android.ide.eclipse.hierarchyviewer"/> diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath index 6aeeb1f77..331b89c7c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath +++ b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath @@ -11,11 +11,11 @@ <classpathentry kind="lib" path="/adt/libs/layoutlib_api.jar" sourcepath="/layoutlib_api"/> <classpathentry kind="lib" path="/adt/libs/ide_common.jar" sourcepath="/ide_common"/> <classpathentry kind="lib" path="/adt/libs/ninepatch.jar" sourcepath="/ninepatch"/> - <classpathentry kind="lib" path="/adt/libs/sdklib.jar" sourcepath="/SdkLib"/> + <classpathentry kind="lib" path="/base/libs/sdklib.jar" sourcepath="/SdkLib"/> <classpathentry kind="lib" path="/adt/libs/sdkuilib.jar" sourcepath="/SdkUiLib"/> <classpathentry kind="lib" path="/adt/libs/rule_api.jar" sourcepath="/rule_api"/> - <classpathentry kind="lib" path="/adt/libs/common.jar"/> - <classpathentry kind="lib" path="/adt/libs/lint_api.jar" sourcepath="/lint-api"/> - <classpathentry kind="lib" path="/adt/libs/lint_checks.jar" sourcepath="/lint-checks"/> + <classpathentry kind="lib" path="/base/libs/common.jar" sourcepath="/common"/> + <classpathentry kind="lib" path="/adt/libs/lint_api.jar" sourcepath="/lint-api"/> + <classpathentry kind="lib" path="/adt/libs/lint_checks.jar" sourcepath="/lint-checks"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/eclipse/scripts/create_all_symlinks.sh b/eclipse/scripts/create_all_symlinks.sh index 25dce6874..ae86fa0b5 100755 --- a/eclipse/scripts/create_all_symlinks.sh +++ b/eclipse/scripts/create_all_symlinks.sh @@ -105,22 +105,31 @@ set -e # fail early LIBS="" CP_FILES="" +### BASE ### + +BASE_PLUGIN_DEST="sdk/eclipse/plugins/com.android.ide.eclipse.base/libs" +BASE_PLUGIN_LIBS="common sdkstats androidprefs sdklib" +BASE_PLUGIN_PREBUILTS="\ + prebuilt/common/commons-compress/commons-compress-1.0.jar \ + prebuilts/tools/common/guava-tools/guava-10.0.1.jar \ + prebuilt/common/http-client/commons-logging-1.1.1.jar \ + prebuilt/common/http-client/commons-codec-1.4.jar \ + prebuilt/common/http-client/httpclient-4.1.1.jar \ + prebuilt/common/http-client/httpcore-4.1.jar \ + prebuilt/common/http-client/httpmime-4.1.1.jar" + +LIBS="$LIBS $BASE_PLUGIN_LIBS" +CP_FILES="$CP_FILES @:$BASE_PLUGIN_DEST $BASE_PLUGIN_LIBS $BASE_PLUGIN_PREBUILTS" + ### ADT ### ADT_DEST="sdk/eclipse/plugins/com.android.ide.eclipse.adt/libs" -ADT_LIBS="sdkstats androidprefs common layoutlib_api lint_api lint_checks ide_common rule_api ninepatch sdklib sdkuilib assetstudio" +ADT_LIBS="layoutlib_api lint_api lint_checks ide_common rule_api ninepatch sdkuilib assetstudio" ADT_PREBUILTS="\ prebuilt/common/kxml2/kxml2-2.3.0.jar \ prebuilts/tools/common/asm-tools/asm-4.0.jar \ prebuilts/tools/common/asm-tools/asm-tree-4.0.jar \ - prebuilts/tools/common/guava-tools/guava-10.0.1.jar \ - prebuilts/tools/common/lombok-ast/lombok-ast-0.2.jar \ - prebuilt/common/commons-compress/commons-compress-1.0.jar \ - prebuilt/common/http-client/httpclient-4.1.1.jar \ - prebuilt/common/http-client/httpcore-4.1.jar \ - prebuilt/common/http-client/httpmime-4.1.1.jar \ - prebuilt/common/http-client/commons-logging-1.1.1.jar \ - prebuilt/common/http-client/commons-codec-1.4.jar" + prebuilts/tools/common/lombok-ast/lombok-ast-0.2.jar" LIBS="$LIBS $ADT_LIBS" CP_FILES="$CP_FILES @:$ADT_DEST $ADT_LIBS $ADT_PREBUILTS" @@ -184,25 +193,16 @@ SDMAN_LIBS="swtmenubar" LIBS="$LIBS $SDKMAN_LIBS" -### MONITOR ### - -MONITOR_DEST="sdk/eclipse/plugins/com.android.ide.eclipse.monitor/libs" -MONITOR_LIBS="sdklib sdkstats androidprefs" - -LIBS="$LIBS $MONITOR_LIBS" -CP_FILES="$CP_FILES @:$MONITOR_DEST $MONITOR_LIBS" - ### GL DEBUGGER ### if [[ $PLATFORM != "windows-x86" ]]; then # liblzf doesn't build under cygwin. If necessary, this should be fixed first. GLD_DEST="sdk/eclipse/plugins/com.android.ide.eclipse.gldebugger/libs" - GLD_LIBS="host-libprotobuf-java-2.3.0-lite liblzf sdklib ddmlib" - GLD_PREBUILTS="prebuilts/tools/common/guava-tools/guava-10.0.1.jar" + GLD_LIBS="host-libprotobuf-java-2.3.0-lite liblzf" LIBS="$LIBS $GLD_LIBS" - CP_FILES="$CP_FILES @:$GLD_DEST $GLD_LIBS $GLD_PREBUILTS" + CP_FILES="$CP_FILES @:$GLD_DEST $GLD_LIBS" fi # In the mode to only echo dependencies, output them and we're done |