X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui.dist%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fcommands%2FOpenModuleEditor.java;h=85d047a95d5d18dd394042af1afaedf2606daf71;hb=524221f25edad4b09aac22555450164e587b304a;hp=26d32e70692e31e02eff11418d8376efa29d91e5;hpb=2ecb1e7ce15a25ba8026b5ded625f36c1be467bd;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/OpenModuleEditor.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/OpenModuleEditor.java
index 26d32e706..85d047a95 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/OpenModuleEditor.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/OpenModuleEditor.java
@@ -25,9 +25,9 @@ import org.argeo.jcr.ArgeoNames;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
-import org.argeo.slc.client.ui.dist.editors.ArtifactEditor;
+import org.argeo.slc.client.ui.dist.editors.ArtifactVersionEditor;
+import org.argeo.slc.client.ui.dist.editors.ModularDistVersionEditor;
 import org.argeo.slc.client.ui.dist.editors.ModuleEditorInput;
-import org.argeo.slc.client.ui.dist.editors.DistributionEditor;
 import org.argeo.slc.jcr.SlcTypes;
 import org.argeo.slc.repo.RepoUtils;
 import org.argeo.util.security.Keyring;
@@ -53,7 +53,7 @@ public class OpenModuleEditor extends AbstractHandler {
 	// relevant repository
 	public final static String PARAM_REPO_URI = "param.repoUri";
 	public final static String PARAM_WORKSPACE_NAME = "param.workspaceName";
-	public final static String PARAM_ARTIFACT_PATH = "param.artifactPath";
+	public final static String PARAM_MODULE_PATH = "param.modulePath";
 
 	/* DEPENDENCY INJECTION */
 	private Repository localRepository;
@@ -66,47 +66,45 @@ public class OpenModuleEditor extends AbstractHandler {
 		String repoNodePath = event.getParameter(PARAM_REPO_NODE_PATH);
 		String repoUri = event.getParameter(PARAM_REPO_URI);
 		String workspaceName = event.getParameter(PARAM_WORKSPACE_NAME);
-		String artifactPath = event.getParameter(PARAM_ARTIFACT_PATH);
+		String modulePath = event.getParameter(PARAM_MODULE_PATH);
 
 		Session localSession = null;
 		Session businessSession = null;
 		Node repoNode = null;
 
 		try {
-			if (repoNodePath != null && repoUri == null) {
-				try {
-					localSession = localRepository.login();
-					if (repoNodePath != null
-							&& localSession.nodeExists(repoNodePath))
-						repoNode = localSession.getNode(repoNodePath);
-
-					businessSession = RepoUtils.getCorrespondingSession(
-							repositoryFactory, keyring, repoNode, repoUri,
-							workspaceName);
+			try {
+				localSession = localRepository.login();
+				if (repoNodePath != null
+						&& localSession.nodeExists(repoNodePath))
+					repoNode = localSession.getNode(repoNodePath);
+
+				businessSession = RepoUtils.getCorrespondingSession(
+						repositoryFactory, keyring, repoNode, repoUri,
+						workspaceName);
+				if (repoUri == null && repoNode != null)
 					repoUri = repoNode.getProperty(ArgeoNames.ARGEO_URI)
 							.getString();
 
-				} catch (RepositoryException e) {
-					throw new SlcException("Cannot log to workspace "
-							+ workspaceName + " for repo defined in "
-							+ repoNodePath, e);
-				} finally {
-					JcrUtils.logoutQuietly(localSession);
-				}
-
+			} catch (RepositoryException e) {
+				throw new SlcException("Cannot log to workspace "
+						+ workspaceName + " for repo defined in "
+						+ repoNodePath, e);
+			} finally {
+				JcrUtils.logoutQuietly(localSession);
 			}
 
 			ModuleEditorInput wei = new ModuleEditorInput(repoNodePath,
-					repoUri, workspaceName, artifactPath);
-			Node artifact = businessSession.getNode(artifactPath);
+					repoUri, workspaceName, modulePath);
+			Node artifact = businessSession.getNode(modulePath);
 
 			// Choose correct editor based on the artifact mixin
 			if (artifact.isNodeType(SlcTypes.SLC_MODULAR_DISTRIBUTION))
 				HandlerUtil.getActiveWorkbenchWindow(event).getActivePage()
-						.openEditor(wei, DistributionEditor.ID);
+						.openEditor(wei, ModularDistVersionEditor.ID);
 			else
 				HandlerUtil.getActiveWorkbenchWindow(event).getActivePage()
-						.openEditor(wei, ArtifactEditor.ID);
+						.openEditor(wei, ArtifactVersionEditor.ID);
 		} catch (RepositoryException e) {
 			throw new SlcException("Unexpected error while "
 					+ "getting repoNode info for repoNode at path "
@@ -116,6 +114,8 @@ public class OpenModuleEditor extends AbstractHandler {
 					+ "opening editor for workspace " + workspaceName
 					+ " with URI " + repoUri + " and repoNode at path "
 					+ repoNodePath, e);
+		} finally {
+			JcrUtils.logoutQuietly(businessSession);
 		}
 		return null;
 	}