/ - Diff - Application: gvSIG desktop - gvSIG

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.lib/src/main/java/org/gvsig/fmap/dal/resource/db/AbstractDBResourceNoBlocker.java
159	159	if (!equals(myParams.getUser(), params.getUser())) {
160	160	return false;
161	161	}
162
	162	if (!equals(myParams.getPassword(), params.getPassword())) {
	163	return false;
	164	}
163	165	return true;
164	166	}
165	167

+    		}
     		DataManager dm = DALLocator.getDataManager();
     		String err_msg = Messages.getText("connection_error");
     		DBServerExplorer dbExplorer;
     		DBServerExplorer dbExplorer = null;
     		try {
     			dbExplorer = (DBServerExplorer) dm.openServerExplorer(dbSeverExplorerParameters2.getExplorerName(), dbSeverExplorerParameters2);
-...
     			getTablesList().setModel(lmodel);
     			getTablesScrollPane().setViewportView(tablesList);
     			tablesScrollPane.updateUI();
     		} catch (InitializeException e) {
     			logger.info("Error while getting table names: " + e.getMessage(), e);
     			ApplicationLocator.getManager().messageDialog(
     			    err_msg + ": " + e.getMessage(),
     		} catch (Exception e) {
     			logger.info("Error while getting table names: " + e.getMessage());
     			String remove_question = Messages.getText(
     			    "_Remove_connection_parameters_from_list_question");
     			int opt = JOptionPane.showConfirmDialog(
     			    ApplicationLocator.getManager().getRootComponent(),
     			    err_msg + ": " + getLastMessage(e) + "\n" + remove_question,
     			    err_msg,
     			    JOptionPane.ERROR_MESSAGE);
     			return;
     		} catch (DataException e) {
     			logger.info("Error while getting table names: " + e.getMessage(), e);
                 ApplicationLocator.getManager().messageDialog(
                     err_msg + ": " + e.getMessage(),
                     err_msg,
                     JOptionPane.ERROR_MESSAGE);
     			return;
     		} catch (Exception e) {
     			logger.info("Error while getting table names: " + e.getMessage(), e);
                 ApplicationLocator.getManager().messageDialog(
                     err_msg + ": " + e.getMessage(),
                     err_msg,
                     JOptionPane.ERROR_MESSAGE);
     			return;
     			    JOptionPane.YES_NO_OPTION);
     			if (opt == JOptionPane.YES_OPTION) {
     			    removeDBPArameters(dbSeverExplorerParameters2);
     			    // dbExplorer.
     			    loadVectorialDBDatasourcesCombo(null);
+    			}
+    		}
+    	}
     	public void valueChanged(ListSelectionEvent arg0) {
     	/**
     	 * Removes DB parameters from list of pre-configured DB parameters
     	 * @param dbSeverExplorerParameters2
     	 */
     	private void removeDBPArameters(
     	    DBServerExplorerParameters dbparams) {
             PluginsManager manager = PluginsLocator.getManager();
             DynObject values = manager.getPlugin(ExtDB_Spatial.class).getPluginProperties();
             Map connections = (Map) values.getDynValue("db_connections");
             if (connections == null) {
                 return;
+            }
             DBServerExplorerParameters item = null;
             Iterator it = connections.entrySet().iterator();
             List<String> toremove = new ArrayList();
             while (it.hasNext()) {
                 Map.Entry entry = (Entry) it.next();
                 item = (DBServerExplorerParameters) entry.getValue();
                 if (dbparams.equals(item)) {
                     toremove.add((String) entry.getKey());
+                }
+            }
             if (toremove.size() == 0) {
                 return;
+            }
             for (int i=0; i<toremove.size(); i++) {
                 connections.remove(toremove.get(i));
+            }
             values.setDynValue("db_connections", connections);
+        }
         public void valueChanged(ListSelectionEvent arg0) {
     		Object src = arg0.getSource();
     		if (src == tablesList) {
-...
     	public void close() {
     		// Nothing to do
+    	}
     	protected String getLastMessage(Throwable ex) {
             Throwable p = ex;
             while (p.getCause() != null && p.getCause() != p) {
                 p = p.getCause();
+            }
             return p.getMessage();
+        }
     } // @jve:decl-index=0:visual-constraint="10,10"

trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.geodb.app/org.gvsig.geodb.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties
34	34	_Table_NAME_does_not_have_declared_PK=The table {0} does not have a declared primary key in the DB
35	35	_If_layer_edited_saving_edits_will_not_be_possible=If layer is edited, saving edits will not be possible
36	36	_Strange_behavior_if_selected_ID_not_unique_values=The layer will have strange behavior if field selected as ID does not have unique values
	37	_Remove_connection_parameters_from_list_question=Do you wish to remove the offending parameters from the list?
37	38
38	39
39	40

trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.geodb.app/org.gvsig.geodb.app.mainplugin/src/main/resources-plugin/i18n/text.properties
34	34	_Table_NAME_does_not_have_declared_PK=La tabla {0} no tiene clave primaria declarada en la BD
35	35	_If_layer_edited_saving_edits_will_not_be_possible=Si edita la capa, no ser? posible salvar los cambios en la misma tabla
36	36	_Strange_behavior_if_selected_ID_not_unique_values=La capa tendr? comportamiento extra?o si el campo elegido como ID no tiene valores ?nicos
	37	_Remove_connection_parameters_from_list_question=?Desea eliminar de la lista los par?metros que han causado el problema?
37	38
38	39
39	40

Application: gvSIG desktop

Revision 41126