Target Explorer: Allow content contributions into column tree viewers

3 files changed, 11 insertions, 8 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/activator/UIPlugin.java
index d7dc54412..a414b66da 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/activator/UIPlugin.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/activator/UIPlugin.java
@@ -14,7 +14,6 @@ import java.net.URL;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.tcf.te.runtime.model.MessageModelNode;
 import org.eclipse.tcf.te.tcf.processes.ui.internal.ImageConsts;
 import org.eclipse.tcf.te.ui.jface.images.AbstractImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -83,9 +82,6 @@ public class UIPlugin extends AbstractUIPlugin {
 		registry.put(ImageConsts.OBJ_Process_Root, ImageDescriptor.createFromURL(url));
 		url = UIPlugin.getDefault().getBundle().getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_OBJ + "process_polling.png"); //$NON-NLS-1$
 		registry.put(ImageConsts.PM_POLLING, ImageDescriptor.createFromURL(url));
-
-		url = UIPlugin.getDefault().getBundle().getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_OBJ + "pending.gif"); //$NON-NLS-1$
-		registry.put(MessageModelNode.OBJECT_MESSAGE_PENDING_ID, ImageDescriptor.createFromURL(url));
 	}
 
 	/**
@@ -96,7 +92,11 @@ public class UIPlugin extends AbstractUIPlugin {
 	 * @return The <code>Image</code> object instance or <code>null</code>.
 	 */
 	public static Image getImage(String key) {
-		return getDefault().getImageRegistry().get(key);
+		Image image = getDefault().getImageRegistry().get(key);
+		if (image == null) {
+			image = org.eclipse.tcf.te.ui.activator.UIPlugin.getImage(key);
+		}
+		return image;
 	}
 
 	/**
@@ -107,7 +107,11 @@ public class UIPlugin extends AbstractUIPlugin {
 	 * @return The <code>ImageDescriptor</code> object instance or <code>null</code>.
 	 */
 	public static ImageDescriptor getImageDescriptor(String key) {
-		return getDefault().getImageRegistry().getDescriptor(key);
+		ImageDescriptor descriptor = getDefault().getImageRegistry().getDescriptor(key);
+		if (descriptor == null) {
+			descriptor = org.eclipse.tcf.te.ui.activator.UIPlugin.getImageDescriptor(key);
+		}
+		return descriptor;
 	}
 
 	/**
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/editor/ProcessMonitorEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/editor/ProcessMonitorEditorPage.java
index e46ea0d46..27ec2b409 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/editor/ProcessMonitorEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/editor/ProcessMonitorEditorPage.java
@@ -151,7 +151,7 @@ public class ProcessMonitorEditorPage extends TreeViewerExplorerEditorPage {
 	    	EventManager.getInstance().addEventListener(listener, ChangeEvent.class);
 	    }
 
-		if (listener == null && treeControl.getViewer() instanceof TreeViewer) {
+		if (treeListener == null && treeControl.getViewer() instanceof TreeViewer) {
 			final TreeViewer treeViewer = (TreeViewer) treeControl.getViewer();
 
 			treeListener = new TreeViewerListener();
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/editor/tree/ContentProvider.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/editor/tree/ContentProvider.java
index 339891055..e854ae43b 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/editor/tree/ContentProvider.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/editor/tree/ContentProvider.java
@@ -32,7 +32,6 @@ public class ContentProvider extends org.eclipse.tcf.te.tcf.processes.ui.navigat
 				// If the model is auto refreshing, then stop it when the editor is disposed.
 				model.setAutoRefreshInterval(0);
 			}
-//			ModelManager.disposeRuntimeModel(peerModel);
 		}
 	}