From b01f9126c4f970f7522619f8e5d0b2d10c445281 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Mon, 26 Dec 2022 19:42:05 +0100 Subject: [PATCH] cleanup --- .../cdm/addon/config/CdmVaadinConfiguration.java | 2 +- .../eu/etaxonomy/cdm/cache/CdmEntityCache.java | 2 +- .../RegistrationRequiredDataInserter.java | 2 +- .../cdm/debug/PersistentContextAnalyzer.java | 2 +- .../cdm/service/CdmFilterablePagingProvider.java | 2 +- .../java/eu/etaxonomy/cdm/service/CdmStore.java | 2 +- .../cdm/service/RegistrationWorkflowService.java | 2 +- .../TaxonNameStringFilterablePagingProvider.java | 2 +- .../vaadin/component/common/GeoLocationField.java | 2 +- .../component/common/TeamOrPersonField.java | 2 +- .../RegistrationItemNameAndTypeButtons.java | 2 +- .../component/taxon/NewTaxonBaseComposite.java | 2 +- .../cdm/vaadin/container/CdmSQLContainer.java | 2 +- .../cdm/vaadin/debug/EntityCacheDebugger.java | 2 +- .../event/EditorActionContextFormatter.java | 2 +- .../event/error/DelegatingErrorHandler.java | 2 +- .../jscomponent/D3ConceptRelationshipTree.java | 2 +- .../AccessRestrictedViewControlBean.java | 2 +- .../AnnotationBasedAccessControlBean.java | 2 +- .../eu/etaxonomy/cdm/vaadin/ui/AbstractUI.java | 2 +- .../cdm/vaadin/ui/ConceptRelationshipUI.java | 2 +- .../vaadin/ui/ConceptRelationshipUIRedirect.java | 2 +- .../cdm/vaadin/util/CdmVaadinAuthentication.java | 2 +- .../converter/GeoLocationConverterValidator.java | 15 +++++---------- .../etaxonomy/cdm/vaadin/view/LoginPresenter.java | 2 +- .../DistributionTableViewBean.java | 2 +- .../view/name/NameTypeDesignationPresenter.java | 2 +- ...SpecimenTypeDesignationSetEditorPresenter.java | 2 +- .../view/name/TaxonNameEditorPresenter.java | 2 +- .../vaadin/view/name/TaxonNamePopupEditor.java | 2 +- .../view/reference/ReferencePopupEditor.java | 2 +- .../vaadin/view/registration/ListPresenter.java | 2 +- .../RegistrationWorkingsetPresenter.java | 2 +- .../registration/StartRegistrationPresenter.java | 2 +- .../ToManyRelatedEntitiesListSelect.java | 2 +- .../etaxonomy/vaadin/mvp/AbstractPopupEditor.java | 2 +- .../etaxonomy/vaadin/mvp/AbstractPresenter.java | 2 +- .../eu/etaxonomy/vaadin/mvp/AbstractView.java | 4 ++-- .../vaadin/mvp/CdmEditorPresenterBase.java | 2 +- .../ui/navigation/NavigationManagerBean.java | 2 +- .../ui/navigation/PopupViewRegistration.java | 2 +- .../event/DefaultPojoEventListenerManager.java | 2 +- .../eu/etaxonomy/cdm/vaadin/ui/D3CTreeUI.java | 2 +- .../etaxonomy/cdm/vaadin/ui/NavigatorTestUI.java | 2 +- 44 files changed, 49 insertions(+), 54 deletions(-) diff --git a/src/main/java/eu/etaxonomy/cdm/addon/config/CdmVaadinConfiguration.java b/src/main/java/eu/etaxonomy/cdm/addon/config/CdmVaadinConfiguration.java index 11ae4b54..593e0546 100644 --- a/src/main/java/eu/etaxonomy/cdm/addon/config/CdmVaadinConfiguration.java +++ b/src/main/java/eu/etaxonomy/cdm/addon/config/CdmVaadinConfiguration.java @@ -91,7 +91,7 @@ import eu.etaxonomy.vaadin.ui.annotation.EnableVaadinSpringNavigation; @CdmHibernateListener // enable the configuration which activates the TaxonGraphHibernateListener bean public class CdmVaadinConfiguration implements ApplicationContextAware { - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); public static final String CDM_VAADIN_UI_ACTIVATED = "cdm-vaadin.ui.activated"; public static final String CDM_SERVICE_MINTER_REGSTRATION_MINID = "cdm.service.minter.registration.minLocalId"; diff --git a/src/main/java/eu/etaxonomy/cdm/cache/CdmEntityCache.java b/src/main/java/eu/etaxonomy/cdm/cache/CdmEntityCache.java index 6fde5e09..7dbfc99a 100644 --- a/src/main/java/eu/etaxonomy/cdm/cache/CdmEntityCache.java +++ b/src/main/java/eu/etaxonomy/cdm/cache/CdmEntityCache.java @@ -43,7 +43,7 @@ import eu.etaxonomy.cdm.persistence.dao.initializer.AbstractBeanInitializer; */ public class CdmEntityCache implements EntityCache { - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); protected static final String COPY_ENTITY = "!"; diff --git a/src/main/java/eu/etaxonomy/cdm/dataInserter/RegistrationRequiredDataInserter.java b/src/main/java/eu/etaxonomy/cdm/dataInserter/RegistrationRequiredDataInserter.java index 32c1369b..1ea8682c 100644 --- a/src/main/java/eu/etaxonomy/cdm/dataInserter/RegistrationRequiredDataInserter.java +++ b/src/main/java/eu/etaxonomy/cdm/dataInserter/RegistrationRequiredDataInserter.java @@ -73,7 +73,7 @@ import eu.etaxonomy.cdm.vaadin.permission.RolesAndPermissions; */ public class RegistrationRequiredDataInserter extends AbstractDataInserter { - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); // protected static final String PARAM_NAME_CREATE = "registrationCreate"; // diff --git a/src/main/java/eu/etaxonomy/cdm/debug/PersistentContextAnalyzer.java b/src/main/java/eu/etaxonomy/cdm/debug/PersistentContextAnalyzer.java index 73706f30..0e9b6413 100644 --- a/src/main/java/eu/etaxonomy/cdm/debug/PersistentContextAnalyzer.java +++ b/src/main/java/eu/etaxonomy/cdm/debug/PersistentContextAnalyzer.java @@ -24,7 +24,7 @@ import eu.etaxonomy.cdm.model.common.CdmBase; public class PersistentContextAnalyzer extends CdmEntityCache { @SuppressWarnings("unused") - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private static final char HASH_SEPARATOR = '.'; diff --git a/src/main/java/eu/etaxonomy/cdm/service/CdmFilterablePagingProvider.java b/src/main/java/eu/etaxonomy/cdm/service/CdmFilterablePagingProvider.java index a63c5e47..22f2b84c 100644 --- a/src/main/java/eu/etaxonomy/cdm/service/CdmFilterablePagingProvider.java +++ b/src/main/java/eu/etaxonomy/cdm/service/CdmFilterablePagingProvider.java @@ -32,7 +32,7 @@ import eu.etaxonomy.cdm.persistence.query.OrderHint; */ public class CdmFilterablePagingProvider implements FilterablePagingProvider, FilterableCountProvider { - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private static final List DEFAULT_INIT_STRATEGY = Arrays.asList("$"); diff --git a/src/main/java/eu/etaxonomy/cdm/service/CdmStore.java b/src/main/java/eu/etaxonomy/cdm/service/CdmStore.java index 42bbdf9a..06e2e2cc 100644 --- a/src/main/java/eu/etaxonomy/cdm/service/CdmStore.java +++ b/src/main/java/eu/etaxonomy/cdm/service/CdmStore.java @@ -47,7 +47,7 @@ import eu.etaxonomy.vaadin.mvp.AbstractView; @ViewScope public class CdmStore { - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); @Autowired @Qualifier("cdmRepository") diff --git a/src/main/java/eu/etaxonomy/cdm/service/RegistrationWorkflowService.java b/src/main/java/eu/etaxonomy/cdm/service/RegistrationWorkflowService.java index fb1dd186..af16df5a 100644 --- a/src/main/java/eu/etaxonomy/cdm/service/RegistrationWorkflowService.java +++ b/src/main/java/eu/etaxonomy/cdm/service/RegistrationWorkflowService.java @@ -35,7 +35,7 @@ import eu.etaxonomy.cdm.model.reference.ReferenceType; @Service("registrationWorkflowService") public class RegistrationWorkflowService implements IRegistrationWorkflowService { - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); @Autowired @Qualifier("cdmRepository") diff --git a/src/main/java/eu/etaxonomy/cdm/service/TaxonNameStringFilterablePagingProvider.java b/src/main/java/eu/etaxonomy/cdm/service/TaxonNameStringFilterablePagingProvider.java index 501b7b02..9ad08931 100644 --- a/src/main/java/eu/etaxonomy/cdm/service/TaxonNameStringFilterablePagingProvider.java +++ b/src/main/java/eu/etaxonomy/cdm/service/TaxonNameStringFilterablePagingProvider.java @@ -44,7 +44,7 @@ import eu.etaxonomy.cdm.persistence.query.OrderHint; */ public class TaxonNameStringFilterablePagingProvider implements FilterableStringRepresentationPagingProvider, FilterableCountProvider { - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private static final List DEFAULT_INIT_STRATEGY = Arrays.asList("$"); diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/component/common/GeoLocationField.java b/src/main/java/eu/etaxonomy/cdm/vaadin/component/common/GeoLocationField.java index 3962c2a5..67a0cc13 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/component/common/GeoLocationField.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/component/common/GeoLocationField.java @@ -45,7 +45,7 @@ import eu.etaxonomy.vaadin.component.CompositeCustomField; public class GeoLocationField extends CompositeCustomField { private static final long serialVersionUID = 1122123034547920390L; - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private static final String PRIMARY_STYLE = "v-geolocation-field"; diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/component/common/TeamOrPersonField.java b/src/main/java/eu/etaxonomy/cdm/vaadin/component/common/TeamOrPersonField.java index 8c2f4615..d0620db2 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/component/common/TeamOrPersonField.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/component/common/TeamOrPersonField.java @@ -58,7 +58,7 @@ public class TeamOrPersonField extends CompositeCustomField> private static final long serialVersionUID = 660806402243118112L; - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private static final String PRIMARY_STYLE = "v-team-or-person-field"; diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/RegistrationItemNameAndTypeButtons.java b/src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/RegistrationItemNameAndTypeButtons.java index c6efd64f..709cb4bf 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/RegistrationItemNameAndTypeButtons.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/RegistrationItemNameAndTypeButtons.java @@ -54,7 +54,7 @@ import eu.etaxonomy.vaadin.component.CompositeStyledComponent; */ public class RegistrationItemNameAndTypeButtons extends CompositeStyledComponent { - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private static final String DEFAULT_BUTTON_STYLES = ""; diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/component/taxon/NewTaxonBaseComposite.java b/src/main/java/eu/etaxonomy/cdm/vaadin/component/taxon/NewTaxonBaseComposite.java index 5ffefb05..59f34207 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/component/taxon/NewTaxonBaseComposite.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/component/taxon/NewTaxonBaseComposite.java @@ -47,7 +47,7 @@ import eu.etaxonomy.cdm.vaadin.util.CdmVaadinUtilities; public class NewTaxonBaseComposite extends CustomComponent implements INewTaxonBaseComposite { @SuppressWarnings("unused") - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); /*- VaadinEditorProperties={"grid":"RegularGrid,20","showGrid":true,"snapToGrid":true,"snapToObject":true,"movingGuides":false,"snappingDistance":10} */ diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/container/CdmSQLContainer.java b/src/main/java/eu/etaxonomy/cdm/vaadin/container/CdmSQLContainer.java index 273a19d0..3cf61b28 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/container/CdmSQLContainer.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/container/CdmSQLContainer.java @@ -19,7 +19,7 @@ public class CdmSQLContainer extends SQLContainer { private static final long serialVersionUID = 2828992538007070061L; - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private DatabaseMetaData databaseMetaData; diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/debug/EntityCacheDebugger.java b/src/main/java/eu/etaxonomy/cdm/vaadin/debug/EntityCacheDebugger.java index 64d83ce0..684bdcc2 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/debug/EntityCacheDebugger.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/debug/EntityCacheDebugger.java @@ -47,7 +47,7 @@ import eu.etaxonomy.vaadin.ui.view.PopupView; @Profile("debug") public class EntityCacheDebugger implements ViewChangeListener, EventBusListener { - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private UIEventBus uiEventBus; diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/event/EditorActionContextFormatter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/event/EditorActionContextFormatter.java index 4710ed8f..199a6d6c 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/event/EditorActionContextFormatter.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/event/EditorActionContextFormatter.java @@ -36,7 +36,7 @@ import eu.etaxonomy.vaadin.util.PropertyIdPath; */ public class EditorActionContextFormatter { - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private static final String NEW = "New"; diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/event/error/DelegatingErrorHandler.java b/src/main/java/eu/etaxonomy/cdm/vaadin/event/error/DelegatingErrorHandler.java index 12fda0d3..dfb6c9a5 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/event/error/DelegatingErrorHandler.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/event/error/DelegatingErrorHandler.java @@ -36,7 +36,7 @@ public class DelegatingErrorHandler implements ErrorHandler{ private static final long serialVersionUID = 3378605204517477112L; - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); List> handlers = new ArrayList<>(); diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3ConceptRelationshipTree.java b/src/main/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3ConceptRelationshipTree.java index 8c9b30eb..b6c3b75a 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3ConceptRelationshipTree.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3ConceptRelationshipTree.java @@ -44,7 +44,7 @@ import eu.etaxonomy.cdm.vaadin.component.taxon.ConceptRelationshipComposite; public class D3ConceptRelationshipTree extends AbstractJavaScriptComponent { private static final long serialVersionUID = 8355509734431610167L; - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); public enum Mode { OneToOne, 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 32c0143f..8cef4fb8 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/permission/AccessRestrictedViewControlBean.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/permission/AccessRestrictedViewControlBean.java @@ -26,7 +26,7 @@ public class AccessRestrictedViewControlBean implements ViewInstanceAccessContro private static final long serialVersionUID = -5192116600545639108L; - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); @Override public boolean isAccessGranted(UI ui, String beanName, View view) { 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 6ad61be2..bc877482 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/permission/AnnotationBasedAccessControlBean.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/permission/AnnotationBasedAccessControlBean.java @@ -35,7 +35,7 @@ public class AnnotationBasedAccessControlBean implements ViewInstanceAccessContr private static final long serialVersionUID = -4232241572782673248L; - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); @Override diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/AbstractUI.java b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/AbstractUI.java index 4bc7395b..60188523 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/AbstractUI.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/AbstractUI.java @@ -46,7 +46,7 @@ public abstract class AbstractUI extends UI { private static final long serialVersionUID = 7430086500775997281L; - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); abstract protected ViewDisplay getViewDisplay(); diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/ConceptRelationshipUI.java b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/ConceptRelationshipUI.java index 5ff51337..769c9179 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/ConceptRelationshipUI.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/ConceptRelationshipUI.java @@ -33,7 +33,7 @@ public class ConceptRelationshipUI extends AbstractAuthenticatedUI { private static final long serialVersionUID = 7356721273326682601L; - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); public static final String NAME = "concept"; diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/ConceptRelationshipUIRedirect.java b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/ConceptRelationshipUIRedirect.java index fc9cc18b..da066ee3 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/ConceptRelationshipUIRedirect.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/ConceptRelationshipUIRedirect.java @@ -32,7 +32,7 @@ public class ConceptRelationshipUIRedirect extends AbstractAuthenticatedUI { private static final long serialVersionUID = -3709422890864662383L; - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private static final String FIRST_VIEW = "editcr"; diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmVaadinAuthentication.java b/src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmVaadinAuthentication.java index b2144d57..a4f4c514 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmVaadinAuthentication.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmVaadinAuthentication.java @@ -24,7 +24,7 @@ import eu.etaxonomy.cdm.common.URI; */ public class CdmVaadinAuthentication { - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); public static final String KEY = "key_authentication"; diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/util/converter/GeoLocationConverterValidator.java b/src/main/java/eu/etaxonomy/cdm/vaadin/util/converter/GeoLocationConverterValidator.java index 43e040b5..97a96ec4 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/util/converter/GeoLocationConverterValidator.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/util/converter/GeoLocationConverterValidator.java @@ -12,6 +12,7 @@ import java.text.ParseException; import java.util.Locale; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.vaadin.data.Validator; import com.vaadin.data.util.converter.Converter; @@ -25,10 +26,11 @@ import eu.etaxonomy.cdm.model.location.Point.Sexagesimal; * * @author a.kohlbecker * @since Nov 20, 2018 - * */ public class GeoLocationConverterValidator implements Converter, Validator { + private static final Logger logger = LogManager.getLogger(); + public enum Axis { LONGITUDE, LATITUDE; } @@ -55,7 +57,7 @@ public class GeoLocationConverterValidator implements Converter, return Point.parseLatitude(value); } } catch (ParseException e) { - LogManager.getLogger(getClass()).error(e); + logger.error(e); throw new ConversionException(e); } } @@ -72,7 +74,6 @@ public class GeoLocationConverterValidator implements Converter, } else { return Sexagesimal.valueOf(value, true).toString(); } - } @Override @@ -85,9 +86,6 @@ public class GeoLocationConverterValidator implements Converter, return String.class; } - /** - * {@inheritDoc} - */ @Override public void validate(Object value) throws InvalidValueException { if(value != null && value instanceof String && !((String)value).isEmpty()){ @@ -97,8 +95,5 @@ public class GeoLocationConverterValidator implements Converter, throw new InvalidValueException("Invalid " + axis.name().toLowerCase()); } } - - } - -} +} \ No newline at end of file diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/LoginPresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/LoginPresenter.java index 40ba8958..c997e333 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/LoginPresenter.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/LoginPresenter.java @@ -74,7 +74,7 @@ public class LoginPresenter extends AbstractPresenter implements Even private static final long serialVersionUID = 4020699735656994791L; - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private final static String PROPNAME_USER = "cdm-vaadin.login.usr"; diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableViewBean.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableViewBean.java index deff7710..58d4aa0a 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableViewBean.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableViewBean.java @@ -74,7 +74,7 @@ public class DistributionTableViewBean extends AbstractPageView typifiedNamesAsLoaded; 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 4e5e7cc0..58fd8320 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 @@ -99,7 +99,7 @@ public class SpecimenTypeDesignationSetEditorPresenter private static final long serialVersionUID = 4255636253714476918L; - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private static final EnumSet COLLECTION_EDITOR_CRUD = EnumSet.of(CRUD.UPDATE, CRUD.DELETE); diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNameEditorPresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNameEditorPresenter.java index 23738728..c4567775 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNameEditorPresenter.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNameEditorPresenter.java @@ -101,7 +101,7 @@ public class TaxonNameEditorPresenter private static final long serialVersionUID = -3538980627079389221L; - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private static final EnumSet SUB_EDITOR_CRUD = EnumSet.of(CRUD.UPDATE, CRUD.DELETE); diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditor.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditor.java index 9f7d2988..0272a739 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditor.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditor.java @@ -87,7 +87,7 @@ public class TaxonNamePopupEditor implements TaxonNamePopupEditorView{ private static final long serialVersionUID = -7037436241474466359L; - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private final static int GRID_COLS = 4; diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/reference/ReferencePopupEditor.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/reference/ReferencePopupEditor.java index 836bc234..79e38b06 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/reference/ReferencePopupEditor.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/reference/ReferencePopupEditor.java @@ -68,7 +68,7 @@ public class ReferencePopupEditor extends AbstractCdmPopupEditor { - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private static final String REGISTRATION_LIST_PRESENTER_SEARCH_FILTER = "registration.listPresenter.searchFilter"; diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java index 341c9451..ae0598fe 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java @@ -109,7 +109,7 @@ public class RegistrationWorkingsetPresenter extends AbstractPresenter fieldType; diff --git a/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPopupEditor.java b/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPopupEditor.java index d1a8e96c..6de22b2c 100644 --- a/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPopupEditor.java +++ b/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPopupEditor.java @@ -87,7 +87,7 @@ public abstract class AbstractPopupEditor { private static final long serialVersionUID = 5944874629527570061L; - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private static final String READ_ONLY_MESSAGE_TEXT = "The editor is in read-only mode. Your authorities are not sufficient to edit this data."; diff --git a/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPresenter.java b/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPresenter.java index b2b18a9b..8b0395aa 100644 --- a/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPresenter.java +++ b/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPresenter.java @@ -43,7 +43,7 @@ import eu.etaxonomy.vaadin.ui.view.PopupView; */ public abstract class AbstractPresenter implements Serializable, DisposableBean { - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private static final long serialVersionUID = 5260910510283481832L; diff --git a/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractView.java b/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractView.java index 232fefe4..f7fbb23d 100644 --- a/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractView.java +++ b/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractView.java @@ -35,7 +35,7 @@ import eu.etaxonomy.cdm.vaadin.permission.ReleasableResourcesView; public abstract class AbstractView

extends CustomComponent implements ApplicationContextAware, ReleasableResourcesView, DisposableBean { - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private P presenter; @@ -50,7 +50,7 @@ public abstract class AbstractView

extends CustomCo @SuppressWarnings("unchecked") @PostConstruct protected final void init() { - LogManager.getLogger(getClass().getSimpleName()).info("View init"); + logger.info("View init"); if(!ApplicationView.class.isAssignableFrom(this.getClass())){ throw new RuntimeException("Any view bean must implement the ApplicationView interface: ViewBean ---> ViewInterface ---> ApplicationView"); } diff --git a/src/main/java/eu/etaxonomy/vaadin/mvp/CdmEditorPresenterBase.java b/src/main/java/eu/etaxonomy/vaadin/mvp/CdmEditorPresenterBase.java index cba2f9c4..74a1c876 100644 --- a/src/main/java/eu/etaxonomy/vaadin/mvp/CdmEditorPresenterBase.java +++ b/src/main/java/eu/etaxonomy/vaadin/mvp/CdmEditorPresenterBase.java @@ -47,7 +47,7 @@ public abstract class CdmEditorPresenterBase beanInstantiator = null; diff --git a/src/main/java/eu/etaxonomy/vaadin/ui/navigation/NavigationManagerBean.java b/src/main/java/eu/etaxonomy/vaadin/ui/navigation/NavigationManagerBean.java index c11cb97e..048a1a03 100644 --- a/src/main/java/eu/etaxonomy/vaadin/ui/navigation/NavigationManagerBean.java +++ b/src/main/java/eu/etaxonomy/vaadin/ui/navigation/NavigationManagerBean.java @@ -46,7 +46,7 @@ public class NavigationManagerBean extends SpringNavigator implements Navigation private static final long serialVersionUID = 6599898650948333853L; - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); // injecting the viewDisplay as spring bean causes problems with older cdm vaadin code // SingleComponentContainerViewDisplay for example can't be used diff --git a/src/main/java/eu/etaxonomy/vaadin/ui/navigation/PopupViewRegistration.java b/src/main/java/eu/etaxonomy/vaadin/ui/navigation/PopupViewRegistration.java index 83c0e932..492c0dfd 100644 --- a/src/main/java/eu/etaxonomy/vaadin/ui/navigation/PopupViewRegistration.java +++ b/src/main/java/eu/etaxonomy/vaadin/ui/navigation/PopupViewRegistration.java @@ -31,7 +31,7 @@ public class PopupViewRegistration implements DetachListener { private static final long serialVersionUID = -5946913287379095637L; - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private Map popupWindowMap = new HashMap<>(); diff --git a/src/main/java/org/springframework/context/event/DefaultPojoEventListenerManager.java b/src/main/java/org/springframework/context/event/DefaultPojoEventListenerManager.java index a3743390..15f38112 100644 --- a/src/main/java/org/springframework/context/event/DefaultPojoEventListenerManager.java +++ b/src/main/java/org/springframework/context/event/DefaultPojoEventListenerManager.java @@ -42,7 +42,7 @@ public class DefaultPojoEventListenerManager implements PojoEventListenerManager private static final long serialVersionUID = -6814417168274166953L; - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); @Autowired private ApplicationEventMulticaster applicationEventMulticaster; diff --git a/src/test/java/eu/etaxonomy/cdm/vaadin/ui/D3CTreeUI.java b/src/test/java/eu/etaxonomy/cdm/vaadin/ui/D3CTreeUI.java index 78e9058a..5df90337 100644 --- a/src/test/java/eu/etaxonomy/cdm/vaadin/ui/D3CTreeUI.java +++ b/src/test/java/eu/etaxonomy/cdm/vaadin/ui/D3CTreeUI.java @@ -32,7 +32,7 @@ public class D3CTreeUI extends UI { private static final long serialVersionUID = 3370416837565654213L; @SuppressWarnings("unused") - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); final VerticalLayout layout = new VerticalLayout(); final D3CTree d3ctree = new D3CTree(); diff --git a/src/test/java/eu/etaxonomy/cdm/vaadin/ui/NavigatorTestUI.java b/src/test/java/eu/etaxonomy/cdm/vaadin/ui/NavigatorTestUI.java index 4de58137..a8ef66a3 100644 --- a/src/test/java/eu/etaxonomy/cdm/vaadin/ui/NavigatorTestUI.java +++ b/src/test/java/eu/etaxonomy/cdm/vaadin/ui/NavigatorTestUI.java @@ -26,7 +26,7 @@ public class NavigatorTestUI extends AbstractAuthenticatedUI { private static final long serialVersionUID = 4959469489638235995L; @SuppressWarnings("unused") - private final static Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(); private static final String FIRST_VIEW = "firstView"; public static final String SECOND_VIEW = "secondView"; -- 2.34.1