Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Chen2012-01-19 07:58:38 +0000
committerWilliam Chen2012-01-19 07:58:38 +0000
commit04fe60b00cda636439eb44550cfc2024c904f098 (patch)
tree34cecacaab1c7f1589d99f2e0470c07338b6193b
parent2fe32fecfa77c1cf619cbf863465286983dff99b (diff)
downloadorg.eclipse.tcf-04fe60b00cda636439eb44550cfc2024c904f098.tar.gz
org.eclipse.tcf-04fe60b00cda636439eb44550cfc2024c904f098.tar.xz
org.eclipse.tcf-04fe60b00cda636439eb44550cfc2024c904f098.zip
Target Explorer: Fixed an issue that File System tree never shows up
after the previous refactoring.
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem/src/org/eclipse/tcf/te/tcf/filesystem/controls/FSNavigatorContentProvider.java15
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/controls/ProcessNavigatorContentProvider.java13
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/CommonViewerListener.java11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/TreeContentProvider.java12
4 files changed, 50 insertions, 1 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem/src/org/eclipse/tcf/te/tcf/filesystem/controls/FSNavigatorContentProvider.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem/src/org/eclipse/tcf/te/tcf/filesystem/controls/FSNavigatorContentProvider.java
index 1af7ea57b..8add1207a 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem/src/org/eclipse/tcf/te/tcf/filesystem/controls/FSNavigatorContentProvider.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem/src/org/eclipse/tcf/te/tcf/filesystem/controls/FSNavigatorContentProvider.java
@@ -132,5 +132,18 @@ public class FSNavigatorContentProvider extends TreeContentProvider {
*/
protected boolean isRootNodeVisible() {
return true;
- }
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.tcf.te.ui.trees.TreeContentProvider#isRootObject(java.lang.Object)
+ */
+ @Override
+ protected boolean isRootObject(Object object) {
+ if(object instanceof FSTreeNode) {
+ FSTreeNode node = (FSTreeNode) object;
+ return node.isSystemRoot();
+ }
+ return false;
+ }
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/controls/ProcessNavigatorContentProvider.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/controls/ProcessNavigatorContentProvider.java
index 01eee0203..321442904 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/controls/ProcessNavigatorContentProvider.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/controls/ProcessNavigatorContentProvider.java
@@ -218,4 +218,17 @@ public class ProcessNavigatorContentProvider extends TreeContentProvider implem
}
}
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.tcf.te.ui.trees.TreeContentProvider#isRootObject(java.lang.Object)
+ */
+ @Override
+ protected boolean isRootObject(Object object) {
+ if(object instanceof ProcessTreeNode) {
+ ProcessTreeNode node = (ProcessTreeNode) object;
+ return node.isRootNode();
+ }
+ return false;
+ }
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/CommonViewerListener.java b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/CommonViewerListener.java
index b573c1676..eac12099c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/CommonViewerListener.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/CommonViewerListener.java
@@ -82,6 +82,9 @@ public abstract class CommonViewerListener extends TimerTask implements IPropert
List<?> list = (List<?>) object;
if (list.size() == 1) {
object = list.get(0);
+ if(isRootObject(object)) {
+ object = NULL;
+ }
}
else {
// If there are multiple root nodes, then select NULL as the final root.
@@ -95,6 +98,14 @@ public abstract class CommonViewerListener extends TimerTask implements IPropert
}
/**
+ * If the specified object is a root object;
+ *
+ * @param object The object to be tested.
+ * @return true if it is root object.
+ */
+ protected abstract boolean isRootObject(Object object);
+
+ /**
* Merge the current objects into an ancestor object.
*
* @param objects The objects to be merged.
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/TreeContentProvider.java b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/TreeContentProvider.java
index 472368f47..ea9a75517 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/TreeContentProvider.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/TreeContentProvider.java
@@ -80,10 +80,22 @@ public abstract class TreeContentProvider implements ITreeContentProvider {
@Override
protected Object getParent(Object node) {
return TreeContentProvider.this.getParent(node);
+ }
+ @Override
+ protected boolean isRootObject(Object object) {
+ return TreeContentProvider.this.isRootObject(object);
}};
}
/**
+ * If the specified object is a root object;
+ *
+ * @param object The object to be tested.
+ * @return true if it is root object.
+ */
+ protected abstract boolean isRootObject(Object object);
+
+ /**
* Install a property change listener to the specified element.
*
* @param element The element node.

Back to the top