cleanup

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 245ecaa0a0845f020c344f36dcb5523de9e28234..3744fdc04f99b4aa0941843d40de15ff4645f6ed 100644 (file)
--- 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 34f06901090faa82cc2e4f384c5d685a6f71c0c1..141185e14fe41613261289dbeca60f92860edb4a 100644 (file)
--- 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 1d7356c6c28a220e5742d99dd0c8454031e51514..635bc9950a75200e6ad5727ea429be377ce8abb8 100644 (file)
--- 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<Collec
        return defaultBeanInstantiator;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected Collection loadCdmEntity(UUID identifier) {
 
         List<String> initStrategy = Arrays.asList(new String []{
-
                 "$",
                 "institute.$",
                 "superCollection.$",
@@ -85,9 +81,6 @@ public class CollectionEditorPresenter extends AbstractCdmEditorPresenter<Collec
         return bean;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected void guaranteePerEntityCRUDPermissions(UUID identifier) {
         if(crud != null){
@@ -96,29 +89,19 @@ public class CollectionEditorPresenter extends AbstractCdmEditorPresenter<Collec
 
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected void guaranteePerEntityCRUDPermissions(Collection bean) {
         if(crud != null){
             newAuthorityCreated = UserHelperAccess.userHelper().createAuthorityForCurrentUser(bean, crud, null);
         }
-
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected IService<Collection> 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 3869519c75ace554d059da7d241f8bdafdf811e0..b602b7413175c527c00642a81360749807668341 100644 (file)
--- 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<Collection, Co
 
     private static final int GRID_ROWS = 4;
 
-    TextField nameField;
-    TextField codeField;
-    TextField codeStandardField;
-    TextField townOrLocationField;
-    ToOneRelatedEntityCombobox<Collection> superCollectionCombobox;
-    ToOneRelatedEntityCombobox<Institution> institutionCombobox;
+    private TextField nameField;
+    private TextField codeField;
+    private TextField codeStandardField;
+    private TextField townOrLocationField;
+    private ToOneRelatedEntityCombobox<Collection> superCollectionCombobox;
+    private ToOneRelatedEntityCombobox<Institution> 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<Collection, Co
                     );
                 }
             });
-
     }
 
     /* ------------------ View Interface methods -------------------- */

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/occurrence/CollectionPopupEditorView.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/occurrence/CollectionPopupEditorView.java
index 435c71658ada240b24435d712783edcf8a15f4f6..ed1a58871b47a3fd81a1ed804778892a251b55dc 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/occurrence/CollectionPopupEditorView.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/occurrence/CollectionPopupEditorView.java
@@ -16,12 +16,11 @@ import eu.etaxonomy.vaadin.mvp.ApplicationView;
 /**
  * @author a.kohlbecker
  * @since Dec 21, 2017
- *
  */
 public interface CollectionPopupEditorView extends ApplicationView<CollectionEditorPresenter> {
 
-    ToOneRelatedEntityCombobox<Collection> getSuperCollectionCombobox();
+    public ToOneRelatedEntityCombobox<Collection> getSuperCollectionCombobox();
 
-    ToOneRelatedEntityCombobox<Institution> getInstitutionCombobox();
+    public ToOneRelatedEntityCombobox<Institution> 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 d466a1cf284a00934ad76a3dad780b2ad4fd41b9..aba717a9abcccff3c54dcc3e5d54393d5b3c579e 100644 (file)
--- 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 95281f13779fad836434f0846503ed42e1ff3e6d..cc48820e1648ca229c447ef74b93d528027888be 100644 (file)
--- 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<DTO, CDM extends CdmBase, V extends ApplicationView<?>> extends AbstractEditorPresenter<DTO, V>
     implements CachingPresenter {
@@ -293,59 +292,38 @@ public abstract class CdmEditorPresenterBase<DTO, CDM extends CdmBase, V extends
     @Override
     protected void deleteBean(DTO bean){
         CDM cdmEntity = cdmEntity(bean);
-        EntityChangeEvent changeEvent = cdmStore.deleteBean(cdmEntity, (AbstractView) getView());
+        EntityChangeEvent<?> changeEvent = cdmStore.deleteBean(cdmEntity, (AbstractView) getView());
         if(changeEvent != null){
             viewEventBus.publish(this, changeEvent);
         }
     }
 
-
-    /**
-     * @param crud
-     */
     public void setGrantsForCurrentUser(EnumSet<CRUD> 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<CdmBase> 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 52d9ca0227fe0b8548b2bd070868a4d3df5fe05e..063b107ee9c64bd8b38959afb0abff3d0a9c21bd 100644 (file)
--- 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 0c0d5d8fe8edb635aa39ce371a51e822291fad79..13c4c6be685a928a9d2f6734a5c9d843c0e7405d 100644 (file)
--- 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;