You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mi...@apache.org on 2004/12/16 20:24:09 UTC
cvs commit: xml-xalan/java/src/org/apache/xml/serializer CharInfo.java OutputPropertiesFactory.java SerializerBase.java SerializerFactory.java ToHTMLStream.java ToStream.java ToTextStream.java ToXMLStream.java
minchau 2004/12/16 11:24:09
Modified: java/src/org/apache/xml/serializer CharInfo.java
OutputPropertiesFactory.java SerializerBase.java
SerializerFactory.java ToHTMLStream.java
ToStream.java ToTextStream.java ToXMLStream.java
Log:
Changes for moving the message keys, to be shared by all language
translations (including English). This is to prevent replication of these
keys during translation. Related to XALANJ-2021
Revision Changes Path
1.17 +4 -4 xml-xalan/java/src/org/apache/xml/serializer/CharInfo.java
Index: CharInfo.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/CharInfo.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- CharInfo.java 15 Dec 2004 17:35:52 -0000 1.16
+++ CharInfo.java 16 Dec 2004 19:24:08 -0000 1.17
@@ -30,7 +30,7 @@
import javax.xml.transform.TransformerException;
-import org.apache.xml.serializer.utils.SerializerMessages;
+import org.apache.xml.serializer.utils.MsgKey;
import org.apache.xml.serializer.utils.SystemIDResolver;
import org.apache.xml.serializer.utils.Utils;
import org.apache.xml.serializer.utils.WrappedRuntimeException;
@@ -216,7 +216,7 @@
if (is == null) {
throw new RuntimeException(
Utils.messages.createMessage(
- SerializerMessages.ER_RESOURCE_COULD_NOT_FIND,
+ MsgKey.ER_RESOURCE_COULD_NOT_FIND,
new Object[] {entitiesResource, entitiesResource}));
}
@@ -287,7 +287,7 @@
} catch (Exception e) {
throw new RuntimeException(
Utils.messages.createMessage(
- SerializerMessages.ER_RESOURCE_COULD_NOT_LOAD,
+ MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
new Object[] { entitiesResource,
e.toString(),
entitiesResource,
1.9 +5 -5 xml-xalan/java/src/org/apache/xml/serializer/OutputPropertiesFactory.java
Index: OutputPropertiesFactory.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/OutputPropertiesFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- OutputPropertiesFactory.java 14 Oct 2004 21:45:05 -0000 1.8
+++ OutputPropertiesFactory.java 16 Dec 2004 19:24:08 -0000 1.9
@@ -28,7 +28,7 @@
import javax.xml.transform.OutputKeys;
-import org.apache.xml.serializer.utils.SerializerMessages;
+import org.apache.xml.serializer.utils.MsgKey;
import org.apache.xml.serializer.utils.Utils;
import org.apache.xml.serializer.utils.WrappedRuntimeException;
@@ -302,7 +302,7 @@
{
throw new WrappedRuntimeException(
Utils.messages.createMessage(
- SerializerMessages.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
+ MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
new Object[] { fileName, method }),
ioe);
}
@@ -371,7 +371,7 @@
{
throw new WrappedRuntimeException(
Utils.messages.createMessage(
- SerializerMessages.ER_COULD_NOT_LOAD_RESOURCE,
+ MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
new Object[] { resourceName }),
ioe);
//"Could not load '"+resourceName+"' (check CLASSPATH), now using just the defaults ", ioe);
@@ -388,7 +388,7 @@
{
throw new WrappedRuntimeException(
Utils.messages.createMessage(
- SerializerMessages.ER_COULD_NOT_LOAD_RESOURCE,
+ MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
new Object[] { resourceName }),
se);
//"Could not load '"+resourceName+"' (check CLASSPATH, applet security), now using just the defaults ", se);
1.15 +3 -3 xml-xalan/java/src/org/apache/xml/serializer/SerializerBase.java
Index: SerializerBase.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/SerializerBase.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SerializerBase.java 26 Oct 2004 21:41:29 -0000 1.14
+++ SerializerBase.java 16 Dec 2004 19:24:08 -0000 1.15
@@ -24,7 +24,7 @@
import javax.xml.transform.SourceLocator;
import javax.xml.transform.Transformer;
-import org.apache.xml.serializer.utils.SerializerMessages;
+import org.apache.xml.serializer.utils.MsgKey;
import org.apache.xml.serializer.utils.Utils;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
@@ -862,7 +862,7 @@
{
throw new RuntimeException(
Utils.messages.createMessage(
- SerializerMessages.ER_NAMESPACE_PREFIX,
+ MsgKey.ER_NAMESPACE_PREFIX,
new Object[] { qname.substring(0, col) } ));
}
}
1.8 +3 -3 xml-xalan/java/src/org/apache/xml/serializer/SerializerFactory.java
Index: SerializerFactory.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/SerializerFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SerializerFactory.java 14 Oct 2004 21:45:05 -0000 1.7
+++ SerializerFactory.java 16 Dec 2004 19:24:08 -0000 1.8
@@ -23,7 +23,7 @@
import javax.xml.transform.OutputKeys;
-import org.apache.xml.serializer.utils.SerializerMessages;
+import org.apache.xml.serializer.utils.MsgKey;
import org.apache.xml.serializer.utils.Utils;
import org.xml.sax.ContentHandler;
@@ -160,7 +160,7 @@
// ContentHandler, ... very bad
throw new Exception(
Utils.messages.createMessage(
- SerializerMessages.ER_SERIALIZER_NOT_CONTENTHANDLER,
+ MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
new Object[] { className}));
}
1.35 +4 -4 xml-xalan/java/src/org/apache/xml/serializer/ToHTMLStream.java
Index: ToHTMLStream.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToHTMLStream.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ToHTMLStream.java 15 Dec 2004 17:35:52 -0000 1.34
+++ ToHTMLStream.java 16 Dec 2004 19:24:08 -0000 1.35
@@ -25,7 +25,7 @@
import javax.xml.transform.Result;
-import org.apache.xml.serializer.utils.SerializerMessages;
+import org.apache.xml.serializer.utils.MsgKey;
import org.apache.xml.serializer.utils.Utils;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -1443,7 +1443,7 @@
{
throw new org.xml.sax.SAXException(
Utils.messages.createMessage(
- SerializerMessages.ER_OIERROR,
+ MsgKey.ER_OIERROR,
null),
ioe);
//"IO error", ioe);
@@ -1510,7 +1510,7 @@
{
throw new org.xml.sax.SAXException(
Utils.messages.createMessage(
- SerializerMessages.ER_OIERROR,
+ MsgKey.ER_OIERROR,
null),
ioe);
//"IO error", ioe);
1.36 +7 -7 xml-xalan/java/src/org/apache/xml/serializer/ToStream.java
Index: ToStream.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToStream.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ToStream.java 14 Oct 2004 21:45:05 -0000 1.35
+++ ToStream.java 16 Dec 2004 19:24:09 -0000 1.36
@@ -29,7 +29,7 @@
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
-import org.apache.xml.serializer.utils.SerializerMessages;
+import org.apache.xml.serializer.utils.MsgKey;
import org.apache.xml.serializer.utils.Utils;
import org.apache.xml.serializer.utils.WrappedRuntimeException;
import org.w3c.dom.Node;
@@ -986,7 +986,7 @@
{
throw new IOException(
Utils.messages.createMessage(
- SerializerMessages.ER_INVALID_UTF16_SURROGATE,
+ MsgKey.ER_INVALID_UTF16_SURROGATE,
new Object[] { Integer.toHexString((int) c)}));
//"Invalid UTF-16 surrogate detected: "
@@ -999,7 +999,7 @@
if (!(0xdc00 <= next && next < 0xe000))
throw new IOException(
Utils.messages.createMessage(
- SerializerMessages.ER_INVALID_UTF16_SURROGATE,
+ MsgKey.ER_INVALID_UTF16_SURROGATE,
new Object[] {
Integer.toHexString((int) c)
+ " "
@@ -1289,7 +1289,7 @@
{
throw new org.xml.sax.SAXException(
Utils.messages.createMessage(
- SerializerMessages.ER_OIERROR,
+ MsgKey.ER_OIERROR,
null),
ioe);
//"IO error", ioe);
@@ -1618,7 +1618,7 @@
{
throw new IOException(
Utils.messages.createMessage(
- SerializerMessages.ER_INVALID_UTF16_SURROGATE,
+ MsgKey.ER_INVALID_UTF16_SURROGATE,
new Object[] { Integer.toHexString(ch)}));
//"Invalid UTF-16 surrogate detected: "
@@ -1631,7 +1631,7 @@
if (!(0xdc00 <= next && next < 0xe000))
throw new IOException(
Utils.messages.createMessage(
- SerializerMessages
+ MsgKey
.ER_INVALID_UTF16_SURROGATE,
new Object[] {
Integer.toHexString(ch)
1.18 +4 -4 xml-xalan/java/src/org/apache/xml/serializer/ToTextStream.java
Index: ToTextStream.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToTextStream.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ToTextStream.java 14 Oct 2004 21:45:05 -0000 1.17
+++ ToTextStream.java 16 Dec 2004 19:24:09 -0000 1.18
@@ -20,7 +20,7 @@
import java.io.IOException;
-import org.apache.xml.serializer.utils.SerializerMessages;
+import org.apache.xml.serializer.utils.MsgKey;
import org.apache.xml.serializer.utils.Utils;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -350,7 +350,7 @@
*/
String integralValue = Integer.toString(c);
throw new SAXException(Utils.messages.createMessage(
- SerializerMessages.ER_ILLEGAL_CHARACTER,
+ MsgKey.ER_ILLEGAL_CHARACTER,
new Object[]{ integralValue, encoding}));
}
else
@@ -398,7 +398,7 @@
*/
String integralValue = Integer.toString(c);
throw new SAXException(Utils.messages.createMessage(
- SerializerMessages.ER_ILLEGAL_CHARACTER,
+ MsgKey.ER_ILLEGAL_CHARACTER,
new Object[]{ integralValue, encoding}));
}
else
1.17 +3 -3 xml-xalan/java/src/org/apache/xml/serializer/ToXMLStream.java
Index: ToXMLStream.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToXMLStream.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ToXMLStream.java 15 Dec 2004 17:35:52 -0000 1.16
+++ ToXMLStream.java 16 Dec 2004 19:24:09 -0000 1.17
@@ -25,7 +25,7 @@
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
-import org.apache.xml.serializer.utils.SerializerMessages;
+import org.apache.xml.serializer.utils.MsgKey;
import org.apache.xml.serializer.utils.Utils;
import org.xml.sax.SAXException;
@@ -450,7 +450,7 @@
// Create the warning message
String msg = Utils.messages.createMessage(
- SerializerMessages.ER_ILLEGAL_ATTRIBUTE_POSITION,new Object[]{ localName });
+ MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,new Object[]{ localName });
try {
// Prepare to issue the warning message
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org