Revision 11952
branches/v10/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/WizardVectorialDB.java | ||
---|---|---|
239 | 239 |
} |
240 | 240 |
|
241 | 241 |
String layerName = item.getUserTableSettingsPanel() |
242 |
.getUserLayerName(); |
|
243 |
String tableName = item.getTableName(); |
|
242 |
.getUserLayerName(); |
|
243 |
|
|
244 |
// Change: we parse tableName to extract schema (or owner in Oracle) |
|
245 |
String[] tokens = item.getTableName().split("\\u002E", 2); |
|
246 |
String tableName; |
|
247 |
String schema = null; |
|
248 |
if (tokens.length > 1) |
|
249 |
{ |
|
250 |
schema = tokens[0]; |
|
251 |
tableName = tokens[1]; |
|
252 |
} |
|
253 |
else |
|
254 |
{ |
|
255 |
tableName = tokens[1]; |
|
256 |
} |
|
257 |
|
|
244 | 258 |
String fidField = item.getUserTableSettingsPanel() |
245 |
.getIdFieldName();
|
|
259 |
.getIdFieldName(); |
|
246 | 260 |
String geomField = item.getUserTableSettingsPanel() |
247 |
.getGeoFieldName();
|
|
261 |
.getGeoFieldName(); |
|
248 | 262 |
String[] fields = item.getUserSelectedFieldsPanel() |
249 |
.getUserSelectedFields(fidField, geomField);
|
|
263 |
.getUserSelectedFields(fidField, geomField); |
|
250 | 264 |
|
251 | 265 |
// fields = driver.manageGeometryField(fields, geomField); |
252 | 266 |
|
253 | 267 |
// driver.manageGeometryField(geomField); |
254 | 268 |
DBLayerDefinition lyrDef = new DBLayerDefinition(); |
255 | 269 |
lyrDef.setName(layerName); |
270 |
lyrDef.setSchema(schema); |
|
256 | 271 |
lyrDef.setTableName(tableName); |
257 | 272 |
|
258 | 273 |
if (item.getUserTableSettingsPanel().isSqlActive()) { |
... | ... | |
670 | 685 |
} |
671 | 686 |
|
672 | 687 |
private void showConnectionErrorMessage(String _msg) { |
673 |
String msg = (_msg.length() > 300) ? "" : (": " + _msg); |
|
688 |
String msg; |
|
689 |
if (_msg == null){ |
|
690 |
_msg = PluginServices.getText(this, "connection_error"); |
|
691 |
} |
|
692 |
msg = (_msg.length() > 300) ? "" : (": " + _msg); |
|
674 | 693 |
String title = PluginServices.getText(this, "connection_error"); |
675 | 694 |
JOptionPane.showMessageDialog(this, title + msg, title, |
676 | 695 |
JOptionPane.ERROR_MESSAGE); |
Also available in: Unified diff