From ed2151797731eac8ce64bd88c08f2a2e2094cd3f Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Mon, 11 May 2015 14:29:06 +0200 Subject: Bug 465093, 465580: Polish labels and position of actions. Also fix download for files containing '+' characters in the name. Change-Id: I3e11378dd123565cabb64ae8fd0628765c3296e4 Signed-off-by: Markus Schorn --- .../tcf/filesystem/core/internal/FSTreeNode.java | 6 ++---- .../plugin.properties | 6 +++--- .../plugin.xml | 24 +++++++++++----------- .../te/tcf/filesystem/ui/nls/Messages.properties | 2 +- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/FSTreeNode.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/FSTreeNode.java index 8ef81be28..41c072a26 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/FSTreeNode.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/FSTreeNode.java @@ -275,8 +275,7 @@ public final class FSTreeNode extends FSTreeNodeBase implements IFilterable, org try { String id = getPeerNode().getPeerId(); String path = getLocation(true); - String location = TcfURLConnection.PROTOCOL_SCHEMA + ":/" + id + (path.startsWith("/") ? path : "/" + path); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - return new URL(location); + return new URL(TcfURLConnection.PROTOCOL_SCHEMA, id, path); } catch (MalformedURLException e) { assert false; return null; @@ -294,8 +293,7 @@ public final class FSTreeNode extends FSTreeNodeBase implements IFilterable, org try { String id = getPeerNode().getPeerId(); String path = getLocation('/', true); - String location = TcfURLConnection.PROTOCOL_SCHEMA + ":/" + id + (path.startsWith("/") ? path : "/" + path); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - return new URI(location); + return new URI(TcfURLConnection.PROTOCOL_SCHEMA, id, path, null); } catch (URISyntaxException e) { assert false; diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.properties index 76a072c71..e40200748 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.properties +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.properties @@ -64,7 +64,7 @@ command.commit.name = Commit File command.merge.name = Merge File command.revert.name = Revert File command.download.name = Download Files -command.toggleReavealOnConnect.name = Toggle Reveal on Connect +command.toggleReavealOnConnect.name = Toggle Show on Connect command.delete.label=Delete command.delete.description=Delete the selected node @@ -74,7 +74,7 @@ decorator.outdated.label = Remote File System Outdated Cache Decorator decorator.conflict.label = Remote File System Conflicting Cache Decorator decorator.label.cut = Remote File System Cut File Decorator decorator.hidden.label = Remote File System Hidden File Decorator -decorator.revealOnConnect.label = Remote File System Reveal on Connect Decorator +decorator.revealOnConnect.label = Remote File System Show on Connect Decorator menu.label.openwith = Open With menu.new.label = &New @@ -85,7 +85,7 @@ command.label.paste = Paste command.label.delete = Delete command.label.rename = Rename command.label.move = Move -command.label.download = Download... +command.label.download = Download to Host... command.newfile.label = &File command.newfolder.label = &Folder diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.xml index 7cd6897b7..e26ea40b0 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.xml +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.xml @@ -219,6 +219,17 @@ id="openWithMenu"> + + + + + + + + + @@ -550,17 +561,6 @@ label="%command.search.label" style="push"> - - - - - - - - - - + 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 bd1ce8788..6d72b6454 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 @@ -167,7 +167,7 @@ SizeValidator_InfoPrompt=Please enter a size number. TargetSelectionPage_Description=Please select the target where the new file or folder is created. TargetSelectionPage_Targets=Targets: TargetSelectionPage_Title=Select the target. -ToggleRevealOnConnectContributionItem_text=Reveal on Connect +ToggleRevealOnConnectContributionItem_text=Show on Connect TreeViewerSearchDialog_LblCancelText=Find: TreeViewerSearchDialog_GrpOptionsText=Options TreeViewerSearchDialog_BtnCaseText=Case sensitive -- cgit v1.2.3