Revision 31889 branches/v2_0_0_prep/extensions/org.gvsig.oracle/src/org/gvsig/oracle/extension/ExportToOracle.java

View differences:

ExportToOracle.java
43 43
package org.gvsig.oracle.extension;
44 44

  
45 45
import java.awt.Component;
46
import java.awt.geom.Rectangle2D;
46 47

  
47 48
import javax.swing.JComponent;
48 49
import javax.swing.JOptionPane;
......
53 54
import org.gvsig.fmap.dal.DataManager;
54 55
import org.gvsig.fmap.dal.DataServerExplorer;
55 56
import org.gvsig.fmap.dal.DataTypes;
57
import org.gvsig.fmap.dal.NewDataStoreParameters;
56 58
import org.gvsig.fmap.dal.exception.DataException;
57 59
import org.gvsig.fmap.dal.exception.ReadException;
58 60
import org.gvsig.fmap.dal.exception.RemoveException;
......
67 69
import org.gvsig.fmap.dal.feature.FeatureStore;
68 70
import org.gvsig.fmap.dal.feature.FeatureType;
69 71
import org.gvsig.fmap.dal.feature.NewFeatureStoreParameters;
72
import org.gvsig.fmap.dal.store.oracle.OracleNewStoreParameters;
70 73
import org.gvsig.fmap.dal.store.oracle.OracleServerExplorer;
71 74
import org.gvsig.fmap.dal.store.oracle.OracleServerExplorerParameters;
72 75
import org.gvsig.fmap.dal.store.oracle.OracleStoreParameters;
76
import org.gvsig.fmap.dal.store.oracle.OracleUtils;
73 77
import org.gvsig.fmap.dal.store.oracle.OracleValues;
74 78
import org.gvsig.fmap.mapcontext.MapContext;
75 79
import org.gvsig.fmap.mapcontext.exceptions.LoadLayerException;
......
78 82
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
79 83
import org.gvsig.geodb.vectorialdb.wizard.MyExplorer;
80 84
import org.gvsig.oracle.gui.OracleConnectionChooserPanel;
85
import org.gvsig.tools.dynobject.DynField;
86
import org.gvsig.tools.dynobject.impl.DefaultDynClass;
81 87
import org.gvsig.utils.PostProcessSupport;
82 88
import org.jfree.util.Log;
83 89
import org.slf4j.Logger;
......
134 140
			return;
135 141
		}
136 142

  
137
		//
138 143
		OracleServerExplorerParameters explorerParams = (OracleServerExplorerParameters) explorer
139 144
				.getDbSeverExplorerParameters();
140 145

  
......
142 147
				pkFieldName);
143 148
	}
144 149

  
145

  
146

  
147

  
148 150
	/**
149 151
	 * create new oracle store
150 152
	 * 
......
165 167
					.createServerExplorer(explorerParams);
166 168
			OracleServerExplorer oraExplorer = (OracleServerExplorer) explorer;
167 169

  
168
			NewFeatureStoreParameters newOracleStoreParams = (NewFeatureStoreParameters) oraExplorer
169
					.getAddParameters();
170
			NewFeatureStoreParameters newOracleStoreParams =
171
				(NewFeatureStoreParameters) oraExplorer.getAddParameters();
170 172

  
171
			((OracleStoreParameters) newOracleStoreParams).setTable(tableName);
173
			((OracleNewStoreParameters) newOracleStoreParams).setTable(tableName);
172 174

  
173 175
			boolean exportOk = export(oraExplorer, newOracleStoreParams, layer
174 176
					.getFeatureStore(), pkName);
......
203 205
		if (res == JOptionPane.YES_OPTION) {
204 206
			PostProcessSupport.executeCalls();
205 207
			try {
206
				FLayer newLayer = LayerFactory.getInstance().createLayer(name,
207
						newParams);
208

  
208
				FLayer newLayer = LayerFactory.getInstance().createLayer(name, newParams);
209 209
				mapContext.getLayers().addLayer(newLayer);
210 210
			} catch (LoadLayerException e) {
211 211
				throw new ReadException("Load layer", e);
......
261 261
				pk.setIsAutomatic(true);
262 262
			}
263 263

  
264
			efType
265
					.setDefaultGeometryAttributeName(OracleValues.DEFAULT_GEO_FIELD);
266

  
264
			efType.setDefaultGeometryAttributeName(OracleValues.DEFAULT_GEO_FIELD);
267 265
			params.setDefaultFeatureType(efType.getNotEditableCopy());
266
			
267
			// adding envelpe and dims, needed afterwards
268
			Rectangle2D envelope = OracleUtils.envelopeToRectangle2D(featureStore.getEnvelope());
269
			int _subtype = featureStore.getDefaultFeatureType().getDefaultGeometryAttribute().getGeometrySubType();
270
			int thedims = OracleUtils.dimensionsFromSubtype(_subtype);
268 271

  
269 272
			if (notExistsOrOverwrite(explorer, params)) {
270
				explorer.add(params, true);
273
				explorer.addWithEnvelopeAndDims(params, true, envelope, thedims);
271 274
			} else {
272 275
				throw new Exception("User_cancelled_or_could_not_overwrite");
273 276
			}
......
318 321

  
319 322
	}
320 323

  
321
	private boolean notExistsOrOverwrite(OracleServerExplorer ose, NewFeatureStoreParameters params) {
324
	private boolean notExistsOrOverwrite(OracleServerExplorer ose,
325
			NewFeatureStoreParameters params) {
322 326
		
323 327
		if (!ose.dataStoreExists(params)) {
324 328
			ose.removeMetadata(params);

Also available in: Unified diff