[jbosstools-commits] JBoss Tools SVN: r8615 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper: editors and 4 other directories.

Author: vyemialyanchyk Date: 2008-06-06 12:51:42 -0400 (Fri, 06 Jun 2008) New Revision: 8615 Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/MapperMessages.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/MapperMessages.properties Removed: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/Messages.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/messages.properties trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/Messages.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/messages.properties trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/Messages.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/messages.properties trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/Messages.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/messages.properties trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/Messages.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/messages.properties Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ChooseConsoleConfigurationDialog.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/HibernateCfgXmlEditor.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ColumnDetailsPage.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ConsoleConfigNamePart.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/CounterFormPart.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/GeneratorDetailsPage.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/HibernateConfigurationForm.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ParamDetailsPage.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/PrimaryKeyDetailsPage.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngFormEditorPart.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngOverviewPage.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngTableFilterPage.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngTablesPage.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngTypeMappingPage.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TableDetailsPage.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TableFilterFormPart.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesLabelProvider.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TypeMappingFormPart.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TypeMappingView.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/GeneratorTypeHandler.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HibernateTypeHandler.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/PropertyAccessHandler.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/DOMReverseEngineeringDefinition.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/RevEngPrimaryKeyAdapter.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/HibernateXMLContentOutlineConfiguration.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/JFaceNodeAdapterForXML.java Log: http://opensource.atlassian.com/projects/hibernate/browse/HBX-500 Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/MapperMessages.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/MapperMessages.java (rev 0) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/MapperMessages.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -0,0 +1,109 @@ +package org.hibernate.eclipse.mapper; + +import org.eclipse.osgi.util.NLS; + +public class MapperMessages extends NLS { + private static final String BUNDLE_NAME = "org.hibernate.eclipse.mapper.MapperMessages"; //$NON-NLS-1$ + public static String ChooseConsoleConfigurationDialog_console_configuration; + public static String ChooseConsoleConfigurationDialog_select_console_configuration; + public static String HibernateCfgXmlEditor_configuration; + public static String HibernateCfgXmlEditor_could_not_create_form_part; + public static String ReverseEngineeringEditor_could_not_create_graphical_viewer; + public static String ReverseEngineeringEditor_error_while_refreshing_databasetree; + public static String ReverseEngineeringEditor_no_filters_defined; + public static String ReverseEngineeringEditor_no_filters_has_been_defined; + public static String ReverseEngineeringEditor_overview; + public static String ReverseEngineeringEditor_table_column; + public static String ReverseEngineeringEditor_table_filters; + public static String ReverseEngineeringEditor_type_mappings; + public static String ColumnDetailsPage_column_details; + public static String ColumnDetailsPage_exclude_columns_from_reverse_engineering; + public static String ColumnDetailsPage_hibernate_type; + public static String ColumnDetailsPage_jdbc_type; + public static String ColumnDetailsPage_name; + public static String ColumnDetailsPage_property_name; + public static String ColumnDetailsPage_set_properties_of_selected_column; + public static String ColumnDetailsPage_the_hibernate_type; + public static String ColumnDetailsPage_the_name_of_the_column; + public static String ColumnDetailsPage_the_property_name_which_must_be_used_for; + public static String ColumnDetailsPage_which_jdbc_type_this_column_should_have; + public static String ConsoleConfigNamePart_console_configuration; + public static String ConsoleConfigNamePart_problem_when_trying_to_hibernate_project_info; + public static String ConsoleConfigNamePart_select_console_configuration; + public static String CounterFormPart_debug_counter; + public static String CounterFormPart_debug_counter_for_property_changes; + public static String CounterFormPart_zero; + public static String GeneratorDetailsPage_class; + public static String GeneratorDetailsPage_id_generator_details; + public static String GeneratorDetailsPage_set_the_properties_of_the_selected_generator; + public static String HibernateConfigurationForm_hibernate_configuration; + public static String ParamDetailsPage_generator_parameter_details; + public static String ParamDetailsPage_name; + public static String ParamDetailsPage_set_the_properties_of_the_selected_parameter; + public static String ParamDetailsPage_value; + public static String PrimaryKeyDetailsPage_add_column; + public static String PrimaryKeyDetailsPage_add_generator; + public static String PrimaryKeyDetailsPage_primary_key_can_define_generator_strategy_and_alternative_columns; + public static String PrimaryKeyDetailsPage_primary_key_details; + public static String RevEngFormEditorPart_need_to_override_formcontent_in; + public static String RevEngOverviewPage_contents; + public static String RevEngOverviewPage_overview; + public static String RevEngOverviewPage_the_content; + public static String RevEngTableFilterPage_table_filters; + public static String RevEngTablesPage_tables_and_columns; + public static String RevEngTypeMappingPage_type_mappings; + public static String TableDetailsPage_add_primary_key; + public static String TableDetailsPage_catalog; + public static String TableDetailsPage_class_name; + public static String TableDetailsPage_name; + public static String TableDetailsPage_schema; + public static String TableDetailsPage_set_properties_of_selected_table; + public static String TableDetailsPage_table_details; + public static String TableFilterFormPart_table_filters; + public static String TableFilterFormPart_table_filters_defines_which_table_included; + public static String TablePropertiesBlock_add; + public static String TablePropertiesBlock_add_tables_columns; + public static String TablePropertiesBlock_delete; + public static String TablePropertiesBlock_deselect_all; + public static String TablePropertiesBlock_explicitly_control_settings_for_table_columns; + public static String TablePropertiesBlock_horizontal_orientation; + public static String TablePropertiesBlock_select_all_children; + public static String TablePropertiesBlock_select_tables_columns; + public static String TablePropertiesBlock_tables_columns; + public static String TablePropertiesBlock_vertical_orientation; + public static String TablePropertiesLabelProvider_primary_key; + public static String TypeMappingFormPart_type_mappings; + public static String TypeMappingFormPart_type_mappings_allows_you_define_which_hibernate_type; + public static String TypeMappingView_add; + public static String TypeMappingView_database_schema; + public static String TypeMappingView_do_you_want_to_remove_all_mappings; + public static String TypeMappingView_hibernate_type; + public static String TypeMappingView_jdbc_type; + public static String TypeMappingView_length; + public static String TypeMappingView_not_known_button; + public static String TypeMappingView_not_null; + public static String TypeMappingView_precision; + public static String TypeMappingView_remove_all_mappings; + public static String TypeMappingView_scale; + public static String TypeMappingView_type_mappings; + public static String GeneratorTypeHandler_generator_type; + public static String GeneratorTypeHandler_return_class; + public static String HBMInfoExtractor_access_fields_directly; + public static String HBMInfoExtractor_do_not_perform_any_access; + public static String HBMInfoExtractor_use_javabean_accessor_methods; + public static String HibernateTypeHandler_hibernate_type; + public static String HibernateTypeHandler_return_class; + public static String HibernateTypeHandler_return_primitive; + public static String PropertyAccessHandler_access_method; + public static String PropertyAccessHandler_description; + public static String DOMReverseEngineeringDefinition_unknown_change; + public static String RevEngPrimaryKeyAdapter_column; + public static String xml_hibernate_tools; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, MapperMessages.class); + } + + private MapperMessages() { + } +} Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/MapperMessages.properties =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/MapperMessages.properties (rev 0) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/MapperMessages.properties 2008-06-06 16:51:42 UTC (rev 8615) @@ -0,0 +1,95 @@ +ChooseConsoleConfigurationDialog_console_configuration=Console configuration: +ChooseConsoleConfigurationDialog_select_console_configuration=Select a console configuration +HibernateCfgXmlEditor_configuration=Configuration +HibernateCfgXmlEditor_could_not_create_form_part=Could not create form part for hibernate.cfg.xml editor +ReverseEngineeringEditor_could_not_create_graphical_viewer=Could not create graphical viewer +ReverseEngineeringEditor_error_while_refreshing_databasetree=Error while refreshing database tree +ReverseEngineeringEditor_no_filters_defined=No filters defined +ReverseEngineeringEditor_no_filters_has_been_defined=No filters has been defined.\n This can make the reading of the database schema very slow.\n Do you wish to continue reading the database schema ? +ReverseEngineeringEditor_overview=Overview +ReverseEngineeringEditor_table_column=Table && Columns +ReverseEngineeringEditor_table_filters=Table Filters +ReverseEngineeringEditor_type_mappings=Type Mappings +ColumnDetailsPage_column_details=Column Details +ColumnDetailsPage_exclude_columns_from_reverse_engineering=Exclude column from reverse engineering +ColumnDetailsPage_hibernate_type=Hibernate Type: +ColumnDetailsPage_jdbc_type=JDBC Type: +ColumnDetailsPage_name=Name: +ColumnDetailsPage_property_name=Property name: +ColumnDetailsPage_set_properties_of_selected_column=Set the properties of the selected column. +ColumnDetailsPage_the_hibernate_type=The hibernate type which should be used for this column when used as a property +ColumnDetailsPage_the_name_of_the_column=The name of the column +ColumnDetailsPage_the_property_name_which_must_be_used_for=The property name which must be used for this column when used as a property +ColumnDetailsPage_which_jdbc_type_this_column_should_have=Which JDBC Type this column should have (overriding the type read from the database) +ConsoleConfigNamePart_console_configuration=Console Configuration +ConsoleConfigNamePart_problem_when_trying_to_hibernate_project_info=Problem when trying to Hibernate Project information +ConsoleConfigNamePart_select_console_configuration=Select Console configuration to be used for editing the reverse engineering settings +CounterFormPart_debug_counter=Debug counter +CounterFormPart_debug_counter_for_property_changes=debug counter for property changes +CounterFormPart_zero=Zero +GeneratorDetailsPage_class=Class: +GeneratorDetailsPage_id_generator_details=Id Generator details +GeneratorDetailsPage_set_the_properties_of_the_selected_generator=Set the properties of the selected generator. +HibernateConfigurationForm_hibernate_configuration=Hibernate Configuration +ParamDetailsPage_generator_parameter_details=Generator parameter details +ParamDetailsPage_name=Name: +ParamDetailsPage_set_the_properties_of_the_selected_parameter=Set the properties of the selected parameter. +ParamDetailsPage_value=Value: +PrimaryKeyDetailsPage_add_column=Add column +PrimaryKeyDetailsPage_add_generator=Add generator +PrimaryKeyDetailsPage_primary_key_can_define_generator_strategy_and_alternative_columns=A primary key can define a generator strategy and alternative columns +PrimaryKeyDetailsPage_primary_key_details=Primary key details +RevEngFormEditorPart_need_to_override_formcontent_in=Need to override formcontent in +RevEngOverviewPage_contents=Contents +RevEngOverviewPage_overview=Overview +RevEngOverviewPage_the_content=<form><p>The content of the reveng.xml is made up of three sections:</p><li style="image" value="page" bindent="5"><a href="typemappings">Type Mappings</a>: lists the mappings from a JDBC/SQL type to Hibernate type.</li><li style="image" value="page" bindent="5"><a href="tablefilter">Table filters</a>: lists which tables that should be included or excluded during reverse engineering.</li><li style="image" value="page" bindent="5"><a href="tables">Tables &amp; Columns</a>: explicitly set properties for tables and columns.</li></form> +RevEngTableFilterPage_table_filters=Table filters +RevEngTablesPage_tables_and_columns=Tables & Columns +RevEngTypeMappingPage_type_mappings=Type Mappings +TableDetailsPage_add_primary_key=Add primary key +TableDetailsPage_catalog=Catalog: +TableDetailsPage_class_name=Class name: +TableDetailsPage_name=Name: +TableDetailsPage_schema=Schema: +TableDetailsPage_set_properties_of_selected_table=Set the properties of the selected table. +TableDetailsPage_table_details=Table details +TableFilterFormPart_table_filters=Table filters +TableFilterFormPart_table_filters_defines_which_table_included=Table filters defines which tables/views are included when performing reverse engineering. +TablePropertiesBlock_add=Add... +TablePropertiesBlock_add_tables_columns=Add Tables & Columns +TablePropertiesBlock_delete=Delete +TablePropertiesBlock_deselect_all=Deselect all +TablePropertiesBlock_explicitly_control_settings_for_table_columns=Explicitly control settings for table & columns for which the defaults is not applicable. Click Add, select the relevant tables & columns and adjust their settings here. +TablePropertiesBlock_horizontal_orientation=Horizontal orientation +TablePropertiesBlock_select_all_children=Select all children +TablePropertiesBlock_select_tables_columns=Select tables and columns +TablePropertiesBlock_tables_columns=Tables & Columns +TablePropertiesBlock_vertical_orientation=Vertical orientation +TablePropertiesLabelProvider_primary_key=Primary key +TypeMappingFormPart_type_mappings=Type mappings +TypeMappingFormPart_type_mappings_allows_you_define_which_hibernate_type=Type mappings allows you to define which Hibernate type to use for specific JDBC types. +TypeMappingView_add=Add... +TypeMappingView_database_schema=Database schema: +TypeMappingView_do_you_want_to_remove_all_mappings=Do you want to remove all mappings? +TypeMappingView_hibernate_type=Hibernate Type +TypeMappingView_jdbc_type=JDBC Type +TypeMappingView_length=Length +TypeMappingView_not_known_button=\ not a known button +TypeMappingView_not_null=Not-Null +TypeMappingView_precision=Precision +TypeMappingView_remove_all_mappings=Remove all mappings +TypeMappingView_scale=Scale +TypeMappingView_type_mappings=Type mappings: +GeneratorTypeHandler_generator_type=<b>Generator type</b>: +GeneratorTypeHandler_return_class=<br><b>Return class</b>: +HBMInfoExtractor_access_fields_directly=Access fields directly +HBMInfoExtractor_do_not_perform_any_access=Do not perform any access. Use with HQL-only properties +HBMInfoExtractor_use_javabean_accessor_methods=Use JavaBean accessor methods +HibernateTypeHandler_hibernate_type=<b>Hibernate type</b>: +HibernateTypeHandler_return_class=<br><b>Return class</b>: +HibernateTypeHandler_return_primitive=<br><b>Return primitive</b>: +PropertyAccessHandler_access_method=<b>Access method</b>: +PropertyAccessHandler_description=<br><b>Description</b>: +DOMReverseEngineeringDefinition_unknown_change=Unknown change: {0} {1} +RevEngPrimaryKeyAdapter_column=column_ +xml_hibernate_tools=xml (Hibernate Tools) Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ChooseConsoleConfigurationDialog.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ChooseConsoleConfigurationDialog.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ChooseConsoleConfigurationDialog.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -17,19 +17,20 @@ import org.eclipse.swt.widgets.Shell; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; +import org.hibernate.eclipse.mapper.MapperMessages; public class ChooseConsoleConfigurationDialog extends TitleAreaDialog { - + private Combo text; String initialDefault; String selectedConfigurationName; - + public ChooseConsoleConfigurationDialog(Shell shell, String initialDefault) { super(shell); this.initialDefault = initialDefault; } - + public void prompt() { open(); @@ -42,7 +43,7 @@ protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); - setTitle(Messages.CHOOSCONSOLECONFIGURATIONDIALOG_SELECT_CONSOLE_CONFIGURATION); + setTitle(MapperMessages.ChooseConsoleConfigurationDialog_select_console_configuration); //setMessage(""); if (getTitleImageLabel() != null) { @@ -56,7 +57,7 @@ protected void configureShell(Shell shell) { super.configureShell(shell); - shell.setText(Messages.CHOOSCONSOLECONFIGURATIONDIALOG_SELECT_CONSOLE_CONFIGURATION); + shell.setText(MapperMessages.ChooseConsoleConfigurationDialog_select_console_configuration); } protected void okPressed() { @@ -82,10 +83,10 @@ panel.setFont(parent.getFont()); Label label = new Label(panel, SWT.NONE); - label.setText(Messages.CHOOSCONSOLECONFIGURATIONDIALOG_CONSOLE_CONFIGURATION); + label.setText(MapperMessages.ChooseConsoleConfigurationDialog_console_configuration); text = new Combo(panel, SWT.BORDER | SWT.LEAD | SWT.DROP_DOWN | SWT.READ_ONLY); - + text.setFocus(); text.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL)); @@ -98,13 +99,13 @@ } }); setInitialTextValues(text); - + } private void setInitialTextValues(Combo text) { ConsoleConfiguration[] recentWorkspaces = KnownConfigurations.getInstance().getConfigurationsSortedByName(); for (int i = 0; i < recentWorkspaces.length; ++i) { - text.add(recentWorkspaces[i].getName()); + text.add(recentWorkspaces[i].getName()); } text.setText(text.getItemCount() > 0 ? text.getItem(0) : initialDefault); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/HibernateCfgXmlEditor.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/HibernateCfgXmlEditor.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/HibernateCfgXmlEditor.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -25,6 +25,7 @@ import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; import org.eclipse.wst.sse.ui.StructuredTextEditor; import org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart; +import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.eclipse.mapper.MapperPlugin; import org.hibernate.eclipse.mapper.editors.reveng.HibernateConfigurationForm; @@ -33,7 +34,7 @@ private HibernateConfigurationForm configurationForm; private int configurationPageNo; private StructuredTextEditor sourcePage; - + public HibernateCfgXmlEditor() { super(); } @@ -45,7 +46,7 @@ initSourcePage(); } catch (PartInitException pe) { MapperPlugin.getDefault().getLogger().logException( - Messages.HIBERNATECFGXMLEDITOR_COULD_NOT_CREATE_FORM_PART, pe ); + MapperMessages.HibernateCfgXmlEditor_could_not_create_form_part, pe ); } } @@ -53,10 +54,10 @@ int pageCount = getPageCount(); for (int i = 0; i < pageCount; i++) { if ( getEditor( i ) instanceof StructuredTextEditor ) { - sourcePage = (StructuredTextEditor) getEditor( i ); + sourcePage = (StructuredTextEditor) getEditor( i ); } } - + configurationForm.setModel(getStructuredModel()); } @@ -64,13 +65,13 @@ configurationForm = new HibernateConfigurationForm(); configurationForm.createPartControl(getContainer()); configurationPageNo = addPage(configurationForm.getControl()); - setPageText(configurationPageNo, Messages.HIBERNATECFGXMLEDITOR_CONFIGURATION); + setPageText(configurationPageNo, MapperMessages.HibernateCfgXmlEditor_configuration); setActivePage( 0 ); } - + IStructuredModel getStructuredModel() { //TODO:how to get it without usage of deprecated methods ? return sourcePage.getModel(); } - + } Deleted: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/Messages.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/Messages.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -1,26 +0,0 @@ -package org.hibernate.eclipse.mapper.editors; - -import org.eclipse.osgi.util.NLS; - -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.hibernate.eclipse.mapper.editors.messages"; //$NON-NLS-1$ - public static String CHOOSCONSOLECONFIGURATIONDIALOG_CONSOLE_CONFIGURATION; - public static String CHOOSCONSOLECONFIGURATIONDIALOG_SELECT_CONSOLE_CONFIGURATION; - public static String HIBERNATECFGXMLEDITOR_CONFIGURATION; - public static String HIBERNATECFGXMLEDITOR_COULD_NOT_CREATE_FORM_PART; - public static String REVERSEENGINEERINGEDITOR_COULD_NOT_CREATE_GRAPHICAL_VIEWER; - public static String REVERSEENGINEERINGEDITOR_ERROR_WHILE_REFRESHING_DATABASETREE; - public static String REVERSEENGINEERINGEDITOR_NO_FILTERS_DEFINED; - public static String REVERSEENGINEERINGEDITOR_NO_FILTERS_HAS_BEEN_DEFINED; - public static String REVERSEENGINEERINGEDITOR_OVERVIEW; - public static String REVERSEENGINEERINGEDITOR_TABLE_COLUMN; - public static String REVERSEENGINEERINGEDITOR_TABLE_FILTERS; - public static String REVERSEENGINEERINGEDITOR_TYPE_MAPPINGS; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -49,6 +49,7 @@ import org.hibernate.eclipse.console.model.ITableFilter; import org.hibernate.eclipse.console.utils.ProjectUtils; import org.hibernate.eclipse.console.workbench.LazyDatabaseSchema; +import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.eclipse.mapper.MapperPlugin; import org.hibernate.eclipse.mapper.editors.reveng.RevEngOverviewPage; import org.hibernate.eclipse.mapper.editors.reveng.RevEngTableFilterPage; @@ -64,17 +65,17 @@ private StructuredTextEditor sourcePage; private DOMReverseEngineeringDefinition definition; - + private RevEngTableFilterPage tableFilterPage; private RevEngTypeMappingPage typeMappingsPage; - private RevEngOverviewPage overviewsPage; + private RevEngOverviewPage overviewsPage; private Map pageNameToIndex = new HashMap(); private RevEngTablesPage tableProperties; - + public ReverseEngineeringEditor() { - + } - + public void init(IEditorSite site, IEditorInput input) throws PartInitException { super.init( site, input ); @@ -89,7 +90,7 @@ } catch (PartInitException e) { MapperPlugin.getDefault().getLogger().logException( - Messages.REVERSEENGINEERINGEDITOR_COULD_NOT_CREATE_GRAPHICAL_VIEWER, e ); + MapperMessages.ReverseEngineeringEditor_could_not_create_graphical_viewer, e ); } } @@ -97,29 +98,29 @@ int i = 0; overviewsPage = new RevEngOverviewPage(this); addPage( i, overviewsPage); - setPageText(i, Messages.REVERSEENGINEERINGEDITOR_OVERVIEW); + setPageText(i, MapperMessages.ReverseEngineeringEditor_overview); pageNameToIndex.put(RevEngOverviewPage.PART_ID, new Integer(i)); i++; - + typeMappingsPage = new RevEngTypeMappingPage( this ); addPage( i, typeMappingsPage); - setPageText( i, Messages.REVERSEENGINEERINGEDITOR_TYPE_MAPPINGS ); + setPageText( i, MapperMessages.ReverseEngineeringEditor_type_mappings ); pageNameToIndex.put(RevEngTypeMappingPage.PART_ID, new Integer(i)); i++; - + tableFilterPage = new RevEngTableFilterPage( this ); addPage( i, tableFilterPage); - setPageText( i, Messages.REVERSEENGINEERINGEDITOR_TABLE_FILTERS ); - pageNameToIndex.put(RevEngTableFilterPage.PART_ID, new Integer(i)); + setPageText( i, MapperMessages.ReverseEngineeringEditor_table_filters ); + pageNameToIndex.put(RevEngTableFilterPage.PART_ID, new Integer(i)); i++; - + tableProperties = new RevEngTablesPage(this ); addPage( i, tableProperties); - setPageText(i, Messages.REVERSEENGINEERINGEDITOR_TABLE_COLUMN); + setPageText(i, MapperMessages.ReverseEngineeringEditor_table_column); pageNameToIndex.put(RevEngTablesPage.PART_ID, new Integer(i)); i++; - + int activePageIndex = getPreferenceStore().getInt(IXMLPreferenceNames.LAST_ACTIVE_PAGE); // firstly init overview page with configuration setActivePage(0); @@ -132,16 +133,16 @@ Integer number = (Integer) pageNameToIndex.get(string); if(number!=null) { setActivePage(number.intValue()); - } + } }*/ - + private void initSourcePage() { int pageCount = getPageCount(); for (int i = 0; i < pageCount; i++) { if ( getEditor( i ) instanceof StructuredTextEditor ) { sourcePage = (StructuredTextEditor) getEditor( i ); IDOMDocument document = getDocument(sourcePage); - definition = new DOMReverseEngineeringDefinition(document); + definition = new DOMReverseEngineeringDefinition(document); } } } @@ -158,24 +159,24 @@ if (service instanceof INestableKeyBindingService) { INestableKeyBindingService nestableService = (INestableKeyBindingService) service; nestableService.activateKeyBindingService(null); - } + } } saveLastActivePageIndex(newPageIndex); super.pageChange(newPageIndex); } - + public IReverseEngineeringDefinition getReverseEngineeringDefinition() { return definition; } - + public String getConsoleConfigurationName() { return overviewsPage.getConsoleConfigName(); } - + protected void setConsoleConfigurationName(String name) { overviewsPage.setConsoleConfigName(name); } - + public HibernateNature getHibernateNature() throws CoreException { if(getEditorInput()!=null) { IJavaProject project = ProjectUtils.findJavaProject(getEditorInput()); @@ -196,11 +197,11 @@ setConsoleConfigurationName(configuration.getName()); } } - + ITableFilter[] tableFilters = getReverseEngineeringDefinition().getTableFilters(); Configuration cfg = configuration.buildWith(null, false); Settings settings = configuration.getSettings(cfg); - + OverrideRepository repository = new OverrideRepository();///*settings.getDefaultCatalogName(),settings.getDefaultSchemaName()*/); boolean hasIncludes = false; for (int i = 0; i < tableFilters.length; i++) { @@ -222,7 +223,7 @@ tf.setMatchName(".*"); //$NON-NLS-1$ repository.addTableFilter(tf); if(tableFilters.length==0) { - boolean b = MessageDialog.openQuestion(getContainer().getShell(), Messages.REVERSEENGINEERINGEDITOR_NO_FILTERS_DEFINED, Messages.REVERSEENGINEERINGEDITOR_NO_FILTERS_HAS_BEEN_DEFINED); + boolean b = MessageDialog.openQuestion(getContainer().getShell(), MapperMessages.ReverseEngineeringEditor_no_filters_defined, MapperMessages.ReverseEngineeringEditor_no_filters_has_been_defined); if(!b) { return null; } @@ -233,12 +234,12 @@ // return null; //} //} - + LazyDatabaseSchema lazyDatabaseSchema = new LazyDatabaseSchema(configuration, repository.getReverseEngineeringStrategy(new DefaultReverseEngineeringStrategy())); - + return lazyDatabaseSchema; } catch(HibernateException he) { - HibernateConsolePlugin.getDefault().showError(getContainer().getShell(), Messages.REVERSEENGINEERINGEDITOR_ERROR_WHILE_REFRESHING_DATABASETREE, he); + HibernateConsolePlugin.getDefault().showError(getContainer().getShell(), MapperMessages.ReverseEngineeringEditor_error_while_refreshing_databasetree, he); return null; } } @@ -250,16 +251,16 @@ return null; } else { return KnownConfigurations.getInstance().find( dialog.getSelectedConfigurationName() ); // TODO: double check to see if an result is actually returned ? - } + } } - + private void saveLastActivePageIndex(int newPageIndex) { // save the last active page index to preference store getPreferenceStore().setValue(IXMLPreferenceNames.LAST_ACTIVE_PAGE, newPageIndex); } - + private IPreferenceStore getPreferenceStore() { return MapperPlugin.getDefault().getPreferenceStore(); } - + } \ No newline at end of file Deleted: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/messages.properties 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/messages.properties 2008-06-06 16:51:42 UTC (rev 8615) @@ -1,12 +0,0 @@ -CHOOSCONSOLECONFIGURATIONDIALOG_CONSOLE_CONFIGURATION=Console configuration: -CHOOSCONSOLECONFIGURATIONDIALOG_SELECT_CONSOLE_CONFIGURATION=Select a console configuration -HIBERNATECFGXMLEDITOR_CONFIGURATION=Configuration -HIBERNATECFGXMLEDITOR_COULD_NOT_CREATE_FORM_PART=Could not create form part for hibernate.cfg.xml editor -REVERSEENGINEERINGEDITOR_COULD_NOT_CREATE_GRAPHICAL_VIEWER=Could not create graphical viewer -REVERSEENGINEERINGEDITOR_ERROR_WHILE_REFRESHING_DATABASETREE=Error while refreshing database tree -REVERSEENGINEERINGEDITOR_NO_FILTERS_DEFINED=No filters defined -REVERSEENGINEERINGEDITOR_NO_FILTERS_HAS_BEEN_DEFINED=No filters has been defined.\n This can make the reading of the database schema very slow.\n Do you wish to continue reading the database schema ? -REVERSEENGINEERINGEDITOR_OVERVIEW=Overview -REVERSEENGINEERINGEDITOR_TABLE_COLUMN=Table && Columns -REVERSEENGINEERINGEDITOR_TABLE_FILTERS=Table Filters -REVERSEENGINEERINGEDITOR_TYPE_MAPPINGS=Type Mappings Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ColumnDetailsPage.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ColumnDetailsPage.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ColumnDetailsPage.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -37,6 +37,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Section; import org.hibernate.eclipse.console.model.IRevEngColumn; +import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.eclipse.mapper.editors.reveng.xpl.FormTextEntry; public class ColumnDetailsPage extends RevEngDetailsPage implements IDetailsPage, PropertyChangeListener { @@ -49,63 +50,63 @@ private IRevEngColumn column; public void buildContents(FormToolkit toolkit, Section section, Composite client) { - section.setText(Messages.COLUMNDETAILSPAGE_COLUMN_DETAILS); - section.setDescription(Messages.COLUMNDETAILSPAGE_SET_PROPERTIES_OF_SELECTED_COLUMN); - - nameEntry = new FormTextEntry(client, toolkit, Messages.COLUMNDETAILSPAGE_NAME, SWT.NULL); - nameEntry.setDescription(Messages.COLUMNDETAILSPAGE_THE_NAME_OF_THE_COLUMN); + section.setText(MapperMessages.ColumnDetailsPage_column_details); + section.setDescription(MapperMessages.ColumnDetailsPage_set_properties_of_selected_column); + + nameEntry = new FormTextEntry(client, toolkit, MapperMessages.ColumnDetailsPage_name, SWT.NULL); + nameEntry.setDescription(MapperMessages.ColumnDetailsPage_the_name_of_the_column); nameEntry.setFormEntryListener(new FormTextEntryListenerAdapter() { public void textValueChanged(FormTextEntry entry) { column.setName(entry.getValue()); } }); - - excluded = toolkit.createButton(client, Messages.COLUMNDETAILSPAGE_EXCLUDE_COLUMNS_FROM_REVERSE_ENGINEERING, SWT.CHECK); + + excluded = toolkit.createButton(client, MapperMessages.ColumnDetailsPage_exclude_columns_from_reverse_engineering, SWT.CHECK); GridData gridData = new GridData(SWT.FILL, SWT.FILL, true,false); gridData.horizontalSpan = 3; excluded.setLayoutData(gridData); excluded.addSelectionListener(new SelectionAdapter() { - + public void widgetSelected(SelectionEvent e) { column.setExcluded(excluded.getSelection()); } - + }); - - jdbcTypeEntry = new FormTextEntry(client, toolkit, Messages.COLUMNDETAILSPAGE_JDBC_TYPE, SWT.NULL); - jdbcTypeEntry.setDescription(Messages.COLUMNDETAILSPAGE_WHICH_JDBC_TYPE_THIS_COLUMN_SHOULD_HAVE); + + jdbcTypeEntry = new FormTextEntry(client, toolkit, MapperMessages.ColumnDetailsPage_jdbc_type, SWT.NULL); + jdbcTypeEntry.setDescription(MapperMessages.ColumnDetailsPage_which_jdbc_type_this_column_should_have); jdbcTypeEntry.setFormEntryListener(new FormTextEntryListenerAdapter() { public void textValueChanged(FormTextEntry entry) { column.setJDBCType(entry.getValue()); } }); - propertyEntry = new FormTextEntry(client, toolkit, Messages.COLUMNDETAILSPAGE_PROPERTY_NAME, SWT.NULL); - propertyEntry.setDescription(Messages.COLUMNDETAILSPAGE_THE_PROPERTY_NAME_WHICH_MUST_BE_USED_FOR); + propertyEntry = new FormTextEntry(client, toolkit, MapperMessages.ColumnDetailsPage_property_name, SWT.NULL); + propertyEntry.setDescription(MapperMessages.ColumnDetailsPage_the_property_name_which_must_be_used_for); propertyEntry.setFormEntryListener(new FormTextEntryListenerAdapter() { public void textValueChanged(FormTextEntry entry) { column.setPropertyName(entry.getValue()); } }); - - typeEntry = new FormTextEntry(client, toolkit, Messages.COLUMNDETAILSPAGE_HIBERNATE_TYPE, SWT.NULL); - typeEntry.setDescription(Messages.COLUMNDETAILSPAGE_THE_HIBERNATE_TYPE); + + typeEntry = new FormTextEntry(client, toolkit, MapperMessages.ColumnDetailsPage_hibernate_type, SWT.NULL); + typeEntry.setDescription(MapperMessages.ColumnDetailsPage_the_hibernate_type); typeEntry.setFormEntryListener(new FormTextEntryListenerAdapter() { public void textValueChanged(FormTextEntry entry) { column.setType(entry.getValue()); } - }); + }); } public void selectionChanged(IFormPart part, ISelection selection) { IRevEngColumn newColumn = (IRevEngColumn) ((IStructuredSelection)selection).getFirstElement(); if(column!=null) { - column.removePropertyChangeListener(this); + column.removePropertyChangeListener(this); } if(newColumn!=null) { newColumn.addPropertyChangeListener(this); } column = newColumn; - + update(); } @@ -115,12 +116,12 @@ propertyEntry.setValue(column.getPropertyName()); typeEntry.setValue(column.getType()); excluded.setSelection(column.getExclude()); - + nameEntry.setEditable(!column.getExclude()); } public void propertyChange(PropertyChangeEvent evt) { - update(); + update(); } } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ConsoleConfigNamePart.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ConsoleConfigNamePart.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ConsoleConfigNamePart.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -32,6 +32,7 @@ import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; import org.hibernate.eclipse.console.model.IReverseEngineeringDefinition; +import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.eclipse.mapper.MapperPlugin; import org.hibernate.eclipse.mapper.editors.ReverseEngineeringEditor; import org.hibernate.util.StringHelper; @@ -40,8 +41,8 @@ private CCombo text; private ReverseEngineeringEditor re; - - + + public ConsoleConfigNamePart(Composite parent, IManagedForm form, ReverseEngineeringEditor re) { super(parent,form); this.re = re; @@ -55,18 +56,18 @@ initialConfg = re.getHibernateNature().getDefaultConsoleConfigurationName(); } } catch (CoreException e) { - MapperPlugin.getDefault().getLogger().logException(Messages.CONSOLECONFIGNAMEPART_PROBLEM_WHEN_TRYING_TO_HIBERNATE_PROJECT_INFO,e); + MapperPlugin.getDefault().getLogger().logException(MapperMessages.ConsoleConfigNamePart_problem_when_trying_to_hibernate_project_info,e); } - + text.setText(initialConfg); } return false; } - + public void dispose() { - + } - + Control createClient(IManagedForm form) { FormToolkit toolkit = form.getToolkit(); Composite composite = toolkit.createComposite(getSection()); @@ -74,31 +75,31 @@ text = new CCombo(composite, SWT.FLAT); text.setEditable(false); adaptRecursively(toolkit, text); - + ConsoleConfiguration[] cfg = KnownConfigurations.getInstance().getConfigurationsSortedByName(); String[] names = new String[cfg.length]; for (int i = 0; i < cfg.length; i++) { ConsoleConfiguration configuration = cfg[i]; names[i] = configuration.getName(); } - text.setItems(names); - + text.setItems(names); + return composite; } - + protected String getSectionDescription() { - return Messages.CONSOLECONFIGNAMEPART_SELECT_CONSOLE_CONFIGURATION; + return MapperMessages.ConsoleConfigNamePart_select_console_configuration; } - + protected String getSectionTitle() { - return Messages.CONSOLECONFIGNAMEPART_CONSOLE_CONFIGURATION; + return MapperMessages.ConsoleConfigNamePart_console_configuration; } - + String getConsoleConfigName() { return text.getText(); } public void setConsoleConfigName(String name) { - text.setText( name ); + text.setText( name ); } } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/CounterFormPart.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/CounterFormPart.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/CounterFormPart.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -31,6 +31,7 @@ import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.widgets.FormToolkit; import org.hibernate.eclipse.console.model.IReverseEngineeringDefinition; +import org.hibernate.eclipse.mapper.MapperMessages; public class CounterFormPart extends RevEngSectionPart { @@ -49,29 +50,29 @@ public void propertyChange(PropertyChangeEvent evt) { text.setText("" + cnt++); //$NON-NLS-1$ } - + }; def.addPropertyChangeListener(listener); return true; } - + public void dispose() { def.removePropertyChangeListener(listener); } - + Control createClient(IManagedForm form) { FormToolkit toolkit = form.getToolkit(); Composite composite = toolkit.createComposite(getSection()); composite.setLayout(new FillLayout()); - text = toolkit.createText(composite, Messages.COUNTERFORMPART_ZERO); + text = toolkit.createText(composite, MapperMessages.CounterFormPart_zero); return composite; } - + protected String getSectionDescription() { - return Messages.COUNTERFORMPART_DEBUG_COUNTER_FOR_PROPERTY_CHANGES; + return MapperMessages.CounterFormPart_debug_counter_for_property_changes; } - + protected String getSectionTitle() { - return Messages.COUNTERFORMPART_DEBUG_COUNTER; + return MapperMessages.CounterFormPart_debug_counter; } } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/GeneratorDetailsPage.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/GeneratorDetailsPage.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/GeneratorDetailsPage.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -33,38 +33,39 @@ import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Section; import org.hibernate.eclipse.console.model.IRevEngGenerator; +import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.eclipse.mapper.editors.reveng.xpl.FormTextEntry; public class GeneratorDetailsPage extends RevEngDetailsPage implements IDetailsPage, PropertyChangeListener { //private Label label; private FormTextEntry nameEntry; - + private IRevEngGenerator generator; - + protected void buildContents(FormToolkit toolkit, Section section, Composite client) { - section.setText(Messages.GENERATORDETAILSPAGE_ID_GENERATOR_DETAILS); - section.setDescription(Messages.GENERATORDETAILSPAGE_SET_THE_PROPERTIES_OF_THE_SELECTED_GENERATOR); - - nameEntry = new FormTextEntry(client, toolkit, Messages.GENERATORDETAILSPAGE_CLASS, SWT.NULL); + section.setText(MapperMessages.GeneratorDetailsPage_id_generator_details); + section.setDescription(MapperMessages.GeneratorDetailsPage_set_the_properties_of_the_selected_generator); + + nameEntry = new FormTextEntry(client, toolkit, MapperMessages.GeneratorDetailsPage_class, SWT.NULL); nameEntry.setFormEntryListener(new FormTextEntryListenerAdapter() { public void textValueChanged(FormTextEntry entry) { generator.setGeneratorClassName(entry.getValue()); } }); - + } public void selectionChanged(IFormPart part, ISelection selection) { IRevEngGenerator newTable = (IRevEngGenerator) ((IStructuredSelection)selection).getFirstElement(); if(generator!=null) { - generator.removePropertyChangeListener(this); + generator.removePropertyChangeListener(this); } if(newTable!=null) { newTable.addPropertyChangeListener(this); } generator = newTable; - + update(); } @@ -73,7 +74,7 @@ } public void propertyChange(PropertyChangeEvent evt) { - update(); + update(); } } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/HibernateConfigurationForm.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/HibernateConfigurationForm.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/HibernateConfigurationForm.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -31,6 +31,7 @@ import org.eclipse.wst.sse.core.internal.provisional.model.IModelStateListenerProposed; import org.eclipse.wst.sse.core.internal.provisional.model.IStructuredModelEvent; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; +import org.hibernate.eclipse.mapper.MapperMessages; import org.w3c.dom.Document; public class HibernateConfigurationForm { @@ -71,7 +72,7 @@ public void createPartControl(Composite cotainer) { this.container = cotainer; managedForm = new ManagedForm( container ); - getForm().setText( Messages.HIBERNATECONFIGURATIONFORM_HIBERNATE_CONFIGURATION ); + getForm().setText( MapperMessages.HibernateConfigurationForm_hibernate_configuration ); GridLayout layout = new GridLayout(); layout.numColumns = 2; Deleted: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/Messages.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/Messages.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -1,84 +0,0 @@ -package org.hibernate.eclipse.mapper.editors.reveng; - -import org.eclipse.osgi.util.NLS; - -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.hibernate.eclipse.mapper.editors.reveng.messages"; //$NON-NLS-1$ - public static String COLUMNDETAILSPAGE_COLUMN_DETAILS; - public static String COLUMNDETAILSPAGE_EXCLUDE_COLUMNS_FROM_REVERSE_ENGINEERING; - public static String COLUMNDETAILSPAGE_HIBERNATE_TYPE; - public static String COLUMNDETAILSPAGE_JDBC_TYPE; - public static String COLUMNDETAILSPAGE_NAME; - public static String COLUMNDETAILSPAGE_PROPERTY_NAME; - public static String COLUMNDETAILSPAGE_SET_PROPERTIES_OF_SELECTED_COLUMN; - public static String COLUMNDETAILSPAGE_THE_HIBERNATE_TYPE; - public static String COLUMNDETAILSPAGE_THE_NAME_OF_THE_COLUMN; - public static String COLUMNDETAILSPAGE_THE_PROPERTY_NAME_WHICH_MUST_BE_USED_FOR; - public static String COLUMNDETAILSPAGE_WHICH_JDBC_TYPE_THIS_COLUMN_SHOULD_HAVE; - public static String CONSOLECONFIGNAMEPART_CONSOLE_CONFIGURATION; - public static String CONSOLECONFIGNAMEPART_PROBLEM_WHEN_TRYING_TO_HIBERNATE_PROJECT_INFO; - public static String CONSOLECONFIGNAMEPART_SELECT_CONSOLE_CONFIGURATION; - public static String COUNTERFORMPART_DEBUG_COUNTER; - public static String COUNTERFORMPART_DEBUG_COUNTER_FOR_PROPERTY_CHANGES; - public static String COUNTERFORMPART_ZERO; - public static String GENERATORDETAILSPAGE_CLASS; - public static String GENERATORDETAILSPAGE_ID_GENERATOR_DETAILS; - public static String GENERATORDETAILSPAGE_SET_THE_PROPERTIES_OF_THE_SELECTED_GENERATOR; - public static String HIBERNATECONFIGURATIONFORM_HIBERNATE_CONFIGURATION; - public static String PARAMDETAILSPAGE_GENERATOR_PARAMETER_DETAILS; - public static String PARAMDETAILSPAGE_NAME; - public static String PARAMDETAILSPAGE_SET_THE_PROPERTIES_OF_THE_SELECTED_PARAMETER; - public static String PARAMDETAILSPAGE_VALUE; - public static String PRIMARYKEYDETAILSPAGE_ADD_COLUMN; - public static String PRIMARYKEYDETAILSPAGE_ADD_GENERATOR; - public static String PRIMARYKEYDETAILSPAGE_PRIMARY_KEY_CAN_DEFINE_GENERATOR_STRATEGY_AND_ALTERNATIVE_COLUMNS; - public static String PRIMARYKEYDETAILSPAGE_PRIMARY_KEY_DETAILS; - public static String REVENGFORMEDITORPART_NEED_TO_OVERRIDE_FORMCONTENT_IN; - public static String REVENGOVERVIEWPAGE_CONTENTS; - public static String REVENGOVERVIEWPAGE_OVERVIEW; - public static String REVENGOVERVIEWPAGE_THE_CONTENT; - public static String REVENGTABLEFILTERPAGE_TABLE_FILTERS; - public static String REVENGTABLESPAGE_TABLES_AND_COLUMNS; - public static String REVENGTYPEMAPPINGPAGE_TYPE_MAPPINGS; - public static String TABLEDETAILSPAGE_ADD_PRIMARY_KEY; - public static String TABLEDETAILSPAGE_CATALOG; - public static String TABLEDETAILSPAGE_CLASS_NAME; - public static String TABLEDETAILSPAGE_NAME; - public static String TABLEDETAILSPAGE_SCHEMA; - public static String TABLEDETAILSPAGE_SET_PROPERTIES_OF_SELECTED_TABLE; - public static String TABLEDETAILSPAGE_TABLE_DETAILS; - public static String TABLEFILTERFORMPART_TABLE_FILTERS; - public static String TABLEFILTERFORMPART_TABLE_FILTERS_DEFINES_WHICH_TABLE_INCLUDED; - public static String TABLEPROPERTIESBLOCK_ADD; - public static String TABLEPROPERTIESBLOCK_ADD_TABLES_COLUMNS; - public static String TABLEPROPERTIESBLOCK_DELETE; - public static String TABLEPROPERTIESBLOCK_DESELECT_ALL; - public static String TABLEPROPERTIESBLOCK_EXPLICITLY_CONTROL_SETTINGS_FOR_TABLE_COLUMNS; - public static String TABLEPROPERTIESBLOCK_HORIZONTAL_ORIENTATION; - public static String TABLEPROPERTIESBLOCK_SELECT_ALL_CHILDREN; - public static String TABLEPROPERTIESBLOCK_SELECT_TABLES_COLUMNS; - public static String TABLEPROPERTIESBLOCK_TABLES_COLUMNS; - public static String TABLEPROPERTIESBLOCK_VERTICAL_ORIENTATION; - public static String TABLEPROPERTIESLABELPROVIDER_PRIMARY_KEY; - public static String TYPEMAPPINGFORMPART_TYPE_MAPPINGS; - public static String TYPEMAPPINGFORMPART_TYPE_MAPPINGS_ALLOWS_YOU_DEFINE_WHICH_HIBERNATE_TYPE; - public static String TYPEMAPPINGVIEW_ADD; - public static String TYPEMAPPINGVIEW_DATABASE_SCHEMA; - public static String TYPEMAPPINGVIEW_DO_YOU_WANT_TO_REMOVE_ALL_MAPPINGS; - public static String TYPEMAPPINGVIEW_HIBERNATE_TYPE; - public static String TYPEMAPPINGVIEW_JDBC_TYPE; - public static String TYPEMAPPINGVIEW_LENGTH; - public static String TYPEMAPPINGVIEW_NOT_KNOWN_BUTTON; - public static String TYPEMAPPINGVIEW_NOT_NULL; - public static String TYPEMAPPINGVIEW_PRECISION; - public static String TYPEMAPPINGVIEW_REMOVE_ALL_MAPPINGS; - public static String TYPEMAPPINGVIEW_SCALE; - public static String TYPEMAPPINGVIEW_TYPE_MAPPINGS; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ParamDetailsPage.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ParamDetailsPage.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ParamDetailsPage.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -33,6 +33,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Section; import org.hibernate.eclipse.console.model.IRevEngParameter; +import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.eclipse.mapper.editors.reveng.xpl.FormTextEntry; public class ParamDetailsPage extends RevEngDetailsPage implements IDetailsPage, PropertyChangeListener { @@ -40,40 +41,40 @@ // private Label label; private FormTextEntry nameEntry; private FormTextEntry valueEntry; - + private IRevEngParameter param; - + protected void buildContents(FormToolkit toolkit, Section section, Composite client) { - section.setText(Messages.PARAMDETAILSPAGE_GENERATOR_PARAMETER_DETAILS); - section.setDescription(Messages.PARAMDETAILSPAGE_SET_THE_PROPERTIES_OF_THE_SELECTED_PARAMETER); - - nameEntry = new FormTextEntry(client, toolkit, Messages.PARAMDETAILSPAGE_NAME, SWT.NULL); + section.setText(MapperMessages.ParamDetailsPage_generator_parameter_details); + section.setDescription(MapperMessages.ParamDetailsPage_set_the_properties_of_the_selected_parameter); + + nameEntry = new FormTextEntry(client, toolkit, MapperMessages.ParamDetailsPage_name, SWT.NULL); nameEntry.setFormEntryListener(new FormTextEntryListenerAdapter() { public void textValueChanged(FormTextEntry entry) { param.setName(entry.getValue()); } }); - - valueEntry = new FormTextEntry(client, toolkit, Messages.PARAMDETAILSPAGE_VALUE, SWT.NULL); + + valueEntry = new FormTextEntry(client, toolkit, MapperMessages.ParamDetailsPage_value, SWT.NULL); valueEntry.setFormEntryListener(new FormTextEntryListenerAdapter() { public void textValueChanged(FormTextEntry entry) { param.setValue(entry.getValue()); } }); - + } public void selectionChanged(IFormPart part, ISelection selection) { IRevEngParameter newParam = (IRevEngParameter) ((IStructuredSelection)selection).getFirstElement(); if(param!=null) { - param.removePropertyChangeListener(this); + param.removePropertyChangeListener(this); } if(newParam!=null) { newParam.addPropertyChangeListener(this); } - + param = newParam; - + update(); } @@ -83,7 +84,7 @@ } public void propertyChange(PropertyChangeEvent evt) { - update(); + update(); } } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/PrimaryKeyDetailsPage.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/PrimaryKeyDetailsPage.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/PrimaryKeyDetailsPage.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -36,38 +36,39 @@ import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Section; import org.hibernate.eclipse.console.model.IRevEngPrimaryKey; +import org.hibernate.eclipse.mapper.MapperMessages; public class PrimaryKeyDetailsPage extends RevEngDetailsPage implements IDetailsPage, PropertyChangeListener { // private Label label; - + private IRevEngPrimaryKey primaryKey; - + protected void buildContents(FormToolkit toolkit, Section section, Composite client) { - section.setText(Messages.PRIMARYKEYDETAILSPAGE_PRIMARY_KEY_DETAILS); - section.setDescription(Messages.PRIMARYKEYDETAILSPAGE_PRIMARY_KEY_CAN_DEFINE_GENERATOR_STRATEGY_AND_ALTERNATIVE_COLUMNS); - - Button createGenerator = toolkit.createButton(client, Messages.PRIMARYKEYDETAILSPAGE_ADD_GENERATOR, SWT.NONE); + section.setText(MapperMessages.PrimaryKeyDetailsPage_primary_key_details); + section.setDescription(MapperMessages.PrimaryKeyDetailsPage_primary_key_can_define_generator_strategy_and_alternative_columns); + + Button createGenerator = toolkit.createButton(client, MapperMessages.PrimaryKeyDetailsPage_add_generator, SWT.NONE); createGenerator.addSelectionListener(new SelectionAdapter() { - + public void widgetSelected(SelectionEvent e) { handleAddGenerator(); - } + } }); - - Button createColumn = toolkit.createButton(client, Messages.PRIMARYKEYDETAILSPAGE_ADD_COLUMN, SWT.NONE); + + Button createColumn = toolkit.createButton(client, MapperMessages.PrimaryKeyDetailsPage_add_column, SWT.NONE); createColumn.addSelectionListener(new SelectionAdapter() { - + public void widgetSelected(SelectionEvent e) { handleAddColumn(); - } + } }); } protected void handleAddColumn() { - primaryKey.addColumn(); + primaryKey.addColumn(); } protected void handleAddGenerator() { @@ -79,23 +80,23 @@ public void selectionChanged(IFormPart part, ISelection selection) { IRevEngPrimaryKey newParam = (IRevEngPrimaryKey) ((IStructuredSelection)selection).getFirstElement(); if(primaryKey!=null) { - primaryKey.removePropertyChangeListener(this); + primaryKey.removePropertyChangeListener(this); } if(newParam!=null) { newParam.addPropertyChangeListener(this); } - + primaryKey = newParam; - + update(); } private void update() { - + } public void propertyChange(PropertyChangeEvent evt) { - update(); + update(); } } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngFormEditorPart.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngFormEditorPart.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngFormEditorPart.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -25,6 +25,7 @@ import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.editor.FormEditor; import org.eclipse.ui.forms.editor.FormPage; +import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.eclipse.mapper.editors.ReverseEngineeringEditor; public class RevEngFormEditorPart extends FormPage { @@ -35,15 +36,15 @@ public RevEngFormEditorPart(FormEditor editor, String id, String title) { super( editor, id, title ); - + } public void createPartControl(Composite parent) { super.createPartControl( parent ); } protected void createFormContent(IManagedForm managedForm) { - throw new IllegalStateException(Messages.REVENGFORMEDITORPART_NEED_TO_OVERRIDE_FORMCONTENT_IN + this.getClass().getName()); + throw new IllegalStateException(MapperMessages.RevEngFormEditorPart_need_to_override_formcontent_in + this.getClass().getName()); } - + ReverseEngineeringEditor getReverseEngineeringEditor() { return (ReverseEngineeringEditor) getEditor(); } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngOverviewPage.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngOverviewPage.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngOverviewPage.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -35,78 +35,79 @@ import org.eclipse.ui.forms.widgets.Section; import org.eclipse.ui.forms.widgets.TableWrapData; import org.eclipse.ui.forms.widgets.TableWrapLayout; +import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.eclipse.mapper.editors.ReverseEngineeringEditor; public class RevEngOverviewPage extends RevEngFormEditorPart { public static final String PART_ID = "overview"; //$NON-NLS-1$ - + public RevEngOverviewPage(ReverseEngineeringEditor reditor) { - super(reditor, PART_ID, Messages.REVENGOVERVIEWPAGE_OVERVIEW); + super(reditor, PART_ID, MapperMessages.RevEngOverviewPage_overview); this.reditor = reditor; } - + private final ReverseEngineeringEditor reditor; private ConsoleConfigNamePart configNamePart; - + public void createFormContent(IManagedForm parent) { ScrolledForm form = parent.getForm(); - + ColumnLayout layout = new ColumnLayout(); layout.maxNumColumns = 2; - + form.getBody().setLayout(layout); - + createConsoleConfigName(); createContentsSection(); - + getManagedForm().setInput(reditor.getReverseEngineeringDefinition()); - + } private void createConsoleConfigName() { Composite parent = getManagedForm().getForm().getBody(); - + configNamePart = new ConsoleConfigNamePart(parent, getManagedForm(), reditor); - + //GridData gd = new GridData(GridData.FILL_HORIZONTAL|GridData.VERTICAL_ALIGN_BEGINNING); //configNamePart.getSection().setLayoutData(gd); - + getManagedForm().addPart(configNamePart); - + } - + private Section createStaticSection(FormToolkit toolkit, Composite parent, String text) { Section section = toolkit.createSection(parent, ExpandableComposite.TITLE_BAR); section.clientVerticalSpacing = 4; section.setText(text); return section; } - + private void createContentsSection() { String sectionTitle; - sectionTitle = Messages.REVENGOVERVIEWPAGE_CONTENTS; + sectionTitle = MapperMessages.RevEngOverviewPage_contents; Section section = createStaticSection( - getManagedForm().getToolkit(), - getManagedForm().getForm().getBody(), + getManagedForm().getToolkit(), + getManagedForm().getForm().getBody(), sectionTitle); - + Composite container = getManagedForm().getToolkit().createComposite(section, SWT.NONE); TableWrapLayout layout = new TableWrapLayout(); layout.leftMargin = layout.rightMargin = layout.topMargin = layout.bottomMargin = 0; container.setLayout(layout); container.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB)); - - FormText text = createClient(container, Messages.REVENGOVERVIEWPAGE_THE_CONTENT, getManagedForm().getToolkit()); + + FormText text = createClient(container, MapperMessages.RevEngOverviewPage_the_content, getManagedForm().getToolkit()); //text.setImage("page", EclipseImages.getImage(ImageConstants.)); //$NON-NLS-1$ - + section.setClient(container); //section.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB)); //section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL,GridData.FILL_VERTICAL)); - - //getManagedForm().addPart(s); + + //getManagedForm().addPart(s); } - + private FormText createClient(Composite section, String content, FormToolkit toolkit) { FormText text = toolkit.createFormText(section, true); try { @@ -116,14 +117,14 @@ } section.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB)); text.addHyperlinkListener(new IHyperlinkListener() { - + public void linkEntered(HyperlinkEvent e) {} public void linkExited(HyperlinkEvent e) {} public void linkActivated(HyperlinkEvent e) { String href = (String) e.getHref(); - getEditor().setActivePage(href); + getEditor().setActivePage(href); } }); return text; @@ -138,7 +139,7 @@ } public void setConsoleConfigName(String name) { - configNamePart.setConsoleConfigName(name); + configNamePart.setConsoleConfigName(name); } - + } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngTableFilterPage.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngTableFilterPage.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngTableFilterPage.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -25,37 +25,38 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.widgets.ScrolledForm; +import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.eclipse.mapper.editors.ReverseEngineeringEditor; public class RevEngTableFilterPage extends RevEngFormEditorPart { - + public final static String PART_ID = "tablefilter"; //$NON-NLS-1$ - + public RevEngTableFilterPage(ReverseEngineeringEditor reditor) { - super(reditor, PART_ID, Messages.REVENGTABLEFILTERPAGE_TABLE_FILTERS); - } + super(reditor, PART_ID, MapperMessages.RevEngTableFilterPage_table_filters); + } protected void createFormContent(IManagedForm managedForm) { ScrolledForm form = managedForm.getForm(); - + GridLayout layout = new GridLayout(); - + form.getBody().setLayout(layout); - + createTableFilterSection(); - + getManagedForm().setInput(getReverseEngineeringEditor().getReverseEngineeringDefinition()); - + } - + private void createTableFilterSection() { TableFilterFormPart part = new TableFilterFormPart(getManagedForm().getForm().getBody(), getManagedForm(), getReverseEngineeringEditor()); GridData gd = new GridData(GridData.FILL_HORIZONTAL|GridData.FILL_VERTICAL); //gd.heightHint = 500; // makes the table stay reasonable small when large list available TODO: make it relative part.getSection().setLayoutData(gd); - - getManagedForm().addPart(part); + + getManagedForm().addPart(part); } - + } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngTablesPage.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngTablesPage.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngTablesPage.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -24,35 +24,36 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.widgets.ScrolledForm; +import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.eclipse.mapper.editors.ReverseEngineeringEditor; public class RevEngTablesPage extends RevEngFormEditorPart { public final static String PART_ID = "tables"; //$NON-NLS-1$ - + public RevEngTablesPage(ReverseEngineeringEditor reditor) { - super(reditor, PART_ID, Messages.REVENGTABLESPAGE_TABLES_AND_COLUMNS); - } + super(reditor, PART_ID, MapperMessages.RevEngTablesPage_tables_and_columns); + } protected void createFormContent(IManagedForm managedForm) { - + ScrolledForm form = managedForm.getForm(); - + GridLayout layout = new GridLayout(); - + form.getBody().setLayout(layout); - + createTablesSection(); - + getManagedForm().setInput(getReverseEngineeringEditor().getReverseEngineeringDefinition()); - + } - + private void createTablesSection() { TablePropertiesBlock block = new TablePropertiesBlock(getReverseEngineeringEditor()); //getManagedForm().getForm().setText("Tables & Columns"); block.createContent(getManagedForm()); } - + } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngTypeMappingPage.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngTypeMappingPage.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngTypeMappingPage.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -26,38 +26,39 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.widgets.ScrolledForm; +import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.eclipse.mapper.editors.ReverseEngineeringEditor; public class RevEngTypeMappingPage extends RevEngFormEditorPart { - + public final static String PART_ID = "typemappings"; //$NON-NLS-1$ - + public RevEngTypeMappingPage(ReverseEngineeringEditor reditor) { - super(reditor, PART_ID, Messages.REVENGTYPEMAPPINGPAGE_TYPE_MAPPINGS); - } + super(reditor, PART_ID, MapperMessages.RevEngTypeMappingPage_type_mappings); + } public void createFormContent(IManagedForm mform) { ScrolledForm form = mform.getForm(); - + GridLayout layout = new GridLayout(); - - + + form.getBody().setLayout(layout); - + createTypeMappingSection(); - + getManagedForm().setInput(getReverseEngineeringEditor().getReverseEngineeringDefinition()); - + } private void createTypeMappingSection() { Composite parent = getManagedForm().getForm().getBody(); - + TypeMappingFormPart part = new TypeMappingFormPart(parent, getManagedForm(),getReverseEngineeringEditor()); GridData gd = new GridData(GridData.FILL_HORIZONTAL|GridData.FILL_VERTICAL); part.getSection().setLayoutData(gd); - + getManagedForm().addPart(part); } - + } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TableDetailsPage.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TableDetailsPage.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TableDetailsPage.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -36,11 +36,12 @@ import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Section; import org.hibernate.eclipse.console.model.IRevEngTable; +import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.eclipse.mapper.editors.reveng.xpl.FormTextEntry; public class TableDetailsPage extends RevEngDetailsPage implements IDetailsPage, PropertyChangeListener { - + //private Label label; private FormTextEntry nameEntry; private FormTextEntry schemaEntry; @@ -48,45 +49,45 @@ private FormTextEntry classEntry; private IRevEngTable table; - + protected void buildContents(FormToolkit toolkit, Section section, Composite client) { - section.setText(Messages.TABLEDETAILSPAGE_TABLE_DETAILS); - section.setDescription(Messages.TABLEDETAILSPAGE_SET_PROPERTIES_OF_SELECTED_TABLE); - - catalogEntry = new FormTextEntry(client, toolkit, Messages.TABLEDETAILSPAGE_CATALOG, SWT.NULL); + section.setText(MapperMessages.TableDetailsPage_table_details); + section.setDescription(MapperMessages.TableDetailsPage_set_properties_of_selected_table); + + catalogEntry = new FormTextEntry(client, toolkit, MapperMessages.TableDetailsPage_catalog, SWT.NULL); catalogEntry.setFormEntryListener(new FormTextEntryListenerAdapter() { public void textValueChanged(FormTextEntry entry) { table.setCatalog(entry.getValue()); } }); - schemaEntry = new FormTextEntry(client, toolkit, Messages.TABLEDETAILSPAGE_SCHEMA, SWT.NULL); + schemaEntry = new FormTextEntry(client, toolkit, MapperMessages.TableDetailsPage_schema, SWT.NULL); schemaEntry.setFormEntryListener(new FormTextEntryListenerAdapter() { public void textValueChanged(FormTextEntry entry) { table.setSchema(entry.getValue()); } }); - nameEntry = new FormTextEntry(client, toolkit, Messages.TABLEDETAILSPAGE_NAME, SWT.NULL); + nameEntry = new FormTextEntry(client, toolkit, MapperMessages.TableDetailsPage_name, SWT.NULL); nameEntry.setFormEntryListener(new FormTextEntryListenerAdapter() { public void textValueChanged(FormTextEntry entry) { table.setName(entry.getValue()); } }); - - classEntry = new FormTextEntry(client, toolkit, Messages.TABLEDETAILSPAGE_CLASS_NAME, SWT.NULL); + + classEntry = new FormTextEntry(client, toolkit, MapperMessages.TableDetailsPage_class_name, SWT.NULL); classEntry.setFormEntryListener(new FormTextEntryListenerAdapter() { public void textValueChanged(FormTextEntry entry) { table.setClassname(entry.getValue()); } }); - - Button button = toolkit.createButton(client, Messages.TABLEDETAILSPAGE_ADD_PRIMARY_KEY, SWT.NULL); + + Button button = toolkit.createButton(client, MapperMessages.TableDetailsPage_add_primary_key, SWT.NULL); button.addSelectionListener(new SelectionAdapter() { - + public void widgetSelected(SelectionEvent e) { - handleAddPrimaryKey(); + handleAddPrimaryKey(); } - + }); } @@ -101,13 +102,13 @@ public void selectionChanged(IFormPart part, ISelection selection) { IRevEngTable newTable = (IRevEngTable) ((IStructuredSelection)selection).getFirstElement(); if(table!=null) { - table.removePropertyChangeListener(this); + table.removePropertyChangeListener(this); } if(newTable!=null) { newTable.addPropertyChangeListener(this); } table = newTable; - + update(); } @@ -120,7 +121,7 @@ } public void propertyChange(PropertyChangeEvent evt) { - update(); + update(); } } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TableFilterFormPart.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TableFilterFormPart.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TableFilterFormPart.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -29,6 +29,7 @@ import org.hibernate.eclipse.console.model.IReverseEngineeringDefinition; import org.hibernate.eclipse.console.wizards.TableFilterView; import org.hibernate.eclipse.console.workbench.LazyDatabaseSchema; +import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.eclipse.mapper.editors.ReverseEngineeringEditor; public class TableFilterFormPart extends RevEngSectionPart { @@ -43,14 +44,14 @@ } protected String getSectionTitle() { - return Messages.TABLEFILTERFORMPART_TABLE_FILTERS; + return MapperMessages.TableFilterFormPart_table_filters; } - + protected String getSectionDescription() { - return Messages.TABLEFILTERFORMPART_TABLE_FILTERS_DEFINES_WHICH_TABLE_INCLUDED; + return MapperMessages.TableFilterFormPart_table_filters_defines_which_table_included; } - - public Control createClient(IManagedForm form) { + + public Control createClient(IManagedForm form) { FormToolkit toolkit = form.getToolkit(); composite = new TableFilterView(getSection(), SWT.NULL) { @@ -62,10 +63,10 @@ } protected String getConsoleConfigurationName() { return configNamePart.getConsoleConfigurationName(); - } + } }; - + adaptRecursively( toolkit, composite ); return composite; @@ -75,7 +76,7 @@ composite.setModel(reveng); return true; } - + public void dispose() { composite.dispose(); } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -62,6 +62,7 @@ import org.hibernate.eclipse.console.workbench.DeferredContentProvider; import org.hibernate.eclipse.console.workbench.LazyDatabaseSchema; import org.hibernate.eclipse.console.workbench.xpl.AnyAdaptableLabelProvider; +import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.eclipse.mapper.editors.ReverseEngineeringEditor; import org.hibernate.eclipse.mapper.model.RevEngColumnAdapter; import org.hibernate.eclipse.mapper.model.RevEngGeneratorAdapter; @@ -72,26 +73,26 @@ import org.hibernate.mapping.Table; public class TablePropertiesBlock extends MasterDetailsBlock { - + private TreeViewer viewer; private final ReverseEngineeringEditor editor; public TablePropertiesBlock(ReverseEngineeringEditor editor) { - this.editor = editor; + this.editor = editor; } public SashForm getComposite() { return sashForm; } - + protected void createMasterPart(final IManagedForm managedForm, Composite parent) { sashForm.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,true)); final ScrolledForm form = managedForm.getForm(); FormToolkit toolkit = managedForm.getToolkit(); - Section section = toolkit.createSection( parent, Section.DESCRIPTION | + Section section = toolkit.createSection( parent, Section.DESCRIPTION | Section.FOCUS_TITLE | Section.TWISTIE | Section.EXPANDED); - section.setText( Messages.TABLEPROPERTIESBLOCK_TABLES_COLUMNS ); - section.setDescription( Messages.TABLEPROPERTIESBLOCK_EXPLICITLY_CONTROL_SETTINGS_FOR_TABLE_COLUMNS ); + section.setText( MapperMessages.TablePropertiesBlock_tables_columns ); + section.setDescription( MapperMessages.TablePropertiesBlock_explicitly_control_settings_for_table_columns ); section.marginWidth = 10; section.marginHeight = 5; toolkit.createCompositeSeparator( section ); @@ -108,36 +109,36 @@ gd.verticalSpan = 2; t.setLayoutData( gd ); toolkit.paintBordersFor( client ); - - Button btnAdd = toolkit.createButton( client, Messages.TABLEPROPERTIESBLOCK_ADD, SWT.PUSH ); + + Button btnAdd = toolkit.createButton( client, MapperMessages.TablePropertiesBlock_add, SWT.PUSH ); btnAdd.addSelectionListener(new SelectionAdapter() { - + public void widgetSelected(SelectionEvent e) { doAdd(); } - + }); gd = new GridData( GridData.VERTICAL_ALIGN_BEGINNING ); btnAdd.setLayoutData( gd ); - - Button btnDel = toolkit.createButton( client, Messages.TABLEPROPERTIESBLOCK_DELETE, SWT.PUSH ); + + Button btnDel = toolkit.createButton( client, MapperMessages.TablePropertiesBlock_delete, SWT.PUSH ); btnDel.addSelectionListener(new SelectionAdapter() { - + public void widgetSelected(SelectionEvent e) { doDelete(); } - + }); gd = new GridData( GridData.VERTICAL_ALIGN_BEGINNING ); btnDel.setLayoutData( gd ); - + section.setClient( client ); final SectionPart spart = new SectionPart( section ) { public boolean setFormInput(Object input) { if(input instanceof IReverseEngineeringDefinition) { viewer.setInput(input); return true; - } + } return false; } }; @@ -150,27 +151,27 @@ } ); viewer.setLabelProvider( new TablePropertiesLabelProvider() ); TablePropertiesContentProvider tablePropertiesContentProvider = new TablePropertiesContentProvider(); - viewer.setContentProvider( tablePropertiesContentProvider ); + viewer.setContentProvider( tablePropertiesContentProvider ); } protected void doAdd() { CheckedTreeSelectionDialog dialog = createTreeSelectionDialog(); - - + + LazyDatabaseSchema lds = editor.getLazyDatabaseSchema(); - + Map tables = new HashMap(); Map columns = new HashMap(); - + if(lds!=null) { - dialog.setTitle(Messages.TABLEPROPERTIESBLOCK_ADD_TABLES_COLUMNS); - dialog.setMessage(Messages.TABLEPROPERTIESBLOCK_SELECT_TABLES_COLUMNS); + dialog.setTitle(MapperMessages.TablePropertiesBlock_add_tables_columns); + dialog.setMessage(MapperMessages.TablePropertiesBlock_select_tables_columns); dialog.setInput(lds); dialog.setContainerMode(true); dialog.open(); Object[] result = dialog.getResult(); TableIdentifier lastTable = null; - if(result!=null) { + if(result!=null) { for (int i = 0; i < result.length; i++) { Object object = result[i]; if(object instanceof Table) { @@ -181,17 +182,17 @@ List existing = (List) columns.get(lastTable); if(existing==null) { existing = new ArrayList(); - columns.put(lastTable,existing); + columns.put(lastTable,existing); } - existing.add(object); + existing.add(object); } } } - + Iterator iterator = tables.entrySet().iterator(); while ( iterator.hasNext() ) { Map.Entry element = (Map.Entry) iterator.next(); - Table table = (Table) element.getValue(); + Table table = (Table) element.getValue(); IRevEngTable retable = null; // editor.getReverseEngineeringDefinition().findTable(TableIdentifier.create(table)); if(retable==null) { @@ -201,7 +202,7 @@ retable.setName(table.getName()); editor.getReverseEngineeringDefinition().addTable(retable); } - + List columnList = (List) columns.get(element.getKey()); if(columnList!=null) { Iterator colIterator = columnList.iterator(); @@ -216,8 +217,8 @@ } //editor.getReverseEngineeringDefinition(); } - - + + } protected void doDelete() { @@ -250,7 +251,7 @@ private CheckedTreeSelectionDialog createTreeSelectionDialog() { return new CheckedTreeSelectionDialog(getComposite().getShell(), new AnyAdaptableLabelProvider(), new DeferredContentProvider()) { - + protected Composite createSelectionButtons(Composite composite) { Composite buttonComposite = new Composite(composite, SWT.RIGHT); GridLayout layout = new GridLayout(); @@ -262,7 +263,7 @@ data.grabExcessHorizontalSpace = true; composite.setData(data); Button selectButton = createButton(buttonComposite, - IDialogConstants.SELECT_ALL_ID, Messages.TABLEPROPERTIESBLOCK_SELECT_ALL_CHILDREN, + IDialogConstants.SELECT_ALL_ID, MapperMessages.TablePropertiesBlock_select_all_children, false); SelectionListener listener = new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -270,13 +271,13 @@ Iterator iterator = viewerElements.iterator(); while(iterator.hasNext()) { getTreeViewer().setSubtreeChecked(iterator.next(), true); - } + } updateOKStatus(); } }; selectButton.addSelectionListener(listener); Button deselectButton = createButton(buttonComposite, - IDialogConstants.DESELECT_ALL_ID, Messages.TABLEPROPERTIESBLOCK_DESELECT_ALL, + IDialogConstants.DESELECT_ALL_ID, MapperMessages.TablePropertiesBlock_deselect_all, false); listener = new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -288,7 +289,7 @@ return buttonComposite; } - + }; } @@ -302,7 +303,7 @@ } }; haction.setChecked( true ); - haction.setToolTipText( Messages.TABLEPROPERTIESBLOCK_HORIZONTAL_ORIENTATION ); + haction.setToolTipText( MapperMessages.TablePropertiesBlock_horizontal_orientation ); Action vaction = new Action( "ver", IAction.AS_RADIO_BUTTON ) { //$NON-NLS-1$ public void run() { sashForm.setOrientation( SWT.VERTICAL ); @@ -310,7 +311,7 @@ } }; vaction.setChecked( false ); - vaction.setToolTipText( Messages.TABLEPROPERTIESBLOCK_VERTICAL_ORIENTATION ); + vaction.setToolTipText( MapperMessages.TablePropertiesBlock_vertical_orientation ); form.getToolBarManager().add( haction ); form.getToolBarManager().add( vaction ); } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesLabelProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesLabelProvider.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesLabelProvider.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -30,6 +30,7 @@ import org.hibernate.eclipse.console.model.IRevEngPrimaryKey; import org.hibernate.eclipse.console.model.IRevEngTable; import org.hibernate.eclipse.console.utils.EclipseImages; +import org.hibernate.eclipse.mapper.MapperMessages; public class TablePropertiesLabelProvider extends LabelProvider { @@ -45,11 +46,11 @@ private String getInternalText(Object element) { if(element instanceof IRevEngTable) { IRevEngTable table = (IRevEngTable)element; - return getLabel( table ); + return getLabel( table ); } else if(element instanceof IRevEngColumn) { return ((IRevEngColumn)element).getName(); } else if(element instanceof IRevEngPrimaryKey) { - return Messages.TABLEPROPERTIESLABELPROVIDER_PRIMARY_KEY; + return MapperMessages.TablePropertiesLabelProvider_primary_key; } else if(element instanceof IRevEngGenerator) { return ((IRevEngGenerator)element).getGeneratorClassName(); } else if ( element instanceof IRevEngParameter ) { @@ -69,17 +70,17 @@ if(res.length()!=0) res.append("."); //$NON-NLS-1$ res.append(table.getSchema()); } - + if(table.getName()!=null) { if(res.length()!=0) res.append("."); //$NON-NLS-1$ res.append(table.getName()); } return res.toString(); } - + public Image getImage(Object element) { if(element instanceof IRevEngTable) { - return EclipseImages.getImage(ImageConstants.TABLE); + return EclipseImages.getImage(ImageConstants.TABLE); } else if(element instanceof IRevEngColumn) { return EclipseImages.getImage(ImageConstants.COLUMN); } else if(element instanceof IRevEngParameter) { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TypeMappingFormPart.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TypeMappingFormPart.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TypeMappingFormPart.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -29,6 +29,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit; import org.hibernate.eclipse.console.model.IReverseEngineeringDefinition; import org.hibernate.eclipse.console.workbench.LazyDatabaseSchema; +import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.eclipse.mapper.editors.ReverseEngineeringEditor; public class TypeMappingFormPart extends RevEngSectionPart { @@ -42,11 +43,11 @@ } protected String getSectionDescription() { - return Messages.TYPEMAPPINGFORMPART_TYPE_MAPPINGS_ALLOWS_YOU_DEFINE_WHICH_HIBERNATE_TYPE; + return MapperMessages.TypeMappingFormPart_type_mappings_allows_you_define_which_hibernate_type; } protected String getSectionTitle() { - return Messages.TYPEMAPPINGFORMPART_TYPE_MAPPINGS; + return MapperMessages.TypeMappingFormPart_type_mappings; } public Control createClient(IManagedForm form) { @@ -61,13 +62,13 @@ protected String getConsoleConfigurationName() { return configNamePart.getConsoleConfigurationName(); - } + } }; - + GridData gd = new GridData(SWT.FILL,SWT.FILL); gd.heightHint = 400; composite.setLayoutData(gd); - + adaptRecursively( toolkit, composite); return composite; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TypeMappingView.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TypeMappingView.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TypeMappingView.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -45,6 +45,7 @@ import org.hibernate.eclipse.console.workbench.DeferredContentProvider; import org.hibernate.eclipse.console.workbench.LazyDatabaseSchema; import org.hibernate.eclipse.console.workbench.xpl.AnyAdaptableLabelProvider; +import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.mapping.Column; import org.hibernate.mapping.PrimaryKey; @@ -59,7 +60,7 @@ private TableViewer tableViewer; private IReverseEngineeringDefinition revEngDef; - + public void setModel(IReverseEngineeringDefinition revEngDef) { this.revEngDef = revEngDef; tableViewer.setInput( revEngDef ); @@ -94,8 +95,8 @@ result.setCellModifier( new TypeMappingCellModifier( result ) ); result.setLabelProvider( new TypeMappingLabelProvider() ); result.setContentProvider( new TypeMappingContentProvider( result ) ); - - + + return result; } @@ -132,7 +133,7 @@ while ( iter.hasNext() ) { Column column = (Column) iter.next(); createTypeMapping(column, column.getSqlTypeCode()); - } + } } else { createDefaultSqlTypeMapping(); } @@ -145,7 +146,7 @@ private void createTypeMapping(Column col, Integer sqlTypeCode) { if(sqlTypeCode!=null) { ITypeMapping typeMapping = revEngDef.createTypeMapping(); - + typeMapping.setJDBCType(JDBCToHibernateTypeHelper.getJDBCTypeName(sqlTypeCode.intValue())); int length = col.getLength(); int precision = col.getPrecision(); @@ -154,9 +155,9 @@ typeMapping.setHibernateType(JDBCToHibernateTypeHelper.getPreferredHibernateType(sqlTypeCode.intValue(), length, precision, scale, nullability, false)); if(JDBCToHibernateTypeHelper.typeHasLength(sqlTypeCode.intValue())) { if(length!=0 && Column.DEFAULT_LENGTH!=length) { - typeMapping.setLength(new Integer(length)); + typeMapping.setLength(new Integer(length)); } - } + } if(JDBCToHibernateTypeHelper.typeHasScaleAndPrecision(sqlTypeCode.intValue())) { if(precision!=0 && Column.DEFAULT_PRECISION!=precision) { typeMapping.setPrecision(new Integer(precision)); @@ -177,10 +178,10 @@ revEngDef.addTypeMapping(createTypeMapping); } - + protected String[] getAddButtonLabels() { - return new String[] { Messages.TYPEMAPPINGVIEW_ADD }; + return new String[] { MapperMessages.TypeMappingView_add }; } protected void handleAddButtonPressed(int i) { @@ -189,7 +190,7 @@ doAdd(); break; default: - throw new IllegalArgumentException( i + Messages.TYPEMAPPINGVIEW_NOT_KNOWN_BUTTON ); + throw new IllegalArgumentException( i + MapperMessages.TypeMappingView_not_known_button ); } } @@ -203,9 +204,9 @@ rightTable .setSelection( Math.min( sel, rightTable.getItemCount() - 1 ) ); } - + protected void doRemoveAll() { - if(MessageDialog.openQuestion( getShell(), Messages.TYPEMAPPINGVIEW_REMOVE_ALL_MAPPINGS , Messages.TYPEMAPPINGVIEW_DO_YOU_WANT_TO_REMOVE_ALL_MAPPINGS)) { + if(MessageDialog.openQuestion( getShell(), MapperMessages.TypeMappingView_remove_all_mappings, MapperMessages.TypeMappingView_do_you_want_to_remove_all_mappings)) { revEngDef.removeAllTypeMappings(); } } @@ -225,39 +226,39 @@ revEngDef.moveTypeMappingUp( item ); } } - + protected void createTableColumns(org.eclipse.swt.widgets.Table table) { - TableColumn column = new TableColumn(table, SWT.CENTER, 0); - column.setText(Messages.TYPEMAPPINGVIEW_JDBC_TYPE); + TableColumn column = new TableColumn(table, SWT.CENTER, 0); + column.setText(MapperMessages.TypeMappingView_jdbc_type); column.setWidth(100); - + column = new TableColumn(table, SWT.LEFT, 1); - column.setText(Messages.TYPEMAPPINGVIEW_HIBERNATE_TYPE); + column.setText(MapperMessages.TypeMappingView_hibernate_type); column.setWidth(150); - + column = new TableColumn(table, SWT.LEFT, 2); - column.setText(Messages.TYPEMAPPINGVIEW_LENGTH); + column.setText(MapperMessages.TypeMappingView_length); column.setWidth(100); column = new TableColumn(table, SWT.LEFT, 3); - column.setText(Messages.TYPEMAPPINGVIEW_SCALE); + column.setText(MapperMessages.TypeMappingView_scale); column.setWidth(100); - + column = new TableColumn(table, SWT.LEFT, 4); - column.setText(Messages.TYPEMAPPINGVIEW_PRECISION); + column.setText(MapperMessages.TypeMappingView_precision); column.setWidth(100); - + column = new TableColumn(table, SWT.LEFT, 5); - column.setText(Messages.TYPEMAPPINGVIEW_NOT_NULL); + column.setText(MapperMessages.TypeMappingView_not_null); column.setWidth(75); } protected String getTableTitle() { - return Messages.TYPEMAPPINGVIEW_TYPE_MAPPINGS; + return MapperMessages.TypeMappingView_type_mappings; } - + protected String getTreeTitle() { - return Messages.TYPEMAPPINGVIEW_DATABASE_SCHEMA; + return MapperMessages.TypeMappingView_database_schema; } - + } Deleted: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/messages.properties 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/messages.properties 2008-06-06 16:51:42 UTC (rev 8615) @@ -1,70 +0,0 @@ -COLUMNDETAILSPAGE_COLUMN_DETAILS=Column Details -COLUMNDETAILSPAGE_EXCLUDE_COLUMNS_FROM_REVERSE_ENGINEERING=Exclude column from reverse engineering -COLUMNDETAILSPAGE_HIBERNATE_TYPE=Hibernate Type: -COLUMNDETAILSPAGE_JDBC_TYPE=JDBC Type: -COLUMNDETAILSPAGE_NAME=Name: -COLUMNDETAILSPAGE_PROPERTY_NAME=Property name: -COLUMNDETAILSPAGE_SET_PROPERTIES_OF_SELECTED_COLUMN=Set the properties of the selected column. -COLUMNDETAILSPAGE_THE_HIBERNATE_TYPE=The hibernate type which should be used for this column when used as a property -COLUMNDETAILSPAGE_THE_NAME_OF_THE_COLUMN=The name of the column -COLUMNDETAILSPAGE_THE_PROPERTY_NAME_WHICH_MUST_BE_USED_FOR=The property name which must be used for this column when used as a property -COLUMNDETAILSPAGE_WHICH_JDBC_TYPE_THIS_COLUMN_SHOULD_HAVE=Which JDBC Type this column should have (overriding the type read from the database) -CONSOLECONFIGNAMEPART_CONSOLE_CONFIGURATION=Console Configuration -CONSOLECONFIGNAMEPART_PROBLEM_WHEN_TRYING_TO_HIBERNATE_PROJECT_INFO=Problem when trying to Hibernate Project information -CONSOLECONFIGNAMEPART_SELECT_CONSOLE_CONFIGURATION=Select Console configuration to be used for editing the reverse engineering settings -COUNTERFORMPART_DEBUG_COUNTER=Debug counter -COUNTERFORMPART_DEBUG_COUNTER_FOR_PROPERTY_CHANGES=debug counter for property changes -COUNTERFORMPART_ZERO=Zero -GENERATORDETAILSPAGE_CLASS=Class: -GENERATORDETAILSPAGE_ID_GENERATOR_DETAILS=Id Generator details -GENERATORDETAILSPAGE_SET_THE_PROPERTIES_OF_THE_SELECTED_GENERATOR=Set the properties of the selected generator. -HIBERNATECONFIGURATIONFORM_HIBERNATE_CONFIGURATION=Hibernate Configuration -PARAMDETAILSPAGE_GENERATOR_PARAMETER_DETAILS=Generator parameter details -PARAMDETAILSPAGE_NAME=Name: -PARAMDETAILSPAGE_SET_THE_PROPERTIES_OF_THE_SELECTED_PARAMETER=Set the properties of the selected parameter. -PARAMDETAILSPAGE_VALUE=Value: -PRIMARYKEYDETAILSPAGE_ADD_COLUMN=Add column -PRIMARYKEYDETAILSPAGE_ADD_GENERATOR=Add generator -PRIMARYKEYDETAILSPAGE_PRIMARY_KEY_CAN_DEFINE_GENERATOR_STRATEGY_AND_ALTERNATIVE_COLUMNS=A primary key can define a generator strategy and alternative columns -PRIMARYKEYDETAILSPAGE_PRIMARY_KEY_DETAILS=Primary key details -REVENGFORMEDITORPART_NEED_TO_OVERRIDE_FORMCONTENT_IN=Need to override formcontent in -REVENGOVERVIEWPAGE_CONTENTS=Contents -REVENGOVERVIEWPAGE_OVERVIEW=Overview -REVENGOVERVIEWPAGE_THE_CONTENT=<form><p>The content of the reveng.xml is made up of three sections:</p><li style="image" value="page" bindent="5"><a href="typemappings">Type Mappings</a>: lists the mappings from a JDBC/SQL type to Hibernate type.</li><li style="image" value="page" bindent="5"><a href="tablefilter">Table filters</a>: lists which tables that should be included or excluded during reverse engineering.</li><li style="image" value="page" bindent="5"><a href="tables">Tables &amp; Columns</a>: explicitly set properties for tables and columns.</li></form> -REVENGTABLEFILTERPAGE_TABLE_FILTERS=Table filters -REVENGTABLESPAGE_TABLES_AND_COLUMNS=Tables & Columns -REVENGTYPEMAPPINGPAGE_TYPE_MAPPINGS=Type Mappings -TABLEDETAILSPAGE_ADD_PRIMARY_KEY=Add primary key -TABLEDETAILSPAGE_CATALOG=Catalog: -TABLEDETAILSPAGE_CLASS_NAME=Class name: -TABLEDETAILSPAGE_NAME=Name: -TABLEDETAILSPAGE_SCHEMA=Schema: -TABLEDETAILSPAGE_SET_PROPERTIES_OF_SELECTED_TABLE=Set the properties of the selected table. -TABLEDETAILSPAGE_TABLE_DETAILS=Table details -TABLEFILTERFORMPART_TABLE_FILTERS=Table filters -TABLEFILTERFORMPART_TABLE_FILTERS_DEFINES_WHICH_TABLE_INCLUDED=Table filters defines which tables/views are included when performing reverse engineering. -TABLEPROPERTIESBLOCK_ADD=Add... -TABLEPROPERTIESBLOCK_ADD_TABLES_COLUMNS=Add Tables & Columns -TABLEPROPERTIESBLOCK_DELETE=Delete -TABLEPROPERTIESBLOCK_DESELECT_ALL=Deselect all -TABLEPROPERTIESBLOCK_EXPLICITLY_CONTROL_SETTINGS_FOR_TABLE_COLUMNS=Explicitly control settings for table & columns for which the defaults is not applicable. Click Add, select the relevant tables & columns and adjust their settings here. -TABLEPROPERTIESBLOCK_HORIZONTAL_ORIENTATION=Horizontal orientation -TABLEPROPERTIESBLOCK_SELECT_ALL_CHILDREN=Select all children -TABLEPROPERTIESBLOCK_SELECT_TABLES_COLUMNS=Select tables and columns -TABLEPROPERTIESBLOCK_TABLES_COLUMNS=Tables & Columns -TABLEPROPERTIESBLOCK_VERTICAL_ORIENTATION=Vertical orientation -TABLEPROPERTIESLABELPROVIDER_PRIMARY_KEY=Primary key -TYPEMAPPINGFORMPART_TYPE_MAPPINGS=Type mappings -TYPEMAPPINGFORMPART_TYPE_MAPPINGS_ALLOWS_YOU_DEFINE_WHICH_HIBERNATE_TYPE=Type mappings allows you to define which Hibernate type to use for specific JDBC types. -TYPEMAPPINGVIEW_ADD=Add... -TYPEMAPPINGVIEW_DATABASE_SCHEMA=Database schema: -TYPEMAPPINGVIEW_DO_YOU_WANT_TO_REMOVE_ALL_MAPPINGS=Do you want to remove all mappings? -TYPEMAPPINGVIEW_HIBERNATE_TYPE=Hibernate Type -TYPEMAPPINGVIEW_JDBC_TYPE=JDBC Type -TYPEMAPPINGVIEW_LENGTH=Length -TYPEMAPPINGVIEW_NOT_KNOWN_BUTTON=\ not a known button -TYPEMAPPINGVIEW_NOT_NULL=Not-Null -TYPEMAPPINGVIEW_PRECISION=Precision -TYPEMAPPINGVIEW_REMOVE_ALL_MAPPINGS=Remove all mappings -TYPEMAPPINGVIEW_SCALE=Scale -TYPEMAPPINGVIEW_TYPE_MAPPINGS=Type mappings: Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/GeneratorTypeHandler.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/GeneratorTypeHandler.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/GeneratorTypeHandler.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -35,11 +35,12 @@ import org.eclipse.jdt.core.ITypeHierarchy; import org.eclipse.jface.text.contentassist.CompletionProposal; import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.hibernate.eclipse.mapper.MapperMessages; import org.w3c.dom.Attr; import org.w3c.dom.Node; public class GeneratorTypeHandler implements HBMInfoHandler { - + private final HBMInfoExtractor extractor; /** @@ -51,20 +52,20 @@ public ICompletionProposal[] attributeCompletionProposals(IJavaProject project, Node node, String attributeName, String start, int offset) { List types = this.extractor.findMatchingGenerators(start); - - List proposals = new ArrayList(types.size() ); + + List proposals = new ArrayList(types.size() ); for (Iterator iter = types.iterator(); iter.hasNext();) { HibernateTypeDescriptor element = (HibernateTypeDescriptor) iter.next(); - String extendedinfo = Messages.GENERATORTYPEHANDLER_GENERATOR_TYPE + element.getName(); + String extendedinfo = MapperMessages.GeneratorTypeHandler_generator_type + element.getName(); if(element.getReturnClass()!=null) { - extendedinfo += Messages.GENERATORTYPEHANDLER_RETURN_CLASS + element.getReturnClass(); + extendedinfo += MapperMessages.GeneratorTypeHandler_return_class + element.getReturnClass(); } proposals.add(new CompletionProposal(element.getName(), offset, start.length(), element.getName().length(), null, null, null, extendedinfo) ); } - + try { IType typeInterface = project.findType("org.hibernate.id.IdentifierGenerator"); //$NON-NLS-1$ - Set alreadyFound = new HashSet(); + Set alreadyFound = new HashSet(); if (typeInterface != null) { ITypeHierarchy hier = typeInterface.newTypeHierarchy(project, new NullProgressMonitor() ); IType[] classes = hier.getAllSubtypes(typeInterface); // TODO: cache these results ? @@ -73,9 +74,9 @@ } catch (CoreException e) { throw new RuntimeException(e); // TODO: log as error! } - + ICompletionProposal[] result = (ICompletionProposal[]) proposals.toArray(new ICompletionProposal[proposals.size()]); - return result; + return result; } public IJavaElement getJavaElement(IJavaProject project, Node currentNode, Attr currentAttrNode) { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -44,65 +44,66 @@ import org.eclipse.wst.xml.ui.internal.contentassist.XMLRelevanceConstants; import org.hibernate.cfg.Environment; import org.hibernate.cfg.reveng.TableIdentifier; +import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.util.StringHelper; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; /** * Helper class that can extract information about a hbm.xml document based on e.g. DOM Nodes. - * + * * @author max * */ public class HBMInfoExtractor { HibernateTypeDescriptor[] hibernateTypes; - + final Map javaTypeProvider = new HashMap(); // key: element name, value: attribute which contains javaType final Map tableProvider = new HashMap(); // key: element name, value: attribute which contains table - - /** set of "tagname>attribname", used to decide which attributes we should react to */ + + /** set of "tagname>attribname", used to decide which attributes we should react to */ final Map attributeHandlers = new HashMap(); // completes a possible package or classname private String[] hibernatePropertyNames; private Map hibernatePropertyValues; - + private HibernateTypeDescriptor[] generatorTypes; private HibernateTypeDescriptor[] propertyAccessors; - - + + public HBMInfoExtractor() { setupTypeFinder(); setupTableFinder(); - + setupJavaTypeHandlers(); - + setupPackageHandlers(); - + setupFieldsPropertyHandlers(); - + setupHibernateTypeHandlers(); - + setupHibernateTypeDescriptors(); - + setupTableNameHandlers(); setupColumnNameHandlers(); setupHibernateProperties(); - + setupGeneratorClassHandlers(); - + setupAccessHandlers(); } - + String[] TRUE_FALSE = new String[] { "true", "false" }; //$NON-NLS-1$ //$NON-NLS-2$ - + private void setupHibernateProperties() { hibernatePropertyNames = extractHibernateProperties(); hibernatePropertyValues = new HashMap(); - + hibernatePropertyValues.put("bytecode.provider", new String[] { "cglib", "javassist"} ); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ hibernatePropertyValues.put("bytecode.use_reflection_optimizer", TRUE_FALSE ); //$NON-NLS-1$ //hibernatePropertyValues.put("c3p0.acquire_increment", new String[] { } ); //$NON-NLS-1$ @@ -175,7 +176,7 @@ hibernatePropertyValues.put("use_identifier_rollback", TRUE_FALSE ); //$NON-NLS-1$ hibernatePropertyValues.put("use_sql_comments", TRUE_FALSE ); //$NON-NLS-1$ //hibernatePropertyValues.put("xml.output_stylesheet]", new String[] { } ); //$NON-NLS-1$ - + } private String[] extractHibernateProperties() { @@ -186,7 +187,7 @@ Field[] fields = cl.getFields(); for (int i = 0; i < fields.length; i++) { Field field = fields[i]; - if(Modifier.isStatic(field.getModifiers() ) && + if(Modifier.isStatic(field.getModifiers() ) && field.getType().equals(String.class) ) { String str = (String) field.get(cl); if(str.startsWith("hibernate.") ) { //$NON-NLS-1$ @@ -199,7 +200,7 @@ return propertyNames; } catch (IllegalAccessException iae) { // ignore - return new String[0]; + return new String[0]; } } @@ -213,7 +214,7 @@ javaTypeProvider.put("composite-id", "class"); //$NON-NLS-1$ //$NON-NLS-2$ javaTypeProvider.put("component", "class"); //$NON-NLS-1$ //$NON-NLS-2$ javaTypeProvider.put("composite-element", "class"); //$NON-NLS-1$ //$NON-NLS-2$ - + javaTypeProvider.put("many-to-one", "class"); //$NON-NLS-1$ //$NON-NLS-2$ javaTypeProvider.put("one-to-many", "class"); //$NON-NLS-1$ //$NON-NLS-2$ javaTypeProvider.put("many-to-many", "class"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -222,7 +223,7 @@ javaTypeProvider.put("key-many-to-one", "class"); //$NON-NLS-1$ //$NON-NLS-2$ javaTypeProvider.put("one-to-many", "class"); //$NON-NLS-1$ //$NON-NLS-2$ } - + private void setupTableFinder() { tableProvider.put("class", "table"); //$NON-NLS-1$ //$NON-NLS-2$ tableProvider.put("join", "table"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -287,7 +288,7 @@ Collections.sort(types); generatorTypes = (HibernateTypeDescriptor[]) types.toArray(new HibernateTypeDescriptor[types.size()]); } - + private void setupHibernateTypeHandlers() { HBMInfoHandler hibernateTypeFinder = new HibernateTypeHandler(this); attributeHandlers.put("filter-param>type", hibernateTypeFinder); //$NON-NLS-1$ @@ -320,7 +321,7 @@ attributeHandlers.put("primitive-array>table", hih); //$NON-NLS-1$ attributeHandlers.put("synchronize>table", hih); //$NON-NLS-1$ } - + private void setupColumnNameHandlers() { HBMInfoHandler hih = new ColumnNameHandler(this); attributeHandlers.put("id>column", hih); //$NON-NLS-1$ @@ -347,15 +348,15 @@ attributeHandlers.put("return-scalar>column", hih); //$NON-NLS-1$ } - + private void setupAccessHandlers() { List types = new ArrayList(); - addType("property", Messages.HBMINFOEXTRACTOR_USE_JAVABEAN_ACCESSOR_METHODS, null, types); //$NON-NLS-1$ - addType("field", Messages.HBMINFOEXTRACTOR_ACCESS_FIELDS_DIRECTLY, null, types); //$NON-NLS-1$ - addType("noop", Messages.HBMINFOEXTRACTOR_DO_NOT_PERFORM_ANY_ACCESS, null, types); //$NON-NLS-1$ + addType("property", MapperMessages.HBMInfoExtractor_use_javabean_accessor_methods, null, types); //$NON-NLS-1$ + addType("field", MapperMessages.HBMInfoExtractor_access_fields_directly, null, types); //$NON-NLS-1$ + addType("noop", MapperMessages.HBMInfoExtractor_do_not_perform_any_access, null, types); //$NON-NLS-1$ Collections.sort(types); propertyAccessors = (HibernateTypeDescriptor[]) types.toArray(new HibernateTypeDescriptor[types.size()]); - + HBMInfoHandler hih = new PropertyAccessHandler(this); attributeHandlers.put("hibernate-mapping>default-access", hih); //$NON-NLS-1$ attributeHandlers.put("id>access", hih); //$NON-NLS-1$ @@ -380,9 +381,9 @@ attributeHandlers.put("nested-composite-element>access", hih); //$NON-NLS-1$ } - + private void setupFieldsPropertyHandlers() { - + HBMInfoHandler fieldsFinder = new FieldPropertyHandler(this); attributeHandlers.put("version>name", fieldsFinder); //$NON-NLS-1$ attributeHandlers.put("timestamp>name", fieldsFinder); //$NON-NLS-1$ @@ -429,7 +430,7 @@ attributeHandlers.put("composite-id>class", classFinder); //$NON-NLS-1$ attributeHandlers.put("key-many-to-one>class", classFinder); //$NON-NLS-1$ } - + List findMatchingHibernateTypes(String item) { return findInTypes( item, hibernateTypes ); } @@ -448,7 +449,7 @@ } return l; } - + public List findMatchingGenerators(String start) { return findInTypes(start, generatorTypes); } @@ -475,7 +476,7 @@ /** * @param holder * @param root TODO - * @return nearest package attribute, null if none found. + * @return nearest package attribute, null if none found. */ protected String getPackageName(Node root) { if(root!=null) { @@ -488,10 +489,10 @@ Node att = attributes.item(count); if("package".equals(att.getNodeName() ) ) { //$NON-NLS-1$ return att.getNodeValue(); - } - } + } + } } - return null; + return null; } protected boolean beginsWith(String aString, String prefix) { @@ -505,11 +506,11 @@ void generateTypeProposals(String matchString, int offset, List proposals, Set alreadyFound, IType[] classes, String filterPackage) throws JavaModelException { for (int j = 0; j < classes.length; j++) { IType type = classes[j]; - if (!Flags.isAbstract(type.getFlags() ) && (filterPackage==null || !type.getFullyQualifiedName().startsWith(filterPackage)) ) { + if (!Flags.isAbstract(type.getFlags() ) && (filterPackage==null || !type.getFullyQualifiedName().startsWith(filterPackage)) ) { String fullName = type.getFullyQualifiedName(); String shortName = type.getElementName(); if(alreadyFound.contains(fullName) ) { - continue; + continue; } else { alreadyFound.add(fullName); } @@ -524,7 +525,7 @@ } - + private void addType(String name, String returnClass, String primitiveClass, Collection hibernateTypes) { hibernateTypes.add(new HibernateTypeDescriptor(name, returnClass, primitiveClass) ); } @@ -541,40 +542,40 @@ /** * @param node - * @return the name of the nearest type from the node or null if none found. + * @return the name of the nearest type from the node or null if none found. */ private String getNearestType(Node node) { Map map = javaTypeProvider; - + if(node==null) return null; - + while(!map.containsKey(node.getNodeName() ) ) { - node = node.getParentNode(); + node = node.getParentNode(); if(node==null) return null; } - + String attributeName = (String) map.get(node.getNodeName() ); NamedNodeMap attributes = node.getAttributes(); - + Node att = attributes.getNamedItem(attributeName); if(att!=null && attributeName.equals(att.getNodeName() ) ) { String typename = att.getNodeValue(); if(typename!=null && typename.indexOf('.')<0) { String packageName = getPackageName(node); if(packageName!=null) { - typename = packageName + "." + typename; //$NON-NLS-1$ + typename = packageName + "." + typename; //$NON-NLS-1$ } } return typename; } - + return null; } public String getNearestType(IJavaProject project, Node parentNode) { String typename = getNearestType(parentNode); if(typename!=null) return typename; - + try { if("component".equals(parentNode.getNodeName())) { // probably need to integrate this into extractor? //$NON-NLS-1$ Node componentPropertyNodeName = parentNode.getAttributes().getNamedItem("name"); //$NON-NLS-1$ @@ -591,13 +592,13 @@ if(!StringHelper.isEmpty(qualifier)) { simpleName = Signature.toQualifiedName(new String[] { qualifier, simpleName }); } - + String[][] possibleTypes = null; - possibleTypes = parentType.resolveType(simpleName); + possibleTypes = parentType.resolveType(simpleName); if(possibleTypes != null && possibleTypes.length>0) { typename = Signature.toQualifiedName(possibleTypes[0]); } - + } } } @@ -611,39 +612,39 @@ public TableIdentifier getNearestTableName(Node node) { Map map = tableProvider; - + if(node==null) return null; - + while(!map.containsKey(node.getNodeName() ) ) { - node = node.getParentNode(); + node = node.getParentNode(); if(node==null) return null; } - + String attributeName = (String) map.get(node.getNodeName() ); NamedNodeMap attributes = node.getAttributes(); - + Node att = attributes.getNamedItem(attributeName); if(att!=null && attributeName.equals(att.getNodeName() ) ) { String typename = att.getNodeValue(); String catalog = null; String schema = null; - + Node namedItem = attributes.getNamedItem("catalog"); //$NON-NLS-1$ if(namedItem!=null) { catalog = namedItem.getNodeValue(); } - + namedItem = attributes.getNamedItem("schema"); //$NON-NLS-1$ if(namedItem!=null) { schema = namedItem.getNodeValue(); } - + return new TableIdentifier(catalog,schema,typename); } - + return null; } - + public IType getNearestTypeJavaElement(IJavaProject project, Node currentNode) { String nearestType = getNearestType(project, currentNode); if(nearestType!=null) { @@ -665,15 +666,15 @@ public List findMatchingPropertyValues(String matchString, Node node) { if(node==null) return Collections.EMPTY_LIST; - + NamedNodeMap attributes = node.getAttributes(); Node namedItem = attributes.getNamedItem("name"); //$NON-NLS-1$ String propName = namedItem.getNodeValue(); if(propName.startsWith("hibernate.")) { //$NON-NLS-1$ propName = propName.substring("hibernate.".length()); //$NON-NLS-1$ - } + } String[] strings = (String[]) hibernatePropertyValues.get(propName); - if(strings==null) { + if(strings==null) { return Collections.EMPTY_LIST; } else { List matches = new ArrayList(strings.length); @@ -681,7 +682,7 @@ String string = strings[i]; if(string.startsWith(matchString)) { matches.add(string); - } + } } return matches; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HibernateTypeHandler.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HibernateTypeHandler.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HibernateTypeHandler.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -35,6 +35,7 @@ import org.eclipse.jdt.core.ITypeHierarchy; import org.eclipse.jface.text.contentassist.CompletionProposal; import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.hibernate.eclipse.mapper.MapperMessages; import org.w3c.dom.Attr; import org.w3c.dom.Node; @@ -51,41 +52,41 @@ public ICompletionProposal[] attributeCompletionProposals(IJavaProject project, Node node, String attributeName, String start, int offset) { List types = this.extractor.findMatchingHibernateTypes(start); - - List proposals = new ArrayList(types.size() ); + + List proposals = new ArrayList(types.size() ); for (Iterator iter = types.iterator(); iter.hasNext();) { HibernateTypeDescriptor element = (HibernateTypeDescriptor) iter.next(); - String extendedinfo = Messages.HIBERANTETYPEHANDLER_HIBERNATE_TYPE + element.getName(); + String extendedinfo = MapperMessages.HibernateTypeHandler_hibernate_type + element.getName(); if(element.getReturnClass()!=null) { - extendedinfo += Messages.HIBERANTETYPEHANDLER_RETURN_CLASS + element.getReturnClass(); + extendedinfo += MapperMessages.HibernateTypeHandler_return_class + element.getReturnClass(); } if(element.getPrimitiveClass()!=null) { - extendedinfo += Messages.HIBERANTETYPEHANDLER_RETURN_PRIMITIVE + element.getPrimitiveClass(); + extendedinfo += MapperMessages.HibernateTypeHandler_return_primitive + element.getPrimitiveClass(); } proposals.add(new CompletionProposal(element.getName(), offset, start.length(), element.getName().length(), null, null, null, extendedinfo) ); } - + try { IType typeInterface = project.findType("org.hibernate.usertype.CompositeUserType"); //$NON-NLS-1$ - Set alreadyFound = new HashSet(); + Set alreadyFound = new HashSet(); if (typeInterface != null) { ITypeHierarchy hier = typeInterface.newTypeHierarchy(project, new NullProgressMonitor() ); IType[] classes = hier.getAllSubtypes(typeInterface); // TODO: cache these results ? - this.extractor.generateTypeProposals(start, offset, proposals, alreadyFound, classes,null); + this.extractor.generateTypeProposals(start, offset, proposals, alreadyFound, classes,null); } - + typeInterface = project.findType("org.hibernate.usertype.UserType"); //$NON-NLS-1$ if (typeInterface != null) { ITypeHierarchy hier = typeInterface.newTypeHierarchy(project, new NullProgressMonitor() ); IType[] classes = hier.getAllSubtypes(typeInterface); // TODO: cache these results ? - this.extractor.generateTypeProposals(start, offset, proposals, alreadyFound, classes,null); + this.extractor.generateTypeProposals(start, offset, proposals, alreadyFound, classes,null); } } catch (CoreException e) { throw new RuntimeException(e); // TODO: log as error! } - + ICompletionProposal[] result = (ICompletionProposal[]) proposals.toArray(new ICompletionProposal[proposals.size()]); - return result; + return result; } public IJavaElement getJavaElement(IJavaProject project, Node currentNode, Attr currentAttrNode) { Deleted: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/Messages.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/Messages.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -1,24 +0,0 @@ -package org.hibernate.eclipse.mapper.extractor; - -import org.eclipse.osgi.util.NLS; - -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.hibernate.eclipse.mapper.extractor.messages"; //$NON-NLS-1$ - public static String GENERATORTYPEHANDLER_GENERATOR_TYPE; - public static String GENERATORTYPEHANDLER_RETURN_CLASS; - public static String HBMINFOEXTRACTOR_ACCESS_FIELDS_DIRECTLY; - public static String HBMINFOEXTRACTOR_DO_NOT_PERFORM_ANY_ACCESS; - public static String HBMINFOEXTRACTOR_USE_JAVABEAN_ACCESSOR_METHODS; - public static String HIBERANTETYPEHANDLER_HIBERNATE_TYPE; - public static String HIBERANTETYPEHANDLER_RETURN_CLASS; - public static String HIBERANTETYPEHANDLER_RETURN_PRIMITIVE; - public static String PROPERTYACCESSHANDLER_ACCESS_METHOD; - public static String PROPERTYACCESSHANDLER_DESCRIPTION; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/PropertyAccessHandler.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/PropertyAccessHandler.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/PropertyAccessHandler.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -35,6 +35,7 @@ import org.eclipse.jdt.core.ITypeHierarchy; import org.eclipse.jface.text.contentassist.CompletionProposal; import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.hibernate.eclipse.mapper.MapperMessages; import org.w3c.dom.Attr; import org.w3c.dom.Node; @@ -48,20 +49,20 @@ public ICompletionProposal[] attributeCompletionProposals(IJavaProject project, Node node, String attributeName, String start, int offset) { List types = this.extractor.findMatchingAccessMethods(start); - - List proposals = new ArrayList(types.size() ); + + List proposals = new ArrayList(types.size() ); for (Iterator iter = types.iterator(); iter.hasNext();) { HibernateTypeDescriptor element = (HibernateTypeDescriptor) iter.next(); - String extendedinfo = Messages.PROPERTYACCESSHANDLER_ACCESS_METHOD + element.getName(); + String extendedinfo = MapperMessages.PropertyAccessHandler_access_method + element.getName(); if(element.getReturnClass()!=null) { - extendedinfo += Messages.PROPERTYACCESSHANDLER_DESCRIPTION + element.getReturnClass(); + extendedinfo += MapperMessages.PropertyAccessHandler_description + element.getReturnClass(); } proposals.add(new CompletionProposal(element.getName(), offset, start.length(), element.getName().length(), null, null, null, extendedinfo) ); } - + try { IType typeInterface = project.findType("org.hibernate.property.PropertyAccessor"); //$NON-NLS-1$ - Set alreadyFound = new HashSet(); + Set alreadyFound = new HashSet(); if (typeInterface != null) { ITypeHierarchy hier = typeInterface.newTypeHierarchy(project, new NullProgressMonitor() ); IType[] classes = hier.getAllSubtypes(typeInterface); // TODO: cache these results ? @@ -70,9 +71,9 @@ } catch (CoreException e) { throw new RuntimeException(e); // TODO: log as error! } - + ICompletionProposal[] result = (ICompletionProposal[]) proposals.toArray(new ICompletionProposal[proposals.size()]); - return result; + return result; } public IJavaElement getJavaElement(IJavaProject project, Node currentNode, Attr currentAttrNode) { Deleted: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/messages.properties 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/messages.properties 2008-06-06 16:51:42 UTC (rev 8615) @@ -1,10 +0,0 @@ -GENERATORTYPEHANDLER_GENERATOR_TYPE=<b>Generator type</b>: -GENERATORTYPEHANDLER_RETURN_CLASS=<br><b>Return class</b>: -HBMINFOEXTRACTOR_ACCESS_FIELDS_DIRECTLY=Access fields directly -HBMINFOEXTRACTOR_DO_NOT_PERFORM_ANY_ACCESS=Do not perform any access. Use with HQL-only properties -HBMINFOEXTRACTOR_USE_JAVABEAN_ACCESSOR_METHODS=Use JavaBean accessor methods -HIBERANTETYPEHANDLER_HIBERNATE_TYPE=<b>Hibernate type</b>: -HIBERANTETYPEHANDLER_RETURN_CLASS=<br><b>Return class</b>: -HIBERANTETYPEHANDLER_RETURN_PRIMITIVE=<br><b>Return primitive</b>: -PROPERTYACCESSHANDLER_ACCESS_METHOD=<b>Access method</b>: -PROPERTYACCESSHANDLER_DESCRIPTION=<br><b>Description</b>: Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/DOMReverseEngineeringDefinition.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/DOMReverseEngineeringDefinition.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/DOMReverseEngineeringDefinition.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -40,6 +40,7 @@ import org.hibernate.eclipse.console.model.IReverseEngineeringDefinition; import org.hibernate.eclipse.console.model.ITableFilter; import org.hibernate.eclipse.console.model.ITypeMapping; +import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.eclipse.mapper.factory.ObserverAdapterFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -48,63 +49,63 @@ public class DOMReverseEngineeringDefinition implements IReverseEngineeringDefinition { private IModelStateListener listener = new IModelStateListener() { - + public void modelReinitialized(IStructuredModel structuredModel) { - //System.out.println("reinit" + structuredModel); + //System.out.println("reinit" + structuredModel); } - + public void modelAboutToBeReinitialized(IStructuredModel structuredModel) { - //System.out.println("about to be reinit" + structuredModel); + //System.out.println("about to be reinit" + structuredModel); } - + public void modelResourceMoved(IStructuredModel oldModel, IStructuredModel newModel) { - //System.out.println("res moved" + oldModel); + //System.out.println("res moved" + oldModel); } - + public void modelResourceDeleted(IStructuredModel model) { - //System.out.println("deleted" + model); + //System.out.println("deleted" + model); } - + public void modelDirtyStateChanged(IStructuredModel model, boolean isDirty) { //System.out.println("dirty changed " + model + " to " + isDirty); - + } - + int cnt = 0; public void modelChanged(IStructuredModel model) { //System.out.println("model changed" + cnt++); //pcs.firePropertyChange(null, null, null); } - + public void modelAboutToBeChanged(IStructuredModel model) { //System.out.println("about to be changed" + cnt++); - + } - + }; - + private ObserverAdapterFactory factory; private IDOMDocument document; public DOMReverseEngineeringDefinition(IDOMDocument document) { this.document = document; - factory = new ObserverAdapterFactory(this); - + factory = new ObserverAdapterFactory(this); + document.getModel().addModelStateListener(listener); factory.adapt(document); } - public ITableFilter createTableFilter() { + public ITableFilter createTableFilter() { return (ITableFilter) factory.adapt((INodeNotifier) getDocument().createElement("table-filter")); //$NON-NLS-1$ } - + public void addTableFilter(ITableFilter filter) { if ( filter instanceof TableFilterAdapter ) { TableFilterAdapter tf = (TableFilterAdapter) filter; factory.adapt((INodeNotifier) tf.getNode()); - + List lastChild = DOMModelUtil.getChildrenByTagName(getDocument().getDocumentElement(),"table-filter"); //$NON-NLS-1$ if(lastChild==null || lastChild.isEmpty()) { List typeMapping = DOMModelUtil.getChildrenByTagName(getDocument().getDocumentElement(),"type-mapping"); //$NON-NLS-1$ @@ -114,7 +115,7 @@ getDocument().getDocumentElement().appendChild(tf.getNode()); } else { Element e = (Element) tableMapping.get(tableMapping.size()-1); - getDocument().getDocumentElement().insertBefore(tf.getNode(),e); + getDocument().getDocumentElement().insertBefore(tf.getNode(),e); } } else { Element e = (Element) typeMapping.get(typeMapping.size()-1); @@ -122,16 +123,16 @@ } } else { Element e = (Element) lastChild.get(lastChild.size()-1); - getDocument().getDocumentElement().insertBefore(tf.getNode(), e.getNextSibling()); + getDocument().getDocumentElement().insertBefore(tf.getNode(), e.getNextSibling()); } - + DOMModelUtil.formatNode(tf.getNode().getParentNode()); } - + } PropertyChangeSupport pcs = new PropertyChangeSupport(this); - + public void addPropertyChangeListener(PropertyChangeListener pcl) { pcs.addPropertyChangeListener(pcl); } @@ -139,9 +140,9 @@ public void removePropertyChangeListener(PropertyChangeListener pcl) { pcs.removePropertyChangeListener(pcl); } - + public void addPropertyChangeListener(String property, PropertyChangeListener pcl) { - pcs.addPropertyChangeListener(property, pcl); + pcs.addPropertyChangeListener(property, pcl); } public void removePropertyChangeListener(String property, PropertyChangeListener pcl) { @@ -179,7 +180,7 @@ TableFilterAdapter tfe = (TableFilterAdapter) item; Node nextSibling = DOMModelUtil.getNextNamedSibling( tfe.getNode(), "table-filter" ); //$NON-NLS-1$ if(nextSibling!=null) { - DOMModelUtil.addElementBefore(tfe.getNode().getParentNode(), nextSibling, tfe.getNode()); + DOMModelUtil.addElementBefore(tfe.getNode().getParentNode(), nextSibling, tfe.getNode()); } pcs.firePropertyChange(TABLEFILTER_STRUCTURE,null, null); } @@ -188,26 +189,26 @@ public void moveTableFilterUp(ITableFilter item) { if ( item instanceof TableFilterAdapter ) { TableFilterAdapter tfe = (TableFilterAdapter) item; - + Node sibling = DOMModelUtil.getPreviousNamedSibling( tfe.getNode(), "table-filter"); //$NON-NLS-1$ if(sibling!=null) { - DOMModelUtil.addElementBefore(tfe.getNode().getParentNode(), tfe.getNode(), sibling); + DOMModelUtil.addElementBefore(tfe.getNode().getParentNode(), tfe.getNode(), sibling); } pcs.firePropertyChange(TABLEFILTER_STRUCTURE,null, null); } } - + private List getTableFiltersList() { return DOMModelUtil.getAdaptedElements(getDocument().getDocumentElement(), "table-filter", factory); //$NON-NLS-1$ } public void unknownNotifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) { - String out = NLS.bind(Messages.DOMREVERSEENGINEERINGDEFINITION_UNKNOWN_CHANGE, notifier, INodeNotifier.EVENT_TYPE_STRINGS[eventType]); + String out = NLS.bind(MapperMessages.DOMReverseEngineeringDefinition_unknown_change, notifier, INodeNotifier.EVENT_TYPE_STRINGS[eventType]); System.out.println(out); } public void hibernateMappingChanged() { - pcs.firePropertyChange(TABLEFILTER_STRUCTURE,null,null); + pcs.firePropertyChange(TABLEFILTER_STRUCTURE,null,null); pcs.firePropertyChange(TYPEMAPPING_STRUCTURE,null,null); pcs.firePropertyChange(TABLES_STRUCTURE,null,null); } @@ -241,7 +242,7 @@ public void addTypeMapping(ITypeMapping typeMapping) { if ( typeMapping instanceof TypeMappingAdapter ) { TypeMappingAdapter tf = (TypeMappingAdapter) typeMapping; - + List parentList = DOMModelUtil.getChildrenByTagName(getDocument().getDocumentElement(),"type-mapping"); //$NON-NLS-1$ Element parent; if(parentList.isEmpty()) { @@ -258,15 +259,15 @@ } parent.appendChild(tf.getNode()); DOMModelUtil.formatNode(tf.getNode().getParentNode()); - } + } } public void typeMappingChanged(INodeNotifier notifier) { - pcs.firePropertyChange(TYPEMAPPING_STRUCTURE, null,null); + pcs.firePropertyChange(TYPEMAPPING_STRUCTURE, null,null); } public void sqlTypeChanged(INodeNotifier notifier) { - pcs.firePropertyChange(TYPEMAPPING_STRUCTURE, null,null); + pcs.firePropertyChange(TYPEMAPPING_STRUCTURE, null,null); } public void moveTypeMappingDown(ITypeMapping item) { @@ -274,22 +275,22 @@ TypeMappingAdapter tfe = (TypeMappingAdapter) item; Node nextSibling = DOMModelUtil.getNextNamedSibling( tfe.getNode(), "sql-type" ); //$NON-NLS-1$ if(nextSibling!=null) { - DOMModelUtil.addElementBefore(tfe.getNode().getParentNode(), nextSibling, tfe.getNode()); - } - } + DOMModelUtil.addElementBefore(tfe.getNode().getParentNode(), nextSibling, tfe.getNode()); + } + } } public void moveTypeMappingUp(ITypeMapping item) { if ( item instanceof TypeMappingAdapter ) { TypeMappingAdapter tfe = (TypeMappingAdapter) item; - + Node sibling = DOMModelUtil.getPreviousNamedSibling( tfe.getNode(), "sql-type"); //$NON-NLS-1$ if(sibling!=null) { - DOMModelUtil.addElementBefore(tfe.getNode().getParentNode(), tfe.getNode(), sibling); + DOMModelUtil.addElementBefore(tfe.getNode().getParentNode(), tfe.getNode(), sibling); } } } - + public void removeAllTypeMappings() { List list = getTypeMappingsList(); for (java.util.Iterator it = list.iterator(); it.hasNext(); ) { @@ -324,7 +325,7 @@ } public void tablesChanged(INodeNotifier notifier) { - pcs.firePropertyChange(TABLES_STRUCTURE, null,null); + pcs.firePropertyChange(TABLES_STRUCTURE, null,null); } public INodeAdapterFactory getNodeFactory() { @@ -342,11 +343,11 @@ public void addTable(IRevEngTable retable) { if ( retable instanceof RevEngTableAdapter ) { RevEngTableAdapter tf = (RevEngTableAdapter) retable; - + getDocument().getDocumentElement().appendChild(tf.getNode()); - + DOMModelUtil.formatNode(tf.getNode().getParentNode()); - } + } } public void removeTable(IRevEngTable retable) { Deleted: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/Messages.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/Messages.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -1,16 +0,0 @@ -package org.hibernate.eclipse.mapper.model; - -import org.eclipse.osgi.util.NLS; - -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.hibernate.eclipse.mapper.model.messages"; //$NON-NLS-1$ - public static String DOMREVERSEENGINEERINGDEFINITION_UNKNOWN_CHANGE; - public static String REVENGPRIMARYKEYADAPTER_COLUMN; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/RevEngPrimaryKeyAdapter.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/RevEngPrimaryKeyAdapter.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/RevEngPrimaryKeyAdapter.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -27,6 +27,7 @@ import org.hibernate.eclipse.console.model.IRevEngColumn; import org.hibernate.eclipse.console.model.IRevEngGenerator; import org.hibernate.eclipse.console.model.IRevEngPrimaryKey; +import org.hibernate.eclipse.mapper.MapperMessages; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -64,7 +65,7 @@ public void addColumn() { RevEngColumnAdapter key = (RevEngColumnAdapter) getModel().createKeyColumn(); - key.setName(Messages.REVENGPRIMARYKEYADAPTER_COLUMN + (getColumns().length+1)); + key.setName(MapperMessages.RevEngPrimaryKeyAdapter_column + (getColumns().length+1)); getNode().appendChild(key.getNode()); DOMModelUtil.formatNode(getNode().getParentNode()); } Deleted: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/messages.properties 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/messages.properties 2008-06-06 16:51:42 UTC (rev 8615) @@ -1,2 +0,0 @@ -DOMREVERSEENGINEERINGDEFINITION_UNKNOWN_CHANGE=Unknown change: {0} {1} -REVENGPRIMARYKEYADAPTER_COLUMN=column_ Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/HibernateXMLContentOutlineConfiguration.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/HibernateXMLContentOutlineConfiguration.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/HibernateXMLContentOutlineConfiguration.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -31,6 +31,7 @@ import org.eclipse.wst.xml.ui.views.contentoutline.XMLContentOutlineConfiguration; import org.hibernate.console.ImageConstants; import org.hibernate.eclipse.console.utils.EclipseImages; +import org.hibernate.eclipse.mapper.MapperMessages; import org.w3c.dom.Node; public class HibernateXMLContentOutlineConfiguration extends @@ -40,25 +41,25 @@ private JFaceNodeAdapterFactoryForXML myFactory; protected IJFaceNodeAdapterFactory getFactory() { - + if(myFactory==null) { IJFaceNodeAdapterFactory realFactory = super.getFactory(); - + myFactory = new JFaceNodeAdapterFactoryForXML(realFactory); } return myFactory; }*/ - - + + private HibernateToolsLabelProvider labelProvider; public ILabelProvider getLabelProvider(TreeViewer viewer) { if(labelProvider==null) { labelProvider = new HibernateToolsLabelProvider(super.getLabelProvider(viewer)); - } + } return labelProvider; } - + static class HibernateToolsLabelProvider implements ILabelProvider { ILabelProvider delegate; @@ -88,7 +89,7 @@ nameToMap.put("one-to-one", ImageConstants.ONETOONE); //$NON-NLS-1$ nameToMap.put("component", ImageConstants.ONETOONE); //$NON-NLS-1$ } - + public Image getImage(Object element) { Node node = (Node) element; if(node.getNodeType()==Node.ELEMENT_NODE) { @@ -105,7 +106,7 @@ Node node = (Node) element; String nodeName = node.getNodeName(); if(node.getNodeType()==Node.PROCESSING_INSTRUCTION_NODE && "xml".equals(nodeName)) { //$NON-NLS-1$ - return Messages.XML_HIBERNATE_TOOLS; + return MapperMessages.xml_hibernate_tools; } } return delegate.getText( element ); @@ -119,5 +120,5 @@ delegate.removeListener( listener ); } } - + } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/JFaceNodeAdapterForXML.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/JFaceNodeAdapterForXML.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/JFaceNodeAdapterForXML.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -31,13 +31,14 @@ import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeAdapterFactory; import org.hibernate.console.ImageConstants; import org.hibernate.eclipse.console.utils.EclipseImages; +import org.hibernate.eclipse.mapper.MapperMessages; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; /** * For xml files in general. - * + * * Adapts a DOM node to a JFace viewer. */ public class JFaceNodeAdapterForXML extends JFaceNodeAdapter { @@ -54,15 +55,15 @@ */ public String getLabelText(Object object) { String result = getNodeName(object); - Node node = (Node) object; + Node node = (Node) object; NamedNodeMap attributes = node.getAttributes(); if(attributes!=null) { Node firstAttribute = attributes.item(0); if(firstAttribute!=null) { return result + " " + firstAttribute.getNodeName() + "=\"" + firstAttribute.getNodeValue() + "\""; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ - } - } - + } + } + return result; } @@ -70,7 +71,7 @@ Node node = (Node) object; String nodeName = node.getNodeName(); if(node.getNodeType()==Node.PROCESSING_INSTRUCTION_NODE && "xml".equals(nodeName)) { //$NON-NLS-1$ - return Messages.XML_HIBERNATE_TOOLS; + return MapperMessages.xml_hibernate_tools; } return nodeName; } @@ -92,8 +93,8 @@ public boolean isAdapterForType(Object type) { return type.equals(ADAPTER_KEY); } - - + + static Map nameToMap = new HashMap(); static { nameToMap.put("many-to-one", ImageConstants.MANYTOONE); //$NON-NLS-1$ @@ -107,7 +108,7 @@ nameToMap.put("one-to-one", ImageConstants.ONETOONE); //$NON-NLS-1$ nameToMap.put("component", ImageConstants.ONETOONE); //$NON-NLS-1$ } - + protected Image createImage(Object object) { Node node = (Node) object; if(node.getNodeType()==Node.ELEMENT_NODE) { Deleted: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/Messages.java 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/Messages.java 2008-06-06 16:51:42 UTC (rev 8615) @@ -1,15 +0,0 @@ -package org.hibernate.eclipse.mapper.views.contentoutline; - -import org.eclipse.osgi.util.NLS; - -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.hibernate.eclipse.mapper.views.contentoutline.messages"; //$NON-NLS-1$ - public static String XML_HIBERNATE_TOOLS; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} Deleted: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/messages.properties 2008-06-06 16:51:19 UTC (rev 8614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/messages.properties 2008-06-06 16:51:42 UTC (rev 8615) @@ -1 +0,0 @@ -XML_HIBERNATE_TOOLS=xml (Hibernate Tools)