Revision 46452

View differences:

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
120 120

  
121 121
    @Override
122 122
    public void set(JDBCServerExplorerParameters value) {
123
        if(value == null){
124
            this.cboConnection.setSelectedIndex(-1);
125
            this.cboConnection.setSelectedItem(null);
126
            return;
127
        }
123 128
        ComboBoxModel<ListElement<JDBCServerExplorerParameters>> model = this.cboConnection.getModel();
124 129
        for (int i = 0; i < model.getSize(); i++) {
125 130
            JDBCServerExplorerParameters params = model.getElementAt(i).getValue();
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/extension/resourcesmanager/ResourcesLoaderPanel.java
10 10
import java.io.File;
11 11
import java.io.FileInputStream;
12 12
import java.io.IOException;
13
import java.util.Collection;
14
import java.util.Collections;
13 15
import java.util.List;
14 16
import java.util.logging.Level;
15 17
import javax.swing.DefaultListModel;
......
107 109
            @Override
108 110
            public void stateChanged(ChangeEvent e) {
109 111
                connection = null;
112
                if(!isValidSelectedConnection()){
113
                    connectionPicker.set(null);
114
                }
110 115
                chkUseLocalResources.setSelected(getUseLocalResources());
111 116
                refreshDBResources();
112 117
                doUpdateEnableComponents();
......
304 309
        return ws.hasAlternativeResourcesStorage();
305 310
    }
306 311

  
312
    private boolean isValidSelectedConnection() {
313
        DataManager manager = DALLocator.getDataManager();
314
        JDBCServerExplorerParameters con = this.connectionPicker.get();
315

  
316
        if(con == null){
317
            return false;
318
        }
319
        DatabaseWorkspaceManager ws = manager.getDatabaseWorkspace(con);
320
        if(ws == null){
321
            return false;
322
        }
323
        return true;
324
    }
325

  
307 326
    private void doChangeUseLocalResources() {
308 327
        
309 328
        DataManager manager = DALLocator.getDataManager();
......
339 358

  
340 359
    private void refreshDBResources() {
341 360
        ResourcesStorage resourcesStorage = getDBResourcesStorage();
342
        List<String> dbResourcesNames = resourcesStorage.getResourceNames();
361
        List<String> dbResourcesNames = resourcesStorage == null ? Collections.EMPTY_LIST : resourcesStorage.getResourceNames();
343 362
        DefaultListModel dBResourcesModel = new DefaultListModel();
344 363
        for (String resourceName : dbResourcesNames) {
345 364
            ResourcesStorage.Resource resource = resourcesStorage.getResource(resourceName);

Also available in: Unified diff