/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision 4e19a89d

Added by Andreas Kohlbecker over 5 years ago

ID 4e19a89d81eb95410ed2a75e87e26bd51bf4d19b
Parent 3aad942d
Child 97312e07

ref #7648 using CdmEntityInstantiator to disentangle the handling the creation of new taxon names for registrations

      * Base implementation for an event which represents the request to start
      * an editor to enable the user to perform the <code>action</code> transported
      * with this event.
      * <p>
      * Which the {@link #context) stack the action can keep track of the chain of editors which where opened before and which lead
      * to this action. This is important information when working with popup editors for which EntitySave events etc
      * need to be also handled by the base view (e.g. see {@link eu.etaxonomy.cdm.vaadin.view.registration.RegistrationWorkingsetPresenter}
      * from which the the first popup editor of the chain has been opened. So the {@link #context) stack is just like a breadcrumbs information.
+     *
      * @author a.kohlbecker
      * @since Mar 22, 2017
-...
             this(action, null, source, target, sourceView);
+        }
         /**
+         *
          * @deprecated Consider using the constructor with Stack<EditorActionContext> context, so that the context is set for all popupeditors!!!
          */
         @Deprecated
         public AbstractEditorAction(EditorActionType action, UUID entityUuid, Button source, Field<V> target, AbstractView sourceView) {
             this(action, entityUuid, source, target, sourceView, null);
+        }
-...
+        }
         /**
          * Which the {@link #context) stack the action can keep track of the chain of editors
          * which where opened before and which lead
          * to this action.
+         *
          * @return the context
          */
         public Stack<EditorActionContext> getContext() {

+            }
             if(getView().isModeEnabled(TaxonNamePopupEditorMode.NOMENCLATURALREFERENCE_SECTION_EDITING_ONLY)){
                 if(taxonName.getNomenclaturalReference() != null){
                     Reference nomRef = taxonName.getNomenclaturalReference();
                     //getView().getNomReferenceCombobox().setEnabled(nomRef.isOfType(ReferenceType.Section));
                     publishedUnit = nomRef;
                     while(publishedUnit.isOfType(ReferenceType.Section) && publishedUnit.getInReference() != null){
                         publishedUnit = nomRef.getInReference();
+                    }
                     // reduce available references to those which are sections of the publishedUnit and the publishedUnit itself
                     // nomReferencePagingProvider
                     nomReferencePagingProvider.getCriteria().add(Restrictions.or(
                             Restrictions.and(Restrictions.eq("inReference", publishedUnit), Restrictions.eq("type", ReferenceType.Section)),
                             Restrictions.idEq(publishedUnit.getId())
+                            )
                     );
                     // and remove the empty option
                     getView().getNomReferenceCombobox().getSelect().setNullSelectionAllowed(false);
                     // new Reference only a sub sections of the publishedUnit
                     newReferenceInstantiator = new BeanInstantiator<Reference>() {
                         @Override
                         public Reference createNewBean() {
                             Reference newRef = ReferenceFactory.newSection();
                             newRef.setInReference(publishedUnit);
                             return newRef;
+                        }
                     };
                 Reference nomRef = taxonName.getNomenclaturalReference();
                 //getView().getNomReferenceCombobox().setEnabled(nomRef.isOfType(ReferenceType.Section));
                 publishedUnit = nomRef;
                 while(publishedUnit.isOfType(ReferenceType.Section) && publishedUnit.getInReference() != null){
                     publishedUnit = nomRef.getInReference();
+                }
                 // reduce available references to those which are sections of the publishedUnit and the publishedUnit itself
                 // nomReferencePagingProvider
                 nomReferencePagingProvider.getCriteria().add(Restrictions.or(
                         Restrictions.and(Restrictions.eq("inReference", publishedUnit), Restrictions.eq("type", ReferenceType.Section)),
                         Restrictions.idEq(publishedUnit.getId())
+                        )
                 );
                 // and remove the empty option
                 getView().getNomReferenceCombobox().getSelect().setNullSelectionAllowed(false);
                 // new Reference only a sub sections of the publishedUnit
                 newReferenceInstantiator = new BeanInstantiator<Reference>() {
                     @Override
                     public Reference createNewBean() {
                         Reference newRef = ReferenceFactory.newSection();
                         newRef.setInReference(publishedUnit);
                         return newRef;
+                    }
                 };
+            }
             return taxonName;
+        }

         private RegistrationWorkingSet workingset;
         private TaxonName newTaxonNameForRegistration = null;
         private TaxonNamePopupEditor newNameForRegistrationPopupEditor = null;
         private Map<NameTypeDesignationPopupEditor, UUID> nameTypeDesignationPopupEditorRegistrationUUIDMap = new HashMap<>();
-...
+            }
             getView().getAddNewNameRegistrationButton().setEnabled(false);
             newTaxonNameForRegistration = TaxonNameFactory.NewNameInstance(RegistrationUIDefaults.NOMENCLATURAL_CODE, Rank.SPECIES());
             newTaxonNameForRegistration.setNomenclaturalReference(getRepo().getReferenceService().find(workingset.getCitationUuid()));
             EntityChangeEvent nameSaveEvent = getTaxonNameStore().saveBean(newTaxonNameForRegistration, (AbstractView) getView());
             newTaxonNameForRegistration = getRepo().getNameService().find(nameSaveEvent.getEntityUuid());
             TaxonNamePopupEditor popup = openPopupEditor(TaxonNamePopupEditor.class, event);
             popup.setParentEditorActionContext(event.getContext());
             popup.grantToCurrentUser(EnumSet.of(CRUD.UPDATE,CRUD.DELETE));
             popup.withDeleteButton(true);
             TaxonNamePopupEditorConfig.configureForNomenclaturalAct(popup);
             popup.loadInEditor(newTaxonNameForRegistration.getUuid());
             if(newNameForRegistrationPopupEditor == null){
                 TaxonNamePopupEditor popup = openPopupEditor(TaxonNamePopupEditor.class, event);
                 popup.setParentEditorActionContext(event.getContext());
                 popup.grantToCurrentUser(EnumSet.of(CRUD.UPDATE,CRUD.DELETE));
                 popup.withDeleteButton(true);
                 popup.setCdmEntityInstantiator(new BeanInstantiator<TaxonName>() {
                     @Override
                     public TaxonName createNewBean() {
                         TaxonName newTaxonName = TaxonNameFactory.NewNameInstance(RegistrationUIDefaults.NOMENCLATURAL_CODE, Rank.SPECIES());
                         newTaxonName.setNomenclaturalReference(getRepo().getReferenceService().load(workingset.getCitationUuid()));
                         return newTaxonName;
+                    }
                 });
                 TaxonNamePopupEditorConfig.configureForNomenclaturalAct(popup);
                 popup.loadInEditor(null);
+            }
+        }
         /**
-...
         public void onDoneWithTaxonnameEditor(DoneWithPopupEvent event) throws RegistrationValidationException{
             if(event.getPopup() instanceof TaxonNamePopupEditor){
                 try {
                     TransactionStatus txStatus = getRepo().startTransaction();
                     if(event.getReason().equals(Reason.SAVE)){
                         if(newTaxonNameForRegistration != null){
                             UUID taxonNameUuid = newTaxonNameForRegistration.getUuid();
                             getRepo().getSession().refresh(newTaxonNameForRegistration);
                         TransactionStatus txStatus = getRepo().startTransaction();
                         if(newNameForRegistrationPopupEditor != null){
                             UUID taxonNameUuid = newNameForRegistrationPopupEditor.getBean().getUuid();
                             getRepo().getSession().refresh(newNameForRegistrationPopupEditor.getBean().cdmEntity());
                             Registration reg = getRepo().getRegistrationService().createRegistrationForName(taxonNameUuid);
                             // reload workingset into current session
                             loadWorkingSet(workingset.getCitationUuid());
                             workingset.add(reg);
+                        }
                         refreshView(true);
                     } else if(event.getReason().equals(Reason.CANCEL)){
                         if(newTaxonNameForRegistration != null){
                             // clean up
                             getTaxonNameStore().deleteBean(newTaxonNameForRegistration, (AbstractView) getView());
+                        }
                         getRepo().commitTransaction(txStatus);
+                    }
                     getRepo().commitTransaction(txStatus);
                 } finally {
                     getRepo().getSession().clear(); // #7702
+                }
                 newTaxonNameForRegistration = null;
                 newNameForRegistrationPopupEditor = null;
                 getView().getAddNewNameRegistrationButton().setEnabled(true);
+            }
+        }
-...
             } else
             if(TaxonName.class.isAssignableFrom(event.getEntityType())){
                 if(event.getType().equals(EntityChangeEvent.Type.CREATED)){
                     // new name! create a blocking registration
                     Stack<EditorActionContext>context = ((AbstractPopupEditor)event.getSourceView()).getEditorActionContext();
                     EditorActionContext rootContext = context.get(0);
                     if(rootContext.getParentView().equals(getView())){
                         Registration blockingRegistration = getRepo().getRegistrationService().createRegistrationForName(event.getEntityUuid());
                         // new name! create a blocking registration
                         UUID taxonNameUUID = event.getEntityUuid();
                         Registration blockingRegistration = getRepo().getRegistrationService().createRegistrationForName(taxonNameUUID);
                         TypedEntityReference<Registration> regReference = (TypedEntityReference<Registration>)rootContext.getParentEntity();
                         Registration registration = null;
                         for(int i = context.size()-1; i>0; i--){
-...
                         getRepo().getRegistrationService().saveOrUpdate(registration);
                         logger.debug("Blocking registration created");
                     } else {
                         // in case of creating a new name for a registration the parent view is the TaxonNamePopupEditor
                         // this is set
                         logger.debug("Non blocking registration, since a new name for a new registration has been created");
+                    }
+                }

src/main/java/eu/etaxonomy/vaadin/mvp/AbstractCdmDTOPopupEditor.java
40	40	getPresenter().setGrantsForCurrentUser(crud);
41	41	}
42	42
	43	public void setCdmEntityInstantiator(BeanInstantiator<CDM> cdmEntityInstantiator) {
	44	((AbstractCdmDTOEditorPresenter)getPresenter()).setCdmEntityInstantiator(cdmEntityInstantiator);
	45	}
	46
43	47
44	48
45	49	}

Also available in: Unified diff

Project

General

Profile

EDIT

Revision 4e19a89d

Added by Andreas Kohlbecker over 5 years ago

Project

General

Profile

EDIT

Revision 4e19a89d

Added by Andreas Kohlbecker over 5 years ago

Related issues