Project

General

Profile

« Previous | Next » 

Revision 341ee038

Added by Andreas Müller about 6 years ago

ajust first and lastname field names

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/component/common/PersonField.java
76 76
    private Button nomenclaturalTitleButton = new Button();
77 77
    private CssLayout detailsContainer = new CssLayout();
78 78
    private TextField initialsField = new TextFieldNFix();
79
    private TextField firstNameField = new TextFieldNFix();
80
    private TextField lastNameField = new TextFieldNFix();
79
    private TextField givenNameField = new TextFieldNFix();
80
    private TextField familyNameField = new TextFieldNFix();
81 81
    private TextField prefixField = new TextFieldNFix();
82 82
    private TextField suffixField = new TextFieldNFix();
83 83
    private SwitchButton unlockSwitch = new SwitchButton();
......
120 120
        // edit person
121 121
        addStyledComponent(titleCacheField);
122 122
        addStyledComponents(initialsField);
123
        addStyledComponent(firstNameField);
124
        addStyledComponent(lastNameField);
123
        addStyledComponent(givenNameField);
124
        addStyledComponent(familyNameField);
125 125
        addStyledComponent(prefixField);
126 126
        addStyledComponent(suffixField);
127 127
        addStyledComponent(unlockSwitch);
......
174 174
        initialsField.setWidth(baseWidth, Unit.PERCENTAGE);
175 175
        initialsField.setInputPrompt("Initials");
176 176

  
177
        firstNameField.setWidth(baseWidth * 3, Unit.PERCENTAGE);
178
        firstNameField.setInputPrompt("Other/given names");
177
        givenNameField.setWidth(baseWidth * 3, Unit.PERCENTAGE);
178
        givenNameField.setInputPrompt("Other/given names");
179 179

  
180
        lastNameField.setWidth(baseWidth * 3, Unit.PERCENTAGE);
181
        lastNameField.setInputPrompt("Family name");
180
        familyNameField.setWidth(baseWidth * 3, Unit.PERCENTAGE);
181
        familyNameField.setInputPrompt("Family name");
182 182

  
183 183
        suffixField.setWidth(baseWidth, Unit.PERCENTAGE);
184 184
        suffixField.setInputPrompt("Suffix");
......
186 186
        detailsContainer.setStyleName(ValoTheme.LAYOUT_COMPONENT_GROUP);
187 187
        detailsContainer.addComponent(prefixField);
188 188
        detailsContainer.addComponent(initialsField);
189
        detailsContainer.addComponent(firstNameField);
190
        detailsContainer.addComponent(lastNameField);
189
        detailsContainer.addComponent(givenNameField);
190
        detailsContainer.addComponent(familyNameField);
191 191
        detailsContainer.addComponent(suffixField);
192 192
        root.addComponent(detailsContainer);
193 193

  
......
213 213
                        titleCacheField.focus();
214 214
                        break;
215 215
                    case DETAILS_MODE:
216
                        firstNameField.focus();
216
                        givenNameField.focus();
217 217
                        break;
218 218
                    default:
219 219
                        break;
......
231 231
        fieldGroup.bind(titleCacheField, "titleCache");
232 232
        fieldGroup.bind(prefixField, "prefix");
233 233
        fieldGroup.bind(initialsField, "initials");
234
        fieldGroup.bind(firstNameField, "firstname");
235
        fieldGroup.bind(lastNameField, "lastname");
234
        fieldGroup.bind(givenNameField, "givenname");
235
        fieldGroup.bind(familyNameField, "familyname");
236 236
        fieldGroup.bind(suffixField, "suffix");
237 237
        fieldGroup.bind(unlockSwitch, "protectedTitleCache");
238 238
        fieldGroup.bind(nomenclaturalTitleField, "nomenclaturalTitle");

Also available in: Unified diff