From fcae1e022198ba95a104983c434ac4060689749e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Sat, 4 Mar 2023 08:31:27 +0100 Subject: [PATCH] cleanup --- .gitattributes | 1 - .../cdm/debug/PersistentContextAnalyzer.java | 14 +--- .../java/eu/etaxonomy/cdm/i18n/Messages.java | 1 - .../cdm/service/BeanToDTOConverter.java | 3 - .../service/CdmBeanItemContainerFactory.java | 12 +-- .../service/CdmFilterablePagingProvider.java | 24 +----- .../CdmFilterablePagingProviderFactory.java | 2 +- .../eu/etaxonomy/cdm/service/CdmStore.java | 23 ++---- ...leStringRepresentationPagingProvider.java} | 10 +-- .../service/RegistrationWorkflowService.java | 13 +--- ...SpecimenTypeDesignationSetServiceImpl.java | 42 ++++------ ...xonNameStringFilterablePagingProvider.java | 43 +--------- .../cdm/service/UserHelperAccess.java | 8 +- .../component/registration/WorkflowSteps.java | 1 - .../container/CdmSpringConnectionPool.java | 43 ---------- .../cdm/vaadin/container/IdUuidName.java | 9 --- .../validator/InReferenceTypeValidator.java | 3 +- ...NomenclaturalReferenceExistsValidator.java | 12 +-- .../PartialCompletenesValidator.java | 2 +- .../validator/PasswordsMatchValidator.java | 10 +-- .../validator/PasswordsPolicyValidator.java | 5 +- .../TimePeriodCompletenesValidator.java | 3 +- .../cdm/vaadin/debug/CdmEntityInfoSorter.java | 14 +--- .../cdm/vaadin/event/AbstractEntityEvent.java | 22 ++---- .../event/AuthenticationAttemptEvent.java | 20 +---- .../model/registration/KindOfUnitTerms.java | 2 - .../model/registration/WorkflowStep.java | 8 +- .../AccessRestrictedViewControlBean.java | 2 +- .../AnnotationBasedAccessControlBean.java | 1 - ...tationBasedAccessControlConfiguration.java | 1 - .../CdmEditDeletePermissionTester.java | 1 - .../permission/PermissionDebugUtils.java | 6 +- .../permission/ReleasableResourcesView.java | 1 - .../util/formatter/PartialFormatter.java | 20 +---- .../util/formatter/TimePeriodFormatter.java | 4 +- .../cdm/vaadin/view/AbstractPageView.java | 23 +----- .../view/AccountRegistrationPresenter.java | 2 +- .../cdm/vaadin/view/AnnotationsEditor.java | 5 -- .../etaxonomy/cdm/vaadin/view/ErrorView.java | 9 +-- .../cdm/vaadin/view/LoginPresenter.java | 8 +- .../etaxonomy/cdm/vaadin/view/LoginView.java | 12 +-- .../cdm/vaadin/view/LoginViewBean.java | 4 +- .../vaadin/view/PasswordResetPresenter.java | 5 +- .../cdm/vaadin/view/PasswordResetView.java | 8 +- .../vaadin/view/PasswordResetViewBean.java | 6 +- .../PerEntityAuthorityGrantingEditor.java | 3 +- .../cdm/vaadin/view/RedirectToLoginView.java | 10 +-- .../common/InstitutionEditorPresenter.java | 29 +------ .../view/common/InstitutionPopupEditor.java | 34 ++------ .../name/NameTypeDesignationPresenter.java | 2 +- ...imenTypeDesignationSetEditorPresenter.java | 18 +---- src/main/java/eu/etaxonomy/vaadin/README.md | 8 +- .../component/CompositeCustomField.java | 1 - .../component/CompositeStyledComponent.java | 11 +-- .../component/EntityFieldInstantiator.java | 1 - .../vaadin/component/EntitySupport.java | 4 +- .../vaadin/component/NameRelationField.java | 38 ++------- .../component/NameRelationsListEditor.java | 17 +--- .../vaadin/component/NestedFieldGroup.java | 4 - .../vaadin/component/ReloadableSelect.java | 2 +- .../vaadin/component/SwitchButton.java | 5 -- .../ToManyRelatedEntitiesComboboxSelect.java | 17 +--- .../ToManyRelatedEntitiesListSelect.java | 78 ++----------------- .../WeaklyRelatedEntityCombobox.java | 6 +- .../vaadin/event/EntityEditorActionEvent.java | 24 +----- .../vaadin/mvp/AbstractPresenter.java | 7 +- .../eu/etaxonomy/vaadin/mvp/AbstractView.java | 2 +- .../etaxonomy/vaadin/mvp/ApplicationView.java | 2 +- .../ApplicationListenerPojoMethodAdapter.java | 16 +--- .../DefaultPojoEventListenerManager.java | 6 +- .../event/PojoEventListenerManager.java | 8 +- 71 files changed, 141 insertions(+), 680 deletions(-) rename src/main/java/eu/etaxonomy/cdm/service/{FilterableStringRepresentationPagingProvider.java => IFilterableStringRepresentationPagingProvider.java} (78%) delete mode 100644 src/main/java/eu/etaxonomy/cdm/vaadin/container/CdmSpringConnectionPool.java diff --git a/.gitattributes b/.gitattributes index 338d1c23..adfaa69f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12,7 +12,6 @@ src/main/java/eu/etaxonomy/cdm/vaadin/component/HorizontalToolbar.java -text src/main/java/eu/etaxonomy/cdm/vaadin/component/NewTaxonBaseComposite.java -text src/main/java/eu/etaxonomy/cdm/vaadin/component/StatusComposite.java -text src/main/java/eu/etaxonomy/cdm/vaadin/container/CdmSQLContainer.java -text -src/main/java/eu/etaxonomy/cdm/vaadin/container/CdmSpringConnectionPool.java -text src/main/java/eu/etaxonomy/cdm/vaadin/container/IdAndUuid.java -text src/main/java/eu/etaxonomy/cdm/vaadin/container/LeafNodeTaxonContainer.java -text src/main/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3ConceptRelationshipTree.java -text diff --git a/src/main/java/eu/etaxonomy/cdm/debug/PersistentContextAnalyzer.java b/src/main/java/eu/etaxonomy/cdm/debug/PersistentContextAnalyzer.java index 0e9b6413..f33d4963 100644 --- a/src/main/java/eu/etaxonomy/cdm/debug/PersistentContextAnalyzer.java +++ b/src/main/java/eu/etaxonomy/cdm/debug/PersistentContextAnalyzer.java @@ -50,10 +50,6 @@ public class PersistentContextAnalyzer extends CdmEntityCache { } - - /** - * @param printStream - */ @Override protected void printLegend(PrintStream printStream) { printStream.println("PersistentContextAnalyzer legend: "); @@ -80,16 +76,9 @@ public class PersistentContextAnalyzer extends CdmEntityCache { return flags; } - /** - * @return the showHashCodes - */ public boolean isShowHashCodes() { return showHashCodes; } - - /** - * @param showHashCodes the showHashCodes to set - */ public void setShowHashCodes(boolean showHashCodes) { boolean runUpdate = this.showHashCodes != showHashCodes; this.showHashCodes = showHashCodes; @@ -97,5 +86,4 @@ public class PersistentContextAnalyzer extends CdmEntityCache { update(); } } - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/i18n/Messages.java b/src/main/java/eu/etaxonomy/cdm/i18n/Messages.java index a0caf449..83224584 100644 --- a/src/main/java/eu/etaxonomy/cdm/i18n/Messages.java +++ b/src/main/java/eu/etaxonomy/cdm/i18n/Messages.java @@ -16,7 +16,6 @@ import com.vaadin.server.VaadinSession; /** * Internationalization class. * @author freimeier - * */ public class Messages implements Serializable { diff --git a/src/main/java/eu/etaxonomy/cdm/service/BeanToDTOConverter.java b/src/main/java/eu/etaxonomy/cdm/service/BeanToDTOConverter.java index c26702fc..02ae2e12 100644 --- a/src/main/java/eu/etaxonomy/cdm/service/BeanToDTOConverter.java +++ b/src/main/java/eu/etaxonomy/cdm/service/BeanToDTOConverter.java @@ -24,9 +24,6 @@ public interface BeanToDTOConverter { public DTO toDTO(CDM bean); - /** - * @return - */ public Class getDTOType(); } diff --git a/src/main/java/eu/etaxonomy/cdm/service/CdmBeanItemContainerFactory.java b/src/main/java/eu/etaxonomy/cdm/service/CdmBeanItemContainerFactory.java index e685594e..03f07dc6 100644 --- a/src/main/java/eu/etaxonomy/cdm/service/CdmBeanItemContainerFactory.java +++ b/src/main/java/eu/etaxonomy/cdm/service/CdmBeanItemContainerFactory.java @@ -39,7 +39,6 @@ import eu.etaxonomy.cdm.persistence.query.OrderHint; * * @author a.kohlbecker * @since Apr 6, 2017 - * */ @Service public class CdmBeanItemContainerFactory { @@ -79,12 +78,11 @@ public class CdmBeanItemContainerFactory { return termItemContainer; } - @Transactional(readOnly=true) public BeanItemContainer buildVocabularyTermsItemContainer(UUID vocabularyUuid) { clearSession(); - TermVocabulary vocab = repo.getVocabularyService().find(vocabularyUuid); + TermVocabulary vocab = repo.getVocabularyService().find(vocabularyUuid); Pager terms = repo.getVocabularyService().getTerms(vocab, null, null, orderHints, INIT_STRATEGY); BeanItemContainer termItemContainer = new BeanItemContainer<>(DefinedTermBase.class); termItemContainer.addAll(terms.getRecords()); @@ -95,7 +93,7 @@ public class CdmBeanItemContainerFactory { public BeanItemContainer buildVocabularyTermsItemContainer(UUID vocabularyUuid, BeanToDTOConverter converter) { clearSession(); - TermVocabulary vocab = repo.getVocabularyService().find(vocabularyUuid); + TermVocabulary vocab = repo.getVocabularyService().find(vocabularyUuid); Pager terms = repo.getVocabularyService().getTerms(vocab, null, null, orderHints, INIT_STRATEGY); BeanItemContainer termItemContainer = new BeanItemContainer<>(converter.getDTOType()); termItemContainer.addAll(terms.getRecords().stream().map(b -> converter.toDTO(b)).collect(Collectors.toList())); @@ -123,7 +121,7 @@ public class CdmBeanItemContainerFactory { BeanItemContainer termItemContainer = new BeanItemContainer<>(DefinedTermBase.class); termItemContainer.addAll(terms.stream() .filter(t -> t instanceof TypeDesignationStatusBase) - .map(t -> (TypeDesignationStatusBase)t) + .map(t -> (TypeDesignationStatusBase)t) .filter(tsb -> !withHasDesignationSource.isPresent() || withHasDesignationSource.get().equals(false) @@ -149,7 +147,6 @@ public class CdmBeanItemContainerFactory { return container; } - @Transactional(readOnly=true) public BeanItemContainer buildBeanItemContainer(Class type, List orderHints) { @@ -179,5 +176,4 @@ public class CdmBeanItemContainerFactory { public void clearSession() { repo.clearSession(); } - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/service/CdmFilterablePagingProvider.java b/src/main/java/eu/etaxonomy/cdm/service/CdmFilterablePagingProvider.java index 22f2b84c..2b13502c 100644 --- a/src/main/java/eu/etaxonomy/cdm/service/CdmFilterablePagingProvider.java +++ b/src/main/java/eu/etaxonomy/cdm/service/CdmFilterablePagingProvider.java @@ -30,7 +30,7 @@ import eu.etaxonomy.cdm.persistence.query.OrderHint; * @author a.kohlbecker * @since Jun 7, 2017 */ -public class CdmFilterablePagingProvider implements FilterablePagingProvider, FilterableCountProvider { +public class CdmFilterablePagingProvider, V extends T> implements FilterablePagingProvider, FilterableCountProvider { private static final Logger logger = LogManager.getLogger(); @@ -38,7 +38,6 @@ public class CdmFilterablePagingProvider service; @@ -49,44 +48,28 @@ public class CdmFilterablePagingProvider orderHints = OrderHint.ORDER_BY_TITLE_CACHE.asList(); - List initStrategy = DEFAULT_INIT_STRATEGY; + private List initStrategy = DEFAULT_INIT_STRATEGY; private List criteria = new ArrayList<>(); private List> restrictions = new ArrayList<>(); - - /** - * @return the matchMode - */ protected MatchMode getMatchMode() { return matchMode; } - - /** - * @param matchMode the matchMode to set - */ protected void setMatchMode(MatchMode matchMode) { this.matchMode = matchMode; } - /** - * @return the orderHints - */ protected List getOrderHints() { return orderHints; } - - /** - * @param orderHints the orderHints to set - */ protected void setOrderHints(List orderHints) { this.orderHints = orderHints; } /** * With defaults for matchMode = MatchMode.ANYWHERE and orderHints = OrderHint.ORDER_BY_TITLE_CACHE - * */ public CdmFilterablePagingProvider(IIdentifiableEntityService service) { this(service, null); @@ -94,7 +77,6 @@ public class CdmFilterablePagingProvider service, Class type) { super(); @@ -225,7 +207,7 @@ public class CdmFilterablePagingProvider(r.getPropertyName(), r.getOperator(), r.getMatchMode(), values.toArray(new Object[values.size()]))); } return prepared; } diff --git a/src/main/java/eu/etaxonomy/cdm/service/CdmFilterablePagingProviderFactory.java b/src/main/java/eu/etaxonomy/cdm/service/CdmFilterablePagingProviderFactory.java index 74de161c..2b2ebd78 100644 --- a/src/main/java/eu/etaxonomy/cdm/service/CdmFilterablePagingProviderFactory.java +++ b/src/main/java/eu/etaxonomy/cdm/service/CdmFilterablePagingProviderFactory.java @@ -108,7 +108,7 @@ public class CdmFilterablePagingProviderFactory { } public CdmFilterablePagingProvider teamOrPersonPagingProvider() { - return new CdmFilterablePagingProvider(repo.getAgentService(), TeamOrPersonBase.class, MatchMode.BEGINNING, OrderHint.ORDER_BY_TITLE_CACHE.asList()); + return new CdmFilterablePagingProvider<>(repo.getAgentService(), TeamOrPersonBase.class, MatchMode.BEGINNING, OrderHint.ORDER_BY_TITLE_CACHE.asList()); } public CdmFilterablePagingProvider personPagingProvider() { diff --git a/src/main/java/eu/etaxonomy/cdm/service/CdmStore.java b/src/main/java/eu/etaxonomy/cdm/service/CdmStore.java index 06e2e2cc..aa979a1d 100644 --- a/src/main/java/eu/etaxonomy/cdm/service/CdmStore.java +++ b/src/main/java/eu/etaxonomy/cdm/service/CdmStore.java @@ -41,7 +41,6 @@ import eu.etaxonomy.vaadin.mvp.AbstractView; * @since Jun 26, 2017 * * TODO better naming of this class, ServiceWrapper, ServiceOperator, ...? - * */ @SpringComponent @ViewScope @@ -99,10 +98,6 @@ public class CdmStore { } - - /** - * @param txStatus - */ public void transactionRollbackIfNotCompleted(TransactionStatus txStatus) { if(!txStatus.isCompleted()){ repo.getTransactionManager().rollback(txStatus); @@ -110,11 +105,9 @@ public class CdmStore { } /** - * - * @param bean * @return a EntityChangeEvent in case the deletion was successful otherwise null. */ - public final EntityChangeEvent deleteBean(T bean, AbstractView view) { + public final EntityChangeEvent deleteBean(T bean, AbstractView view) { IService typeSpecificService = serviceFor(bean); @@ -122,9 +115,9 @@ public class CdmStore { logger.trace(this._toString() + ".deleteBean - deleting" + bean.toString()); DeleteResult result = typeSpecificService.delete(bean); if (result.isOk()) { - return new EntityChangeEvent(bean, Type.REMOVED, view); + return new EntityChangeEvent<>(bean, Type.REMOVED, view); } else { - handleDeleteresultInError(result); + handleDeleteResultInError(result); } } finally { repo.clearSession(); // #7559 @@ -133,10 +126,7 @@ public class CdmStore { return null; } - /** - * @param result - */ - public static void handleDeleteresultInError(DeleteResult result) { + public static void handleDeleteResultInError(DeleteResult result) { String notificationTitle; StringBuffer messageBody = new StringBuffer(); if (result.isAbort()) { @@ -154,7 +144,7 @@ public class CdmStore { result.getRelatedObjects().forEach(e -> { messageBody.append("
  • "); if (IdentifiableEntity.class.isAssignableFrom(e.getClass())) { - messageBody.append(((IdentifiableEntity) e).getTitleCache()); + messageBody.append(((IdentifiableEntity) e).getTitleCache()); } else { messageBody.append(e.toString()); } @@ -192,5 +182,4 @@ public class CdmStore { throw new RuntimeException("Implementation to find service for " + cdmType + " still missing."); } } - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/service/FilterableStringRepresentationPagingProvider.java b/src/main/java/eu/etaxonomy/cdm/service/IFilterableStringRepresentationPagingProvider.java similarity index 78% rename from src/main/java/eu/etaxonomy/cdm/service/FilterableStringRepresentationPagingProvider.java rename to src/main/java/eu/etaxonomy/cdm/service/IFilterableStringRepresentationPagingProvider.java index 9878f62d..1ea65a71 100644 --- a/src/main/java/eu/etaxonomy/cdm/service/FilterableStringRepresentationPagingProvider.java +++ b/src/main/java/eu/etaxonomy/cdm/service/IFilterableStringRepresentationPagingProvider.java @@ -13,16 +13,10 @@ import org.vaadin.viritin.fields.LazyComboBox.FilterablePagingProvider; /** * @author a.kohlbecker * @since Sep 24, 2018 - * */ -public interface FilterableStringRepresentationPagingProvider extends FilterablePagingProvider { +public interface IFilterableStringRepresentationPagingProvider extends FilterablePagingProvider { public IDTYPE idFor(String stringRepresentation); - /** - * - */ public void clearIdCache(); - - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/service/RegistrationWorkflowService.java b/src/main/java/eu/etaxonomy/cdm/service/RegistrationWorkflowService.java index af16df5a..e93c4430 100644 --- a/src/main/java/eu/etaxonomy/cdm/service/RegistrationWorkflowService.java +++ b/src/main/java/eu/etaxonomy/cdm/service/RegistrationWorkflowService.java @@ -48,7 +48,6 @@ public class RegistrationWorkflowService implements IRegistrationWorkflowService return repo; } - @Override public Registration createRegistration(TaxonName taxonName, List preparedBlockingRegistrations) { @@ -69,7 +68,6 @@ public class RegistrationWorkflowService implements IRegistrationWorkflowService return reg; } - @Override public boolean createRegistrationforExistingName(RegistrationWorkingSet workingset, TaxonName typifiedName) throws TypeDesignationSetException { @@ -144,10 +142,6 @@ public class RegistrationWorkflowService implements IRegistrationWorkflowService return null; } - /** - * @param registration - * @return - */ @Override public Registration reloadRegistration(Registration registration) { if(registration.isPersited()){ @@ -176,10 +170,6 @@ public class RegistrationWorkflowService implements IRegistrationWorkflowService return !getRepo().getRegistrationService().checkRegistrationExistsFor(name) && checkWokingsetContainsProtologe(workingset, name); } - /** - * @param name - * @return - */ @Override public boolean checkWokingsetContainsProtologe(RegistrationWorkingSet workingset, TaxonName name) { Reference nomRef = name.getNomenclaturalReference(); @@ -193,5 +183,4 @@ public class RegistrationWorkflowService implements IRegistrationWorkflowService ); // @formatter:on } - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/service/SpecimenTypeDesignationSetServiceImpl.java b/src/main/java/eu/etaxonomy/cdm/service/SpecimenTypeDesignationSetServiceImpl.java index c0336e74..7d57fcde 100644 --- a/src/main/java/eu/etaxonomy/cdm/service/SpecimenTypeDesignationSetServiceImpl.java +++ b/src/main/java/eu/etaxonomy/cdm/service/SpecimenTypeDesignationSetServiceImpl.java @@ -77,11 +77,11 @@ public class SpecimenTypeDesignationSetServiceImpl ); @Autowired - IRegistrationWorkingSetService registrationWorkingSetService; + private IRegistrationWorkingSetService registrationWorkingSetService; @Qualifier("cdmRepository") @Autowired - CdmRepository repo; + private CdmRepository repo; @Override public SpecimenTypeDesignationSetDTO create(UUID registrationUuid, UUID typifiedNameUuid) { @@ -109,6 +109,7 @@ public class SpecimenTypeDesignationSetServiceImpl protected SpecimenTypeDesignationSetDTO specimenTypeDesignationSetDTO( RegistrationDTO regDTO, VersionableEntity baseEntity) { + @SuppressWarnings("rawtypes") Set typeDesignations = regDTO.getTypeDesignationsInWorkingSet(baseEntity); List specimenTypeDesignations = new ArrayList<>(typeDesignations.size()); typeDesignations.forEach(td -> specimenTypeDesignations.add((SpecimenTypeDesignation)td)); @@ -137,6 +138,7 @@ public class SpecimenTypeDesignationSetServiceImpl fieldUnit = repo.getOccurrenceService().save(fieldUnit); VersionableEntity baseEntity = bean.getBaseEntity(); + @SuppressWarnings("rawtypes") Set typeDesignations = regDTO.getTypeDesignationsInWorkingSet(baseEntity); for(TypeDesignationBase td : typeDesignations){ DerivationEvent de = DerivationEvent.NewInstance(DerivationEventType.GATHERING_IN_SITU()); @@ -193,11 +195,6 @@ public class SpecimenTypeDesignationSetServiceImpl } - /** - * @param dto - * @param specimenDeleteConfigurer - * @param std - */ protected void deleteSpecimenTypeDesignation(SpecimenTypeDesignationSetDTO dto, SpecimenTypeDesignation std) { // if(dto.getOwner() instanceof Registration){ @@ -220,11 +217,6 @@ public class SpecimenTypeDesignationSetServiceImpl // } } - /** - * @param session - * @param fieldUnit - * @param specimenTypeDesignation - */ protected void assureFieldUnit(FieldUnit fieldUnit, SpecimenTypeDesignation specimenTypeDesignation) { try { @@ -239,18 +231,14 @@ public class SpecimenTypeDesignationSetServiceImpl } } - /** - * @param std - * @return - * @throws Exception - */ private SpecimenOrObservationBase findEarliestOriginal(DerivedUnit du) throws Exception { - SpecimenOrObservationBase original = du; + SpecimenOrObservationBase original = du; while(du != null && du.getDerivedFrom() != null && !du.getDerivedFrom().getOriginals().isEmpty()) { + @SuppressWarnings("rawtypes") Iterator it = du.getDerivedFrom().getOriginals().iterator(); - SpecimenOrObservationBase nextOriginal = it.next(); + SpecimenOrObservationBase nextOriginal = it.next(); if(nextOriginal == null){ break; } @@ -281,9 +269,6 @@ public class SpecimenTypeDesignationSetServiceImpl return addCandidates; } - /** - * {@inheritDoc} - */ @Override @Transactional(readOnly=false) public void delete(SpecimenTypeDesignationSetDTO bean, boolean deleteFieldUnit) { @@ -291,11 +276,11 @@ public class SpecimenTypeDesignationSetServiceImpl @SuppressWarnings("unchecked") List specimenTypeDesignationDTOs = bean.getSpecimenTypeDesignationDTOs(); for(SpecimenTypeDesignationDTO stdDTO : specimenTypeDesignationDTOs){ - SpecimenTypeDesignation std = stdDTO.asSpecimenTypeDesignation(); - deleteSpecimenTypeDesignation(bean, std); - if(bean.getOwner() instanceof Registration){ - ((Registration)bean.getOwner()).getTypeDesignations().remove(std); - } + SpecimenTypeDesignation std = stdDTO.asSpecimenTypeDesignation(); + deleteSpecimenTypeDesignation(bean, std); + if(bean.getOwner() instanceof Registration){ + ((Registration)bean.getOwner()).getTypeDesignations().remove(std); + } } if(deleteFieldUnit){ @@ -305,5 +290,4 @@ public class SpecimenTypeDesignationSetServiceImpl String msg = result.toString(); } } - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/service/TaxonNameStringFilterablePagingProvider.java b/src/main/java/eu/etaxonomy/cdm/service/TaxonNameStringFilterablePagingProvider.java index 9ad08931..fe43371d 100644 --- a/src/main/java/eu/etaxonomy/cdm/service/TaxonNameStringFilterablePagingProvider.java +++ b/src/main/java/eu/etaxonomy/cdm/service/TaxonNameStringFilterablePagingProvider.java @@ -40,9 +40,8 @@ import eu.etaxonomy.cdm.persistence.query.OrderHint; * * @author a.kohlbecker * @since Jun 7, 2017 - * */ -public class TaxonNameStringFilterablePagingProvider implements FilterableStringRepresentationPagingProvider, FilterableCountProvider { +public class TaxonNameStringFilterablePagingProvider implements IFilterableStringRepresentationPagingProvider, FilterableCountProvider { private static final Logger logger = LogManager.getLogger(); @@ -56,7 +55,7 @@ public class TaxonNameStringFilterablePagingProvider implements FilterableString private List orderHints = OrderHint.ORDER_BY_TITLE_CACHE.asList(); - List initStrategy = DEFAULT_INIT_STRATEGY; + private List initStrategy = DEFAULT_INIT_STRATEGY; private TaxonNamePartsFilter namePartsFilter = new TaxonNamePartsFilter(); @@ -93,9 +92,6 @@ public class TaxonNameStringFilterablePagingProvider implements FilterableString registerNullSave(infraSpecificEpithetField, e -> namePartsFilter.setGenusOrUninomial(infraSpecificEpithetField.getValue())); } - /** - * - */ public void unlistenAllFields() { for(AbstractField f : registeredToFields.keySet()){ f.removeValueChangeListener(registeredToFields.get(f)); @@ -121,9 +117,6 @@ public class TaxonNameStringFilterablePagingProvider implements FilterableString } } - /** - * @param genusOrUninomialField - */ protected void registerNullSave(AbstractField field, ValueChangeListener listener) { if(field != null){ registeredToFields.put(field, listener); @@ -131,30 +124,16 @@ public class TaxonNameStringFilterablePagingProvider implements FilterableString } } - /** - * @return the matchMode - */ protected MatchMode getMatchMode() { return matchMode; } - - /** - * @param matchMode the matchMode to set - */ protected void setMatchMode(MatchMode matchMode) { this.matchMode = matchMode; } - /** - * @return the orderHints - */ protected List getOrderHints() { return orderHints; } - - /** - * @param orderHints the orderHints to set - */ protected void setOrderHints(List orderHints) { this.orderHints = orderHints; } @@ -162,10 +141,6 @@ public class TaxonNameStringFilterablePagingProvider implements FilterableString public TaxonNamePartsFilter getFilter(){ return namePartsFilter; } - - /** - * {@inheritDoc} - */ @Override public List findEntities(int firstRow, String filter) { @@ -222,15 +197,10 @@ public class TaxonNameStringFilterablePagingProvider implements FilterableString return lastPagedEntityUUIDs; } - public class UnknownFieldException extends Exception { - private static final long serialVersionUID = 1L; } - /** - * {@inheritDoc} - */ @Override public UUID idFor(String stringRepresentation) { if(stringRepresentation == null){ @@ -245,22 +215,15 @@ public class TaxonNameStringFilterablePagingProvider implements FilterableString return lastPagedEntityUUIDs.get(stringRepresentation); } - /** - * {@inheritDoc} - */ @Override public void clearIdCache() { lastPagedEntityUUIDs = null; } - /** - * @param asList - * @return - */ public void excludeNames(TaxonName ... excludedTaxonNames) { namePartsFilter.getExludedNamesUuids(); for(TaxonName n : excludedTaxonNames){ namePartsFilter.getExludedNamesUuids().add(n.getUuid()); } } -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/service/UserHelperAccess.java b/src/main/java/eu/etaxonomy/cdm/service/UserHelperAccess.java index ef65fdf2..05176997 100644 --- a/src/main/java/eu/etaxonomy/cdm/service/UserHelperAccess.java +++ b/src/main/java/eu/etaxonomy/cdm/service/UserHelperAccess.java @@ -19,7 +19,6 @@ import eu.etaxonomy.cdm.api.util.UserHelper; * * @author a.kohlbecker * @since May 23, 2017 - * */ @SpringComponent public class UserHelperAccess { @@ -33,13 +32,8 @@ public class UserHelperAccess { /** * Static accessor method to obtain the UserHelper bean - * - * @return */ public static UserHelper userHelper() { return userHelper; } - - - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/WorkflowSteps.java b/src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/WorkflowSteps.java index 2362314c..95f99bfd 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/WorkflowSteps.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/WorkflowSteps.java @@ -15,7 +15,6 @@ import eu.etaxonomy.cdm.vaadin.design.registration.WorkflowStepsDesign; /** * @author a.kohlbecker * @since Mar 10, 2017 - * */ @Deprecated // FIXME delete also all css styles if any public class WorkflowSteps extends WorkflowStepsDesign { diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/container/CdmSpringConnectionPool.java b/src/main/java/eu/etaxonomy/cdm/vaadin/container/CdmSpringConnectionPool.java deleted file mode 100644 index 109d8a9c..00000000 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/container/CdmSpringConnectionPool.java +++ /dev/null @@ -1,43 +0,0 @@ -/** -* Copyright (C) 2015 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.cdm.vaadin.container; - -import java.sql.Connection; -import java.sql.SQLException; - -import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; - -/** - * @author cmathew - * @since 9 Mar 2015 - * - * @deprecated unused! should be deleted - */ -@Deprecated -public class CdmSpringConnectionPool implements JDBCConnectionPool { - - private final Connection conn; - - public CdmSpringConnectionPool(Connection conn) { - this.conn = conn; - } - - @Override - public void destroy() { - } - - @Override - public void releaseConnection(Connection conn) { - } - - @Override - public Connection reserveConnection() throws SQLException { - return conn; - } -} diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/container/IdUuidName.java b/src/main/java/eu/etaxonomy/cdm/vaadin/container/IdUuidName.java index 532b2605..c9eee846 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/container/IdUuidName.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/container/IdUuidName.java @@ -31,23 +31,14 @@ public class IdUuidName { this.name = name; } - /** - * @return the id - */ public Object getId() { return id; } - /** - * @return the uuid - */ public UUID getUuid() { return uuid; } - /** - * @return the name - */ public String getName() { return name; } diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/InReferenceTypeValidator.java b/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/InReferenceTypeValidator.java index 8eee7729..c25e83cf 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/InReferenceTypeValidator.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/InReferenceTypeValidator.java @@ -40,6 +40,5 @@ public class InReferenceTypeValidator implements Validator { throw new InvalidValueException(Objects.toString(inReference.getType(), "[NULL]") + " is not a suitable in-reference type for " + Objects.toString(type, "[NULL]") ); } } - } -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/NomenclaturalReferenceExistsValidator.java b/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/NomenclaturalReferenceExistsValidator.java index be1995d7..ab44473f 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/NomenclaturalReferenceExistsValidator.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/NomenclaturalReferenceExistsValidator.java @@ -20,11 +20,9 @@ import eu.etaxonomy.cdm.vaadin.model.name.NameRelationshipDTO; * * @author a.kohlbecker * @since Mar 27, 2019 - * */ public class NomenclaturalReferenceExistsValidator implements Validator { - private static final long serialVersionUID = -7750232876262922982L; private String userHint = ""; @@ -33,9 +31,6 @@ public class NomenclaturalReferenceExistsValidator implements Validator { this.userHint = userHint; } - /** - * {@inheritDoc} - */ @Override public void validate(Object value) throws InvalidValueException { if(value != null){ @@ -48,16 +43,11 @@ public class NomenclaturalReferenceExistsValidator implements Validator { validateName(nameRelDto.getOtherName()); } } - } - /** - * @param name - */ public void validateName(TaxonName name) { if(name.getNomenclaturalReference() == null) { throw new InvalidValueException("The taxon name must have a nomenclatural reference. " + userHint); } } - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/PartialCompletenesValidator.java b/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/PartialCompletenesValidator.java index c2945277..ba5af8c3 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/PartialCompletenesValidator.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/PartialCompletenesValidator.java @@ -42,4 +42,4 @@ public class PartialCompletenesValidator implements Validator { } } } -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/PasswordsMatchValidator.java b/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/PasswordsMatchValidator.java index 5b6d04f8..62e7200e 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/PasswordsMatchValidator.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/PasswordsMatchValidator.java @@ -23,12 +23,9 @@ public class PasswordsMatchValidator extends AbstractStringValidator { private static final long serialVersionUID = -9048318480638222817L; - PasswordField firstField; - PasswordField secondField; + private PasswordField firstField; + private PasswordField secondField; - /** - * @param errorMessage - */ public PasswordsMatchValidator(String errorMessage, PasswordField firstField, PasswordField secondField) { super(errorMessage); this.firstField = firstField; @@ -42,5 +39,4 @@ public class PasswordsMatchValidator extends AbstractStringValidator { protected boolean isValidValue(String value) { return firstField.getValue().equals(secondField.getValue()); } - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/PasswordsPolicyValidator.java b/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/PasswordsPolicyValidator.java index a2dca8bf..b2fa933a 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/PasswordsPolicyValidator.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/PasswordsPolicyValidator.java @@ -41,7 +41,4 @@ public class PasswordsPolicyValidator implements Validator { } } } - - - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/TimePeriodCompletenesValidator.java b/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/TimePeriodCompletenesValidator.java index 71f66b6a..02455419 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/TimePeriodCompletenesValidator.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/data/validator/TimePeriodCompletenesValidator.java @@ -15,7 +15,6 @@ import eu.etaxonomy.cdm.model.common.TimePeriod; /** * @author a.kohlbecker * @since Mar 27, 2019 - * */ public class TimePeriodCompletenesValidator implements Validator { @@ -35,4 +34,4 @@ public class TimePeriodCompletenesValidator implements Validator { } } } -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/debug/CdmEntityInfoSorter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/debug/CdmEntityInfoSorter.java index 891fadfb..d1d51528 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/debug/CdmEntityInfoSorter.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/debug/CdmEntityInfoSorter.java @@ -22,12 +22,9 @@ public class CdmEntityInfoSorter implements ItemSorter { private static final long serialVersionUID = 1008554008146041297L; - Object[] propertyId; - boolean[] ascending; + private Object[] propertyId; + private boolean[] ascending; - /** - * {@inheritDoc} - */ @Override public void setSortProperties(Sortable container, Object[] propertyId, boolean[] ascending) { this.propertyId = propertyId; @@ -35,9 +32,6 @@ public class CdmEntityInfoSorter implements ItemSorter { } - /** - * {@inheritDoc} - */ @Override public int compare(Object itemId1, Object itemId2) { if(! (itemId1 instanceof CdmEntityInfo && itemId2 instanceof CdmEntityInfo) ){ @@ -47,7 +41,5 @@ public class CdmEntityInfoSorter implements ItemSorter { CdmEntityInfo infoItem2 = (CdmEntityInfo)itemId2; return infoItem1.getField().getName().compareToIgnoreCase(infoItem2.getField().getName()); - } - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/event/AbstractEntityEvent.java b/src/main/java/eu/etaxonomy/cdm/vaadin/event/AbstractEntityEvent.java index 403d1b75..1184c9af 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/event/AbstractEntityEvent.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/event/AbstractEntityEvent.java @@ -15,17 +15,16 @@ import eu.etaxonomy.vaadin.mvp.AbstractView; /** * @author a.kohlbecker * @since May 10, 2017 - * */ -public abstract class AbstractEntityEvent { - - private UUID entityUuid = null; +public abstract class AbstractEntityEvent> { protected T type; - private AbstractView sourceView = null; + private UUID entityUuid = null; - public AbstractEntityEvent(T type, UUID entityUuid, AbstractView sourceView) { + private AbstractView sourceView = null; + + public AbstractEntityEvent(T type, UUID entityUuid, AbstractView sourceView) { this.entityUuid = entityUuid; this.type = type; this.sourceView = sourceView; @@ -34,9 +33,6 @@ public abstract class AbstractEntityEvent { } } - /** - * @return the entityId - */ public UUID getEntityUuid() { return entityUuid; } @@ -45,11 +41,7 @@ public abstract class AbstractEntityEvent { return type; } - /** - * @return the sourceView - */ - public AbstractView getSourceView() { + public AbstractView getSourceView() { return sourceView; } - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/event/AuthenticationAttemptEvent.java b/src/main/java/eu/etaxonomy/cdm/vaadin/event/AuthenticationAttemptEvent.java index cdcd6c74..6d303136 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/event/AuthenticationAttemptEvent.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/event/AuthenticationAttemptEvent.java @@ -16,36 +16,22 @@ import com.vaadin.ui.Button.ClickEvent; * * @author a.kohlbecker * @since Apr 25, 2017 - * */ public class AuthenticationAttemptEvent implements AuthenticationEvent{ - ClickEvent e; - String userName; + private ClickEvent e; + private String userName; - /** - * @param e - * @param userName - */ public AuthenticationAttemptEvent(ClickEvent e, String userName) { this.e = e; this.userName = userName; } - /** - * @return the e - */ public ClickEvent getE() { return e; } - /** - * @return the userName - */ public String getUserName() { return userName; } - - - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/KindOfUnitTerms.java b/src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/KindOfUnitTerms.java index 911f26dc..8cfd1032 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/KindOfUnitTerms.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/KindOfUnitTerms.java @@ -20,10 +20,8 @@ import eu.etaxonomy.cdm.model.term.TermVocabulary; * These terms are specific to the phycobank project but are temporarily necessary in * cdmlib-services for {@link SpecimenTypeDesignationDTO} * - * * @author a.kohlbecker * @since Jun 20, 2017 - * */ public class KindOfUnitTerms { diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/WorkflowStep.java b/src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/WorkflowStep.java index 53fc9fd9..691efccf 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/WorkflowStep.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/WorkflowStep.java @@ -33,16 +33,10 @@ public enum WorkflowStep { this.representation = representation; } - /** - * @return the representation - */ public String getRepresentation() { return representation; } - /** - * @return the stepIndex - */ public int getStepIndex() { return stepIndex; } @@ -72,4 +66,4 @@ public enum WorkflowStep { } } } -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/permission/AccessRestrictedViewControlBean.java b/src/main/java/eu/etaxonomy/cdm/vaadin/permission/AccessRestrictedViewControlBean.java index 8cef4fb8..3a97c92d 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/permission/AccessRestrictedViewControlBean.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/permission/AccessRestrictedViewControlBean.java @@ -41,4 +41,4 @@ public class AccessRestrictedViewControlBean implements ViewInstanceAccessContro logger.debug("allowing view by fall through, no check performed"); return true; } -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/permission/AnnotationBasedAccessControlBean.java b/src/main/java/eu/etaxonomy/cdm/vaadin/permission/AnnotationBasedAccessControlBean.java index bc877482..5633a5a8 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/permission/AnnotationBasedAccessControlBean.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/permission/AnnotationBasedAccessControlBean.java @@ -25,7 +25,6 @@ import com.vaadin.ui.UI; * @author a.kohlbecker * @since Apr 24, 2017 * - * * (FIMXE 1. consider renaming this class and its interface, since it is no longer annotation based!!!!) * * FIMXE 2. this class should implement ViewAccessControl. The view class and annotations can be accessed diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/permission/AnnotationBasedAccessControlConfiguration.java b/src/main/java/eu/etaxonomy/cdm/vaadin/permission/AnnotationBasedAccessControlConfiguration.java index 53438b80..94a5e35d 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/permission/AnnotationBasedAccessControlConfiguration.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/permission/AnnotationBasedAccessControlConfiguration.java @@ -16,7 +16,6 @@ import com.vaadin.spring.annotation.UIScope; /** * @author a.kohlbecker * @since Apr 24, 2017 - * */ @Configuration public class AnnotationBasedAccessControlConfiguration { diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/permission/CdmEditDeletePermissionTester.java b/src/main/java/eu/etaxonomy/cdm/vaadin/permission/CdmEditDeletePermissionTester.java index 5d77582e..10f1a0fe 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/permission/CdmEditDeletePermissionTester.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/permission/CdmEditDeletePermissionTester.java @@ -19,7 +19,6 @@ import eu.etaxonomy.vaadin.permission.EditPermissionTester; * * @author a.kohlbecker * @since Apr 20, 2018 - * */ public class CdmEditDeletePermissionTester implements EditPermissionTester { @Override diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/permission/PermissionDebugUtils.java b/src/main/java/eu/etaxonomy/cdm/vaadin/permission/PermissionDebugUtils.java index ac1df241..02fde123 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/permission/PermissionDebugUtils.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/permission/PermissionDebugUtils.java @@ -40,7 +40,6 @@ import eu.etaxonomy.cdm.service.UserHelperAccess; * * @author a.kohlbecker * @since Oct 11, 2017 - * */ @SpringComponent @Profile("debug") @@ -79,8 +78,5 @@ public class PermissionDebugUtils implements Serializable { button.addClickListener(e -> UserHelperAccess.userHelper().createAuthorityFor(UserHelperAccess.userHelper().userName(), cdmType, entitiyUuid, crud, property)); button.addStyleName(ValoTheme.BUTTON_DANGER); return button; - } - - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/permission/ReleasableResourcesView.java b/src/main/java/eu/etaxonomy/cdm/vaadin/permission/ReleasableResourcesView.java index c8a109d1..8429a6f7 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/permission/ReleasableResourcesView.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/permission/ReleasableResourcesView.java @@ -11,7 +11,6 @@ package eu.etaxonomy.cdm.vaadin.permission; /** * @author a.kohlbecker * @since 25.10.2017 - * */ public interface ReleasableResourcesView { diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/util/formatter/PartialFormatter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/util/formatter/PartialFormatter.java index d94e08b2..38d0c01c 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/util/formatter/PartialFormatter.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/util/formatter/PartialFormatter.java @@ -17,17 +17,16 @@ import eu.etaxonomy.cdm.model.common.TimePeriod; /** * @author a.kohlbecker * @since Apr 28, 2017 - * */ public class PartialFormatter { private DateTimeFormat format; - private static final DateTimeFormatter dmyDotDayMonthYear = org.joda.time.format.DateTimeFormat.forPattern("dd.MM.y"); + private static final DateTimeFormatter dmyDotDayMonthYear = org.joda.time.format.DateTimeFormat.forPattern("dd.MM.y"); - private static final DateTimeFormatter dmyDotMonthYear = org.joda.time.format.DateTimeFormat.forPattern("MM.y"); + private static final DateTimeFormatter dmyDotMonthYear = org.joda.time.format.DateTimeFormat.forPattern("MM.y"); - private static final DateTimeFormatter dmyDotYear = org.joda.time.format.DateTimeFormat.forPattern("y"); + private static final DateTimeFormatter dmyDotYear = org.joda.time.format.DateTimeFormat.forPattern("y"); public PartialFormatter(DateTimeFormat format) { this.format = format; @@ -43,10 +42,6 @@ public class PartialFormatter { } } - /** - * @param partial - * @return - */ private DateTimeFormatter determine_ISO860_Formatter(Partial partial) { if (partial.isSupported(TimePeriod.DAY_TYPE)) { return ISODateTimeFormat.yearMonthDay(); @@ -55,13 +50,8 @@ public class PartialFormatter { return ISODateTimeFormat.yearMonth(); } return ISODateTimeFormat.year(); - } - /** - * @param partial - * @return - */ private DateTimeFormatter determine_DMY_DOT_Formatter(Partial partial) { if (partial.isSupported(TimePeriod.DAY_TYPE)) { return dmyDotDayMonthYear; @@ -70,7 +60,5 @@ public class PartialFormatter { return dmyDotMonthYear; } return dmyDotYear; - } - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/util/formatter/TimePeriodFormatter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/util/formatter/TimePeriodFormatter.java index 1f875722..85256d6b 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/util/formatter/TimePeriodFormatter.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/util/formatter/TimePeriodFormatter.java @@ -18,7 +18,6 @@ import eu.etaxonomy.cdm.model.common.TimePeriod; * * @author a.kohlbecker * @since Apr 26, 2017 - * */ public class TimePeriodFormatter { @@ -46,5 +45,4 @@ public class TimePeriodFormatter { return sb.toString(); } } - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/AbstractPageView.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/AbstractPageView.java index 3a0b40d8..d5408544 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/AbstractPageView.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/AbstractPageView.java @@ -28,9 +28,10 @@ import eu.etaxonomy.vaadin.mvp.AbstractView; * * @author a.kohlbecker * @since Mar 20, 2017 - * */ -public abstract class AbstractPageView

    extends AbstractView

    { +public abstract class AbstractPageView

    > extends AbstractView

    { + + private static final long serialVersionUID = -8669483572788112285L; private VerticalLayout layout; @@ -38,10 +39,6 @@ public abstract class AbstractPageView

    extends Abst private Label header; - - /** - * - */ public AbstractPageView() { layout = new VerticalLayout(); layout.setSizeFull(); @@ -57,9 +54,6 @@ public abstract class AbstractPageView

    extends Abst this.setSizeFull(); } - /** - * - */ public void updateHeader() { header.setValue("

    " + getHeaderText() + "
    " + getSubHeaderText() + "
    "); } @@ -72,7 +66,6 @@ public abstract class AbstractPageView

    extends Abst for(Component c : contentComponents){ layout.removeComponent(c); } - } protected void addContentComponent(Component component, Float expandRatio){ @@ -83,22 +76,14 @@ public abstract class AbstractPageView

    extends Abst } } - - /** * Provides the sub header text - * - * @return */ protected abstract String getHeaderText(); /** * Provides the header text - * - * @return */ protected abstract String getSubHeaderText(); - - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/AccountRegistrationPresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/AccountRegistrationPresenter.java index 71336899..e10bddbd 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/AccountRegistrationPresenter.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/AccountRegistrationPresenter.java @@ -54,7 +54,7 @@ public class AccountRegistrationPresenter extends AbstractPresenter implements Even } } - private void requestPasswordReset() throws MalformedURLException, ExecutionException { + private void requestPasswordReset() throws MalformedURLException { String userNameOrEmail = getView().getLoginDialog().getUserNameOrEmail().getValue(); URL servletBaseUrl = VaadinServletUtilities.getServletBaseUrl(); logger.debug("UserAccountAction.REQUEST_PASSWORD_RESET for " + servletBaseUrl + ", userNameOrEmail:" + userNameOrEmail); @@ -241,11 +241,11 @@ public class LoginPresenter extends AbstractPresenter implements Even } } - private void requestAccountCreation() throws MalformedURLException, MailException, AddressException, AccountSelfManagementException, ExecutionException { + private void requestAccountCreation() throws MalformedURLException, MailException, AddressException, AccountSelfManagementException { String emailAddress = getView().getLoginDialog().getEmail().getValue(); URL servletBaseUrl = VaadinServletUtilities.getServletBaseUrl(); - logger.debug("UserAccountAction.REGISTER_ACCOUNT for " + servletBaseUrl + ", emailAddress:" + emailAddress); + if (logger.isDebugEnabled()) {logger.debug("UserAccountAction.REGISTER_ACCOUNT for " + servletBaseUrl + ", emailAddress:" + emailAddress);} CountDownLatch finshedSignal = new CountDownLatch(1); List asyncExceptions = new ArrayList<>(1); @@ -294,4 +294,4 @@ public class LoginPresenter extends AbstractPresenter implements Even } } } -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/LoginView.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/LoginView.java index 0ef6e71a..1124deb9 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/LoginView.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/LoginView.java @@ -8,22 +8,18 @@ */ package eu.etaxonomy.cdm.vaadin.view; -import com.vaadin.ui.themes.ValoTheme; - import eu.etaxonomy.cdm.vaadin.component.LoginDialog; import eu.etaxonomy.vaadin.mvp.ApplicationView; /** * @author a.kohlbecker * @since Apr 25, 2017 - * */ public interface LoginView extends ApplicationView { - LoginDialog getLoginDialog(); - - void clearMessage(); + public LoginDialog getLoginDialog(); - void showErrorMessage(String text); + public void clearMessage(); -} + public void showErrorMessage(String text); +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/LoginViewBean.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/LoginViewBean.java index f5646026..c2271ed7 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/LoginViewBean.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/LoginViewBean.java @@ -33,7 +33,9 @@ import eu.etaxonomy.vaadin.ui.navigation.NavigationEvent; * @since Apr 25, 2017 */ @SpringView(name=LoginViewBean.NAME) -public class LoginViewBean extends AbstractView implements LoginView, View { +public class LoginViewBean + extends AbstractView + implements LoginView, View { private static final long serialVersionUID = 8527714663738364972L; diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/PasswordResetPresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/PasswordResetPresenter.java index 35c21ece..071b0c41 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/PasswordResetPresenter.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/PasswordResetPresenter.java @@ -53,7 +53,7 @@ public class PasswordResetPresenter extends AbstractPresenter protected EventBus.UIEventBus uiEventBus; - PasswordResetRequest resetRequest = null; + private PasswordResetRequest resetRequest = null; @Autowired protected void setUIEventBus(EventBus.UIEventBus uiEventBus){ @@ -118,7 +118,6 @@ public class PasswordResetPresenter extends AbstractPresenter getView().showErrorMessage("A timeout has occured, please try again."); } } - } } -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/PasswordResetView.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/PasswordResetView.java index 443d91c7..ec45bc5e 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/PasswordResetView.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/PasswordResetView.java @@ -19,9 +19,7 @@ public interface PasswordResetView extends ApplicationView public PasswordField getPassword1Field() { return password1Field; } - - - - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/PerEntityAuthorityGrantingEditor.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/PerEntityAuthorityGrantingEditor.java index eb286c0e..bba52cde 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/PerEntityAuthorityGrantingEditor.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/PerEntityAuthorityGrantingEditor.java @@ -16,7 +16,6 @@ import eu.etaxonomy.cdm.model.permission.CRUD; /** * @author a.kohlbecker * @since 20.10.2017 - * */ public interface PerEntityAuthorityGrantingEditor { @@ -28,4 +27,4 @@ public interface PerEntityAuthorityGrantingEditor { */ public void grantToCurrentUser(EnumSet crud); -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/RedirectToLoginView.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/RedirectToLoginView.java index 03f9314a..8237c675 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/RedirectToLoginView.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/RedirectToLoginView.java @@ -37,17 +37,15 @@ import eu.etaxonomy.vaadin.ui.navigation.NavigationManager; * * @author a.kohlbecker * @since Jul 13, 2017 - * */ @SpringComponent @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) public class RedirectToLoginView extends VerticalLayout implements View { - private static final long serialVersionUID = -8763747518841365925L; @Autowired - NavigationManager navigationManager; + private NavigationManager navigationManager; @Autowired protected EventBus.UIEventBus uiEventBus; @@ -63,9 +61,6 @@ public class RedirectToLoginView extends VerticalLayout implements View { setComponentAlignment(header, Alignment.MIDDLE_CENTER); } - /** - * {@inheritDoc} - */ @Override public void enter(ViewChangeEvent event) { @@ -75,5 +70,4 @@ public class RedirectToLoginView extends VerticalLayout implements View { uiEventBus.publish(this, new NavigationEvent(LoginViewBean.NAME, currentState)); } } - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/common/InstitutionEditorPresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/common/InstitutionEditorPresenter.java index 25446509..b95ca8a1 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/common/InstitutionEditorPresenter.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/common/InstitutionEditorPresenter.java @@ -67,40 +67,26 @@ public class InstitutionEditorPresenter extends AbstractCdmDTOEditorPresenter getService() { // TODO Auto-generated method stub return null; } - /** - * {@inheritDoc} - */ @Override public void handleViewEntered() { super.handleViewEntered(); @@ -156,33 +142,22 @@ public class InstitutionEditorPresenter extends AbstractCdmDTOEditorPresenter defaultCdmEntityInstantiator() { - return new BeanInstantiator(){ + return new BeanInstantiator(){ @Override public Institution createNewBean() { return Institution.NewInstance(); } - }; } - - - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/common/InstitutionPopupEditor.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/common/InstitutionPopupEditor.java index dba1fb0b..97faf1ec 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/common/InstitutionPopupEditor.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/common/InstitutionPopupEditor.java @@ -26,7 +26,6 @@ import eu.etaxonomy.vaadin.mvp.AbstractCdmDTOPopupEditor; /** * @author a.kohlbecker * @since Dec 21, 2017 - * */ @SpringComponent @Scope("prototype") @@ -38,55 +37,35 @@ public class InstitutionPopupEditor extends AbstractCdmDTOPopupEditor partOfCombobox; + private TextField codeField; + private TextField codeStandardField; + private TextField townOrLocationField; + private ToOneRelatedEntityCombobox partOfCombobox; - - /** - * @param layout - * @param dtoType - */ public InstitutionPopupEditor() { super(new GridLayout(GRID_COLS, GRID_ROWS), InstitutionDTO.class); } - /** - * {@inheritDoc} - */ @Override public String getWindowCaption() { return "Institution editor"; } - /** - * {@inheritDoc} - */ @Override public int getWindowWidth() { return 500; } - /** - * {@inheritDoc} - */ @Override public void focusFirst() { codeField.focus(); } - /** - * {@inheritDoc} - */ @Override protected String getDefaultComponentStyles() { return "tiny"; } - /** - * {@inheritDoc} - */ @Override protected void initContent() { @@ -103,7 +82,7 @@ public class InstitutionPopupEditor extends AbstractCdmDTOPopupEditor("Part of", Institution.class); + partOfCombobox = new ToOneRelatedEntityCombobox<>("Part of", Institution.class); partOfCombobox.setWidth(300, Unit.PIXELS); @@ -134,7 +113,6 @@ public class InstitutionPopupEditor extends AbstractCdmDTOPopupEditor getPartOfCombobox(){ return partOfCombobox; } -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/NameTypeDesignationPresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/NameTypeDesignationPresenter.java index 69114ef3..fbe7e328 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/NameTypeDesignationPresenter.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/NameTypeDesignationPresenter.java @@ -277,7 +277,7 @@ public class NameTypeDesignationPresenter EntityChangeEvent changeEvent = new EntityChangeEvent<>(bean, Type.REMOVED, (AbstractView) getView()); viewEventBus.publish(this, changeEvent); } else { - CdmStore.handleDeleteresultInError(deletResult); + CdmStore.handleDeleteResultInError(deletResult); } } diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationSetEditorPresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationSetEditorPresenter.java index 58fd8320..bc8fa2dc 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationSetEditorPresenter.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationSetEditorPresenter.java @@ -385,18 +385,11 @@ public class SpecimenTypeDesignationSetEditorPresenter specimenTypeDesignationSetService.save(dto); } - /** - * {@inheritDoc} - */ @Override protected void deleteBean(SpecimenTypeDesignationSetDTO bean) { specimenTypeDesignationSetService.delete(bean, true); } - /** - * @param element - * @return - */ private void addTypeDesignation(SpecimenTypeDesignationDTO element) { getView().updateAllowDeleteTypeDesignation(); } @@ -407,9 +400,6 @@ public class SpecimenTypeDesignationSetEditorPresenter * The actual deletion of the SpecimenTypeDesignation and DerivedUnit will take place in {@link #saveBean(SpecimenTypeDesignationSetDTO)} * * TODO once https://dev.e-taxonomy.eu/redmine/issues/7077 is fixed dissociating from the Registration could be removed here - * - * @param e - * @return */ private void deleteTypeDesignation(SpecimenTypeDesignationDTO element) { @@ -421,16 +411,10 @@ public class SpecimenTypeDesignationSetEditorPresenter getView().updateAllowDeleteTypeDesignation(); } - /** - * @param crud - */ public void setGrantsForCurrentUser(EnumSet crud) { this.crud = crud; } - /** - * {@inheritDoc} - */ @Override public ICdmEntityUuidCacher getCache() { return cache; @@ -465,7 +449,7 @@ public class SpecimenTypeDesignationSetEditorPresenter @EventBusListenerMethod(filter = EntityChangeEventFilter.OccurrenceCollectionFilter.class) - public void onCollectionEvent(EntityChangeEvent event){ + public void onCollectionEvent(EntityChangeEvent event){ if(event.getSourceView() instanceof AbstractPopupEditor) { diff --git a/src/main/java/eu/etaxonomy/vaadin/README.md b/src/main/java/eu/etaxonomy/vaadin/README.md index 78232bf0..2c7f6342 100644 --- a/src/main/java/eu/etaxonomy/vaadin/README.md +++ b/src/main/java/eu/etaxonomy/vaadin/README.md @@ -1,10 +1,10 @@ # Vaadin UI and Spring based MVP Framework -* `./ui` *A VaadinSpring bases MVP framework with popup views and editors with easy data binding.* +* `./ui` *A VaadinSpring based MVP framework with popup views and editors with easy data binding.* * `./mvp` *A spring based UI framework for Vaadin which brings a responsive menu layout and support for the mvp popup views.* -These framework is based on ideas of Peter Letho from Vaadin: -* ["Supporting mobile, desktop and tablet by building impressive layout systems"](https://www.youtube.com/watch?v=zKJ7tkLS8XE). The according source code is here https://github.com/peterl1084/devday2016" a the Vaadin DevDay 2016. The original framework was using Java Web Beans (CDI) which has been ported to Spring DI for this project. -* **devday-spring** a VaadinSpring based example project with MVP integration - the according soure code is here https://github.com/peterl1084/devday-spring +This framework is based on ideas of Peter Letho from Vaadin: +* ["Supporting mobile, desktop and tablet by building impressive layout systems"](https://www.youtube.com/watch?v=zKJ7tkLS8XE). The according source code is here https://github.com/peterl1084/devday2016" at the Vaadin DevDay 2016. The original framework was using Java Web Beans (CDI) which has been ported to Spring DI for this project. +* **devday-spring** a VaadinSpring based example project with MVP integration - the according source code is here https://github.com/peterl1084/devday-spring diff --git a/src/main/java/eu/etaxonomy/vaadin/component/CompositeCustomField.java b/src/main/java/eu/etaxonomy/vaadin/component/CompositeCustomField.java index e640da95..9d1bea97 100644 --- a/src/main/java/eu/etaxonomy/vaadin/component/CompositeCustomField.java +++ b/src/main/java/eu/etaxonomy/vaadin/component/CompositeCustomField.java @@ -45,7 +45,6 @@ import eu.etaxonomy.cdm.vaadin.event.NestedButtonStateUpdater; * @since May 12, 2017 * * IMPORTANT see also {@link CompositeStyledComponent} which has almost the same functionality. - * */ @SuppressWarnings("serial") public abstract class CompositeCustomField extends CustomField implements NestedFieldGroup { diff --git a/src/main/java/eu/etaxonomy/vaadin/component/CompositeStyledComponent.java b/src/main/java/eu/etaxonomy/vaadin/component/CompositeStyledComponent.java index 652a18be..6f3734ce 100644 --- a/src/main/java/eu/etaxonomy/vaadin/component/CompositeStyledComponent.java +++ b/src/main/java/eu/etaxonomy/vaadin/component/CompositeStyledComponent.java @@ -20,7 +20,6 @@ import com.vaadin.ui.CssLayout; * @since May 22, 2017 * * IMPORTANT see also {@link CompositeCustomField} which has almost the same functionality. - * */ @SuppressWarnings("serial") public abstract class CompositeStyledComponent extends CssLayout { @@ -65,12 +64,9 @@ public abstract class CompositeStyledComponent extends CssLayout { /** * Implementations preferably call this method in the constructor - * - * @param component - * @return */ - protected boolean addStyledComponents(Component ... component){ - List componentList = Arrays.asList(component); + protected boolean addStyledComponents(Component ... components){ + List componentList = Arrays.asList(components); componentList.forEach(c -> applyCurrentStyleNames(c)); return styledComponents.addAll(componentList); } @@ -80,6 +76,5 @@ public abstract class CompositeStyledComponent extends CssLayout { * to prevent these styles from being overwritten when setStyleName() id called on the composite field. */ protected abstract void addDefaultStyles(); - //-------- -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/vaadin/component/EntityFieldInstantiator.java b/src/main/java/eu/etaxonomy/vaadin/component/EntityFieldInstantiator.java index 3e5182dc..76baad91 100644 --- a/src/main/java/eu/etaxonomy/vaadin/component/EntityFieldInstantiator.java +++ b/src/main/java/eu/etaxonomy/vaadin/component/EntityFieldInstantiator.java @@ -11,7 +11,6 @@ package eu.etaxonomy.vaadin.component; /** * @author a.kohlbecker * @since Dec 11, 2017 - * */ public abstract class EntityFieldInstantiator { diff --git a/src/main/java/eu/etaxonomy/vaadin/component/EntitySupport.java b/src/main/java/eu/etaxonomy/vaadin/component/EntitySupport.java index 36bfb404..a5a20049 100644 --- a/src/main/java/eu/etaxonomy/vaadin/component/EntitySupport.java +++ b/src/main/java/eu/etaxonomy/vaadin/component/EntitySupport.java @@ -8,6 +8,8 @@ */ package eu.etaxonomy.vaadin.component; +import com.vaadin.data.Property.ValueChangeListener; + /** * Interface to ship around equality problems of entities which have modified data. * @@ -40,6 +42,6 @@ public interface EntitySupport { * * @param bean */ - void replaceEntityValue(V bean); + public void replaceEntityValue(V bean); } \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/vaadin/component/NameRelationField.java b/src/main/java/eu/etaxonomy/vaadin/component/NameRelationField.java index ba213e84..1b1eeaa2 100644 --- a/src/main/java/eu/etaxonomy/vaadin/component/NameRelationField.java +++ b/src/main/java/eu/etaxonomy/vaadin/component/NameRelationField.java @@ -32,17 +32,12 @@ import eu.etaxonomy.cdm.vaadin.event.ToOneRelatedEntityButtonUpdater; import eu.etaxonomy.cdm.vaadin.model.name.NameRelationshipDTO; import eu.etaxonomy.cdm.vaadin.util.ReferenceEllypsisCaptionGenerator; - /** * @author a.kohlbecker * @since May 3, 2018 - * */ public class NameRelationField extends CompositeCustomField { - /** - * - */ public static final String PRIMARY_STYLE = "v-name-relation-field"; private static final long serialVersionUID = -7080885013120044655L; @@ -57,15 +52,15 @@ public class NameRelationField extends CompositeCustomField private BeanFieldGroup fieldGroup = new BeanFieldGroup<>(NameRelationshipDTO.class); - ToOneRelatedEntityCombobox relatedNameComboBox; + private ToOneRelatedEntityCombobox relatedNameComboBox; - ToOneRelatedEntityCombobox citatonComboBox; + private ToOneRelatedEntityCombobox citatonComboBox; - TextFieldNFix citationMicroReferenceField = new TextFieldNFix(); + private TextFieldNFix citationMicroReferenceField = new TextFieldNFix(); - TextFieldNFix ruleConsideredField = new TextFieldNFix(); + private TextFieldNFix ruleConsideredField = new TextFieldNFix(); - NativeSelect codeEditionSelect = new NativeSelect(); + private NativeSelect codeEditionSelect = new NativeSelect(); private Direction direction; @@ -76,9 +71,6 @@ public class NameRelationField extends CompositeCustomField private String nameFieldCaption; - /** - * @param string - */ public NameRelationField(String caption, String nameFieldCaption, Direction direction, NameRelationshipType type) { this.direction = direction; this.type = type; @@ -171,17 +163,11 @@ public class NameRelationField extends CompositeCustomField return compositeWrapper; } - /** - * {@inheritDoc} - */ @Override public Class getType() { return NameRelationshipDTO.class; } - /** - * {@inheritDoc} - */ @Override protected void setInternalValue(NameRelationshipDTO newValue) { @@ -216,23 +202,16 @@ public class NameRelationField extends CompositeCustomField } - private void updateToolBarButtonStates(){ boolean hasValue = getValue() != null; removeButton.setVisible(hasValue); newButton.setVisible(!hasValue); } - /** - * @return the relatedNameComboBox - */ public ToOneRelatedEntityCombobox getRelatedNameComboBox() { return relatedNameComboBox; } - /** - * @return the citatonComboBox - */ public ToOneRelatedEntityCombobox getCitatonComboBox() { return citatonComboBox; } @@ -241,15 +220,10 @@ public class NameRelationField extends CompositeCustomField return codeEditionSelect; } - /** - * {@inheritDoc} - */ @Override public void setReadOnly(boolean readOnly) { super.setReadOnly(readOnly); setDeepReadOnly(readOnly, grid, null); setDeepReadOnly(readOnly, toolBar, null); } - - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/vaadin/component/NameRelationsListEditor.java b/src/main/java/eu/etaxonomy/vaadin/component/NameRelationsListEditor.java index 63b058fe..3ea296ca 100644 --- a/src/main/java/eu/etaxonomy/vaadin/component/NameRelationsListEditor.java +++ b/src/main/java/eu/etaxonomy/vaadin/component/NameRelationsListEditor.java @@ -30,10 +30,6 @@ public class NameRelationsListEditor extends ToManyRelatedEntitiesListSelect referenceSelectInstantiator; - /** - * @param itemType - * @param caption - */ public NameRelationsListEditor(String caption) { super(NameRelationshipDTO.class, null, caption); this.fieldType = NameRelationField.class; @@ -43,9 +39,6 @@ public class NameRelationsListEditor extends ToManyRelatedEntitiesListSelect(Reference.class); } - /** - * {@inheritDoc} - */ // @Override // protected NameRelationField newFieldInstance(NameRelationshipDTO val) throws InstantiationException, IllegalAccessException { // @@ -60,9 +53,6 @@ public class NameRelationsListEditor extends ToManyRelatedEntitiesListSelect captionGenerator) { nameSelectInstantiator.setCaptionGenerator(captionGenerator); } @@ -73,12 +63,7 @@ public class NameRelationsListEditor extends ToManyRelatedEntitiesListSelect captionGenerator) { referenceSelectInstantiator.setCaptionGenerator(captionGenerator); } - - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/vaadin/component/NestedFieldGroup.java b/src/main/java/eu/etaxonomy/vaadin/component/NestedFieldGroup.java index fa94d178..7b48f8f6 100644 --- a/src/main/java/eu/etaxonomy/vaadin/component/NestedFieldGroup.java +++ b/src/main/java/eu/etaxonomy/vaadin/component/NestedFieldGroup.java @@ -15,7 +15,6 @@ import com.vaadin.data.fieldgroup.FieldGroup; /** * @author a.kohlbecker * @since May 12, 2017 - * */ public interface NestedFieldGroup { @@ -28,9 +27,6 @@ public interface NestedFieldGroup { public abstract void registerParentFieldGroup(FieldGroup parent); - /** - * @param parent - */ public abstract void unregisterParentFieldGroup(FieldGroup parent); } diff --git a/src/main/java/eu/etaxonomy/vaadin/component/ReloadableSelect.java b/src/main/java/eu/etaxonomy/vaadin/component/ReloadableSelect.java index 40a825f3..9dbc0f72 100644 --- a/src/main/java/eu/etaxonomy/vaadin/component/ReloadableSelect.java +++ b/src/main/java/eu/etaxonomy/vaadin/component/ReloadableSelect.java @@ -22,4 +22,4 @@ public interface ReloadableSelect { */ public void reload(); -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/vaadin/component/SwitchButton.java b/src/main/java/eu/etaxonomy/vaadin/component/SwitchButton.java index 57868979..bf773657 100644 --- a/src/main/java/eu/etaxonomy/vaadin/component/SwitchButton.java +++ b/src/main/java/eu/etaxonomy/vaadin/component/SwitchButton.java @@ -13,7 +13,6 @@ import org.vaadin.teemu.switchui.Switch; /** * @author a.kohlbecker * @since May 11, 2017 - * */ public class SwitchButton extends Switch { @@ -25,9 +24,6 @@ public class SwitchButton extends Switch { super(); } - /** - * {@inheritDoc} - */ @Override protected void setInternalValue(Boolean newValue) { super.setInternalValue(newValue); @@ -39,5 +35,4 @@ public class SwitchButton extends Switch { public void setValueSetLister(ValueChangeListener valueSetListener){ this.valueSetListener = valueSetListener; } - } \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/vaadin/component/ToManyRelatedEntitiesComboboxSelect.java b/src/main/java/eu/etaxonomy/vaadin/component/ToManyRelatedEntitiesComboboxSelect.java index 6e809b59..f05c4834 100644 --- a/src/main/java/eu/etaxonomy/vaadin/component/ToManyRelatedEntitiesComboboxSelect.java +++ b/src/main/java/eu/etaxonomy/vaadin/component/ToManyRelatedEntitiesComboboxSelect.java @@ -20,7 +20,6 @@ import eu.etaxonomy.cdm.vaadin.view.name.CachingPresenter; * * @author a.kohlbecker * @since Jun 7, 2017 - * */ public class ToManyRelatedEntitiesComboboxSelect extends ToManyRelatedEntitiesListSelect> { @@ -28,11 +27,6 @@ public class ToManyRelatedEntitiesComboboxSelect extends ToMan private ReloadableLazyComboBoxInstantiator fieldInstantiator; - /** - * @param itemType - * @param fieldType - * @param caption - */ public ToManyRelatedEntitiesComboboxSelect(Class itemType, String caption) { super(itemType, null, caption); // TODO this.fieldTyp = LazyComboBox.class does not work @@ -40,12 +34,9 @@ public class ToManyRelatedEntitiesComboboxSelect extends ToMan this.fieldType = (Class>) field.getClass(); // addEmptyRowOnInitContent is false in this class since adding row is only possible after setting the PagingProviders addEmptyRowOnInitContent = false; - fieldInstantiator = new ReloadableLazyComboBoxInstantiator(itemType); + fieldInstantiator = new ReloadableLazyComboBoxInstantiator<>(itemType); } - /** - * {@inheritDoc} - */ @Override protected ReloadableLazyComboBox newFieldInstance(V val) throws InstantiationException, IllegalAccessException { @@ -61,11 +52,7 @@ public class ToManyRelatedEntitiesComboboxSelect extends ToMan setInternalValue(null); } - /** - * @param cdmTitleCacheCaptionGenerator - */ public void setCaptionGenerator(CaptionGenerator captionGenerator) { fieldInstantiator.setCaptionGenerator(captionGenerator); } - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/vaadin/component/ToManyRelatedEntitiesListSelect.java b/src/main/java/eu/etaxonomy/vaadin/component/ToManyRelatedEntitiesListSelect.java index 8e7a63cf..a97ef0f2 100644 --- a/src/main/java/eu/etaxonomy/vaadin/component/ToManyRelatedEntitiesListSelect.java +++ b/src/main/java/eu/etaxonomy/vaadin/component/ToManyRelatedEntitiesListSelect.java @@ -48,7 +48,6 @@ import eu.etaxonomy.vaadin.permission.EditPermissionTester; * * @author a.kohlbecker * @since May 11, 2017 - * */ public class ToManyRelatedEntitiesListSelect> extends CompositeCustomField> { @@ -116,11 +115,9 @@ public class ToManyRelatedEntitiesListSelect fields() { - Integer row = null; List fields = new ArrayList<>(); for(int r = 0; r < grid.getRows(); r++){ fields.add((F) grid.getComponent(GRID_X_FIELD, r)); @@ -128,10 +125,6 @@ public class ToManyRelatedEntitiesListSelect nestedValues = getValueFromNestedFields(); @@ -153,10 +146,6 @@ public class ToManyRelatedEntitiesListSelect getNestedFields(){ List nestedFields = new ArrayList<>(grid.getRows()); for(int r = 0; r < grid.getRows(); r++){ + @SuppressWarnings("unchecked") F f = (F) grid.getComponent(GRID_X_FIELD, r); if(f == null){ logger.debug(String.format("NULL field at %d,%d", GRID_X_FIELD, r)); @@ -540,13 +517,6 @@ public class ToManyRelatedEntitiesListSelect f : getNestedFields()){ if(f instanceof CompositeCustomField){ - if(!((CompositeCustomField)f).hasNullContent()){ + if(!((CompositeCustomField)f).hasNullContent()){ return false; } } @@ -736,56 +694,30 @@ public class ToManyRelatedEntitiesListSelect getEntityFieldInstantiator() { return entityFieldInstantiator; } - - /** - * @param enityFieldInstantiator the enityFieldInstantiator to set - */ public void setEntityFieldInstantiator(EntityFieldInstantiator entityFieldInstantiator) { this.entityFieldInstantiator = entityFieldInstantiator; } - /** - * {@inheritDoc} - */ @Override public void setReadOnly(boolean readOnly) { super.setReadOnly(readOnly); updateComponentStates(); } - - /** - * @return the editPermissionTester - */ public EditPermissionTester getEditPermissionTester() { return editPermissionTester; } - - /** - * @param editPermissionTester the editPermissionTester to set - */ public void setEditPermissionTester(EditPermissionTester editPermissionTester) { this.editPermissionTester = editPermissionTester; } - /** - * @return the editActionListener - */ public EntityEditorActionListener getEditActionListener() { return editActionListener; } - - /** - * @param editActionListener the editActionListener to set - */ public void setEditActionListener(EntityEditorActionListener editActionListener) { this.editActionListener = editActionListener; } - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/vaadin/component/WeaklyRelatedEntityCombobox.java b/src/main/java/eu/etaxonomy/vaadin/component/WeaklyRelatedEntityCombobox.java index 2a4a2c08..0c3bdbcd 100644 --- a/src/main/java/eu/etaxonomy/vaadin/component/WeaklyRelatedEntityCombobox.java +++ b/src/main/java/eu/etaxonomy/vaadin/component/WeaklyRelatedEntityCombobox.java @@ -31,7 +31,7 @@ import com.vaadin.ui.themes.ValoTheme; import eu.etaxonomy.cdm.model.common.IdentifiableEntity; import eu.etaxonomy.cdm.model.permission.CRUD; -import eu.etaxonomy.cdm.service.FilterableStringRepresentationPagingProvider; +import eu.etaxonomy.cdm.service.IFilterableStringRepresentationPagingProvider; import eu.etaxonomy.cdm.service.UserHelperAccess; import eu.etaxonomy.cdm.vaadin.component.ButtonFactory; import eu.etaxonomy.cdm.vaadin.event.NestedButtonStateUpdater; @@ -59,7 +59,7 @@ public class WeaklyRelatedEntityCombobox> extend private WeaklyRelatedEntityButtonUpdater buttonUpdater; - private FilterableStringRepresentationPagingProvider filterablePagingProvider; + private IFilterableStringRepresentationPagingProvider filterablePagingProvider; public WeaklyRelatedEntityCombobox(String caption, Class type){ this.type = type; @@ -132,7 +132,7 @@ public class WeaklyRelatedEntityCombobox> extend */ public void loadFrom(FilterablePagingProvider filterablePagingProvider, FilterableCountProvider filterableCountProvider, int pageLength) { - this.filterablePagingProvider = (FilterableStringRepresentationPagingProvider) filterablePagingProvider; + this.filterablePagingProvider = (IFilterableStringRepresentationPagingProvider) filterablePagingProvider; lazySelect.loadFrom(filterablePagingProvider, filterableCountProvider, pageLength); buttonUpdater.updateButtons(getValue()); } diff --git a/src/main/java/eu/etaxonomy/vaadin/event/EntityEditorActionEvent.java b/src/main/java/eu/etaxonomy/vaadin/event/EntityEditorActionEvent.java index 255c1a48..70a38992 100644 --- a/src/main/java/eu/etaxonomy/vaadin/event/EntityEditorActionEvent.java +++ b/src/main/java/eu/etaxonomy/vaadin/event/EntityEditorActionEvent.java @@ -17,7 +17,6 @@ import com.vaadin.ui.AbstractField; * user to perform the action transported with this event. * * @author a.kohlbecker - * */ public class EntityEditorActionEvent { @@ -26,23 +25,12 @@ public class EntityEditorActionEvent { private AbstractField field; private T bean; - /** - * @param type - * @param entityId - * @param field - */ public EntityEditorActionEvent(EditorActionType action, Class beanType, AbstractField field) { this.action = action; this.beanType = beanType; this.field = field; } - /** - * - * @param type - * @param entityId - * @param field - */ public EntityEditorActionEvent(EditorActionType action, Class beanType, T bean, AbstractField field) { this.action = action; this.beanType = beanType; @@ -53,16 +41,10 @@ public class EntityEditorActionEvent { this.field = field; } - /** - * @return the beanType - */ public Class getBeanType() { return beanType; } - /** - * @return the action - */ public EditorActionType getAction() { return action; } @@ -74,11 +56,7 @@ public class EntityEditorActionEvent { return field; } - /** - * @return the bean - */ public T getBean() { return bean; } - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPresenter.java b/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPresenter.java index 8b0395aa..c77c91ed 100644 --- a/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPresenter.java +++ b/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPresenter.java @@ -41,12 +41,13 @@ import eu.etaxonomy.vaadin.ui.view.PopupView; * @param * type of the view this presenter governs */ -public abstract class AbstractPresenter implements Serializable, DisposableBean { - - private static final Logger logger = LogManager.getLogger(); +public abstract class AbstractPresenter> + implements Serializable, DisposableBean { private static final long serialVersionUID = 5260910510283481832L; + private static final Logger logger = LogManager.getLogger(); + private V view; protected V getView() { diff --git a/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractView.java b/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractView.java index f7fbb23d..bf2e7eec 100644 --- a/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractView.java +++ b/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractView.java @@ -104,7 +104,7 @@ public abstract class AbstractView

    extends CustomCo return viewEventBus; } - @Override + @Override public void releaseResourcesOnAccessDenied() { getPresenter().onViewExit(); } diff --git a/src/main/java/eu/etaxonomy/vaadin/mvp/ApplicationView.java b/src/main/java/eu/etaxonomy/vaadin/mvp/ApplicationView.java index 2d14ef73..e7ad2d32 100644 --- a/src/main/java/eu/etaxonomy/vaadin/mvp/ApplicationView.java +++ b/src/main/java/eu/etaxonomy/vaadin/mvp/ApplicationView.java @@ -4,6 +4,6 @@ package eu.etaxonomy.vaadin.mvp; * An interface to be implemented by the specific view interface definitions. * See https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/VaadinNotes#Model-View-Presenter-MVP-Pattern */ -public interface ApplicationView

    { +public interface ApplicationView

    > { } diff --git a/src/main/java/org/springframework/context/event/ApplicationListenerPojoMethodAdapter.java b/src/main/java/org/springframework/context/event/ApplicationListenerPojoMethodAdapter.java index 74afbdfb..1beb62f3 100644 --- a/src/main/java/org/springframework/context/event/ApplicationListenerPojoMethodAdapter.java +++ b/src/main/java/org/springframework/context/event/ApplicationListenerPojoMethodAdapter.java @@ -15,32 +15,18 @@ import java.lang.reflect.Method; * * @author a.kohlbecker * @since May 30, 2017 - * */ public class ApplicationListenerPojoMethodAdapter extends ApplicationListenerMethodAdapter { - PojoEventListenerManager eventListenerManager = null; - private Object o; - /** - * @param beanName - * @param targetClass - * @param method - */ public ApplicationListenerPojoMethodAdapter(String beanName, Class targetClass, Method method, Object o) { super(beanName, targetClass, method); this.o = o; } - /** - * {@inheritDoc} - */ @Override protected Object getTargetBean() { return o; } - - - -} +} \ No newline at end of file diff --git a/src/main/java/org/springframework/context/event/DefaultPojoEventListenerManager.java b/src/main/java/org/springframework/context/event/DefaultPojoEventListenerManager.java index 15f38112..74646c94 100644 --- a/src/main/java/org/springframework/context/event/DefaultPojoEventListenerManager.java +++ b/src/main/java/org/springframework/context/event/DefaultPojoEventListenerManager.java @@ -89,12 +89,8 @@ public class DefaultPojoEventListenerManager implements PojoEventListenerManager listenerMap.get(o).add(applicationListener); } - /** - * {@inheritDoc} - */ @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; } - -} +} \ No newline at end of file diff --git a/src/main/java/org/springframework/context/event/PojoEventListenerManager.java b/src/main/java/org/springframework/context/event/PojoEventListenerManager.java index 13f5510a..cea93b3a 100644 --- a/src/main/java/org/springframework/context/event/PojoEventListenerManager.java +++ b/src/main/java/org/springframework/context/event/PojoEventListenerManager.java @@ -11,12 +11,10 @@ package org.springframework.context.event; /** * @author a.kohlbecker * @since May 29, 2017 - * */ public interface PojoEventListenerManager { - void removeEventListeners(Object o); + public void removeEventListeners(Object o); - void addEventListeners(Object o); - -} + public void addEventListeners(Object o); +} \ No newline at end of file -- 2.34.1