cleanup

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/ConvertPerson2TeamHandlerE4.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/ConvertPerson2TeamHandlerE4.java
index 245c6d86f010f5d726c2092006f32c60949bc12e..75d82fa8f9d3143bc7d50427757d3f08e3e0e160 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/ConvertPerson2TeamHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/ConvertPerson2TeamHandlerE4.java
@@ -35,7 +35,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 /**
  * @author k.luther
  * @date 12.05.2015
- *
  */
 public class ConvertPerson2TeamHandlerE4 {
 
@@ -54,7 +53,7 @@ public class ConvertPerson2TeamHandlerE4 {
             }
         }
         IStructuredSelection selection = editor.getSelection();
-        Iterator iterator = selection.iterator();
+        Iterator<?> iterator = selection.iterator();
         for(selection.iterator();iterator.hasNext();){
 
             Person person = (Person) iterator.next();
@@ -82,7 +81,7 @@ public class ConvertPerson2TeamHandlerE4 {
         BulkEditorE4 bulkEditorE4 = (BulkEditorE4)activePart.getObject();
         StructuredSelection selection = (StructuredSelection)bulkEditorE4.getSelection();
         canExecute = !selection.isEmpty() && bulkEditorE4.getEditorInput().isConvertingEnabled();
-        Iterator iterator = selection.iterator();
+        Iterator<?> iterator = selection.iterator();
         for(selection.iterator();iterator.hasNext();){
             if(!(iterator.next() instanceof Person)){
                 canExecute = false;

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
index 7a4189efc7a51707e22f9c062b3a1e492f85d21b..3d51857c1ab7485072b10d756bac0dcded9fe8eb 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
@@ -58,7 +58,7 @@ public class CdmEntitySession implements ICdmEntitySession  {
         this.cdmTransientEntityCacher = new ConversationalTransientEntityCacher(sessionOwner);
 
 
-        this.changeObservers = new ArrayList<ICdmEntitySessionEnabled>();
+        this.changeObservers = new ArrayList<>();
         cdmEntitySessionManager.addToOwnerSessionMap(sessionOwner, this);
     }
 

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySession.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySession.java
index 49f453bdce2c0e23e418dd7b338d32d707b04a25..3e04e3b9e6180f58da2b021133a3a62730c4a08c 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySession.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySession.java
@@ -28,192 +28,110 @@ import net.sf.ehcache.statistics.LiveCacheStatistics;
  */
 public class MockCdmEntitySession implements ICdmEntitySession  {
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(java.lang.Object)
-     */
     @Override
     public <O extends Object> O load(O obj, boolean update) {
         return obj;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(eu.etaxonomy.cdm.model.common.CdmBase)
-     */
     @Override
     public  <T extends CdmBase> T load(T cdmBase, boolean update) {
         return cdmBase;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(java.util.Collection)
-     */
     @Override
     public  <T extends CdmBase> Collection<T> load(Collection<T> cdmBaseList, boolean update) {
         return cdmBaseList;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#setEntitiesAsLatest()
-     */
     @Override
     public void setEntitiesAsLatest() {
-
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#dispose()
-     */
     @Override
     public void dispose() {
-
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#bind()
-     */
     @Override
     public void bind() {
-        // TODO Auto-generated method stub
-
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#debug(eu.etaxonomy.cdm.model.common.CdmBase)
-     */
     @Override
     public  <T extends CdmBase> EntityCacherDebugResult debug(T cdmBase) {
-
         return new EntityCacherDebugResult();
     }
 
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(java.util.UUID, eu.etaxonomy.cdm.api.service.IService)
-     */
     @Override
     public <T extends CdmBase> T remoteLoad(IService<T> service, UUID uuid) {
         return service.load(uuid);
     }
 
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(eu.etaxonomy.cdm.api.service.IService, java.util.UUID, java.util.List)
-     */
     @Override
     public <T extends CdmBase> T remoteLoad(IService<T> service, UUID uuid, List<String> propertyPaths) {
         return service.load(uuid, propertyPaths);
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#save(eu.etaxonomy.cdm.api.service.IService, eu.etaxonomy.cdm.model.common.CdmBase)
-     */
     @Override
     public <T extends CdmBase> UUID remoteSave(IService<T> service, T cdmBase) {
         return service.save(cdmBase).getUuid();
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#update(eu.etaxonomy.cdm.api.service.IService, eu.etaxonomy.cdm.model.common.CdmBase)
-     */
     @Override
     public <T extends CdmBase> T remoteUpdate(IService<T> service, T cdmBase) {
         return cdmBase;
     }
 
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#getOwner()
-     */
     @Override
     public ICdmEntitySessionEnabled getOwner() {
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#getCacheStatistics()
-     */
     @Override
     public LiveCacheStatistics getCacheStatistics() {
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#isActive()
-     */
     @Override
     public boolean isActive() {
         return false;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#getRootEntities()
-     */
     @Override
     public <T extends CdmBase> List<T> getRootEntities() {
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#debug(java.util.List)
-     */
     @Override
     public <T extends CdmBase> EntityCacherDebugResult debug(Collection<T> cdmBase) {
 
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#debug()
-     */
     @Override
     public <T extends CdmBase> EntityCacherDebugResult debug() {
-
         return null;
     }
 
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#update()
-     */
     @Override
     public <T extends CdmBase> void update() {
-        // TODO Auto-generated method stub
-
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(eu.etaxonomy.cdm.api.service.UpdateResult, boolean)
-     */
     @Override
     public UpdateResult load(UpdateResult updateResult, boolean update) {
         return updateResult;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#getPropertyPath(java.lang.Class)
-     */
     @Override
     public List<String> getPropertyPaths(Object obj) {
-        // TODO Auto-generated method stub
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#addNewCdmEntity(eu.etaxonomy.cdm.model.common.CdmBase)
-     */
     @Override
     public void addNewCdmEntity(CdmBase newEntity) {
-        // TODO Auto-generated method stub
-
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(eu.etaxonomy.cdm.persistence.dto.MergeResult, boolean)
-     */
     @Override
     public <T extends CdmBase> MergeResult<T> load(MergeResult<T> mergeResult, boolean update) {
         return mergeResult;
     }
-
-
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupedContainerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupedContainerE4.java
index a85005d820a4c0e4733a59e74daa7b73690e3e4b..ce4226523481e2148bcb969bd5adb8905bf5e11e 100755 (executable)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupedContainerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupedContainerE4.java
@@ -394,20 +394,12 @@ abstract public class AbstractGroupedContainerE4<T extends TaxonBase> implements
                return isParsable;
        }
 
-       /**
-     * @param name
-     * @return
-     */
     private boolean nameAuthorsSet(TaxonName name) {
        boolean result = true;
        result &= name.getBasionymAuthorship() == null && name.getCombinationAuthorship() == null && name.getExBasionymAuthorship() == null && name.getExCombinationAuthorship() == null;
        return result;
     }
 
-    /**
-     * @param name
-     * @return
-     */
     private boolean nameEpithetsNotSet(TaxonName name) {
         boolean result = true;
         result &= name.getGenusOrUninomial() == null && name.getInfraGenericEpithet() == null && name.getSpecificEpithet() == null && name.getInfraSpecificEpithet() == null;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailSection.java
index 251cf4a3a0c6b23960fab7cf9d1178b948eb9660..18f41688451447d593ffae6e67794d4d81de803c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailSection.java
@@ -31,7 +31,7 @@ import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
 public class NomenclaturalReferenceDetailSection extends
                AbstractCdmDetailSection<TaxonName>  implements ITaxonBaseDetailSection{
 
-       private TaxonBase taxonBase;
+       private TaxonBase<?> taxonBase;
 
        /**
         * <p>Constructor for NomenclaturalReferenceDetailSection.</p>
@@ -47,13 +47,11 @@ public class NomenclaturalReferenceDetailSection extends
                super(cdmFormFactory, conversation, parentElement, selectionProvider, style);
        }
 
-       /** {@inheritDoc} */
        @Override
        public String getHeading() {
                return "Nomenclatural Reference";
        }
 
-       /** {@inheritDoc} */
        @Override
     public void setTaxonBase(TaxonBase entity) {
                this.taxonBase = entity;
@@ -61,7 +59,6 @@ public class NomenclaturalReferenceDetailSection extends
                setEntity(name);
        }
 
-       /** {@inheritDoc} */
        @Override
        protected void setSectionTitle() {
                String title = "";
@@ -83,10 +80,4 @@ public class NomenclaturalReferenceDetailSection extends
                        AbstractCdmDetailSection<TaxonName> parentElement, int style) {
            return formFactory.createNomenclaturalReferenceDetailElement(parentElement, style);
        }
-
-
-
-
-
-
 }