From 2628d99c24618748fac1a627a9715bf8b0dc7b14 Mon Sep 17 00:00:00 2001 From: "n.hoffmann" Date: Fri, 11 Mar 2011 17:26:46 +0000 Subject: [PATCH] There now exists a dummy delete entry in the bulk editors context menu. It is also possible to select more than one item in descriptive and media view. --- .gitattributes | 1 - taxeditor-bulkeditor/plugin.xml | 31 ++---------- .../taxeditor/bulkeditor/BulkEditor.java | 3 -- .../bulkeditor/handler/DeleteHandler.java | 4 +- .../ShowReferencingObjectsHandler.java | 48 ------------------- taxeditor-editor/plugin.xml | 30 +++++++----- .../view/descriptive/DescriptiveViewPart.java | 3 +- .../MoveDescriptionElementsHandler.java | 2 +- .../editor/view/media/MediaViewPart.java | 3 +- .../taxeditor/navigation/NavigationUtil.java | 2 +- .../navigator/handler/EditHandler.java | 2 +- 11 files changed, 32 insertions(+), 97 deletions(-) delete mode 100644 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ShowReferencingObjectsHandler.java diff --git a/.gitattributes b/.gitattributes index 5d3a0dd98..3eecc7c15 100644 --- a/.gitattributes +++ b/.gitattributes @@ -100,7 +100,6 @@ taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/Rem taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/SetMarkerFlagHandler.java -text taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/SetMergeCandidateHandler.java -text taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/SetMergeTargetHandler.java -text -taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ShowReferencingObjectsHandler.java -text taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java -text taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java -text taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java -text diff --git a/taxeditor-bulkeditor/plugin.xml b/taxeditor-bulkeditor/plugin.xml index 21004cd3d..45d1fd3fd 100644 --- a/taxeditor-bulkeditor/plugin.xml +++ b/taxeditor-bulkeditor/plugin.xml @@ -66,24 +66,6 @@ name="taxeditor-bulkeditor.separator1" visible="true"> - - - - - - - - - - - - + variable="selection"> + + diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java index 3f543dcbd..77869dfcd 100644 --- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java +++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java @@ -298,8 +298,5 @@ public class BulkEditor extends AnnotatedLineEditor implements IPartContentHasDe menu.remove(ITextEditorActionConstants.SHIFT_RIGHT); menu.remove(ITextEditorActionConstants.SHIFT_LEFT); menu.remove(ITextEditorActionConstants.CONTEXT_PREFERENCES); - - IMenuManager showInMenu = menu.findMenuUsingPath("viewsShowIn"); - System.out.println(showInMenu); } } diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java index 443359284..560b9dfc1 100644 --- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java +++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java @@ -14,6 +14,8 @@ import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; +import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; + /** * @author n.hoffmann * @created Mar 11, 2011 @@ -26,7 +28,7 @@ public class DeleteHandler extends AbstractHandler { */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { - // TODO Auto-generated method stub + BulkEditorUtil.warningDialog("Not implemented yet", getClass(), "Delete was not implemented yet."); return null; } diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ShowReferencingObjectsHandler.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ShowReferencingObjectsHandler.java deleted file mode 100644 index 43d612fec..000000000 --- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ShowReferencingObjectsHandler.java +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ - -package eu.etaxonomy.taxeditor.bulkeditor.handler; - -import org.apache.log4j.Logger; -import org.eclipse.core.commands.AbstractHandler; -import org.eclipse.core.commands.ExecutionEvent; -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.handlers.HandlerUtil; - -import eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.ReferencingObjectsView; - -/** - *

ShowReferencingObjectsHandler class.

- * - * @author p.ciardelli - * @created 08.07.2009 - * @version 1.0 - */ -public class ShowReferencingObjectsHandler extends AbstractHandler { - private static final Logger logger = Logger - .getLogger(ShowReferencingObjectsHandler.class); - - /* (non-Javadoc) - * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ - /** {@inheritDoc} */ - public Object execute(ExecutionEvent event) throws ExecutionException { - try { - ReferencingObjectsView view = (ReferencingObjectsView) HandlerUtil.getActiveWorkbenchWindow(event).getActivePage(). - showView(ReferencingObjectsView.ID); -// view.updateReferencingObjects(); - } catch (PartInitException e) { - logger.error("PartInitException when updating referncing objects view", e); - } - return null; - } - -} diff --git a/taxeditor-editor/plugin.xml b/taxeditor-editor/plugin.xml index 4f506c9cd..bfbd8d93e 100644 --- a/taxeditor-editor/plugin.xml +++ b/taxeditor-editor/plugin.xml @@ -536,23 +536,29 @@ class="eu.etaxonomy.taxeditor.editor.name.handler.DeleteTaxonBaseHandler" commandId="org.eclipse.ui.edit.delete"> - - - - + + + + + + + + - - - - + + + + + +