Project

General

Profile

« Previous | Next » 

Revision a2415b9f

Added by Andreas Kohlbecker almost 6 years ago

ref #7458 initial implementation of a note field at the example of the TaxonNameEditor

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditor.java
34 34
import com.vaadin.ui.TextField;
35 35

  
36 36
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
37
import eu.etaxonomy.cdm.model.common.AnnotationType;
37 38
import eu.etaxonomy.cdm.model.common.CdmBase;
38 39
import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction;
39 40
import eu.etaxonomy.cdm.model.name.NameRelationshipType;
......
41 42
import eu.etaxonomy.cdm.model.name.TaxonName;
42 43
import eu.etaxonomy.cdm.model.reference.Reference;
43 44
import eu.etaxonomy.cdm.vaadin.component.TextFieldNFix;
45
import eu.etaxonomy.cdm.vaadin.component.common.FilterableAnnotationsField;
44 46
import eu.etaxonomy.cdm.vaadin.component.common.TeamOrPersonField;
45 47
import eu.etaxonomy.cdm.vaadin.event.ReferenceEditorAction;
46 48
import eu.etaxonomy.cdm.vaadin.event.TaxonNameEditorAction;
......
65 67
 */
66 68
@SpringComponent
67 69
@Scope("prototype")
68
public class TaxonNamePopupEditor extends AbstractCdmDTOPopupEditor<TaxonNameDTO, TaxonName, TaxonNameEditorPresenter> implements TaxonNamePopupEditorView, AccessRestrictedView {
70
public class TaxonNamePopupEditor extends AbstractCdmDTOPopupEditor<TaxonNameDTO, TaxonName, TaxonNameEditorPresenter>
71
    implements TaxonNamePopupEditorView, AccessRestrictedView {
69 72

  
70 73
    private static final long serialVersionUID = -7037436241474466359L;
71 74

  
72 75
    private final static int GRID_COLS = 4;
73 76

  
74
    private final static int GRID_ROWS = 16;
77
    private final static int GRID_ROWS = 17;
75 78

  
76 79
    private static final boolean HAS_BASIONYM_DEFAULT = false;
77 80

  
......
129 132

  
130 133
    private ValueChangeListener updateFieldVisibilityListener = e -> updateFieldVisibility();
131 134

  
135
    private FilterableAnnotationsField annotationsListField;
136

  
137
    private AnnotationType[] editableAnotationTypes = new AnnotationType[]{AnnotationType.EDITORIAL()};
138

  
139

  
140
    /**
141
     * By default  AnnotationType.EDITORIAL() is enabled.
142
     *
143
     * @return the editableAnotationTypes
144
     */
145
    public AnnotationType[] getEditableAnotationTypes() {
146
        return editableAnotationTypes;
147
    }
148

  
149
    /**
150
     * By default  AnnotationType.EDITORIAL() is enabled.
151
     *
152
     *
153
     * @param editableAnotationTypes the editableAnotationTypes to set
154
     */
155
    public void setEditableAnotationTypes(AnnotationType ... editableAnotationTypes) {
156
        this.editableAnotationTypes = editableAnotationTypes;
157
    }
158

  
132 159
    /**
133 160
     * @param layout
134 161
     * @param dtoType
......
146 173
    }
147 174

  
148 175

  
149

  
150 176
    /**
151 177
     * {@inheritDoc}
152 178
     */
......
420 446
        exCombinationAuthorshipField.setWidth(100,  Unit.PERCENTAGE);
421 447
        addField(exCombinationAuthorshipField, "exCombinationAuthorship", 0, row, GRID_COLS-1, row);
422 448

  
449
        row++;
450
        annotationsListField = new FilterableAnnotationsField("Editorial notes");
451
        annotationsListField.setWidth(100, Unit.PERCENTAGE);
452
        annotationsListField.setAnnotationTypesVisible(editableAnotationTypes);
453
        addField(annotationsListField, "annotations", 0, row, GRID_COLS-1, row);
454

  
423 455
        // -----------------------------------------------------------------------------
424 456

  
425 457
        setAdvancedModeEnabled(true);
......
831 863
        return basionymToggle;
832 864
    }
833 865

  
866
    @Override
867
    public FilterableAnnotationsField getAnnotationsField() {
868
        return annotationsListField;
869
    }
870

  
834 871
    /**
835 872
     * {@inheritDoc}
836 873
     */
......
852 889
        }
853 890
    }
854 891

  
892

  
893

  
855 894
    /**
856 895
     * @return the infraGenericEpithetField
857 896
     */

Also available in: Unified diff