Author: snjeza Date: 2008-11-15 13:40:33 -0500 (Sat, 15 Nov 2008) New Revision: 11808 Added: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/Messages.java trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/messages.properties Modified: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/META-INF/MANIFEST.MF trunk/birt/plugins/org.jboss.tools.birt.oda.ui/plugin.properties trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/Activator.java trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/CustomDataSetWizardPage.java trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/HibernateDSDropSource.java trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/HibernateSelectionPageHelper.java trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/TextMenuManager.java Log: JBIDE-3000 Internationalize BIRT component Modified: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/META-INF/MANIFEST.MF 2008-11-14 22:10:43 UTC (rev 11807) +++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/META-INF/MANIFEST.MF 2008-11-15 18:40:33 UTC (rev 11808) @@ -4,7 +4,7 @@ Bundle-SymbolicName: org.jboss.tools.birt.oda.ui;singleton:=true Bundle-Version: 1.0.0 Bundle-Activator: org.jboss.tools.birt.oda.ui.Activator -Bundle-Vendor: JBoss, a division of Red Hat +Bundle-Vendor: %BundleVendor Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, Modified: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/plugin.properties =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/plugin.properties 2008-11-14 22:10:43 UTC (rev 11807) +++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/plugin.properties 2008-11-15 18:40:33 UTC (rev 11808) @@ -14,3 +14,5 @@ profile.propertypage.name=Hibernate Data Source Connection Properties wizard.data.set.window.title=New Hibernate Data Set wizard.data.set.page.title=Query + +BundleVendor = JBoss, a division of Red Hat \ No newline at end of file Modified: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/Activator.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/Activator.java 2008-11-14 22:10:43 UTC (rev 11807) +++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/Activator.java 2008-11-15 18:40:33 UTC (rev 11808) @@ -20,7 +20,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.birt.oda.ui"; + public static final String PLUGIN_ID = "org.jboss.tools.birt.oda.ui"; //$NON-NLS-1$ // The shared instance private static Activator plugin; Added: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/Messages.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/Messages.java (rev 0) +++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/Messages.java 2008-11-15 18:40:33 UTC (rev 11808) @@ -0,0 +1,40 @@ +package org.jboss.tools.birt.oda.ui; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.birt.oda.ui.messages"; //$NON-NLS-1$ + public static String CustomDataSetWizardPage_Avaliable_Items; + public static String CustomDataSetWizardPage_Define_the_query_text_for_the_data_set; + public static String CustomDataSetWizardPage_Invalid_configuration; + public static String CustomDataSetWizardPage_Requires_input_value; + public static String CustomDataSetWizardPage_Test_query; + public static String CustomDataSetWizardPage_Test_query1; + public static String CustomDataSetWizardPage_The_query_is_not_valid; + public static String CustomDataSetWizardPage_The_query_is_valid; + public static String HibernateSelectionPageHelper_Configuration; + public static String HibernateSelectionPageHelper_Configuration_must_not_be_empty; + public static String HibernateSelectionPageHelper_Connection_successfull; + public static String HibernateSelectionPageHelper_Edit_the_selected_data_source; + public static String HibernateSelectionPageHelper_Invalid_configuration; + public static String HibernateSelectionPageHelper_JNDI_URL; + public static String HibernateSelectionPageHelper_Max_results; + public static String HibernateSelectionPageHelper_Test_connection; + public static String HibernateSelectionPageHelper_Test_connection1; + public static String TextMenuManager_Content_Assist; + public static String TextMenuManager_Content_Tip; + public static String TextMenuManager_Copy; + public static String TextMenuManager_Cut; + public static String TextMenuManager_Format_HQL_source; + public static String TextMenuManager_Paste; + public static String TextMenuManager_Redo; + public static String TextMenuManager_Select_all; + public static String TextMenuManager_Undo; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Modified: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/CustomDataSetWizardPage.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/CustomDataSetWizardPage.java 2008-11-14 22:10:43 UTC (rev 11807) +++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/CustomDataSetWizardPage.java 2008-11-15 18:40:33 UTC (rev 11808) @@ -50,6 +50,7 @@ import org.eclipse.jface.text.source.SourceViewer; import org.eclipse.jface.text.source.SourceViewerConfiguration; import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.events.KeyEvent; @@ -94,6 +95,7 @@ import org.jboss.tools.birt.oda.IOdaFactory; import org.jboss.tools.birt.oda.impl.HibernateDriver; import org.jboss.tools.birt.oda.ui.Activator; +import org.jboss.tools.birt.oda.ui.Messages; /** * Hibernate data set designer page @@ -102,7 +104,7 @@ */ public class CustomDataSetWizardPage extends DataSetWizardPage { - private static String DEFAULT_MESSAGE = "Define the query text for the data set"; + private static String DEFAULT_MESSAGE = Messages.CustomDataSetWizardPage_Define_the_query_text_for_the_data_set; private StyledText styledText; @@ -323,7 +325,7 @@ SourceViewerConfiguration svc = new HQLSourceViewerConfiguration(editor); sourceViewer.configure(svc); testButton = new Button(composite, SWT.NONE); - testButton.setText("Test query ..."); + testButton.setText(Messages.CustomDataSetWizardPage_Test_query); testButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -335,11 +337,11 @@ } private void testQuery() { - String title = "Test query"; + String title = Messages.CustomDataSetWizardPage_Test_query1; ConsoleConfiguration configuration = getInternalConsoleConfiguration(); if (configuration == null || configuration.getSessionFactory() == null) { MessageDialog.openConfirm(getShell(), title, - "Invalid configuration '" + getConfigurationName() + "'."); + NLS.bind(Messages.CustomDataSetWizardPage_Invalid_configuration, getConfigurationName())); } try { //session = configuration.getSessionFactory().openSession(); @@ -350,9 +352,9 @@ //q.setMaxResults(1); //q.list(); MessageDialog.openInformation(getShell(), title, - "The query is valid."); + Messages.CustomDataSetWizardPage_The_query_is_valid); } catch (Exception e) { - String message = "The query is not valid."; + String message = Messages.CustomDataSetWizardPage_The_query_is_not_valid; IStatus status = new Status(Status.ERROR, Activator.PLUGIN_ID, e .getLocalizedMessage(), e); Activator.getDefault().getLog().log(status); @@ -372,7 +374,7 @@ for (int i = 0; i < translators.length; i++) { QueryTranslator translator = translators[i]; if(translator.isManipulationStatement()) { - str.append(HibernateConsoleMessages.DynamicSQLPreviewView_manipulation_of + i + ":"); //$NON-NLS-1$ + str.append("Manipulation of" + i + ":"); //$NON-NLS-1$ //$NON-NLS-2$ Iterator iterator = translator.getQuerySpaces().iterator(); while ( iterator.hasNext() ) { Object qspace = iterator.next(); @@ -438,7 +440,7 @@ composite.setLayoutData(data); Label dataSourceLabel = new Label(composite, SWT.LEFT); - dataSourceLabel.setText("Available Items"); + dataSourceLabel.setText(Messages.CustomDataSetWizardPage_Avaliable_Items); data = new GridData(); dataSourceLabel.setLayoutData(data); @@ -506,11 +508,11 @@ private String getInitialQueryString() { DataSetDesign dataSetDesign = getInitializationDesign(); if (dataSetDesign == null) - return ""; // nothing to initialize + return ""; // nothing to initialize //$NON-NLS-1$ String queryText = dataSetDesign.getQueryText(); if (queryText == null) { - return ""; + return ""; //$NON-NLS-1$ } return queryText; } @@ -578,7 +580,7 @@ if (isValid) setMessage(DEFAULT_MESSAGE); else - setMessage("Requires input value.", ERROR); + setMessage(Messages.CustomDataSetWizardPage_Requires_input_value, ERROR); if (testButton != null) { testButton.setEnabled(isValid); @@ -731,7 +733,7 @@ ParameterDefinition paramDef = (ParameterDefinition) paramDesign .getParameterDefinitions().get(0); if (paramDef != null) - paramDef.setDefaultScalarValue("dummy default value"); + paramDef.setDefaultScalarValue("dummy default value"); //$NON-NLS-1$ } } Modified: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/HibernateDSDropSource.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/HibernateDSDropSource.java 2008-11-14 22:10:43 UTC (rev 11807) +++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/HibernateDSDropSource.java 2008-11-15 18:40:33 UTC (rev 11808) @@ -78,8 +78,8 @@ } private String getShortName(String name) { - while (name.indexOf(".") > -1) - name = name.substring(name.indexOf(".") + 1); + while (name.indexOf(".") > -1) //$NON-NLS-1$ + name = name.substring(name.indexOf(".") + 1); //$NON-NLS-1$ return name; } Modified: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/HibernateSelectionPageHelper.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/HibernateSelectionPageHelper.java 2008-11-14 22:10:43 UTC (rev 11807) +++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/HibernateSelectionPageHelper.java 2008-11-15 18:40:33 UTC (rev 11808) @@ -17,6 +17,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -36,6 +37,7 @@ import org.hibernate.console.KnownConfigurations; import org.jboss.tools.birt.oda.IOdaFactory; import org.jboss.tools.birt.oda.ui.Activator; +import org.jboss.tools.birt.oda.ui.Messages; /** * Helper class for Hibernate wizard and property page @@ -45,7 +47,7 @@ */ public class HibernateSelectionPageHelper { - private static final String DEFAULT_MAX_ROWS = "100"; + private static final String DEFAULT_MAX_ROWS = "100"; //$NON-NLS-1$ private WizardPage wizardPage; private PreferencePage propertyPage; private Combo configurationCombo; @@ -73,7 +75,7 @@ GridData gridData; Label configurationLabel = new Label(composite, SWT.RIGHT); - configurationLabel.setText("Configuration:"); + configurationLabel.setText(Messages.HibernateSelectionPageHelper_Configuration); configurationCombo = new Combo(composite, SWT.NONE); gridData = new GridData(); @@ -83,7 +85,7 @@ configurationCombo.setLayoutData(gridData); Label jndiLabel = new Label(composite, SWT.RIGHT); - jndiLabel.setText("JNDI URL:"); + jndiLabel.setText(Messages.HibernateSelectionPageHelper_JNDI_URL); jndiSessionFactoryName = new Text(composite,SWT.BORDER); gridData = new GridData(); @@ -101,7 +103,7 @@ configurationCombo.setItems(configurationNames); Label maxFetchLabel = new Label(composite, SWT.NONE); - maxFetchLabel.setText("Max results:"); + maxFetchLabel.setText(Messages.HibernateSelectionPageHelper_Max_results); maxRows = new Text(composite, SWT.BORDER); maxRows.setLayoutData(gridData); @@ -119,7 +121,7 @@ new Label(composite, SWT.NONE); testButton = new Button(composite, SWT.PUSH); - testButton.setText("Test Connection..."); + testButton.setText(Messages.HibernateSelectionPageHelper_Test_connection); testButton.setLayoutData(new GridData(GridData.CENTER)); testButton.addSelectionListener(new SelectionAdapter() { @@ -139,11 +141,11 @@ if (jndiName == null || jndiName.length() <= 0) { String configurationName = configurationCombo.getText(); if (configurationName != null && configurationName.length() > 0) { - int index = configurationName.indexOf("-ejb"); + int index = configurationName.indexOf("-ejb"); //$NON-NLS-1$ if (index > 0) { configurationName = configurationName.substring(0,index); } - jndiSessionFactoryName.setText("java:/" + configurationName); + jndiSessionFactoryName.setText("java:/" + configurationName); //$NON-NLS-1$ } } } @@ -164,11 +166,11 @@ private void validateData() { if (configurationCombo.getText().trim().length() > 0) { - setMessage("Edit the selected data source"); + setMessage(Messages.HibernateSelectionPageHelper_Edit_the_selected_data_source); testButton.setEnabled(true); setPageComplete(true); } else { - setMessage("Configuration must not be empty", + setMessage(Messages.HibernateSelectionPageHelper_Configuration_must_not_be_empty, IMessageProvider.ERROR); testButton.setEnabled(false); setPageComplete(false); @@ -198,7 +200,7 @@ ConsoleConfiguration[] configurations = KnownConfigurations .getInstance().getConfigurations(); ConsoleConfiguration consoleConfiguration = null; - String title = "Test connection"; + String title = Messages.HibernateSelectionPageHelper_Test_connection1; for (int i = 0; i < configurations.length; i++) { if (configurations[i].getName().equals(configurationName)) { consoleConfiguration = configurations[i]; @@ -215,7 +217,7 @@ sessionFactory = consoleConfiguration.getSessionFactory(); } MessageDialog.openInformation(getShell(), title, - "Connection successfull."); + Messages.HibernateSelectionPageHelper_Connection_successfull); } catch (HibernateException e) { String message = e.getLocalizedMessage(); IStatus status = new Status(Status.ERROR, Activator.PLUGIN_ID, @@ -225,7 +227,7 @@ } } else { MessageDialog.openConfirm(getShell(), title, - "Invalid configuration '" + configurationName + "'."); + NLS.bind(Messages.HibernateSelectionPageHelper_Invalid_configuration, configurationName)); } Modified: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/TextMenuManager.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/TextMenuManager.java 2008-11-14 22:10:43 UTC (rev 11807) +++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/TextMenuManager.java 2008-11-15 18:40:33 UTC (rev 11808) @@ -12,6 +12,7 @@ import org.eclipse.jface.text.TextViewer; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Menu; +import org.jboss.tools.birt.oda.ui.Messages; /** @@ -39,17 +40,17 @@ manager.add( separator ); separator = new Separator( "select" );//$NON-NLS-1$ manager.add( separator ); - manager.appendToGroup( "undo", getAction( "undo", viewer, "Undo", ITextOperationTarget.UNDO ) ); - manager.appendToGroup( "undo", getAction( "redo", viewer, "Redo", ITextOperationTarget.REDO ) ); - manager.appendToGroup( "copy", getAction( "cut", viewer, "Cut", ITextOperationTarget.CUT ) ); - manager.appendToGroup( "copy", getAction( "copy", viewer, "Copy", ITextOperationTarget.COPY ) );//$NON-NLS-1$ - manager.appendToGroup( "copy", getAction( "paste", viewer, "Paste", ITextOperationTarget.PASTE ) );//$NON-NLS-1$ - manager.appendToGroup( "select", getAction( "selectall", viewer, "Select all", ITextOperationTarget.SELECT_ALL ) );//$NON-NLS-1$ + manager.appendToGroup( "undo", getAction( "undo", viewer, Messages.TextMenuManager_Undo, ITextOperationTarget.UNDO ) ); //$NON-NLS-1$ //$NON-NLS-2$ + manager.appendToGroup( "undo", getAction( "redo", viewer, Messages.TextMenuManager_Redo, ITextOperationTarget.REDO ) ); //$NON-NLS-1$ //$NON-NLS-2$ + manager.appendToGroup( "copy", getAction( "cut", viewer, Messages.TextMenuManager_Cut, ITextOperationTarget.CUT ) ); //$NON-NLS-1$ //$NON-NLS-2$ + manager.appendToGroup( "copy", getAction( "copy", viewer, Messages.TextMenuManager_Copy, ITextOperationTarget.COPY ) );//$NON-NLS-1$ //$NON-NLS-2$ + manager.appendToGroup( "copy", getAction( "paste", viewer, Messages.TextMenuManager_Paste, ITextOperationTarget.PASTE ) );//$NON-NLS-1$ //$NON-NLS-2$ + manager.appendToGroup( "select", getAction( "selectall", viewer, Messages.TextMenuManager_Select_all, ITextOperationTarget.SELECT_ALL ) );//$NON-NLS-1$ //$NON-NLS-2$ - manager.add( new Separator("hql") ); - manager.appendToGroup( "hql", getAction("contentAssist", viewer, "Content Assist",13)); - manager.appendToGroup( "hql", getAction("contentTip", viewer, "Content Tip",14)); - manager.appendToGroup( "hql", getAction("format", viewer, "Format HQL source",15)); + manager.add( new Separator("hql") ); //$NON-NLS-1$ + manager.appendToGroup( "hql", getAction("contentAssist", viewer, Messages.TextMenuManager_Content_Assist,13)); //$NON-NLS-1$ //$NON-NLS-2$ + manager.appendToGroup( "hql", getAction("contentTip", viewer, Messages.TextMenuManager_Content_Tip,14)); //$NON-NLS-1$ //$NON-NLS-2$ + manager.appendToGroup( "hql", getAction("format", viewer, Messages.TextMenuManager_Format_HQL_source,15)); //$NON-NLS-1$ //$NON-NLS-2$ manager.addMenuListener( new IMenuListener( ) { Added: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/messages.properties =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/messages.properties (rev 0) +++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/messages.properties 2008-11-15 18:40:33 UTC (rev 11808) @@ -0,0 +1,26 @@ +CustomDataSetWizardPage_Avaliable_Items=Available Items +CustomDataSetWizardPage_Define_the_query_text_for_the_data_set=Define the query text for the data set +CustomDataSetWizardPage_Invalid_configuration=Invalid configuration ''{0}''. +CustomDataSetWizardPage_Requires_input_value=Requires input value. +CustomDataSetWizardPage_Test_query=Test query ... +CustomDataSetWizardPage_Test_query1=Test query +CustomDataSetWizardPage_The_query_is_not_valid=The query is not valid. +CustomDataSetWizardPage_The_query_is_valid=The query is valid. +HibernateSelectionPageHelper_Configuration=Configuration: +HibernateSelectionPageHelper_Configuration_must_not_be_empty=Configuration must not be empty +HibernateSelectionPageHelper_Connection_successfull=Connection successfull. +HibernateSelectionPageHelper_Edit_the_selected_data_source=Edit the selected data source +HibernateSelectionPageHelper_Invalid_configuration=Invalid configuration ''{0}''. +HibernateSelectionPageHelper_JNDI_URL=JNDI URL: +HibernateSelectionPageHelper_Max_results=Max results: +HibernateSelectionPageHelper_Test_connection=Test Connection... +HibernateSelectionPageHelper_Test_connection1=Test connection +TextMenuManager_Content_Assist=Content Assist +TextMenuManager_Content_Tip=Content Tip +TextMenuManager_Copy=Copy +TextMenuManager_Cut=Cut +TextMenuManager_Format_HQL_source=Format HQL source +TextMenuManager_Paste=Paste +TextMenuManager_Redo=Redo +TextMenuManager_Select_all=Select all +TextMenuManager_Undo=Undo