Author: dgeraskov Date: 2008-11-10 07:46:00 -0500 (Mon, 10 Nov 2008) New Revision: 11633 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizardPage.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java Log: https://jira.jboss.org/jira/browse/JBIDE-3052 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java 2008-11-10 12:43:26 UTC (rev 11632) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java 2008-11-10 12:46:00 UTC (rev 11633) @@ -87,6 +87,7 @@ protected void dialogChanged() { setErrorMessage(null); + setMessage(null); String msg = PathHelper.checkDirectory(getOutputDir(), HibernateConsoleMessages.CodeGenerationSettingsTab_output_directory, false); if (msg!=null) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizardPage.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizardPage.java 2008-11-10 12:43:26 UTC (rev 11632) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizardPage.java 2008-11-10 12:46:00 UTC (rev 11633) @@ -93,6 +93,7 @@ protected void dialogChanged() { setErrorMessage(null); + setMessage(null); /*validate package name*/ String packName= getPackageName(); if (packName.length() > 0) { 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-10 12:43:26 UTC (rev 11632) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2008-11-10 12:46:00 UTC (rev 11633) @@ -63,7 +63,7 @@ */ public abstract class GenerateInitWizardPage extends WizardPage { - private static final String AUTODETECT = "[Autodetect]"; + private static final String AUTODETECT = "[Autodetect]"; //$NON-NLS-1$ private DriverClassHelpers helper = new DriverClassHelpers(); @@ -107,12 +107,6 @@ createChildControls(container); - dialectName = new ComboDialogField(SWT.NONE); - dialectName.setLabelText(HibernateConsoleMessages.NewConfigurationWizardPage_database_dialect); - dialectName.setItems(getDialectNames()); - dialectName.selectItem(0); - dialectName.doFillIntoGrid(container, numColumns); - selectMethod = new Button(container, SWT.CHECK); selectMethod.setText("Use Console Configuration"); selectMethod.setSelection(true); @@ -127,6 +121,7 @@ consoleConfigurationName.setEnabled(selectMethod.getSelection()); connectionProfileName.setEnabled(!selectMethod.getSelection()); schemaName.setEnabled(!selectMethod.getSelection()); + dialectName.setEnabled(!selectMethod.getSelection()); dialogChanged(); }}); GridData gd = new GridData(GridData.FILL_HORIZONTAL); @@ -185,7 +180,15 @@ } connectionProfileName.doFillIntoGrid(dbGroup, numColumns); connectionProfileName.setDialogFieldListener(fieldlistener); - connectionProfileName.setEnabled(!selectMethod.getSelection()); + connectionProfileName.setEnabled(!selectMethod.getSelection()); + //****************************dialect***************** + dialectName = new ComboDialogField(SWT.NONE); + dialectName.setLabelText(HibernateConsoleMessages.NewConfigurationWizardPage_database_dialect); + dialectName.setItems(getDialectNames()); + dialectName.selectItem(0); + dialectName.doFillIntoGrid(dbGroup, numColumns); + dialectName.setEnabled(false); + dialectName.setDialogFieldListener(fieldlistener); //****************************schema***************** schemaName = new StringButtonDialogField(new IStringButtonAdapter(){ public void changeControlPressed(DialogField field) { @@ -214,6 +217,10 @@ return; } + if (selectMethod.getSelection()){ // TODO: can't check that dialect set + setWarningMessage("Impossible to check that hibernate dialect is set."); + } + setPageComplete(true); } @@ -323,8 +330,10 @@ } private String determineDialect() { - if (!AUTODETECT.equals(dialectName.getText())) - return helper.getDialectClass(dialectName.getText()); + if (!AUTODETECT.equals(dialectName.getText())){ + String dialect = helper.getDialectClass(dialectName.getText()); + return dialect != null ? dialect : dialectName.getText(); + } if (!selectMethod.getSelection()){ IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(getConnectionProfileName()); String driver = profile.getProperties(profile.getProviderId()).getProperty("org.eclipse.datatools.connectivity.db.driverClass");