Migrate SLC modules

[gpl/argeo-slc.git] / plugins / org.argeo.slc.client.ui / src / main / java / org / argeo / slc / client / ui / wizards / ConfirmOverwriteWizard.java

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/wizards/ConfirmOverwriteWizard.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/wizards/ConfirmOverwriteWizard.java
index 4c812770e35cb92ee1b8918bdf814d36070d2916..3fa15f9bfb10d32770269c7fd86d6a51a9cc35ae 100644 (file)
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/wizards/ConfirmOverwriteWizard.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/wizards/ConfirmOverwriteWizard.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.slc.client.ui.wizards;
 
 import javax.jcr.Node;
@@ -76,8 +91,8 @@ public class ConfirmOverwriteWizard extends Wizard {
                        if (overwriteBtn.getSelection())
                                doFinish = MessageDialog.openConfirm(Display.getDefault()
                                                .getActiveShell(), "CAUTION", "All data contained in ["
-                                               + (parentRelPath !=null?parentRelPath:"")
-                                               + sourceNodeName
+                                               + (parentRelPath != null ? parentRelPath : "")
+                                               + "/"+ sourceNodeName
                                                + "] are about to be definitively destroyed. \n "
                                                + "Are you sure you want to proceed ?");
                        else
@@ -109,7 +124,7 @@ public class ConfirmOverwriteWizard extends Wizard {
                                if (relPath.startsWith(basePath))
                                        relPath = relPath.substring(basePath.length());
                                // FIXME currently add the default base label
-                               parentRelPath = SlcUiConstants.DEFAULT_MY_RESULTS_FOLDER_LABEL + "/"
+                               parentRelPath = SlcUiConstants.DEFAULT_MY_RESULTS_FOLDER_LABEL
                                                + relPath;
                        } catch (RepositoryException e) {
                                throw new SlcException("Unexpected error while defining "
@@ -208,4 +223,4 @@ public class ConfirmOverwriteWizard extends Wizard {
                        }
                }
        }
-}
+}
\ No newline at end of file