convert chars and strings to Unicode (UTF-8)

7 files changed, 31 insertions, 31 deletions

diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/ByteArrayToolsTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/ByteArrayToolsTests.java
index 5aa479806f..3126fe20b2 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/ByteArrayToolsTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/ByteArrayToolsTests.java
@@ -25,21 +25,21 @@ public class ByteArrayToolsTests
 
 	public void testConvertToHexString() throws Exception {
 		String s = "test";
-		assertEquals("74657374", ByteArrayTools.convertToHexString(s.getBytes())); // Unicode values
+		assertEquals("74657374", ByteArrayTools.convertToHexString(s.getBytes())); // UTF-8 values
 	}
 
 	public void testConvertToHexString_negative() throws Exception {
-		String s = "café";
-		assertEquals("636166E9", ByteArrayTools.convertToHexString(s.getBytes())); // Unicode values
+		String s = "café";
+		assertEquals("636166C3A9", ByteArrayTools.convertToHexString(s.getBytes())); // UTF-8 values
 	}
 
 	public void testConvertToHexCharArray() throws Exception {
 		String s = "test";
-		assertTrue(Arrays.equals("74657374".toCharArray(), ByteArrayTools.convertToHexCharArray(s.getBytes()))); // Unicode values
+		assertTrue(Arrays.equals("74657374".toCharArray(), ByteArrayTools.convertToHexCharArray(s.getBytes()))); // UTF-8 values
 	}
 
 	public void testConvertToHexCharArray_negative() throws Exception {
-		String s = "café";
-		assertTrue(Arrays.equals("636166E9".toCharArray(), ByteArrayTools.convertToHexCharArray(s.getBytes()))); // Unicode values
+		String s = "café";
+		assertTrue(Arrays.equals("636166C3A9".toCharArray(), ByteArrayTools.convertToHexCharArray(s.getBytes()))); // UTF-8 values
 	}
 }
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/CharArrayToolsTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/CharArrayToolsTests.java
index 755db9ea41..1a95b9454d 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/CharArrayToolsTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/CharArrayToolsTests.java
@@ -270,18 +270,18 @@ public class CharArrayToolsTests
 	}
 
 	public void testConvertHexStringToByteArray_ok() throws Exception {
-		String s = "74657374"; // Unicode values
+		String s = "74657374"; // UTF-8 values
 		assertEquals("test", new String(CharArrayTools.convertHexStringToByteArray(s.toCharArray())));
 	}
 
 	public void testConvertHexStringToByteArray_negative() throws Exception {
-		String s = "636166E9"; // Unicode values
-		assertEquals("café", new String(CharArrayTools.convertHexStringToByteArray(s.toCharArray())));
+		String s = "636166C3A9"; // UTF-8 values
+		assertEquals("café", new String(CharArrayTools.convertHexStringToByteArray(s.toCharArray())));
 	}
 
 	public void testConvertHexStringToByteArray_lowercase() throws Exception {
-		String s = "636166e9"; // Unicode values
-		assertEquals("café", new String(CharArrayTools.convertHexStringToByteArray(s.toCharArray())));
+		String s = "636166c3a9"; // UTF-8 values
+		assertEquals("café", new String(CharArrayTools.convertHexStringToByteArray(s.toCharArray())));
 	}
 
 	// ********** convert camel-case to all-caps **********
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/StringBufferToolsTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/StringBufferToolsTests.java
index 435c6d8f2e..d2ba712198 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/StringBufferToolsTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/StringBufferToolsTests.java
@@ -224,7 +224,7 @@ public class StringBufferToolsTests
 		this.verifyCapitalizeOnStringStringBuffer("ORACLE", "ORACLE");
 		this.verifyCapitalizeOnStringStringBuffer("", "");
 		this.verifyCapitalizeOnStringStringBuffer("A", "a");
-		this.verifyCapitalizeOnStringStringBuffer("\u00C9cole", "\u00E9cole"); // �cole->�COLE
+		this.verifyCapitalizeOnStringStringBuffer("École", "école");
 	}
 
 	private void verifyCapitalizeOnStringStringBuffer(String expected, String string) {
@@ -256,7 +256,7 @@ public class StringBufferToolsTests
 		this.verifyUncapitalizeOnString("ORACLE", "ORACLE");
 		this.verifyUncapitalizeOnString("", "");
 		this.verifyUncapitalizeOnString("a", "A");
-		this.verifyUncapitalizeOnString("\u00E9cole", "\u00C9cole"); // �cole->�COLE
+		this.verifyUncapitalizeOnString("école", "École");
 	}
 
 	private void verifyUncapitalizeOnString(String expected, String string) {
@@ -282,11 +282,11 @@ public class StringBufferToolsTests
 	}
 
 	public void testConvertToHexString() {
-		this.verifyConvertToHexString("74657374", "test"); // Unicode values
+		this.verifyConvertToHexString("74657374", "test"); // UTF-8 values
 	}
 
 	public void testConvertToHexString_negative() {
-		this.verifyConvertToHexString("636166E9", "café"); // Unicode values
+		this.verifyConvertToHexString("636166C3A9", "café"); // UTF-8 values
 	}
 
 	private void verifyConvertToHexString(String expected, String string) {
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/StringBuilderToolsTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/StringBuilderToolsTests.java
index 8285e90be4..4258538b81 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/StringBuilderToolsTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/StringBuilderToolsTests.java
@@ -224,7 +224,7 @@ public class StringBuilderToolsTests
 		this.verifyCapitalizeOnString("ORACLE", "ORACLE");
 		this.verifyCapitalizeOnString("", "");
 		this.verifyCapitalizeOnString("A", "a");
-		this.verifyCapitalizeOnString("\u00C9cole", "\u00E9cole"); // �cole->�COLE
+		this.verifyCapitalizeOnString("École", "école");
 	}
 
 	private void verifyCapitalizeOnString(String expected, String string) {
@@ -256,7 +256,7 @@ public class StringBuilderToolsTests
 		this.verifyUncapitalizeOnString("ORACLE", "ORACLE");
 		this.verifyUncapitalizeOnString("", "");
 		this.verifyUncapitalizeOnString("a", "A");
-		this.verifyUncapitalizeOnString("\u00E9cole", "\u00C9cole"); // �cole->�COLE
+		this.verifyUncapitalizeOnString("école", "École");
 	}
 
 	private void verifyUncapitalizeOnString(String expected, String string) {
@@ -282,11 +282,11 @@ public class StringBuilderToolsTests
 	}
 
 	public void testConvertToHexString() {
-		this.verifyConvertToHexString("74657374", "test"); // Unicode values
+		this.verifyConvertToHexString("74657374", "test"); // UTF-8 values
 	}
 
 	public void testConvertToHexString_negative() {
-		this.verifyConvertToHexString("636166E9", "café"); // Unicode values
+		this.verifyConvertToHexString("636166C3A9", "café"); // UTF-8 values
 	}
 
 	private void verifyConvertToHexString(String expected, String string) {
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/StringToolsTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/StringToolsTests.java
index 8ec16d5793..5ac4cc5b8a 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/StringToolsTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/StringToolsTests.java
@@ -180,7 +180,7 @@ public class StringToolsTests
 		this.verifyCapitalize("ORACLE", "ORACLE");
 		this.verifyCapitalize("", "");
 		this.verifyCapitalize("A", "a");
-		this.verifyCapitalize("\u00C9cole", "\u00E9cole"); // �cole->�COLE
+		this.verifyCapitalize("École", "école");
 	}
 
 	private void verifyCapitalize(String expected, String string) {
@@ -194,7 +194,7 @@ public class StringToolsTests
 		this.verifyUncapitalize("ORACLE", "ORACLE");
 		this.verifyUncapitalize("", "");
 		this.verifyUncapitalize("a", "A");
-		this.verifyUncapitalize("\u00E9cole", "\u00C9cole"); // �cole->�COLE
+		this.verifyUncapitalize("école", "École");
 	}
 
 	private void verifyUncapitalize(String expected, String string) {
@@ -313,18 +313,18 @@ public class StringToolsTests
 	}
 
 	public void testConvertHexStringToByteArray_ok() throws Exception {
-		String s = "74657374"; // Unicode values
+		String s = "74657374"; // UTF-8 values
 		assertEquals("test", new String(StringTools.convertHexStringToByteArray(s)));
 	}
 
 	public void testConvertHexStringToByteArray_negative() throws Exception {
-		String s = "636166E9"; // Unicode values
-		assertEquals("café", new String(StringTools.convertHexStringToByteArray(s)));
+		String s = "636166C3A9"; // UTF-8 values
+		assertEquals("café", new String(StringTools.convertHexStringToByteArray(s)));
 	}
 
 	public void testConvertHexStringToByteArray_lowercase() throws Exception {
-		String s = "636166e9"; // Unicode values
-		assertEquals("café", new String(StringTools.convertHexStringToByteArray(s)));
+		String s = "636166c3a9"; // UTF-8 values
+		assertEquals("café", new String(StringTools.convertHexStringToByteArray(s)));
 	}
 
 	// ********** convert camel-case to all-caps **********
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/io/WriterToolsTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/io/WriterToolsTests.java
index 9609a8bded..917a793a4d 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/io/WriterToolsTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/io/WriterToolsTests.java
@@ -226,7 +226,7 @@ public class WriterToolsTests
 		this.verifyCapitalizeOnStringWriter("ORACLE", "ORACLE");
 		this.verifyCapitalizeOnStringWriter("", "");
 		this.verifyCapitalizeOnStringWriter("A", "a");
-		this.verifyCapitalizeOnStringWriter("\u00C9cole", "\u00E9cole"); // �cole->�COLE
+		this.verifyCapitalizeOnStringWriter("École", "école");
 	}
 
 	private void verifyCapitalizeOnStringWriter(String expected, String string) throws Exception {
@@ -258,7 +258,7 @@ public class WriterToolsTests
 		this.verifyUncapitalizeOnStringWriter("ORACLE", "ORACLE");
 		this.verifyUncapitalizeOnStringWriter("", "");
 		this.verifyUncapitalizeOnStringWriter("a", "A");
-		this.verifyUncapitalizeOnStringWriter("\u00E9cole", "\u00C9cole"); // �cole->�COLE
+		this.verifyUncapitalizeOnStringWriter("école", "École");
 	}
 
 	private void verifyUncapitalizeOnStringWriter(String expected, String string) throws Exception {
@@ -284,11 +284,11 @@ public class WriterToolsTests
 	}
 
 	public void testConvertToHexString() throws Exception {
-		this.verifyConvertToHexString("74657374", "test"); // Unicode values
+		this.verifyConvertToHexString("74657374", "test"); // UTF-8 values
 	}
 
 	public void testConvertToHexString_negative() throws Exception {
-		this.verifyConvertToHexString("636166E9", "café"); // Unicode values
+		this.verifyConvertToHexString("636166C3A9", "café"); // UTF-8 values
 	}
 
 	private void verifyConvertToHexString(String expected, String string) throws Exception {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/internal/driver/Sybase.java b/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/internal/driver/Sybase.java
index c9b93e51f5..caebeba9b4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/internal/driver/Sybase.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/internal/driver/Sybase.java
@@ -82,7 +82,7 @@ class Sybase
 	char[] getExtendedRegularNamePartCharacters() {
 		return EXTENDED_REGULAR_NAME_PART_CHARACTERS;
 	}
-	private static final char[] EXTENDED_REGULAR_NAME_PART_CHARACTERS = new char[] { '$', '¥', '£', '#' };
+	private static final char[] EXTENDED_REGULAR_NAME_PART_CHARACTERS = new char[] { '$', '¥', '£', '#' };
 
 	//TODO query database for delimiter setting
 	@Override