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%2FMergeWorkspaces.java;h=5fd8fcaf1774a55445b47fdcb19a95cd2f436e2b;hb=48b6f7647f12f4b96d1914bcafc95efd7f43cc43;hp=cd535dd6912d40fda3475b9413c82f9200ba5c06;hpb=0d236262a853a1286b317c30d64d4692bc21c7a4;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/MergeWorkspaces.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
index cd535dd69..5fd8fcaf1 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
@@ -45,12 +45,12 @@ import org.eclipse.core.runtime.jobs.Job;
 /**
  * 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 DEFAULT_LABEL = "Merge";
+
 	public final static String PARAM_SOURCE_WORKSPACE_NAME = "srcWkspName";
 	public final static String PARAM_SOURCE_REPO_PATH = "srcRepoPath";
 	public final static String PARAM_TARGET_WORKSPACE_NAME = "targetWkspName";
@@ -62,7 +62,6 @@ public class MergeWorkspaces extends AbstractHandler {
 	private Repository nodeRepository;
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
-
 		String targetRepoPath = event.getParameter(PARAM_TARGET_REPO_PATH);
 		String targetWkspName = event.getParameter(PARAM_TARGET_WORKSPACE_NAME);
 		String sourceRepoPath = event.getParameter(PARAM_SOURCE_REPO_PATH);