Author: dgeraskov Date: 2010-07-02 09:25:48 -0400 (Fri, 02 Jul 2010) New Revision: 23179 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java Log: https://jira.jboss.org/browse/JBIDE-6571 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java 2010-07-02 13:09:07 UTC (rev 23178) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java 2010-07-02 13:25:48 UTC (rev 23179) @@ -67,6 +67,8 @@ @SuppressWarnings("restriction") public class CodeGenerationSettingsTab extends AbstractLaunchConfigurationTab { + + public static final String NULL_CONFIG = "<None>"; //$NON-NLS-1$ private ComboDialogField consoleConfigurationName; @@ -114,10 +116,11 @@ consoleConfigurationName = new ComboDialogField(SWT.READ_ONLY); consoleConfigurationName.setLabelText(HibernateConsoleMessages.CodeGenerationSettingsTab_console_configuration); ConsoleConfiguration[] cfg = LaunchHelper.findFilteredSortedConsoleConfigs(); - String[] names = new String[cfg.length]; + String[] names = new String[cfg.length + 1]; + names[0] = NULL_CONFIG; for (int i = 0; i < cfg.length; i++) { ConsoleConfiguration configuration = cfg[i]; - names[i] = configuration.getName(); + names[i + 1] = configuration.getName(); } consoleConfigurationName.setItems(names); @@ -373,7 +376,8 @@ } public String getConfigurationName() { - return consoleConfigurationName.getText(); + String text = consoleConfigurationName.getText(); + return NULL_CONFIG.equals(text) ? "" : text; } @@ -422,7 +426,11 @@ public void initializeFrom(ILaunchConfiguration configuration) { try { ExporterAttributes attributes = new ExporterAttributes(configuration); - consoleConfigurationName.setText(attributes.getConsoleConfigurationName()); + if ( consoleConfigurationName.getText() != attributes.getConsoleConfigurationName()){ + consoleConfigurationName.selectItem(0);//NULL_CONFIG + consoleConfigurationName.setText(attributes.getConsoleConfigurationName()); + } + preferRawCompositeIds.setSelection(attributes.isPreferBasicCompositeIds()); autoManyToMany.setSelection( attributes.detectManyToMany() ); autoVersioning.setSelection( attributes.detectOptimisticLock() );