From 65729c231d312b791497ef98d941871c1d848c36 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 8 Oct 2012 22:26:01 +0200
Subject: [PATCH] Replace icu4j with JDK

---
 src/nu/xom/TextWriter.java              | 10 +++++-----
 src/nu/xom/tests/CanonicalizerTest.java |  6 +++---
 src/nu/xom/tests/FastTests.java         |  1 -
 src/nu/xom/tests/XOMTests.java          |  2 --
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/nu/xom/TextWriter.java b/src/nu/xom/TextWriter.java
index 46f8877..6107021 100644
--- a/src/nu/xom/TextWriter.java
+++ b/src/nu/xom/TextWriter.java
@@ -24,7 +24,7 @@ package nu.xom;
 import java.io.IOException;
 import java.io.Writer;
 
-import com.ibm.icu.text.Normalizer;
+import java.text.Normalizer;
 
 /**
  * <p>
@@ -415,7 +415,7 @@ abstract class TextWriter {
     final void writePCDATA(String s) throws IOException {
         
         if (normalize) {
-            s = Normalizer.normalize(s, Normalizer.NFC);   
+            s = Normalizer.normalize(s, Normalizer.Form.NFC);   
         }
         int length = s.length();
         for (int i=0; i < length; i++) {
@@ -429,7 +429,7 @@ abstract class TextWriter {
       throws IOException {
         
         if (normalize) {
-            s = Normalizer.normalize(s, Normalizer.NFC);   
+            s = Normalizer.normalize(s, Normalizer.Form.NFC);   
         }
         int length = s.length();
         for (int i=0; i < length; i++) {
@@ -442,7 +442,7 @@ abstract class TextWriter {
     final void writeMarkup(String s) throws IOException {
         
         if (normalize) {
-            s = Normalizer.normalize(s, Normalizer.NFC);   
+            s = Normalizer.normalize(s, Normalizer.Form.NFC);   
         }
         int length = s.length();
         for (int i=0; i < length; i++) {
@@ -667,4 +667,4 @@ abstract class TextWriter {
     }
 
     
-}
\ No newline at end of file
+}
diff --git a/src/nu/xom/tests/CanonicalizerTest.java b/src/nu/xom/tests/CanonicalizerTest.java
index 9de4d50..e0df901 100644
--- a/src/nu/xom/tests/CanonicalizerTest.java
+++ b/src/nu/xom/tests/CanonicalizerTest.java
@@ -31,7 +31,7 @@ import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.ibm.icu.text.Normalizer;
+import java.text.Normalizer;
 
 import nu.xom.Attribute;
 import nu.xom.Builder;
@@ -361,7 +361,7 @@ public class CanonicalizerTest extends XOMTestCase {
         InputStream in = new ByteArrayInputStream(data);
         Document doc = builder.build(in);
         String rawResult = doc.getValue();
-        String normalizedResult = Normalizer.normalize(rawResult, Normalizer.NFC);
+        String normalizedResult = Normalizer.normalize(rawResult, Normalizer.Form.NFC);
         assertEquals("Parser doesn't use NFC when converting from " + encoding, 
           normalizedResult, rawResult);
         
@@ -390,7 +390,7 @@ public class CanonicalizerTest extends XOMTestCase {
         InputStream in = new ByteArrayInputStream(data);
         Document doc = builder.build(in);
         String rawResult = doc.getValue();
-        String normalizedResult = Normalizer.normalize(rawResult, Normalizer.NFC);
+        String normalizedResult = Normalizer.normalize(rawResult, Normalizer.Form.NFC);
         assertEquals("Parser doesn't use NFC when converting from " + encoding, 
           normalizedResult, rawResult);
         
diff --git a/src/nu/xom/tests/FastTests.java b/src/nu/xom/tests/FastTests.java
index a1ae5fe..a8ce239 100644
--- a/src/nu/xom/tests/FastTests.java
+++ b/src/nu/xom/tests/FastTests.java
@@ -45,7 +45,6 @@ public class FastTests extends TestCase {
 
     public static Test suite() {
         TestSuite result = new TestSuite();
-        result.addTest(new TestSuite(VerifierTest.class));
         result.addTest(new TestSuite(SubclassTest.class));
         result.addTest(new TestSuite(NodeFactoryTest.class));
         result.addTest(new TestSuite(ParentNodeTest.class));
diff --git a/src/nu/xom/tests/XOMTests.java b/src/nu/xom/tests/XOMTests.java
index 246a31e..b17eea1 100644
--- a/src/nu/xom/tests/XOMTests.java
+++ b/src/nu/xom/tests/XOMTests.java
@@ -46,7 +46,6 @@ public class XOMTests extends TestCase {
     
     public static Test suite() {
         TestSuite result = new TestSuite();
-        result.addTest(new TestSuite(VerifierTest.class));
         result.addTest(new TestSuite(SubclassTest.class));
         result.addTest(new TestSuite(NodeFactoryTest.class));
         result.addTest(new TestSuite(ParentNodeTest.class));
@@ -82,7 +81,6 @@ public class XOMTests extends TestCase {
         result.addTest(new TestSuite(BaseURITest.class));
         result.addTest(new TestSuite(TextTest.class));
         result.addTest(new TestSuite(XSLTransformTest.class));
-        result.addTest(new TestSuite(EncodingTest.class));
         return result;
     }
 
-- 
1.7.11.4