Author: dgeraskov Date: 2008-11-11 07:06:56 -0500 (Tue, 11 Nov 2008) New Revision: 11666 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java Log: ps://jira.jboss.org/jira/browse/JBIDE-2740 DriverClassHelpers.getShortDialectNane() changed Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java 2008-11-11 12:06:52 UTC (rev 11665) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java 2008-11-11 12:06:56 UTC (rev 11666) @@ -126,7 +126,7 @@ driverHolder.addPropertyChangeListener(new PropertyChangeListener() { public void propertyChanged(PropertyChangeEvent event) { - String driverClass = helper.getDialectClass((String) event.getNewValue()); + String driverClass = (String) event.getNewValue(); String[] connectionURLS = helper.getConnectionURLS(driverClass); String url = urlHolder.getValue();//save value lvmUrl.clear(); @@ -199,18 +199,13 @@ BasicHibernateProperties.DIALECT_PROPERTY) { @Override protected String buildValue_() { - String dialect = subject.getDialect(); - String value = helper.getShortDialectName(dialect); - if (value == null) value = dialect; - return value; + return helper.getShortDialectName(subject.getDialect()); } @Override protected void setValue_(String value) { if ("".equals(value))value = null; //$NON-NLS-1$ - String dialect = helper.getDialectClass(value); - if (dialect == null) dialect = value; - subject.setDialect(dialect); + subject.setDialect(helper.getDialectClass(value)); } }; } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2008-11-11 12:06:52 UTC (rev 11665) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2008-11-11 12:06:56 UTC (rev 11666) @@ -306,8 +306,7 @@ private String determineDialect() { if (!AUTODETECT.equals(dialectName.getText())){ - String dialect = helper.getDialectClass(dialectName.getText()); - return dialect != null ? dialect : dialectName.getText(); + return helper.getDialectClass(dialectName.getText()); } if (!selectMethod.getSelection()){ IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(getConnectionProfileName());