1 files changed, 54 insertions, 22 deletions

diff --git a/libjava/java/text/RuleBasedCollator.java b/libjava/java/text/RuleBasedCollator.java
index e8662a827a6..799c3a2088f 100644
--- a/libjava/java/text/RuleBasedCollator.java
+++ b/libjava/java/text/RuleBasedCollator.java
@@ -1,12 +1,40 @@
-// RuleBasedCollator.java - Concrete class for locale-based string compare.
+/* RuleBasedCollator.java -- Concrete Collator Class
 
 /* Copyright (C) 1999, 2000, 2001  Free Software Foundation
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
 
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
 
 package java.text;
 
@@ -14,15 +42,16 @@ import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Vector;
 
-/**
- * @author Tom Tromey <tromey@cygnus.com>
- * @date March 25, 1999
- */
 /* Written using "Java Class Libraries", 2nd edition, plus online
  * API docs for JDK 1.2 from http://www.javasoft.com.
  * Status: Believed complete and correct
  */
 
+/**
+ * @author Tom Tromey <tromey@cygnus.com>
+ * @date March 25, 1999
+ */
+
 final class RBCElement
 {
   String key;
@@ -37,6 +66,21 @@ final class RBCElement
 
 public class RuleBasedCollator extends Collator
 {
+  // True if we are using French-style accent ordering.
+  private boolean frenchAccents;
+
+  /**
+   * This the the original rule string.
+   */
+  private String rules;
+
+  // This maps strings onto collation values.
+  private Hashtable map;
+  
+  // An entry in this hash means that more lookahead is required for
+  // the prefix string.
+  private Hashtable prefixes;
+  
   public Object clone ()
   {
     RuleBasedCollator c = (RuleBasedCollator) super.clone ();
@@ -354,16 +398,4 @@ public class RuleBasedCollator extends Collator
 	  prefixes.put(r.key.substring(0, i), Boolean.TRUE);
       }
   }
-
-  // True if we are using French-style accent ordering.
-  private boolean frenchAccents;
-
-  // It's easier to just save the rules than to try to recreate them.
-  private String rules;
-
-  // This maps strings onto collation values.
-  private Hashtable map;
-  // An entry in this hash means that more lookahead is required for
-  // the prefix string.
-  private Hashtable prefixes;
 }