Index: java/lang/Appendable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Appendable.java,v
retrieving revision 1.1.2.3
diff -u -3 -p -u -r1.1.2.3 Appendable.java
--- java/lang/Appendable.java 1 Nov 2004 15:57:08 -0000 1.1.2.3
+++ java/lang/Appendable.java 1 Feb 2005 00:09:28 -0000
@@ -58,8 +58,8 @@ import java.io.IOException;
* any class that wishes to receive data from a Formatter
instance.
*
*
- * @author Tom Tromey
- * @author Andrew John Hughes
+ * @author Tom Tromey (address@hidden)
+ * @author Andrew John Hughes (address@hidden)
* @since 1.5
*/
public interface Appendable
@@ -73,7 +73,8 @@ public interface Appendable
* @return a reference to this object.
* @throws IOException if an I/O error occurs.
*/
- Appendable append(char c) throws IOException;
+ Appendable append(char c)
+ throws IOException;
/**
* Appends the specified sequence of Unicode characters to this
@@ -88,7 +89,8 @@ public interface Appendable
* @return a reference to this object.
* @throws IOException if an I/O error occurs.
*/
- Appendable append(CharSequence seq) throws IOException;
+ Appendable append(CharSequence seq)
+ throws IOException;
/**
* Appends the specified subsequence of Unicode characters to this
@@ -113,5 +115,7 @@ public interface Appendable
* the start index occurs after the end index, or the end index is
* beyond the end of the sequence.
*/
- Appendable append(CharSequence seq, int start, int end) throws IOException;
+ Appendable append(CharSequence seq, int start, int end)
+ throws IOException;
+
}
Index: java/text/MessageFormat.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/MessageFormat.java,v
retrieving revision 1.11.2.5
diff -u -3 -p -u -r1.11.2.5 MessageFormat.java
--- java/text/MessageFormat.java 18 Jan 2005 11:38:30 -0000 1.11.2.5
+++ java/text/MessageFormat.java 1 Feb 2005 00:09:29 -0000
@@ -247,18 +247,18 @@ public class MessageFormat extends Forma
// In both cases we fall through to inserting the
// character here.
}
- // See if we have just a plain quote to insert.
+ // See if we have just a plain quote to insert.
else if (c == '\'' && index + 1 < max
&& pat.charAt(index + 1) == '\'')
{
buffer.append(c);
++index;
}
- // See if quoting should turn on.
- else if (c == '\'')
- quoted = true;
+ // See if quoting should turn on.
+ else if (c == '\'')
+ quoted = true;
else if (c == '{')
- ++brace_depth;
+ ++brace_depth;
else if (c == '}')
{
if (--brace_depth == 0)
@@ -267,9 +267,9 @@ public class MessageFormat extends Forma
// Check for TERM after braces, because TERM might be `}'.
else if (c == term)
break;
- // All characters, including opening and closing quotes, are
- // inserted here.
- buffer.append(c);
+ // All characters, including opening and closing quotes, are
+ // inserted here.
+ buffer.append(c);
}
return index;
}
Index: javax/swing/AbstractSet.java
===================================================================
RCS file: javax/swing/AbstractSet.java
diff -N javax/swing/AbstractSet.java
--- javax/swing/AbstractSet.java 9 Jan 2004 10:19:16 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,103 +0,0 @@
-/* AbstractSet.java --
- Copyright (C) 2002, 2004 Free Software Foundation, Inc.
-
-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. */
-
-package javax.swing;
-
-import java.util.AbstractCollection;
-import java.util.Collection;
-import java.util.Set;
-
-/**
- * Empty
- *
- * @author Ronald Veldema (address@hidden)
- */
-public abstract class AbstractSet extends AbstractCollection implements Set
-{
- boolean contained(Object []a1, Object b)
- {
- for (int i=0;i