From cfc9fe898053133b2761ea05f26c130d84b69de7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Tue, 23 Jun 2020 23:51:07 +0200 Subject: [PATCH] cleanup --- .../handler/ConvertPerson2TeamHandlerE4.java | 5 +- .../taxeditor/session/CdmEntitySession.java | 2 +- .../session/mock/MockCdmEntitySession.java | 82 ------------------- .../container/AbstractGroupedContainerE4.java | 8 -- .../NomenclaturalReferenceDetailSection.java | 11 +-- 5 files changed, 4 insertions(+), 104 deletions(-) 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 245c6d86f..75d82fa8f 100644 --- 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 7a4189efc..3d51857c1 100644 --- 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(); + 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 49f453bdc..3e04e3b9e 100644 --- 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 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 load(T cdmBase, boolean update) { return cdmBase; } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(java.util.Collection) - */ @Override public Collection load(Collection 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 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 remoteLoad(IService 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 remoteLoad(IService service, UUID uuid, List 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 UUID remoteSave(IService 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 remoteUpdate(IService 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 List getRootEntities() { return null; } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#debug(java.util.List) - */ @Override public EntityCacherDebugResult debug(Collection cdmBase) { return null; } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#debug() - */ @Override public EntityCacherDebugResult debug() { - return null; } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#update() - */ @Override public 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 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 MergeResult load(MergeResult 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 a85005d82..ce4226523 100755 --- 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 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 251cf4a3a..18f416884 100644 --- 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 implements ITaxonBaseDetailSection{ - private TaxonBase taxonBase; + private TaxonBase taxonBase; /** *

Constructor for NomenclaturalReferenceDetailSection.

@@ -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 parentElement, int style) { return formFactory.createNomenclaturalReferenceDetailElement(parentElement, style); } - - - - - - } -- 2.34.1