+ clean repo model

[gpl/argeo-slc.git] / plugins / org.argeo.slc.client.ui.dist / src / main / java / org / argeo / slc / client / ui / dist / controllers / DistTreeDoubleClickListener.java

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeDoubleClickListener.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeDoubleClickListener.java
index 6e8d53734ce0b3ec64a58b47b3df83e805bad441..c280a53e00f8b78d23d4032f2ba99e2dbbbfe999 100644 (file)
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeDoubleClickListener.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeDoubleClickListener.java
@@ -8,7 +8,9 @@ import javax.jcr.RepositoryException;
 
 import org.argeo.eclipse.ui.utils.CommandUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.client.ui.dist.commands.OpenModuleEditor;
 import org.argeo.slc.client.ui.dist.commands.OpenWorkspaceEditor;
+import org.argeo.slc.client.ui.dist.model.ModularDistVersionElem;
 import org.argeo.slc.client.ui.dist.model.RepoElem;
 import org.argeo.slc.client.ui.dist.model.WorkspaceElem;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -38,33 +40,36 @@ public class DistTreeDoubleClickListener implements IDoubleClickListener {
                                treeViewer.refresh(obj);
                        }
                } else if (obj instanceof WorkspaceElem) {
-                       WorkspaceElem wn = (WorkspaceElem) obj;
-                       if (!wn.isConnected())
-                               wn.login();
-                       else {
-                               WorkspaceElem we = (WorkspaceElem) obj;
+                       WorkspaceElem we = (WorkspaceElem) obj;
+                       RepoElem repoElem = we.getRepoElem();
+                       Map<String, String> params = new HashMap<String, String>();
+                       params.put(OpenWorkspaceEditor.PARAM_REPO_NODE_PATH,
+                                       repoElem.getRepoNodePath());
+                       params.put(OpenWorkspaceEditor.PARAM_REPO_URI, repoElem.getUri());
+                       params.put(OpenWorkspaceEditor.PARAM_WORKSPACE_NAME,
+                                       we.getWorkspaceName());
+                       CommandUtils.callCommand(OpenWorkspaceEditor.ID, params);
 
-                               try {
-                                       RepoElem repoElem = we.getRepoElem();
-                                       Map<String, String> params = new HashMap<String, String>();
-
-                                       Node repoNode = repoElem.getRepoNode();
-                                       if (repoNode != null)
-                                               params.put(OpenWorkspaceEditor.PARAM_REPO_NODE_PATH,
-                                                               repoNode.getPath());
-                                       params.put(OpenWorkspaceEditor.PARAM_REPO_URI,
-                                                       repoElem.getUri());
-                                       params.put(OpenWorkspaceEditor.PARAM_WORKSPACE_NAME,
-                                                       we.getWorkspaceName());
-                                       CommandUtils.callCommand(OpenWorkspaceEditor.ID, params);
-                               } catch (RepositoryException re) {
-                                       throw new SlcException(
-                                                       "Cannot get path for node while "
-                                                                       + "setting parameters of command OpenWorkspaceEditor",
-                                                       re);
-                               }
+               } else if (obj instanceof ModularDistVersionElem) {
+                       ModularDistVersionElem modDistElem = (ModularDistVersionElem) obj;
+                       WorkspaceElem wkspElem = modDistElem.getWorkspaceElem();
+                       Node moduleNode = modDistElem.getModularDistVersionNode();
+                       RepoElem repoElem = wkspElem.getRepoElem();
+                       Map<String, String> params = new HashMap<String, String>();
+                       params.put(OpenModuleEditor.PARAM_REPO_NODE_PATH,
+                                       repoElem.getRepoNodePath());
+                       params.put(OpenModuleEditor.PARAM_REPO_URI, repoElem.getUri());
+                       params.put(OpenModuleEditor.PARAM_WORKSPACE_NAME,
+                                       wkspElem.getWorkspaceName());
+                       try {
+                               params.put(OpenModuleEditor.PARAM_MODULE_PATH,
+                                               moduleNode.getPath());
+                       } catch (RepositoryException re) {
+                               throw new SlcException("Cannot get path for node " + moduleNode
+                                               + " while setting parameters for "
+                                               + "command OpenModuleEditor", re);
                        }
-                       treeViewer.refresh(obj);
+                       CommandUtils.callCommand(OpenModuleEditor.ID, params);
                }
        }
 }
\ No newline at end of file