From 45e12d2b2b62fb1e1376ff66289c0eb499b9f6d1 Mon Sep 17 00:00:00 2001 From: Patric Plitzner Date: Mon, 23 Feb 2015 17:21:28 +0000 Subject: [PATCH] - added Open in Taxon Editor command to Taxon Bulk Editor (#4536) --- .gitattributes | 1 - eu.etaxonomy.taxeditor.bulkeditor/plugin.xml | 35 ++++++++---- .../taxeditor/bulkeditor/PropertyTester.java | 23 -------- .../command/BulkEditorPropertyTester.java | 55 +++++++++---------- .../navigator/handler/EditHandler.java | 6 +- 5 files changed, 53 insertions(+), 67 deletions(-) delete mode 100644 eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/PropertyTester.java diff --git a/.gitattributes b/.gitattributes index 0d1701f00..7530a1c50 100644 --- a/.gitattributes +++ b/.gitattributes @@ -82,7 +82,6 @@ eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkedito eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorViewerConfiguration.java -text eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/IBulkEditorConstants.java -text eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/IBulkEditorSortProvider.java -text -eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/PropertyTester.java -text eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/BulkEditorPropertyTester.java -text eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DeleteObjectContributionItem.java -text eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicMarkerTypeEditingMenu.java -text diff --git a/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml b/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml index fc783f268..1d9437f8b 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml +++ b/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml @@ -82,6 +82,20 @@ + + + + + + + + + name="eu.etaxonomy.taxeditor.bulkeditor.separator1"> + + + + + + @@ -313,14 +335,7 @@ class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorPropertyTester" id="taxeditor-bulkeditor.PropertyTester" namespace="taxeditor-bulkeditor.propertyTester" - properties="isMergingEnabled" - type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor"> - - diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/PropertyTester.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/PropertyTester.java deleted file mode 100644 index fe5333c19..000000000 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/PropertyTester.java +++ /dev/null @@ -1,23 +0,0 @@ - -package eu.etaxonomy.taxeditor.bulkeditor; - -import eu.etaxonomy.taxeditor.bulkeditor.input.OccurrenceEditorInput; - -public class PropertyTester extends org.eclipse.core.expressions.PropertyTester { - - public static final String IS_DERIVED_UNIT_EDITOR = "isDerivedUnitEditor"; - - @Override - public boolean test(Object receiver, String property, Object[] args, - Object expectedValue) { - - BulkEditor editor = (BulkEditor) receiver; - - if(IS_DERIVED_UNIT_EDITOR.equals(property)){ - return editor.getEditorInput() instanceof OccurrenceEditorInput; - } - - return false; - } - -} diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/BulkEditorPropertyTester.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/BulkEditorPropertyTester.java index acc7a08c9..0d3efd55b 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/BulkEditorPropertyTester.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/BulkEditorPropertyTester.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* 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. */ @@ -12,16 +12,13 @@ package eu.etaxonomy.taxeditor.bulkeditor.command; import org.apache.log4j.Logger; import org.eclipse.core.expressions.PropertyTester; -import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IEditorInput; -import eu.etaxonomy.cdm.model.common.Group; -import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor; import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput; import eu.etaxonomy.taxeditor.bulkeditor.input.GroupEditorInput; import eu.etaxonomy.taxeditor.bulkeditor.input.OccurrenceEditorInput; -import eu.etaxonomy.taxeditor.ui.section.description.DerivedUnitElement; +import eu.etaxonomy.taxeditor.bulkeditor.input.TaxonEditorInput; /** *

BulkEditorPropertyTester class.

@@ -31,33 +28,41 @@ import eu.etaxonomy.taxeditor.ui.section.description.DerivedUnitElement; * @version 1.0 */ public class BulkEditorPropertyTester extends PropertyTester { - private static final Logger logger = Logger + + @SuppressWarnings("unused") + private static final Logger logger = Logger .getLogger(BulkEditorPropertyTester.class); - private static final String GROUP = "isGroup"; - private static final String DERIVEDUNIT = "isDerivedUnit"; + private static final String IS_MERGING_ENABLED = "isMergingEnabled"; + + private static final String IS_GROUP_EDITOR = "isGroupEditor"; + public static final String IS_DERIVED_UNIT_EDITOR = "isDerivedUnitEditor"; + public static final String IS_TAXON_EDITOR = "isTaxonEditor"; + /* (non-Javadoc) * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object) */ /** {@inheritDoc} */ - public boolean test(Object receiver, String property, Object[] args, + @Override + public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { BulkEditor bulkEditor = (BulkEditor) receiver; - - if ("isMergingEnabled".equals(property)) { + + if (IS_MERGING_ENABLED.equals(property)) { IEditorInput input = bulkEditor.getEditorInput(); if (input instanceof AbstractBulkEditorInput) { - return ((AbstractBulkEditorInput) input).isMergingEnabled(); - } + return ((AbstractBulkEditorInput) input).isMergingEnabled(); + } } - if(GROUP.equals(property)){ - return isGroup(bulkEditor); + else if(IS_GROUP_EDITOR.equals(property)){ + return bulkEditor.getEditorInput() instanceof GroupEditorInput; } - - if (DERIVEDUNIT.equals(property)){ - - return isDerivedUnit(bulkEditor); + else if (IS_DERIVED_UNIT_EDITOR.equals(property)){ + return bulkEditor.getEditorInput() instanceof OccurrenceEditorInput; } + else if(IS_TAXON_EDITOR.equals(property)){ + return bulkEditor.getEditorInput() instanceof TaxonEditorInput; + } // if (("isPublishFlagEditingEnabled").equals(property)) { // IEditorInput input = bulkEditor.getEditorInput(); // if (input instanceof NameEditorInput) { @@ -66,14 +71,4 @@ public class BulkEditorPropertyTester extends PropertyTester { // } return false; } - - private boolean isDerivedUnit(BulkEditor bulkEditor) { - IEditorInput input = bulkEditor.getEditorInput(); - return (input instanceof OccurrenceEditorInput) ? true : false; - } - - private boolean isGroup(BulkEditor bulkEditor) { - IEditorInput input = bulkEditor.getEditorInput(); - return (input instanceof GroupEditorInput) ? true : false; - } } diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/EditHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/EditHandler.java index 917f5f40d..e4876d35a 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/EditHandler.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/EditHandler.java @@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.handlers.HandlerUtil; @@ -46,8 +46,8 @@ public class EditHandler extends AbstractHandler implements IHandler{ ISelection selection = HandlerUtil.getCurrentSelection(event); - if(selection instanceof StructuredSelection){ - final StructuredSelection structuredSelection = (StructuredSelection) selection; + if(selection instanceof IStructuredSelection){ + final IStructuredSelection structuredSelection = (IStructuredSelection) selection; if(structuredSelection.size() == 1 && structuredSelection.getFirstElement() instanceof Classification){ Classification classification = (Classification) structuredSelection.getFirstElement(); -- 2.34.1