Revision 46337 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/jdbc/DefaultJDBCConnectionPanel.java
| DefaultJDBCConnectionPanel.java | ||
|---|---|---|
| 231 | 231 |
} |
| 232 | 232 |
|
| 233 | 233 |
@Override |
| 234 |
public JDBCServerExplorerParameters getServerExplorerParameters() {
|
|
| 234 |
public JDBCServerExplorerParameters getServerExplorerParametersAndRegister() {
|
|
| 235 |
JDBCServerExplorerParameters params = this.getServerExplorerParametersWithoutRegister(); |
|
| 236 |
addServerExplorerParametersToThePool(this.getConnectionName(), params); |
|
| 237 |
return params; |
|
| 238 |
} |
|
| 239 |
|
|
| 240 |
public JDBCServerExplorerParameters getServerExplorerParametersWithoutRegister() {
|
|
| 235 | 241 |
JDBCServerExplorerParameters params; |
| 236 | 242 |
JDBCServerExplorerParameters connector = this.getConnector(); |
| 237 | 243 |
if( connector==null ) {
|
| ... | ... | |
| 262 | 268 |
if( s!=null ) {
|
| 263 | 269 |
params.setPassword(s); |
| 264 | 270 |
} |
| 265 |
addServerExplorerParametersToThePool(this.getConnectionName(), params); |
|
| 266 | 271 |
return params; |
| 267 | 272 |
} |
| 268 | 273 |
|
| ... | ... | |
| 274 | 279 |
|
| 275 | 280 |
@Override |
| 276 | 281 |
public LabeledValue<JDBCServerExplorerParameters> getLabeledServerExplorerParameters() {
|
| 277 |
JDBCServerExplorerParameters params = this.getServerExplorerParameters(); |
|
| 282 |
JDBCServerExplorerParameters params = this.getServerExplorerParametersAndRegister();
|
|
| 278 | 283 |
if( params == null ) {
|
| 279 | 284 |
return null; |
| 280 | 285 |
} |
| ... | ... | |
| 312 | 317 |
@Override |
| 313 | 318 |
public boolean areTheParametersValid() {
|
| 314 | 319 |
try {
|
| 315 |
LabeledValue<JDBCServerExplorerParameters> params = this.getLabeledServerExplorerParameters();
|
|
| 316 |
params.getValue().validate();
|
|
| 320 |
JDBCServerExplorerParameters params = this.getServerExplorerParametersWithoutRegister();
|
|
| 321 |
params.validate(); |
|
| 317 | 322 |
return true; |
| 318 | 323 |
} catch (ValidateDataParametersException ex) {
|
| 319 | 324 |
return false; |
| ... | ... | |
| 324 | 329 |
public String getParametersProblems() {
|
| 325 | 330 |
try {
|
| 326 | 331 |
I18nManager i18n = ToolsLocator.getI18nManager(); |
| 327 |
JDBCServerExplorerParameters params = this.getServerExplorerParameters(); |
|
| 332 |
JDBCServerExplorerParameters params = this.getServerExplorerParametersWithoutRegister();
|
|
| 328 | 333 |
if( params == null ) {
|
| 329 | 334 |
return i18n.getTranslation("You need to select a connector");
|
| 330 | 335 |
} |
Also available in: Unified diff