Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2015-05-12 10:15:58 -0400
committerUwe Stieber2015-05-12 10:15:58 -0400
commit3f91f0e198f6dd2676883086f274414ad709c3d5 (patch)
tree40ff86cb475bc95975f3cdd6c449b2bf7a99add3
parentd5a9b8c17e042603050fa0cabf9c60bb56ae6f3f (diff)
downloadorg.eclipse.tcf-3f91f0e198f6dd2676883086f274414ad709c3d5.tar.gz
org.eclipse.tcf-3f91f0e198f6dd2676883086f274414ad709c3d5.tar.xz
org.eclipse.tcf-3f91f0e198f6dd2676883086f274414ad709c3d5.zip
Target Explorer: Fix "Please connect ..." message not shown on "File System" tab
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/pages/FSExplorerEditorPage.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/pages/FSExplorerEventListener.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/nls/Messages.properties2
3 files changed, 4 insertions, 1 deletions
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 343582805..231cceb0a 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
@@ -90,6 +90,7 @@ public class FSExplorerEditorPage extends AbstractTreeViewerExplorerEditorPage {
IRuntimeModel rtModel = ModelManager.getRuntimeModel(peerNode);
if (rtModel != null)
return rtModel.getRoot();
+ return 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/pages/FSExplorerEventListener.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/pages/FSExplorerEventListener.java
index a21d1567d..92a836b80 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/pages/FSExplorerEventListener.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/pages/FSExplorerEventListener.java
@@ -83,6 +83,8 @@ public class FSExplorerEventListener extends AbstractEventListener {
// Update the tree viewer input element
treeControl.getViewer().setInput(model.getRoot());
}
+ } else {
+ treeControl.getViewer().setInput(getPeerNode());
}
// Trigger a refresh on the whole viewer to show the "Please connect ..." text
treeControl.getViewer().refresh();
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/nls/Messages.properties
index 6d72b6454..477871c72 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/nls/Messages.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/nls/Messages.properties
@@ -173,5 +173,5 @@ TreeViewerSearchDialog_GrpOptionsText=Options
TreeViewerSearchDialog_BtnCaseText=Case sensitive
TreeViewerSearchDialog_BtnPreciseText=Precise matching
-ContentProvider_notConnected=Please connect to see the filesystem on the target.
+ContentProvider_notConnected=Please connect to see the file system on the target.
UiExecutor_errorRunningOperation=Operation completed with errors

Back to the top