/ - Diff - EDIT - EDIT Project Management

                 // associate the new typeDesignations with the registration
                 for(SpecimenTypeDesignation std : newTypeDesignations){
                     assureFieldUnit(fieldUnit, std);
                     // here the TypeDesignation.typifiedName is also set internally
                     dto.getTypifiedName().addTypeDesignation(std, false);
                     regPremerge.addTypeDesignation(std);
+                }
-...
                 Session session = repo.getSession();
                 session.merge(dto.getOwner());
                 session.merge(regPremerge);
                 session.flush();
                 // ------------------------ perform delete of removed SpecimenTypeDesignations

     */
     package eu.etaxonomy.cdm.vaadin.view.name;
     import java.util.Optional;
     import com.vaadin.ui.NativeSelect;
     import eu.etaxonomy.cdm.model.name.TaxonName;
     import eu.etaxonomy.cdm.model.name.TypeDesignationStatusBase;
     import eu.etaxonomy.cdm.model.reference.Reference;
     import eu.etaxonomy.cdm.vaadin.view.AnnotationsEditor;
     import eu.etaxonomy.vaadin.component.ToManyRelatedEntitiesComboboxSelect;
-...
      * @since Jan 26, 2018
+     *
      */
     public interface NameTypeDesignationEditorView extends ApplicationView<NameTypeDesignationPresenter>, AnnotationsEditor  {
     public interface NameTypeDesignationEditorView extends ApplicationView<NameTypeDesignationPresenter>, AnnotationsEditor, NomenclaturalActContext  {
         ToOneRelatedEntityCombobox<Reference> getDesignationReferenceCombobox();
-...
         boolean isShowTypeFlags();
         /**
          * possible values:
+         *
          * <ul>
          * <li>NULL: undecided, should be treated like <code>false</code>. This can happen in cases when the typified name is missing the nomref</li>
          * <li>false: the typification is published in an nomenclatural act in which no new name or new combination is being published.
          * The available {@link TypeDesignationStatusBase} should be limited to those with
          * <code>{@link TypeDesignationStatusBase#hasDesignationSource() hasDesignationSource} == true</code></li>
          * <li>true: only status with <code>{@link TypeDesignationStatusBase#hasDesignationSource() hasDesignationSource} == true</li>
          * </ul>
          */
         public void setInTypedesignationOnlyAct(Optional<Boolean> isInTypedesignationOnlyAct);
         /**
          * possible values:
+         *
          * <ul>
          * <li>NULL: undecided, should be treated like <code>false</code>. This can happen in cases when the typified name is missing the nomref</li>
          * <li>false: the typification is published in an nomenclatural act in which no new name or new combination is being published.
          * The available {@link TypeDesignationStatusBase} should be limited to those with
          * <code>{@link TypeDesignationStatusBase#hasDesignationSource() hasDesignationSource} == true</code></li>
          * <li>true: only status with <code>{@link TypeDesignationStatusBase#hasDesignationSource() hasDesignationSource} == true</li>
          * </ul>
          */
         public Optional<Boolean> isInTypedesignationOnlyAct();
+    }

         private boolean showTypeFlags = true;
         Optional<Boolean> inTypedesignationOnlyAct = Optional.empty();
         private Optional<Boolean> inTypedesignationOnlyAct = Optional.empty();
         private FilterableAnnotationsField annotationsListField;
-...
             // need to check for isInTypedesignationOnlyAct also, otherwise the reference field will not show up
             // and the type designation might not be associated with the registration
             // TODO discuss with Henning
             typeStatusSelect.setRequired(typeStatusRequired || isInTypedesignationOnlyAct);
             if(typeStatusRequired && isInTypedesignationOnlyAct) {
             typeStatusSelect.setRequired(typeStatusRequired || checkInTypeDesignationOnlyAct());
             if(typeStatusRequired && checkInTypeDesignationOnlyAct()) {
                 designationReferenceCombobox.setRequiredError(TYPE_STATUS_MUST_BE_SET);
             } else {
                 designationReferenceCombobox.setRequiredError(TYPE_STATUS_OR_FLAG_MUST_BE_SET);

         protected BeanItemContainer<NameTypeDesignationStatus> provideTypeStatusTermItemContainer() {
             Optional<Boolean> isInTypedesignationOnlyAct = getView().isInTypedesignationOnlyAct();
             BeanItemContainer<NameTypeDesignationStatus> container = cdmBeanItemContainerFactory.buildBeanItemContainer(NameTypeDesignationStatus.class);
             List<NameTypeDesignationStatus> filteredItems = container.getItemIds().stream().filter(tsb ->
                         !isInTypedesignationOnlyAct.isPresent()
                         || isInTypedesignationOnlyAct.get().equals(false)
                         getView().checkInTypeDesignationOnlyAct()
                         || tsb.hasDesignationSource() == true
+                    )
                     .collect(Collectors.toList());
-...
+        }
         /**
          * {@inheritDoc}
          */
         @Override
         public void handleViewEntered() {

     /**
     * Copyright (C) 2021 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.cdm.vaadin.view.name;
     import java.util.Optional;
     import eu.etaxonomy.cdm.model.name.TypeDesignationStatusBase;
     /**
      * @author a.kohlbecker
      * @since Feb 25, 2021
      */
     public interface NomenclaturalActContext {
         /**
          * see {@link #isInTypedesignationOnlyAct()}.
          */
         public void setInTypedesignationOnlyAct(Optional<Boolean> isInTypedesignationOnlyAct);
         /**
          * Possible values of the Optional:
+         *
          * <ul>
          * <li><code>!isPresent()</code> (value = NULL): undecided, is treated by {@link #checkInTypeDesignationOnlyAct()} like <code>false</code>.
          * This for example can happen in cases when the typified name misses the nomenclatural reference.</li>
          * <li><code>TRUE</code>: the typification is published in an nomenclatural act in which no new name or new combination is being published.
          * Consequently for example {@link TypeDesignationStatusBase} terms available in an editor should be limited to those with
          * <code>{@link TypeDesignationStatusBase#hasDesignationSource() hasDesignationSource} == true</code>. Other consequences depend on the
          * type of designation and editor.</li>
          * <li><code>FALSE</code>: In the example from above all with <code>{@link TypeDesignationStatusBase}</code> terms are allowed.</li>
          * </ul>
          */
         public Optional<Boolean> isInTypedesignationOnlyAct();
         /**
          * Interprets the value of the Optional according to the rules described in {@link #isInTypedesignationOnlyAct()} and returns
          * an easy to use <code>boolean</code> value.
          */
         public default boolean checkInTypeDesignationOnlyAct() {
             return !isInTypedesignationOnlyAct().isPresent()
                     || isInTypedesignationOnlyAct().get();
+        }
+    }

             boolean withDesignationReference = typeStatus.getValue() != null && ((SpecimenTypeDesignationStatus)typeStatus.getValue()).hasDesignationSource();
             designationReference.setEnabled(withDesignationReference);
             designationReference.setEnabled(withDesignationReference || designationReference.isRequired());
             designationReference.setImmediate(designationReference.isRequired());
     //        if(designationReference.isRequired() && designationReference.isEmpty()) {
     //            designationReference.selectFirst();
     //            designationReference.commitSelect();
     //        }
             designationReferenceDetail.setEnabled(withDesignationReference);
             mediaSpecimenReference.setEnabled(publishedImageType || unPublishedImageType);
-...
+        }
         /**
+         *
          * @return the 0-based position index of the <code>kindOfUnit</code> field in this class
          * which are visible according to {@link #visibleFields())
          */
-...
             @Override
             public void updateRowItemsEnabledStates() {
                 row.updateRowItemsEnablement();
+            }
+        }

     @Scope("prototype")
     public class SpecimenTypeDesignationWorkingsetEditorPresenter
         extends AbstractEditorPresenter<SpecimenTypeDesignationWorkingSetDTO , SpecimenTypeDesignationWorkingsetPopupEditorView>
         implements CachingPresenter, DisposableBean {
         implements CachingPresenter, NomenclaturalActContext, DisposableBean {
         private static final long serialVersionUID = 4255636253714476918L;
-...
         private BeanInstantiator<Reference> newReferenceInstantiator;
         /**
          * possible values:
+         *
          * <ul>
          * <li>NULL: undecided, should be treaded like <code>false</code></li>
          * <li>false: the typification is published in an nomenclatural act in which no new name or new combination is being published.
          * The available {@link TypeDesignationStatusBase} should be limited to those with
          * <code>{@link TypeDesignationStatusBase#hasDesignationSource() hasDesignationSource} == true</code></li>
          * <li>true: only status with <code>{@link TypeDesignationStatusBase#hasDesignationSource() hasDesignationSource} == true</li>
          * </ul>
          */
         private Optional<Boolean> isInTypedesignationOnlyAct = Optional.empty();
         /**
          * Loads an existing working set from the database. This process actually involves
          * loading the Registration specified by the <code>RegistrationAndWorkingsetId.registrationId</code> and in
-...
                 // need to use load() but put() see #7214
                 cache.load(registration);
                 rootEntities.add(registration);
                 isInTypedesignationOnlyAct = Optional.of(Boolean.valueOf(registration.getName() == null));
                 setInTypedesignationOnlyAct(Optional.of(Boolean.valueOf(registration.getName() == null)));
                 try {
                     DescriptionElementSource pubUnitSource = RegistrationDTO.findPublishedUnit(registration);
                     if(pubUnitSource == null) {
-...
                             doReferenceEditorEdit(row.designationReference);
+                        }
                     });
                     row.designationReference.setRequired(checkInTypeDesignationOnlyAct());
                     row.designationReference.getSelect().setNullSelectionAllowed(!checkInTypeDesignationOnlyAct());
                     row.mediaSpecimenReference.loadFrom(
                             referencePagingProvider,
-...
                     .filter(t -> t instanceof SpecimenTypeDesignationStatus)
                     .map(t -> (SpecimenTypeDesignationStatus)t)
                     .filter(tsb ->
                         !isInTypedesignationOnlyAct.isPresent()
                         || isInTypedesignationOnlyAct.get().equals(false)
                         !checkInTypeDesignationOnlyAct()
                         || tsb.hasDesignationSource() == true
+                    )
                     .collect(Collectors.toList());
-...
             return rootEntities ;
+        }
         /**
          * {@inheritDoc}
          */
         @Override
         public void destroy() throws Exception {
             super.destroy();
-...
             this.publishedUnit = publishedUnit;
+        }
         @Override
         public void setInTypedesignationOnlyAct(Optional<Boolean> isInTypedesignationOnlyAct) {
             this.isInTypedesignationOnlyAct = isInTypedesignationOnlyAct;
+        }
         @Override
         public Optional<Boolean> isInTypedesignationOnlyAct() {
             return isInTypedesignationOnlyAct;
+        }
+    }

      */
     public class SpecimenTypeDesignationWorkingsetIds extends TypeDesignationWorkingsetIds<FieldUnit> {
         /**
          * @param registrationUuid
          * @param baseEntityRef
          * @param typifiedNameUuid
          */
         public SpecimenTypeDesignationWorkingsetIds(UUID publishedUnitUuid, UUID registrationUuid, TypedEntityReference<FieldUnit> baseEntityRef, UUID typifiedNameUuid) {
             super(publishedUnitUuid, registrationUuid, baseEntityRef, typifiedNameUuid);
+        }

Project

General

Profile

EDIT

Revision 3776382f

Added by Andreas Kohlbecker about 3 years ago

Project

General

Profile

EDIT

Revision 3776382f

Added by Andreas Kohlbecker about 3 years ago

Related issues