Revision 30231 branches/v2_0_0_prep/extensions/org.gvsig.oracle/src/org/gvsig/fmap/dal/store/oracle/OracleServerExplorer.java

View differences:

OracleServerExplorer.java
177 177
	 * get parameters
178 178
	 */
179 179
	public NewDataStoreParameters getAddParameters() throws DataException {
180
		OracleServerExplorerParameters parameters = getOracleSpatialParameters();
180
		OracleServerExplorerParameters parameters = getOracleExplorerParameters();
181 181
		OracleNewStoreParameters params = new OracleNewStoreParameters();
182 182
		params.setHost(parameters.getHost());
183 183
		params.setPort(parameters.getPort());
......
298 298

  
299 299
		FeatureType fType = nfdsp.getDefaultFeatureType();
300 300

  
301
		sqlnewtable.append("CREATE TABLE " + ((JDBCStoreParameters) ndsp).tableID()
302
				+ "(");
301
		sqlnewtable.append("CREATE TABLE "
302
				+ ((JDBCStoreParameters) ndsp).tableID() + "(");
303 303
		Iterator<FeatureAttributeDescriptor> attrs = fType.iterator();
304 304
		String sqlAttr;
305 305
		List<String> sqlAttrs = new ArrayList<String>();
......
316 316
		helper.stringJoin(sqlAttrs, ", ", sqlnewtable);
317 317

  
318 318
		String pk = "CONSTRAINT "
319
				+ OracleUtils.getDerivedName(
320
						((JDBCStoreParameters) ndsp).tableID(), "PK")
321
				+ " PRIMARY KEY (\""
319
				+ OracleUtils.getDerivedName(((JDBCStoreParameters) ndsp)
320
						.tableID(), "PK") + " PRIMARY KEY (\""
322 321
				+ OracleValues.DEFAULT_ID_FIELD_CASE_SENSITIVE + "\") ENABLE";
323 322

  
324 323
		sqlnewtable.append(", ");
......
326 325

  
327 326
		sqlnewtable.append("); ");
328 327
		final String sqlCreateNew = sqlnewtable.toString();
329
		
328

  
330 329
		// SQL CREATE SPATIAL INDEX
331 330
		final String sqlindex = "CREATE INDEX "
332
			+ OracleUtils.getDerivedName(((JDBCStoreParameters) ndsp).tableID(), "SX") + " ON "
333
			+ ((JDBCStoreParameters) ndsp).tableID() + " (\"" + OracleValues.DEFAULT_GEO_FIELD
334
			+ "\") INDEXTYPE IS \"MDSYS\".\"SPATIAL_INDEX\" ";
331
				+ OracleUtils.getDerivedName(((JDBCStoreParameters) ndsp)
332
						.tableID(), "SX") + " ON "
333
				+ ((JDBCStoreParameters) ndsp).tableID() + " (\""
334
				+ OracleValues.DEFAULT_GEO_FIELD
335
				+ "\") INDEXTYPE IS \"MDSYS\".\"SPATIAL_INDEX\" ";
335 336

  
336 337
		// SQL CREATE TABLE METADATA
337
		Rectangle2D bbox = new Rectangle2D.Double(0,0,1,1);
338
		final String sqlmeta = ((OracleHelper) helper)
339
				.getSqlUpdateMetadata((OracleStoreParameters)ndsp, null, bbox, 2, true);		
338
		Rectangle2D bbox = new Rectangle2D.Double(0, 0, 1, 1);
339
		final String sqlmeta = ((OracleHelper) helper).getSqlUpdateMetadata(
340
				(OracleStoreParameters) ndsp, null, bbox, 2, true);
340 341

  
341 342
		TransactionalAction action = new TransactionalAction() {
342 343

  
......
364 365
				} catch (SQLException e) {
365 366
					throw new JDBCExecuteSQLException(sqlnew, e);
366 367
				}
367
				//new spatial index
368
				// new spatial index
368 369
				try {
369 370
					sqlspatialindex = sqlindex;
370 371
					st.execute(sqlspatialindex);
......
372 373
				} catch (SQLException e) {
373 374
					throw new JDBCExecuteSQLException(sqlspatialindex, e);
374 375
				}
375
				//new metadata
376
				// new metadata
376 377
				try {
377 378
					sqlmetadata = sqlmeta;
378 379
					st.execute(sqlmetadata);
......
408 409
	 * create helper
409 410
	 */
410 411
	protected JDBCHelper createHelper() throws InitializeException {
411
		return new OracleHelper(this, getOracleSpatialParameters());
412
		return new OracleHelper(this, getOracleExplorerParameters());
412 413
	}
413 414

  
414 415
	/**
......
459 460
		super.checkIsMine(dsp);
460 461

  
461 462
		OracleStoreParameters orap = (OracleStoreParameters) dsp;
462
		if (orap.getUseSSL().booleanValue() != getOracleSpatialParameters()
463
		if (orap.getUseSSL().booleanValue() != getOracleExplorerParameters()
463 464
				.getUseSSL()) {
464 465
			throw new IllegalArgumentException("worng explorer: SSL");
465 466
		}
466 467
		if (orap.getOraDriverType().compareToIgnoreCase(
467
				getOracleSpatialParameters().getOraDriverType()) != 0) {
468
				getOracleExplorerParameters().getOraDriverType()) != 0) {
468 469
			throw new IllegalArgumentException(
469 470
					"worng explorer: Oracle type driver: THIN or OCI");
470 471
		}
......
478 479
		OracleStoreParameters params = (OracleStoreParameters) super
479 480
				.createStoreParams();
480 481
		// add SSL and type driver (THIN or OCI)
481
		params.setUseSSL(getOracleSpatialParameters().getUseSSL());
482
		params
483
				.setOraDriverType(getOracleSpatialParameters()
484
						.getOraDriverType());
482
		params.setUseSSL(getOracleExplorerParameters().getUseSSL());
483
		params.setOraDriverType(getOracleExplorerParameters()
484
				.getOraDriverType());
485 485

  
486 486
		return params;
487 487
	}
......
491 491
	 * 
492 492
	 * @return
493 493
	 */
494
	private OracleServerExplorerParameters getOracleSpatialParameters() {
494
	private OracleServerExplorerParameters getOracleExplorerParameters() {
495 495
		return (OracleServerExplorerParameters) getParameters();
496 496
	}
497 497

  

Also available in: Unified diff