Author: marcusb-guest
Date: 2006-09-06 15:19:20 +0000 (Wed, 06 Sep 2006)
New Revision: 2381
Added:
trunk/xml-im-exporter/xml-im-exporter/debian/
Modified:
trunk/xml-im-exporter/xml-im-exporter/build.xml
trunk/xml-im-exporter/xml-im-exporter/src/test/de/zeigermann/xml/XMLWriterTest.java
Log:
Merged debian and fix-source-utf8-encoding branches (r2380).
Modified: trunk/xml-im-exporter/xml-im-exporter/build.xml
===================================================================
--- trunk/xml-im-exporter/xml-im-exporter/build.xml 2006-09-06 15:15:42 UTC
(rev 2380)
+++ trunk/xml-im-exporter/xml-im-exporter/build.xml 2006-09-06 15:19:20 UTC
(rev 2381)
@@ -129,7 +129,7 @@
author="true"
windowtitle="XML Im-/Exporter API"
doctitle="XML Im-/Exporter"
- link="http://java.sun.com/j2se/1.4/docs/api/";
+ link="/usr/share/doc/classpath-doc/api"
bottom="Copyright © 2002-2004 Oliver Zeigermann. All Rights
Reserved."
classpathref="classpath"/>
</target>
Copied: trunk/xml-im-exporter/xml-im-exporter/debian (from rev 2380,
branches/xml-im-exporter/feature/debian/debian)
Modified:
trunk/xml-im-exporter/xml-im-exporter/src/test/de/zeigermann/xml/XMLWriterTest.java
===================================================================
---
trunk/xml-im-exporter/xml-im-exporter/src/test/de/zeigermann/xml/XMLWriterTest.java
2006-09-06 15:15:42 UTC (rev 2380)
+++
trunk/xml-im-exporter/xml-im-exporter/src/test/de/zeigermann/xml/XMLWriterTest.java
2006-09-06 15:19:20 UTC (rev 2381)
@@ -273,10 +273,10 @@
xmlWriter = new XMLWriter(stringWriter);
xmlWriter.writeXMLDeclaration();
xmlWriter.writeStartTag("<root>",
XMLOutputStreamWriter.NO_NEWLINE);
- xmlWriter.writePCData("text ��� ��� �");
+ xmlWriter.writePCData("text öäü ÄÖÜ ß");
xmlWriter.writeEndTag("</root>");
String xml = stringWriter.toString();
- String expected = "<?xml version=\"1.0\"?>\n<root>text ��� ���
�</root>\n";
+ String expected = "<?xml version=\"1.0\"?>\n<root>text öäü ÄÖÜ
ß</root>\n";
System.out.println(xml);
if (!xml.equals(expected)) {
fail("\nWrong output:\n'" + xml + "'\nShould be:\n'" +
expected + "'\n");
@@ -296,7 +296,7 @@
// this must not be encoded to UTF-16 - CHECK!
xmlWriter.writeXMLDeclaration();
xmlWriter.writeStartTag("<r>", XMLOutputStreamWriter.NO_NEWLINE);
- xmlWriter.writePCData("t ��� �");
+ xmlWriter.writePCData("t öäü ß");
xmlWriter.writeEndTag("</r>");
xmlWriter.flush();
out.flush();
@@ -358,7 +358,7 @@
// <r>t in UTF-16
0, '<', 0, 'r', 0, '>', 0, 't', 0, ' ',
// german umlaute encoded as UTF-16
- // 0, '�' (F6=246,246-256=-10), 0, '�' (E4=228,
228-256=-28), 0, '�' (FC=252, 252-256=-4), 0, ' ', 0, '�' (DF=223, 223-256=33),
+ // 0, 'ö' (F6=246,246-256=-10), 0, 'ä' (E4=228,
228-256=-28), 0, 'ü' (FC=252, 252-256=-4), 0, ' ', 0, 'ß' (DF=223, 223-256=33),
0, -10, 0, -28, 0, -4, 0, ' ', 0, -33,
// <r> in UTF-16
0, '<', 0, '/', 0, 'r', 0, '>',
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
