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%2FOpenWorkspaceEditor.java;h=1a93fb0bb0a1a842e5ec41b99b034a6a3d81fa61;hb=48b6f7647f12f4b96d1914bcafc95efd7f43cc43;hp=c7734a8c47f260e81106754f98840d7f8ea8a09a;hpb=702f1e0c7d73edeb739dd62cd4248f489e1420b7;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/OpenWorkspaceEditor.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/OpenWorkspaceEditor.java index c7734a8c4..1a93fb0bb 100644 --- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/OpenWorkspaceEditor.java +++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/OpenWorkspaceEditor.java @@ -24,8 +24,8 @@ 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.DistributionWorkspaceEditor; -import org.argeo.slc.client.ui.dist.editors.WorkspaceEditorInput; +import org.argeo.slc.client.ui.dist.editors.DistWorkspaceEditor; +import org.argeo.slc.client.ui.dist.editors.DistWkspEditorInput; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -61,7 +61,6 @@ public class OpenWorkspaceEditor extends AbstractHandler { Session defaultSession = null; if (repoNodePath != null && repoUri == null) { try { - defaultSession = localRepository.login(); if (defaultSession.nodeExists(repoNodePath)) { Node repoNode = defaultSession.getNode(repoNodePath); @@ -70,18 +69,18 @@ public class OpenWorkspaceEditor extends AbstractHandler { } } catch (RepositoryException e) { throw new SlcException("Unexpected error while " - + "getting repoNode info for repoNode at path " + + "getting repoNode at path " + repoNodePath, e); } finally { JcrUtils.logoutQuietly(defaultSession); } } - WorkspaceEditorInput wei = new WorkspaceEditorInput(repoNodePath, + DistWkspEditorInput wei = new DistWkspEditorInput(repoNodePath, repoUri, workspaceName); try { HandlerUtil.getActiveWorkbenchWindow(event).getActivePage() - .openEditor(wei, DistributionWorkspaceEditor.ID); + .openEditor(wei, DistWorkspaceEditor.ID); } catch (PartInitException e) { throw new SlcException("Unexpected error while " + "opening editor for workspace " + workspaceName