| author | Rainer Pielmann | 2012-02-09 11:35:51 (EST) |
|---|---|---|
| committer | Stephan Born | 2012-04-27 06:56:11 (EDT) |
| commit | 7d3991154f563e9899ef1d755948d8bec95593db (patch) (side-by-side diff) | |
| tree | 7a3925b98ba9f9fe50ff67c76783059f130999ca | |
| parent | 23f9c6747d31b2b9e8c39f7e86a8fc7307d65d41 (diff) | |
| download | org.eclipse.stardust.reporting.ui-7d3991154f563e9899ef1d755948d8bec95593db.zip org.eclipse.stardust.reporting.ui-7d3991154f563e9899ef1d755948d8bec95593db.tar.gz org.eclipse.stardust.reporting.ui-7d3991154f563e9899ef1d755948d8bec95593db.tar.bz2 | |
Jira-ID: CRNT-23200 Stardust: Rename NL Plugins to new name pattern (fixing missing externalized Strings)
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/reporting.ui@53675 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
32 files changed, 186 insertions, 159 deletions
diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/JdbcPlugin.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/JdbcPlugin.java index 3ea93df..7a44428 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/JdbcPlugin.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/JdbcPlugin.java @@ -58,7 +58,7 @@ public class JdbcPlugin extends AbstractUIPlugin plugin = this; try { - resourceBundle = ResourceBundle.getBundle( "org.eclipse.stardust.reporting.oda.jdbc.ui.nls.JdbcPluginResources" ); + resourceBundle = ResourceBundle.getBundle( "org.eclipse.stardust.reporting.oda.jdbc.ui.nls.JdbcPluginResources" ); //$NON-NLS-1$ } catch ( MissingResourceException x ) { diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/dialogs/JdbcDriverManagerDialog.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/dialogs/JdbcDriverManagerDialog.java index 7d69360..efc30de 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/dialogs/JdbcDriverManagerDialog.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/dialogs/JdbcDriverManagerDialog.java @@ -557,7 +557,7 @@ public class JdbcDriverManagerDialog extends TrayDialog if ( pathname.exists( ) && pathname.isFile( ) && ( !deletedJars.containsKey( pathname.getName( ) ) ) - && ( pathname.getName( ).endsWith( ".jar" ) || pathname.getName( ).endsWith( ".zip" ) ) ) //$NON-NLS-1$ + && ( pathname.getName( ).endsWith( ".jar" ) || pathname.getName( ).endsWith( ".zip" ) ) ) //$NON-NLS-1$ //$NON-NLS-2$ { return true; } @@ -570,7 +570,7 @@ public class JdbcDriverManagerDialog extends TrayDialog jarMap.put( jars[i].getName( ), new JarFile( jars[i].getName( ), jars[i].getAbsolutePath( ), - "", + "", //$NON-NLS-1$ false ) ); } @@ -654,7 +654,7 @@ public class JdbcDriverManagerDialog extends TrayDialog */ private String getDriverClassName( String source ) { - int index = source.lastIndexOf( "=" ); + int index = source.lastIndexOf( "=" ); //$NON-NLS-1$ if ( index != -1 && driverMap.containsKey( source.substring( 0, index ) ) ) return source.substring( 0, index ); @@ -736,7 +736,7 @@ public class JdbcDriverManagerDialog extends TrayDialog */ private String getFileName( String source ) { - int index = source.lastIndexOf( "=" ); + int index = source.lastIndexOf( "=" ); //$NON-NLS-1$ if ( index != -1 && jarMap.containsKey( source.substring( 0, index ) ) ) return source.substring( 0, index ); else @@ -1015,7 +1015,7 @@ public class JdbcDriverManagerDialog extends TrayDialog jarChanged=true; FileDialog dlg = new FileDialog( getShell( ), SWT.MULTI ); dlg.setFilterExtensions( new String[]{ - "*.jar", "*.zip" //$NON-NLS-1$, $NON-NLS-2$ + "*.jar", "*.zip" //$NON-NLS-1$ //$NON-NLS-2$, $NON-NLS-2$ } ); if ( dlg.open( ) != null ) @@ -1046,12 +1046,12 @@ public class JdbcDriverManagerDialog extends TrayDialog { // duplicate,can not add a driver MessageDialog.openError( null, - JdbcPlugin.getResourceString( "driverManagerDialog.text.DriverError" ), - JdbcPlugin.getResourceString( "driverManagerDialog.error.CanNotAddDriver" ) ); + JdbcPlugin.getResourceString( "driverManagerDialog.text.DriverError" ), //$NON-NLS-1$ + JdbcPlugin.getResourceString( "driverManagerDialog.error.CanNotAddDriver" ) ); //$NON-NLS-1$ return; } - JarFile jarInfo = new JarFile( fileName, folder, "", false ); + JarFile jarInfo = new JarFile( fileName, folder, "", false ); //$NON-NLS-1$ System.out.println( jarInfo.toString( ) ); if ( jarsToBeDeleted.containsKey( fileName ) ) @@ -1273,8 +1273,8 @@ public class JdbcDriverManagerDialog extends TrayDialog if ( jarsToBeDeleted.values( ).iterator( ).hasNext( ) ) { MessageDialog.openInformation( getShell( ), - JdbcPlugin.getResourceString( "driverManagerDialog.fileDelete.title" ), - JdbcPlugin.getResourceString( "driverManagerDialog.fileDelete.text" ) ); + JdbcPlugin.getResourceString( "driverManagerDialog.fileDelete.title" ), //$NON-NLS-1$ + JdbcPlugin.getResourceString( "driverManagerDialog.fileDelete.text" ) ); //$NON-NLS-1$ } okPressedProcess( ); @@ -1322,10 +1322,10 @@ public class JdbcDriverManagerDialog extends TrayDialog } catch ( OdaException e ) { - logger.log( Level.WARNING, "", e ); + logger.log( Level.WARNING, "", e ); //$NON-NLS-1$ MessageDialog.openError( null, - JdbcPlugin.getResourceString( "driverManagerDialog.ErrorDialog.addDriver.title" ), - JdbcPlugin.getResourceString( "driverManagerDialog.ErrorDialog.addDriver.message" ) + JdbcPlugin.getResourceString( "driverManagerDialog.ErrorDialog.addDriver.title" ), //$NON-NLS-1$ + JdbcPlugin.getResourceString( "driverManagerDialog.ErrorDialog.addDriver.message" ) //$NON-NLS-1$ + info.getDriverClassName( ) ); } } @@ -1356,8 +1356,8 @@ public class JdbcDriverManagerDialog extends TrayDialog catch ( OdaException e ) { MessageDialog.openError( null, - JdbcPlugin.getResourceString( "driverManagerDialog.ErrorDialog.deregisterDriver.title" ), - JdbcPlugin.getResourceString( "driverManagerDialog.ErrorDialog.deregisterDriver.message" ) + JdbcPlugin.getResourceString( "driverManagerDialog.ErrorDialog.deregisterDriver.title" ), //$NON-NLS-1$ + JdbcPlugin.getResourceString( "driverManagerDialog.ErrorDialog.deregisterDriver.message" ) //$NON-NLS-1$ + info.getDriverClassName( ) ); } } diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/JdbcSQLContentAssistProcessor.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/JdbcSQLContentAssistProcessor.java index f82cd74..f9d816c 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/JdbcSQLContentAssistProcessor.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/JdbcSQLContentAssistProcessor.java @@ -394,11 +394,11 @@ public class JdbcSQLContentAssistProcessor implements { if ( string.indexOf( ' ' ) != -1 ) { - if("ACCESS".equalsIgnoreCase(metaData.getDatabaseProductName())) + if("ACCESS".equalsIgnoreCase(metaData.getDatabaseProductName())) //$NON-NLS-1$ { - return "[" + string + "]";//$NON-NLS-1$ + return "[" + string + "]";//$NON-NLS-1$ //$NON-NLS-2$ } - return "\"" + string + "\"";//$NON-NLS-1$ + return "\"" + string + "\"";//$NON-NLS-1$ //$NON-NLS-2$ } } catch(Exception ex) @@ -412,7 +412,7 @@ public class JdbcSQLContentAssistProcessor implements { try { - if("ACCESS".equalsIgnoreCase(metaData.getDatabaseProductName())) + if("ACCESS".equalsIgnoreCase(metaData.getDatabaseProductName())) //$NON-NLS-1$ { return (ch == '['); } @@ -430,7 +430,7 @@ public class JdbcSQLContentAssistProcessor implements { try { - if("ACCESS".equalsIgnoreCase(metaData.getDatabaseProductName())) + if("ACCESS".equalsIgnoreCase(metaData.getDatabaseProductName())) //$NON-NLS-1$ { return (ch == ']'); } @@ -448,7 +448,7 @@ public class JdbcSQLContentAssistProcessor implements { try { - if("ACCESS".equalsIgnoreCase(metaData.getDatabaseProductName())) + if("ACCESS".equalsIgnoreCase(metaData.getDatabaseProductName())) //$NON-NLS-1$ { return '['; } diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/SQLDataSetEditorPage.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/SQLDataSetEditorPage.java index e1632ef..a54e4a3 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/SQLDataSetEditorPage.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/SQLDataSetEditorPage.java @@ -218,7 +218,7 @@ public class SQLDataSetEditorPage extends DataSetWizardPage ExceptionHandler.showException( PlatformUI.getWorkbench( ) .getDisplay( ) .getActiveShell( ), - JdbcPlugin.getResourceString( "exceptionHandler.title.error" ), + JdbcPlugin.getResourceString( "exceptionHandler.title.error" ), //$NON-NLS-1$ e.getLocalizedMessage( ), e ); } @@ -304,7 +304,7 @@ public class SQLDataSetEditorPage extends DataSetWizardPage */ private void initializeControl( ) { - DEFAULT_MESSAGE = JdbcPlugin.getResourceString( "dataset.new.query" ); + DEFAULT_MESSAGE = JdbcPlugin.getResourceString( "dataset.new.query" ); //$NON-NLS-1$ setMessage( DEFAULT_MESSAGE, IMessageProvider.NONE ); viewer.getTextWidget( ).setFocus( ); } @@ -410,7 +410,7 @@ public class SQLDataSetEditorPage extends DataSetWizardPage treeMenu = new Menu( availableDbObjectsTree ); MenuItem insert = new MenuItem( treeMenu, SWT.NONE ); - insert.setText( JdbcPlugin.getResourceString( "sqleditor.objectTree.menuItem.insert" ) ); + insert.setText( JdbcPlugin.getResourceString( "sqleditor.objectTree.menuItem.insert" ) ); //$NON-NLS-1$ insert.addSelectionListener( new SelectionAdapter( ) { public void widgetSelected( SelectionEvent e ) @@ -438,7 +438,7 @@ public class SQLDataSetEditorPage extends DataSetWizardPage selectTableGroup.setLayoutData( selectTableData ); schemaLabel = new Label( selectTableGroup, SWT.LEFT ); - schemaLabel.setText( JdbcPlugin.getResourceString( "tablepage.label.schema" ) ); + schemaLabel.setText( JdbcPlugin.getResourceString( "tablepage.label.schema" ) ); //$NON-NLS-1$ schemaCombo = new Combo( selectTableGroup, prefetchSchema ? SWT.READ_ONLY : SWT.DROP_DOWN ); @@ -449,7 +449,7 @@ public class SQLDataSetEditorPage extends DataSetWizardPage schemaCombo.setVisibleItemCount( 30 ); Label FilterLabel = new Label( selectTableGroup, SWT.LEFT ); - FilterLabel.setText( JdbcPlugin.getResourceString( "tablepage.label.filter" ) ); + FilterLabel.setText( JdbcPlugin.getResourceString( "tablepage.label.filter" ) ); //$NON-NLS-1$ searchTxt = new Text( selectTableGroup, SWT.BORDER ); GridData searchTxtData = new GridData( GridData.FILL_HORIZONTAL ); @@ -458,7 +458,7 @@ public class SQLDataSetEditorPage extends DataSetWizardPage // Select Type Label selectTypeLabel = new Label( selectTableGroup, SWT.NONE ); - selectTypeLabel.setText( JdbcPlugin.getResourceString( "tablepage.label.selecttype" ) ); + selectTypeLabel.setText( JdbcPlugin.getResourceString( "tablepage.label.selecttype" ) ); //$NON-NLS-1$ // Filter Combo filterComboViewer = new ComboViewer( selectTableGroup, SWT.READ_ONLY ); @@ -503,7 +503,7 @@ public class SQLDataSetEditorPage extends DataSetWizardPage String[] allSchemaNames = null; if ( supportsSchema ) { - String allFlag = JdbcPlugin.getResourceString( "tablepage.text.All" ); + String allFlag = JdbcPlugin.getResourceString( "tablepage.text.All" ); //$NON-NLS-1$ schemaCombo.add( allFlag ); if ( prefetchSchema ) @@ -868,7 +868,7 @@ public class SQLDataSetEditorPage extends DataSetWizardPage metadataBidiFormatStr ); if ( sql != null ) { - data.append( sql ).append( "," ); + data.append( sql ).append( "," ); //$NON-NLS-1$ } } } @@ -916,7 +916,7 @@ public class SQLDataSetEditorPage extends DataSetWizardPage public void drop( DropTargetEvent event ) { - if ( event.data instanceof String && !event.data.equals( "" ) ) + if ( event.data instanceof String && !event.data.equals( "" ) ) //$NON-NLS-1$ insertText( (String) event.data ); } } ); diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/SQLPartitionScanner.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/SQLPartitionScanner.java index 373e2fc..3374e3c 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/SQLPartitionScanner.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/SQLPartitionScanner.java @@ -30,7 +30,7 @@ public class SQLPartitionScanner extends RuleBasedPartitionScanner { public static final String COMMENT = "sql_comment"; //$NON-NLS-1$ - public static final String QUOTE_STRING = "sql_quote_string1"; + public static final String QUOTE_STRING = "sql_quote_string1"; //$NON-NLS-1$ /** * diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/SQLUtility.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/SQLUtility.java index 95be446..fc1b975 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/SQLUtility.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/SQLUtility.java @@ -92,13 +92,13 @@ public class SQLUtility // Punctuations will be regarded as delimiter so that different // splits could be rendered separately. - Object[] splits = lineText.split( "\\p{Punct}" ); + Object[] splits = lineText.split( "\\p{Punct}" ); //$NON-NLS-1$ // !=, <> etc. leading to "" will be filtered to meet the rule that // segments must not have duplicates. for ( int i = 0; i < splits.length; i++ ) { - if ( !splits[i].equals( "" ) ) + if ( !splits[i].equals( "" ) ) //$NON-NLS-1$ list.add( splits[i] ); } splits = list.toArray( ); @@ -146,13 +146,13 @@ public class SQLUtility public static String[] getQueryPresetTextArray( String extensionId ) { final String[] lines; - if ( extensionId.equals( "org.eclipse.birt.report.data.oda.jdbc.SPSelectDataSet" ) ) + if ( extensionId.equals( "org.eclipse.birt.report.data.oda.jdbc.SPSelectDataSet" ) ) //$NON-NLS-1$ lines = new String[]{ - "{call procedure-name(arg1,arg2, ...)}" + "{call procedure-name(arg1,arg2, ...)}" //$NON-NLS-1$ }; else lines = new String[]{ - "select", "from" + "select", "from" //$NON-NLS-1$ //$NON-NLS-2$ }; return lines; } diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/TextMenuManager.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/TextMenuManager.java index 54f7bca..f8220a9 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/TextMenuManager.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/editors/TextMenuManager.java @@ -51,12 +51,12 @@ class TextMenuManager manager.add( separator ); separator = new Separator( "select" );//$NON-NLS-1$ manager.add( separator ); - manager.appendToGroup( "undo", getAction( "undo", viewer, JdbcPlugin.getResourceString( "sqleditor.action.undo" ), ITextOperationTarget.UNDO ) );//$NON-NLS-1$ - manager.appendToGroup( "undo", getAction( "redo", viewer, JdbcPlugin.getResourceString( "sqleditor.action.redo" ), ITextOperationTarget.REDO ) );//$NON-NLS-1$ - manager.appendToGroup( "copy", getAction( "cut", viewer, JdbcPlugin.getResourceString( "sqleditor.action.cut" ), ITextOperationTarget.CUT ) );//$NON-NLS-1$ - manager.appendToGroup( "copy", getAction( "copy", viewer, JdbcPlugin.getResourceString( "sqleditor.action.copy" ), ITextOperationTarget.COPY ) );//$NON-NLS-1$ - manager.appendToGroup( "copy", getAction( "paste", viewer, JdbcPlugin.getResourceString( "sqleditor.action.paste" ), ITextOperationTarget.PASTE ) );//$NON-NLS-1$ - manager.appendToGroup( "select", getAction( "selectall", viewer, JdbcPlugin.getResourceString( "sqleditor.action.selectAll" ), ITextOperationTarget.SELECT_ALL ) );//$NON-NLS-1$ + manager.appendToGroup( "undo", getAction( "undo", viewer, JdbcPlugin.getResourceString( "sqleditor.action.undo" ), ITextOperationTarget.UNDO ) );//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + manager.appendToGroup( "undo", getAction( "redo", viewer, JdbcPlugin.getResourceString( "sqleditor.action.redo" ), ITextOperationTarget.REDO ) );//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + manager.appendToGroup( "copy", getAction( "cut", viewer, JdbcPlugin.getResourceString( "sqleditor.action.cut" ), ITextOperationTarget.CUT ) );//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + manager.appendToGroup( "copy", getAction( "copy", viewer, JdbcPlugin.getResourceString( "sqleditor.action.copy" ), ITextOperationTarget.COPY ) );//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + manager.appendToGroup( "copy", getAction( "paste", viewer, JdbcPlugin.getResourceString( "sqleditor.action.paste" ), ITextOperationTarget.PASTE ) );//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + manager.appendToGroup( "select", getAction( "selectall", viewer, JdbcPlugin.getResourceString( "sqleditor.action.selectAll" ), ITextOperationTarget.SELECT_ALL ) );//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ manager.addMenuListener( new IMenuListener( ) { diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/DBNodeUtil.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/DBNodeUtil.java index 813779e..a6aec0a 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/DBNodeUtil.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/DBNodeUtil.java @@ -38,7 +38,7 @@ public class DBNodeUtil { tree.removeAll( ); TreeItem dummyItem = new TreeItem( tree, SWT.NONE ); - dummyItem.setText( JdbcPlugin.getResourceString( "tablepage.refreshing" ) ); + dummyItem.setText( JdbcPlugin.getResourceString( "tablepage.refreshing" ) ); //$NON-NLS-1$ if ( ! node.isChildrenPrepared( ) ) { diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/FilterConfig.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/FilterConfig.java index 8badbf1..7a62c20 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/FilterConfig.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/FilterConfig.java @@ -83,22 +83,22 @@ public class FilterConfig case TABLE: if ( isShowSystemTable( ) ) { - return new String[]{ "TABLE", "SYSTEM TABLE" }; + return new String[]{ "TABLE", "SYSTEM TABLE" }; //$NON-NLS-1$ //$NON-NLS-2$ } else { - return new String[]{ "TABLE" }; + return new String[]{ "TABLE" }; //$NON-NLS-1$ } case VIEW: - return new String[]{ "VIEW" }; + return new String[]{ "VIEW" }; //$NON-NLS-1$ case ALL: if ( isShowSystemTable( ) ) { - return new String[]{ "TABLE", "VIEW", "SYSTEM TABLE" }; + return new String[]{ "TABLE", "VIEW", "SYSTEM TABLE" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } else { - return new String[]{ "TABLE", "VIEW" }; + return new String[]{ "TABLE", "VIEW" }; //$NON-NLS-1$ //$NON-NLS-2$ } default: //should never goes here @@ -113,12 +113,12 @@ public class FilterConfig { if ( input.lastIndexOf( '%' ) == -1 ) { - input = input + "%"; + input = input + "%"; //$NON-NLS-1$ } } else { - input = "%"; + input = "%"; //$NON-NLS-1$ } return input; } @@ -129,17 +129,17 @@ public class FilterConfig switch ( type ) { case PROCEDURE: - return JdbcPlugin.getResourceString( "tablepage.text.procedure" ); + return JdbcPlugin.getResourceString( "tablepage.text.procedure" ); //$NON-NLS-1$ case TABLE: - return JdbcPlugin.getResourceString( "tablepage.text.tabletype" ); + return JdbcPlugin.getResourceString( "tablepage.text.tabletype" ); //$NON-NLS-1$ case VIEW: - return JdbcPlugin.getResourceString( "tablepage.text.viewtype" ); + return JdbcPlugin.getResourceString( "tablepage.text.viewtype" ); //$NON-NLS-1$ case ALL: - return JdbcPlugin.getResourceString( "tablepage.text.All" ); + return JdbcPlugin.getResourceString( "tablepage.text.All" ); //$NON-NLS-1$ default: //should never goes here assert false; - return ""; + return ""; //$NON-NLS-1$ } } } diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/ProcedureColumnNode.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/ProcedureColumnNode.java index 35f3bd3..8081833 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/ProcedureColumnNode.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/ProcedureColumnNode.java @@ -22,7 +22,7 @@ import org.eclipse.swt.graphics.Image; public class ProcedureColumnNode implements IDBNode, Comparable<ProcedureColumnNode> { - private static String PROCEDURE_COLUMN_ICON = ProcedureColumnNode.class.getName( ) + ".ProcedureColumnIcon"; + private static String PROCEDURE_COLUMN_ICON = ProcedureColumnNode.class.getName( ) + ".ProcedureColumnIcon"; //$NON-NLS-1$ static { ImageRegistry reg = JFaceResources.getImageRegistry( ); @@ -54,7 +54,7 @@ public class ProcedureColumnNode implements IDBNode, Comparable<ProcedureColumnN public String getDisplayName( String metadataBidiFormatStr ) { String bidiName = BidiTransform.transform(name, metadataBidiFormatStr, BidiConstants.DEFAULT_BIDI_FORMAT_STR); - return bidiName + " (" + type + ", " + mode + ")"; + return bidiName + " (" + type + ", " + mode + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public Image getImage( ) diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/ProcedureFlagNode.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/ProcedureFlagNode.java index 421c23f..29c06db 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/ProcedureFlagNode.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/ProcedureFlagNode.java @@ -29,7 +29,7 @@ import org.eclipse.swt.graphics.Image; public class ProcedureFlagNode extends ChildrenAllowedNode { private static Logger logger = Logger.getLogger( ProcedureFlagNode.class.getName( ) ); - private static String PROCEDURE_FLAG_ICON = ProcedureFlagNode.class.getName( ) + ".ProcedureFlagIcon"; + private static String PROCEDURE_FLAG_ICON = ProcedureFlagNode.class.getName( ) + ".ProcedureFlagIcon"; //$NON-NLS-1$ static { ImageRegistry reg = JFaceResources.getImageRegistry( ); @@ -46,7 +46,7 @@ public class ProcedureFlagNode extends ChildrenAllowedNode public String getDisplayName( String metadataBidiFormatStr ) { - return "STORED PROCEDURES"; + return "STORED PROCEDURES"; //$NON-NLS-1$ } public Image getImage( ) @@ -75,7 +75,7 @@ public class ProcedureFlagNode extends ChildrenAllowedNode { while ( rs.next( ) ) { - String procedureName = rs.getString( "PROCEDURE_NAME" ); + String procedureName = rs.getString( "PROCEDURE_NAME" ); //$NON-NLS-1$ ProcedureNode procedure = new ProcedureNode( schemaName, procedureName); procedures.add( procedure ); } diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/ProcedureNode.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/ProcedureNode.java index b93b058..564bdcf 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/ProcedureNode.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/ProcedureNode.java @@ -34,7 +34,7 @@ public class ProcedureNode extends ChildrenAllowedNode Comparable<ProcedureNode> { private static Logger logger = Logger.getLogger( ProcedureNode.class.getName( ) ); - private static String PROCEDURE_ICON = ProcedureNode.class.getName( ) + ".ProcedureIcon"; + private static String PROCEDURE_ICON = ProcedureNode.class.getName( ) + ".ProcedureIcon"; //$NON-NLS-1$ static { ImageRegistry reg = JFaceResources.getImageRegistry( ); @@ -74,7 +74,7 @@ public class ProcedureNode extends ChildrenAllowedNode boolean includeSchema, String metadataBidiFormatStr ) { StringBuffer sb = new StringBuffer( ); - String quoteFlag = ""; + String quoteFlag = ""; //$NON-NLS-1$ if ( useIdentifierQuoteString ) { quoteFlag @@ -82,7 +82,7 @@ public class ProcedureNode extends ChildrenAllowedNode } if ( includeSchema && schemaName != null ) { - sb.append( Utility.quoteString( BidiTransform.transform(schemaName, metadataBidiFormatStr, BidiConstants.DEFAULT_BIDI_FORMAT_STR), quoteFlag ) ).append( "." ); + sb.append( Utility.quoteString( BidiTransform.transform(schemaName, metadataBidiFormatStr, BidiConstants.DEFAULT_BIDI_FORMAT_STR), quoteFlag ) ).append( "." ); //$NON-NLS-1$ } sb.append( Utility.quoteString( BidiTransform.transform(procedureName, metadataBidiFormatStr, BidiConstants.DEFAULT_BIDI_FORMAT_STR), quoteFlag ) ); return sb.toString( ); @@ -100,15 +100,15 @@ public class ProcedureNode extends ChildrenAllowedNode int n = 0; while ( rs.next( ) ) { - String columnName = rs.getString( "COLUMN_NAME" ); + String columnName = rs.getString( "COLUMN_NAME" ); //$NON-NLS-1$ if ( columnName == null ) { // if the column name cannot retrieved ,give the unique name for this column n++; - columnName = "param" + n; + columnName = "param" + n; //$NON-NLS-1$ } - String mode = Utility.toModeType( rs.getInt( "COLUMN_TYPE" ) ); - String type = rs.getString( "TYPE_NAME" ); + String mode = Utility.toModeType( rs.getInt( "COLUMN_TYPE" ) ); //$NON-NLS-1$ + String type = rs.getString( "TYPE_NAME" ); //$NON-NLS-1$ ProcedureColumnNode column = new ProcedureColumnNode( columnName, type, mode ); columns.add( column ); diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/RootNode.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/RootNode.java index 60b0910..6611175 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/RootNode.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/RootNode.java @@ -36,7 +36,7 @@ import org.eclipse.swt.graphics.Image; public class RootNode extends ChildrenAllowedNode { private static Logger logger = Logger.getLogger( RootNode.class.getName( ) ); - private static String ROOT_ICON = RootNode.class.getName( ) + ".RootIcon"; + private static String ROOT_ICON = RootNode.class.getName( ) + ".RootIcon"; //$NON-NLS-1$ static { ImageRegistry reg = JFaceResources.getImageRegistry( ); @@ -67,7 +67,7 @@ public class RootNode extends ChildrenAllowedNode .isSupportSchema( ); boolean supportsProcedure = JdbcMetaDataProvider.getInstance( ) .isSupportProcedure( ); - if ( namePattern.equals( "%" ) ) + if ( namePattern.equals( "%" ) ) //$NON-NLS-1$ { if ( supportsSchema ) { @@ -133,12 +133,12 @@ public class RootNode extends ChildrenAllowedNode { while ( rs.next( ) ) { - String schemaName = rs.getString( "TABLE_SCHEM" ); - String tableName = rs.getString( "TABLE_NAME" ); + String schemaName = rs.getString( "TABLE_SCHEM" ); //$NON-NLS-1$ + String tableName = rs.getString( "TABLE_NAME" ); //$NON-NLS-1$ String type = rs.getString( "TABLE_TYPE" );//$NON-NLS-1$ TableNode table = new TableNode( schemaName, tableName, - "VIEW".equalsIgnoreCase( type ) ); + "VIEW".equalsIgnoreCase( type ) ); //$NON-NLS-1$ TablesAndProcedures tap = schemas.get( schemaName ); if ( tap == null ) { @@ -168,8 +168,8 @@ public class RootNode extends ChildrenAllowedNode { while ( rs.next( ) ) { - String schemaName = rs.getString( "PROCEDURE_SCHEM" ); - String procedureName = rs.getString( "PROCEDURE_NAME" ); + String schemaName = rs.getString( "PROCEDURE_SCHEM" ); //$NON-NLS-1$ + String procedureName = rs.getString( "PROCEDURE_NAME" ); //$NON-NLS-1$ ProcedureNode procedure = new ProcedureNode( schemaName, procedureName ); TablesAndProcedures tap = schemas.get( schemaName ); @@ -241,7 +241,7 @@ public class RootNode extends ChildrenAllowedNode { while ( rs.next( ) && count < maxSchemaCount ) { - String name = rs.getString( "TABLE_SCHEM" ); + String name = rs.getString( "TABLE_SCHEM" ); //$NON-NLS-1$ SchemaNode schema = new SchemaNode( name ); schemas.add( schema ); count++; @@ -268,7 +268,7 @@ public class RootNode extends ChildrenAllowedNode { while ( rs.next( ) ) { - String name = rs.getString( "TABLE_SCHEM" ); + String name = rs.getString( "TABLE_SCHEM" ); //$NON-NLS-1$ if ( name.equals( schemaName )) { return new SchemaNode( name ); diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/SchemaNode.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/SchemaNode.java index b641bef..50d791d 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/SchemaNode.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/SchemaNode.java @@ -36,7 +36,7 @@ public class SchemaNode extends ChildrenAllowedNode private static Logger logger = Logger.getLogger( SchemaNode.class.getName( ) ); private static String SCHEMA_ICON = SchemaNode.class.getName( ) - + ".SchemaIcon"; + + ".SchemaIcon"; //$NON-NLS-1$ static { ImageRegistry reg = JFaceResources.getImageRegistry( ); @@ -69,11 +69,11 @@ public class SchemaNode extends ChildrenAllowedNode { while ( rs.next( ) && count < maxTableCountPerSchema ) { - String tableName = rs.getString( "TABLE_NAME" ); + String tableName = rs.getString( "TABLE_NAME" ); //$NON-NLS-1$ String type = rs.getString( "TABLE_TYPE" );//$NON-NLS-1$ TableNode table = new TableNode( schemaName, tableName, - "VIEW".equalsIgnoreCase( type ) ); + "VIEW".equalsIgnoreCase( type ) ); //$NON-NLS-1$ children.add( table ); count++; } @@ -111,7 +111,7 @@ public class SchemaNode extends ChildrenAllowedNode public String getQualifiedNameInSQL( boolean useIdentifierQuoteString, boolean includeSchema, String metadataBidiFormatStr ) { - String quoteFlag = ""; + String quoteFlag = ""; //$NON-NLS-1$ if ( useIdentifierQuoteString ) { quoteFlag = JdbcMetaDataProvider.getInstance( ) diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/TableColumnNode.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/TableColumnNode.java index bd50585..097b54b 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/TableColumnNode.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/TableColumnNode.java @@ -24,7 +24,7 @@ import org.eclipse.swt.graphics.Image; public class TableColumnNode implements IDBNode, Comparable<TableColumnNode> { - private static String COLUMN_ICON = TableColumnNode.class.getName( ) + ".ColumnIcon"; + private static String COLUMN_ICON = TableColumnNode.class.getName( ) + ".ColumnIcon"; //$NON-NLS-1$ static { ImageRegistry reg = JFaceResources.getImageRegistry( ); @@ -50,7 +50,7 @@ public class TableColumnNode implements IDBNode, Comparable<TableColumnNode> public String getDisplayName( String metadataBidiFormatStr ) { return BidiTransform.transform(columnName,metadataBidiFormatStr,BidiConstants.DEFAULT_BIDI_FORMAT_STR) + - " (" + typeName + ")"; + " (" + typeName + ")"; //$NON-NLS-1$ //$NON-NLS-2$ } public Image getImage( ) @@ -62,7 +62,7 @@ public class TableColumnNode implements IDBNode, Comparable<TableColumnNode> boolean includeSchema, String metadataBidiFormatStr ) { StringBuffer sb = new StringBuffer( ); - String quoteFlag = ""; + String quoteFlag = ""; //$NON-NLS-1$ if ( useIdentifierQuoteString ) { quoteFlag = JdbcMetaDataProvider.getInstance( ) @@ -81,9 +81,9 @@ public class TableColumnNode implements IDBNode, Comparable<TableColumnNode> columnNameStr = BidiTransform.transform(columnNameStr,metadataBidiFormatStr, BidiConstants.DEFAULT_BIDI_FORMAT_STR); } sb.append( Utility.quoteString( schemaNameStr, quoteFlag ) ) - .append( "." ); + .append( "." ); //$NON-NLS-1$ } - sb.append( Utility.quoteString( tableNameStr, quoteFlag ) ).append( "." ); + sb.append( Utility.quoteString( tableNameStr, quoteFlag ) ).append( "." ); //$NON-NLS-1$ sb.append( Utility.quoteString( columnNameStr, quoteFlag ) ); return sb.toString( ); } diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/TableNode.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/TableNode.java index e3d40ad..d693d89 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/TableNode.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/model/TableNode.java @@ -32,8 +32,8 @@ import org.eclipse.swt.graphics.Image; public class TableNode extends ChildrenAllowedNode implements Comparable<TableNode> { private static Logger logger = Logger.getLogger( TableNode.class.getName( ) ); - private static String TABLE_ICON = TableNode.class.getName( ) + ".TableIcon"; - private static String VIEW_ICON = TableNode.class.getName( ) + ".ViewIcon"; + private static String TABLE_ICON = TableNode.class.getName( ) + ".TableIcon"; //$NON-NLS-1$ + private static String VIEW_ICON = TableNode.class.getName( ) + ".ViewIcon"; //$NON-NLS-1$ static { ImageRegistry reg = JFaceResources.getImageRegistry( ); @@ -78,7 +78,7 @@ public class TableNode extends ChildrenAllowedNode implements Comparable<TableNo boolean includeSchema, String metadataBidiFormatStr ) { StringBuffer sb = new StringBuffer( ); - String quoteFlag = ""; + String quoteFlag = ""; //$NON-NLS-1$ if ( useIdentifierQuoteString ) { quoteFlag @@ -90,7 +90,7 @@ public class TableNode extends ChildrenAllowedNode implements Comparable<TableNo if ( includeSchema && schemaName != null ) { schemaNameStr = BidiTransform.transform(schemaName,metadataBidiFormatStr, BidiConstants.DEFAULT_BIDI_FORMAT_STR); - sb.append( Utility.quoteString( schemaNameStr, quoteFlag ) ).append( "." ); + sb.append( Utility.quoteString( schemaNameStr, quoteFlag ) ).append( "." ); //$NON-NLS-1$ } tableNameStr = BidiTransform.transform(tableNameStr,metadataBidiFormatStr, BidiConstants.DEFAULT_BIDI_FORMAT_STR); sb.append( Utility.quoteString( tableNameStr, quoteFlag ) ); @@ -110,8 +110,8 @@ public class TableNode extends ChildrenAllowedNode implements Comparable<TableNo { while ( rs.next( ) ) { - String columnName = rs.getString( "COLUMN_NAME" ); - String typeName = rs.getString( "TYPE_NAME" ); + String columnName = rs.getString( "COLUMN_NAME" ); //$NON-NLS-1$ + String typeName = rs.getString( "TYPE_NAME" ); //$NON-NLS-1$ TableColumnNode column = new TableColumnNode( schemaName, tableName, columnName, diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/preference/DateSetPreferencePage.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/preference/DateSetPreferencePage.java index f6d2254..27b2c10 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/preference/DateSetPreferencePage.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/preference/DateSetPreferencePage.java @@ -60,16 +60,16 @@ public class DateSetPreferencePage extends PreferencePage private static final int MAX_MAX_ROW = Integer.MAX_VALUE; - public static final String ENABLED = "YES"; - public static final String DISABLED = "NO"; + public static final String ENABLED = "YES"; //$NON-NLS-1$ + public static final String DISABLED = "NO"; //$NON-NLS-1$ /** max Row preference name */ public static final String USER_MAXROW = "user_maxrow"; //$NON-NLS-1$ - public static final String SCHEMAS_PREFETCH_CONFIG = "shemas_prefetch_config"; - public static final String USER_MAX_NUM_OF_SCHEMA = "user_max_num_of_schema"; - public static final String USER_MAX_NUM_OF_TABLE_EACH_SCHEMA="user_max_num_of_table_each_schema"; - public static final String USER_TIMEOUT_LIMIT = "user_timeout_limit"; - public static final String ENABLE_CODE_ASSIST = "enable_code_assit"; + public static final String SCHEMAS_PREFETCH_CONFIG = "shemas_prefetch_config"; //$NON-NLS-1$ + public static final String USER_MAX_NUM_OF_SCHEMA = "user_max_num_of_schema"; //$NON-NLS-1$ + public static final String USER_MAX_NUM_OF_TABLE_EACH_SCHEMA="user_max_num_of_table_each_schema"; //$NON-NLS-1$ + public static final String USER_TIMEOUT_LIMIT = "user_timeout_limit"; //$NON-NLS-1$ + public static final String ENABLE_CODE_ASSIST = "enable_code_assit"; //$NON-NLS-1$ /* * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ @@ -87,7 +87,7 @@ public class DateSetPreferencePage extends PreferencePage final Group sqlDataSetGroup = new Group( mainComposite, SWT.NONE ); sqlDataSetGroup.setLayout( layout ); - sqlDataSetGroup.setText( JdbcPlugin.getResourceString( "designer.preview.preference.resultset.sqldatasetpage.group.title" ) ); + sqlDataSetGroup.setText( JdbcPlugin.getResourceString( "designer.preview.preference.resultset.sqldatasetpage.group.title" ) ); //$NON-NLS-1$ sqlDataSetGroup.setLayoutData( data ); sqlDataSetGroup.setEnabled( true ); @@ -100,20 +100,20 @@ public class DateSetPreferencePage extends PreferencePage schemasPrefetchConfigCheckbox = new Button( sqlDataSetGroup, SWT.CHECK ); schemasPrefetchConfigCheckbox.setLayoutData( data ); - schemasPrefetchConfigCheckbox.setText( JdbcPlugin.getResourceString( "designer.preview.preference.resultset.schemasPrefetchCheckbox.description" ) ); + schemasPrefetchConfigCheckbox.setText( JdbcPlugin.getResourceString( "designer.preview.preference.resultset.schemasPrefetchCheckbox.description" ) ); //$NON-NLS-1$ enableCodeAssistCheckbox = new Button( sqlDataSetGroup, SWT.CHECK ); enableCodeAssistCheckbox.setLayoutData( data ); - enableCodeAssistCheckbox.setText( JdbcPlugin.getResourceString( "designer.preview.preference.resultset.enableCodeAssist.description" ) ); + enableCodeAssistCheckbox.setText( JdbcPlugin.getResourceString( "designer.preview.preference.resultset.enableCodeAssist.description" ) ); //$NON-NLS-1$ initializeSchemaPrefetchConfig( ); initializeEnableCodeAssistConfig( ); //Set up the maximum number of schemas to be fetched in SQLDataSetPage. - maxDisplaySchemaEditor = new IntegerFieldEditor( USER_MAX_NUM_OF_SCHEMA, "", sqlDataSetGroup ); + maxDisplaySchemaEditor = new IntegerFieldEditor( USER_MAX_NUM_OF_SCHEMA, "", sqlDataSetGroup ); //$NON-NLS-1$ Label lab = maxDisplaySchemaEditor.getLabelControl( sqlDataSetGroup ); - lab.setText(JdbcPlugin.getResourceString("designer.preview.preference.resultset.maxNoOfSchema.description" )); + lab.setText(JdbcPlugin.getResourceString("designer.preview.preference.resultset.maxNoOfSchema.description" )); //$NON-NLS-1$ maxDisplaySchemaEditor.setPage(this); maxDisplaySchemaEditor.setTextLimit( Integer.toString( MAX_MAX_ROW ).length( ) ); @@ -128,7 +128,7 @@ public class DateSetPreferencePage extends PreferencePage } }); - maxDisplaySchemaEditor.setErrorMessage( JdbcPlugin.getFormattedString( "designer.preview.preference.resultset.maxNoOfSchema.errormessage", + maxDisplaySchemaEditor.setErrorMessage( JdbcPlugin.getFormattedString( "designer.preview.preference.resultset.maxNoOfSchema.errormessage", //$NON-NLS-1$ new Object[]{new Integer( MAX_MAX_ROW ) } ) ); String defaultMaxSchema = JdbcPlugin.getDefault( ) @@ -142,10 +142,10 @@ public class DateSetPreferencePage extends PreferencePage //Set up the maximum number of tables in each schema - maxDisplayTableEditor = new IntegerFieldEditor( USER_MAX_NUM_OF_TABLE_EACH_SCHEMA, "", sqlDataSetGroup ); + maxDisplayTableEditor = new IntegerFieldEditor( USER_MAX_NUM_OF_TABLE_EACH_SCHEMA, "", sqlDataSetGroup ); //$NON-NLS-1$ lab = maxDisplayTableEditor.getLabelControl( sqlDataSetGroup ); - lab.setText(JdbcPlugin.getResourceString( "designer.preview.preference.resultset.maxNoOfTable.description" )); + lab.setText(JdbcPlugin.getResourceString( "designer.preview.preference.resultset.maxNoOfTable.description" )); //$NON-NLS-1$ maxDisplayTableEditor.setPage(this); maxDisplayTableEditor.setTextLimit( Integer.toString( MAX_MAX_ROW ).length( ) ); @@ -160,7 +160,7 @@ public class DateSetPreferencePage extends PreferencePage } }); - maxDisplayTableEditor.setErrorMessage( JdbcPlugin.getFormattedString( "designer.preview.preference.resultset.maxNoOfTable.errormessage", + maxDisplayTableEditor.setErrorMessage( JdbcPlugin.getFormattedString( "designer.preview.preference.resultset.maxNoOfTable.errormessage", //$NON-NLS-1$ new Object[]{new Integer( MAX_MAX_ROW ) } ) ); String defaultMaxTable = JdbcPlugin.getDefault( ) @@ -175,11 +175,11 @@ public class DateSetPreferencePage extends PreferencePage // Set up the timeout timeOutLimitEditor = new IntegerFieldEditor( USER_MAX_NUM_OF_SCHEMA, - "", + "", //$NON-NLS-1$ sqlDataSetGroup ); lab = timeOutLimitEditor.getLabelControl( sqlDataSetGroup ); - lab.setText( JdbcPlugin.getResourceString( "designer.preview.preference.resultset.timeOutLimit.description" ) ); + lab.setText( JdbcPlugin.getResourceString( "designer.preview.preference.resultset.timeOutLimit.description" ) ); //$NON-NLS-1$ timeOutLimitEditor.setPage( this ); timeOutLimitEditor.setTextLimit( Integer.toString( MAX_MAX_ROW ) @@ -197,7 +197,7 @@ public class DateSetPreferencePage extends PreferencePage } } ); - timeOutLimitEditor.setErrorMessage( JdbcPlugin.getFormattedString( "designer.preview.preference.resultset.timeOutLimit.errormessage", + timeOutLimitEditor.setErrorMessage( JdbcPlugin.getFormattedString( "designer.preview.preference.resultset.timeOutLimit.errormessage", //$NON-NLS-1$ new Object[]{ new Integer( MAX_MAX_ROW ) } ) ); diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/profile/JDBCSelectionPageHelper.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/profile/JDBCSelectionPageHelper.java index 7b79fb0..0f9370d 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/profile/JDBCSelectionPageHelper.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/profile/JDBCSelectionPageHelper.java @@ -578,10 +578,10 @@ public class JDBCSelectionPageHelper } else { - OdaException ex = new OdaException( JdbcPlugin.getResourceString( "connection.failed" ) ); + OdaException ex = new OdaException( JdbcPlugin.getResourceString( "connection.failed" ) ); //$NON-NLS-1$ ExceptionHandler.showException( getShell( ), JdbcPlugin.getResourceString( "connection.test" ),//$NON-NLS-1$ - JdbcPlugin.getResourceString( "connection.failed" ), + JdbcPlugin.getResourceString( "connection.failed" ), //$NON-NLS-1$ ex ); } } diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/provider/JdbcMetaDataProvider.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/provider/JdbcMetaDataProvider.java index a782c5e..8a3e276 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/provider/JdbcMetaDataProvider.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/provider/JdbcMetaDataProvider.java @@ -131,7 +131,7 @@ public class JdbcMetaDataProvider catch ( Exception e ) { logger.log( Level.WARNING, e.getMessage( ), e ); - return ""; + return ""; //$NON-NLS-1$ } try { @@ -140,7 +140,7 @@ public class JdbcMetaDataProvider catch ( SQLException e ) { logger.log( Level.WARNING, e.getMessage( ), e ); - return ""; + return ""; //$NON-NLS-1$ } } try @@ -157,7 +157,7 @@ public class JdbcMetaDataProvider catch ( Exception e1 ) { logger.log( Level.WARNING, e.getMessage( ), e ); - return ""; + return ""; //$NON-NLS-1$ } } } @@ -536,7 +536,7 @@ public class JdbcMetaDataProvider { while ( rs.next( ) ) { - names.add( rs.getString( "TABLE_SCHEM" ) ); + names.add( rs.getString( "TABLE_SCHEM" ) ); //$NON-NLS-1$ } } catch ( SQLException e ) diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/ConnectionMetaData.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/ConnectionMetaData.java index e0e1fdc..38b01a8 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/ConnectionMetaData.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/ConnectionMetaData.java @@ -255,7 +255,7 @@ public class ConnectionMetaData implements Serializable { if ( getPassword( ) == null ) { - setPassword( "" ); + setPassword( "" ); //$NON-NLS-1$ } connection = DriverLoader.getConnectionWithExceptionTip( classname, diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/DriverInfo.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/DriverInfo.java index 8f1fa72..88243a8 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/DriverInfo.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/DriverInfo.java @@ -47,11 +47,11 @@ public class DriverInfo implements Serializable { this.driverName = driverName; if ( displayName == null ) - this.displayName = ""; + this.displayName = ""; //$NON-NLS-1$ else this.displayName = displayName; if ( urlTemplate == null ) - this.urlTemplate = ""; + this.urlTemplate = ""; //$NON-NLS-1$ else this.urlTemplate = urlTemplate; } diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/DriverLoader.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/DriverLoader.java index 13ab50a..df4ac9f 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/DriverLoader.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/DriverLoader.java @@ -54,7 +54,7 @@ public final class DriverLoader ExceptionHandler.showException( PlatformUI.getWorkbench( ) .getDisplay( ) .getActiveShell( ), - JdbcPlugin.getResourceString( "exceptionHandler.title.error" ), + JdbcPlugin.getResourceString( "exceptionHandler.title.error" ), //$NON-NLS-1$ e.getLocalizedMessage( ), e ); return null; diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/IHelpConstants.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/IHelpConstants.java index 726c093..f69a777 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/IHelpConstants.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/IHelpConstants.java @@ -18,7 +18,7 @@ package org.eclipse.stardust.reporting.oda.jdbc.ui.util; public interface IHelpConstants { - public static final String PREFIX = "org.eclipse.birt.cshelp" + "."; //$NON-NLS-1$ + public static final String PREFIX = "org.eclipse.birt.cshelp" + "."; //$NON-NLS-1$ //$NON-NLS-2$ public static final String CONEXT_ID_DATASOURCE_JDBC = PREFIX + "Wizard_JDBC_Datasource_ID";//$NON-NLS-1$ diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/JDBCDriverInformation.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/JDBCDriverInformation.java index 0527e59..29e314f 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/JDBCDriverInformation.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/JDBCDriverInformation.java @@ -165,11 +165,11 @@ public final class JDBCDriverInformation buffer.append(driverClassName); if ( majorVersion != 0 || minorVersion != 0 ) { - buffer.append(" ("); + buffer.append(" ("); //$NON-NLS-1$ buffer.append(majorVersion); - buffer.append("."); + buffer.append("."); //$NON-NLS-1$ buffer.append(minorVersion); - buffer.append(")"); + buffer.append(")"); //$NON-NLS-1$ } return buffer.toString(); } @@ -182,19 +182,19 @@ public final class JDBCDriverInformation if ( majorVersion != 0 || minorVersion != 0 || driverDisplayName != null ) { - buffer.append(" ("); + buffer.append(" ("); //$NON-NLS-1$ if ( driverDisplayName != null ) buffer.append( driverDisplayName ); if ( majorVersion != 0 || minorVersion != 0 ) { if ( driverDisplayName != null ) - buffer.append(" "); - buffer.append("v"); + buffer.append(" "); //$NON-NLS-1$ + buffer.append("v"); //$NON-NLS-1$ buffer.append(majorVersion); - buffer.append("."); + buffer.append("."); //$NON-NLS-1$ buffer.append(minorVersion); } - buffer.append(")"); + buffer.append(")"); //$NON-NLS-1$ } return buffer.toString(); } diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/JarFile.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/JarFile.java index d23c7ce..e1392ec 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/JarFile.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/JarFile.java @@ -269,7 +269,7 @@ public class JarFile implements Serializable ExceptionHandler.showException( PlatformUI.getWorkbench( ) .getDisplay( ) .getActiveShell( ), - JdbcPlugin.getResourceString( "exceptionHandler.title.error" ), + JdbcPlugin.getResourceString( "exceptionHandler.title.error" ), //$NON-NLS-1$ e.getLocalizedMessage( ), e ); } @@ -278,7 +278,7 @@ public class JarFile implements Serializable ExceptionHandler.showException( PlatformUI.getWorkbench( ) .getDisplay( ) .getActiveShell( ), - JdbcPlugin.getResourceString( "exceptionHandler.title.error" ), + JdbcPlugin.getResourceString( "exceptionHandler.title.error" ), //$NON-NLS-1$ e.getLocalizedMessage( ), e ); } diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/JdbcDriverConfigUtil.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/JdbcDriverConfigUtil.java index e791e14..8d3c6e2 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/JdbcDriverConfigUtil.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/JdbcDriverConfigUtil.java @@ -83,7 +83,7 @@ public class JdbcDriverConfigUtil ExceptionHandler.showException( PlatformUI.getWorkbench( ) .getDisplay( ) .getActiveShell( ), - JdbcPlugin.getResourceString( "exceptionHandler.title.error" ), + JdbcPlugin.getResourceString( "exceptionHandler.title.error" ), //$NON-NLS-1$ e.getLocalizedMessage( ), e ); @@ -93,7 +93,7 @@ public class JdbcDriverConfigUtil ExceptionHandler.showException( PlatformUI.getWorkbench( ) .getDisplay( ) .getActiveShell( ), - JdbcPlugin.getResourceString( "exceptionHandler.title.error" ), + JdbcPlugin.getResourceString( "exceptionHandler.title.error" ), //$NON-NLS-1$ e.getLocalizedMessage( ), e ); diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/JdbcToolKit.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/JdbcToolKit.java index 3b95057..6262d52 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/JdbcToolKit.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/JdbcToolKit.java @@ -129,7 +129,7 @@ public class JdbcToolKit // Get drivers from drivers subdirectory addDriversFromFiles( ); - final String ODBCJDBCDriverName = "sun.jdbc.odbc.JdbcOdbcDriver"; + final String ODBCJDBCDriverName = "sun.jdbc.odbc.JdbcOdbcDriver"; //$NON-NLS-1$ JDBCDriverInformation ODBCJDBCInfo = null; // Merge drivers from the driverInfo extension point @@ -213,9 +213,9 @@ public class JdbcToolKit if ( fileName.isFile( ) && ( fileName.getName( ) .toLowerCase( ) - .endsWith( ".jar" ) || fileName.getName( ) + .endsWith( ".jar" ) || fileName.getName( ) //$NON-NLS-1$ .toLowerCase( ) - .endsWith( ".zip" ) ) ) + .endsWith( ".zip" ) ) ) //$NON-NLS-1$ { return true; } @@ -381,7 +381,7 @@ public class JdbcToolKit */ private static String modifyResourceName( String resourceName ) { - resourceName = ( resourceName.replaceAll( "/", "." ) ).substring( 0,resourceName.length( ) - 6 ); + resourceName = ( resourceName.replaceAll( "/", "." ) ).substring( 0,resourceName.length( ) - 6 ); //$NON-NLS-1$ //$NON-NLS-2$ return resourceName; } @@ -453,7 +453,7 @@ public class JdbcToolKit { for ( int i = 0; i < jdbcDriverFiles.length; i++ ) { - urlList[i] = new URL( "file", + urlList[i] = new URL( "file", //$NON-NLS-1$ null, ( (File) jdbcDriverFiles[i] ).getAbsolutePath( ) ); } @@ -463,7 +463,7 @@ public class JdbcToolKit ExceptionHandler.showException( PlatformUI.getWorkbench( ) .getDisplay( ) .getActiveShell( ), - JdbcPlugin.getResourceString( "exceptionHandler.title.error" ), + JdbcPlugin.getResourceString( "exceptionHandler.title.error" ), //$NON-NLS-1$ e.getLocalizedMessage( ), e ); @@ -535,7 +535,7 @@ public class JdbcToolKit ExceptionHandler.showException( PlatformUI.getWorkbench( ) .getDisplay( ) .getActiveShell( ), - JdbcPlugin.getResourceString( "exceptionHandler.title.error" ), + JdbcPlugin.getResourceString( "exceptionHandler.title.error" ), //$NON-NLS-1$ e.getLocalizedMessage( ), e ); diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/Utility.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/Utility.java index 6339442..5692e9d 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/Utility.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/Utility.java @@ -58,17 +58,17 @@ public class Utility switch ( type ) { case ParameterMetaData.parameterModeUnknown: - return "Unknown"; + return "Unknown"; //$NON-NLS-1$ case ParameterMetaData.parameterModeIn: - return "Input"; + return "Input"; //$NON-NLS-1$ case ParameterMetaData.parameterModeInOut: - return "Input/Output"; + return "Input/Output"; //$NON-NLS-1$ case ParameterMetaData.parameterModeOut: - return "Output"; + return "Output"; //$NON-NLS-1$ case 5: - return "Return Value"; + return "Return Value"; //$NON-NLS-1$ default: - return "Unknown"; + return "Unknown"; //$NON-NLS-1$ } } @@ -107,7 +107,7 @@ public class Utility ExceptionHandler.showException( PlatformUI.getWorkbench( ) .getDisplay( ) .getActiveShell( ), - JdbcPlugin.getResourceString( "exceptionHandler.title.error" ), + JdbcPlugin.getResourceString( "exceptionHandler.title.error" ), //$NON-NLS-1$ e.getLocalizedMessage( ), e ); @@ -184,7 +184,7 @@ public class Utility entryValue = (String[]) entry.getValue( ); jarFile = new JarFile( getFileNameFromFilePath( (String) entryValue[0] ), entryValue[0], - "", + "", //$NON-NLS-1$ false ); rMap.put( entry.getKey( ), jarFile ); } @@ -284,7 +284,7 @@ public class Utility assert quoteFlag != null; if ( quoted == null ) { - return ""; + return ""; //$NON-NLS-1$ } else { diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/bidi/preference/JDBCDataSourcePreferencePage.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/bidi/preference/JDBCDataSourcePreferencePage.java index cc29408..0189183 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/bidi/preference/JDBCDataSourcePreferencePage.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/bidi/preference/JDBCDataSourcePreferencePage.java @@ -33,13 +33,13 @@ import org.eclipse.ui.IWorkbenchPreferencePage; */ public class JDBCDataSourcePreferencePage extends PreferencePage implements IWorkbenchPreferencePage { - public static final String EXTERNAL_BIDI_FORMAT = "report.data.oda.bidi.jdbc.ui.externalbidiformat"; + public static final String EXTERNAL_BIDI_FORMAT = "report.data.oda.bidi.jdbc.ui.externalbidiformat"; //$NON-NLS-1$ private Group externalBiDiFormatFrame; private String externalBiDiFormatStr; Preferences ps = null; public JDBCDataSourcePreferencePage() { super(); - setDescription(Messages.getString("preference.description")); + setDescription(Messages.getString("preference.description")); //$NON-NLS-1$ } @@ -52,7 +52,7 @@ public class JDBCDataSourcePreferencePage extends PreferencePage implements mainComposite.setLayout( twoColLayout ); externalBiDiFormatFrame = BidiGUIUtility.INSTANCE.addBiDiFormatFrame( - mainComposite, Messages.getString("preference.bidiframe.title"), new BidiFormat(externalBiDiFormatStr) ); + mainComposite, Messages.getString("preference.bidiframe.title"), new BidiFormat(externalBiDiFormatStr) ); //$NON-NLS-1$ return mainComposite; } diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/bidi/profile/AdvancedBidiDialog.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/bidi/profile/AdvancedBidiDialog.java index 8cdf747..365596b 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/bidi/profile/AdvancedBidiDialog.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/bidi/profile/AdvancedBidiDialog.java @@ -38,9 +38,9 @@ import org.eclipse.ui.PlatformUI; public class AdvancedBidiDialog extends TitleAreaDialog { public final static String ADVANCED_DIALOG_TITLE = Messages - .getString( "advancedbididialog.title" ); + .getString( "advancedbididialog.title" ); //$NON-NLS-1$ public final static String ADVANCED_DIALOG_MSG = Messages - .getString( "advancedbididialog.msg" ); + .getString( "advancedbididialog.msg" ); //$NON-NLS-1$ final private static String EXTERNAL_SYSTEM_METADATA_BIDI_FORMAT = Messages .getString( "metadata.bidiframe.title" );//$NON-NLS-1$ final private static String EXTERNAL_SYSTEM_CONTENT_BIDI_FORMAT = Messages diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/bidi/profile/BidiSettingsSupport.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/bidi/profile/BidiSettingsSupport.java index d6e0752..8b1aeef 100644 --- a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/bidi/profile/BidiSettingsSupport.java +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/bidi/profile/BidiSettingsSupport.java @@ -113,22 +113,22 @@ public class BidiSettingsSupport if (props == null) return; String str = props.getProperty(BidiConstants.CONTENT_FORMAT_PROP_NAME); - if (str != null && !str.equals("")) + if (str != null && !str.equals("")) //$NON-NLS-1$ contentFormat = new BidiFormat(str); else contentFormat = new BidiFormat(BidiConstants.DEFAULT_BIDI_FORMAT_STR); str = props.getProperty(BidiConstants.METADATA_FORMAT_PROP_NAME); - if (str != null && !str.equals("")) + if (str != null && !str.equals("")) //$NON-NLS-1$ metadataFormat = new BidiFormat(str); else metadataFormat = new BidiFormat(BidiConstants.DEFAULT_BIDI_FORMAT_STR); str = props.getProperty(BidiConstants.DISABLED_CONTENT_FORMAT_PROP_NAME); - if (str != null && !str.equals("")) + if (str != null && !str.equals("")) //$NON-NLS-1$ disabledContentBidiFormat = new BidiFormat(str); else disabledContentBidiFormat = null; str = props.getProperty(BidiConstants.DISABLED_METADATA_FORMAT_PROP_NAME); - if (str != null && !str.equals("")) + if (str != null && !str.equals("")) //$NON-NLS-1$ disabledMetadataBidiFormat = new BidiFormat(str); else disabledMetadataBidiFormat = null; diff --git a/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/bidi/profile/Messages.java b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/bidi/profile/Messages.java new file mode 100644 index 0000000..6fd0205 --- a/dev/null +++ b/org.eclipse.stardust.reporting.oda.jdbc.ui/src/org/eclipse/stardust/reporting/oda/jdbc/ui/util/bidi/profile/Messages.java @@ -0,0 +1,27 @@ +package org.eclipse.stardust.reporting.oda.jdbc.ui.util.bidi.profile;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Messages
+{
+ private static final String BUNDLE_NAME = "org.eclipse.stardust.reporting.oda.jdbc.ui.util.bidi.profile.messages"; //$NON-NLS-1$
+
+ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+ .getBundle(BUNDLE_NAME);
+
+ private Messages()
+ {}
+
+ public static String getString(String key)
+ {
+ try
+ {
+ return RESOURCE_BUNDLE.getString(key);
+ }
+ catch (MissingResourceException e)
+ {
+ return '!' + key + '!';
+ }
+ }
+}
|