Revision 44304 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/jdbc2/spi/JDBCServerExplorerBase.java
JDBCServerExplorerBase.java | ||
---|---|---|
33 | 33 |
import org.apache.commons.lang3.tuple.ImmutablePair; |
34 | 34 |
import org.apache.commons.lang3.tuple.Pair; |
35 | 35 |
import org.gvsig.fmap.dal.DALLocator; |
36 |
import static org.gvsig.fmap.dal.DataManager.RESOURCES_TABLE_NAME; |
|
37 | 36 |
import org.gvsig.fmap.dal.DataStore; |
38 | 37 |
import org.gvsig.fmap.dal.DataStoreParameters; |
38 |
import static org.gvsig.fmap.dal.DatabaseWorkspaceManager.TABLE_RESOURCES_NAME; |
|
39 | 39 |
import org.gvsig.fmap.dal.NewDataStoreParameters; |
40 | 40 |
import org.gvsig.fmap.dal.exception.CloseException; |
41 | 41 |
import org.gvsig.fmap.dal.exception.DataException; |
... | ... | |
179 | 179 |
} |
180 | 180 |
|
181 | 181 |
@Override |
182 |
public NewDataStoreParameters getAddParameters(String storeName) |
|
183 |
throws DataException { |
|
184 |
JDBCNewStoreParameters params = this.getAddParameters(); |
|
185 |
params.setTable(storeName); |
|
186 |
return params; |
|
187 |
} |
|
188 |
|
|
189 |
@Override |
|
182 | 190 |
public JDBCNewStoreParameters getAddParameters() throws DataException { |
183 | 191 |
JDBCServerExplorerParameters parameters = getParameters(); |
184 | 192 |
JDBCNewStoreParameters params = this.helper.createNewStoreParameters(); |
... | ... | |
392 | 400 |
List<JDBCStoreParameters> tables = this.list(); |
393 | 401 |
for (JDBCStoreParameters params : tables) { |
394 | 402 |
String theTableName = params.getTable(); |
395 |
if (StringUtils.equals(theTableName, RESOURCES_TABLE_NAME)) {
|
|
403 |
if (StringUtils.equals(theTableName, TABLE_RESOURCES_NAME)) {
|
|
396 | 404 |
this.resourcesStorage = new JDBCResourcesStorage( |
397 | 405 |
params, |
398 | 406 |
dataStore.getName() |
... | ... | |
402 | 410 |
} |
403 | 411 |
this.resourcesStorage = new EmptyResourcesStorage(); |
404 | 412 |
} catch (Throwable ex) { |
405 |
LOG.warn("Can't retrieve reources storage from table '" + RESOURCES_TABLE_NAME + "' in '"+this.getParameters().getUrl()+"'.", ex);
|
|
413 |
LOG.warn("Can't retrieve reources storage from table '" + TABLE_RESOURCES_NAME + "' in '"+this.getParameters().getUrl()+"'.", ex);
|
|
406 | 414 |
} |
407 | 415 |
} |
408 | 416 |
return this.resourcesStorage; |
Also available in: Unified diff