Author: snjeza Date: 2008-11-15 13:41:05 -0500 (Sat, 15 Nov 2008) New Revision: 11810 Added: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/Messages.java trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/messages.properties Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF trunk/birt/plugins/org.jboss.tools.birt.oda/plugin.properties trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/Activator.java trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/IOdaFactory.java trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/AbstractOdaFactory.java trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/ConsoleConfigurationOdaFactory.java trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/DataTypes.java trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateConnection.java trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateDataSetMetaData.java trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateDriver.java trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateOdaQuery.java trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateResultSet.java trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateResultSetMetaData.java trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/ReflectServerOdaFactory.java trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/ServerOdaFactory.java Log: JBIDE-3000 Internationalize BIRT component Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF 2008-11-15 18:40:40 UTC (rev 11809) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF 2008-11-15 18:41:05 UTC (rev 11810) @@ -5,7 +5,7 @@ Bundle-Version: 1.0.0 Bundle-ClassPath: . Bundle-Activator: org.jboss.tools.birt.oda.Activator -Bundle-Vendor: JBoss, a division of Red Hat +Bundle-Vendor: %BundleVendor Bundle-Localization: plugin Export-Package: org.jboss.tools.birt.oda, org.jboss.tools.birt.oda.impl Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/plugin.properties =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/plugin.properties 2008-11-15 18:40:40 UTC (rev 11809) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/plugin.properties 2008-11-15 18:41:05 UTC (rev 11810) @@ -11,3 +11,5 @@ data.source.name=Hibernate Data Source data.set.name=Hibernate Data Set connection.profile.name=Hibernate Data Source Connection Profile + +BundleVendor = JBoss, a division of Red Hat \ No newline at end of file Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/Activator.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/Activator.java 2008-11-15 18:40:40 UTC (rev 11809) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/Activator.java 2008-11-15 18:41:05 UTC (rev 11810) @@ -19,7 +19,7 @@ public class Activator extends Plugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.birt.oda"; + public static final String PLUGIN_ID = "org.jboss.tools.birt.oda"; //$NON-NLS-1$ // The shared instance private static Activator plugin; Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/IOdaFactory.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/IOdaFactory.java 2008-11-15 18:40:40 UTC (rev 11809) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/IOdaFactory.java 2008-11-15 18:41:05 UTC (rev 11810) @@ -24,10 +24,10 @@ */ public interface IOdaFactory { - public static final String MAX_ROWS = "maxRows"; - public static final String CONFIGURATION = "configuration"; - public static final String JNDI_NAME = "jndiName"; - public static final String ORG_HIBERNATE_ECLIPSE_BUNDLE_ID = "org.hibernate.eclipse"; + public static final String MAX_ROWS = "maxRows"; //$NON-NLS-1$ + public static final String CONFIGURATION = "configuration"; //$NON-NLS-1$ + public static final String JNDI_NAME = "jndiName"; //$NON-NLS-1$ + public static final String ORG_HIBERNATE_ECLIPSE_BUNDLE_ID = "org.hibernate.eclipse"; //$NON-NLS-1$ void close(); boolean isOpen(); Added: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/Messages.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/Messages.java (rev 0) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/Messages.java 2008-11-15 18:41:05 UTC (rev 11810) @@ -0,0 +1,27 @@ +package org.jboss.tools.birt.oda; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.birt.oda.messages"; //$NON-NLS-1$ + public static String AbstractOdaFactory_The_type_is_not_valid; + public static String ConsoleConfigurationOdaFactory_Invalid_configuration; + public static String DataTypes_Invalid_type_name; + public static String HibernateConnection_Invalid_AppContext; + public static String HibernateDataSetMetaData_Hibernate_Data_Source; + public static String HibernateDriver_Non_defined; + public static String HibernateResultSet_Cursor_has_not_been_initialized; + public static String HibernateResultSet_The_data_type_is_not_valid; + public static String HibernateResultSetMetaData_Argument_cannot_be_null; + public static String HibernateResultSetMetaData_Invalid_index; + public static String ReflectServerOdaFactory_Cannot_create_Hibernate_session_factory; + public static String ReflectServerOdaFactory_The_type_is_not_valid; + public static String ServerOdaFactory_Cannot_create_Hibernate_session_factory; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/AbstractOdaFactory.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/AbstractOdaFactory.java 2008-11-15 18:40:40 UTC (rev 11809) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/AbstractOdaFactory.java 2008-11-15 18:41:05 UTC (rev 11810) @@ -9,6 +9,7 @@ import org.eclipse.datatools.connectivity.oda.IParameterMetaData; import org.eclipse.datatools.connectivity.oda.IResultSetMetaData; import org.eclipse.datatools.connectivity.oda.OdaException; +import org.eclipse.osgi.util.NLS; import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.Query; @@ -19,6 +20,7 @@ import org.hibernate.metadata.ClassMetadata; import org.hibernate.type.Type; import org.jboss.tools.birt.oda.IOdaFactory; +import org.jboss.tools.birt.oda.Messages; public abstract class AbstractOdaFactory implements IOdaFactory { @@ -81,7 +83,7 @@ //throw new OdaException("Data Type is Not Valid"); arColsType.add(DataTypes.UNKNOWN); arCols.add(props[x]); - arColClass.add("java.lang.String"); + arColClass.add("java.lang.String"); //$NON-NLS-1$ } } } @@ -92,9 +94,7 @@ arColsType.add(qryReturnTypes[t].getName()); arCols.add(props[t]); } else { - throw new OdaException("'" - + qryReturnTypes[t].getName() - + "' is not a valid type."); + throw new OdaException(NLS.bind(Messages.AbstractOdaFactory_The_type_is_not_valid,qryReturnTypes[t].getName())); } } @@ -120,11 +120,11 @@ } private static String[] extractColumns(final String query) { - int fromPosition = query.toLowerCase().indexOf("from"); - int selectPosition = query.toLowerCase().indexOf("select"); + int fromPosition = query.toLowerCase().indexOf("from"); //$NON-NLS-1$ + int selectPosition = query.toLowerCase().indexOf("select"); //$NON-NLS-1$ if (selectPosition >= 0) { String columns = query.substring(selectPosition + 6, fromPosition); - StringTokenizer st = new StringTokenizer(columns, ","); + StringTokenizer st = new StringTokenizer(columns, ","); //$NON-NLS-1$ List columnList = new ArrayList(); while (st.hasMoreTokens()) { columnList.add(st.nextToken().trim()); Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/ConsoleConfigurationOdaFactory.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/ConsoleConfigurationOdaFactory.java 2008-11-15 18:40:40 UTC (rev 11809) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/ConsoleConfigurationOdaFactory.java 2008-11-15 18:41:05 UTC (rev 11810) @@ -13,11 +13,13 @@ import java.util.Properties; import org.eclipse.datatools.connectivity.oda.OdaException; +import org.eclipse.osgi.util.NLS; import org.hibernate.HibernateException; import org.hibernate.SessionFactory; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; import org.jboss.tools.birt.oda.IOdaFactory; +import org.jboss.tools.birt.oda.Messages; /** * @@ -59,7 +61,7 @@ throw new OdaException(e.getLocalizedMessage()); } } else { - throw new OdaException("Invalid configuration '" + configurationName + "'"); + throw new OdaException(NLS.bind(Messages.ConsoleConfigurationOdaFactory_Invalid_configuration, configurationName)); } return sessionFactory; } Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/DataTypes.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/DataTypes.java 2008-11-15 18:40:40 UTC (rev 11809) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/DataTypes.java 2008-11-15 18:41:05 UTC (rev 11810) @@ -16,6 +16,8 @@ import java.util.Map; import org.eclipse.datatools.connectivity.oda.OdaException; +import org.eclipse.osgi.util.NLS; +import org.jboss.tools.birt.oda.Messages; /** * This class hosts the information of data types that are supported by flat @@ -25,7 +27,7 @@ public final class DataTypes { - public static final String UNKNOWN = "UNKNOWN"; + public static final String UNKNOWN = "UNKNOWN"; //$NON-NLS-1$ public static final int INT = Types.INTEGER; public static final int LONG = Types.INTEGER; public static final int SHORT = Types.INTEGER; @@ -55,7 +57,7 @@ typeStringIntPair.put( "BIGDECIMAL", new Integer( BIGDECIMAL ) ); //$NON-NLS-1$ typeStringIntPair.put( "BIG_DECIMAL", new Integer( BIGDECIMAL ) ); //$NON-NLS-1$ typeStringIntPair.put( "BIG_INTEGER", new Integer( INT ) ); //$NON-NLS-1$ - typeStringIntPair.put( "NULL", new Integer ( NULL ) ); + typeStringIntPair.put( "NULL", new Integer ( NULL ) ); //$NON-NLS-1$ typeStringIntPair.put( UNKNOWN, new Integer ( STRING ) ); } @@ -72,12 +74,12 @@ public static int getType( String typeName ) throws OdaException { String name = typeName.trim( ).toUpperCase( ); - while (name.indexOf(".") > 0) { - name = name.substring(name.indexOf(".")+1); + while (name.indexOf(".") > 0) { //$NON-NLS-1$ + name = name.substring(name.indexOf(".")+1); //$NON-NLS-1$ } if ( typeStringIntPair.containsKey( name ) ) return ( (Integer) typeStringIntPair.get( name ) ).intValue( ); - throw new OdaException( "Invalid type name : " + typeName); + throw new OdaException( NLS.bind(Messages.DataTypes_Invalid_type_name, typeName)); } /** @@ -93,8 +95,8 @@ if (valid) { return true; } - while (name.indexOf(".") > 0) { - name = name.substring(name.indexOf(".")+1); + while (name.indexOf(".") > 0) { //$NON-NLS-1$ + name = name.substring(name.indexOf(".")+1); //$NON-NLS-1$ } return typeStringIntPair.containsKey( name ); } Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateConnection.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateConnection.java 2008-11-15 18:40:40 UTC (rev 11809) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateConnection.java 2008-11-15 18:41:05 UTC (rev 11810) @@ -17,6 +17,7 @@ import org.eclipse.datatools.connectivity.oda.IQuery; import org.eclipse.datatools.connectivity.oda.OdaException; import org.jboss.tools.birt.oda.IOdaFactory; +import org.jboss.tools.birt.oda.Messages; import org.osgi.framework.Bundle; /** @@ -51,7 +52,7 @@ */ public void setAppContext(Object context) throws OdaException { if (!(context instanceof Map)) { - throw new OdaException("Invalid AppContext"); + throw new OdaException(Messages.HibernateConnection_Invalid_AppContext); } this.appContext = (Map) context; } Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateDataSetMetaData.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateDataSetMetaData.java 2008-11-15 18:40:40 UTC (rev 11809) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateDataSetMetaData.java 2008-11-15 18:41:05 UTC (rev 11810) @@ -13,6 +13,7 @@ import org.eclipse.datatools.connectivity.oda.IDataSetMetaData; import org.eclipse.datatools.connectivity.oda.IResultSet; import org.eclipse.datatools.connectivity.oda.OdaException; +import org.jboss.tools.birt.oda.Messages; /** * Implementation class of IDataSetMetaData for an ODA runtime driver. @@ -65,7 +66,7 @@ */ public String getDataSourceProductName() throws OdaException { - return "Hibernate Data Source"; + return Messages.HibernateDataSetMetaData_Hibernate_Data_Source; } /* Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateDriver.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateDriver.java 2008-11-15 18:40:40 UTC (rev 11809) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateDriver.java 2008-11-15 18:41:05 UTC (rev 11810) @@ -15,6 +15,7 @@ import org.eclipse.datatools.connectivity.oda.util.manifest.DataTypeMapping; import org.eclipse.datatools.connectivity.oda.util.manifest.ExtensionManifest; import org.eclipse.datatools.connectivity.oda.util.manifest.ManifestExplorer; +import org.jboss.tools.birt.oda.Messages; /** * Implementation class of IDriver for an ODA runtime driver. @@ -86,7 +87,7 @@ .getDataTypeMapping( nativeDataTypeCode ); if( typeMapping != null ) return typeMapping.getNativeType(); - return "Non-defined"; + return Messages.HibernateDriver_Non_defined; } } Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateOdaQuery.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateOdaQuery.java 2008-11-15 18:40:40 UTC (rev 11809) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateOdaQuery.java 2008-11-15 18:41:05 UTC (rev 11810) @@ -20,6 +20,7 @@ import org.eclipse.datatools.connectivity.oda.IResultSetMetaData; import org.eclipse.datatools.connectivity.oda.OdaException; import org.eclipse.datatools.connectivity.oda.SortSpec; +import org.jboss.tools.birt.oda.Messages; /** * Implementation class of IQuery for an ODA runtime driver. @@ -150,7 +151,7 @@ private void setParameter(int parameterId,int type,Object value) { List<Parameter> parameters = parameterMetaData.getParameters(); - String parameterName = "parameter" + parameterId; + String parameterName = "parameter" + parameterId; //$NON-NLS-1$ if (parameters.size() < parameterId) { Parameter parameter = new Parameter(type, parameterName, value); Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateResultSet.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateResultSet.java 2008-11-15 18:40:40 UTC (rev 11809) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateResultSet.java 2008-11-15 18:41:05 UTC (rev 11810) @@ -24,6 +24,8 @@ import org.eclipse.datatools.connectivity.oda.IResultSet; import org.eclipse.datatools.connectivity.oda.IResultSetMetaData; import org.eclipse.datatools.connectivity.oda.OdaException; +import org.eclipse.osgi.util.NLS; +import org.jboss.tools.birt.oda.Messages; /** * Implementation class of IResultSet for an ODA runtime driver. @@ -37,7 +39,7 @@ private int rowNumber = -1; private boolean wasNull; - private static DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy"); + private static DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy"); //$NON-NLS-1$ public HibernateResultSet(HibernateOdaQuery query) throws OdaException { this.query = query; @@ -154,7 +156,7 @@ else if (rObj instanceof Short) result = ((Short) rObj).intValue(); else - throw new RuntimeException("The " + rObj.getClass() + " data type is not valid."); + throw new RuntimeException(NLS.bind(Messages.HibernateResultSet_The_data_type_is_not_valid, rObj.getClass())); } return result; @@ -372,7 +374,7 @@ private void testFetchStarted() throws OdaException { if (rowNumber < 0) - throw new OdaException("Cursor has not been initialized"); + throw new OdaException(Messages.HibernateResultSet_Cursor_has_not_been_initialized); } } Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateResultSetMetaData.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateResultSetMetaData.java 2008-11-15 18:40:40 UTC (rev 11809) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/HibernateResultSetMetaData.java 2008-11-15 18:41:05 UTC (rev 11810) @@ -13,6 +13,8 @@ import org.eclipse.datatools.connectivity.oda.IResultSetMetaData; import org.eclipse.datatools.connectivity.oda.OdaException; +import org.eclipse.osgi.util.NLS; +import org.jboss.tools.birt.oda.Messages; /** * Implementation class of IResultSetMetaData for an ODA runtime driver. @@ -32,7 +34,7 @@ throws OdaException { if ( cName == null ) - throw new OdaException( "Argument cannot be null" ); + throw new OdaException( Messages.HibernateResultSetMetaData_Argument_cannot_be_null ); this.columnName = cName; this.columnType = cType; this.columnLabel = cLabel; @@ -54,8 +56,8 @@ { assertIndexValid( index ); String name = this.columnName[index - 1].trim( ); - if (name.indexOf(" ") > 0) { - StringTokenizer tokenizer = new StringTokenizer(name," "); + if (name.indexOf(" ") > 0) { //$NON-NLS-1$ + StringTokenizer tokenizer = new StringTokenizer(name," "); //$NON-NLS-1$ String prettyName = null; while (tokenizer.hasMoreTokens()) { prettyName = tokenizer.nextToken(); @@ -151,7 +153,7 @@ private void assertIndexValid( int index ) throws OdaException { if ( index > getColumnCount( ) || index < 1 ) - throw new OdaException( "Invalid index " + index ); + throw new OdaException( NLS.bind(Messages.HibernateResultSetMetaData_Invalid_index, new Integer(index).toString()) ); } public String getColumnClass( int index ) throws OdaException Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/ReflectServerOdaFactory.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/ReflectServerOdaFactory.java 2008-11-15 18:40:40 UTC (rev 11809) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/ReflectServerOdaFactory.java 2008-11-15 18:41:05 UTC (rev 11810) @@ -23,9 +23,11 @@ import org.eclipse.datatools.connectivity.oda.IResultSetMetaData; import org.eclipse.datatools.connectivity.oda.OdaException; +import org.eclipse.osgi.util.NLS; import org.hibernate.SessionFactory; import org.jboss.tools.birt.oda.Activator; import org.jboss.tools.birt.oda.IOdaFactory; +import org.jboss.tools.birt.oda.Messages; /** * @@ -64,14 +66,14 @@ InitialContext ctx = null; try { ctx = new InitialContext(); - Object obj = ctx.lookup("java:/" + configurationName); + Object obj = ctx.lookup("java:/" + configurationName); //$NON-NLS-1$ sessionFactory = obj; SessionFactory sf = (SessionFactory) obj; System.out.println(sf); } catch (Exception e) { e.printStackTrace(); throw new OdaException( - "Cannot create Hibernate session factory"); + Messages.ReflectServerOdaFactory_Cannot_create_Hibernate_session_factory); } } @@ -91,7 +93,7 @@ return false; boolean isClosed = true; try { - Method method = sessionFactory.getClass().getMethod("isClosed", new Class[0]); + Method method = sessionFactory.getClass().getMethod("isClosed", new Class[0]); //$NON-NLS-1$ if (method != null) { Object closed = method.invoke(sessionFactory, new Object[0]); isClosed = ((Boolean) closed).booleanValue(); @@ -119,12 +121,12 @@ session = openSession(); Object query = createQuery(session, queryText); if (maxRows > 0) { - Method setFirstResult = query.getClass().getMethod("setFirstResult", new Class[] {Integer.TYPE}); + Method setFirstResult = query.getClass().getMethod("setFirstResult", new Class[] {Integer.TYPE}); //$NON-NLS-1$ setFirstResult.invoke(query, new Object[] {INTZERO}); - Method setMaxResults = query.getClass().getMethod("setMaxResults", new Class[] {Integer.TYPE}); + Method setMaxResults = query.getClass().getMethod("setMaxResults", new Class[] {Integer.TYPE}); //$NON-NLS-1$ setMaxResults.invoke(query, new Object[] {new Integer(maxRows)}); } - Method getReturnTypes = query.getClass().getMethod("getReturnTypes", emptyClassArg); + Method getReturnTypes = query.getClass().getMethod("getReturnTypes", emptyClassArg); //$NON-NLS-1$ Object returnType = getReturnTypes.invoke(query, emptyObjectArg); Object[] qryReturnTypes = (Object[]) returnType; if (checkEntityType(qryReturnTypes)) { @@ -141,7 +143,7 @@ } else { arColsType.add(DataTypes.UNKNOWN); arCols.add(props[x]); - arColClass.add("java.lang.String"); + arColClass.add("java.lang.String"); //$NON-NLS-1$ } } } @@ -153,9 +155,7 @@ arColsType.add(typeName); arCols.add(props[t]); } else { - throw new OdaException("'" - + typeName - + "' is not a valid type."); + throw new OdaException(NLS.bind(Messages.ReflectServerOdaFactory_The_type_is_not_valid, typeName)); } } } @@ -180,7 +180,7 @@ private void closeSession(Object session) { if (session != null) { try { - Method close = session.getClass().getMethod("close", emptyClassArg); + Method close = session.getClass().getMethod("close", emptyClassArg); //$NON-NLS-1$ close.invoke(session, emptyObjectArg); session = null; } catch (Exception e) { @@ -191,7 +191,7 @@ private boolean checkEntityType(Object[] qryReturnTypes) throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException { Object first = qryReturnTypes[0]; - Method isEntityType = first.getClass().getMethod("isEntityType", emptyClassArg); + Method isEntityType = first.getClass().getMethod("isEntityType", emptyClassArg); //$NON-NLS-1$ Object ret = isEntityType.invoke(first, emptyObjectArg); boolean isEntity = ((Boolean)ret).booleanValue(); return qryReturnTypes.length > 0 && isEntity; @@ -200,7 +200,7 @@ private Object createQuery(Object session, String queryText) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException { - Method createQuery = session.getClass().getMethod("createQuery", new Class[] {String.class}); + Method createQuery = session.getClass().getMethod("createQuery", new Class[] {String.class}); //$NON-NLS-1$ Object query = createQuery.invoke(session, new Object[] {queryText}); return query; } @@ -208,17 +208,17 @@ private Object openSession() throws NoSuchMethodException, IllegalAccessException, InvocationTargetException { Object session; - Method openSession = sessionFactory.getClass().getMethod("openSession", emptyClassArg); + Method openSession = sessionFactory.getClass().getMethod("openSession", emptyClassArg); //$NON-NLS-1$ session = openSession.invoke(sessionFactory, emptyObjectArg); return session; } private static String[] extractColumns(final String query) { - int fromPosition = query.toLowerCase().indexOf("from"); - int selectPosition = query.toLowerCase().indexOf("select"); + int fromPosition = query.toLowerCase().indexOf("from"); //$NON-NLS-1$ + int selectPosition = query.toLowerCase().indexOf("select"); //$NON-NLS-1$ if (selectPosition >= 0) { String columns = query.substring(selectPosition + 6, fromPosition); - StringTokenizer st = new StringTokenizer(columns, ","); + StringTokenizer st = new StringTokenizer(columns, ","); //$NON-NLS-1$ List columnList = new ArrayList(); while (st.hasMoreTokens()) { columnList.add(st.nextToken().trim()); @@ -230,14 +230,14 @@ } private String getReturnTypeName(Object returnType) throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException { - Method getName = returnType.getClass().getMethod("getName", emptyClassArg); + Method getName = returnType.getClass().getMethod("getName", emptyClassArg); //$NON-NLS-1$ Object name = getName.invoke(returnType, emptyObjectArg); return (String) name; } private String[] getHibernateProp(String className) throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException{ Object classMetadata = getClassMetadata(className); - Method getPropertyNames = classMetadata.getClass().getMethod("getPropertyNames", emptyClassArg); + Method getPropertyNames = classMetadata.getClass().getMethod("getPropertyNames", emptyClassArg); //$NON-NLS-1$ String[] properties = (String[]) getPropertyNames.invoke(classMetadata, emptyObjectArg); return properties; } @@ -245,7 +245,7 @@ private Object getClassMetadata(String className) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException { - Method getClassMetadata = sessionFactory.getClass().getMethod("getClassMetadata", new Class[] {String.class}); + Method getClassMetadata = sessionFactory.getClass().getMethod("getClassMetadata", new Class[] {String.class}); //$NON-NLS-1$ Object classMetadata = getClassMetadata.invoke(sessionFactory, new Object[] {className}); return classMetadata; } @@ -253,7 +253,7 @@ private Object getClassMetadata(Class clazz) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException { Method getClassMetadata = sessionFactory.getClass().getMethod( - "getClassMetadata", new Class[] { Class.class }); + "getClassMetadata", new Class[] { Class.class }); //$NON-NLS-1$ Object classMetadata = getClassMetadata.invoke(sessionFactory, new Object[] { clazz }); return classMetadata; @@ -261,7 +261,7 @@ private String getHibernatePropTypes(String className, String property) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException{ Object classMetadata = getClassMetadata(className); - Method getPropertyType = classMetadata.getClass().getMethod("getPropertyType", new Class[] {String.class}); + Method getPropertyType = classMetadata.getClass().getMethod("getPropertyType", new Class[] {String.class}); //$NON-NLS-1$ Object type = getPropertyType.invoke(classMetadata, new Object[] {property}); return getReturnTypeName(type); } @@ -275,10 +275,10 @@ try { session = openSession(); Object q = createQuery(session,queryText); - Method list = q.getClass().getMethod("list", emptyClassArg); + Method list = q.getClass().getMethod("list", emptyClassArg); //$NON-NLS-1$ result = (List) list.invoke(q, emptyObjectArg); iterator = result.iterator(); - Method getReturnTypes = q.getClass().getMethod("getReturnTypes", emptyClassArg); + Method getReturnTypes = q.getClass().getMethod("getReturnTypes", emptyClassArg); //$NON-NLS-1$ this.queryReturnTypes = (Object[]) getReturnTypes.invoke(q, emptyObjectArg); } catch (Exception e) { throw new OdaException(e.getLocalizedMessage()); @@ -304,12 +304,12 @@ if (metadata == null) { metadata = getClassMetadata(obj.getClass()); } - String className = "org.hibernate.EntityMode"; + String className = "org.hibernate.EntityMode"; //$NON-NLS-1$ Class pojo = Activator.classForName(className, getClass()); - Field pojoField = pojo.getField("POJO"); + Field pojoField = pojo.getField("POJO"); //$NON-NLS-1$ Object POJO = pojoField.get(null); Class[] parameterTypes = new Class[] {Object.class,String.class, POJO.getClass()}; - Method getPropertyValue = metadata.getClass().getMethod("getPropertyValue", parameterTypes); + Method getPropertyValue = metadata.getClass().getMethod("getPropertyValue", parameterTypes); //$NON-NLS-1$ Object[] args = new Object[] {obj,getMetaData().getColumnName(rstcol),POJO}; value = getPropertyValue.invoke(metadata, args); } else { Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/ServerOdaFactory.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/ServerOdaFactory.java 2008-11-15 18:40:40 UTC (rev 11809) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/ServerOdaFactory.java 2008-11-15 18:41:05 UTC (rev 11810) @@ -10,6 +10,7 @@ import org.hibernate.SessionFactory; import org.hibernate.ejb.EntityManagerImpl; import org.jboss.tools.birt.oda.IOdaFactory; +import org.jboss.tools.birt.oda.Messages; public class ServerOdaFactory extends AbstractOdaFactory { @@ -30,15 +31,15 @@ String jndiName = properties.getProperty(JNDI_NAME); String configurationName = properties.getProperty(CONFIGURATION); if (configurationName != null) { - int index = configurationName.indexOf("-ejb"); + int index = configurationName.indexOf("-ejb"); //$NON-NLS-1$ if (index > 0) { configurationName = configurationName.substring(0, index); } } if (jndiName == null || jndiName.length() <= 0) { - jndiName = "java:/" + configurationName; + jndiName = "java:/" + configurationName; //$NON-NLS-1$ } - String entityFactoryName = "java:/" + configurationName + "EntityManagerFactory"; + String entityFactoryName = "java:/" + configurationName + "EntityManagerFactory"; //$NON-NLS-1$ //$NON-NLS-2$ if (sessionFactory == null) { InitialContext ctx = null; @@ -83,7 +84,7 @@ } catch (Exception e) { e.printStackTrace(); throw new OdaException( - "Cannot create Hibernate session factory"); + Messages.ServerOdaFactory_Cannot_create_Hibernate_session_factory); } } return sessionFactory; Added: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/messages.properties =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/messages.properties (rev 0) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/messages.properties 2008-11-15 18:41:05 UTC (rev 11810) @@ -0,0 +1,13 @@ +AbstractOdaFactory_The_type_is_not_valid=''{0}'' is not a valid type. +ConsoleConfigurationOdaFactory_Invalid_configuration=Invalid configuration ''{0}''. +DataTypes_Invalid_type_name=Invalid type name \: {0} +HibernateConnection_Invalid_AppContext=Invalid AppContext +HibernateDataSetMetaData_Hibernate_Data_Source=Hibernate Data Source +HibernateDriver_Non_defined=Non-defined +HibernateResultSet_Cursor_has_not_been_initialized=Cursor has not been initialized. +HibernateResultSet_The_data_type_is_not_valid=The {0} data type is not valid. +HibernateResultSetMetaData_Argument_cannot_be_null=Argument cannot be null. +HibernateResultSetMetaData_Invalid_index=Invalid index {0}. +ReflectServerOdaFactory_Cannot_create_Hibernate_session_factory=Cannot create Hibernate session factory +ReflectServerOdaFactory_The_type_is_not_valid=The ''{0}'' is not a valid type. +ServerOdaFactory_Cannot_create_Hibernate_session_factory=Cannot create Hibernate session factory