Author: dgeraskov Date: 2008-11-11 07:06:52 -0500 (Tue, 11 Nov 2008) New Revision: 11665 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationOptionsTab.java Log: ps://jira.jboss.org/jira/browse/JBIDE-2740 DriverClassHelpers.getShortDialectNane() changed Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2008-11-11 11:19:01 UTC (rev 11664) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2008-11-11 12:06:52 UTC (rev 11665) @@ -263,13 +263,18 @@ return (String[]) list.toArray(new String[list.size()]); } + /** + * + * @param fullName + * @return short dialect name by corresponding class if available, otherwise return fullName assuming it is a "raw" classname. + */ public String getShortDialectName(String fullName) { Iterator keyIterator = dialectNames.keySet().iterator(); while (keyIterator.hasNext()){ String key = (String)keyIterator.next(); if (dialectNames.get(key).equals(fullName)) return key; } - return null; + return fullName; } public String getDialect(String driverclass) { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationOptionsTab.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationOptionsTab.java 2008-11-11 11:19:01 UTC (rev 11664) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationOptionsTab.java 2008-11-11 12:06:52 UTC (rev 11665) @@ -89,8 +89,7 @@ try { String dialect = configuration.getAttribute( IConsoleConfigurationLaunchConstants.DIALECT , (String)null ); if (dialect != null){ - String dialectShort = helper.getShortDialectName(dialect); - dialectNameCombo.setText( dialectShort != null ? dialectShort : dialect ); + dialectNameCombo.setText( helper.getShortDialectName(dialect) ); } namingStrategyClassNameText.setText( configuration.getAttribute( IConsoleConfigurationLaunchConstants.NAMING_STRATEGY, "" ) ); //$NON-NLS-1$ entityResolverClassNameText.setText( configuration.getAttribute( IConsoleConfigurationLaunchConstants.ENTITY_RESOLVER, "" ) ); //$NON-NLS-1$ @@ -102,11 +101,7 @@ public void performApply(ILaunchConfigurationWorkingCopy configuration) { String dialect = nonEmptyTrimOrNull( dialectNameCombo.getText() ); - if ( dialect != null ) { - String dialectFull = helper.getDialectClass(dialect); - /*It can be unknown dialect*/ - if (dialectFull != null) dialect = dialectFull; - } + dialect = helper.getDialectClass(dialect); configuration.setAttribute( IConsoleConfigurationLaunchConstants.DIALECT, nonEmptyTrimOrNull( dialect ) ); configuration.setAttribute( IConsoleConfigurationLaunchConstants.NAMING_STRATEGY, nonEmptyTrimOrNull( namingStrategyClassNameText ) );