Bug 37026 - [Working Sets] IWorkingSet.getImage should be getImageDescriptor

1 files changed, 13 insertions, 20 deletions

diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSet.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSet.java
index f6f769d4c16..45a6cfa65c5 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSet.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSet.java
@@ -105,25 +105,18 @@ public class WorkingSet extends AbstractWorkingSet {
     public String getId() {
         return editPageId;
     }
+    
+    /*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.IWorkingSet#getImageDescriptor()
+	 */
+	public ImageDescriptor getImageDescriptor() {
+		WorkingSetRegistry registry = WorkbenchPlugin.getDefault()
+				.getWorkingSetRegistry();
+		WorkingSetDescriptor descriptor = null;
 
-    /**
-     * Returns the working set icon.
-     * Currently, this is one of the icons specified in the extensions 
-     * of the org.eclipse.ui.workingSets extension point. 
-     * The extension is identified using the value returned by
-     * <code>getId()</code>. 
-     * Returns <code>null</code> if no icon has been specified in the 
-     * extension or if <code>getId()</code> returns <code>null</code>. 
-     * 
-     * @return the working set icon or <code>null</code>.
-     * @since 2.1 
-     */
-    public ImageDescriptor getImage() {
-        WorkingSetRegistry registry = WorkbenchPlugin.getDefault()
-                .getWorkingSetRegistry();
-        WorkingSetDescriptor descriptor = null;
-
-        if (editPageId == null) {
+		if (editPageId == null) {
 			editPageId = "org.eclipse.ui.resourceWorkingSetPage"; //$NON-NLS-1$
 		}
 
@@ -131,8 +124,8 @@ public class WorkingSet extends AbstractWorkingSet {
 		if (descriptor == null) {
 			return null;
 		}
-        return descriptor.getIcon();
-    }
+		return descriptor.getIcon();
+	}
 
     /**
      * Returns the hash code.