PatchSet 5331
Date: 2004/10/23 10:40:48
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: cleaups in java,util.logging
2004-10-23 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/java/util/logging/ConsoleHandler.java,
libraries/javalib/java/util/logging/ErrorManager.java,
libraries/javalib/java/util/logging/FileHandler.java,
libraries/javalib/java/util/logging/Filter.java,
libraries/javalib/java/util/logging/Formatter.java,
libraries/javalib/java/util/logging/Handler.java,
libraries/javalib/java/util/logging/Level.java,
libraries/javalib/java/util/logging/LogManager.java,
libraries/javalib/java/util/logging/LogRecord.java,
libraries/javalib/java/util/logging/Logger.java,
libraries/javalib/java/util/logging/LoggingPermission.java,
libraries/javalib/java/util/logging/MemoryHandler.java,
libraries/javalib/java/util/logging/SimpleFormatter.java,
libraries/javalib/java/util/logging/SocketHandler.java,
libraries/javalib/java/util/logging/StreamHandler.java,
libraries/javalib/java/util/logging/XMLFormatter.java:
Resynced with GNU Classpath.
2004-10-20 Michael Koch <[EMAIL PROTECTED]>
* java/util/logging/ConsoleHandler.java,
java/util/logging/ErrorManager.java,
java/util/logging/FileHandler.java,
java/util/logging/Filter.java,
java/util/logging/Formatter.java,
java/util/logging/Handler.java,
java/util/logging/Level.java,
java/util/logging/LogManager.java,
java/util/logging/LogRecord.java,
java/util/logging/Logger.java,
java/util/logging/LoggingPermission.java,
java/util/logging/MemoryHandler.java,
java/util/logging/SimpleFormatter.java,
java/util/logging/SocketHandler.java,
java/util/logging/StreamHandler.java,
java/util/logging/XMLFormatter.java:
Standardized copyrigth header.
Members:
ChangeLog:1.2883->1.2884
libraries/javalib/java/util/logging/ConsoleHandler.java:1.2->1.3
libraries/javalib/java/util/logging/ErrorManager.java:1.2->1.3
libraries/javalib/java/util/logging/FileHandler.java:1.4->1.5
libraries/javalib/java/util/logging/Filter.java:1.2->1.3
libraries/javalib/java/util/logging/Formatter.java:1.3->1.4
libraries/javalib/java/util/logging/Handler.java:1.5->1.6
libraries/javalib/java/util/logging/Level.java:1.3->1.4
libraries/javalib/java/util/logging/LogManager.java:1.8->1.9
libraries/javalib/java/util/logging/LogRecord.java:1.3->1.4
libraries/javalib/java/util/logging/Logger.java:1.4->1.5
libraries/javalib/java/util/logging/LoggingPermission.java:1.1->1.2
libraries/javalib/java/util/logging/MemoryHandler.java:1.2->1.3
libraries/javalib/java/util/logging/SimpleFormatter.java:1.4->1.5
libraries/javalib/java/util/logging/SocketHandler.java:1.2->1.3
libraries/javalib/java/util/logging/StreamHandler.java:1.1->1.2
libraries/javalib/java/util/logging/XMLFormatter.java:1.5->1.6
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2883 kaffe/ChangeLog:1.2884
--- kaffe/ChangeLog:1.2883 Sat Oct 23 10:07:16 2004
+++ kaffe/ChangeLog Sat Oct 23 10:40:48 2004
@@ -1,5 +1,45 @@
2004-10-23 Dalibor Topic <[EMAIL PROTECTED]>
+ * libraries/javalib/java/util/logging/ConsoleHandler.java,
+ libraries/javalib/java/util/logging/ErrorManager.java,
+ libraries/javalib/java/util/logging/FileHandler.java,
+ libraries/javalib/java/util/logging/Filter.java,
+ libraries/javalib/java/util/logging/Formatter.java,
+ libraries/javalib/java/util/logging/Handler.java,
+ libraries/javalib/java/util/logging/Level.java,
+ libraries/javalib/java/util/logging/LogManager.java,
+ libraries/javalib/java/util/logging/LogRecord.java,
+ libraries/javalib/java/util/logging/Logger.java,
+ libraries/javalib/java/util/logging/LoggingPermission.java,
+ libraries/javalib/java/util/logging/MemoryHandler.java,
+ libraries/javalib/java/util/logging/SimpleFormatter.java,
+ libraries/javalib/java/util/logging/SocketHandler.java,
+ libraries/javalib/java/util/logging/StreamHandler.java,
+ libraries/javalib/java/util/logging/XMLFormatter.java:
+ Resynced with GNU Classpath.
+
+ 2004-10-20 Michael Koch <[EMAIL PROTECTED]>
+
+ * java/util/logging/ConsoleHandler.java,
+ java/util/logging/ErrorManager.java,
+ java/util/logging/FileHandler.java,
+ java/util/logging/Filter.java,
+ java/util/logging/Formatter.java,
+ java/util/logging/Handler.java,
+ java/util/logging/Level.java,
+ java/util/logging/LogManager.java,
+ java/util/logging/LogRecord.java,
+ java/util/logging/Logger.java,
+ java/util/logging/LoggingPermission.java,
+ java/util/logging/MemoryHandler.java,
+ java/util/logging/SimpleFormatter.java,
+ java/util/logging/SocketHandler.java,
+ java/util/logging/StreamHandler.java,
+ java/util/logging/XMLFormatter.java:
+ Standardized copyrigth header.
+
+2004-10-23 Dalibor Topic <[EMAIL PROTECTED]>
+
* libraries/javalib/java/security/Identity.java:
Replaced by implementation from GNU Classpath.
Index: kaffe/libraries/javalib/java/util/logging/ConsoleHandler.java
diff -u kaffe/libraries/javalib/java/util/logging/ConsoleHandler.java:1.2
kaffe/libraries/javalib/java/util/logging/ConsoleHandler.java:1.3
--- kaffe/libraries/javalib/java/util/logging/ConsoleHandler.java:1.2 Thu Apr 22
09:59:55 2004
+++ kaffe/libraries/javalib/java/util/logging/ConsoleHandler.java Sat Oct 23
10:40:49 2004
@@ -1,7 +1,5 @@
-/* ConsoleHandler.java
- -- a class for publishing log messages to System.err
-
-Copyright (C) 2002 Free Software Foundation, Inc.
+/* ConsoleHandler.java -- a class for publishing log messages to System.err
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -35,9 +33,7 @@
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
-
-*/
+exception statement from your version. */
package java.util.logging;
Index: kaffe/libraries/javalib/java/util/logging/ErrorManager.java
diff -u kaffe/libraries/javalib/java/util/logging/ErrorManager.java:1.2
kaffe/libraries/javalib/java/util/logging/ErrorManager.java:1.3
--- kaffe/libraries/javalib/java/util/logging/ErrorManager.java:1.2 Sat Oct 25
18:30:25 2003
+++ kaffe/libraries/javalib/java/util/logging/ErrorManager.java Sat Oct 23 10:40:49
2004
@@ -1,8 +1,7 @@
-/* ErrorManager.java
- -- a class for dealing with errors that a Handler encounters
- during logging
-
-Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* ErrorManager.java --
+ A class for dealing with errors that a Handler encounters
+ during logging
+ Copyright (C) 2002, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -36,9 +35,7 @@
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
-
-*/
+exception statement from your version. */
package java.util.logging;
Index: kaffe/libraries/javalib/java/util/logging/FileHandler.java
diff -u kaffe/libraries/javalib/java/util/logging/FileHandler.java:1.4
kaffe/libraries/javalib/java/util/logging/FileHandler.java:1.5
--- kaffe/libraries/javalib/java/util/logging/FileHandler.java:1.4 Thu Apr 22
09:59:55 2004
+++ kaffe/libraries/javalib/java/util/logging/FileHandler.java Sat Oct 23 10:40:49
2004
@@ -1,7 +1,5 @@
-/* FileHandler.java
- -- a class for publishing log messages to log files
-
-Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+/* FileHandler.java -- a class for publishing log messages to log files
+ Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -35,9 +33,8 @@
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
+exception statement from your version. */
-*/
package java.util.logging;
Index: kaffe/libraries/javalib/java/util/logging/Filter.java
diff -u kaffe/libraries/javalib/java/util/logging/Filter.java:1.2
kaffe/libraries/javalib/java/util/logging/Filter.java:1.3
--- kaffe/libraries/javalib/java/util/logging/Filter.java:1.2 Sat Jan 10 19:06:31
2004
+++ kaffe/libraries/javalib/java/util/logging/Filter.java Sat Oct 23 10:40:49
2004
@@ -1,8 +1,6 @@
-/* Filter.java
- -- an interface for filters that decide whether a LogRecord should
- be published or discarded
-
-Copyright (C) 2002 Free Software Foundation, Inc.
+/* Filter.java -- an interface for filters that decide whether a
+ LogRecord should be published or discarded
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -36,9 +34,7 @@
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
-
-*/
+exception statement from your version. */
package java.util.logging;
Index: kaffe/libraries/javalib/java/util/logging/Formatter.java
diff -u kaffe/libraries/javalib/java/util/logging/Formatter.java:1.3
kaffe/libraries/javalib/java/util/logging/Formatter.java:1.4
--- kaffe/libraries/javalib/java/util/logging/Formatter.java:1.3 Thu Apr 22
09:59:55 2004
+++ kaffe/libraries/javalib/java/util/logging/Formatter.java Sat Oct 23 10:40:49
2004
@@ -1,8 +1,7 @@
-/* Formatter.java
- -- a class for formatting log messages by localizing message texts
- and performing substitution of parameters
-
-Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+/* Formatter.java --
+ A class for formatting log messages by localizing message texts
+ and performing substitution of parameters
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -36,9 +35,7 @@
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
-
-*/
+exception statement from your version. */
package java.util.logging;
Index: kaffe/libraries/javalib/java/util/logging/Handler.java
diff -u kaffe/libraries/javalib/java/util/logging/Handler.java:1.5
kaffe/libraries/javalib/java/util/logging/Handler.java:1.6
--- kaffe/libraries/javalib/java/util/logging/Handler.java:1.5 Wed Aug 18 16:37:58
2004
+++ kaffe/libraries/javalib/java/util/logging/Handler.java Sat Oct 23 10:40:49
2004
@@ -1,7 +1,5 @@
-/* Handler.java
- -- a class for publishing log messages
-
-Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+/* Handler.java -- a class for publishing log messages
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -35,9 +33,7 @@
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
-
-*/
+exception statement from your version. */
package java.util.logging;
Index: kaffe/libraries/javalib/java/util/logging/Level.java
diff -u kaffe/libraries/javalib/java/util/logging/Level.java:1.3
kaffe/libraries/javalib/java/util/logging/Level.java:1.4
--- kaffe/libraries/javalib/java/util/logging/Level.java:1.3 Mon May 17 13:55:07
2004
+++ kaffe/libraries/javalib/java/util/logging/Level.java Sat Oct 23 10:40:49
2004
@@ -33,9 +33,7 @@
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
-
-*/
+exception statement from your version. */
package java.util.logging;
Index: kaffe/libraries/javalib/java/util/logging/LogManager.java
diff -u kaffe/libraries/javalib/java/util/logging/LogManager.java:1.8
kaffe/libraries/javalib/java/util/logging/LogManager.java:1.9
--- kaffe/libraries/javalib/java/util/logging/LogManager.java:1.8 Tue Oct 12
01:00:34 2004
+++ kaffe/libraries/javalib/java/util/logging/LogManager.java Sat Oct 23 10:40:49
2004
@@ -1,8 +1,6 @@
-/* LogManager.java
- -- a class for maintaining Loggers and managing configuration
- properties
-
-Copyright (C) 2002 Free Software Foundation, Inc.
+/* LogManager.java -- a class for maintaining Loggers and managing
+ configuration properties
+ Copyright (C) 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -36,9 +34,8 @@
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
+exception statement from your version. */
-*/
package java.util.logging;
@@ -46,14 +43,14 @@
import java.beans.PropertyChangeSupport;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.ref.WeakReference;
import java.net.URL;
import java.util.Collections;
-import java.util.Properties;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Map;
+import java.util.Properties;
import java.util.StringTokenizer;
-import java.lang.ref.WeakReference;
/**
* The <code>LogManager</code> maintains a hierarchical namespace
Index: kaffe/libraries/javalib/java/util/logging/LogRecord.java
diff -u kaffe/libraries/javalib/java/util/logging/LogRecord.java:1.3
kaffe/libraries/javalib/java/util/logging/LogRecord.java:1.4
--- kaffe/libraries/javalib/java/util/logging/LogRecord.java:1.3 Tue Oct 12
00:25:00 2004
+++ kaffe/libraries/javalib/java/util/logging/LogRecord.java Sat Oct 23 10:40:49
2004
@@ -1,7 +1,6 @@
-/* LogRecord.java
- -- a class for the state associated with individual logging events
-
-Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* LogRecord.java --
+ A class for the state associated with individual logging events
+ Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -35,9 +34,7 @@
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
-
-*/
+exception statement from your version. */
package java.util.logging;
@@ -391,7 +388,7 @@
* Allocates a sequence number for a new LogRecord. This class
* method is only called by the LogRecord constructor.
*/
- private synchronized static long allocateSeqNum()
+ private static synchronized long allocateSeqNum()
{
lastSeqNum += 1;
return lastSeqNum;
Index: kaffe/libraries/javalib/java/util/logging/Logger.java
diff -u kaffe/libraries/javalib/java/util/logging/Logger.java:1.4
kaffe/libraries/javalib/java/util/logging/Logger.java:1.5
--- kaffe/libraries/javalib/java/util/logging/Logger.java:1.4 Thu Apr 22 09:59:55
2004
+++ kaffe/libraries/javalib/java/util/logging/Logger.java Sat Oct 23 10:40:49
2004
@@ -1,7 +1,5 @@
-/* Logger.java
- -- a class for logging messages
-
-Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+/* Logger.java -- a class for logging messages
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -35,9 +33,7 @@
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
-
-*/
+exception statement from your version. */
package java.util.logging;
Index: kaffe/libraries/javalib/java/util/logging/LoggingPermission.java
diff -u kaffe/libraries/javalib/java/util/logging/LoggingPermission.java:1.1
kaffe/libraries/javalib/java/util/logging/LoggingPermission.java:1.2
--- kaffe/libraries/javalib/java/util/logging/LoggingPermission.java:1.1 Mon
Nov 11 12:01:53 2002
+++ kaffe/libraries/javalib/java/util/logging/LoggingPermission.java Sat Oct 23
10:40:49 2004
@@ -33,9 +33,7 @@
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
-
-*/
+exception statement from your version. */
package java.util.logging;
Index: kaffe/libraries/javalib/java/util/logging/MemoryHandler.java
diff -u kaffe/libraries/javalib/java/util/logging/MemoryHandler.java:1.2
kaffe/libraries/javalib/java/util/logging/MemoryHandler.java:1.3
--- kaffe/libraries/javalib/java/util/logging/MemoryHandler.java:1.2 Thu Apr 22
09:59:55 2004
+++ kaffe/libraries/javalib/java/util/logging/MemoryHandler.java Sat Oct 23
10:40:50 2004
@@ -1,7 +1,5 @@
-/* MemoryHandler.java
- -- a class for buffering log messages in a memory buffer
-
-Copyright (C) 2002 Free Software Foundation, Inc.
+/* MemoryHandler.java -- a class for buffering log messages in a memory buffer
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
Index: kaffe/libraries/javalib/java/util/logging/SimpleFormatter.java
diff -u kaffe/libraries/javalib/java/util/logging/SimpleFormatter.java:1.4
kaffe/libraries/javalib/java/util/logging/SimpleFormatter.java:1.5
--- kaffe/libraries/javalib/java/util/logging/SimpleFormatter.java:1.4 Thu Apr 22
09:59:55 2004
+++ kaffe/libraries/javalib/java/util/logging/SimpleFormatter.java Sat Oct 23
10:40:50 2004
@@ -1,7 +1,6 @@
-/* SimpleFormatter.java
- -- a class for formatting log records into short human-readable messages
-
-Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+/* SimpleFormatter.java --
+ A class for formatting log records into short human-readable messages
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -35,9 +34,7 @@
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
-
-*/
+exception statement from your version. */
package java.util.logging;
Index: kaffe/libraries/javalib/java/util/logging/SocketHandler.java
diff -u kaffe/libraries/javalib/java/util/logging/SocketHandler.java:1.2
kaffe/libraries/javalib/java/util/logging/SocketHandler.java:1.3
--- kaffe/libraries/javalib/java/util/logging/SocketHandler.java:1.2 Thu Apr 22
09:59:55 2004
+++ kaffe/libraries/javalib/java/util/logging/SocketHandler.java Sat Oct 23
10:40:50 2004
@@ -1,7 +1,5 @@
-/* SocketHandler.java
- -- a class for publishing log messages to network sockets
-
-Copyright (C) 2002 Free Software Foundation, Inc.
+/* SocketHandler.java -- a class for publishing log messages to network sockets
+ Copyright (C) 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -35,9 +33,7 @@
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
-
-*/
+exception statement from your version. */
package java.util.logging;
Index: kaffe/libraries/javalib/java/util/logging/StreamHandler.java
diff -u kaffe/libraries/javalib/java/util/logging/StreamHandler.java:1.1
kaffe/libraries/javalib/java/util/logging/StreamHandler.java:1.2
--- kaffe/libraries/javalib/java/util/logging/StreamHandler.java:1.1 Mon Nov 11
12:01:53 2002
+++ kaffe/libraries/javalib/java/util/logging/StreamHandler.java Sat Oct 23
10:40:50 2004
@@ -1,7 +1,6 @@
-/* StreamHandler.java
- -- a class for publishing log messages to instances of java.io.OutputStream
-
-Copyright (C) 2002 Free Software Foundation, Inc.
+/* StreamHandler.java --
+ A class for publishing log messages to instances of java.io.OutputStream
+ Copyright (C) 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -35,9 +34,7 @@
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
-
-*/
+exception statement from your version. */
package java.util.logging;
Index: kaffe/libraries/javalib/java/util/logging/XMLFormatter.java
diff -u kaffe/libraries/javalib/java/util/logging/XMLFormatter.java:1.5
kaffe/libraries/javalib/java/util/logging/XMLFormatter.java:1.6
--- kaffe/libraries/javalib/java/util/logging/XMLFormatter.java:1.5 Thu Apr 22
09:59:55 2004
+++ kaffe/libraries/javalib/java/util/logging/XMLFormatter.java Sat Oct 23 10:40:50
2004
@@ -1,7 +1,6 @@
-/* XMLFormatter.java
- -- a class for formatting log messages into a standard XML format
-
-Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+/* XMLFormatter.java --
+ A class for formatting log messages into a standard XML format
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -35,9 +34,7 @@
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
-
-*/
+exception statement from your version. */
package java.util.logging;
@@ -101,10 +98,8 @@
* @param content the element content, or <code>null</code> to
* have no output whatsoever appended to <code>buf</code>.
*/
- private static final void appendTag(StringBuffer buf,
- int indent,
- String tag,
- String content)
+ private static void appendTag(StringBuffer buf, int indent,
+ String tag, String content)
{
int i;
@@ -178,10 +173,8 @@
*
* @param content the element content.
*/
- private static final void appendTag(StringBuffer buf,
- int indent,
- String tag,
- long content)
+ private static void appendTag(StringBuffer buf, int indent,
+ String tag, long content)
{
appendTag(buf, indent, tag, Long.toString(content));
}
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
