X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fplugins%2Forg.argeo.jcr.ui.explorer%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fui%2Fexplorer%2Fcommands%2FDeleteNodes.java;fp=server%2Fplugins%2Forg.argeo.jcr.ui.explorer%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fui%2Fexplorer%2Fcommands%2FDeleteNodes.java;h=26d4cdd4323f85ed7f58df47cf952f96d9169d97;hb=f53af8d52b0364ae25c2256b4772c08fe86f3340;hp=29760a2bf89e4e2fcf924293ecc47c9d1f8f1ef5;hpb=1b81872e22ed0a3c6aba96f55062b4916b2f9cb8;p=lgpl%2Fargeo-commons.git diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/DeleteNodes.java b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/DeleteNodes.java index 29760a2bf..26d4cdd43 100644 --- a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/DeleteNodes.java +++ b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/DeleteNodes.java @@ -23,8 +23,8 @@ import javax.jcr.RepositoryException; import org.argeo.ArgeoException; import org.argeo.eclipse.ui.ErrorFeedback; import org.argeo.eclipse.ui.TreeParent; -import org.argeo.jcr.ui.explorer.model.SingleJcrNode; -import org.argeo.jcr.ui.explorer.model.WorkspaceNode; +import org.argeo.jcr.ui.explorer.model.SingleJcrNodeElem; +import org.argeo.jcr.ui.explorer.model.WorkspaceElem; import org.argeo.jcr.ui.explorer.views.GenericJcrBrowser; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; @@ -58,7 +58,7 @@ public class DeleteNodes extends AbstractHandler { StringBuffer buf = new StringBuffer(""); Iterator lst = ((IStructuredSelection) selection).iterator(); while (lst.hasNext()) { - SingleJcrNode sjn = ((SingleJcrNode) lst.next()); + SingleJcrNodeElem sjn = ((SingleJcrNodeElem) lst.next()); buf.append(sjn.getName()).append(' '); } Boolean ok = MessageDialog.openConfirm( @@ -69,14 +69,14 @@ public class DeleteNodes extends AbstractHandler { if (ok) { Iterator it = ((IStructuredSelection) selection).iterator(); Object obj = null; - SingleJcrNode ancestor = null; - WorkspaceNode rootAncestor = null; + SingleJcrNodeElem ancestor = null; + WorkspaceElem rootAncestor = null; try { while (it.hasNext()) { obj = it.next(); - if (obj instanceof SingleJcrNode) { + if (obj instanceof SingleJcrNodeElem) { // Cache objects - SingleJcrNode sjn = (SingleJcrNode) obj; + SingleJcrNodeElem sjn = (SingleJcrNodeElem) obj; TreeParent tp = (TreeParent) sjn.getParent(); Node node = sjn.getNode(); @@ -87,10 +87,10 @@ public class DeleteNodes extends AbstractHandler { tp.removeChild(sjn); // Check if the parent is the root node - if (tp instanceof WorkspaceNode) - rootAncestor = (WorkspaceNode) tp; + if (tp instanceof WorkspaceElem) + rootAncestor = (WorkspaceElem) tp; else - ancestor = getOlder(ancestor, (SingleJcrNode) tp); + ancestor = getOlder(ancestor, (SingleJcrNodeElem) tp); } } if (rootAncestor != null) @@ -104,7 +104,7 @@ public class DeleteNodes extends AbstractHandler { return null; } - private SingleJcrNode getOlder(SingleJcrNode A, SingleJcrNode B) { + private SingleJcrNodeElem getOlder(SingleJcrNodeElem A, SingleJcrNodeElem B) { try { if (A == null) return B == null ? null : B;