[kaffe] CVS kaffe (dalibor): resynced with GNU Classpath: Call static methods staticly
Kaffe CVS
cvs-commits at kaffe.org
Fri Apr 23 12:26:03 PDT 2004
PatchSet 4687
Date: 2004/04/23 18:38:26
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
resynced with GNU Classpath: Call static methods staticly
2004-04-23 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/java/text/RuleBasedCollator.java,
libraries/javalib/java/util/Arrays.java:
Resynced with GNU Classpath.
2004-04-23 Mark Wielaard <mark at klomp.org>
* java/text/RuleBasedCollator.java: Call static methods staticly.A
* java/util/Arrays.java: Likewise.
Members:
ChangeLog:1.2263->1.2264
libraries/javalib/java/text/RuleBasedCollator.java:1.19->1.20
libraries/javalib/java/util/Arrays.java:1.10->1.11
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2263 kaffe/ChangeLog:1.2264
--- kaffe/ChangeLog:1.2263 Fri Apr 23 18:23:46 2004
+++ kaffe/ChangeLog Fri Apr 23 18:38:26 2004
@@ -1,5 +1,16 @@
2004-04-23 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/java/text/RuleBasedCollator.java,
+ libraries/javalib/java/util/Arrays.java:
+ Resynced with GNU Classpath.
+
+ 2004-04-23 Mark Wielaard <mark at klomp.org>
+
+ * java/text/RuleBasedCollator.java: Call static methods staticly.A
+ * java/util/Arrays.java: Likewise.
+
+2004-04-23 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/java/security/interfaces/DSAKeyPairGenerator.java,
libraries/javalib/java/security/interfaces/DSAPrivateKey.java,
libraries/javalib/java/security/interfaces/DSAPublicKey.java,
Index: kaffe/libraries/javalib/java/text/RuleBasedCollator.java
diff -u kaffe/libraries/javalib/java/text/RuleBasedCollator.java:1.19 kaffe/libraries/javalib/java/text/RuleBasedCollator.java:1.20
--- kaffe/libraries/javalib/java/text/RuleBasedCollator.java:1.19 Fri Apr 23 17:35:12 2004
+++ kaffe/libraries/javalib/java/text/RuleBasedCollator.java Fri Apr 23 18:38:28 2004
@@ -755,8 +755,8 @@
}
// Check for primary strength differences
- int prim1 = cs.primaryOrder(ord1);
- int prim2 = ct.primaryOrder(ord2);
+ int prim1 = CollationElementIterator.primaryOrder(ord1);
+ int prim2 = CollationElementIterator.primaryOrder(ord2);
if (prim1 < prim2)
return -1;
@@ -766,8 +766,8 @@
continue;
// Check for secondary strength differences
- int sec1 = cs.secondaryOrder(ord1);
- int sec2 = ct.secondaryOrder(ord2);
+ int sec1 = CollationElementIterator.secondaryOrder(ord1);
+ int sec2 = CollationElementIterator.secondaryOrder(ord2);
if (sec1 < sec2)
return -1;
@@ -777,8 +777,8 @@
continue;
// Check for tertiary differences
- int tert1 = cs.tertiaryOrder(ord1);
- int tert2 = ct.tertiaryOrder(ord2);
+ int tert1 = CollationElementIterator.tertiaryOrder(ord1);
+ int tert2 = CollationElementIterator.tertiaryOrder(ord2);
if (tert1 < tert2)
return -1;
@@ -894,11 +894,11 @@
switch (getStrength())
{
case PRIMARY:
- ord = cei.primaryOrder(ord);
+ ord = CollationElementIterator.primaryOrder(ord);
break;
case SECONDARY:
- ord = cei.secondaryOrder(ord);
+ ord = CollationElementIterator.secondaryOrder(ord);
default:
break;
Index: kaffe/libraries/javalib/java/util/Arrays.java
diff -u kaffe/libraries/javalib/java/util/Arrays.java:1.10 kaffe/libraries/javalib/java/util/Arrays.java:1.11
--- kaffe/libraries/javalib/java/util/Arrays.java:1.10 Wed Oct 22 10:35:00 2003
+++ kaffe/libraries/javalib/java/util/Arrays.java Fri Apr 23 18:38:28 2004
@@ -2400,7 +2400,7 @@
{
int size = a.length;
for (int i = 0; i < size; i++)
- if (this.equals(o, a[i]))
+ if (ArrayList.equals(o, a[i]))
return i;
return -1;
}
@@ -2409,7 +2409,7 @@
{
int i = a.length;
while (--i >= 0)
- if (this.equals(o, a[i]))
+ if (ArrayList.equals(o, a[i]))
return i;
return -1;
}
More information about the kaffe
mailing list