This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: java.util.Map and java.text.AttributedCharacterIterator
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Wed, 21 Apr 2004 07:26:11 +0200
- Subject: Patch: java.util.Map and java.text.AttributedCharacterIterator
Hi list,
I just commited the attached patch to merge these two files with GNU
classpath.
Michael
2004-04-21 Michael Koch <konqueror@gmx.de>
* java/util/Map.java
(Entry): Removed redundant "static" modifier.
* java/text/AttributedCharacterIterator.java:
Updated copyright year.
Index: java/util/Map.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/Map.java,v
retrieving revision 1.6
diff -u -r1.6 Map.java
--- java/util/Map.java 11 Oct 2003 18:52:30 -0000 1.6
+++ java/util/Map.java 21 Apr 2004 05:24:51 -0000
@@ -1,6 +1,6 @@
/* Map.java: interface Map -- An object that maps keys to values
interface Map.Entry -- an Entry in a Map
- Copyright (C) 1998, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2001, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -264,7 +264,7 @@
* @since 1.2
* @status updated to 1.4
*/
- static interface Entry
+ interface Entry
{
/**
* Get the key corresponding to this entry.
Index: java/text/AttributedCharacterIterator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/text/AttributedCharacterIterator.java,v
retrieving revision 1.5
diff -u -r1.5 AttributedCharacterIterator.java
--- java/text/AttributedCharacterIterator.java 15 Oct 2003 13:57:00 -0000 1.5
+++ java/text/AttributedCharacterIterator.java 21 Apr 2004 05:24:51 -0000
@@ -1,5 +1,5 @@
/* AttributedCharacterIterator.java -- Iterate over attributes
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.