Bug 505796 - Icons are missing in the Remote System Details View

Change-Id: I82086e684065175dff897093bd0b8416ffb7d4e0
Signed-off-by: Kaloyan Raev <kaloyan@raev.name>

rse/features/org.eclipse.rse.core-feature/feature.xml

@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.core"
       label="%featureName"
-      version="3.7.2.qualifier"
+      version="3.7.3.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.core"
       license-feature="org.eclipse.license"

rse/features/org.eclipse.rse.core-feature/pom.xml

@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.core</artifactId>
-  <version>3.7.2.qualifier</version>
+  <version>3.7.3.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>

rse/features/org.eclipse.rse.core.source/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rse.core.source"
       label="%featureName"
-      version="3.7.2.qualifier"
+      version="3.7.3.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">

rse/features/org.eclipse.rse.core.source/pom.xml

@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.core.source</artifactId>
-  <version>3.7.2.qualifier</version>
+  <version>3.7.3.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>

rse/features/org.eclipse.rse.sdk-feature/feature.xml

@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.sdk"
       label="%featureName"
-      version="3.7.2.qualifier"
+      version="3.7.3.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.license"

rse/features/org.eclipse.rse.sdk-feature/pom.xml

@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.sdk</artifactId>
-  <version>3.7.2.qualifier</version>
+  <version>3.7.3.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>

rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.ui;singleton:=true
-Bundle-Version: 3.3.300.qualifier
+Bundle-Version: 3.3.400.qualifier
 Bundle-Activator: org.eclipse.rse.ui.RSEUIPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCollapseAllAction.java

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2017 IBM Corporation and others. All rights reserved.
  * This program and the accompanying materials are made available under the terms
  * of the Eclipse Public License v1.0 which accompanies this distribution, and is
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -13,6 +13,7 @@
  * Contributors:
  * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
+ * Kaloyan Raev (Rogue Wave) - [505796] Icons are missing in the Remote System Details View
  ********************************************************************************/
 
 package org.eclipse.rse.internal.ui.actions;
@@ -44,7 +45,6 @@ public class SystemCollapseAllAction extends SystemBaseAction {
 		super(SystemResources.ACTION_COLLAPSE_ALL_LABEL, SystemResources.ACTION_COLLAPSE_ALL_TOOLTIP, PlatformUI.getWorkbench().getSharedImages()
 				.getImageDescriptor(ISharedImages.IMG_ELCL_COLLAPSEALL), // D54577
 				parent);
-		//setHoverImageDescriptor(RSEUIPlugin.getDefault().getImageDescriptorFromIDE("elcl16/collapseall.gif")); //$NON-NLS-1$
 		setHoverImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_ELCL_COLLAPSEALL));
 		allowOnMultipleSelection(true);
 		setContextMenuGroup(ISystemContextMenuConstants.GROUP_EXPAND); // should never be used

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2002, 2014 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2017 IBM Corporation and others. All rights reserved.
  * This program and the accompanying materials are made available under the terms
  * of the Eclipse Public License v1.0 which accompanies this distribution, and is
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -50,12 +50,11 @@
  * David McKnight   (IBM)        - [372674] Enhancement - Preserve state of Remote Monitor view
  * David McKnight   (IBM)        - [373673] Remote Systems Details view calling wrong method for setting action tooltips
  * David McKnight   (IBM)        - [425113] Improve performance of RSE table views by using SWT.VIRTUAL
+ * Kaloyan Raev (Rogue Wave) - [505796] Icons are missing in the Remote System Details View
 *******************************************************/
 
 package org.eclipse.rse.internal.ui.view;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -65,7 +64,6 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.action.Action;
@@ -142,6 +140,7 @@ import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.ISelectionListener;
 import org.eclipse.ui.ISelectionService;
+import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.IViewSite;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PartInitException;
@@ -150,7 +149,6 @@ import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.part.CellEditorActionHandler;
 import org.eclipse.ui.part.ViewPart;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.osgi.framework.Bundle;
 
 import com.ibm.icu.text.MessageFormat;
 
@@ -199,10 +197,10 @@ public class SystemTableViewPart extends ViewPart
 	{
 		public ForwardAction()
 		{
-			super(SystemResources.ACTION_HISTORY_MOVEFORWARD_LABEL, getEclipseImageDescriptor("elcl16/forward_nav.gif")); //$NON-NLS-1$
+			super(SystemResources.ACTION_HISTORY_MOVEFORWARD_LABEL, PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_FORWARD));
 
 			setToolTipText(SystemResources.ACTION_HISTORY_MOVEFORWARD_TOOLTIP);
-			setDisabledImageDescriptor(getEclipseImageDescriptor("dlcl16/forward_nav.gif")); //$NON-NLS-1$
+			setDisabledImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_FORWARD_DISABLED));
 		}
 
 		public void checkEnabledState()
@@ -232,9 +230,9 @@ public class SystemTableViewPart extends ViewPart
 	{
 		public BackwardAction()
 		{
-			super(SystemResources.ACTION_HISTORY_MOVEBACKWARD_LABEL, getEclipseImageDescriptor("elcl16/backward_nav.gif")); //$NON-NLS-1$
+			super(SystemResources.ACTION_HISTORY_MOVEBACKWARD_LABEL, PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_BACK));
 			setToolTipText(SystemResources.ACTION_HISTORY_MOVEBACKWARD_TOOLTIP);
-			setDisabledImageDescriptor(getEclipseImageDescriptor("dlcl16/backward_nav.gif")); //$NON-NLS-1$
+			setDisabledImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_BACK_DISABLED));
 		}
 
 		public void checkEnabledState()
@@ -265,8 +263,8 @@ public class SystemTableViewPart extends ViewPart
 		private IAdaptable _parent;
 		public UpAction()
 		{
-			super(SystemResources.ACTION_GOUPLEVEL_TOOLTIP, getEclipseImageDescriptor("elcl16/up_nav.gif")); //$NON-NLS-1$
+			super(SystemResources.ACTION_GOUPLEVEL_TOOLTIP, PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_UP));
-			setDisabledImageDescriptor(getEclipseImageDescriptor("dlcl16/up_nav.gif")); //$NON-NLS-1$
+			setDisabledImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_UP_DISABLED));
 		}
 
 		public void checkEnabledState()
@@ -1435,22 +1433,6 @@ public class SystemTableViewPart extends ViewPart
 		_selectColumnsAction.checkEnabledState();
 	}
 
-	private ImageDescriptor getEclipseImageDescriptor(String relativePath)
-	{
-		String iconPath = "icons/full/"; //$NON-NLS-1$
-		try
-		{
-		    Bundle bundle = Platform.getBundle(PlatformUI.PLUGIN_ID);
-			URL installURL = bundle.getEntry("/"); //$NON-NLS-1$
-			URL url = new URL(installURL, iconPath + relativePath);
-			return ImageDescriptor.createFromURL(url);
-		}
-		catch (MalformedURLException e)
-		{
-			return null;
-		}
-	}
-
 	public void fillLocalToolBar()
 	{
 

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2017 IBM Corporation and others. All rights reserved.
  * This program and the accompanying materials are made available under the terms
  * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -21,6 +21,7 @@
  * Martin Oberhuber (Wind River) - [cleanup] Avoid using SystemStartHere in production code
  * David Dykstal (IBM) - [202630] getDefaultPrivateProfile() and ensureDefaultPrivateProfile() are inconsistent
  * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
+ * Kaloyan Raev (Rogue Wave) - [505796] Icons are missing in the Remote System Details View
  ********************************************************************************/
 
 package org.eclipse.rse.internal.ui.view.team;
@@ -114,6 +115,7 @@ import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IMemento;
+import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.IViewSite;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
@@ -851,9 +853,9 @@ public class SystemTeamViewPart
 			collapseAllAction = new SystemCollapseAllAction(getShell()); 
 			collapseAllAction.setSelectionProvider(treeViewer);
 			collapseAllAction.setViewer(treeViewer);
-			collapseAllAction.setImageDescriptor(getNavigatorImageDescriptor("elcl16/collapseall.gif")); //$NON-NLS-1$
+			ImageDescriptor collapseAllImage = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_ELCL_COLLAPSEALL);
-			// DKM - changed this icon from clcl16 since navigator no longer has it
+			collapseAllAction.setImageDescriptor(collapseAllImage);
-			collapseAllAction.setHoverImageDescriptor(getNavigatorImageDescriptor("elcl16/collapseall.gif")); //$NON-NLS-1$
+			collapseAllAction.setHoverImageDescriptor(collapseAllImage);
 		}
 		return collapseAllAction;
 	}

rse/plugins/org.eclipse.rse.ui/pom.xml

@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.ui</artifactId>
-  <version>3.3.300.qualifier</version>
+  <version>3.3.400.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 </project>