From 72821c227362159aaa1d39603adc7d54e7a92133 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Thu, 20 Jan 2022 00:05:26 +0100 Subject: [PATCH] cleanup --- .../cdm/vaadin/ui/DistributionStatusUI.java | 5 +-- .../cdm/vaadin/ui/RegistrationUI.java | 1 - .../occurrence/CollectionEditorPresenter.java | 17 --------- .../occurrence/CollectionPopupEditor.java | 36 ++++--------------- .../occurrence/CollectionPopupEditorView.java | 5 ++- .../view/registration/DashBoardView.java | 1 - .../vaadin/mvp/CdmEditorPresenterBase.java | 24 +------------ .../ui/navigation/NavigationManager.java | 8 +++++ .../ui/navigation/NavigationManagerBean.java | 8 +++++ 9 files changed, 26 insertions(+), 79 deletions(-) diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/DistributionStatusUI.java b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/DistributionStatusUI.java index 245ecaa0..3744fdc0 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/DistributionStatusUI.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/DistributionStatusUI.java @@ -30,6 +30,7 @@ import eu.etaxonomy.vaadin.ui.navigation.NavigationManagerBean; @SuppressWarnings("serial") public class DistributionStatusUI extends UI{ + @SuppressWarnings("unused") private final static Logger logger = Logger.getLogger(DistributionStatusUI.class); public static final String NAME = "distribution"; @@ -81,10 +82,6 @@ public class DistributionStatusUI extends UI{ } - /** - * - * {@inheritDoc} - */ @Override protected void init(VaadinRequest request) { diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/RegistrationUI.java b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/RegistrationUI.java index 34f06901..141185e1 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/RegistrationUI.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/RegistrationUI.java @@ -37,7 +37,6 @@ import eu.etaxonomy.vaadin.ui.view.ToolbarDisplay; /** * @author a.kohlbecker * @since Feb 24, 2017 - * */ @Theme("edit-valo") @Title("Registration") diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/occurrence/CollectionEditorPresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/occurrence/CollectionEditorPresenter.java index 1d7356c6..635bc995 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/occurrence/CollectionEditorPresenter.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/occurrence/CollectionEditorPresenter.java @@ -62,14 +62,10 @@ public class CollectionEditorPresenter extends AbstractCdmEditorPresenter initStrategy = Arrays.asList(new String []{ - "$", "institute.$", "superCollection.$", @@ -85,9 +81,6 @@ public class CollectionEditorPresenter extends AbstractCdmEditorPresenter getService() { // TODO Auto-generated method stub return null; } - /** - * {@inheritDoc} - */ @Override public void handleViewEntered() { super.handleViewEntered(); diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/occurrence/CollectionPopupEditor.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/occurrence/CollectionPopupEditor.java index 3869519c..b602b741 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/occurrence/CollectionPopupEditor.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/occurrence/CollectionPopupEditor.java @@ -32,7 +32,6 @@ import eu.etaxonomy.vaadin.mvp.AbstractCdmPopupEditor; /** * @author a.kohlbecker * @since Dec 21, 2017 - * */ @SpringComponent @Scope("prototype") @@ -44,59 +43,37 @@ public class CollectionPopupEditor extends AbstractCdmPopupEditor superCollectionCombobox; - ToOneRelatedEntityCombobox institutionCombobox; + private TextField nameField; + private TextField codeField; + private TextField codeStandardField; + private TextField townOrLocationField; + private ToOneRelatedEntityCombobox superCollectionCombobox; + private ToOneRelatedEntityCombobox institutionCombobox; - - /** - * @param layout - * @param dtoType - */ public CollectionPopupEditor() { super(new GridLayout(GRID_COLS, GRID_ROWS), Collection.class); } - /** - * {@inheritDoc} - */ @Override public String getWindowCaption() { return "Collection 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() { /* @@ -192,7 +169,6 @@ public class CollectionPopupEditor extends AbstractCdmPopupEditor { - ToOneRelatedEntityCombobox getSuperCollectionCombobox(); + public ToOneRelatedEntityCombobox getSuperCollectionCombobox(); - ToOneRelatedEntityCombobox getInstitutionCombobox(); + public ToOneRelatedEntityCombobox getInstitutionCombobox(); } diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/DashBoardView.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/DashBoardView.java index d466a1cf..aba717a9 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/DashBoardView.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/DashBoardView.java @@ -22,7 +22,6 @@ import eu.etaxonomy.vaadin.ui.navigation.NavigationEvent; /** * @author a.kohlbecker * @since Mar 2, 2017 - * */ @SpringView(name=DashBoardView.NAME) public class DashBoardView extends DashBoardDesign implements View { diff --git a/src/main/java/eu/etaxonomy/vaadin/mvp/CdmEditorPresenterBase.java b/src/main/java/eu/etaxonomy/vaadin/mvp/CdmEditorPresenterBase.java index 95281f13..cc48820e 100644 --- a/src/main/java/eu/etaxonomy/vaadin/mvp/CdmEditorPresenterBase.java +++ b/src/main/java/eu/etaxonomy/vaadin/mvp/CdmEditorPresenterBase.java @@ -39,7 +39,6 @@ import eu.etaxonomy.vaadin.mvp.event.EditorSaveEvent; * * @author a.kohlbecker * @since Apr 5, 2017 - * */ public abstract class CdmEditorPresenterBase> extends AbstractEditorPresenter implements CachingPresenter { @@ -293,59 +292,38 @@ public abstract class CdmEditorPresenterBase changeEvent = cdmStore.deleteBean(cdmEntity, (AbstractView) getView()); if(changeEvent != null){ viewEventBus.publish(this, changeEvent); } } - - /** - * @param crud - */ public void setGrantsForCurrentUser(EnumSet crud) { this.crud = crud; } - /** - * {@inheritDoc} - */ @Override public ICdmEntityUuidCacher getCache() { return cache; } - /** - * {@inheritDoc} - */ @Override public void addRootEntity(CdmBase entity) { rootEntities.add(entity); } - - /** - * {@inheritDoc} - */ @Override public Collection getRootEntities() { return rootEntities; } - - /** - * {@inheritDoc} - */ @Override public void destroy() throws Exception { super.destroy(); disposeCache(); } - /** - * {@inheritDoc} - */ @Override public void disposeCache() { cache.dispose(); diff --git a/src/main/java/eu/etaxonomy/vaadin/ui/navigation/NavigationManager.java b/src/main/java/eu/etaxonomy/vaadin/ui/navigation/NavigationManager.java index 52d9ca02..063b107e 100644 --- a/src/main/java/eu/etaxonomy/vaadin/ui/navigation/NavigationManager.java +++ b/src/main/java/eu/etaxonomy/vaadin/ui/navigation/NavigationManager.java @@ -1,3 +1,11 @@ +/** +* Copyright (C) 2017 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.vaadin.ui.navigation; import java.util.List; 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 0c0d5d8f..13c4c6be 100644 --- a/src/main/java/eu/etaxonomy/vaadin/ui/navigation/NavigationManagerBean.java +++ b/src/main/java/eu/etaxonomy/vaadin/ui/navigation/NavigationManagerBean.java @@ -1,3 +1,11 @@ +/** +* Copyright (C) 2017 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.vaadin.ui.navigation; import java.util.Arrays; -- 2.34.1