cleanup TypedEntityReference constructors in vaadin and general cleanup

diff --git a/src/main/java/eu/etaxonomy/cdm/service/TypifiedEntityFilterablePagingProvider.java b/src/main/java/eu/etaxonomy/cdm/service/TypifiedEntityFilterablePagingProvider.java
index 324a1ff09af22a3a4babbafdeac1a3dc8bc8a079..0bb85acfe83d842a7e19d69252768dbad695386c 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/service/TypifiedEntityFilterablePagingProvider.java
+++ b/src/main/java/eu/etaxonomy/cdm/service/TypifiedEntityFilterablePagingProvider.java
@@ -26,9 +26,9 @@ import eu.etaxonomy.cdm.ref.TypedEntityReference;
 /**
  * @author a.kohlbecker
  * @since Dec 11, 2018
- *
  */
-public class TypifiedEntityFilterablePagingProvider<T extends IdentifiableEntity> implements FilterablePagingProvider<TypedEntityReference<T>>, FilterableCountProvider{
+public class TypifiedEntityFilterablePagingProvider<T extends IdentifiableEntity>
+        implements FilterablePagingProvider<TypedEntityReference<T>>, FilterableCountProvider{
 
     private CdmFilterablePagingProvider<T, T> entityPagingProvider;
 
@@ -39,47 +39,31 @@ public class TypifiedEntityFilterablePagingProvider<T extends IdentifiableEntity
         entityPagingProvider = new CdmFilterablePagingProvider<T, T>(service, matchMode, orderHints);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public int size(String filter) {
         return entityPagingProvider.size(filter);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public List<TypedEntityReference<T>> findEntities(int firstRow, String filter) {
         List<T> entities = entityPagingProvider.findEntities(firstRow, filter);
         List<TypedEntityReference<T>> ters = new ArrayList<>(entities.size());
-        for(T e : entities){
-            Class<T> type = (Class<T>)e.getClass();
-            String label = labelProvider.ellypsis(e, filter);
-            TypedEntityReference<T> ter = new TypedEntityReference<T>(type, e.getUuid(), label);
-            ters.add(ter);
+        for(T entity : entities){
+            String label = labelProvider.ellypsis(entity, filter);
+            TypedEntityReference<T> typedEntityReference = TypedEntityReference.fromEntityWithLabel(entity, label);
+            ters.add(typedEntityReference);
         }
         return ters;
     }
 
-    /**
-     * @param restriction
-     */
     public void addRestriction(Restriction restriction) {
         entityPagingProvider.addRestriction(restriction);
     }
 
-    /**
-     * @return
-     */
     public int getPageSize() {
         return entityPagingProvider.getPageSize();
     }
 
-    /**
-     * @param asList
-     */
     public void setInitStrategy(List<String> initStrategy) {
         entityPagingProvider.setInitStrategy(initStrategy);
     }

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorksetViewBean.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorksetViewBean.java
index ab59762f12d554906d05ee40bdf3b1166f73a8d8..48923e41c5ab2952c5a44ca0a78eadf50666c177 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorksetViewBean.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorksetViewBean.java
@@ -46,7 +46,6 @@ import com.vaadin.ui.Window;
 import com.vaadin.ui.themes.ValoTheme;
 
 import eu.etaxonomy.cdm.api.service.dto.RegistrationDTO;
-import eu.etaxonomy.cdm.api.service.dto.RegistrationType;
 import eu.etaxonomy.cdm.api.service.dto.RegistrationWorkingSet;
 import eu.etaxonomy.cdm.api.service.name.TypeDesignationSet.TypeDesignationSetType;
 import eu.etaxonomy.cdm.api.util.RoleProberImpl;
@@ -235,7 +234,6 @@ public class RegistrationWorksetViewBean
         addNewNameRegistrationButton.addClickListener(
                 e -> {
                     getViewEventBus().publish(this, new TaxonNameEditorAction(EditorActionType.ADD, null, addNewNameRegistrationButton, null, this, context));
-
                 }
         );
 
@@ -300,17 +298,17 @@ public class RegistrationWorksetViewBean
     private void reviewExistingName() {
         // call commit to make the selection available
         existingNameCombobox.commit();
-        UUID uuid = existingNameCombobox.getValue().getUuid();
-        Stack<EditorActionContext> context = new Stack<EditorActionContext>();
+        TaxonName taxonName = existingNameCombobox.getValue();
+        Stack<EditorActionContext> context = new Stack<>();
         context.push(new EditorActionContext(
-                    new TypedEntityReference<>(TaxonName.class, uuid),
+                    TypedEntityReference.fromEntity(taxonName),
                     this)
                     );
         getViewEventBus().publish(
                 this,
                 new TaxonNameEditorAction(
                         EditorActionType.EDIT,
-                        uuid,
+                        taxonName.getUuid(),
                         addExistingNameButton,
                         existingNameCombobox,
                         this,