Author: shawkins Date: 2009-03-17 15:08:09 -0400 (Tue, 17 Mar 2009) New Revision: 568 Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDataSource.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/StandardAuthorizationActions.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/ExtensionModuleReader.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/RelationalPlanExecutor.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/XMLContext.java trunk/soap/src/main/java/com/metamatrix/soap/service/DataServiceWebServiceImpl.java Log: removing warnings with bundleutil and string arrays Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDataSource.java =================================================================== --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDataSource.java 2009-03-17 16:26:29 UTC (rev 567) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDataSource.java 2009-03-17 19:08:09 UTC (rev 568) @@ -458,7 +458,7 @@ } } if ( reasonCount < 1 ) return null; - return JDBCPlugin.Util.getString("MMDataSource.alternateServer_is_invalid", new String[] { "" + reasonCount, reason }); //$NON-NLS-1$ //$NON-NLS-2$ + return JDBCPlugin.Util.getString("MMDataSource.alternateServer_is_invalid", String.valueOf(reasonCount), reason); //$NON-NLS-1$ } /** Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/StandardAuthorizationActions.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/StandardAuthorizationActions.java 2009-03-17 16:26:29 UTC (rev 567) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/StandardAuthorizationActions.java 2009-03-17 19:08:09 UTC (rev 568) @@ -143,7 +143,7 @@ */ public static AuthorizationActions getAuthorizationActions(String[] labels) { if (labels == null || labels.length == 0 || labels.length > LABELS_COUNT ) { - throw new IllegalArgumentException(SecurityPlugin.Util.getString(SecurityMessagesKeys.SEC_API_0068, labels)); + throw new IllegalArgumentException(SecurityPlugin.Util.getString(SecurityMessagesKeys.SEC_API_0068, (Object[])labels)); } Iterator iter = actionSet.values().iterator(); while ( iter.hasNext() ) { Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/ExtensionModuleReader.java =================================================================== --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/ExtensionModuleReader.java 2009-03-17 16:26:29 UTC (rev 567) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/ExtensionModuleReader.java 2009-03-17 19:08:09 UTC (rev 568) @@ -60,9 +60,9 @@ in = extModuleURL.openStream(); contents = ByteArrayHelper.toByteArray(in); } catch (FileNotFoundException e) { - throw new MetaMatrixComponentException(DQPEmbeddedPlugin.Util.getString("ExtensionModuleReader.ext_module_does_not_exist", new String[] {extModuleName})); //$NON-NLS-1$ + throw new MetaMatrixComponentException(DQPEmbeddedPlugin.Util.getString("ExtensionModuleReader.ext_module_does_not_exist", extModuleName)); //$NON-NLS-1$ } catch (IOException e) { - throw new MetaMatrixComponentException(e, DQPEmbeddedPlugin.Util.getString("ExtensionModuleReader.ext_module_failed_to_read", new String[] {extModuleName})); //$NON-NLS-1$ + throw new MetaMatrixComponentException(e, DQPEmbeddedPlugin.Util.getString("ExtensionModuleReader.ext_module_failed_to_read", extModuleName)); //$NON-NLS-1$ } finally { if (in != null) { try{in.close();}catch(IOException e) {} Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/xml/RelationalPlanExecutor.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/query/processor/xml/RelationalPlanExecutor.java 2009-03-17 16:26:29 UTC (rev 567) +++ trunk/engine/src/main/java/com/metamatrix/query/processor/xml/RelationalPlanExecutor.java 2009-03-17 19:08:09 UTC (rev 568) @@ -155,7 +155,7 @@ try { this.tupleSource = this.bufferMgr.getTupleSource(this.internalResultID); } catch (TupleSourceNotFoundException e) { - throw new MetaMatrixComponentException(e, QueryExecPlugin.Util.getString("tuple_not_found", new String[] {this.resultInfo.getResultSetName()})); //$NON-NLS-1$ + throw new MetaMatrixComponentException(e, QueryExecPlugin.Util.getString("tuple_not_found", this.resultInfo.getResultSetName())); //$NON-NLS-1$ } } Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/xml/XMLContext.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/query/processor/xml/XMLContext.java 2009-03-17 16:26:29 UTC (rev 567) +++ trunk/engine/src/main/java/com/metamatrix/query/processor/xml/XMLContext.java 2009-03-17 19:08:09 UTC (rev 568) @@ -82,7 +82,7 @@ if (this.parentContext != null) { return this.parentContext.getCurrentRow(aliasResultName); } - throw new MetaMatrixComponentException(QueryExecPlugin.Util.getString("results_not_found", new String[] {aliasResultName})); //$NON-NLS-1$ + throw new MetaMatrixComponentException(QueryExecPlugin.Util.getString("results_not_found", aliasResultName)); //$NON-NLS-1$ } return executor.currentRow(); } @@ -99,7 +99,7 @@ if (this.parentContext != null) { return this.parentContext.getNextRow(aliasResultName); } - throw new MetaMatrixComponentException(QueryExecPlugin.Util.getString("results_not_found", new String[] {aliasResultName})); //$NON-NLS-1$ + throw new MetaMatrixComponentException(QueryExecPlugin.Util.getString("results_not_found", aliasResultName)); //$NON-NLS-1$ } return executor.nextRow(); } @@ -137,7 +137,7 @@ if (this.parentContext != null) { return this.parentContext.getOutputElements(resultName); } - throw new MetaMatrixComponentException(QueryExecPlugin.Util.getString("results_not_found", new String[] {resultName})); //$NON-NLS-1$ + throw new MetaMatrixComponentException(QueryExecPlugin.Util.getString("results_not_found", resultName)); //$NON-NLS-1$ } return executor.getOutputElements(); } Modified: trunk/soap/src/main/java/com/metamatrix/soap/service/DataServiceWebServiceImpl.java =================================================================== --- trunk/soap/src/main/java/com/metamatrix/soap/service/DataServiceWebServiceImpl.java 2009-03-17 16:26:29 UTC (rev 567) +++ trunk/soap/src/main/java/com/metamatrix/soap/service/DataServiceWebServiceImpl.java 2009-03-17 19:08:09 UTC (rev 568) @@ -184,7 +184,7 @@ returnFragment = set.getString(1); } else { - final String[] params = { procedure }; + final String params = procedure; LogUtil.log(LogConfiguration.ERROR, SOAPPlugin.Util.getString("DataServiceWebServiceImpl.8")); //$NON-NLS-1$ createSOAPFaultMessage(new Exception(SOAPPlugin.Util .getString("DataServiceWebServiceImpl.7", params)), //$NON-NLS-1$ @@ -194,7 +194,7 @@ } if (set.next()) { - final String[] params = { procedure }; + final String params = procedure; String message = SOAPPlugin.Util.getString( "DataServiceWebServiceImpl.1", params); //$NON-NLS-1$ createSOAPFaultMessage(new SQLException(message), message, @@ -307,9 +307,8 @@ connection = connectionSource.getConnection(connectionProperties); } catch (Exception e) { - final String[] param = { userName, e.getMessage() }; throw new SOAPException(SOAPPlugin.Util.getString( - "DataServiceWebServiceImpl.12", param) //$NON-NLS-1$ + "DataServiceWebServiceImpl.12", userName, e.getMessage()) //$NON-NLS-1$ , e); } return connection;