Author: dgeraskov Date: 2009-08-10 06:38:51 -0400 (Mon, 10 Aug 2009) New Revision: 17034 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java 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-4737 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java 2009-08-08 01:13:30 UTC (rev 17033) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java 2009-08-10 10:38:51 UTC (rev 17034) @@ -62,7 +62,8 @@ prop.put("outputFileName", initPage.getFilename()); //$NON-NLS-1$ prop.put("format", "true"); //$NON-NLS-1$ //$NON-NLS-2$ prop.put("scriptToConsole", "false"); //$NON-NLS-1$ //$NON-NLS-2$ - + prop.put("exportToDatabase", "false");//$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateJpaPlatformUi.full_exporter_id + ".properties", prop); //$NON-NLS-1$ wc.setAttribute(HibernateJpaPlatformUi.full_exporter_id + ".extension_id", HibernateLaunchConstants.ATTR_PREFIX + "hbm2ddl"); //$NON-NLS-1$ //$NON-NLS-2$ try { 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 2009-08-08 01:13:30 UTC (rev 17033) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java 2009-08-10 10:38:51 UTC (rev 17034) @@ -12,20 +12,10 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; -import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.jdt.internal.ui.wizards.dialogfields.IStringButtonAdapter; -import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringButtonDialogField; import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringDialogField; import org.eclipse.jpt.core.JpaProject; -import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.hibernate.eclipse.console.HibernateConsoleMessages; -import org.hibernate.eclipse.console.utils.DialogSelectionHelper; -import org.hibernate.eclipse.launch.PathHelper; import org.hibernate.util.StringHelper; /** @@ -34,8 +24,6 @@ */ public class GenerateDdlWizardPage extends GenerateInitWizardPage { - private StringButtonDialogField outputdir; - private StringDialogField filename; protected GenerateDdlWizardPage(JpaProject jpaProject) { @@ -47,50 +35,16 @@ */ @Override protected void createChildControls(Composite container) { - int numColumns = 3; - - IDialogFieldListener fieldlistener = new IDialogFieldListener() { - public void dialogFieldChanged(DialogField field) { - dialogChanged(); - } - }; - - outputdir = new StringButtonDialogField(new IStringButtonAdapter() { - public void changeControlPressed(DialogField field) { - IPath[] paths = DialogSelectionHelper.chooseFolderEntries(getShell(), PathHelper.pathOrNull(outputdir.getText()), HibernateConsoleMessages.CodeGenerationSettingsTab_select_output_dir, HibernateConsoleMessages.CodeGenerationSettingsTab_choose_dir_for_generated_files, false); - if(paths!=null && paths.length==1) { - outputdir.setText( ( (paths[0]).toOSString() ) ); - } - } - }); - outputdir.setText(getDefaultOutput()); - outputdir.setDialogFieldListener(fieldlistener); - outputdir.setLabelText(HibernateConsoleMessages.CodeGenerationSettingsTab_output_dir); - outputdir.setButtonLabel(HibernateConsoleMessages.CodeGenerationSettingsTab_browse); - - Control[] controls = outputdir.doFillIntoGrid(container, numColumns); - // Hack to tell the text field to stretch! - ( (GridData)controls[1].getLayoutData() ).grabExcessHorizontalSpace = true; - filename = new StringDialogField(); filename.setLabelText(Messages.GenerateDdlWizardPage_file_name); filename.setText("schema.ddl"); //$NON-NLS-1$ filename.setDialogFieldListener(fieldlistener); filename.doFillIntoGrid(container, numColumns); - - setPageComplete( false ); } protected void dialogChanged() { setErrorMessage(null); setMessage(null); - String msg = PathHelper.checkDirectory(getOutputDir(), HibernateConsoleMessages.CodeGenerationSettingsTab_output_directory, false); - - if (msg!=null) { - setErrorMessage( msg ); - setPageComplete( false ); - return; - } if (StringHelper.isEmpty(getFilename())) { setErrorMessage(Messages.GenerateDdlWizardPage_err_msg_input_file_name); @@ -111,9 +65,7 @@ return filename.getText(); } - public String getOutputDir(){ - return outputdir.getText(); - } + } 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 2009-08-08 01:13:30 UTC (rev 17033) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizardPage.java 2009-08-10 10:38:51 UTC (rev 17034) @@ -10,25 +10,18 @@ ******************************************************************************/ package org.jboss.tools.hibernate.jpt.ui.wizard; -import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.jdt.core.JavaConventions; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.internal.corext.util.JavaConventionsUtil; import org.eclipse.jdt.internal.corext.util.Messages; import org.eclipse.jdt.internal.ui.wizards.NewWizardMessages; -import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.jdt.internal.ui.wizards.dialogfields.IStringButtonAdapter; -import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringButtonDialogField; import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringDialogField; import org.eclipse.jpt.core.JpaProject; -import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; import org.hibernate.eclipse.console.HibernateConsoleMessages; -import org.hibernate.eclipse.console.utils.DialogSelectionHelper; import org.hibernate.eclipse.launch.PathHelper; +import org.hibernate.util.StringHelper; /** * @author Dmitry Geraskov @@ -36,8 +29,6 @@ */ public class GenerateEntitiesWizardPage extends GenerateInitWizardPage { - private StringButtonDialogField outputdir; - private StringDialogField packageName; /** @@ -52,37 +43,10 @@ */ @Override protected void createChildControls(Composite container) { - int numColumns = 3; - - IDialogFieldListener fieldlistener = new IDialogFieldListener() { - public void dialogFieldChanged(DialogField field) { - dialogChanged(); - } - }; - - outputdir = new StringButtonDialogField(new IStringButtonAdapter() { - public void changeControlPressed(DialogField field) { - IPath[] paths = DialogSelectionHelper.chooseFolderEntries(getShell(), PathHelper.pathOrNull(outputdir.getText()), HibernateConsoleMessages.CodeGenerationSettingsTab_select_output_dir, HibernateConsoleMessages.CodeGenerationSettingsTab_choose_dir_for_generated_files, false); - if(paths!=null && paths.length==1) { - outputdir.setText( ( (paths[0]).toOSString() ) ); - } - } - }); - outputdir.setText(getDefaultOutput()); - outputdir.setDialogFieldListener(fieldlistener); - outputdir.setLabelText(HibernateConsoleMessages.CodeGenerationSettingsTab_output_dir); - outputdir.setButtonLabel(HibernateConsoleMessages.CodeGenerationSettingsTab_browse); - - Control[] controls = outputdir.doFillIntoGrid(container, numColumns); - // Hack to tell the text field to stretch! - ( (GridData)controls[1].getLayoutData() ).grabExcessHorizontalSpace = true; - packageName = new StringDialogField(); packageName.setDialogFieldListener(fieldlistener); packageName.setLabelText(HibernateConsoleMessages.CodeGenerationSettingsTab_package); - packageName.doFillIntoGrid(container, numColumns); - - setPageComplete( false ); + packageName.doFillIntoGrid(container, numColumns); } @@ -125,9 +89,5 @@ public String getPackageName(){ return packageName.getText(); } - - public String getOutputDir(){ - return outputdir.getText(); - } } 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 2009-08-08 01:13:30 UTC (rev 17033) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2009-08-10 10:38:51 UTC (rev 17034) @@ -45,7 +45,9 @@ import org.hibernate.console.preferences.ConsoleConfigurationPreferences.ConfigurationMode; import org.hibernate.eclipse.console.EclipseConsoleConfigurationPreferences; import org.hibernate.eclipse.console.HibernateConsoleMessages; +import org.hibernate.eclipse.console.utils.DialogSelectionHelper; import org.hibernate.eclipse.console.utils.DriverClassHelpers; +import org.hibernate.eclipse.launch.PathHelper; import org.hibernate.tool.hbm2x.StringUtils; import org.hibernate.util.StringHelper; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; @@ -61,6 +63,8 @@ private DriverClassHelpers helper = new DriverClassHelpers(); + private StringButtonDialogField outputdir; + private ComboDialogField connectionProfileName; private StringButtonDialogField schemaName; @@ -75,7 +79,9 @@ private JpaProject jpaProject; - private IDialogFieldListener fieldlistener = new IDialogFieldListener() { + protected int numColumns = 3; + + protected IDialogFieldListener fieldlistener = new IDialogFieldListener() { public void dialogFieldChanged(DialogField field) { dialogChanged(); } @@ -92,19 +98,35 @@ */ public void createControl(Composite parent) { Composite container = new Composite(parent, SWT.NULL); - GridLayout layout = new GridLayout(); - int numColumns = 3; + GridLayout layout = new GridLayout(); container.setLayout(layout); layout.numColumns = numColumns; layout.verticalSpacing = 10; + outputdir = new StringButtonDialogField(new IStringButtonAdapter() { + public void changeControlPressed(DialogField field) { + IPath[] paths = DialogSelectionHelper.chooseFolderEntries(getShell(), PathHelper.pathOrNull(outputdir.getText()), HibernateConsoleMessages.CodeGenerationSettingsTab_select_output_dir, HibernateConsoleMessages.CodeGenerationSettingsTab_choose_dir_for_generated_files, false); + if(paths!=null && paths.length==1) { + outputdir.setText( ( (paths[0]).toOSString() ) ); + } + } + }); + outputdir.setText(getDefaultOutput()); + outputdir.setDialogFieldListener(fieldlistener); + outputdir.setLabelText(HibernateConsoleMessages.CodeGenerationSettingsTab_output_dir); + outputdir.setButtonLabel(HibernateConsoleMessages.CodeGenerationSettingsTab_browse); + + Control[] controls = outputdir.doFillIntoGrid(container, numColumns); + // Hack to tell the text field to stretch! + ( (GridData)controls[1].getLayoutData() ).grabExcessHorizontalSpace = true; + setPageComplete(!StringHelper.isEmpty(getOutputDir())); + createChildControls(container); selectMethod = new Button(container, SWT.CHECK); selectMethod.setText(Messages.GenerateInitWizardPage_use_console_configuration); selectMethod.setSelection(true); - //selectMethod.setEnabled(false); selectMethod.addSelectionListener(new SelectionListener(){ public void widgetDefaultSelected(SelectionEvent e) { @@ -138,6 +160,10 @@ createDBGroup(container, numColumns); setControl(container); + + if (StringHelper.isEmpty(consoleConfigurationName.getText())) { + setPageComplete(false); + } } /** @@ -199,8 +225,16 @@ } - protected void dialogChanged() { + protected void dialogChanged() { + String msg = PathHelper.checkDirectory(getOutputDir(), HibernateConsoleMessages.CodeGenerationSettingsTab_output_directory, false); + + if (msg!=null) { + setErrorMessage( msg ); + setPageComplete( false ); + return; + } + if (selectMethod.getSelection() && (StringHelper.isEmpty(getConfigurationName()))){ setPageComplete(false); setErrorMessage(Messages.GenerateInitWizardPage_err_msg_select_console_configuration); @@ -215,6 +249,10 @@ setPageComplete(true); } + public String getOutputDir(){ + return outputdir.getText(); + } + private String[] dtpConnectionProfileNames() { List<String> list = new ArrayList<String>();