Revision 47784 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/main/java/org/gvsig/fmap/dal/store/jdbc/JDBCStoreParametersBase.java

View differences:

JDBCStoreParametersBase.java
297 297
	 *
298 298
	 * @return
299 299
	 */
300
    @Override
301
	public String getSourceId() {
302
		if (getTable() != null) {
303
			return MessageFormat.format(
304
					"provider={0}:url=\"{1}\":table=\"{2}\":user={3}:driverclass={4}", 
305
					this.getDataStoreName(),
306
					this.getUrl(),
307
					this.getTable(),
308
					this.getUser(),
309
					this.getJDBCDriverClassName()
310
			);
311
		}
312
		return MessageFormat.format(
313
				"provider={0}:url=\"{1}\":sql=\"{2}\":user={3}:driverclass={4}", 
314
				this.getDataStoreName(),
315
				this.getUrl(),
316
				this.getSQL(),
317
				this.getUser(),
318
				this.getJDBCDriverClassName()
319
		);
320
	}
300
//    @Override
301
//	public String getSourceId() {
302
//		if (getTable() != null) {
303
//			return MessageFormat.format(
304
//					"provider={0}:url=\"{1}\":table=\"{2}\":user={3}:driverclass={4}", 
305
//					this.getDataStoreName(),
306
//					this.getUrl(),
307
//					this.getTable(),
308
//					this.getUser(),
309
//					this.getJDBCDriverClassName()
310
//			);
311
//		}
312
//		return MessageFormat.format(
313
//				"provider={0}:url=\"{1}\":sql=\"{2}\":user={3}:driverclass={4}", 
314
//				this.getDataStoreName(),
315
//				this.getUrl(),
316
//				this.getSQL(),
317
//				this.getUser(),
318
//				this.getJDBCDriverClassName()
319
//		);
320
//	}
321 321

  
322 322
    @Override
323 323
	public String getUrl() {
......
361 361
        return true;
362 362
    }
363 363

  
364
    @Override
365
    public String getSourceId() {
366
        StringBuilder builder = new StringBuilder();
367
        builder.append(this.getTable());
368
        builder.append("(");
369
        boolean needComma = false;
370
        if( StringUtils.isNotBlank(this.getHost()) ) {
371
            builder.append("host=");
372
            builder.append(this.getHost());
373
            needComma = true;
374
        }
375
        if( this.getPort()>0 ) {
376
            if (needComma ) {
377
                builder.append(", ");
378
            }
379
            builder.append("port=");
380
            builder.append(this.getPort());
381
            needComma = true;
382
        }
383
        if( StringUtils.isNotBlank(this.getDBName()) ) {
384
            if (needComma ) {
385
                builder.append(", ");
386
            }
387
            builder.append("db=");
388
            builder.append(this.getDBName());
389
            needComma = true;
390
        }
391
        if( StringUtils.isNotBlank(this.getSchema()) ) {
392
            if (needComma ) {
393
                builder.append(", ");
394
            }
395
            builder.append("schema=");
396
            builder.append(this.getSchema());
397
            needComma = true;
398
        }
399
        builder.append(")");
400
        return builder.toString();
401
  }
402

  
364 403
}

Also available in: Unified diff