Target Explorer: Changes of Quick Filter based on the feedbacks

received.

4 files changed, 27 insertions, 3 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/controls/NavigatorContentProvider.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/controls/NavigatorContentProvider.java
index c123f968c..ba500863c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/controls/NavigatorContentProvider.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/controls/NavigatorContentProvider.java
@@ -34,7 +34,15 @@ public abstract class NavigatorContentProvider extends TreeContentProvider  impl
 	public Object getParent(Object element) {

 		if (element instanceof AbstractTreeNode) {

 			AbstractTreeNode node = (AbstractTreeNode) element;

-			return node.getParent() != null ? node.getParent() : (isRootNodeVisible()? node.peerNode : null);

+			AbstractTreeNode parent = node.getParent();

+			if (parent != null) {

+				if (parent.isSystemRoot()) {

+					if (isRootNodeVisible()) return parent;

+					return null;

+				}

+				return parent;

+			}

+			if (isRootNodeVisible()) return node.peerNode;

 		}

 		return null;

 	}

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/adapters/FSTreeNodeAdapterFactory.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/adapters/FSTreeNodeAdapterFactory.java
index ce12fb273..686d89aee 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/adapters/FSTreeNodeAdapterFactory.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/adapters/FSTreeNodeAdapterFactory.java
@@ -19,6 +19,7 @@ import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.tcf.te.tcf.filesystem.core.model.FSTreeNode;

 import org.eclipse.tcf.te.tcf.filesystem.ui.activator.UIPlugin;

 import org.eclipse.tcf.te.tcf.filesystem.ui.internal.columns.FSTreeElementLabelProvider;

+import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;

 import org.eclipse.tcf.te.ui.interfaces.ILazyLoader;

 import org.eclipse.ui.IActionFilter;

 import org.eclipse.ui.IPersistableElement;

@@ -62,6 +63,9 @@ public class FSTreeNodeAdapterFactory implements IAdapterFactory {
 			else if(adapterType == ILazyLoader.class) {

 				return new FSTreeNodeLoader(node);

 			}

+			else if(adapterType == IPeerModel.class) {

+				return node.getPeerModel();

+			}

 		}

 		return null;

 	}

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/columns/LabelProviderUpdateDaemon.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/columns/LabelProviderUpdateDaemon.java
index b11891d16..de1a06158 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/columns/LabelProviderUpdateDaemon.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/columns/LabelProviderUpdateDaemon.java
@@ -29,7 +29,7 @@ import org.eclipse.core.runtime.ISafeRunnable;
 import org.eclipse.core.runtime.SafeRunner;

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.swt.graphics.Image;

-import org.eclipse.tcf.te.core.interfaces.IViewerInput;

+import org.eclipse.tcf.te.core.interfaces.IPropertyChangeProvider;

 import org.eclipse.tcf.te.tcf.filesystem.core.internal.utils.CacheManager;

 import org.eclipse.tcf.te.tcf.filesystem.core.model.FSTreeNode;

 import org.eclipse.tcf.te.tcf.filesystem.ui.activator.UIPlugin;

@@ -282,7 +282,7 @@ public class LabelProviderUpdateDaemon extends Thread {
 	 */

 	private void sendNotification(FSTreeNode node, String key, ImageDescriptor oldImg, ImageDescriptor newImg) {

 		if (node.peerNode != null) {

-			IViewerInput viewerInput = (IViewerInput) node.peerNode.getAdapter(IViewerInput.class);

+			IPropertyChangeProvider viewerInput = (IPropertyChangeProvider) node.peerNode.getAdapter(IPropertyChangeProvider.class);

 			viewerInput.firePropertyChange(new PropertyChangeEvent(node, key, oldImg, newImg));

 		}

 	}

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/pages/FSExplorerEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/pages/FSExplorerEditorPage.java
index 74099e68d..ed76450c4 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/pages/FSExplorerEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/pages/FSExplorerEditorPage.java
@@ -9,7 +9,9 @@
  *******************************************************************************/

 package org.eclipse.tcf.te.tcf.filesystem.ui.internal.pages;

 

+import org.eclipse.tcf.te.tcf.filesystem.core.model.FSModel;

 import org.eclipse.tcf.te.tcf.filesystem.ui.nls.Messages;

+import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;

 import org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage;

 /**

  * The editor page for the file system explorer. 

@@ -51,4 +53,14 @@ public class FSExplorerEditorPage extends TreeViewerExplorerEditorPage {
     protected String getContextHelpId() {

 	    return "org.eclipse.tcf.te.tcf.filesystem.FSExplorerEditorPage"; //$NON-NLS-1$

     }

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage#getViewerInput()

+	 */

+	@Override

+    protected Object getViewerInput() {

+		IPeerModel peerModel = (IPeerModel) getEditorInputNode();

+		return FSModel.getFSModel(peerModel).getRoot();

+    }

 }