Eliminate GEF dependency

ADT used to depend on GEF (the Graphical Editing Framework in
Eclipse), but with GLE2 it no longer does. However, there were still a
couple of references left to GEF (a javadoc reference, some usages of
its Rectangle class, and a reference in the manifest).

Not all Eclipse distributions ship with GEF, which means some users
get a missing dependency error which is not immediately obvious to
those not familiar with Eclipse libraries.

Since we don't depend on GEF for anything important, eliminate the
last dependencies.

Change-Id: I5d1e11a195da496dc10c10fc7865df7e4d183629

6 files changed, 14 insertions, 19 deletions

diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml
index 7c85b4f..6d8f430 100644
--- a/eclipse/features/com.android.ide.eclipse.adt/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.adt/feature.xml
@@ -130,7 +130,6 @@ This Agreement is governed by the laws of the State of New York and the intellec
       <import plugin="org.eclipse.ui" version="3.5" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.gef"/>
       <import plugin="org.eclipse.ui.browser"/>
       <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.wst.sse.core"/>
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 ae958d9..1709849 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
@@ -42,7 +42,6 @@ Require-Bundle: com.android.ide.eclipse.ddms,
  org.eclipse.ui,
  org.eclipse.ui.ide,
  org.eclipse.ui.forms,
- org.eclipse.gef,
  org.eclipse.ui.browser,
  org.eclipse.ui.views,
  org.eclipse.wst.sse.core,
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java
index bc54780..5535ad0 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java
@@ -19,6 +19,7 @@ package com.android.ide.eclipse.adt.internal.editors.layout.configuration;
 import static com.android.ide.common.layout.LayoutConstants.ANDROID_NS_NAME_PREFIX;
 import static com.android.ide.common.resources.ResourceResolver.PREFIX_ANDROID_STYLE;
 
+import com.android.ide.common.api.Rect;
 import com.android.ide.common.rendering.api.ResourceValue;
 import com.android.ide.common.rendering.api.StyleResourceValue;
 import com.android.ide.common.resources.ResourceFile;
@@ -66,7 +67,6 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -1727,7 +1727,7 @@ public class ConfigurationComposite extends Composite {
         return getDensity().getDpiValue();
     }
 
-    public Rectangle getScreenBounds() {
+    public Rect getScreenBounds() {
         // get the orientation from the current device config
         ScreenOrientationQualifier qual = mCurrentConfig.getScreenOrientationQualifier();
         ScreenOrientation orientation = ScreenOrientation.PORTRAIT;
@@ -1749,11 +1749,11 @@ public class ConfigurationComposite extends Composite {
         switch (orientation) {
             default:
             case PORTRAIT:
-                return new Rectangle(0, 0, s2, s1);
+                return new Rect(0, 0, s2, s1);
             case LANDSCAPE:
-                return new Rectangle(0, 0, s1, s2);
+                return new Rect(0, 0, s1, s2);
             case SQUARE:
-                return new Rectangle(0, 0, s1, s1);
+                return new Rect(0, 0, s1, s1);
         }
     }
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java
index 547cbd5..8ecf9df 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java
@@ -23,6 +23,7 @@ import static com.android.ide.eclipse.adt.AdtConstants.ANDROID_PKG;
 import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.ViewElementDescriptor.viewNeedsPackage;
 import static com.android.sdklib.SdkConstants.FD_GEN_SOURCES;
 
+import com.android.ide.common.api.Rect;
 import com.android.ide.common.rendering.LayoutLibrary;
 import com.android.ide.common.rendering.StaticRenderSession;
 import com.android.ide.common.rendering.api.Capability;
@@ -84,7 +85,6 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaModelMarker;
@@ -1102,7 +1102,7 @@ public class GraphicalEditorPart extends EditorPart
      *
      * @return the bounds of the screen, never null
      */
-    public Rectangle getScreenBounds() {
+    public Rect getScreenBounds() {
         return mConfigComposite.getScreenBounds();
     }
 
@@ -1286,7 +1286,7 @@ public class GraphicalEditorPart extends EditorPart
             LayoutLibrary layoutLib) {
         LayoutCanvas canvas = getCanvasControl();
         Set<UiElementNode> explodeNodes = canvas.getNodesToExplode();
-        Rectangle rect = getScreenBounds();
+        Rect rect = getScreenBounds();
         RenderLogger logger = new RenderLogger(mEditedFile.getName());
         RenderingMode renderingMode = RenderingMode.NORMAL;
         // FIXME set the rendering mode using ViewRule or something.
@@ -1298,7 +1298,7 @@ public class GraphicalEditorPart extends EditorPart
 
         RenderSession session = RenderService.create(this)
             .setModel(model)
-            .setSize(rect.width, rect.height)
+            .setSize(rect.w, rect.h)
             .setLog(logger)
             .setRenderingMode(renderingMode)
             .setIncludedWithin(mIncludedWithin)
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 52fba94..65f717a 100755
--- 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
@@ -986,9 +986,9 @@ public class PaletteControl extends Composite {
                 // This is important since when we fill the size of certain views (like
                 // a SeekBar), we want it to at most be the width of the screen, and for small
                 // screens the RENDER_WIDTH was wider.
-                org.eclipse.draw2d.geometry.Rectangle screenBounds = editor.getScreenBounds();
-                int renderWidth = Math.min(screenBounds.width, MAX_RENDER_WIDTH);
-                int renderHeight = Math.min(screenBounds.height, MAX_RENDER_HEIGHT);
+                Rect screenBounds = editor.getScreenBounds();
+                int renderWidth = Math.min(screenBounds.w, MAX_RENDER_WIDTH);
+                int renderHeight = Math.min(screenBounds.h, MAX_RENDER_HEIGHT);
                 LayoutLog silentLogger = new LayoutLog();
 
                 session = RenderService.create(editor)
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 757e2c4..1bef3b4 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
@@ -28,7 +28,6 @@ import com.android.sdklib.SdkConstants;
 import com.android.util.Pair;
 
 import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.gef.ui.parts.TreeViewer;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ActionContributionItem;
 import org.eclipse.jface.action.IAction;
@@ -117,8 +116,6 @@ public class SelectionManager implements ISelectionProvider {
      * Returns the native {@link SelectionItem} list.
      *
      * @return An immutable list of {@link SelectionItem}. Can be empty but not null.
-     * @see #getSelection() {@link #getSelection()} to retrieve a {@link TreeViewer}
-     *                      compatible {@link ISelection}.
      */
     List<SelectionItem> getSelections() {
         return mUnmodifiableSelection;
@@ -135,8 +132,8 @@ public class SelectionManager implements ISelectionProvider {
     }
 
     /**
-     * Returns a {@link TreeSelection} compatible with a TreeViewer
-     * where each {@link TreePath} item is actually a {@link CanvasViewInfo}.
+     * Returns a {@link TreeSelection} where each {@link TreePath} item is
+     * actually a {@link CanvasViewInfo}.
      */
     public ISelection getSelection() {
         if (mSelections.isEmpty()) {