+

git-svn-id: https://svn.argeo.org/slc/trunk@5848 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java
index a830c9b96e4e2e6c97e24bf98ce4dc584582e949..152e15c6e89bdf4f40cc44a1664d4a701b2ae0f2 100644 (file)
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java
@@ -32,8 +32,6 @@ import javax.jcr.observation.Event;
 import javax.jcr.observation.EventListener;\r
 import javax.jcr.observation.ObservationManager;\r
 \r
-import org.apache.commons.logging.Log;\r
-import org.apache.commons.logging.LogFactory;\r
 import org.argeo.ArgeoException;\r
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;\r
 import org.argeo.eclipse.ui.utils.CommandUtils;\r
@@ -103,7 +101,8 @@ import org.eclipse.ui.part.ViewPart;
 public class JcrResultTreeView extends ViewPart {\r
        public final static String ID = ClientUiPlugin.ID + ".jcrResultTreeView";\r
 \r
-       private final static Log log = LogFactory.getLog(JcrResultTreeView.class);\r
+       // private final static Log log =\r
+       // LogFactory.getLog(JcrResultTreeView.class);\r
 \r
        /* DEPENDENCY INJECTION */\r
        private Session session;\r
@@ -619,7 +618,9 @@ public class JcrResultTreeView extends ViewPart {
                                        if (isResultFolder) {\r
                                                source = ((ParentNodeFolder) lastSelectedSourceElement)\r
                                                                .getNode();\r
-                                               if (tpNode.getPath().startsWith(source.getPath()))\r
+                                               if (tpNode.getPath().startsWith(source.getPath())\r
+                                                               || source.getParent().getPath()\r
+                                                                               .equals(tpNode.getPath()))\r
                                                        doit = false;\r
                                        } else if (lastSelectedSourceElement instanceof SingleResultNode) {\r
                                                source = ((SingleResultNode) lastSelectedSourceElement)\r

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 f83b77b17ce332ae2e2df08a34b54415616082f5..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
@@ -91,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
@@ -124,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 "
@@ -223,4 +223,4 @@ public class ConfirmOverwriteWizard extends Wizard {
                        }
                }
        }
-}
+}
\ No newline at end of file