Revision 11965

View differences:

branches/v10/applications/appgvSIG/src/com/iver/cit/gvsig/SingleVectorialDBConnectionExtension.java
108 108
        XMLEntity xml = PluginServices.getPluginServices(this).getPersistentXML();
109 109
        xml.remove("db-connections");
110 110

  
111
//        TODO este trozo de c?digo es para limpiar la forma en la que se guardaba la persistencia.
112
//        XMLEntity xmlJDBC = PluginServices.getPluginServices("com.iver.cit.gvsig.jdbc_spatial").getPersistentXML();
113
//        xmlJDBC.remove("jdbc-connections");
114

  
111 115
        ConnectionWithParams[] all = SingleVectorialDBConnectionManager.instance()
112 116
                                                                .getAllConnections();
113 117

  
......
203 207
            }
204 208
            if (params_ok) addDisconnected(cs);
205 209
        }
210

  
211
        XMLEntity xmlJDBC = PluginServices.getPluginServices("com.iver.cit.gvsig.jdbc_spatial").getPersistentXML();
212

  
213
        if (xmlJDBC==null || !xmlJDBC.contains("jdbc-connections"))
214
        	return;
215

  
216
//      add drivers to connection manager
217
        String[] serversOld = null;
218

  
219
        try {
220
            serversOld = xmlJDBC.getStringArrayProperty("jdbc-connections");
221
        }
222
        catch (NotExistInXMLEntity e) {
223
            System.err.println(
224
                "Error while getting projects jdbc-connections: " +
225
                e.getMessage());
226

  
227
            return;
228
        }
229

  
230
        for (int i = 0; i < serversOld.length; i++) {
231
            ConnectionSettings cs = new ConnectionSettings();
232
            boolean params_ok = true;
233
            try {
234
            	cs.setFromString(serversOld[i]);
235
            } catch (Exception ex) {
236
            	logger.error("Found misconfigured connection: " + serversOld[i]);
237
            	params_ok = false;
238
            }
239
            if (params_ok) addDisconnected(cs);
240
        }
241

  
242

  
206 243
    }
207 244

  
208 245
    private void addDisconnected(ConnectionSettings _cs) {

Also available in: Unified diff