/ - Diff - EDIT - EDIT Project Management

     @Configuration
     @ComponentScan(basePackages={
             "eu.etaxonomy.cdm.vaadin",
             "eu.etaxonomy.vaadin.ui"
             "eu.etaxonomy.vaadin.ui",
             "eu.etaxonomy.cdm.mock" // FIXME remove once mocks are no longer needed
             })
     @EnableVaadin   // this imports VaadinConfiguration
     @EnableVaadinSpringNavigation // activate the NavigationManagerBean

     /**
     * 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.cdm.mock;
     import java.util.HashSet;
     import java.util.Set;
     import org.joda.time.DateTime;
     import eu.etaxonomy.cdm.model.agent.Institution;
     import eu.etaxonomy.cdm.model.common.CdmBase;
     import eu.etaxonomy.cdm.model.common.User;
     import eu.etaxonomy.cdm.model.name.TaxonNameBase;
     import eu.etaxonomy.cdm.model.name.TypeDesignationBase;
     /**
      * @author a.kohlbecker
      * @since Mar 10, 2017
+     *
      */
     public class Registration extends CdmBase {
         private static final long serialVersionUID = -7214477130043178680L;
         private String identifier;
         private String specificIdentifier;   //id without http-domain
         private DateTime registrationDate;
         private RegistrationStatus status;
         private Institution institution;
         private TaxonNameBase name;
         private Set<TypeDesignationBase> typeDesignations = new HashSet<>();
         private Set<Registration> blockedBy = new HashSet<>();
         private User submitter;
         static int idAutoincrement = 100000;
         /**
          * @param name
          */
         public Registration() {
             super();
             status = RegistrationStatus.values()[(int) (Math.random() * RegistrationStatus.values().length)];
             specificIdentifier = Integer.toString(idAutoincrement++);
             identifier = "http://pyhcobank.org/" + specificIdentifier;
             registrationDate = DateTime.now();
+        }
         /**
          * @return the identifier
          */
         public String getIdentifier() {
             return identifier;
+        }
         /**
          * @param identifier the identifier to set
          */
         public void setIdentifier(String identifier) {
             this.identifier = identifier;
+        }
         /**
          * @return the specificIdentifier
          */
         public String getSpecificIdentifier() {
             return specificIdentifier;
+        }
         /**
          * @param specificIdentifier the specificIdentifier to set
          */
         public void setSpecificIdentifier(String specificIdentifier) {
             this.specificIdentifier = specificIdentifier;
+        }
         /**
          * @return the registrationDate
          */
         public org.joda.time.DateTime getRegistrationDate() {
             return registrationDate;
+        }
         /**
          * @param registrationDate the registrationDate to set
          */
         public void setRegistrationDate(org.joda.time.DateTime registrationDate) {
             this.registrationDate = registrationDate;
+        }
         /**
          * @return the status
          */
         public RegistrationStatus getStatus() {
             return status;
+        }
         /**
          * @param status the status to set
          */
         public void setStatus(RegistrationStatus status) {
             this.status = status;
+        }
         /**
          * @return the institution
          */
         public Institution getInstitution() {
             return institution;
+        }
         /**
          * @param institution the institution to set
          */
         public void setInstitution(Institution institution) {
             this.institution = institution;
+        }
         /**
          * @return the name
          */
         public TaxonNameBase getName() {
             return name;
+        }
         /**
          * @param name the name to set
          */
         public void setName(TaxonNameBase name) {
             this.name = name;
+        }
         /**
          * @return the submitter
          */
         public User getSubmitter() {
             return submitter;
+        }
         /**
          * @param submitter the submitter to set
          */
         public void setSubmitter(User submitter) {
             this.submitter = submitter;
+        }
         public boolean addTypeDesignationBase(TypeDesignationBase typeDesignationBase){
             return typeDesignations.add(typeDesignationBase);
+        }
         public boolean addBlockedBy(Registration registration){
             return blockedBy.add(registration);
+        }
         /**
          * @return the typeDesignations
          */
         public Set<TypeDesignationBase> getTypeDesignations() {
             return typeDesignations;
+        }
         /**
          * @return the blockedBy
          */
         public Set<Registration> getBlockedBy() {
             return blockedBy;
+        }
+    }

     /**
     * 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.cdm.mock;
     import java.util.Collection;
     import java.util.HashMap;
     import java.util.List;
     import java.util.Map;
     import java.util.UUID;
     import javax.annotation.PostConstruct;
     import org.springframework.beans.factory.annotation.Autowired;
     import org.springframework.beans.factory.annotation.Qualifier;
     import org.springframework.stereotype.Component;
     import eu.etaxonomy.cdm.api.application.CdmRepository;
     import eu.etaxonomy.cdm.model.name.TaxonNameBase;
     import eu.etaxonomy.cdm.model.name.TypeDesignationBase;
     /**
      * @author a.kohlbecker
      * @since Mar 10, 2017
+     *
      */
     @Component("registrationServiceMock")
     public class RegistrationService {
         @Autowired
         @Qualifier("cdmRepository")
         private CdmRepository repo;
         private Map<UUID, Registration> registrationsByUUID = new HashMap<>();
         private Map<String, Registration> registrationsByRegID = new HashMap<>();
         public RegistrationService() {
+        }
         @PostConstruct
         protected void init(){
             List<TaxonNameBase> names = repo.getNameService().list(TaxonNameBase.class, 20, 0, null, null);
             names.forEach(
                     name -> {
                         Registration reg = new Registration();
                         reg.setName(name);
                         registrationsByUUID.put(reg.getUuid(), reg);
                         registrationsByRegID.put(reg.getSpecificIdentifier(), reg);
+                    }
                    );
             List<TypeDesignationBase> tds = repo.getNameService().getAllTypeDesignations(20, 0);
             tds.forEach(
                     type -> {
                         Registration reg = new Registration();
                         reg.addTypeDesignationBase(type);
                         registrationsByUUID.put(reg.getUuid(), reg);
                         registrationsByRegID.put(reg.getSpecificIdentifier(), reg);
+                    }
                    );
+        }
         /**
          * {@inheritDoc}
          */
         public Registration load(UUID uuid) {
             return registrationsByUUID.get(uuid);
+        }
         public Collection<Registration> list(){
             return registrationsByUUID.values();
+        }
         /**
          * @param registrationID
          * @return
          */
         public Registration loadByRegistrationID(Integer registrationID) {
             return registrationsByRegID.get(registrationID);
+        }
+    }

     /**
     * 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.cdm.mock;
     public enum RegistrationStatus {
         preparation,// A new record which is being edited by the Author
         curation, //A record ready for the curator to be validated.
         ready, //The record has passed the validation by the curator and is ready for publication.
         published, //The name or typification has finally been published.
         rejected //The registration has been rejected, the process is aborted and the record is preserved.
+    }

     /**
     * 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.cdm.vaadin.event.phycobank;
     import eu.etaxonomy.cdm.vaadin.presenter.phycobank.RegistrationType;
     /**
      * @author a.kohlbecker
      * @since Mar 3, 2017
+     *
      */
     public class RegistrationStartEvent {
         private RegistrationType type;
         RegistrationStartEvent(RegistrationType type){
             this.type = type;
+        }
         /**
          * @return the type
          */
         public RegistrationType getType() {
             return type;
+        }
+    }

     /**
     * 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.cdm.vaadin.event.phycobank;
     import eu.etaxonomy.cdm.vaadin.presenter.phycobank.RegistrationType;
     /**
      * @author a.kohlbecker
      * @since Mar 3, 2017
+     *
      */
     public class RegistrationWorkflowEvent {
         private RegistrationType type = null;
         private Action action;
         private Integer registrationID = null;
         public RegistrationWorkflowEvent(int registrationID){
             this.action = Action.open;
             this.registrationID = registrationID;
+        }
         public RegistrationWorkflowEvent(RegistrationType type){
             this.type = type;
             this.action = Action.start;
+        }
         /**
          * @return the type
          */
         public RegistrationType getType() {
             return type;
+        }
         /**
          * @return the action
          */
         public Action getAction() {
             return action;
+        }
         /**
          * @return the registrationID
          */
         public Integer getRegistrationID() {
             return registrationID;
+        }
         public boolean isStart() {
             return action.equals(Action.start);
+        }
         enum Action {
             start, open;
+        }
+    }

     import java.util.ArrayList;
     import java.util.Collection;
     import java.util.List;
     import java.util.UUID;
     import org.joda.time.DateTime;
     import org.springframework.beans.factory.annotation.Autowired;
     import com.vaadin.spring.annotation.SpringComponent;
     import com.vaadin.spring.annotation.ViewScope;
     import eu.etaxonomy.cdm.model.name.TaxonNameBase;
     import eu.etaxonomy.cdm.mock.Registration;
     import eu.etaxonomy.cdm.mock.RegistrationService;
     import eu.etaxonomy.cdm.vaadin.view.phycobank.ListView;
     import eu.etaxonomy.vaadin.mvp.AbstractPresenter;
-...
     @ViewScope
     public class ListPresenter extends AbstractPresenter<ListView> {
         @Autowired
         private RegistrationService serviceMock;
         @Override
         public void onViewEnter() {
             super.onViewEnter();
-...
          * @return
          */
         private Collection<RegistrationDTO> listRegistrations() {
             List<TaxonNameBase> names = getRepo().getNameService().list(TaxonNameBase.class, 500, 0, null, null);
             Collection<RegistrationDTO> dtos = new ArrayList<>(names.size());
             names.forEach(name -> { dtos.add(new RegistrationDTO(name)); });
             Collection<Registration> registrations = serviceMock.list();
             Collection<RegistrationDTO> dtos = new ArrayList<>(registrations.size());
             registrations.forEach(reg -> { dtos.add(new RegistrationDTO(reg)); });
             return dtos;
+        }
         private static int idAutoincrement = 100000;
         public class RegistrationDTO{
             private String summary;
             private UUID registeredEntityUuid;
             private RegistrationType registrationType;
             private RegistrationStatus status;
             private String registrationId;
             private String internalRegId;
             private DateTime registrationDate = null;
             private DateTime created = null;
             /**
              * @param name
              */
             public RegistrationDTO(TaxonNameBase name) {
                 summary = name.getTitleCache();
                 registeredEntityUuid = name.getUuid();
                 registrationType = RegistrationType.values()[(int) (Math.random() * RegistrationType.values().length)];
                 status = RegistrationStatus.values()[(int) (Math.random() * RegistrationStatus.values().length)];
                 internalRegId = Integer.toString(ListPresenter.idAutoincrement++);
                 registrationId = "http://pyhcobank.org/" + internalRegId;
                 created = DateTime.now();
+            }
             /**
              * @return the summary
              */
             public String getSummary() {
                 return summary;
+            }
             /**
              * @param summary the summary to set
              */
             public void setSummary(String summary) {
                 this.summary = summary;
+            }
             /**
              * @return the registrationType
              */
             public RegistrationType getRegistrationType() {
                 return registrationType;
+            }
             /**
              * @param registrationType the registrationType to set
              */
             public void setRegistrationType(RegistrationType registrationType) {
                 this.registrationType = registrationType;
+            }
             /**
              * @return the status
              */
             public RegistrationStatus getStatus() {
                 return status;
+            }
             /**
              * @param status the status to set
              */
             public void setStatus(RegistrationStatus status) {
                 this.status = status;
+            }
             /**
              * @return the registrationId
              */
             public String getRegistrationId() {
                 return registrationId;
+            }
             /**
              * @param registrationId the registrationId to set
              */
             public void setRegistrationId(String registrationId) {
                 this.registrationId = registrationId;
+            }
             /**
              * @return the internalRegId
              */
             public String getInternalRegId() {
                 return internalRegId;
+            }
             /**
              * @param internalRegId the internalRegId to set
              */
             public void setInternalRegId(String internalRegId) {
                 this.internalRegId = internalRegId;
+            }
             /**
              * @return the registeredEntityUuid
              */
             public UUID getRegisteredEntityUuid() {
                 return registeredEntityUuid;
+            }
             /**
              * @param registeredEntityUuid the registeredEntityUuid to set
              */
             public void setRegisteredEntityUuid(UUID registeredEntityUuid) {
                 this.registeredEntityUuid = registeredEntityUuid;
+            }
             /**
              * @return the registrationDate
              */
             public DateTime getRegistrationDate() {
                 return registrationDate;
+            }
             /**
              * @return the created
              */
             public DateTime getCreated() {
                 return created;
+            }
+        }
         public enum RegistrationStatus {
             preparation,// A new record which is being edited by the Author
             curation, //A record ready for the curator to be validated.
             ready, //The record has passed the validation by the curator and is ready for publication.
             published, //The name or typification has finally been published.
             rejected //The registration has been rejected, the process is aborted and the record is preserved.
+        }
+    }

     /**
     * 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.cdm.vaadin.presenter.phycobank;
     import org.joda.time.DateTime;
     import eu.etaxonomy.cdm.mock.Registration;
     import eu.etaxonomy.cdm.mock.RegistrationStatus;
     public class RegistrationDTO{
         private String summary = "";
         private RegistrationType registrationType;
         private Registration reg;
         static int idAutoincrement = 100000;
         /**
          * @param reg
          */
         public RegistrationDTO(Registration reg) {
              this.reg = reg;
             registrationType = RegistrationType.from(reg);
             if(registrationType.isName()){
                 summary = reg.getName().getTitleCache();
             } else if(registrationType.isTypification()){
                 StringBuffer sb = new StringBuffer();
                 reg.getTypeDesignations().forEach(td -> sb.append(td.toString()).append(' '));
                 summary = sb.toString();
             } else {
                 summary = "- INVALID REGISTRATION -";
+            }
+        }
         /**
          * @return the summary
          */
         public String getSummary() {
             return summary;
+        }
         /**
          * @return the registrationType
          */
         public RegistrationType getRegistrationType() {
             return registrationType;
+        }
         /**
          * @return the status
          */
         public RegistrationStatus getStatus() {
             return reg.getStatus();
+        }
         /**
          * @return the registrationId
          */
         public String getRegistrationId() {
             return reg.getIdentifier();
+        }
         /**
          * @return the internalRegId
          */
         public String getInternalRegId() {
             return reg.getSpecificIdentifier();
+        }
         /**
          * @return the registrationDate
          */
         public DateTime getRegistrationDate() {
             return reg.getRegistrationDate();
+        }
         /**
          * @return the created
          */
         public DateTime getCreated() {
             return reg.getCreated();
+        }
+    }

     */
     package eu.etaxonomy.cdm.vaadin.presenter.phycobank;
     import eu.etaxonomy.cdm.mock.Registration;
     /**
      * @author a.kohlbecker
      * @since Mar 3, 2017
-...
      */
     public enum RegistrationType {
         name, typification;
         name, typification, invalid;
         /**
          * @param reg
          * @return
          */
         public static RegistrationType from(Registration reg) {
             if(reg.getName() != null){
                 return name;
+            }
             if(reg.getTypeDesignations().size() > 0){
                 return typification;
+            }
             return invalid;
+        }
         /**
          * @return
          */
         public boolean isName() {
             return name.equals(this);
+      }
         /**
          * @return
          */
         public boolean isTypification() {
             return typification.equals(this);
+        }
+    }

     */
     package eu.etaxonomy.cdm.vaadin.presenter.phycobank;
     import org.springframework.beans.factory.annotation.Autowired;
     import org.springframework.context.event.EventListener;
     import com.vaadin.spring.annotation.SpringComponent;
     import com.vaadin.spring.annotation.ViewScope;
     import eu.etaxonomy.cdm.vaadin.event.phycobank.RegistrationStartEvent;
     import eu.etaxonomy.cdm.mock.Registration;
     import eu.etaxonomy.cdm.mock.RegistrationService;
     import eu.etaxonomy.cdm.model.name.Rank;
     import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
     import eu.etaxonomy.cdm.vaadin.event.phycobank.RegistrationWorkflowEvent;
     import eu.etaxonomy.cdm.vaadin.view.phycobank.RegistrationWorkflowView;
     import eu.etaxonomy.vaadin.mvp.AbstractPresenter;
-...
     @ViewScope
     public class RegistrationWorkflowPresenter extends AbstractPresenter<RegistrationWorkflowView> {
         private RegistrationType registrationType = null;
         @Autowired
         private RegistrationService serviceMock;
         private Registration registration;
         /**
+         *
-...
+        }
         @EventListener
         protected void onRegistrationStartEvent(RegistrationStartEvent e){
             this.registrationType = e.getType();
             getView().getTitle().setValue(getView().getTitle().getValue() + " " + registrationType.name());
         protected void onRegistrationStartEvent(RegistrationWorkflowEvent e){
             if(e.isStart()) {
                 registration = new Registration();
                 registration.setName(TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES()));
             } else {
                 registration = serviceMock.loadByRegistrationID(e.getRegistrationID());
+            }
             if(registration != null){
                 getView().getTitle().setValue(getView().getTitle().getValue() + " " + registrationType().name());
                 getView().makeWorflow(registrationType());
+            }
+        }
         /**
          * @return
          */
         private RegistrationType registrationType() {
             return RegistrationType.from(registration);
+        }

     import java.util.Collection;
     import eu.etaxonomy.cdm.vaadin.presenter.phycobank.ListPresenter;
     import eu.etaxonomy.cdm.vaadin.presenter.phycobank.ListPresenter.RegistrationDTO;
     import eu.etaxonomy.cdm.vaadin.presenter.phycobank.RegistrationDTO;
     import eu.etaxonomy.vaadin.mvp.ApplicationView;
     /**
-...
          */
         void populateTable(Collection<RegistrationDTO> registrations);
+    }

     import com.vaadin.ui.themes.ValoTheme;
     import eu.etaxonomy.cdm.vaadin.presenter.phycobank.ListPresenter;
     import eu.etaxonomy.cdm.vaadin.presenter.phycobank.ListPresenter.RegistrationDTO;
     import eu.etaxonomy.cdm.vaadin.presenter.phycobank.RegistrationDTO;
     import eu.etaxonomy.cdm.vaadin.presenter.phycobank.RegistrationType;
     import eu.etaxonomy.cdm.vaadin.util.JodaDateTimeConverter;
     import eu.etaxonomy.cdm.vaadin.util.UrlStringConverter;

     import com.vaadin.ui.CssLayout;
     import com.vaadin.ui.Label;
     import eu.etaxonomy.cdm.vaadin.presenter.phycobank.RegistrationType;
     import eu.etaxonomy.vaadin.mvp.ApplicationView;
     /**
-...
         @Deprecated
         void openNameEditor(UUID nameUuid);
         public void makeWorflow(RegistrationType type);
+    }

     import eu.etaxonomy.cdm.vaadin.component.phycobank.RegistrationWorkflowComponent;
     import eu.etaxonomy.cdm.vaadin.component.phycobank.WorkflowSteps;
     import eu.etaxonomy.cdm.vaadin.event.phycobank.RegistrationWorkflowEvent;
     import eu.etaxonomy.cdm.vaadin.presenter.phycobank.RegistrationType;
     import eu.etaxonomy.cdm.vaadin.presenter.phycobank.RegistrationWorkflowPresenter;
     import eu.etaxonomy.vaadin.mvp.AbstractView;
-...
                if(params[0].equals(ACTION_NEW)) {
                    regType = RegistrationType.valueOf(params[1]);
                    design.getTitle().setValue(design.getTitle().getValue() + "  " + regType.name() + " ...");
                    makeWorflow(regType);
                    eventBus.publishEvent(new RegistrationWorkflowEvent(regType));
                } else if( params[0].equals(ACTION_EDIT)) {
                    design.getTitle().setValue(design.getTitle().getValue() + "  " + params[1]);
                    eventBus.publishEvent(new RegistrationWorkflowEvent(Integer.parseInt(params[1])));
+               }
+            }
+        }
         private void makeWorflow(RegistrationType type){
         @Override
         public void makeWorflow(RegistrationType type){
             switch (type) {
             case name:
                 addNameWorkflow();

Project

General

Profile

EDIT

Revision b0fdf0ab

Added by Andreas Kohlbecker about 7 years ago

Project

General

Profile

EDIT

Revision b0fdf0ab

Added by Andreas Kohlbecker about 7 years ago

Related issues