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/JDBCConnectionPickerController.java

View differences:

JDBCConnectionPickerController.java
16 16
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters;
17 17
import org.gvsig.fmap.dal.swing.DALSwingLocator;
18 18
import org.gvsig.fmap.dal.swing.jdbc.JDBCConnectionDialog;
19
import org.gvsig.tools.swing.api.ListElement;
19 20
import org.gvsig.tools.swing.api.ToolsSwingLocator;
20 21
import org.gvsig.tools.swing.api.pickercontroller.AbstractPickerController;
21 22
import org.gvsig.tools.swing.api.pickercontroller.PickerController;
22 23
import org.gvsig.tools.swing.icontheme.IconTheme;
23
import org.gvsig.tools.util.LabeledValue;
24
import org.gvsig.tools.util.LabeledValueImpl;
25 24

  
26 25
/**
27 26
 *
......
72 71
            if (entry.getExplorerParameters() instanceof JDBCServerExplorerParameters) {
73 72
                JDBCServerExplorerParameters dbParams = (JDBCServerExplorerParameters) entry.getExplorerParameters();
74 73
                combo.addItem(
75
                        new LabeledValueImpl<>(entry.getName(), dbParams)
74
                        new ListElement<>(entry.getName(), dbParams)
76 75
                );
77 76
            }
78 77
        }
......
80 79
    }
81 80

  
82 81
    private void doAddConnection() {
83
        JDBCConnectionDialog newco = DALSwingLocator.getSwingManager().createJDBCConectionDialog();
84
        newco.showDialog();
85
        if (newco.isCanceled()) {
82
        JDBCConnectionDialog dialog = DALSwingLocator.getSwingManager().createJDBCConectionDialog();
83
        dialog.showDialog();
84
        if (dialog.isCanceled()) {
86 85
            return;
87 86
        }
88 87
        DataManager dataManager = DALLocator.getDataManager();
89 88
        DataServerExplorerPool pool = dataManager.getDataServerExplorerPool();
90 89

  
91
        pool.add(newco.getConnectionName(), newco.getServerExplorerParameters());
90
        pool.add(dialog.getConnectionName(), dialog.getServerExplorerParameters());
92 91
        this.fillConnections(this.cboConnection);
92
        ListElement.setSelected(cboConnection, dialog);
93 93
    }
94 94
    
95 95
    @Override
96 96
    public JDBCServerExplorerParameters get() {
97
        LabeledValueImpl<JDBCServerExplorerParameters> item = (LabeledValueImpl<JDBCServerExplorerParameters>) this.cboConnection.getSelectedItem();
97
        ListElement<JDBCServerExplorerParameters> item = (ListElement<JDBCServerExplorerParameters>) this.cboConnection.getSelectedItem();
98 98
        if (item == null) {
99 99
            return null;
100 100
        }
......
104 104

  
105 105
    @Override
106 106
    public void set(JDBCServerExplorerParameters value) {
107
        ComboBoxModel<LabeledValue<JDBCServerExplorerParameters>> model = this.cboConnection.getModel();
107
        ComboBoxModel<ListElement<JDBCServerExplorerParameters>> model = this.cboConnection.getModel();
108 108
        for (int i = 0; i < model.getSize(); i++) {
109 109
            JDBCServerExplorerParameters params = model.getElementAt(i).getValue();
110 110
            if( params == value ) {

Also available in: Unified diff