From c38375d8a7783b64a260baf6a0eeff01ba423274 Mon Sep 17 00:00:00 2001 From: "n.hoffmann" Date: Wed, 22 Jun 2011 15:46:38 +0000 Subject: [PATCH] Fixes #2418 --- .gitattributes | 2 +- .../taxeditor/bulkeditor/BulkEditorUtil.java | 3 +- .../command/DeleteObjectContributionItem.java | 2 +- .../OpenBulkEditorContributionItem.java | 19 ++- .../handler/OpenBulkEditorHandler.java | 2 +- .../input/AbstractBulkEditorInput.java | 1 - .../bulkeditor/input/AgentEditorInput.java | 1 - .../bulkeditor/input/BulkEditorInputType.java | 134 ++++++++++++++++ .../input/BulkEditorInputTypeValues.java | 150 ------------------ .../bulkeditor/input/GroupEditorInput.java | 1 - .../bulkeditor/input/NameEditorInput.java | 1 - .../input/NameRelationshipEditorInput.java | 4 - .../input/OccurrenceEditorInput.java | 1 - .../input/ReferenceEditorInput.java | 2 - .../bulkeditor/input/UserEditorInput.java | 1 - 15 files changed, 150 insertions(+), 174 deletions(-) create mode 100644 eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/BulkEditorInputType.java delete mode 100644 eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/BulkEditorInputTypeValues.java diff --git a/.gitattributes b/.gitattributes index f223383e6..ca26dc66c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -84,7 +84,7 @@ eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkedito eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/SetMergeTargetHandler.java -text eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java -text eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java -text -eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/BulkEditorInputTypeValues.java -text +eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/BulkEditorInputType.java -text eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java -text eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java -text eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameRelationshipEditorInput.java -text diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorUtil.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorUtil.java index ae8de5aec..e6bc27539 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorUtil.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorUtil.java @@ -10,7 +10,6 @@ package eu.etaxonomy.taxeditor.bulkeditor; -import org.apache.log4j.Logger; import org.eclipse.core.commands.operations.IOperationHistory; import org.eclipse.core.commands.operations.IUndoContext; import org.eclipse.core.runtime.Assert; @@ -20,7 +19,7 @@ import org.eclipse.ui.PartInitException; import eu.etaxonomy.cdm.model.common.IdentifiableEntity; import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput; -import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues.BulkEditorInputType; +import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputType; import eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin; import eu.etaxonomy.taxeditor.model.AbstractUtility; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DeleteObjectContributionItem.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DeleteObjectContributionItem.java index 8f28e048f..799368a8a 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DeleteObjectContributionItem.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DeleteObjectContributionItem.java @@ -21,7 +21,7 @@ import org.eclipse.ui.menus.CommandContributionItem; import org.eclipse.ui.menus.CommandContributionItemParameter; import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorConstants; -import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues.BulkEditorInputType; +import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputType; /** *

DeleteObjectContributionItem class.

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/OpenBulkEditorContributionItem.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/OpenBulkEditorContributionItem.java index aa07a22ad..8150e39ae 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/OpenBulkEditorContributionItem.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/OpenBulkEditorContributionItem.java @@ -16,6 +16,7 @@ import java.util.List; import java.util.Map; import org.eclipse.jface.action.IContributionItem; +import org.eclipse.jface.action.Separator; import org.eclipse.swt.SWT; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.CompoundContributionItem; @@ -23,7 +24,7 @@ import org.eclipse.ui.menus.CommandContributionItem; import org.eclipse.ui.menus.CommandContributionItemParameter; import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorConstants; -import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues; +import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputType; /** *

@@ -68,12 +69,16 @@ public class OpenBulkEditorContributionItem extends CompoundContributionItem { List contributionItems = new ArrayList(); - Map inputTypeValues = (new BulkEditorInputTypeValues()) - .getParameterValues(); - for (Object key : inputTypeValues.keySet()) { - contributionItems.add(createContributionItem((String) key, - (String) inputTypeValues.get(key))); - } + contributionItems.add(BulkEditorInputType.AGENT.createContributionItem()); + contributionItems.add(BulkEditorInputType.REFERENCE.createContributionItem()); + contributionItems.add(new Separator("test")); + contributionItems.add(BulkEditorInputType.NAME.createContributionItem()); + contributionItems.add(BulkEditorInputType.NAME_RELATIONSHIP.createContributionItem()); + contributionItems.add(new Separator("test")); + contributionItems.add(BulkEditorInputType.OCCURRENCE.createContributionItem()); + contributionItems.add(new Separator("test")); + contributionItems.add(BulkEditorInputType.USER.createContributionItem()); + contributionItems.add(BulkEditorInputType.GROUP.createContributionItem()); return contributionItems .toArray(new IContributionItem[contributionItems.size()]); diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/OpenBulkEditorHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/OpenBulkEditorHandler.java index 5fb4b96d7..dc4d133e2 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/OpenBulkEditorHandler.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/OpenBulkEditorHandler.java @@ -18,7 +18,7 @@ import org.eclipse.ui.handlers.HandlerUtil; import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor; import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorConstants; import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput; -import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues.BulkEditorInputType; +import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputType; /** *

OpenBulkEditorHandler class.

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java index 773c3fc00..c92942567 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java @@ -32,7 +32,6 @@ import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService; import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorQuery; import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider; -import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues.BulkEditorInputType; import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.CdmBaseSortProvider; import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.TitleCacheComparator; import eu.etaxonomy.taxeditor.store.CdmStore; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java index 17c8db0b7..95c0c0b20 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java @@ -18,7 +18,6 @@ import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurato import eu.etaxonomy.cdm.model.agent.AgentBase; import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator; import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider; -import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues.BulkEditorInputType; import eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator.AgentCreator; import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.IdentifiableEntitySortProvider; import eu.etaxonomy.taxeditor.store.CdmStore; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/BulkEditorInputType.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/BulkEditorInputType.java new file mode 100644 index 000000000..b40c5ac7a --- /dev/null +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/BulkEditorInputType.java @@ -0,0 +1,134 @@ +package eu.etaxonomy.taxeditor.bulkeditor.input; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.jface.action.IContributionItem; +import org.eclipse.swt.SWT; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.menus.CommandContributionItem; +import org.eclipse.ui.menus.CommandContributionItemParameter; + +import eu.etaxonomy.cdm.model.agent.AgentBase; +import eu.etaxonomy.cdm.model.common.Group; +import eu.etaxonomy.cdm.model.common.User; +import eu.etaxonomy.cdm.model.name.NameRelationship; +import eu.etaxonomy.cdm.model.name.TaxonNameBase; +import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; +import eu.etaxonomy.cdm.model.reference.Reference; +import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorConstants; + +public enum BulkEditorInputType { + AGENT("Authors and Author Teams", AgentEditorInput.ID), + REFERENCE("Reference", ReferenceEditorInput.ID), + NAME("Name", NameEditorInput.ID), + NAME_RELATIONSHIP("Name Relationship", NameRelationshipEditorInput.ID), + OCCURRENCE("Specimens and Observations", OccurrenceEditorInput.ID), + USER("User", UserEditorInput.ID), + GROUP("Group", GroupEditorInput.ID); + + public String id; + public String label; + + BulkEditorInputType(String label, String id) { + this.id = id; + this.label = label; + } + + public IContributionItem createContributionItem(){ + return createContributionItem(label, id); + } + + /** + * @param key + * @param object + * @return + */ + private IContributionItem createContributionItem(String label, + String inputType) { + CommandContributionItemParameter parameter = new CommandContributionItemParameter( + PlatformUI.getWorkbench().getActiveWorkbenchWindow(), null, + IBulkEditorConstants.DYNAMIC_OPEN_MENU_ID, SWT.NONE); + + parameter.label = label; + + Map parameters = new HashMap(); + parameters.put(IBulkEditorConstants.INPUT_TYPE_PARAMETER_ID, inputType); + parameter.parameters = parameters; + + return new CommandContributionItem(parameter); + } + + public static BulkEditorInputType getById(String id) { + + for (BulkEditorInputType type : values()) { + if (id.equals(type.id)) { + return type; + } + } + + return null; + } + + public static BulkEditorInputType getByType(Class clazz) { + if (Reference.class.isAssignableFrom(clazz)) { + return REFERENCE; + } else if (TaxonNameBase.class.isAssignableFrom(clazz)) { + return NAME; + } else if (AgentBase.class.isAssignableFrom(clazz)) { + return AGENT; + } else if (SpecimenOrObservationBase.class.isAssignableFrom(clazz)) { + return OCCURRENCE; + } else if (NameRelationship.class.isAssignableFrom(clazz)) { + return NAME_RELATIONSHIP; + } else if (Group.class.isAssignableFrom(clazz)) { + return GROUP; + } else if (User.class.isAssignableFrom(clazz)) { + return USER; + } + return null; + } + + public static BulkEditorInputType getByInput(IEditorInput input) { + if (input instanceof ReferenceEditorInput) { + return REFERENCE; + } else if (input instanceof NameEditorInput) { + return NAME; + } else if (input instanceof AgentEditorInput) { + return AGENT; + } else if (input instanceof OccurrenceEditorInput) { + return OCCURRENCE; + } else if (input instanceof NameRelationshipEditorInput) { + return NAME_RELATIONSHIP; + } else if (input instanceof UserEditorInput) { + return USER; + } else if (input instanceof GroupEditorInput) { + return GROUP; + } + return null; + } + + public static AbstractBulkEditorInput getInput( + BulkEditorInputType inputType) { + switch (inputType) { + case REFERENCE: + return new ReferenceEditorInput(); + case NAME: + return new NameEditorInput(); + case AGENT: + return new AgentEditorInput(); + case OCCURRENCE: + return new OccurrenceEditorInput(); + case NAME_RELATIONSHIP: + return new NameRelationshipEditorInput(); + case USER: + return new UserEditorInput(); + case GROUP: + return new GroupEditorInput(); + default: + throw new IllegalStateException( + "No input class for the given input type defined."); + } + } +} \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/BulkEditorInputTypeValues.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/BulkEditorInputTypeValues.java deleted file mode 100644 index 6fa85297d..000000000 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/BulkEditorInputTypeValues.java +++ /dev/null @@ -1,150 +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.input; - -import java.util.HashMap; -import java.util.Map; - -import org.eclipse.core.commands.IParameterValues; -import org.eclipse.ui.IEditorInput; - -import eu.etaxonomy.cdm.model.agent.AgentBase; -import eu.etaxonomy.cdm.model.common.Group; -import eu.etaxonomy.cdm.model.common.User; -import eu.etaxonomy.cdm.model.name.NameRelationship; -import eu.etaxonomy.cdm.model.name.TaxonNameBase; -import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; -import eu.etaxonomy.cdm.model.reference.Reference; - -/** - *

- * BulkEditorInputTypeValues class. - *

- * - * @author p.ciardelli - * @created 20.08.2009 - * @version 1.0 - */ -public class BulkEditorInputTypeValues implements IParameterValues { - - public enum BulkEditorInputType { - REFERENCE("Reference", ReferenceEditorInput.ID), NAME("Name", - NameEditorInput.ID), AGENT("Authors and Author Teams", - AgentEditorInput.ID), OCCURRENCE("Specimens and Observations", - OccurrenceEditorInput.ID), NAME_RELATIONSHIP( - "Name Relationship", NameRelationshipEditorInput.ID), USER( - "User", UserEditorInput.ID), GROUP("Group", GroupEditorInput.ID); - - public String id; - public String label; - - BulkEditorInputType(String label, String id) { - this.id = id; - this.label = label; - } - - public static BulkEditorInputType getById(String id) { - - for (BulkEditorInputType type : values()) { - if (id.equals(type.id)) { - return type; - } - } - - return null; - } - - public static BulkEditorInputType getByType(Class clazz) { - if (Reference.class.isAssignableFrom(clazz)) { - return REFERENCE; - } else if (TaxonNameBase.class.isAssignableFrom(clazz)) { - return NAME; - } else if (AgentBase.class.isAssignableFrom(clazz)) { - return AGENT; - } else if (SpecimenOrObservationBase.class.isAssignableFrom(clazz)) { - return OCCURRENCE; - } else if (NameRelationship.class.isAssignableFrom(clazz)) { - return NAME_RELATIONSHIP; - } else if (Group.class.isAssignableFrom(clazz)) { - return GROUP; - } else if (User.class.isAssignableFrom(clazz)) { - return USER; - } - return null; - } - - public static BulkEditorInputType getByInput(IEditorInput input) { - if (input instanceof ReferenceEditorInput) { - return REFERENCE; - } else if (input instanceof NameEditorInput) { - return NAME; - } else if (input instanceof AgentEditorInput) { - return AGENT; - } else if (input instanceof OccurrenceEditorInput) { - return OCCURRENCE; - } else if (input instanceof NameRelationshipEditorInput) { - return NAME_RELATIONSHIP; - } else if (input instanceof UserEditorInput) { - return USER; - } else if (input instanceof GroupEditorInput) { - return GROUP; - } - return null; - } - - public static AbstractBulkEditorInput getInput( - BulkEditorInputType inputType) { - switch (inputType) { - case REFERENCE: - return new ReferenceEditorInput(); - case NAME: - return new NameEditorInput(); - case AGENT: - return new AgentEditorInput(); - case OCCURRENCE: - return new OccurrenceEditorInput(); - case NAME_RELATIONSHIP: - return new NameRelationshipEditorInput(); - case USER: - return new UserEditorInput(); - case GROUP: - return new GroupEditorInput(); - default: - throw new IllegalStateException( - "No input class for the given input type defined."); - } - } - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.core.commands.IParameterValues#getParameterValues() - */ - /** - *

- * getParameterValues - *

- * - * @return a {@link java.util.Map} object. - */ - @Override - public Map getParameterValues() { - final Map values = new HashMap(); - - // TODO user role determines which editor inputs are returned - for (BulkEditorInputType inputType : BulkEditorInputType.values()) { - values.put(inputType.label, inputType.id); - } - - return values; - } -} diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java index 5dcc628b3..b5d87769d 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java @@ -18,7 +18,6 @@ import eu.etaxonomy.cdm.api.service.IGroupService; import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator; import eu.etaxonomy.cdm.model.common.Group; import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator; -import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues.BulkEditorInputType; import eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator.GroupCreator; import eu.etaxonomy.taxeditor.store.CdmStore; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java index 144b469f0..cab74e3cb 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java @@ -19,7 +19,6 @@ import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurato import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator; import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider; -import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues.BulkEditorInputType; import eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator.NameCreator; import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.IdentifiableEntitySortProvider; import eu.etaxonomy.taxeditor.store.CdmStore; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameRelationshipEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameRelationshipEditorInput.java index 3d2ccd432..1956b9476 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameRelationshipEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameRelationshipEditorInput.java @@ -10,18 +10,14 @@ package eu.etaxonomy.taxeditor.bulkeditor.input; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.UUID; -import eu.etaxonomy.cdm.api.service.INameService; import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator; -import eu.etaxonomy.cdm.model.common.RelationshipBase; import eu.etaxonomy.cdm.model.name.NameRelationship; import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator; import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; -import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues.BulkEditorInputType; import eu.etaxonomy.taxeditor.store.CdmStore; /** diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java index 3cb3bfeba..6c7fc05d2 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java @@ -19,7 +19,6 @@ import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurato import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator; import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider; -import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues.BulkEditorInputType; import eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator.OccurrenceCreator; import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.IdentifiableEntitySortProvider; import eu.etaxonomy.taxeditor.store.CdmStore; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java index 98e58f047..8e3f32513 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java @@ -19,9 +19,7 @@ import eu.etaxonomy.cdm.model.common.MarkerType; import eu.etaxonomy.cdm.model.reference.Reference; import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator; import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider; -import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues.BulkEditorInputType; import eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator.ReferenceCreator; -import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.CdmBaseSortProvider; import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.IdentifiableEntitySortProvider; import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.ReferenceSortProvider; import eu.etaxonomy.taxeditor.store.CdmStore; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java index bc1fd74e1..bafce5e95 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java @@ -18,7 +18,6 @@ import eu.etaxonomy.cdm.api.service.IUserService; import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator; import eu.etaxonomy.cdm.model.common.User; import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator; -import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues.BulkEditorInputType; import eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator.UserCreator; import eu.etaxonomy.taxeditor.store.CdmStore; -- 2.34.1