Adapt after ui.dist after Argeo Commons upgrade. Build but do not start correctly.

[gpl/argeo-slc.git] / org.argeo.slc.client.ui.dist / src / org / argeo / slc / client / ui / dist / commands / MergeWorkspaces.java

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
index 5fd8fcaf1774a55445b47fdcb19a95cd2f436e2b..e3190072648437086e0e3a1e53288abc00283ecb 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
@@ -42,13 +42,11 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 
-/**
- * Merge two workspaces
- */
+/** Merge two workspaces */
 public class MergeWorkspaces extends AbstractHandler {
        private final static Log log = LogFactory.getLog(MergeWorkspaces.class);
 
-       public final static String ID = DistPlugin.ID + ".mergeWorkspaces";
+       public final static String ID = DistPlugin.PLUGIN_ID + ".mergeWorkspaces";
        public final static String DEFAULT_LABEL = "Merge";
 
        public final static String PARAM_SOURCE_WORKSPACE_NAME = "srcWkspName";
@@ -168,8 +166,8 @@ public class MergeWorkspaces extends AbstractHandler {
 
                                return Status.OK_STATUS;
                        } catch (RepositoryException e) {
-                               return new Status(IStatus.ERROR, DistPlugin.ID, "Cannot merge",
-                                               e);
+                               return new Status(IStatus.ERROR, DistPlugin.PLUGIN_ID,
+                                               "Cannot merge", e);
                        } finally {
                                JcrUtils.logoutQuietly(sourceSession);
                                JcrUtils.logoutQuietly(targetSession);