PatchSet 4767
Date: 2004/05/21 16:05:33
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: Renamed enums to avoid clashes with Java 1.5 compilers
2004-05-21 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/gnu/java/beans/BeanInfoEmbryo.java,
libraries/javalib/java/io/SequenceInputStream.java:
Resynced with GNU Classpath.
2004-05-21 Michael Koch <[EMAIL PROTECTED]>
* gnu/java/beans/BeanInfoEmbryo.java,
java/io/SequenceInputStream.java:
Rename enum to e because enum is a keyword in Java 1.5.
Members:
ChangeLog:1.2338->1.2339
libraries/javalib/gnu/java/beans/BeanInfoEmbryo.java:1.3->1.4
libraries/javalib/java/io/SequenceInputStream.java:1.5->1.6
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2338 kaffe/ChangeLog:1.2339
--- kaffe/ChangeLog:1.2338 Fri May 21 15:51:07 2004
+++ kaffe/ChangeLog Fri May 21 16:05:33 2004
@@ -1,5 +1,17 @@
2004-05-21 Dalibor Topic <[EMAIL PROTECTED]>
+ * libraries/javalib/gnu/java/beans/BeanInfoEmbryo.java,
+ libraries/javalib/java/io/SequenceInputStream.java:
+ Resynced with GNU Classpath.
+
+ 2004-05-21 Michael Koch <[EMAIL PROTECTED]>
+
+ * gnu/java/beans/BeanInfoEmbryo.java,
+ java/io/SequenceInputStream.java:
+ Rename enum to e because enum is a keyword in Java 1.5.
+
+2004-05-21 Dalibor Topic <[EMAIL PROTECTED]>
+
* libraries/javalib/java/io/DeleteFileHelper.java:
Resynced with GNU Classpath.
Index: kaffe/libraries/javalib/gnu/java/beans/BeanInfoEmbryo.java
diff -u kaffe/libraries/javalib/gnu/java/beans/BeanInfoEmbryo.java:1.3
kaffe/libraries/javalib/gnu/java/beans/BeanInfoEmbryo.java:1.4
--- kaffe/libraries/javalib/gnu/java/beans/BeanInfoEmbryo.java:1.3 Mon Mar 22
11:24:10 2004
+++ kaffe/libraries/javalib/gnu/java/beans/BeanInfoEmbryo.java Fri May 21 16:05:35
2004
@@ -85,9 +85,9 @@
PropertyDescriptor[] Aproperties = new
PropertyDescriptor[properties.size()];
int i = 0;
- Enumeration enum = properties.elements();
- while(enum.hasMoreElements()) {
- Aproperties[i] = (PropertyDescriptor)enum.nextElement();
+ Enumeration e = properties.elements();
+ while (e.hasMoreElements()) {
+ Aproperties[i] = (PropertyDescriptor) e.nextElement();
if(defaultPropertyName != null &&
Aproperties[i].getName().equals(defaultPropertyName)) {
defaultProperty = i;
}
@@ -96,9 +96,9 @@
EventSetDescriptor[] Aevents = new EventSetDescriptor[events.size()];
i = 0;
- enum = events.elements();
- while(enum.hasMoreElements()) {
- Aevents[i] = (EventSetDescriptor)enum.nextElement();
+ e = events.elements();
+ while (e.hasMoreElements()) {
+ Aevents[i] = (EventSetDescriptor) e.nextElement();
if(defaultEventName != null &&
Aevents[i].getName().equals(defaultEventName)) {
defaultEvent = i;
}
Index: kaffe/libraries/javalib/java/io/SequenceInputStream.java
diff -u kaffe/libraries/javalib/java/io/SequenceInputStream.java:1.5
kaffe/libraries/javalib/java/io/SequenceInputStream.java:1.6
--- kaffe/libraries/javalib/java/io/SequenceInputStream.java:1.5 Sun Nov 2
13:29:37 2003
+++ kaffe/libraries/javalib/java/io/SequenceInputStream.java Fri May 21 16:05:35
2004
@@ -71,8 +71,8 @@
/** Secondary input stream; not used if constructed w/ enumeration. */
private InputStream in2;
- /** The enum handle; not used if constructed w/ 2 explicit input streams. */
- private Enumeration enum;
+ /** The enumeration handle; not used if constructed w/ 2 explicit input streams. */
+ private Enumeration e;
/**
* This method creates a new <code>SequenceInputStream</code> that obtains
@@ -84,8 +84,8 @@
*/
public SequenceInputStream(Enumeration e)
{
- enum = e;
- in = (InputStream) enum.nextElement();
+ this.e = e;
+ in = (InputStream) e.nextElement();
in2 = null;
}
@@ -204,10 +204,10 @@
{
InputStream nextIn = null;
- if (enum != null)
+ if (e != null)
{
- if (enum.hasMoreElements())
- nextIn = (InputStream) enum.nextElement();
+ if (e.hasMoreElements())
+ nextIn = (InputStream) e.nextElement();
}
else
if (in2 != null)
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
