Author: dgeraskov Date: 2009-11-04 07:04:51 -0500 (Wed, 04 Nov 2009) New Revision: 18403 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingElementsSelectionPage2.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java Log: https://jira.jboss.org/jira/browse/JBIDE-5095 Removed "Create Empty" button. Messages moved to right plugin. Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2009-11-04 03:11:34 UTC (rev 18402) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2009-11-04 12:04:51 UTC (rev 18403) @@ -200,19 +200,6 @@ public static String NewConfigurationWizardPage_user_name; public static String NewHibernateMappingElementsSelectionPage_select; - public static String NewHibernateMappingFilePage_class_name_column; - public static String NewHibernateMappingFilePage_file_name_column; - public static String NewHibernateMappingFilePage_hibernate_xml_mapping_file; - - public static String NewHibernateMappingFilePage_project_name_column; - - public static String NewHibernateMappingFilePage_this_wizard_creates; - public static String NewHibernateMappingFileWizard_create_hibernate_xml_mapping_file; - public static String NewHibernateMappingFileWizard_create_new_xml_mapping_file; - - public static String NewHibernateMappingFileWizard_finding_dependent_cu; - - public static String NewHibernateMappingFileWizard_selection_cant_be_empty; public static String NewReverseEngineeringFileWizard_create_hibernate_reverse_engineering_file; public static String NewReverseEngineeringFileWizard_create_new_hibernate_reveng_xml; public static String NewReverseEngineeringFileWizard_creating; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2009-11-04 03:11:34 UTC (rev 18402) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2009-11-04 12:04:51 UTC (rev 18403) @@ -194,16 +194,7 @@ NewConfigurationWizardPage_session_factory_name=&Session factory name: NewConfigurationWizardPage_this_wizard_creates=This wizard creates a new configuration file to use with Hibernate. NewConfigurationWizardPage_user_name=User&name: -NewHibernateMappingElementsSelectionPage_select=Select compilation units or containers. -NewHibernateMappingFilePage_class_name_column=Class name -NewHibernateMappingFilePage_file_name_column=File name -NewHibernateMappingFilePage_hibernate_xml_mapping_file=Hibernate XML Mapping file -NewHibernateMappingFilePage_project_name_column=Project name -NewHibernateMappingFilePage_this_wizard_creates=This wizard creates a new Hibernate XML Mapping file skeletons -NewHibernateMappingFileWizard_create_hibernate_xml_mapping_file=Create Hibernate XML Mapping file (hbm.xml) -NewHibernateMappingFileWizard_create_new_xml_mapping_file=Create new XML Mapping files. -NewHibernateMappingFileWizard_finding_dependent_cu=Search for dependent compilation units... -NewHibernateMappingFileWizard_selection_cant_be_empty=Selection can't be empty + NewReverseEngineeringFileWizard_create_hibernate_reverse_engineering_file=Create Hibernate Reverse Engineering file (reveng.xml) NewReverseEngineeringFileWizard_create_new_hibernate_reveng_xml=Create a new hibernate.reveng.xml. NewReverseEngineeringFileWizard_creating=Creating Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java 2009-11-04 03:11:34 UTC (rev 18402) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java 2009-11-04 12:04:51 UTC (rev 18403) @@ -41,9 +41,19 @@ public static String AddRemoveTableComposite_java_packages_title; public static String AddRemoveTableComposite_java_select_types; public static String AddRemoveTableComposite_java_select_packages; + public static String NewHibernateMappingElementsSelectionPage2_description; - public static String NewHibernateMappingElementsSelectionPage2_createEmpty; + public static String NewHibernateMappingFilePage_class_name_column; + public static String NewHibernateMappingFilePage_file_name_column; + public static String NewHibernateMappingFilePage_hibernate_xml_mapping_file; + public static String NewHibernateMappingFilePage_project_name_column; + public static String NewHibernateMappingFilePage_this_wizard_creates; + public static String NewHibernateMappingFileWizard_create_hibernate_xml_mapping_file; + public static String NewHibernateMappingFileWizard_create_empty_xml_mapping_file; + public static String NewHibernateMappingFileWizard_look_for_dependent_cu; + public static String NewHibernateMappingFileWizard_selection_cant_be_empty; + static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, JdtUiMessages.class); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties 2009-11-04 03:11:34 UTC (rev 18402) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties 2009-11-04 12:04:51 UTC (rev 18403) @@ -45,5 +45,15 @@ AddRemoveTableComposite_java_packages_title=Packages AddRemoveTableComposite_java_select_types=Select types to be mapped AddRemoveTableComposite_java_select_packages=Select packages to search for java types -NewHibernateMappingElementsSelectionPage2_description=Add classes and packages to create mapping files for -NewHibernateMappingElementsSelectionPage2_createEmpty=Create empty file (hbm.xml) \ No newline at end of file + +NewHibernateMappingElementsSelectionPage_select=Select compilation units or containers +NewHibernateMappingElementsSelectionPage2_description=Add classes and packages or wizard will create an empty mapping file +NewHibernateMappingFilePage_class_name_column=Class name +NewHibernateMappingFilePage_file_name_column=File name +NewHibernateMappingFilePage_hibernate_xml_mapping_file=Hibernate XML Mapping file +NewHibernateMappingFilePage_project_name_column=Project name +NewHibernateMappingFilePage_this_wizard_creates=This wizard creates new Hibernate XML Mapping file skeletons +NewHibernateMappingFileWizard_create_hibernate_xml_mapping_file=New Hibernate XML Mapping file (hbm.xml) +NewHibernateMappingFileWizard_create_empty_xml_mapping_file=Create a new empty XML Mapping files +NewHibernateMappingFileWizard_look_for_dependent_cu=Search for dependent compilation units... +NewHibernateMappingFileWizard_selection_cant_be_empty=Selection can't be empty Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingElementsSelectionPage2.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingElementsSelectionPage2.java 2009-11-04 03:11:34 UTC (rev 18402) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingElementsSelectionPage2.java 2009-11-04 12:04:51 UTC (rev 18403) @@ -15,7 +15,6 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.TableItem; import org.hibernate.eclipse.jdt.ui.internal.JdtUiMessages; @@ -28,8 +27,6 @@ AddRemoveTableComposite addRemoveTableComposite; - Button createEmpty; - private IStructuredSelection selection; public NewHibernateMappingElementsSelectionPage2(String pageName, IStructuredSelection selection) { @@ -39,16 +36,8 @@ } public void createControl(Composite parent) { - /*Composite container = new Composite(parent, SWT.NULL); - GridLayout layout = new GridLayout(); - - container.setLayout(layout); - layout.verticalSpacing = 10;*/ - addRemoveTableComposite = new AddRemoveTableComposite(parent, SWT.NONE); addRemoveTableComposite.getTableViewer().setInput(selection.toArray()); - createEmpty = new Button(addRemoveTableComposite, SWT.CHECK); - createEmpty.setText(JdtUiMessages.NewHibernateMappingElementsSelectionPage2_createEmpty); setControl(addRemoveTableComposite); } @@ -60,9 +49,5 @@ } return new StructuredSelection(data); } - - public boolean createEmpty(){ - return createEmpty.getSelection(); - } } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java 2009-11-04 03:11:34 UTC (rev 18402) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java 2009-11-04 12:04:51 UTC (rev 18403) @@ -38,8 +38,8 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; import org.hibernate.console.ImageConstants; -import org.hibernate.eclipse.console.HibernateConsoleMessages; import org.hibernate.eclipse.console.utils.EclipseImages; +import org.hibernate.eclipse.jdt.ui.internal.JdtUiMessages; import org.hibernate.eclipse.jdt.ui.internal.jpa.common.EntityInfo; /** @@ -55,8 +55,8 @@ */ protected NewHibernateMappingFilePage() { super(""); //$NON-NLS-1$ - setTitle(HibernateConsoleMessages.NewHibernateMappingFilePage_hibernate_xml_mapping_file); - setMessage(HibernateConsoleMessages.NewHibernateMappingFilePage_this_wizard_creates, WARNING); + setTitle(JdtUiMessages.NewHibernateMappingFilePage_hibernate_xml_mapping_file); + setMessage(JdtUiMessages.NewHibernateMappingFilePage_this_wizard_creates, WARNING); } public void createControl(Composite parent) { @@ -99,16 +99,16 @@ //if (project_infos.keySet().size() > 1){ column = new TableColumn(table, SWT.LEFT, coulmnIndex++); - column.setText(HibernateConsoleMessages.NewHibernateMappingFilePage_project_name_column); + column.setText(JdtUiMessages.NewHibernateMappingFilePage_project_name_column); column.setWidth(120); //} column = new TableColumn(table, SWT.LEFT, coulmnIndex++); - column.setText(HibernateConsoleMessages.NewHibernateMappingFilePage_class_name_column); + column.setText(JdtUiMessages.NewHibernateMappingFilePage_class_name_column); column.setWidth(150); column = new TableColumn(table, SWT.LEFT, coulmnIndex++); - column.setText(HibernateConsoleMessages.NewHibernateMappingFilePage_file_name_column); + column.setText(JdtUiMessages.NewHibernateMappingFilePage_file_name_column); column.setWidth(150); } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2009-11-04 03:11:34 UTC (rev 18402) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2009-11-04 12:04:51 UTC (rev 18403) @@ -63,6 +63,7 @@ import org.hibernate.eclipse.console.HibernateConsoleMessages; import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.eclipse.console.utils.EclipseImages; +import org.hibernate.eclipse.jdt.ui.internal.JdtUiMessages; import org.hibernate.eclipse.jdt.ui.internal.jpa.collect.AllEntitiesInfoCollector; import org.hibernate.eclipse.jdt.ui.internal.jpa.common.EntityInfo; import org.hibernate.tool.hbm2x.HibernateMappingExporter; @@ -96,7 +97,7 @@ public NewHibernateMappingFileWizard(){ setDefaultPageImageDescriptor(EclipseImages.getImageDescriptor(ImageConstants.NEW_WIZARD) ); setNeedsProgressMonitor(true); - setWindowTitle(HibernateConsoleMessages.NewHibernateMappingFileWizard_create_hibernate_xml_mapping_file); + setWindowTitle(JdtUiMessages.NewHibernateMappingFileWizard_create_hibernate_xml_mapping_file); } @Override @@ -107,7 +108,7 @@ selection = new StructuredSelection(); } - page0 = new NewHibernateMappingElementsSelectionPage2(HibernateConsoleMessages.NewHibernateMappingFileWizard_create_hibernate_xml_mapping_file, selection); + page0 = new NewHibernateMappingElementsSelectionPage2(JdtUiMessages.NewHibernateMappingFileWizard_create_hibernate_xml_mapping_file, selection); addPage(page0); //page1 = new NewHibernateMappingElementsSelectionPage(selection); @@ -116,8 +117,8 @@ //addPage(page1); cPage = new WizardNewFileCreationPage( "Ccfgxml", selection ); //$NON-NLS-1$ - cPage.setTitle( HibernateConsoleMessages.NewHibernateMappingFileWizard_create_hibernate_xml_mapping_file ); - cPage.setDescription( HibernateConsoleMessages.NewHibernateMappingFileWizard_create_hibernate_xml_mapping_file ); + cPage.setTitle( JdtUiMessages.NewHibernateMappingFileWizard_create_hibernate_xml_mapping_file ); + cPage.setDescription( JdtUiMessages.NewHibernateMappingFileWizard_create_empty_xml_mapping_file ); cPage.setFileName("hibernate.hbm.xml"); //$NON-NLS-1$ addPage( cPage ); @@ -127,7 +128,7 @@ @Override public IWizardPage getNextPage(IWizardPage page) { - if (page == page0 && !page0.createEmpty()) return page2; + if (page == page0 && !page0.getSelection().isEmpty()) return page2; if (page == cPage) return null; return super.getNextPage(page); } @@ -206,7 +207,7 @@ @Override public boolean performFinish() { - if (page0.createEmpty()){ + if (page0.getSelection().isEmpty()){ final IFile file = cPage.createNewFile(); IRunnableWithProgress op = new IRunnableWithProgress() { public void run(IProgressMonitor monitor) throws InvocationTargetException { @@ -396,7 +397,7 @@ } protected void updateCompilationUnits(){ - Assert.isNotNull(page0.getSelection(), HibernateConsoleMessages.NewHibernateMappingFileWizard_selection_cant_be_empty); + Assert.isNotNull(page0.getSelection(), JdtUiMessages.NewHibernateMappingFileWizard_selection_cant_be_empty); if ((selectionCU == null) || !page0.getSelection().equals(selection)) { selectionCU = new HashSet<ICompilationUnit>(); project_infos.clear(); @@ -407,7 +408,7 @@ public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - monitor.beginTask(HibernateConsoleMessages.NewHibernateMappingFileWizard_finding_dependent_cu, selection.size() + 1); + monitor.beginTask(JdtUiMessages.NewHibernateMappingFileWizard_look_for_dependent_cu, selection.size() + 1); Iterator<?> it = selection.iterator(); int done = 1; while (it.hasNext()) {