Project

General

Profile

« Previous | Next » 

Revision d9a042e5

Added by Andreas Müller almost 2 years ago

ref #10089 rename TypeDesignationWorkingSet to TypeDesignationSet in vaadin

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorksetViewBean.java
48 48
import eu.etaxonomy.cdm.api.service.dto.RegistrationDTO;
49 49
import eu.etaxonomy.cdm.api.service.dto.RegistrationType;
50 50
import eu.etaxonomy.cdm.api.service.dto.RegistrationWorkingSet;
51
import eu.etaxonomy.cdm.api.service.name.TypeDesignationWorkingSet.TypeDesignationWorkingSetType;
51
import eu.etaxonomy.cdm.api.service.name.TypeDesignationSet.TypeDesignationSetType;
52 52
import eu.etaxonomy.cdm.api.util.RoleProberImpl;
53 53
import eu.etaxonomy.cdm.model.common.VersionableEntity;
54 54
import eu.etaxonomy.cdm.model.name.Registration;
......
62 62
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationItem;
63 63
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationItemButtons;
64 64
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationItemNameAndTypeButtons;
65
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationItemNameAndTypeButtons.TypeDesignationWorkingSetButton;
65
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationItemNameAndTypeButtons.TypeDesignationSetButton;
66 66
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationItemsPanel;
67 67
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationStatusFieldInstantiator;
68 68
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationStatusLabel;
......
70 70
import eu.etaxonomy.cdm.vaadin.event.RegistrationEditorAction;
71 71
import eu.etaxonomy.cdm.vaadin.event.ShowDetailsEvent;
72 72
import eu.etaxonomy.cdm.vaadin.event.TaxonNameEditorAction;
73
import eu.etaxonomy.cdm.vaadin.event.TypeDesignationWorkingsetEditorAction;
73
import eu.etaxonomy.cdm.vaadin.event.TypeDesignationSetEditorAction;
74 74
import eu.etaxonomy.cdm.vaadin.event.registration.RegistrationWorkingsetAction;
75 75
import eu.etaxonomy.cdm.vaadin.permission.AccessRestrictedView;
76 76
import eu.etaxonomy.cdm.vaadin.permission.PermissionDebugUtils;
......
397 397
            });
398 398
        }
399 399

  
400
        for(TypeDesignationWorkingSetButton workingsetButton : regItemButtonGroup.getTypeDesignationButtons()){
400
        for(TypeDesignationSetButton workingsetButton : regItemButtonGroup.getTypeDesignationButtons()){
401 401
            workingsetButton.getButton().addClickListener(e -> {
402 402
                VersionableEntity baseEntity = workingsetButton.getBaseEntity();
403 403
                EntityReference typifiedNameRef = typifiedNamesMap.get(registrationEntityUuid);
404
                TypeDesignationWorkingSetType workingsetType = workingsetButton.getType();
405
                getViewEventBus().publish(this, new TypeDesignationWorkingsetEditorAction(
404
                TypeDesignationSetType workingsetType = workingsetButton.getType();
405
                getViewEventBus().publish(this, new TypeDesignationSetEditorAction(
406 406
                        baseEntity,
407 407
                        workingsetType,
408 408
                        registrationEntityUuid,
......
526 526
        typeDesignationTypeCooser.setCaption("Add new type designation");
527 527
        Label label = new Label("Please select kind of type designation to be created.");
528 528
        Button newSpecimenTypeDesignationButton = new Button("Specimen type designation",
529
                e -> addNewTypeDesignationWorkingset(TypeDesignationWorkingSetType.SPECIMEN_TYPE_DESIGNATION_WORKINGSET, registrationEntityUuid, typeDesignationTypeCooser, e.getButton()));
529
                e -> addNewTypeDesignationSet(TypeDesignationSetType.SPECIMEN_TYPE_DESIGNATION_SET, registrationEntityUuid, typeDesignationTypeCooser, e.getButton()));
530 530
        Button newNameTypeDesignationButton = new Button("Name type designation",
531
                e -> addNewTypeDesignationWorkingset(TypeDesignationWorkingSetType.NAME_TYPE_DESIGNATION_WORKINGSET, registrationEntityUuid, typeDesignationTypeCooser, e.getButton()));
531
                e -> addNewTypeDesignationSet(TypeDesignationSetType.NAME_TYPE_DESIGNATION_SET, registrationEntityUuid, typeDesignationTypeCooser, e.getButton()));
532 532

  
533 533
        VerticalLayout layout = new VerticalLayout(label, newSpecimenTypeDesignationButton, newNameTypeDesignationButton);
534 534
        layout.setMargin(true);
......
543 543
     * @param button
544 544
     *
545 545
     */
546
    protected void addNewTypeDesignationWorkingset(TypeDesignationWorkingSetType newWorkingsetType, UUID registrationEntityUuid, Window typeDesignationTypeCooser, Button sourceButton) {
546
    protected void addNewTypeDesignationSet(TypeDesignationSetType newWorkingsetType, UUID registrationEntityUuid, Window typeDesignationTypeCooser, Button sourceButton) {
547 547
        UI.getCurrent().removeWindow(typeDesignationTypeCooser);
548 548
        EntityReference typifiedNameRef = typifiedNamesMap.get(registrationEntityUuid);
549
        getViewEventBus().publish(this, new TypeDesignationWorkingsetEditorAction(
549
        getViewEventBus().publish(this, new TypeDesignationSetEditorAction(
550 550
                newWorkingsetType,
551 551
                registrationEntityUuid,
552 552
                typifiedNameRef.getUuid(),

Also available in: Unified diff