Project

General

Profile

« Previous | Next » 

Revision 767eef89

Added by Andreas Kohlbecker about 6 years ago

ref #6740 NameTypeDesignationEditor layout finetuning

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/name/NameTypeDesignationEditorView.java
31 31 

  		




  32
  32
  
    
    ToOneRelatedEntityCombobox<TaxonName> getTypeNameField();


  		




  33
  33
  
    

  		




  
  34
  
    
    void setShowTypeFlags(boolean showTypeFlags);


  		




  
  35
  
    

  		




  
  36
  
    
    boolean isShowTypeFlags();


  		




  
  37
  
    

  		




  34
  38
  
    
}


  		












  

    
      src/main/java/eu/etaxonomy/cdm/vaadin/view/name/NameTypeDesignationPopupEditor.java
    
  





  47
  47
  
    

  		




  48
  48
  
    
    private TextField citationDetailField;


  		




  49
  49
  
    

  		




  
  50
  
    
    private boolean showTypeFlags = false;


  		




  
  51
  
    

  		




  50
  52
  
    

  		




  51
  53
  
    
    /**


  		




  52
  54
  
    
     * @param layout


  		




  ......




  69
  71
  
    
     */


  		




  70
  72
  
    
    @Override


  		




  71
  73
  
    
    public void focusFirst() {


  		




  72
  
  
    
        // TODO Auto-generated method stub


  		




  
  74
  
    
        // none


  		




  73
  75
  
    
    }


  		




  74
  76
  
    

  		




  75
  77
  
    
    /**


  		




  ......




  110
  112
  
    

  		




  111
  113
  
    
        int row = 0;


  		




  112
  114
  
    

  		




  113
  
  
    
        conservedTypeField = addCheckBox("Conserved type", "conservedType", 0, row);


  		




  114
  
  
    

  		




  115
  
  
    
        rejectedTypeField = addCheckBox("Rejected type", "rejectedType", 1, row);


  		




  116
  
  
    

  		




  117
  
  
    
        notDesignatedField = addCheckBox("Not designated", "notDesignated", 2, row);


  		




  118
  
  
    

  		




  119
  
  
    
        row++;


  		




  120
  
  
    
        typeNameField = new ToOneRelatedEntityCombobox<TaxonName>("Type name", TaxonName.class);


  		




  121
  
  
    
        addField(typeNameField, "typeName", 0, row, 3, row);


  		




  
  115
  
    
        if(showTypeFlags){


  		




  
  116
  
    
            conservedTypeField = addCheckBox("Conserved type", "conservedType", 0, row);


  		




  
  117
  
    
            rejectedTypeField = addCheckBox("Rejected type", "rejectedType", 1, row);


  		




  
  118
  
    
            notDesignatedField = addCheckBox("Not designated", "notDesignated", 2, row);


  		




  
  119
  
    
            row++;


  		




  
  120
  
    
        }


  		




  122
  121
  
    

  		




  123
  
  
    
        row++;


  		




  124
  122
  
    
        typeStatusSelect = new ListSelect("Type status");


  		




  125
  123
  
    
        typeStatusSelect.setNullSelectionAllowed(false);


  		




  126
  124
  
    
        typeStatusSelect.setRows(1);


  		




  ......




  128
  126
  
    
        addField(typeStatusSelect, "typeStatus", 0, row, 1, row);


  		




  129
  127
  
    
        grid.setComponentAlignment(typeStatusSelect, Alignment.TOP_RIGHT);


  		




  130
  128
  
    

  		




  
  129
  
    
        row++;


  		




  
  130
  
    
        typeNameField = new ToOneRelatedEntityCombobox<TaxonName>("Type name", TaxonName.class);


  		




  
  131
  
    
        addField(typeNameField, "typeName", 0, row, 3, row);


  		




  
  132
  
    

  		




  131
  133
  
    
        row++;


  		




  132
  134
  
    
        typifiedNamesComboboxSelect = new ToManyRelatedEntitiesComboboxSelect<TaxonName>(TaxonName.class, "Typified names");


  		




  133
  135
  
    
        typifiedNamesComboboxSelect.setConverter(new SetToListConverter<TaxonName>());


  		




  ......




  137
  139
  
    
        row++;


  		




  138
  140
  
    
        citationCombobox = new ToOneRelatedEntityCombobox<Reference>("Citation", Reference.class);


  		




  139
  141
  
    
        addField(citationCombobox, "citation", 0, row, 2, row);


  		




  
  142
  
    
        citationCombobox.setWidth(400, Unit.PIXELS);


  		




  140
  143
  
    
        citationDetailField = addTextField("Citation detail", "citationMicroReference", 3, row);


  		




  141
  144
  
    
    }


  		




  142
  145
  
    

  		




  ......




  173
  176
  
    
    }


  		




  174
  177
  
    

  		




  175
  178
  
    

  		




  
  179
  
    
    /**


  		




  
  180
  
    
     * @return the showTypeFlags


  		




  
  181
  
    
     */


  		




  
  182
  
    
    @Override


  		




  
  183
  
    
    public boolean isShowTypeFlags() {


  		




  
  184
  
    
        return showTypeFlags;


  		




  
  185
  
    
    }


  		




  
  186
  
    

  		




  
  187
  
    
    /**


  		




  
  188
  
    
     * @param showTypeFlags the showTypeFlags to set


  		




  
  189
  
    
     */


  		




  
  190
  
    
    @Override


  		




  
  191
  
    
    public void setShowTypeFlags(boolean showTypeFlags) {


  		




  
  192
  
    
        this.showTypeFlags = showTypeFlags;


  		




  
  193
  
    
    }


  		




  
  194
  
    

  		




  
  195
  
    

  		




  176
  196
  
    

  		




  177
  197
  
    
}


  		












  

    
      src/main/java/eu/etaxonomy/cdm/vaadin/view/name/NameTypeDesignationPresenter.java
    
  





  108
  108
  
    

  		




  109
  109
  
    
        CdmBeanItemContainerFactory selectFactory = new CdmBeanItemContainerFactory(getRepo());


  		




  110
  110
  
    
        getView().getTypeStatusSelect().setContainerDataSource(selectFactory.buildBeanItemContainer(NameTypeDesignationStatus.class));


  		




  
  111
  
    
        getView().getTypeStatusSelect().setItemCaptionPropertyId("description");


  		




  111
  112
  
    

  		




  112
  113
  
    
        getView().getCitationCombobox().getSelect().setCaptionGenerator(new CdmTitleCacheCaptionGenerator<Reference>());


  		




  113
  114
  
    
        CdmFilterablePagingProvider<Reference,Reference> referencePagingProvider = new CdmFilterablePagingProvider<Reference, Reference>(getRepo().getReferenceService());


  		












Also available in:  Unified diff