PatchSet 4529
Date: 2004/03/17 00:59:43
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Removed unneeded collection classes
2004-03-16 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/java/util/AbstractListIterator.java,
libraries/javalib/java/util/AbstractMapEntry.java,
libraries/javalib/java/util/AbstractMapEntrySet.java:
Removed since no longer necessary after the merge of collection
classes with GNU Classpath.
* libraries/javalib/Makefile.am,
libraries/javalib/Makefile.in:
Regenerated.
* libraries/javalib/bootstrap.classlist,
libraries/javalib/essential.files:
Removed purged files.
* libraries/javalib/profiles/default/core.files,
libraries/javalib/profiles/allatonce/all.files:
Moved java,util.ZipOutputStream to essential files.
Members:
ChangeLog:1.2107->1.2108
libltdl/config-h.in:1.16->1.17
libraries/javalib/Makefile.am:1.172->1.173
libraries/javalib/Makefile.in:1.231->1.232
libraries/javalib/bootstrap.classlist:1.38->1.39
libraries/javalib/essential.files:1.37->1.38
libraries/javalib/java/util/AbstractListIterator.java:1.3->1.4(DEAD)
libraries/javalib/java/util/AbstractMapEntry.java:1.2->1.3(DEAD)
libraries/javalib/java/util/AbstractMapEntrySet.java:1.1->1.2(DEAD)
libraries/javalib/profiles/allatonce/all.files:1.38->1.39
libraries/javalib/profiles/default/core.files:1.25->1.26
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2107 kaffe/ChangeLog:1.2108
--- kaffe/ChangeLog:1.2107 Tue Mar 16 23:30:08 2004
+++ kaffe/ChangeLog Wed Mar 17 00:59:43 2004
@@ -1,5 +1,25 @@
2004-03-16 Dalibor Topic <[EMAIL PROTECTED]>
+ * libraries/javalib/java/util/AbstractListIterator.java,
+ libraries/javalib/java/util/AbstractMapEntry.java,
+ libraries/javalib/java/util/AbstractMapEntrySet.java:
+ Removed since no longer necessary after the merge of collection
+ classes with GNU Classpath.
+
+ * libraries/javalib/Makefile.am,
+ libraries/javalib/Makefile.in:
+ Regenerated.
+
+ * libraries/javalib/bootstrap.classlist,
+ libraries/javalib/essential.files:
+ Removed purged files.
+
+ * libraries/javalib/profiles/default/core.files,
+ libraries/javalib/profiles/allatonce/all.files:
+ Moved java,util.ZipOutputStream to essential files.
+
+2004-03-16 Dalibor Topic <[EMAIL PROTECTED]>
+
* libraries/javalib/java/util/zip/ZipFile.java
(close) Don't set zip to null when closing, otherwise
getEntry on a closed zip file will crash.
Index: kaffe/libltdl/config-h.in
diff -u kaffe/libltdl/config-h.in:1.16 kaffe/libltdl/config-h.in:1.17
--- kaffe/libltdl/config-h.in:1.16 Tue Mar 16 17:06:40 2004
+++ kaffe/libltdl/config-h.in Wed Mar 17 00:59:47 2004
@@ -3,6 +3,9 @@
/* Define to 1 if you have the `argz_append' function. */
#undef HAVE_ARGZ_APPEND
+/* Define to 1 if you have the `argz_create_sep' function. */
+#undef HAVE_ARGZ_CREATE_SEP
+
/* Define to 1 if you have the <argz.h> header file. */
#undef HAVE_ARGZ_H
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.172
kaffe/libraries/javalib/Makefile.am:1.173
--- kaffe/libraries/javalib/Makefile.am:1.172 Thu Mar 11 11:56:51 2004
+++ kaffe/libraries/javalib/Makefile.am Wed Mar 17 00:59:49 2004
@@ -1592,10 +1592,7 @@
java/text/StringCharacterIterator.java
java_util_SRCS = \
java/util/AbstractCollection.java \
- java/util/AbstractListIterator.java \
java/util/AbstractList.java \
- java/util/AbstractMapEntry.java \
- java/util/AbstractMapEntrySet.java \
java/util/AbstractMap.java \
java/util/AbstractSequentialList.java \
java/util/AbstractSet.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.231
kaffe/libraries/javalib/Makefile.in:1.232
--- kaffe/libraries/javalib/Makefile.in:1.231 Tue Mar 16 14:11:18 2004
+++ kaffe/libraries/javalib/Makefile.in Wed Mar 17 00:59:50 2004
@@ -1952,10 +1952,7 @@
java_util_SRCS = \
java/util/AbstractCollection.java \
- java/util/AbstractListIterator.java \
java/util/AbstractList.java \
- java/util/AbstractMapEntry.java \
- java/util/AbstractMapEntrySet.java \
java/util/AbstractMap.java \
java/util/AbstractSequentialList.java \
java/util/AbstractSet.java \
Index: kaffe/libraries/javalib/bootstrap.classlist
diff -u kaffe/libraries/javalib/bootstrap.classlist:1.38
kaffe/libraries/javalib/bootstrap.classlist:1.39
--- kaffe/libraries/javalib/bootstrap.classlist:1.38 Fri Jan 30 16:44:36 2004
+++ kaffe/libraries/javalib/bootstrap.classlist Wed Mar 17 00:59:51 2004
@@ -157,15 +157,12 @@
java/util/AbstractList.class
java/util/AbstractList$1.class
java/util/AbstractList$2.class
-java/util/AbstractListIterator.class
java/util/AbstractMap.class
java/util/AbstractMap$1.class
java/util/AbstractMap$1$1.class
java/util/AbstractMap$2.class
java/util/AbstractMap$2$1.class
java/util/AbstractMap$BasicMapEntry.class
-java/util/AbstractMapEntry.class
-java/util/AbstractMapEntrySet.class
java/util/AbstractSequentialList.class
java/util/AbstractSet.class
java/util/ArrayList.class
Index: kaffe/libraries/javalib/essential.files
diff -u kaffe/libraries/javalib/essential.files:1.37
kaffe/libraries/javalib/essential.files:1.38
--- kaffe/libraries/javalib/essential.files:1.37 Fri Jan 30 16:44:36 2004
+++ kaffe/libraries/javalib/essential.files Wed Mar 17 00:59:51 2004
@@ -385,10 +385,7 @@
java/text/SimpleDateFormat.java
java/util/AbstractCollection.java
java/util/AbstractList.java
-java/util/AbstractListIterator.java
java/util/AbstractMap.java
-java/util/AbstractMapEntry.java
-java/util/AbstractMapEntrySet.java
java/util/AbstractSequentialList.java
java/util/AbstractSet.java
java/util/ArrayList.java
@@ -450,6 +447,7 @@
java/util/zip/ZipException.java
java/util/zip/ZipFile.java
java/util/zip/ZipInputStream.java
+java/util/zip/ZipOutputStream.java
kaffe/io/ByteToCharConverter.java
kaffe/io/ByteToCharDefault.java
kaffe/io/ByteToCharIconv.java
===================================================================
Checking out kaffe/libraries/javalib/java/util/AbstractListIterator.java
RCS:
/home/cvs/kaffe/kaffe/libraries/javalib/java/util/Attic/AbstractListIterator.java,v
VERS: 1.3
***************
--- kaffe/libraries/javalib/java/util/AbstractListIterator.java Wed Mar 17 01:03:00
2004
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,107 +0,0 @@
-/*
- * Java core library component.
- *
- * Copyright (c) 1999
- * Archie L. Cobbs. All rights reserved.
- * Copyright (c) 1999
- * Transvirtual Technologies, Inc. All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file.
- *
- * Author: Archie L. Cobbs <[EMAIL PROTECTED]>
- */
-
-package java.util;
-
-// This class is used internally by this package
-class AbstractListIterator implements ListIterator {
- protected final AbstractList list;
- protected int lastIndex = -1;
- protected int modCount;
- protected int index;
-
- AbstractListIterator(AbstractList list, int index) {
- if (index < 0 || index > list.size()) {
- throw new IndexOutOfBoundsException ();
- }
- this.list = list;
- this.index = index;
- this.modCount = list.modCount;
- }
-
- public int nextIndex() {
- return index;
- }
-
- public int previousIndex() {
- return index - 1;
- }
-
- public boolean hasNext() {
- return index < list.size();
- }
-
- public Object next() {
- if (list.modCount != modCount) {
- throw new ConcurrentModificationException();
- }
- if (index >= list.size()) {
- throw new NoSuchElementException();
- }
- Object rtn = list.get(index);
- lastIndex = index++;
- return rtn;
- }
-
- public boolean hasPrevious() {
- return index > 0;
- }
-
- public Object previous() {
- if (list.modCount != modCount) {
- throw new ConcurrentModificationException();
- }
- if (index <= 0) {
- throw new NoSuchElementException();
- }
- Object rtn = list.get(index - 1);
- lastIndex = --index;
- return rtn;
- }
-
- public void remove() {
- if (list.modCount != modCount) {
- throw new ConcurrentModificationException();
- }
- if (lastIndex == -1) {
- throw new IllegalStateException();
- }
- list.remove(lastIndex);
- modCount++;
- if (lastIndex < index) {
- index--;
- }
- lastIndex = -1;
- }
-
- public void set(Object o) {
- if (list.modCount != modCount) {
- throw new ConcurrentModificationException();
- }
- if (lastIndex == -1) {
- throw new IllegalStateException();
- }
- list.set(lastIndex, o);
- }
-
- public void add(Object o) {
- if (list.modCount != modCount) {
- throw new ConcurrentModificationException();
- }
- list.add(index, o);
- modCount++;
- index++;
- }
-}
-
===================================================================
Checking out kaffe/libraries/javalib/java/util/AbstractMapEntry.java
RCS: /home/cvs/kaffe/kaffe/libraries/javalib/java/util/Attic/AbstractMapEntry.java,v
VERS: 1.2
***************
--- kaffe/libraries/javalib/java/util/AbstractMapEntry.java Wed Mar 17 01:03:00
2004
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,65 +0,0 @@
-
-/*
- * Java core library component.
- *
- * Copyright (c) 1999
- * Archie L. Cobbs. All rights reserved.
- * Copyright (c) 1999
- * Transvirtual Technologies, Inc. All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file.
- *
- * Author: Archie L. Cobbs <[EMAIL PROTECTED]>
- */
-
-package java.util;
-
-abstract class AbstractMapEntry implements Map.Entry {
- protected final Object key;
- protected Object value;
-
- AbstractMapEntry(Object key, Object value) {
- this.key = key;
- this.value = value;
- }
-
- public Object getKey() {
- return key;
- }
-
- public Object getValue() {
- return value;
- }
-
- public Object setValue(Object newValue) {
- Object oldValue = value;
- changeValue(newValue);
- value = newValue;
- return oldValue;
- }
-
- // This should write the new value back through to the underlying Map
- protected abstract void changeValue(Object newValue);
-
- public boolean equals(Object o) {
- if (!(o instanceof Map.Entry)) {
- return false;
- }
- Map.Entry me = (Map.Entry)o;
- return (this.key == null ? me.getKey() == null
- : this.key.equals(me.getKey()))
- && (this.value == null ? me.getValue() == null
- : this.value.equals(me.getValue()));
- }
-
- public int hashCode() {
- return (key == null ? 0 : key.hashCode())
- ^ (value == null ? 0 : value.hashCode());
- }
-
- public String toString() {
- return getKey() + "=" + getValue();
- }
-}
-
===================================================================
Checking out kaffe/libraries/javalib/java/util/AbstractMapEntrySet.java
RCS:
/home/cvs/kaffe/kaffe/libraries/javalib/java/util/Attic/AbstractMapEntrySet.java,v
VERS: 1.1
***************
--- kaffe/libraries/javalib/java/util/AbstractMapEntrySet.java Wed Mar 17 01:03:00
2004
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,59 +0,0 @@
-
-/*
- * Java core library component.
- *
- * Copyright (c) 1999
- * Archie L. Cobbs. All rights reserved.
- * Copyright (c) 1999
- * Transvirtual Technologies, Inc. All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file.
- *
- * Author: Archie L. Cobbs <[EMAIL PROTECTED]>
- */
-
-package java.util;
-
-// This class is used by both HashMap and TreeMap to help with their
-// implementation of the Map.entrySet() method, which is supposed to
-// return a Set object backed by the set of Map.Entry's in the map.
-
-abstract class AbstractMapEntrySet extends AbstractSet {
- private final Map map;
-
- AbstractMapEntrySet(Map map) {
- this.map = map;
- }
-
- // This should return an iterator over the Map.Entry's in the map
- public abstract Iterator iterator();
-
- // This should return the equivalent Map.Entry from the map, else null
- protected abstract Map.Entry find(Map.Entry e);
-
- public int size() {
- return map.size();
- }
-
- public boolean contains(Object o) {
- return (o instanceof Map.Entry) && find((Map.Entry)o) != null;
- }
-
- public boolean remove(Object o) {
- if (!(o instanceof Map.Entry)) {
- return false;
- }
- Map.Entry ent = find((Map.Entry)o);
- if (ent == null) {
- return false;
- }
- map.remove(ent.getKey());
- return true;
- }
-
- public void clear() {
- map.clear();
- }
-}
-
Index: kaffe/libraries/javalib/profiles/allatonce/all.files
diff -u kaffe/libraries/javalib/profiles/allatonce/all.files:1.38
kaffe/libraries/javalib/profiles/allatonce/all.files:1.39
--- kaffe/libraries/javalib/profiles/allatonce/all.files:1.38 Wed Mar 10 17:24:46
2004
+++ kaffe/libraries/javalib/profiles/allatonce/all.files Wed Mar 17 00:59:52
2004
@@ -1008,7 +1008,6 @@
java/util/zip/DeflaterOutputStream.java
java/util/zip/GZIPInputStream.java
java/util/zip/GZIPOutputStream.java
-java/util/zip/ZipOutputStream.java
javax/accessibility/AccessibleAction.java
javax/accessibility/AccessibleBundle.java
javax/accessibility/AccessibleComponent.java
Index: kaffe/libraries/javalib/profiles/default/core.files
diff -u kaffe/libraries/javalib/profiles/default/core.files:1.25
kaffe/libraries/javalib/profiles/default/core.files:1.26
--- kaffe/libraries/javalib/profiles/default/core.files:1.25 Fri Jan 23 17:34:22
2004
+++ kaffe/libraries/javalib/profiles/default/core.files Wed Mar 17 00:59:54 2004
@@ -254,7 +254,6 @@
java/util/zip/DeflaterOutputStream.java
java/util/zip/GZIPInputStream.java
java/util/zip/GZIPOutputStream.java
-java/util/zip/ZipOutputStream.java
javax/security/auth/x500/X500Principal.java
kaffe/io/AccessibleBAOStream.java
kaffe/io/ByteToChar8859_1.java
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
