Revision 44591 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 | ||
|---|---|---|
| 138 | 138 |
} |
| 139 | 139 |
}); |
| 140 | 140 |
adjustPreferedHeight(this.lblFoother,300); |
| 141 |
Dimension sz = this.getPreferredSize(); |
|
| 142 |
if( sz.width<400 ) {
|
|
| 143 |
sz.width = 400; |
|
| 144 |
this.setPreferredSize(sz); |
|
| 145 |
} |
|
| 141 | 146 |
} |
| 142 | 147 |
|
| 143 | 148 |
private void adjustPreferedHeight(JLabel label, int prefWidth) {
|
| ... | ... | |
| 234 | 239 |
|
| 235 | 240 |
@Override |
| 236 | 241 |
public JDBCServerExplorerParameters getServerExplorerParameters() {
|
| 237 |
LabeledValue<JDBCServerExplorerParameters> labeledConnection = this.getLabeledServerExplorerParameters(); |
|
| 238 |
if( labeledConnection==null ) {
|
|
| 239 |
return null; |
|
| 240 |
} |
|
| 241 |
return labeledConnection.getValue(); |
|
| 242 |
} |
|
| 243 |
|
|
| 244 |
@Override |
|
| 245 |
public LabeledValue<JDBCServerExplorerParameters> getLabeledServerExplorerParameters() {
|
|
| 246 | 242 |
JDBCServerExplorerParameters params; |
| 247 | 243 |
JDBCServerExplorerParameters connector = this.getConnector(); |
| 248 | 244 |
if( connector==null ) {
|
| ... | ... | |
| 273 | 269 |
if( s!=null ) {
|
| 274 | 270 |
params.setPassword(s); |
| 275 | 271 |
} |
| 276 |
|
|
| 272 |
return params; |
|
| 273 |
} |
|
| 274 |
|
|
| 275 |
@Override |
|
| 276 |
public LabeledValue<JDBCServerExplorerParameters> getLabeledServerExplorerParameters() {
|
|
| 277 |
JDBCServerExplorerParameters params = this.getServerExplorerParameters(); |
|
| 278 |
if( params == null ) {
|
|
| 279 |
return null; |
|
| 280 |
} |
|
| 277 | 281 |
String name = this.getConnectionName(); |
| 278 | 282 |
if ( StringUtils.isBlank(name) ) {
|
| 279 | 283 |
if( params instanceof FilesystemStoreParameters ) {
|
| ... | ... | |
| 302 | 306 |
} else if( this.isNewConnection() ) {
|
| 303 | 307 |
name = getUniqueEntryName(name); |
| 304 | 308 |
} |
| 305 |
|
|
| 306 |
try {
|
|
| 307 |
params.validate(); |
|
| 308 |
DataManager dataManager = DALLocator.getDataManager(); |
|
| 309 |
DataServerExplorerPool pool = dataManager.getDataServerExplorerPool(); |
|
| 310 |
pool.add(name, params); |
|
| 311 |
} catch (ValidateDataParametersException ex) {
|
|
| 312 |
|
|
| 313 |
} |
|
| 314 |
|
|
| 315 | 309 |
return new LabeledValueImpl<>(name,params); |
| 316 | 310 |
} |
| 317 | 311 |
|
| ... | ... | |
| 330 | 324 |
public String getParametersProblems() {
|
| 331 | 325 |
try {
|
| 332 | 326 |
I18nManager i18n = ToolsLocator.getI18nManager(); |
| 333 |
LabeledValue<JDBCServerExplorerParameters> params = this.getLabeledServerExplorerParameters();
|
|
| 327 |
JDBCServerExplorerParameters params = this.getServerExplorerParameters();
|
|
| 334 | 328 |
if( params == null ) {
|
| 335 | 329 |
return i18n.getTranslation("You need to select a connector");
|
| 336 | 330 |
} |
| 337 |
params.getValue().validate();
|
|
| 331 |
params.validate(); |
|
| 338 | 332 |
return null; |
| 339 | 333 |
} catch (ValidateDataParametersException ex) {
|
| 340 | 334 |
return ex.getLocalizedMessageStack(); |
| ... | ... | |
| 362 | 356 |
@Override |
| 363 | 357 |
public String getConnectionName() {
|
| 364 | 358 |
Object value = this.cboConnections.getSelectedItem(); |
| 365 |
return StringUtils.defaultIfBlank(Objects.toString(value, null), null); |
|
| 359 |
String name = StringUtils.defaultIfBlank(Objects.toString(value, null), null); |
|
| 360 |
if( StringUtils.isBlank(name) ) {
|
|
| 361 |
name = getUniqueEntryName("Connection");
|
|
| 362 |
} else if( this.isNewConnection() ) {
|
|
| 363 |
name = getUniqueEntryName(name); |
|
| 364 |
} |
|
| 365 |
return name; |
|
| 366 |
|
|
| 366 | 367 |
} |
| 367 | 368 |
|
| 368 | 369 |
@Override |
| 369 | 370 |
public boolean isNewConnection() {
|
| 370 |
String name = this.getConnectionName(); |
|
| 371 |
Object value = this.cboConnections.getSelectedItem(); |
|
| 372 |
String name = StringUtils.defaultIfBlank(Objects.toString(value, null), null); |
|
| 371 | 373 |
if( name == null ) {
|
| 372 | 374 |
return true; |
| 373 | 375 |
} |
Also available in: Unified diff