Revision 45162 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/DefaultFeatureAttributesSelectionPanel.java

View differences:

DefaultFeatureAttributesSelectionPanel.java
47 47
    private final List<String> selecteds;
48 48
    private ExpressionPickerController expressionPicker = null;
49 49
    private boolean allowCalculatedAttributes;
50
    private List<EditableFeatureAttributeDescriptor> extraColumns;
50 51
    
51 52
    public DefaultFeatureAttributesSelectionPanel() {
52 53
        this.actionListenerSupport = ToolsSwingLocator.getToolsSwingManager().createActionListenerSupport();
......
264 265
        }
265 266
        this.updateControls();
266 267
    }
268
    @Override
269
    public void setExtraColumns(List<EditableFeatureAttributeDescriptor> extraColumns) {
270
        this.extraColumns = extraColumns;
271
        this.updateControls();
272
    }
267 273

  
268 274
    @Override
269 275
    public FeatureType getFeatureType() {
......
333 339
                }
334 340
            }
335 341
        }
342
        
343
        if (this.extraColumns!=null && !this.extraColumns.isEmpty()) {
344
            for (FeatureAttributeDescriptor extraCol : this.extraColumns) {
345
                if( !this.extraColumns.contains(extraCol.getName()) ) {
346
                    modelAvailables.addElement(extraCol.getName());
347
                }
348
            }
349
        }
350
        
336 351
        modelAvailables.setFilter(this.txtColumnsFilter.getText());
337 352
        modelAvailables.sort(true);
338 353
        for (String name : this.selecteds) {

Also available in: Unified diff