[freenet-cvs] r10392 - trunk/freenet/src/freenet/support

[t...@freenetproject.org]

Author: toad
Date: 2006-09-05 12:58:08 +0000 (Tue, 05 Sep 2006)
New Revision: 10392

Modified:
   trunk/freenet/src/freenet/support/SimpleFieldSet.java
Log:
Simplify writeToOrdered()

Modified: trunk/freenet/src/freenet/support/SimpleFieldSet.java
===================================================================
--- trunk/freenet/src/freenet/support/SimpleFieldSet.java       2006-09-05 
12:15:40 UTC (rev 10391)
+++ trunk/freenet/src/freenet/support/SimpleFieldSet.java       2006-09-05 
12:58:08 UTC (rev 10392)
@@ -261,32 +261,21 @@
        }

     synchronized void writeToOrdered(Writer w, String prefix, boolean 
noEndMarker) throws IOException {
-       Object[] objects = values.keySet().toArray();
-       String[] orderedValues = new String[values.size()];
+       String[] keys = (String[]) values.keySet().toArray();
        int i=0;

-       // Stringify
-       for(i=0; i < values.size(); i++)
-               orderedValues[i] = objects[i].toString();
-       
        // Sort
-       Arrays.sort(orderedValues);
+       Arrays.sort(keys);

        // Output
-       for(i=0; i < orderedValues.length; i++)
-               w.write(prefix+orderedValues[i]+'='+get(orderedValues[i])+'\n');
+       for(i=0; i < keys.length; i++)
+               w.write(prefix+keys[i]+'='+get(keys[i])+'\n');

        if(subsets != null) {
-               objects = subsets.keySet().toArray();
-               String[] orderedPrefixes = new String[subsets.size()];
+               String[] orderedPrefixes = (String[]) 
subsets.keySet().toArray();
+               // Sort
+               Arrays.sort(orderedPrefixes);

-               // Stringify
-               for(i=0; i < subsets.size(); i++)
-                       orderedPrefixes[i] = objects[i].toString();
-               
-               // Sort
-               Arrays.sort(orderedPrefixes);
-               
                for(i=0; i < orderedPrefixes.length; i++) {
                        SimpleFieldSet subset = subset(orderedPrefixes[i]);
                        if(subset == null) throw new NullPointerException();