ADT editors Hyperlinks potentially not using the right GLE.

This fixes a wrong GLE reference in Hyperlinks.getCongigutation().

Also suppresses a few annoying warnings (mostly obsolete imports.)

Change-Id: Ibff38ecf3048d96c2eb3090b2dfd2f4066fe8bc6

5 files changed, 4 insertions, 7 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidSourceViewerConfig.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidSourceViewerConfig.java
index 8334c61..b2c10ec 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidSourceViewerConfig.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidSourceViewerConfig.java
@@ -17,7 +17,6 @@
 package com.android.ide.eclipse.adt.internal.editors;
 
 
-import com.android.ide.eclipse.adt.internal.editors.common.CommonXmlEditor;
 import com.android.ide.eclipse.adt.internal.editors.formatting.AndroidXmlFormatter;
 import com.android.ide.eclipse.adt.internal.editors.formatting.AndroidXmlFormattingStrategy;
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/Hyperlinks.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/Hyperlinks.java
index 6da978d..08ca60a 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/Hyperlinks.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/Hyperlinks.java
@@ -710,7 +710,7 @@ public class Hyperlinks {
                 if (refDelegate != null) {
                     IProject refProject = refDelegate.getEditor().getProject();
                     if (project == null || project == refProject) {
-                        GraphicalEditorPart refGraphicalEditor = delegate.getGraphicalEditor();
+                        GraphicalEditorPart refGraphicalEditor = refDelegate.getGraphicalEditor();
                         if (refGraphicalEditor != null) {
                             return refGraphicalEditor.getConfiguration();
                         }
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/common/CommonSourceViewerConfig.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/common/CommonSourceViewerConfig.java
index ed6e5e9..be31040 100755
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/common/CommonSourceViewerConfig.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/common/CommonSourceViewerConfig.java
@@ -17,7 +17,6 @@
 package com.android.ide.eclipse.adt.internal.editors.common;
 
 import com.android.ide.eclipse.adt.internal.editors.AndroidSourceViewerConfig;
-import com.android.ide.eclipse.adt.internal.editors.AndroidXmlEditor;
 
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.text.source.ISourceViewer;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/ui/tree/UiElementDetail.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/ui/tree/UiElementDetail.java
index 972af93..2aa56a8 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/ui/tree/UiElementDetail.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/ui/tree/UiElementDetail.java
@@ -346,9 +346,9 @@ class UiElementDetail implements IDetailsPage {
 
             final IUiUpdateListener updateListener = new IUiUpdateListener() {
                 @Override
-                public void uiElementNodeUpdated(UiElementNode ui_node, UiUpdateState state) {
+                public void uiElementNodeUpdated(UiElementNode uiNode, UiUpdateState state) {
                     if (state == UiUpdateState.ATTR_UPDATED) {
-                        updateUnknownAttributesSection(ui_node, unknownTable, managedForm,
+                        updateUnknownAttributesSection(uiNode, unknownTable, managedForm,
                                 reference);
                     }
                 }
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/ui/tree/UiTreeBlock.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/ui/tree/UiTreeBlock.java
index 42fd32a..d11b8a4 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/ui/tree/UiTreeBlock.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/ui/tree/UiTreeBlock.java
@@ -642,11 +642,10 @@ public final class UiTreeBlock extends MasterDetailsBlock implements ICommitXml
      *
      * @return A new list of {@link UiElementNode} with at least one item or null.
      */
-    @SuppressWarnings("unchecked")
     private ArrayList<UiElementNode> filterSelection(ITreeSelection selection) {
         ArrayList<UiElementNode> selected = new ArrayList<UiElementNode>();
 
-        for (Iterator it = selection.iterator(); it.hasNext(); ) {
+        for (Iterator<Object> it = selection.iterator(); it.hasNext(); ) {
             Object selectedObj = it.next();
 
             if (selectedObj instanceof UiElementNode) {