From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 26 Jan 2014 12:22:42 +0000 (+0000)
Subject: Make distribution browser more robust
X-Git-Tag: argeo-slc-2.1.7~265
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=inline;h=dad892d8383b3d5ade11cbda5ee7b41354165076;p=gpl%2Fargeo-slc.git

Make distribution browser more robust

git-svn-id: https://svn.argeo.org/slc/trunk@6766 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/DistParentElem.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/DistParentElem.java
index 8b1f045d3..3d7cef270 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/DistParentElem.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/DistParentElem.java
@@ -2,6 +2,8 @@ package org.argeo.slc.client.ui.dist.model;
 
 /** Common super class for all dist tree elements */
 public abstract class DistParentElem {
+	public final static Character VERSION_SEP = '-';
+
 	private boolean inHome = false;
 	private boolean isReadOnly = false;
 
diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/GroupElem.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/GroupElem.java
index ca7213a27..bc5e94e77 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/GroupElem.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/GroupElem.java
@@ -60,7 +60,7 @@ public class GroupElem extends DistParentElem {
 				// filter technical workspaces
 				if (workspaceName.startsWith(name)
 						&& workspaceName.substring(0,
-								workspaceName.indexOf("-")).equals(name)) {
+								workspaceName.lastIndexOf(VERSION_SEP)).equals(name)) {
 					distributionElems.add(new WorkspaceElem(repoElem,
 							workspaceName));
 				}
diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/RepoElem.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/RepoElem.java
index 6fdde8af2..7d584f787 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/RepoElem.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/RepoElem.java
@@ -144,9 +144,9 @@ public class RepoElem extends DistParentElem {
 
 				// filter technical workspaces
 				// FIXME: rely on a more robust rule than just wksp name
-				if (workspaceName.lastIndexOf('-') > 0) {
+				if (workspaceName.lastIndexOf(VERSION_SEP) > 0) {
 					String prefix = workspaceName.substring(0,
-							workspaceName.lastIndexOf('-'));
+							workspaceName.lastIndexOf(VERSION_SEP));
 					if (!children.containsKey(prefix)) {
 						children.put(prefix, new GroupElem(RepoElem.this,
 								prefix));
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 5c5181d77..f5fb3722e 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
@@ -10,8 +10,8 @@ public class WorkspaceElem extends DistParentElem {
 	 * Helper to display only version when the workspace name is well formatted
 	 */
 	private static String formatName(String name) {
-		if (name != null && name.lastIndexOf('-') > 0)
-			return name.substring(name.lastIndexOf('-') + 1);
+		if (name != null && name.lastIndexOf(VERSION_SEP) > 0)
+			return name.substring(name.lastIndexOf(VERSION_SEP) + 1);
 		else
 			return name;
 	}