Revision 44633 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/fmap/dal/impl/DefaultDatabaseWorkspaceManager.java

View differences:

DefaultDatabaseWorkspaceManager.java
5 5
import java.util.Collection;
6 6
import java.util.Collections;
7 7
import java.util.List;
8
import java.util.Objects;
8 9
import org.gvsig.fmap.dal.DatabaseWorkspaceManager;
9 10
import org.apache.commons.lang3.StringUtils;
10 11
import org.apache.commons.lang3.mutable.Mutable;
......
213 214
        }
214 215
    }
215 216
    
216
    private boolean existsTable(String tableName) {
217
    @Override
218
    public DataServerExplorer getServerExplorer() {
217 219
        try {
218 220
            DataManager dataManager = DALLocator.getDataManager();
219 221
            DataServerExplorer server = dataManager.openServerExplorer(
220 222
                    this.serverParameters.getProviderName(),
221 223
                    this.serverParameters
222 224
            );
225
            return server;
226
        } catch (Exception ex) {
227
            throw new RuntimeException("Can't get server explorer for workspace '"+Objects.toString(this.serverParameters)+"'", ex);
228
        }
229
    }
230
    
231
    private boolean existsTable(String tableName) {
232
        try {
233
            DataServerExplorer server = this.getServerExplorer();
223 234
            for (DataStoreParameters params : server.list()) {
224 235
                String theTableName = (String) params.getDynValue("Table");
225 236
                if( StringUtils.equals(theTableName, tableName) ) {
......
235 246
    private FeatureStore getTable(String tableName) {
236 247
        try {
237 248
            DataManager dataManager = DALLocator.getDataManager();
238
            DataServerExplorer server = dataManager.openServerExplorer(
239
                    this.serverParameters.getProviderName(),
240
                    this.serverParameters
241
            );
249
            DataServerExplorer server = this.getServerExplorer();
242 250
            DataStoreParameters params = server.get(tableName);
243 251
            if( params!=null ) {
244 252
                FeatureStore store = (FeatureStore) dataManager.openStore(
......
255 263

  
256 264
    private void dropTable(String tableName) {
257 265
        try {
258
            DataManager dataManager = DALLocator.getDataManager();
259
            DataServerExplorer server = dataManager.openServerExplorer(
260
                    this.serverParameters.getProviderName(),
261
                    this.serverParameters
262
            );
266
            DataServerExplorer server = this.getServerExplorer();
263 267
            DataStoreParameters params = server.get(tableName);
264 268
            if( params!=null ) {
265 269
                server.remove(params);
......
272 276
    private void createTableResources() {
273 277
        String tableName = TABLE_RESOURCES_NAME;
274 278
        try {
275
            DataManager dataManager = DALLocator.getDataManager();
276
            DataServerExplorer server = dataManager.openServerExplorer(
277
                    this.serverParameters.getProviderName(),
278
                    this.serverParameters
279
            );
279
            DataServerExplorer server = this.getServerExplorer();
280 280
            NewFeatureStoreParameters params = (NewFeatureStoreParameters) server.getAddParameters(tableName);
281 281
            EditableFeatureType ft = params.getDefaultFeatureType();
282 282
            ft.add(FIELD_RESOURCES_NAME, DataTypes.STRING, 150)
......
293 293
    private void createTableRepository() {
294 294
        String tableName = TABLE_REPOSITORY_NAME;
295 295
        try {
296
            DataManager dataManager = DALLocator.getDataManager();
297
            DataServerExplorer server = dataManager.openServerExplorer(
298
                    this.serverParameters.getProviderName(),
299
                    this.serverParameters
300
            );
296
            DataServerExplorer server = this.getServerExplorer();
301 297
            NewFeatureStoreParameters params = (NewFeatureStoreParameters) server.getAddParameters(tableName);
302 298
            EditableFeatureType ft = params.getDefaultFeatureType();
303 299
            ft.add(FIELD_REPOSITORY_NAME, DataTypes.STRING, 150)
......
314 310
    private void createTableConfiguration() {
315 311
        String tableName = TABLE_CONFIGURATION_NAME;
316 312
        try {
317
            DataManager dataManager = DALLocator.getDataManager();
318
            DataServerExplorer server = dataManager.openServerExplorer(
319
                    this.serverParameters.getProviderName(),
320
                    this.serverParameters
321
            );
313
            DataServerExplorer server = this.getServerExplorer();
322 314
            NewFeatureStoreParameters params = (NewFeatureStoreParameters) server.getAddParameters(tableName);
323 315
            EditableFeatureType ft = params.getDefaultFeatureType();
324 316
            ft.add(FIELD_CONFIGURATION_NAME, DataTypes.STRING, 200)

Also available in: Unified diff