From f66f6731733060ab796d7e2a7c0cdf49962d2c39 Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Tue, 4 Feb 2014 21:41:03 +0000 Subject: [PATCH] fix a small bug, display full workspace name git-svn-id: https://svn.argeo.org/slc/trunk@6808 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../client/ui/dist/model/WorkspaceElem.java | 21 ++++++++++--------- .../ui/dist/views/DistributionsView.java | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java index f5fb3722e..9cf295c5f 100644 --- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java +++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java @@ -6,20 +6,21 @@ public class WorkspaceElem extends DistParentElem { private String workspaceName; private String label; - /** - * Helper to display only version when the workspace name is well formatted - */ - private static String formatName(String name) { - if (name != null && name.lastIndexOf(VERSION_SEP) > 0) - return name.substring(name.lastIndexOf(VERSION_SEP) + 1); - else - return name; - } + // /** + // * Helper to display only version when the workspace name is well + // formatted + // */ + // private static String formatName(String name) { + // if (name != null && name.lastIndexOf(VERSION_SEP) > 0) + // return name.substring(name.lastIndexOf(VERSION_SEP) + 1); + // else + // return name; + // } public WorkspaceElem(RepoElem repoElem, String workspaceName) { this.repoElem = repoElem; this.workspaceName = workspaceName; - this.label = formatName(workspaceName); + this.label = workspaceName; // formatName(workspaceName); } public String getWorkspaceName() { diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java index 84d00e673..466148798 100644 --- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java +++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java @@ -224,7 +224,7 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames params.put(Fetch.PARAM_TARGET_REPO_PATH, targetRepoPath); CommandHelpers.refreshParameterizedCommand(menuManager, window, Fetch.ID, Fetch.DEFAULT_LABEL, Fetch.DEFAULT_ICON_PATH, - isRepoElem && singleElement && !isReadOnly, params); + isRepoElem && isHomeRepo && singleElement && !isReadOnly, params); // Normalize workspace params = new HashMap(); -- 2.39.2