X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fworkbench%2Finternal%2Fjcr%2Fcommands%2FRenameNode.java;h=7f4b554181c459300d0e2197d0aab44eb772b041;hb=5b444174cd13680f99944026877f6cac2e1faba1;hp=fefc551cf8b5975a88c43fb606097d4e343e9291;hpb=23b7a170cae60b500e9d45551f26b5075eba73a4;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/RenameNode.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/RenameNode.java index fefc551cf..7f4b55418 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/RenameNode.java +++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/RenameNode.java @@ -21,8 +21,8 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import javax.jcr.Session; +import org.argeo.cms.ui.jcr.model.SingleJcrNodeElem; import org.argeo.cms.ui.workbench.WorkbenchUiPlugin; -import org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem; import org.argeo.cms.ui.workbench.jcr.JcrBrowserView; import org.argeo.eclipse.ui.EclipseUiException; import org.argeo.eclipse.ui.dialogs.SingleValue; @@ -36,8 +36,8 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.handlers.HandlerUtil; /** - * Canonically call JCR {@link Session#move(String, String)} on the first - * element returned by {@link HandlerUtil#getActiveWorkbenchWindow()} + * Canonically call JCR Session#move(String, String) on the first element + * returned by HandlerUtil#getActiveWorkbenchWindow() * (...getActivePage().getSelection()), if it is a {@link SingleJcrNodeElem}. * The user must then fill a new name in and confirm */ @@ -45,8 +45,7 @@ public class RenameNode extends AbstractHandler { public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".renameNode"; public Object execute(ExecutionEvent event) throws ExecutionException { - IWorkbenchPage iwp = HandlerUtil.getActiveWorkbenchWindow(event) - .getActivePage(); + IWorkbenchPage iwp = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage(); ISelection selection = iwp.getSelection(); if (selection == null || !(selection instanceof IStructuredSelection)) @@ -63,25 +62,22 @@ public class RenameNode extends AbstractHandler { String oldPath = null; try { newName = SingleValue.ask("New node name", - "Please provide a new name for [" + node.getName() - + "]"); + "Please provide a new name for [" + node.getName() + "]"); // TODO sanity check and user feedback newName = JcrUtils.replaceInvalidChars(newName); oldPath = node.getPath(); session = node.getSession(); - session.move(oldPath, JcrUtils.parentPath(oldPath) + "/" - + newName); + session.move(oldPath, JcrUtils.parentPath(oldPath) + "/" + newName); session.save(); // Manually refresh the browser view. Must be enhanced if (iwp.getActivePart() instanceof JcrBrowserView) ((JcrBrowserView) iwp.getActivePart()).refresh(sjn); } catch (RepositoryException e) { - throw new EclipseUiException("Unable to rename " + node - + " to " + newName, e); + throw new EclipseUiException("Unable to rename " + node + " to " + newName, e); } } } return null; } -} \ No newline at end of file +}