X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Forg.argeo.slc.client.ui.dist%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fmodel%2FWorkspaceElem.java;h=5c5181d7797cff07e176cb37664b71d5e0056f79;hb=0d236262a853a1286b317c30d64d4692bc21c7a4;hp=e4562ee71154ebb505a138b8da976762b2942d2d;hpb=dc95cc0fdc36c88e778cdfd52d443d0a0b8d926c;p=gpl%2Fargeo-slc.git

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 e4562ee71..5c5181d77 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
@@ -1,70 +1,49 @@
 package org.argeo.slc.client.ui.dist.model;
 
-import javax.jcr.Credentials;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-
-import org.argeo.eclipse.ui.TreeParent;
-import org.argeo.jcr.JcrUtils;
-import org.argeo.slc.SlcException;
-
 /** Abstracts a workspace that contains a given distribution */
-public class WorkspaceElem extends TreeParent {
+public class WorkspaceElem extends DistParentElem {
 	private final RepoElem repoElem;
-	private final Node workspaceNode;
+	private String workspaceName;
+	private String label;
 
 	/**
 	 * Helper to display only version when the workspace name is well formatted
 	 */
-	private static String formatName(Node workspaceNode) {
-		String name = JcrUtils.getNameQuietly(workspaceNode);
+	private static String formatName(String name) {
 		if (name != null && name.lastIndexOf('-') > 0)
 			return name.substring(name.lastIndexOf('-') + 1);
 		else
 			return name;
 	}
 
-	public WorkspaceElem(RepoElem repoElem, Node workspaceNode) {
-		super(formatName(workspaceNode));
+	public WorkspaceElem(RepoElem repoElem, String workspaceName) {
 		this.repoElem = repoElem;
-		this.workspaceNode = workspaceNode;
-	}
-
-	public Node getWorkspaceNode() {
-		return workspaceNode;
+		this.workspaceName = workspaceName;
+		this.label = formatName(workspaceName);
 	}
 
 	public String getWorkspaceName() {
-		return JcrUtils.getNameQuietly(workspaceNode);
+		return workspaceName;
 	}
 
-	public String getWorkspacePath() {
-		try {
-			return workspaceNode.getPath();
-		} catch (RepositoryException e) {
-			throw new SlcException("Cannot get or add workspace path "
-					+ getWorkspaceName(), e);
-		}
+	public RepoElem getRepoElem() {
+		return repoElem;
 	}
 
-	public String getRepoPath() {
-		try {
-			return workspaceNode.getParent().getPath();
-		} catch (RepositoryException e) {
-			throw new SlcException("Cannot get or add workspace path "
-					+ getWorkspaceName(), e);
-		}
+	public boolean isReadOnly() {
+		return repoElem.isReadOnly();
 	}
 
-	public RepoElem getRepoElem() {
-		return repoElem;
+	public boolean hasChildren() {
+		return false;
 	}
 
-	public Credentials getCredentials() {
-		return repoElem.getCredentials();
+	public Object[] getChildren() {
+		return null;
 	}
 
-	public boolean isReadOnly() {
-		return repoElem.isReadOnly();
+	@Override
+	public String getLabel() {
+		return label;
 	}
 }