Author: dgeraskov Date: 2009-08-11 08:15:18 -0400 (Tue, 11 Aug 2009) New Revision: 17044 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/ConsoleConfigurationPreferences.java Log: https://jira.jboss.org/jira/browse/JBIDE-4721 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2009-08-11 09:46:12 UTC (rev 17043) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2009-08-11 12:15:18 UTC (rev 17044) @@ -175,7 +175,7 @@ // refresh profile (refresh jpa connection): // get fresh information about current db structure and update error markers if (profile.getConnectionState() == IConnectionProfile.CONNECTED_STATE){ - profile.disconnect(); + profile.disconnect(null); } profile.connect(null); } @@ -686,7 +686,7 @@ private Configuration configureConnectionProfile(Configuration localCfg) { String connectionProfile = prefs.getConnectionProfileName(); - if(connectionProfile==null || "".equals(connectionProfile)) {//$NON-NLS-1$ + if(connectionProfile==null) { return localCfg; } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/ConsoleConfigurationPreferences.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/ConsoleConfigurationPreferences.java 2009-08-11 09:46:12 UTC (rev 17043) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/ConsoleConfigurationPreferences.java 2009-08-11 12:15:18 UTC (rev 17044) @@ -125,6 +125,10 @@ public abstract String getNamingStrategy(); + /** + * + * @return null if ConnectionProfile was not specified + */ public abstract String getConnectionProfileName(); public abstract String getDialectName(); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2009-08-11 09:46:12 UTC (rev 17043) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2009-08-11 12:15:18 UTC (rev 17044) @@ -147,7 +147,7 @@ if (jpaProject != null) { JpaDataSource ds = jpaProject.getDataSource(); if (ds != null) - return ds.getConnectionProfileName(); + return "".equals(ds.getConnectionProfileName()) ? null : ds.getConnectionProfileName();//$NON-NLS-1$ } } }