harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r812070 - in /harmony/enhanced/classlib/trunk/modules/text: META-INF/MANIFEST.MF src/main/java/java/text/Collator.java
Date Mon, 07 Sep 2009 10:09:47 GMT
Author: tellison
Date: Mon Sep  7 10:09:46 2009
New Revision: 812070

URL: http://svn.apache.org/viewvc?rev=812070&view=rev
Log:
Remove last remaining dependency on LUNI internals from TEXT module.  The PriviAction doesn't
help here anyway.
We have no dependency on java.net APIs either.

Modified:
    harmony/enhanced/classlib/trunk/modules/text/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/Collator.java

Modified: harmony/enhanced/classlib/trunk/modules/text/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/META-INF/MANIFEST.MF?rev=812070&r1=812069&r2=812070&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/trunk/modules/text/META-INF/MANIFEST.MF Mon Sep  7 10:09:46
2009
@@ -18,10 +18,9 @@
  java.lang,
  java.lang.reflect,
  java.math,
- java.net,
+ java.net;resolution:=optional,
  java.security,
  java.util,
  org.apache.harmony.kernel.vm,
- org.apache.harmony.luni.util,
  org.apache.harmony.testframework.serialization;hy_usage=test;resolution:=optional
 Export-Package: java.text

Modified: harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/Collator.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/Collator.java?rev=812070&r1=812069&r2=812070&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/Collator.java (original)
+++ harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/Collator.java Mon
Sep  7 10:09:46 2009
@@ -18,12 +18,11 @@
 package java.text;
 
 import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Comparator;
 import java.util.Locale;
 import java.util.Vector;
 
-import org.apache.harmony.luni.util.PriviAction;
-
 /**
  * Performs locale-sensitive string comparison. A concrete subclass,
  * {@link RuleBasedCollator}, allows customization of the collation ordering by
@@ -159,7 +158,11 @@
     static {
         // CACHE_SIZE includes key and value, so needs to be double
         String cacheSize = AccessController
-                .doPrivileged(new PriviAction<String>("collator.cache")); //$NON-NLS-1$
+                .doPrivileged(new PrivilegedAction<String>() {
+                    public String run() {
+                        return System.getProperty("collator.cache"); //$NON-NLS-1$
+                    }
+                });
         if (cacheSize != null) {
             try {
                 CACHE_SIZE = Integer.parseInt(cacheSize);



Mime
View raw message