[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath
Kaffe CVS
Kaffe Mailing List <kaffe@kaffe.org>
Fri Jan 2 20:28:02 2004
PatchSet 4275
Date: 2004/01/03 04:14:32
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath
2004-01-03 Dalibor Topic <robilad@kaffe.org>
Resynced with GNU Classpath.
2003-11-28 Ito Kazumitsu <kaz@maczuka.gcd.org>
* java/text/SimpleDateFormat.java (compileFormat):
isLowerCase() and isUpperCase() allow too many characters.
Just use >= 'A' && <= 'Z' || >= 'a' && <= 'z'.
2003-11-15 Michael Koch <konqueror@gmx.de>
* java/text/SimpleDateFormat.java (equals):
Removed some redundant obj == null checks.
Members:
ChangeLog:1.1862->1.1863
libraries/javalib/java/text/SimpleDateFormat.java:1.27->1.28
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1862 kaffe/ChangeLog:1.1863
--- kaffe/ChangeLog:1.1862 Sat Jan 3 04:07:08 2004
+++ kaffe/ChangeLog Sat Jan 3 04:14:32 2004
@@ -2,6 +2,21 @@
Resynced with GNU Classpath.
+ 2003-11-28 Ito Kazumitsu <kaz@maczuka.gcd.org>
+
+ * java/text/SimpleDateFormat.java (compileFormat):
+ isLowerCase() and isUpperCase() allow too many characters.
+ Just use >= 'A' && <= 'Z' || >= 'a' && <= 'z'.
+
+ 2003-11-15 Michael Koch <konqueror@gmx.de>
+
+ * java/text/SimpleDateFormat.java (equals):
+ Removed some redundant obj == null checks.
+
+2004-01-03 Dalibor Topic <robilad@kaffe.org>
+
+ Resynced with GNU Classpath.
+
2003-12-26 Michael Koch <konqueror@gmx.de>
* java/text/NumberFormat.java
Index: kaffe/libraries/javalib/java/text/SimpleDateFormat.java
diff -u kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.27 kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.28
--- kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.27 Sat Oct 25 18:30:25 2003
+++ kaffe/libraries/javalib/java/text/SimpleDateFormat.java Sat Jan 3 04:14:34 2004
@@ -119,8 +119,8 @@
field = formatData.getLocalPatternChars().indexOf(thisChar);
if (field == -1) {
current = null;
- if (Character.isLowerCase (thisChar)
- || Character.isUpperCase (thisChar)) {
+ if ((thisChar >= 'A' && thisChar <= 'Z')
+ || (thisChar >= 'a' && thisChar <= 'z')) {
// Not a valid letter
tokens.add(new FieldSizePair(-1,0));
} else if (thisChar == '\'') {
@@ -376,9 +376,6 @@
*/
public boolean equals(Object o)
{
- if (o == null)
- return false;
-
if (!super.equals(o))
return false;