From 8f523f3a1047919d3563daf1ef47ba87336ebe89 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@gcc.gnu.org>
Date: Tue, 15 Nov 2005 23:20:01 +0000
Subject: Imported GNU Classpath 0.19 + gcj-import-20051115.

       * sources.am: Regenerated.
       * Makefile.in: Likewise.
       * scripts/makemake.tcl: Use glob -nocomplain.

From-SVN: r107049
---
 libjava/classpath/java/util/logging/FileHandler.java       | 4 ----
 libjava/classpath/java/util/logging/Handler.java           | 6 +++---
 libjava/classpath/java/util/logging/LogManager.java        | 4 ++--
 libjava/classpath/java/util/logging/LoggingPermission.java | 2 ++
 libjava/classpath/java/util/logging/SimpleFormatter.java   | 2 +-
 libjava/classpath/java/util/logging/XMLFormatter.java      | 2 +-
 6 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'libjava/classpath/java/util/logging')

diff --git a/libjava/classpath/java/util/logging/FileHandler.java b/libjava/classpath/java/util/logging/FileHandler.java
index 3d958b7..b03df97 100644
--- a/libjava/classpath/java/util/logging/FileHandler.java
+++ b/libjava/classpath/java/util/logging/FileHandler.java
@@ -43,10 +43,6 @@ import java.io.FileOutputStream;
 import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-
 import java.util.LinkedList;
 import java.util.ListIterator;
 
diff --git a/libjava/classpath/java/util/logging/Handler.java b/libjava/classpath/java/util/logging/Handler.java
index c3227d6..616b502 100644
--- a/libjava/classpath/java/util/logging/Handler.java
+++ b/libjava/classpath/java/util/logging/Handler.java
@@ -191,8 +191,8 @@ h.setFormatter(h.getFormatter());</pre>
    * Returns the character encoding which this handler uses for publishing
    * log records.
    *
-   * @param encoding the name of a character encoding, or <code>null</code>
-   *            for the default platform encoding.
+   * @return the name of a character encoding, or <code>null</code>
+   *         for the default platform encoding.
    */
   public String getEncoding()
   {
@@ -252,7 +252,7 @@ h.setFormatter(h.getFormatter());</pre>
    * Sets the <code>Filter</code> for controlling which
    * log records will be published by this <code>Handler</code>.
    *
-   * @return the <code>Filter</code> to use, or
+   * @param filter the <code>Filter</code> to use, or
    *         <code>null</code> to filter log records purely based
    *         on their severity level.
    */
diff --git a/libjava/classpath/java/util/logging/LogManager.java b/libjava/classpath/java/util/logging/LogManager.java
index 7e3fd97..b62292f 100644
--- a/libjava/classpath/java/util/logging/LogManager.java
+++ b/libjava/classpath/java/util/logging/LogManager.java
@@ -664,7 +664,7 @@ public class LogManager
   {
     try
       {
-	return (new Boolean(getLogManager().getProperty(name))).booleanValue();
+	return (Boolean.valueOf(getLogManager().getProperty(name))).booleanValue();
       }
     catch (Exception ex)
       {
@@ -682,7 +682,7 @@ public class LogManager
    *
    * @param defaultValue the value that will be returned if the
    *        property is not defined, or if
-   *        {@link Level.parse(java.lang.String)} does not like
+   *        {@link Level#parse(java.lang.String)} does not like
    *        the property value.
    */
   static Level getLevelProperty(String propertyName, Level defaultValue)
diff --git a/libjava/classpath/java/util/logging/LoggingPermission.java b/libjava/classpath/java/util/logging/LoggingPermission.java
index c7a2255..1139a79 100644
--- a/libjava/classpath/java/util/logging/LoggingPermission.java
+++ b/libjava/classpath/java/util/logging/LoggingPermission.java
@@ -41,6 +41,8 @@ package java.util.logging;
 public final class LoggingPermission
   extends java.security.BasicPermission
 {
+  private static final long serialVersionUID = 63564341580231582L;
+
   /**
    * Creates a new LoggingPermission.
    *
diff --git a/libjava/classpath/java/util/logging/SimpleFormatter.java b/libjava/classpath/java/util/logging/SimpleFormatter.java
index f7a4427..ff53db8 100644
--- a/libjava/classpath/java/util/logging/SimpleFormatter.java
+++ b/libjava/classpath/java/util/logging/SimpleFormatter.java
@@ -85,7 +85,7 @@ public class SimpleFormatter
   /**
    * Formats a log record into a String.
    *
-   * @param the log record to be formatted.
+   * @param record the log record to be formatted.
    *
    * @return a short human-readable message, typically one or two
    *   lines.  Lines are separated using the default platform line
diff --git a/libjava/classpath/java/util/logging/XMLFormatter.java b/libjava/classpath/java/util/logging/XMLFormatter.java
index 4dd6328..8bd83ba 100644
--- a/libjava/classpath/java/util/logging/XMLFormatter.java
+++ b/libjava/classpath/java/util/logging/XMLFormatter.java
@@ -307,7 +307,7 @@ public class XMLFormatter
    *
    * @return a string for the header.
    *
-   * @param handler the handler which will prepend the returned
+   * @param h the handler which will prepend the returned
    *     string in front of the first log record.  This method
    *     will inspect certain properties of the handler, for
    *     example its encoding, in order to construct the header.
-- 
cgit v1.1