Revision 47658 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/DefaultFeatureTypePanel.java
DefaultFeatureTypePanel.java | ||
---|---|---|
9 | 9 |
import java.awt.event.ActionListener; |
10 | 10 |
import java.util.ArrayList; |
11 | 11 |
import java.util.Objects; |
12 |
import java.util.function.Predicate; |
|
12 | 13 |
import javax.swing.AbstractAction; |
13 | 14 |
import static javax.swing.Action.ACTION_COMMAND_KEY; |
14 | 15 |
import static javax.swing.Action.NAME; |
... | ... | |
26 | 27 |
import org.gvsig.configurableactions.ConfigurableActionsMamager; |
27 | 28 |
import org.gvsig.expressionevaluator.ExpressionUtils; |
28 | 29 |
import org.gvsig.featureform.swing.impl.DefaultJFeatureForm; |
30 |
import org.gvsig.fmap.dal.DataTypes; |
|
29 | 31 |
import org.gvsig.fmap.dal.feature.EditableFeatureAttributeDescriptor; |
30 | 32 |
import org.gvsig.fmap.dal.feature.EditableFeatureType; |
31 | 33 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
32 | 34 |
import org.gvsig.fmap.dal.feature.FeatureRule; |
33 | 35 |
import org.gvsig.fmap.dal.feature.FeatureStore; |
34 | 36 |
import org.gvsig.fmap.dal.feature.FeatureType; |
37 |
import org.gvsig.fmap.dal.swing.DALSwingLocator; |
|
38 |
import org.gvsig.fmap.dal.swing.featuretype.AttributeDescriptorPickerController; |
|
35 | 39 |
import org.gvsig.fmap.dal.swing.featuretype.FeatureTypeAttributePanel; |
36 | 40 |
import org.gvsig.fmap.dal.swing.impl.featuretype.tags.Tag; |
37 | 41 |
import org.gvsig.fmap.dal.swing.impl.featuretype.tags.TagsModel; |
38 | 42 |
import org.gvsig.texteditor.JTextEditor; |
39 | 43 |
import org.gvsig.tools.ToolsLocator; |
40 | 44 |
import org.gvsig.tools.dataTypes.DataType; |
41 |
import org.gvsig.tools.dataTypes.DataTypes; |
|
42 | 45 |
import org.gvsig.tools.dynobject.DynStruct_v2; |
43 | 46 |
import org.gvsig.tools.i18n.I18nManager; |
44 | 47 |
import org.gvsig.tools.locator.ReferenceNotRegisteredException; |
... | ... | |
69 | 72 |
private FeatureRuleController ruleController; |
70 | 73 |
private JSplitPane splTags; |
71 | 74 |
private IProjection defaultProjection; |
75 |
private AttributeDescriptorPickerController defaultGeometryController; |
|
72 | 76 |
|
73 | 77 |
private class FeatureTypeTableModel extends AbstractTableModel { |
74 | 78 |
|
... | ... | |
677 | 681 |
this.tagsController.getModel().fetch(type.getTags()); |
678 | 682 |
type.setCheckFeaturesAtInsert(this.chkRulesValidateFeatureBeforeInsert.isSelected()); |
679 | 683 |
type.setCheckFeaturesAtFinishEditing(this.chkRulesValidateFeaturesAtFinishEditing.isSelected()); |
684 |
type.setDefaultGeometryAttributeName(this.defaultGeometryController.getName()); |
|
680 | 685 |
return type; |
681 | 686 |
} |
682 | 687 |
|
... | ... | |
723 | 728 |
SwingUtilities.invokeLater(() -> { |
724 | 729 |
this.splAttributes.setDividerLocation(0.3); |
725 | 730 |
}); |
726 |
|
|
731 |
this.defaultGeometryController = DALSwingLocator.getDataSwingManager().createAttributeDescriptorPickerController(cboDefaultGeometry, new Predicate<FeatureAttributeDescriptor>() { |
|
732 |
@Override |
|
733 |
public boolean test(FeatureAttributeDescriptor t) { |
|
734 |
return t.getType() == DataTypes.GEOMETRY; |
|
735 |
} |
|
736 |
}); |
|
737 |
this.defaultGeometryController.setFeatureType(this.featureType); |
|
738 |
this.defaultGeometryController.set(this.featureType.getDefaultGeometryAttributeName()); |
|
727 | 739 |
updateButtonState(); |
728 | 740 |
doFormFieldPut(); |
729 | 741 |
} |
Also available in: Unified diff