Merge "Code cleanup"

24 files changed, 42 insertions, 41 deletions

diff --git a/changes.txt b/changes.txt
index 835e1b6..1649586 100644
--- a/changes.txt
+++ b/changes.txt
@@ -2,6 +2,7 @@ Change log for Android SDK Tools.
 
 Revision 20:
 - Ant build system:
+- Ant build system:
    * the location of the SDK can now be set through the ANDROID_HOME
      environment variable (requires updating the project's build.xml file)
    * Fixed issues with compilation, deployment of test projects and running tests.
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/CanvasViewInfo.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/CanvasViewInfo.java
index 0298fbb..03c6c39 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/CanvasViewInfo.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/CanvasViewInfo.java
@@ -499,7 +499,7 @@ public class CanvasViewInfo implements IPropertySource {
      * @param exploded New value of the exploded property to mark this info with.
      */
     void setExploded(boolean exploded) {
-        this.mExploded = exploded;
+        mExploded = exploded;
     }
 
     /**
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ClipboardSupport.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ClipboardSupport.java
index 3f9c13b..ae2737b 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ClipboardSupport.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ClipboardSupport.java
@@ -65,7 +65,7 @@ public class ClipboardSupport {
      * @param parent The parent widget in the SWT hierarchy of the canvas.
      */
     public ClipboardSupport(LayoutCanvas canvas, Composite parent) {
-        this.mCanvas = canvas;
+        mCanvas = canvas;
 
         mClipboard = new Clipboard(parent.getDisplay());
     }
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ControlPoint.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ControlPoint.java
index 59b9602..55930f6 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ControlPoint.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ControlPoint.java
@@ -132,7 +132,7 @@ public final class ControlPoint {
      * @param y The mouse y coordinate
      */
     private ControlPoint(LayoutCanvas canvas, int x, int y) {
-        this.mCanvas = canvas;
+        mCanvas = canvas;
         this.x = x;
         this.y = y;
     }
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/EmptyViewsOverlay.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/EmptyViewsOverlay.java
index 8df6c58..daa3e0e 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/EmptyViewsOverlay.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/EmptyViewsOverlay.java
@@ -52,9 +52,9 @@ public class EmptyViewsOverlay extends Overlay {
             CanvasTransform hScale,
             CanvasTransform vScale) {
         super();
-        this.mViewHierarchy = viewHierarchy;
-        this.mHScale = hScale;
-        this.mVScale = vScale;
+        mViewHierarchy = viewHierarchy;
+        mHScale = hScale;
+        mVScale = vScale;
     }
 
     @Override
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/Gesture.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/Gesture.java
index 78bf93e..a35d190 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/Gesture.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/Gesture.java
@@ -96,8 +96,8 @@ public abstract class Gesture {
      *            otherwise 0.
      */
     public void begin(ControlPoint pos, int startMask) {
-        this.mStart = pos;
-        this.mStartMask = startMask;
+        mStart = pos;
+        mStartMask = startMask;
     }
 
     /**
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GestureManager.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GestureManager.java
index e0f0f0f..468d159 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GestureManager.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GestureManager.java
@@ -138,7 +138,7 @@ public class GestureManager {
      * @param canvas The canvas which controls this {@link GestureManager}
      */
     public GestureManager(LayoutCanvas canvas) {
-        this.mCanvas = canvas;
+        mCanvas = canvas;
     }
 
     /**
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/HoverOverlay.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/HoverOverlay.java
index 2f46921..2e7c559 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/HoverOverlay.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/HoverOverlay.java
@@ -69,8 +69,8 @@ public class HoverOverlay extends Overlay {
      */
     public HoverOverlay(LayoutCanvas canvas, CanvasTransform hScale, CanvasTransform vScale) {
         mCanvas = canvas;
-        this.mHScale = hScale;
-        this.mVScale = vScale;
+        mHScale = hScale;
+        mVScale = vScale;
     }
 
     @Override
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ImageControl.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ImageControl.java
index 53dd881..4447eeb 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ImageControl.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ImageControl.java
@@ -65,7 +65,7 @@ public class ImageControl extends Canvas implements MouseTrackListener {
      */
     public ImageControl(@NonNull Composite parent, int style, @Nullable Image image) {
         super(parent, style | SWT.NO_FOCUS | SWT.DOUBLE_BUFFERED);
-        this.mImage = image;
+        mImage = image;
 
         addPaintListener(new PaintListener() {
             @Override
@@ -136,8 +136,8 @@ public class ImageControl extends Canvas implements MouseTrackListener {
         mImage = null;
     }
 
-    public void setDisposeImage(boolean mDisposeImage) {
-        this.mDisposeImage = mDisposeImage;
+    public void setDisposeImage(boolean disposeImage) {
+        mDisposeImage = disposeImage;
     }
 
     public boolean getDisposeImage() {
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ImageOverlay.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ImageOverlay.java
index cb52397..a1363ec 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ImageOverlay.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ImageOverlay.java
@@ -91,9 +91,9 @@ public class ImageOverlay extends Overlay implements IImageFactory {
      * @param vScale The vertical scale information.
      */
     public ImageOverlay(LayoutCanvas canvas, CanvasTransform hScale, CanvasTransform vScale) {
-        this.mCanvas = canvas;
-        this.mHScale = hScale;
-        this.mVScale = vScale;
+        mCanvas = canvas;
+        mHScale = hScale;
+        mVScale = vScale;
     }
 
     @Override
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/IncludeOverlay.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/IncludeOverlay.java
index 66adad8..81c03ed 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/IncludeOverlay.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/IncludeOverlay.java
@@ -46,7 +46,7 @@ public class IncludeOverlay extends Overlay {
      * @param canvas The {@link LayoutCanvas} to paint the overlay over.
      */
     public IncludeOverlay(LayoutCanvas canvas) {
-        this.mCanvas = canvas;
+        mCanvas = canvas;
     }
 
     @Override
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutPoint.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutPoint.java
index 5f82e88..818b2c4 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutPoint.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutPoint.java
@@ -96,7 +96,7 @@ public final class LayoutPoint {
      * @param y The canvas Y coordinate
      */
     private LayoutPoint(LayoutCanvas canvas, int x, int y) {
-        this.mCanvas = canvas;
+        mCanvas = canvas;
         this.x = x;
         this.y = y;
     }
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/MarqueeGesture.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/MarqueeGesture.java
index d0ef9b7..4cfd4fe 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/MarqueeGesture.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/MarqueeGesture.java
@@ -50,7 +50,7 @@ public class MarqueeGesture extends Gesture {
      *            instead of adding it.
      */
     public MarqueeGesture(LayoutCanvas canvas, boolean toggle) {
-        this.mCanvas = canvas;
+        mCanvas = canvas;
 
         if (toggle) {
             List<SelectionItem> selection = canvas.getSelectionManager().getSelections();
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/MoveGesture.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/MoveGesture.java
index 520396d..1d87eb7 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/MoveGesture.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/MoveGesture.java
@@ -115,7 +115,7 @@ public class MoveGesture extends DropGesture {
      * @param canvas The canvas to associate the {@link MoveGesture} with.
      */
     public MoveGesture(LayoutCanvas canvas) {
-        this.mCanvas = canvas;
+        mCanvas = canvas;
         mGlobalDragInfo = GlobalCanvasDragInfo.getInstance();
     }
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/OutlineOverlay.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/OutlineOverlay.java
index a2c533e..e63fff7 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/OutlineOverlay.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/OutlineOverlay.java
@@ -53,9 +53,9 @@ public class OutlineOverlay extends Overlay {
             CanvasTransform hScale,
             CanvasTransform vScale) {
         super();
-        this.mViewHierarchy = viewHierarchy;
-        this.mHScale = hScale;
-        this.mVScale = vScale;
+        mViewHierarchy = viewHierarchy;
+        mHScale = hScale;
+        mVScale = vScale;
     }
 
     @Override
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PaletteControl.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PaletteControl.java
index 2fbd992..119506b 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PaletteControl.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PaletteControl.java
@@ -1252,7 +1252,7 @@ public class PaletteControl extends Composite {
         private final Composite mParent;
 
         private ViewFinderListener(Composite parent) {
-            this.mParent = parent;
+            mParent = parent;
         }
 
         @Override
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/SelectionManager.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/SelectionManager.java
index 57b7871..7c5cd4b 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/SelectionManager.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/SelectionManager.java
@@ -120,7 +120,7 @@ public class SelectionManager implements ISelectionProvider {
      * @param layoutCanvas The layout canvas to create a {@link SelectionManager} for.
      */
     public SelectionManager(LayoutCanvas layoutCanvas) {
-        this.mCanvas = layoutCanvas;
+        mCanvas = layoutCanvas;
     }
 
     @Override
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ViewHierarchy.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ViewHierarchy.java
index 01dd21e..d247e28 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ViewHierarchy.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ViewHierarchy.java
@@ -63,7 +63,7 @@ public class ViewHierarchy {
      *            for.
      */
     public ViewHierarchy(LayoutCanvas canvas) {
-        this.mCanvas = canvas;
+        mCanvas = canvas;
     }
 
     /**
diff --git a/lint/cli/src/com/android/tools/lint/LintCliXmlParser.java b/lint/cli/src/com/android/tools/lint/LintCliXmlParser.java
index d8f413a..c06178a 100644
--- a/lint/cli/src/com/android/tools/lint/LintCliXmlParser.java
+++ b/lint/cli/src/com/android/tools/lint/LintCliXmlParser.java
@@ -129,9 +129,9 @@ public class LintCliXmlParser extends PositionXmlParser implements IDomParser {
          * @param offset the offset, or -1 if unknown
          */
         public OffsetPosition(int line, int column, int offset) {
-            this.mLine = line;
-            this.mColumn = column;
-            this.mOffset = offset;
+            mLine = line;
+            mColumn = column;
+            mOffset = offset;
         }
 
         @Override
diff --git a/lint/cli/src/com/android/tools/lint/Warning.java b/lint/cli/src/com/android/tools/lint/Warning.java
index cb55165..b6f413b 100644
--- a/lint/cli/src/com/android/tools/lint/Warning.java
+++ b/lint/cli/src/com/android/tools/lint/Warning.java
@@ -88,4 +88,4 @@ class Warning implements Comparable<Warning> {
 
         return message.compareTo(other.message);
     }
-}
\ No newline at end of file
+}
diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/DefaultPosition.java b/lint/libs/lint_api/src/com/android/tools/lint/detector/api/DefaultPosition.java
index fe5ada8..72c8ee7 100644
--- a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/DefaultPosition.java
+++ b/lint/libs/lint_api/src/com/android/tools/lint/detector/api/DefaultPosition.java
@@ -46,9 +46,9 @@ public class DefaultPosition extends Position {
      * @param offset the offset, or -1 if unknown
      */
     public DefaultPosition(int line, int column, int offset) {
-        this.mLine = line;
-        this.mColumn = column;
-        this.mOffset = offset;
+        mLine = line;
+        mColumn = column;
+        mOffset = offset;
     }
 
     @Override
@@ -65,4 +65,4 @@ public class DefaultPosition extends Position {
     public int getColumn() {
         return mColumn;
     }
-}
\ No newline at end of file
+}
diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Location.java b/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Location.java
index fb65e00..f574189 100644
--- a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Location.java
+++ b/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Location.java
@@ -56,9 +56,9 @@ public class Location {
      */
     protected Location(@NonNull File file, @Nullable Position start, @Nullable Position end) {
         super();
-        this.mFile = file;
-        this.mStart = start;
-        this.mEnd = end;
+        mFile = file;
+        mStart = start;
+        mEnd = end;
     }
 
     /**
@@ -113,7 +113,7 @@ public class Location {
      * @param secondary a secondary location associated with this location
      */
     public void setSecondary(@Nullable Location secondary) {
-        this.mSecondary = secondary;
+        mSecondary = secondary;
     }
 
     /**
diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/SecurityDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/SecurityDetector.java
index 8c3bc84..57f4af4 100644
--- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/SecurityDetector.java
+++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/SecurityDetector.java
@@ -402,7 +402,7 @@ public class SecurityDetector extends Detector implements Detector.XmlScanner,
 
         public IdentifierVisitor(JavaContext context) {
             super();
-            this.mContext = context;
+            mContext = context;
         }
 
         @Override
diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongImportDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongImportDetector.java
index 1f04eb2..bc3c45e 100644
--- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongImportDetector.java
+++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongImportDetector.java
@@ -89,7 +89,7 @@ public class WrongImportDetector extends Detector implements Detector.JavaScanne
 
         public ImportVisitor(JavaContext context) {
             super();
-            this.mContext = context;
+            mContext = context;
         }
 
         @Override