Fixes #2418

diff --git a/.gitattributes b/.gitattributes
index f223383e6460869615827a7bd1ec8735ada78f02..ca26dc66cdbb835c93a9a6995967ea303df2f70a 100644 (file)
--- 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 ae8de5aec9bd36fdcc56f889b6008ccb6e39dea4..e6bc27539d7a4f49147ea7a64977c87474ded4e1 100644 (file)
--- 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 8f28e048fdcb325ab14204b27f0d6a927a469e33..799368a8a26193b65089aba39e4e2f4632d67c69 100644 (file)
--- 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;
 
 /**
  * <p>DeleteObjectContributionItem class.</p>

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 aa07a22adec1f9b9ef8e7cdbb0fdcbb1a3f920c6..8150e39aee0724e380a4e48e6784021d89a38e35 100644 (file)
--- 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;
 
 /**
  * <p>
@@ -68,12 +69,16 @@ public class OpenBulkEditorContributionItem extends CompoundContributionItem {
 
                List<IContributionItem> contributionItems = new ArrayList<IContributionItem>();
 
-               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 5fb4b96d71a5009c2af25db91d0a29b95faa96dc..dc4d133e2f6c0676640ea273d391c2081224ce61 100644 (file)
--- 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;
 
 /**
  * <p>OpenBulkEditorHandler class.</p>

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 773c3fc007850fbea51848af2691317305b9caac..c929425671fa1658a72640a30a251f0c46ea4f71 100644 (file)
--- 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 17c8db0b7985048993e5aeece29091558330038e..95c0c0b20dd3fe7bda685bd816df31f78ec27f1b 100644 (file)
--- 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 (file)
index 0000000..b40c5ac
--- /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 (file)
index 6fa8529..0000000
--- 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;
-
-/**
- * <p>
- * BulkEditorInputTypeValues class.
- * </p>
- * 
- * @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()
-        */
-       /**
-        * <p>
-        * getParameterValues
-        * </p>
-        * 
-        * @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 5dcc628b3f77fd5bbe4bee1447509486d74b72f1..b5d87769da8bdd1b4fd0f05a625a6b867993f2aa 100644 (file)
--- 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 144b469f0b65376dc2870624412e3778eaf1042e..cab74e3cb4170199cac6d1fa95fb56567706ef99 100644 (file)
--- 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 3d2ccd4322bb76e65e743aec0731cdaf545af943..1956b9476cb3e47e898f290ee15a8bee2cb37bb9 100644 (file)
--- 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 3cb3bfebaffd05e00b25be58bc4e65f4e9312059..6c7fc05d23d55c25f49de07491bc1db905cafb27 100644 (file)
--- 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 98e58f047f69b6c1eae250769f9bc7555fbfadad..8e3f3251375f80fa85bb33e8ebc42380e4f7d9c2 100644 (file)
--- 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 bc1fd74e18d138d835bd3a3cfcdac16d3fb5a720..bafce5e950a6f32d509dd817df730ace28a934ff 100644 (file)
--- 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;