Revision 47433 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
DefaultFeatureAttributePanel.java | ||
---|---|---|
134 | 134 |
private ToManyController toManyController; |
135 | 135 |
private JSplitPane splAttrTags; |
136 | 136 |
private FeatureType featureType; |
137 |
private IProjection defaultProjection; |
|
137 | 138 |
|
138 | 139 |
private static class ToOneController { |
139 | 140 |
|
... | ... | |
1505 | 1506 |
descriptor.setDataProfileName((String) ListElement.getSelected(this.cboDataProfile)); |
1506 | 1507 |
switch (descriptor.getType()) { |
1507 | 1508 |
case DataTypes.GEOMETRY: |
1509 |
if( ListElement.getSelected(this.cboGeometryType)==null |
|
1510 |
|| ListElement.getSelected(this.cboGeometrySubtype)==null |
|
1511 |
|| this.pickerCRS.get() == null ){ |
|
1512 |
ThreadSafeDialogsManager dialogs = ToolsSwingLocator.getThreadSafeDialogsManager(); |
|
1513 |
dialogs.messageDialog( |
|
1514 |
i18n.getTranslation("_Geometry_not_configured"), |
|
1515 |
null, |
|
1516 |
i18n.getTranslation("_Warning"), |
|
1517 |
JOptionPane.WARNING_MESSAGE |
|
1518 |
); |
|
1519 |
return null; |
|
1520 |
} |
|
1508 | 1521 |
GeometryManager geomManager = GeometryLocator.getGeometryManager(); |
1509 | 1522 |
GeometryType geomType = geomManager.getGeometryType( |
1510 | 1523 |
(int) ListElement.getSelected(this.cboGeometryType), |
... | ... | |
1701 | 1714 |
this.availableValuesController.clean(); |
1702 | 1715 |
this.tagsController.clean(); |
1703 | 1716 |
this.toOneController.clean(); |
1717 |
|
|
1718 |
this.pickerCRS.set(defaultProjection); |
|
1704 | 1719 |
} |
1705 | 1720 |
|
1706 | 1721 |
@Override |
... | ... | |
1713 | 1728 |
FeatureType featureType = descriptor.getFeatureType(); |
1714 | 1729 |
DefaultComboBoxModel groupModel = new DefaultComboBoxModel(); |
1715 | 1730 |
|
1731 |
this.pickerCRS.set(defaultProjection); |
|
1732 |
|
|
1716 | 1733 |
if (featureType != null) { |
1717 | 1734 |
FeatureStore store = descriptor.getFeatureType().getStore(); |
1718 | 1735 |
this.featureStoreElement.setFeatureStore(store); |
... | ... | |
1801 | 1818 |
Expression expression = descriptor.getAvailableValuesFilter(); |
1802 | 1819 |
this.pickerValuesFilter.set(expression); |
1803 | 1820 |
|
1804 |
this.pickerCRS.set(descriptor.getSRS()); |
|
1805 |
|
|
1806 |
if (descriptor.getGeomType() != null) { |
|
1807 |
ListElement.setSelected(cboGeometryType, descriptor.getGeomType().getType()); |
|
1808 |
ListElement.setSelected(cboGeometrySubtype, descriptor.getGeomType().getSubType()); |
|
1821 |
if( descriptor.getType() == DataTypes.GEOMETRY ) { |
|
1822 |
if( descriptor.getSRS()==null ) { |
|
1823 |
this.pickerCRS.set(defaultProjection); |
|
1824 |
} else { |
|
1825 |
this.pickerCRS.set(descriptor.getSRS()); |
|
1826 |
} |
|
1827 |
if (descriptor.getGeomType() != null) { |
|
1828 |
ListElement.setSelected(cboGeometryType, descriptor.getGeomType().getType()); |
|
1829 |
ListElement.setSelected(cboGeometrySubtype, descriptor.getGeomType().getSubType()); |
|
1830 |
} |
|
1831 |
} else { |
|
1832 |
this.pickerCRS.set(defaultProjection); |
|
1833 |
ListElement.setSelected(cboGeometryType, null); |
|
1834 |
ListElement.setSelected(cboGeometrySubtype, null); |
|
1809 | 1835 |
} |
1810 | 1836 |
ListElement.setSelected(cboFieldType, dataType.getType()); |
1811 | 1837 |
if( ListElement.getSelected(cboFieldType)==null ) { |
... | ... | |
1939 | 1965 |
this.pickerIntervalEnd.setEditable(false); |
1940 | 1966 |
this.tabAditionalFields.setEnabledAt(1, true); |
1941 | 1967 |
this.tabAditionalFields.setEnabledAt(2, false); |
1968 |
|
|
1942 | 1969 |
break; |
1943 | 1970 |
case DataTypes.INSTANT: |
1944 | 1971 |
case DataTypes.INTERVAL: |
... | ... | |
2270 | 2297 |
); |
2271 | 2298 |
} |
2272 | 2299 |
|
2300 |
public void setDefaultProjection(IProjection projection) { |
|
2301 |
this.defaultProjection = projection; |
|
2302 |
} |
|
2273 | 2303 |
} |
Also available in: Unified diff