Revision 29445 branches/v2_0_0_prep/libraries/libFMap_daldb/src/org/gvsig/fmap/dal/store/postgresql/PostgreSQLServerExplorer.java

View differences:

PostgreSQLServerExplorer.java
42 42
import org.gvsig.fmap.dal.exception.InitializeException;
43 43
import org.gvsig.fmap.dal.exception.ProviderNotRegisteredException;
44 44
import org.gvsig.fmap.dal.exception.RemoveException;
45
import org.gvsig.fmap.dal.spi.DataServerExplorerProviderServices;
45 46
import org.gvsig.fmap.dal.store.jdbc.JDBCHelper;
46 47
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorer;
47
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters;
48 48
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParameters;
49 49
import org.gvsig.fmap.dal.store.jdbc.TransactionalAction;
50 50
import org.gvsig.fmap.dal.store.jdbc.exception.JDBCExecuteSQLException;
......
62 62

  
63 63
	public static final String NAME = "PostgreSQLExplorer";
64 64

  
65
	private PostgreSQLServerExplorerParameters pgParameters;
66 65

  
67

  
68 66
	public PostgreSQLServerExplorer(
69
			PostgreSQLServerExplorerParameters parameters)
67
			PostgreSQLServerExplorerParameters parameters,
68
			DataServerExplorerProviderServices services)
70 69
			throws InitializeException {
71
		super(parameters);
70
		super(parameters, services);
72 71
	}
73 72

  
74
	protected void init(JDBCServerExplorerParameters parameters)
75
			throws InitializeException {
76
		pgParameters = (PostgreSQLServerExplorerParameters) parameters;
77
		super.init(parameters);
73
	private PostgreSQLServerExplorerParameters getPostgreSQLParameters() {
74
		return (PostgreSQLServerExplorerParameters) getParameters();
78 75
	}
79 76

  
77

  
80 78
	protected JDBCHelper createHelper() throws InitializeException {
81
		return new PostgreSQLHelper(this, pgParameters);
79
		return new PostgreSQLHelper(this, getPostgreSQLParameters());
82 80
	}
83 81

  
84 82

  
......
95 93
		PostgreSQLStoreParameters orgParams = (PostgreSQLStoreParameters) super
96 94
				.createStoreParams();
97 95

  
98
		orgParams.setUseSSL(pgParameters.getUseSSL());
96
		orgParams.setUseSSL(getPostgreSQLParameters().getUseSSL());
99 97

  
100 98
		return orgParams;
101 99
	}
......
117 115
		super.checkIsMine(dsp);
118 116

  
119 117
		PostgreSQLStoreParameters pgp = (PostgreSQLStoreParameters) dsp;
120
		if (pgp.getUseSSL().booleanValue() != pgParameters.getUseSSL()) {
118
		if (pgp.getUseSSL().booleanValue() != getPostgreSQLParameters()
119
				.getUseSSL()) {
121 120
			throw new IllegalArgumentException("worng explorer: Host");
122 121
		}
123 122
	}
......
184 183
	}
185 184

  
186 185
	public NewDataStoreParameters getAddParameters() throws DataException {
186
		PostgreSQLServerExplorerParameters parameters = getPostgreSQLParameters();
187 187
		PostgreSQLNewStoreParameters params = new PostgreSQLNewStoreParameters();
188
		params.setHost(this.parameters.getHost());
189
		params.setPort(this.parameters.getPort());
190
		params.setDBName(this.parameters.getDBName());
191
		params.setUser(this.parameters.getUser());
192
		params.setPassword(this.parameters.getPassword());
193
		params.setCatalog(this.parameters.getCatalog());
194
		params.setSchema(this.parameters.getSchema());
195
		params.setJDBCDriverClassName(this.parameters.getJDBCDriverClassName());
196
		params.setUrl(this.parameters.getUrl());
197
		params.setUseSSL(((PostgreSQLServerExplorerParameters) this.parameters)
198
				.getUseSSL());
188
		params.setHost(parameters.getHost());
189
		params.setPort(parameters.getPort());
190
		params.setDBName(parameters.getDBName());
191
		params.setUser(parameters.getUser());
192
		params.setPassword(parameters.getPassword());
193
		params.setCatalog(parameters.getCatalog());
194
		params.setSchema(parameters.getSchema());
195
		params.setJDBCDriverClassName(parameters.getJDBCDriverClassName());
196
		params.setUrl(parameters.getUrl());
197
		params.setUseSSL(parameters.getUseSSL());
199 198

  
200 199

  
201 200
		params.setDefaultFeatureType(this.getServerExplorerProviderServices()

Also available in: Unified diff