commit fb732740cad45560de455438275d33f367ee74e4
author Mark Hindess <hindessm@apache.org> Sat Feb 06 07:25:22 2010 +0000
committer Mark Hindess <hindessm@apache.org> Sat Feb 06 07:25:22 2010 +0000
tree 82435d92145aa576931dd89060fe2495342ceb84
parent 16c53819998c7ecfa1a8910da20df5c0a729c017

Java6 api compatibility.

git-svn-id: https://svn.apache.org/repos/asf/harmony/enhanced/classlib/branches/java6@907186 13f79535-47bb-0310-9956-ffa450edef68

modules/luni/src/main/java/java/io/File.java

diff --git a/modules/luni/src/main/java/java/io/File.java b/modules/luni/src/main/java/java/io/File.java
index 32b76cd..c32f6f7 100644
--- a/modules/luni/src/main/java/java/io/File.java
+++ b/modules/luni/src/main/java/java/io/File.java
@@ -1586,7 +1586,11 @@
      * @return a URL for this file.
      * @throws java.net.MalformedURLException
      *             if the path cannot be transformed into a URL.
+     *
+     * @deprecated use {@link #toURI} and {@link java.net.URI#toURL} to get
+     * correct escaping of illegal characters.
      */
+    @Deprecated
     @SuppressWarnings("nls")
     public URL toURL() throws java.net.MalformedURLException {
         String name = getAbsoluteName();

modules/text/src/main/java/java/text/CollationKey.java

diff --git a/modules/text/src/main/java/java/text/CollationKey.java b/modules/text/src/main/java/java/text/CollationKey.java
index 7498ecd..9835828 100644
--- a/modules/text/src/main/java/java/text/CollationKey.java
+++ b/modules/text/src/main/java/java/text/CollationKey.java
@@ -78,11 +78,11 @@
  * @see Collator
  * @see RuleBasedCollator
  */
-public final class CollationKey implements Comparable<CollationKey> {
+public class CollationKey implements Comparable<CollationKey> {
 
-    private String source;
+    private final String source;
 
-    private com.ibm.icu.text.CollationKey icuKey;
+    private final com.ibm.icu.text.CollationKey icuKey;
 
     CollationKey(String source, com.ibm.icu.text.CollationKey key) {
         this.source = source;