This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Patch: java.text merged

From: Michael Koch <konqueror at gmx dot de>
To: java-patches at gcc dot gnu dot org
Date: Wed, 5 May 2004 09:36:13 +0200
Subject: Patch: java.text merged

Hi list,


I just commited the last patch to get java.text mostly merged with GNU 
classpath again.


Michael


2004-05-05  Dalibor Topic  <robilad@kaffe.org>

	* java/text/AttributedString.java,
	java/text/AttributedStringIterator.java,
	java/text/Collator.java,
	java/text/DecimalFormatSymbols.java,
	java/text/NumberFormat.java,
	java/text/RuleBasedCollator.java:
	Cleaned up imports.

Index: java/text/AttributedString.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/text/AttributedString.java,v
retrieving revision 1.4
diff -u -r1.4 AttributedString.java
--- java/text/AttributedString.java	16 Apr 2004 18:44:43 -0000	1.4
+++ java/text/AttributedString.java	5 May 2004 07:35:15 -0000
@@ -39,10 +39,9 @@
 package java.text;
 
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.HashMap;
 import java.util.Hashtable;
-import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
Index: java/text/AttributedStringIterator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/text/AttributedStringIterator.java,v
retrieving revision 1.4
diff -u -r1.4 AttributedStringIterator.java
--- java/text/AttributedStringIterator.java	16 Apr 2004 18:44:44 -0000	1.4
+++ java/text/AttributedStringIterator.java	5 May 2004 07:35:15 -0000
@@ -1,5 +1,5 @@
 /* AttributedStringIterator.java -- Class to iterate over AttributedString
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,11 +38,11 @@
 
 package java.text;
 
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Map;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
 
 /**
   * This class implements the AttributedCharacterIterator interface.  It
Index: java/text/Collator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/text/Collator.java,v
retrieving revision 1.12
diff -u -r1.12 Collator.java
--- java/text/Collator.java	20 Apr 2004 14:45:02 -0000	1.12
+++ java/text/Collator.java	5 May 2004 07:35:15 -0000
@@ -1,5 +1,5 @@
 /* Collator.java -- Perform locale dependent String comparisons.
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,10 +38,10 @@
 
 package java.text;
 
+import java.util.Comparator;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
-import java.util.Comparator;
 
 /**
  * This class is the abstract superclass of classes which perform 
Index: java/text/DecimalFormatSymbols.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/text/DecimalFormatSymbols.java,v
retrieving revision 1.12
diff -u -r1.12 DecimalFormatSymbols.java
--- java/text/DecimalFormatSymbols.java	20 Apr 2004 14:45:04 -0000	1.12
+++ java/text/DecimalFormatSymbols.java	5 May 2004 07:35:15 -0000
@@ -1,5 +1,5 @@
 /* DecimalFormatSymbols.java -- Format symbols used by DecimalFormat
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,13 +38,13 @@
 
 package java.text;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.util.Currency;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
-import java.io.ObjectInputStream;
-import java.io.IOException;
 
 /**
  * This class is a container for the symbols used by 
Index: java/text/NumberFormat.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/text/NumberFormat.java,v
retrieving revision 1.12
diff -u -r1.12 NumberFormat.java
--- java/text/NumberFormat.java	26 Mar 2004 20:25:00 -0000	1.12
+++ java/text/NumberFormat.java	5 May 2004 07:35:15 -0000
@@ -38,8 +38,8 @@
 
 package java.text;
 
-import java.io.InvalidObjectException;
 import java.io.IOException;
+import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Currency;
Index: java/text/RuleBasedCollator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/text/RuleBasedCollator.java,v
retrieving revision 1.15
diff -u -r1.15 RuleBasedCollator.java
--- java/text/RuleBasedCollator.java	20 Apr 2004 14:45:05 -0000	1.15
+++ java/text/RuleBasedCollator.java	5 May 2004 07:35:15 -0000
@@ -1,5 +1,5 @@
 /* RuleBasedCollator.java -- Concrete Collator Class
-   Copyright (C) 1998, 1999, 2000, 2001, 2003  Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]