cleanup

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/e4/handler/NewObjectHandlerE4.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/e4/handler/NewObjectHandlerE4.java
index 89a45116129327dfbb265f1184590a6e3701d795..27f428bf66bb1863bcbfd82de0c97841c43733d5 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/e4/handler/NewObjectHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/e4/handler/NewObjectHandlerE4.java
@@ -6,7 +6,6 @@
  * 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.annotatedlineeditor.e4.handler;
 
 import javax.inject.Named;
@@ -32,10 +31,8 @@ import eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator.UserCreator;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 
 /**
- *
  * @author pplitzner
  * @date 12.09.2017
- *
  */
 public class NewObjectHandlerE4 {
 
@@ -77,7 +74,7 @@ public class NewObjectHandlerE4 {
                     nonEmptyInputValidator);
 
             if (dialog.open() != Window.CANCEL) {
-                IEntityCreator entityCreator = bulkEditor.getEditorInput().getEntityCreator();
+                IEntityCreator<?> entityCreator = bulkEditor.getEditorInput().getEntityCreator();
                 Object createdEntity = entityCreator.createEntity(key, dialog.getValue());
                 if (createdEntity == null){
                     return;
@@ -91,15 +88,9 @@ public class NewObjectHandlerE4 {
 
                 }
                 IStructuredSelection selection = new StructuredSelection(createdEntity);
-
                 bulkEditor.refresh();
-
-
                 bulkEditor.setFocus();
-
                 bulkEditor.setSelection(selection);
-
-
             }
         }
     }

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/e4/ReferencingObjectsViewE4.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/e4/ReferencingObjectsViewE4.java
index f6de95b2d33d0a114872c2f8a0428e385babdfb7..c2dffe95dbb0f30b8f1000aefdf9a5019ba1506c 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/e4/ReferencingObjectsViewE4.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/e4/ReferencingObjectsViewE4.java
@@ -551,5 +551,4 @@ public class ReferencingObjectsViewE4 extends AbstractCdmEditorPartE4 implements
        protected String getViewName() {
                return "Referencing Objects";
        }
-
-}
+}
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java
index 4db8bbb866474bbc7d5cfc5b869c3833db2f76db..87d965b6c20afc6115d91e11cecf785177b2eca1 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java
@@ -13,9 +13,9 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 \r
 import eu.etaxonomy.cdm.api.service.IVocabularyService;\r
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;\r
-import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.Marker;\r
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.term.TermBase;\r
 import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 import eu.etaxonomy.cdm.persistence.dto.TermDto;\r
@@ -25,16 +25,11 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 /**\r
  * @author l.morris\r
  * @date 9 Jan 2012\r
- *\r
  */\r
 public class TermBasePropertyTester extends PropertyTester {\r
 \r
        private static final String IS_MODIFIABLE = "isModifiable";\r
 \r
-\r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)\r
-        */\r
        @Override\r
        public boolean test(Object receiver, String property, Object[] args,\r
                        Object expectedValue) {\r
@@ -63,12 +58,12 @@ public class TermBasePropertyTester extends PropertyTester {
                        return true;\r
                }\r
 \r
-               TermVocabulary vocabulary = null;\r
+               TermVocabulary<?> vocabulary = null;\r
 \r
                if(object instanceof DefinedTermBase){\r
-                       vocabulary = ((DefinedTermBase) object).getVocabulary();\r
+                       vocabulary = ((DefinedTermBase<?>) object).getVocabulary();\r
                }else if(object instanceof TermVocabulary){\r
-                       vocabulary = (TermVocabulary) object;\r
+                       vocabulary = (TermVocabulary<?>) object;\r
                }else if(object instanceof TermDto){\r
             vocabulary = CdmStore.getService(IVocabularyService.class).load(((TermDto) object).getVocabularyUuid());\r
         }else if(object instanceof TermVocabularyDto){\r
@@ -87,5 +82,4 @@ public class TermBasePropertyTester extends PropertyTester {
 \r
                return true;\r
        }\r
-\r
 }\r