ref #9290 cleaning up

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TypeDesignationWorkingsetEditorIdSet.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TypeDesignationWorkingsetEditorIdSet.java
index 96112aaa7836d149d2bfa67009642944bc6fd27f..fdb4cb4a39ec25d0d9ca8e141827513635bbb459 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TypeDesignationWorkingsetEditorIdSet.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TypeDesignationWorkingsetEditorIdSet.java
@@ -17,7 +17,6 @@ public class TypeDesignationWorkingsetEditorIdSet {
 
     UUID registrationUuid;
     TypedEntityReference<IdentifiableEntity<?>> baseEntityRef;
-    UUID publicationUuid;
     UUID typifiedNameUuid;
 
     /**
@@ -25,16 +24,12 @@ public class TypeDesignationWorkingsetEditorIdSet {
      *            must be present
      * @param baseEntityRef
      *
-     * @param publicationUuid
-     *            Can <code>null</code> if the <code>workingsetId</code> is given.
      * @param typifiedNameUuid
      *            Can <code>null</code> if the <code>workingsetId</code> is given
      */
-    protected TypeDesignationWorkingsetEditorIdSet(UUID registrationUuid, TypedEntityReference<IdentifiableEntity<?>> baseEntityRef,
-            UUID publicationUuid, UUID typifiedNameUuid) {
+    protected TypeDesignationWorkingsetEditorIdSet(UUID registrationUuid, TypedEntityReference<IdentifiableEntity<?>> baseEntityRef, UUID typifiedNameUuid) {
         this.registrationUuid = registrationUuid;
         this.baseEntityRef = baseEntityRef;
-        this.publicationUuid = publicationUuid;
         this.typifiedNameUuid = typifiedNameUuid;
         if(baseEntityRef == null && typifiedNameUuid == null){
             throw new NullPointerException("When workingsetId is null the typifiedNameId must be non null.");
@@ -42,10 +37,10 @@ public class TypeDesignationWorkingsetEditorIdSet {
     }
 
     public TypeDesignationWorkingsetEditorIdSet(UUID registrationUuid, TypedEntityReference<IdentifiableEntity<?>> baseEntityRef) {
-        this(registrationUuid, baseEntityRef, null, null);
+        this(registrationUuid, baseEntityRef, null);
     }
 
-    public TypeDesignationWorkingsetEditorIdSet(UUID registrationUuid, UUID publicationUuid, UUID typifiedNameUuid) {
-        this(registrationUuid, null, publicationUuid, typifiedNameUuid);
+    public TypeDesignationWorkingsetEditorIdSet(UUID registrationUuid, UUID typifiedNameUuid) {
+        this(registrationUuid, null, typifiedNameUuid);
     }
 }
\ No newline at end of file

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 239248de616c24877df0ece723efbb2e3ffa156c..d4944d2f042718f88c1aae3403a11319c5645b00 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java
@@ -586,7 +586,6 @@ public class RegistrationWorkingsetPresenter extends AbstractPresenter<Registrat
         if(event.getWorkingSetType() == TypeDesignationWorkingSetType.SPECIMEN_TYPE_DESIGNATION_WORKINGSET){
             SpecimenTypeDesignationWorkingsetPopupEditor popup = openPopupEditor(SpecimenTypeDesignationWorkingsetPopupEditor.class, event);
             popup.setParentEditorActionContext(event.getContext(), event.getTarget());
-            TypeDesignationWorkingsetEditorIdSet identifierSet;
             UUID typifiedNameUuid;
 
             RegistrationDTO registrationDTO = workingset.getRegistrationDTO(event.getRegistrationUuid()).get();
@@ -599,14 +598,13 @@ public class RegistrationWorkingsetPresenter extends AbstractPresenter<Registrat
                 typifiedNameUuid = registrationDTO.getNameRef().getUuid();
             }
 
-            identifierSet = new TypeDesignationWorkingsetEditorIdSet(
+            popup.grantToCurrentUser(EnumSet.of(CRUD.UPDATE, CRUD.DELETE));
+            popup.withDeleteButton(false);
+            popup.loadInEditor(new TypeDesignationWorkingsetEditorIdSet(
                     event.getRegistrationUuid(),
-                    null,
                     typifiedNameUuid
+                    )
                     );
-            popup.grantToCurrentUser(EnumSet.of(CRUD.UPDATE, CRUD.DELETE));
-            popup.withDeleteButton(false);
-            popup.loadInEditor(identifierSet);
             if(event.hasSource()){
                 // propagate readonly state from source component to popup
                 popup.setReadOnly(event.getSource().isReadOnly());