cleanup

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java
index 1c1276cd6cb6bd7cffc1c012899d0880bbdd3ae0..e8c3f4860cd86acf62348d9ef253387d708302b6 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java
@@ -60,7 +60,7 @@ public class AgentCreator implements IEntityCreator<TeamOrPersonBase> {
         */
        @Override
     public Map<Object, String> getKeyLabelPairs() {
-               Map<Object, String> result = new HashMap<Object, String>();
+               Map<Object, String> result = new HashMap<>();
                result.put(Team.class, "Team");
                result.put(Person.class, "Person");
                return result;

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/GroupCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/GroupCreator.java
index 8884f2e9b42dfaebbc98464f9977258f7bf2023a..b7e5a0f6c8c80cd50d8572e57f353b6818e19163 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/GroupCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/GroupCreator.java
@@ -26,24 +26,17 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 /**
  * @author n.hoffmann
  * @created Mar 9, 2011
- * @version 1.0
  */
 public class GroupCreator implements IEntityCreator<Group> {
 
     public static final String GROUP = "Group";
 
-    /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator#createEntity(java.lang.String)
-        */
        @Override
        public Group createEntity(String text) {
                Group group = createEntity(null, text);
                return group;
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator#createEntity(java.lang.Object, java.lang.String)
-        */
        @Override
        public Group createEntity(Object key, String text) {
            try{
@@ -64,12 +57,9 @@ public class GroupCreator implements IEntityCreator<Group> {
 
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator#getKeyLabelPairs()
-        */
        @Override
        public Map<Object, String> getKeyLabelPairs() {
-               Map<Object, String> result = new HashMap<Object, String>();
+               Map<Object, String> result = new HashMap<>();
                result.put(Group.class, GROUP);
                return result;
        }

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/MediaCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/MediaCreator.java
index 3b9c6f93ba3804967097beb4aed4ff05c2bc9562..f230a2dfff552a190543c638553c76597f43d6fd 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/MediaCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/MediaCreator.java
@@ -17,13 +17,9 @@ import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
 /**
  * @author k.luther
  * @date 10.03.2016
- *
  */
 public class MediaCreator implements IEntityCreator<Media> {
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public Media createEntity(String text) {
         Media result = Media.NewInstance();
@@ -31,9 +27,6 @@ public class MediaCreator implements IEntityCreator<Media> {
         return result;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public Media createEntity(Object key, String text) {
         if (key.equals(Media.class)){
@@ -44,23 +37,16 @@ public class MediaCreator implements IEntityCreator<Media> {
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public Map<Object, String> getKeyLabelPairs() {
-        Map<Object, String> result = new HashMap<Object, String>();
-       result.put(Media.class, "Media");
+        Map<Object, String> result = new HashMap<>();
+        result.put(Media.class, "Media");
         return result;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public boolean savesEntity() {
         // TODO Auto-generated method stub
         return false;
     }
-
 }

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java
index 66080b55b25bd6b9ad22b9103cd69a25589500d4..6cf79b0753a24ece5b592169e1878de332236f34 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java
@@ -31,16 +31,15 @@ import eu.etaxonomy.taxeditor.newWizard.NewDerivedUnitBaseWizard;
  *
  * @author n.hoffmann
  * @created Jun 16, 2010
- * @version 1.0
  */
 public class OccurrenceCreator implements
                IEntityCreator<SpecimenOrObservationBase> {
-       private static final Logger logger = Logger
-                       .getLogger(OccurrenceCreator.class);
+
+       @SuppressWarnings("unused")
+    private static final Logger logger = Logger.getLogger(OccurrenceCreator.class);
 
        @Override
        public SpecimenOrObservationBase createEntity(String text) {
-
                return createEntity(DerivedUnit.class, text);
        }
 
@@ -61,16 +60,9 @@ public class OccurrenceCreator implements
                return specimenOrObservation;
        }
 
-       /**
-        * <p>
-        * getKeyLabelPairs
-        * </p>
-        *
-        * @return a {@link java.util.Map} object.
-        */
        @Override
        public Map<Object, String> getKeyLabelPairs() {
-           Map<Object, String> keyLabelPairs = new LinkedHashMap<Object, String>();
+           Map<Object, String> keyLabelPairs = new LinkedHashMap<>();
            keyLabelPairs.putAll(AbstractUtility.orderTerms(Arrays.asList(SpecimenOrObservationType.values())));
            return keyLabelPairs;
        }
@@ -79,6 +71,4 @@ public class OccurrenceCreator implements
        public boolean savesEntity() {
                return true;
        }
-
-
 }

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/TaxonCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/TaxonCreator.java
index c80cd3fbb7878a5c9b6d09a7feb6b96f5ade96a6..8ee1c1d2cfca81e8584a66650c891e2f0d73545c 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/TaxonCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/TaxonCreator.java
@@ -3,16 +3,10 @@ package eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator;
 import java.util.HashMap;\r
 import java.util.Map;\r
 \r
-import eu.etaxonomy.cdm.model.agent.Person;\r
-import eu.etaxonomy.cdm.model.agent.Team;\r
-import eu.etaxonomy.cdm.model.name.Rank;\r
-import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;\r
-import eu.etaxonomy.taxeditor.preference.PreferencesUtil;\r
-import eu.etaxonomy.taxeditor.store.CdmStore;\r
 \r
 public class TaxonCreator implements IEntityCreator<TaxonBase>{\r
 \r
@@ -34,13 +28,13 @@ public class TaxonCreator implements IEntityCreator<TaxonBase>{
                } else{\r
                        taxonBase = Taxon.NewInstance(nameCreator.createEntity(null, text), null);\r
                }\r
-               \r
+\r
                return taxonBase;\r
        }\r
 \r
        @Override\r
        public Map<Object, String> getKeyLabelPairs() {\r
-               Map<Object, String> result = new HashMap<Object, String>();\r
+               Map<Object, String> result = new HashMap<>();\r
                result.put(Synonym.class, "Synonym");\r
                result.put(Taxon.class, "Taxon");\r
                return result;\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
index 4389625eab70ccd91f28112c959c36f07ff15d25..d32cd9abc5c3533c0b986783d7d35ab9bc121e59 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
@@ -119,17 +119,6 @@ public class ParseHandler{
         */
        public INonViralName parse(String unparsedNameString){
 
-//             String unparsedNameString = "";
-//             try {
-//                     Method getText;
-//                     getText = textWidget.getClass().getDeclaredMethod("getText", null);
-//                     unparsedNameString = (String) getText.invoke(textWidget, null);
-//             } catch (Exception e) {
-//                     // we should never get here
-//                     StoreUtil.error(this.getClass(), "Error trying to invoke getText method", e);
-//             }
-
-
                nonViralNameParser.parseReferencedName(name, unparsedNameString,
                                name.getRank(), true);