You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by da...@apache.org on 2006/04/20 22:14:35 UTC
svn commit: r395690 - in /db/derby/code/trunk:
java/build/org/apache/derbyBuild/ java/client/org/apache/derby/client/am/
java/client/org/apache/derby/client/net/ java/engine/org/apache/derby/loc/
java/shared/org/apache/derby/shared/common/reference/ to...
Author: davidvc
Date: Thu Apr 20 13:14:33 2006
New Revision: 395690
URL: http://svn.apache.org/viewcvs?rev=395690&view=rev
Log:
DERBY-845: Internationalize CcsidManager to FdocaSimpleArray in
client/net package. Only one message needed to be internationalized
in this set. derbynetclientmats passes.
Modified:
db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement40.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/EbcdicCcsidManager.java
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties
db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
db/derby/code/trunk/tools/testing/i18nTestGenerator/genClient2.sed
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java?rev=395690&r1=395689&r2=395690&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java Thu Apr 20 13:14:33 2006
@@ -99,6 +99,7 @@
clientMessageIds.add(SQLState.LOSS_OF_PRECISION_EXCEPTION);
clientMessageIds.add(SQLState.LANG_INVALID_SQL_IN_BATCH);
clientMessageIds.add(SQLState.CLIENT_RESULT_SET_NOT_OPEN);
+ clientMessageIds.add(SQLState.CANT_CONVERT_UNICODE_TO_EBCDIC);
}
public static void main(String[] args) throws Exception {
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement40.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement40.java?rev=395690&r1=395689&r2=395690&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement40.java Thu Apr 20 13:14:33 2006
@@ -201,7 +201,7 @@
try {
return interfaces.cast(this);
} catch (ClassCastException cce) {
- throw new SqlException(null,new MessageId(SQLState.UNABLE_TO_UNWRAP),
+ throw new SqlException(null, new MessageId(SQLState.UNABLE_TO_UNWRAP),
interfaces).getSQLException();
}
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/EbcdicCcsidManager.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/net/EbcdicCcsidManager.java?rev=395690&r1=395689&r2=395690&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/EbcdicCcsidManager.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/EbcdicCcsidManager.java Thu Apr 20 13:14:33 2006
@@ -21,6 +21,8 @@
package org.apache.derby.client.net;
import org.apache.derby.client.am.SqlException;
+import org.apache.derby.client.am.MessageId;
+import org.apache.derby.shared.common.reference.SQLState;
/**
* A concrete implementation of a CcsidMgr used to convert between Java UCS2 and Ebcdic as needed to handle character
@@ -138,7 +140,8 @@
if (c > 0xff)
// buffer[offset++] = (byte) 63;
{
- throw new SqlException(agent.logWriter_, "Unicode string can't convert to Ebcdic string");
+ throw new SqlException(agent.logWriter_,
+ new MessageId(SQLState.CANT_CONVERT_UNICODE_TO_EBCDIC));
} else {
buffer[offset++] = (byte) (conversionArrayToEbcdic[c]);
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties?rev=395690&r1=395689&r2=395690&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties Thu Apr 20 13:14:33 2006
@@ -378,6 +378,7 @@
22005=An attempt was made to get a data value of type ''{0}'' from a data value of type ''{1}''.
22005.S.1=Unable to convert a value of type ''{0}'' to type ''{1}'' : the encoding is not supported.
22005.S.2=The required character converter is not available.
+22005.S.3=Unicode string can't convert to Ebcdic string
22007.S.180=The string representation of a datetime value is out of range.
22007.S.181=The syntax of the string representation of a datetime value is incorrect.
22008.S=''{0}'' is an invalid argument to the {1} function.
Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java?rev=395690&r1=395689&r2=395690&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java (original)
+++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java Thu Apr 20 13:14:33 2006
@@ -672,6 +672,7 @@
String LANG_DATA_TYPE_GET_MISMATCH = "22005"; // same 22005 error
String UNSUPPORTED_ENCODING = "22005.S.1";
String CHARACTER_CONVERTER_NOT_AVAILABLE = "22005.S.2";
+ String CANT_CONVERT_UNICODE_TO_EBCDIC = "22005.S.3";
String LANG_DATE_RANGE_EXCEPTION = "22007.S.180";
String LANG_DATE_SYNTAX_EXCEPTION = "22007.S.181";
Modified: db/derby/code/trunk/tools/testing/i18nTestGenerator/genClient2.sed
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/tools/testing/i18nTestGenerator/genClient2.sed?rev=395690&r1=395689&r2=395690&view=diff
==============================================================================
--- db/derby/code/trunk/tools/testing/i18nTestGenerator/genClient2.sed (original)
+++ db/derby/code/trunk/tools/testing/i18nTestGenerator/genClient2.sed Thu Apr 20 13:14:33 2006
@@ -57,6 +57,8 @@
s/[[:space:]]cursorName/ "cursorName"/g
s/[[:space:]]cursorName/ "cursorName"/g
s/[[:space:]]methodName/ "methodName"/g
+s/[[:space:]]interfaces/ "interfaces"/g
+s/[[:space:]]method/ "method"/g
s/[[:space:]]instance/ "instance"/g
s/[[:space:]]method)/ "method")/g
s/[[:space:]]b.toString()/ "bytes"/g