Revision 30231 branches/v2_0_0_prep/extensions/org.gvsig.oracle/src/org/gvsig/oracle/extension/NewOracleTableFinishAction.java

View differences:

NewOracleTableFinishAction.java
22 22
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters;
23 23
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParameters;
24 24
import org.gvsig.fmap.dal.store.oracle.OracleNewStoreParameters;
25
import org.gvsig.fmap.dal.store.oracle.OracleStoreParameters;
26 25
import org.gvsig.fmap.dal.store.oracle.OracleValues;
27 26
import org.gvsig.fmap.mapcontext.MapContext;
28 27
import org.gvsig.fmap.mapcontext.exceptions.LoadLayerException;
29 28
import org.gvsig.fmap.mapcontext.layers.LayerFactory;
30 29
import org.gvsig.fmap.mapcontext.layers.vectorial.FLayerVectorialDB;
31
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
32 30
import org.gvsig.oracle.gui.NewOracleTableWizard;
33 31
import org.gvsig.oracle.gui.RepeatedChooseGeometryTypePanel;
34 32
import org.gvsig.oracle.gui.RepeatedFieldDefinitionPanel;
35 33
import org.slf4j.Logger;
36 34
import org.slf4j.LoggerFactory;
37 35

  
38

  
39

  
36
/**
37
 * 
38
 * @author vsanjaime
39
 * 
40
 */
40 41
public class NewOracleTableFinishAction extends FinishAction {
41 42

  
42 43
	@SuppressWarnings("unused")
......
50 51

  
51 52
	/**
52 53
	 * Constructor
54
	 * 
53 55
	 * @param wc
54 56
	 * @param closeit
55 57
	 * @param connPanel
56 58
	 * @param mc
57 59
	 */
58
	public NewOracleTableFinishAction(JWizardComponents wc,
59
			IWindow closeit, NewOracleTableWizard connPanel,
60
			MapContext mc) {
60
	public NewOracleTableFinishAction(JWizardComponents wc, IWindow closeit,
61
			NewOracleTableWizard connPanel, MapContext mc) {
61 62

  
62 63
		super(wc);
63 64
		theMapContext = mc;
......
99 100

  
100 101
			TableModel model = fieldsPanel.getFieldsDescription();
101 102
			FeatureType fType = createDefaultFeatureType(eFType, model);
102
			
103
			((OracleNewStoreParameters)newStoreParams).setDefaultFeatureType(fType);
104 103

  
105
			explorer.add((OracleNewStoreParameters)newStoreParams, true);
104
			((OracleNewStoreParameters) newStoreParams)
105
					.setDefaultFeatureType(fType);
106 106

  
107
			target = (FeatureStore) dataManager.createStore((OracleNewStoreParameters)newStoreParams);
108
			
107
			explorer.add((OracleNewStoreParameters) newStoreParams, true);
109 108

  
109
			target = (FeatureStore) dataManager
110
					.createStore((OracleNewStoreParameters) newStoreParams);
111

  
110 112
		} catch (DataException e) {
111 113
			NotificationManager.addError(e.getMessage(), e);
112 114
		} catch (ValidateDataParametersException e) {
......
129 131

  
130 132
	/**
131 133
	 * Validate field name
132
	 * @param field name
134
	 * 
135
	 * @param field
136
	 *            name
133 137
	 * @return field name
134 138
	 */
135 139
	private String validFieldName(String name) {
136 140

  
137 141
		if ((name
138 142
				.compareToIgnoreCase(OracleValues.DEFAULT_ID_FIELD_CASE_SENSITIVE) == 0)
139
				|| (name
140
						.compareToIgnoreCase(OracleValues.ORACLE_ID_FIELD) == 0)) {
143
				|| (name.compareToIgnoreCase(OracleValues.ORACLE_ID_FIELD) == 0)) {
141 144
			return name + "_";
142 145
		}
143 146
		return name;
......
145 148

  
146 149
	/**
147 150
	 * Build feature type from field table model
151
	 * 
148 152
	 * @param eFType
149 153
	 * @param model
150 154
	 * @return
......
154 158

  
155 159
		// GID Field
156 160
		EditableFeatureAttributeDescriptor gid = eFType.add(
157
				OracleValues.DEFAULT_ID_FIELD_CASE_SENSITIVE,
158
				DataTypes.INT);
161
				OracleValues.DEFAULT_ID_FIELD_CASE_SENSITIVE, DataTypes.INT);
159 162
		gid.setIsAutomatic(true);
160 163
		gid.setSize(7);
161 164
		gid.setPrecision(0);
......
192 195
		EditableFeatureAttributeDescriptor geometry = eFType.add(
193 196
				OracleValues.DEFAULT_GEO_FIELD, DataTypes.GEOMETRY);
194 197
		int geom = geoTypePanel.getSelectedGeometryType();
195
		geometry.setGeometryType(geom);	
196
		
198
		geometry.setGeometryType(geom);
199

  
197 200
		eFType.setDefaultGeometryAttributeName(OracleValues.DEFAULT_GEO_FIELD);
198
		
199 201

  
200 202
		return eFType.getNotEditableCopy();
201 203
	}

Also available in: Unified diff