Merge "Update to Lombok 0.2.2 and package ecj for command line lint" into idea133

8 files changed, 14 insertions, 15 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
index 89b762f..d6e4c2e 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
@@ -12,7 +12,7 @@
 	<classpathentry exported="true" kind="lib" path="libs/ant-glob.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/freemarker-2.3.19.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/manifest-merger.jar" sourcepath="/ManifestMerger"/>
-	<classpathentry exported="true" kind="lib" path="libs/lombok-ast-0.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/lombok-ast-0.2.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/propertysheet.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/asm-4.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/asm-analysis-4.0.jar"/>
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 bd72b31..033c340 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
@@ -11,7 +11,7 @@ Bundle-ClassPath: .,
  libs/asset-studio.jar,
  libs/lint-api.jar,
  libs/lint-checks.jar,
- libs/lombok-ast-0.2.jar,
+ libs/lombok-ast-0.2.2.jar,
  libs/asm-4.0.jar,
  libs/asm-tree-4.0.jar,
  libs/asm-analysis-4.0.jar,
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LintOverlay.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LintOverlay.java
index bce1512..ca74493 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LintOverlay.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LintOverlay.java
@@ -19,6 +19,7 @@ package com.android.ide.eclipse.adt.internal.editors.layout.gle2;
 import com.android.ide.eclipse.adt.internal.editors.IconFactory;
 import com.android.ide.eclipse.adt.internal.editors.layout.LayoutEditorDelegate;
 import com.android.ide.eclipse.adt.internal.preferences.AdtPrefs;
+import com.google.common.collect.Lists;
 
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.swt.graphics.GC;
@@ -29,8 +30,6 @@ import org.w3c.dom.Node;
 
 import java.util.Collection;
 
-import lombok.ast.libs.org.parboiled.google.collect.Lists;
-
 /**
  * The {@link LintOverlay} paints an icon over each view that contains at least one
  * lint error (unless the view is smaller than the icon)
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java
index 45ae2c5..ce0202f 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java
@@ -1097,11 +1097,13 @@ public class EclipseLintClient extends LintClient implements IDomParser {
         EclipseJavaParser() {
             if (USE_ECLIPSE_PARSER) {
                 CompilerOptions options = new CompilerOptions();
-                // Read settings from project? Note that this doesn't really matter because
-                // we will only be parsing, not actually compiling.
-                options.complianceLevel = ClassFileConstants.JDK1_6;
-                options.sourceLevel = ClassFileConstants.JDK1_6;
-                options.targetJDK = ClassFileConstants.JDK1_6;
+                // Always using JDK 7 rather than basing it on project metadata since we
+                // don't do compilation error validation in lint (we leave that to the IDE's
+                // error parser or the command line build's compilation step); we want an
+                // AST that is as tolerant as possible.
+                options.complianceLevel = ClassFileConstants.JDK1_7;
+                options.sourceLevel = ClassFileConstants.JDK1_7;
+                options.targetJDK = ClassFileConstants.JDK1_7;
                 options.parseLiteralExpressionsAsConstants = true;
                 ProblemReporter problemReporter = new ProblemReporter(
                         DefaultErrorHandlingPolicies.exitOnFirstError(),
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/NewProjectPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/NewProjectPage.java
index 0b003f3..ebaacfe 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/NewProjectPage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/NewProjectPage.java
@@ -29,6 +29,7 @@ import com.android.ide.eclipse.adt.internal.wizards.newproject.ApplicationInfoPa
 import com.android.ide.eclipse.adt.internal.wizards.newproject.ProjectNamePage;
 import com.android.sdklib.AndroidVersion;
 import com.android.sdklib.IAndroidTarget;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 import org.eclipse.core.resources.IResource;
@@ -63,8 +64,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import lombok.ast.libs.org.parboiled.google.collect.Lists;
-
 /**
  * First wizard page in the "New Project From Template" wizard
  */
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateMetadata.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateMetadata.java
index cb184b8..f5e35ef 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateMetadata.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateMetadata.java
@@ -46,6 +46,7 @@ import com.android.ide.eclipse.adt.internal.assetstudio.CreateAssetSetWizardStat
 import com.android.ide.eclipse.adt.internal.editors.IconFactory;
 import com.android.ide.eclipse.adt.internal.editors.layout.gle2.ImageUtils;
 import com.android.utils.Pair;
+import com.google.common.collect.Lists;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.swt.graphics.Image;
@@ -64,8 +65,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import lombok.ast.libs.org.parboiled.google.collect.Lists;
-
 /** An ADT template along with metadata */
 class TemplateMetadata {
     private final Document mDocument;
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
index 247c1c2..cce7e3c 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
@@ -15,7 +15,7 @@
 	<classpathentry kind="lib" path="/plugin-adt/libs/lint-api.jar" sourcepath="/lint-api"/>
 	<classpathentry kind="lib" path="/plugin-adt/libs/lint-checks.jar" sourcepath="/lint-checks"/>
 	<classpathentry kind="lib" path="/plugin-base/libs/sdk-common.jar"/>
-	<classpathentry kind="lib" path="/plugin-adt/libs/lombok-ast-0.2.jar"/>
+	<classpathentry kind="lib" path="/plugin-adt/libs/lombok-ast-0.2.2.jar"/>
 	<classpathentry kind="lib" path="/plugin-adt/libs/asm-4.0.jar"/>
 	<classpathentry kind="lib" path="/plugin-adt/libs/asm-analysis-4.0.jar"/>
 	<classpathentry kind="lib" path="/plugin-adt/libs/asm-tree-4.0.jar"/>
diff --git a/eclipse/scripts/create_all_symlinks.sh b/eclipse/scripts/create_all_symlinks.sh
index b20b692..e3cef1a 100755
--- a/eclipse/scripts/create_all_symlinks.sh
+++ b/eclipse/scripts/create_all_symlinks.sh
@@ -159,7 +159,7 @@ ADT_PREBUILTS="\
     prebuilts/tools/common/m2/repository/org/ow2/asm/asm/4.0/asm-4.0.jar \
     prebuilts/tools/common/m2/repository/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar \
     prebuilts/tools/common/m2/repository/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar \
-    prebuilts/tools/common/lombok-ast/lombok-ast-0.2.jar"
+    prebuilts/tools/common/m2/repository/com/android/tools/external/lombok/lombok-ast/0.2.2/lombok-ast-0.2.2.jar"
 
 LIBS="$LIBS $ADT_LIBS"
 CP_FILES="$CP_FILES @:$ADT_DEST $ADT_LIBS $ADT_PREBUILTS"