Revision 45994 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/featuretype/DefaultFeatureAttributePanel.java

View differences:

DefaultFeatureAttributePanel.java
438 438
    private CalculatorController<Integer> pickerScale;
439 439
    private PickerController<IProjection> pickerCRS;
440 440
    private ExpressionPickerController pickerVirtualField;
441
    private ExpressionPickerController pickerDefaultFormat;
441 442
    private CalculatorController<Integer> pickerOrder;
442 443
    private AvailableValuesController availableValuesController;
443 444
    private AggregateController<Tag> tagsController;
......
536 537
        swingManager.translate(this.lblDataProfile);
537 538
        swingManager.translate(this.lblDateFormat);
538 539
        swingManager.translate(this.lblDefaultValue);
540
        swingManager.translate(this.lblDefaultFormat);
539 541
        swingManager.translate(this.lblFieldName);
540 542
        swingManager.translate(this.lblFieldType);
541 543
        swingManager.translate(this.lblGeometrySubtype);
......
586 588
        swingManager.translate(this.txtScale);
587 589

  
588 590
        swingManager.addClearButton(this.txtDefaultValue);
591
        swingManager.addClearButton(this.txtDefaultFormat);
589 592
        swingManager.addClearButton(this.txtFieldName);
590 593
        swingManager.addClearButton(this.txtIntervalEnd);
591 594
        swingManager.addClearButton(this.txtIntervalStart);
......
601 604
        swingManager.addClearButton(this.txtAvailableValuesValue);
602 605

  
603 606
        swingManager.setDefaultPopupMenu(this.txtDefaultValue);
607
        swingManager.setDefaultPopupMenu(this.txtDefaultFormat);
604 608
        swingManager.setDefaultPopupMenu(this.txtFieldName);
605 609
        swingManager.setDefaultPopupMenu(this.txtIntervalEnd);
606 610
        swingManager.setDefaultPopupMenu(this.txtIntervalStart);
......
836 840
            descriptor.setPrecision(this.pickerPrecision.get(0));
837 841
            descriptor.setScale(this.pickerScale.get(0));
838 842
            descriptor.setDefaultValue(this.txtDefaultValue.getText());
843
            descriptor.setDefaultFormat(this.txtDefaultFormat.getText());
839 844
            descriptor.setDataProfileName((String) ListElement.getSelected(this.cboDataProfile));
840 845
            descriptor.setRelationType((int) ListElement.getSelected(this.cboRelationType));
841 846
            switch (descriptor.getType()) {
......
968 973
    @Override
969 974
    public void clean() {
970 975
        this.txtDefaultValue.setText("");
976
        this.txtDefaultFormat.setText("");
971 977
        this.txtFieldName.setText("");
972 978
//        this.pickerFieldName.set(null);
973 979
        this.pickerIntervalEnd.set(null);
......
1048 1054
        }
1049 1055

  
1050 1056
        this.txtDefaultValue.setText(Objects.toString(descriptor.getDefaultValue(),""));
1057
        this.txtDefaultFormat.setText(Objects.toString(descriptor.getDefaultFormat(),""));
1051 1058
        this.txtFieldName.setText(descriptor.getName());
1052 1059
        RelativeInterval interval = (RelativeInterval) descriptor.getInterval();
1053 1060
        if (interval == null) {
......
1269 1276
            case MODE_EDIT_ALL:
1270 1277
                this.cboRelationType.setEnabled(true);
1271 1278
                this.txtDefaultValue.setEditable(true);
1279
                this.txtDefaultFormat.setEditable(true);
1272 1280
                this.txtFieldName.setEditable(true);
1273 1281
                this.pickerIntervalEnd.setEditable(true);
1274 1282
                this.pickerIntervalStart.setEditable(true);
......
1338 1346

  
1339 1347
                this.cboRelationType.setEnabled(true);
1340 1348
                this.txtDefaultValue.setEditable(true);
1349
                this.txtDefaultFormat.setEditable(true);
1341 1350
                this.pickerIntervalEnd.setEditable(true);
1342 1351
                this.pickerIntervalStart.setEditable(true);
1343 1352

  
......
1373 1382
            case MODE_SHOW_ONLY:
1374 1383
                this.cboRelationType.setEnabled(false);
1375 1384
                this.txtDefaultValue.setEditable(false);
1385
                this.txtDefaultFormat.setEditable(false);
1376 1386
                this.txtFieldName.setEditable(false);
1377 1387
                this.pickerIntervalEnd.setEditable(false);
1378 1388
                this.pickerIntervalStart.setEditable(false);

Also available in: Unified diff