harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r571185 [1/3] - in /harmony/enhanced/classlib/branches/java6: depends/jars/ make/ modules/auth/src/main/java/common/org/apache/harmony/auth/module/ modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/ modules/beans/src/ma...
Date Thu, 30 Aug 2007 14:33:59 GMT
Author: tellison
Date: Thu Aug 30 07:33:56 2007
New Revision: 571185

URL: http://svn.apache.org/viewvc?rev=571185&view=rev
Log:
Merge updates between classlib trunk@r570018 and r571136,
plus necessary fixes to SQL's AbstractRowSetImpl for compilation.

Added:
    harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/LoginModuleUtils.java
      - copied unchanged from r571136, harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/LoginModuleUtils.java
    harmony/enhanced/classlib/branches/java6/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/LoginModuleUtilsTest.java
      - copied unchanged from r571136, harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/LoginModuleUtilsTest.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/AbstractRowSetImpl.java
      - copied, changed from r571136, harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/AbstractRowSetImpl.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRow.java
      - copied unchanged from r571136, harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRow.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetReader.java
      - copied unchanged from r571136, harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetReader.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetWriter.java
      - copied unchanged from r571136, harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetWriter.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/FilteredRowSetImpl.java
      - copied unchanged from r571136, harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/FilteredRowSetImpl.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/JdbcRowSetImpl.java
      - copied unchanged from r571136, harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/JdbcRowSetImpl.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/JoinRowSetImpl.java
      - copied unchanged from r571136, harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/JoinRowSetImpl.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/WebRowSetImpl.java
      - copied unchanged from r571136, harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/WebRowSetImpl.java
Modified:
    harmony/enhanced/classlib/branches/java6/depends/jars/   (props changed)
    harmony/enhanced/classlib/branches/java6/make/build-java.xml
    harmony/enhanced/classlib/branches/java6/make/depends.properties
    harmony/enhanced/classlib/branches/java6/make/depends.xml
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLDecoder.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/ConsoleHandler.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/ErrorManager.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/FileHandler.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Filter.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Formatter.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Handler.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Level.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LogManager.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LogRecord.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Logger.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LoggingMXBean.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LoggingPermission.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/MemoryHandler.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/SimpleFormatter.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/SocketHandler.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/StreamHandler.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/XMLFormatter.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/ObjectInputStream.java
    harmony/enhanced/classlib/branches/java6/modules/math/src/test/java/tests/api/java/math/BigDecimalTest.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/nls/messages.properties
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetImpl.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/CachedRowSetImplTest.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/metal/MetalFileChooserUI.java

Propchange: harmony/enhanced/classlib/branches/java6/depends/jars/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 30 07:33:56 2007
@@ -14,7 +14,33 @@
 ecj_3.2
 bcel-5.2
 jetty
+bcprov-jdk14-134bcprov-jdk14-133
+ecj_3.2RC5
+icu4j_3.4.4
+junit_3.8.2
+mx4j_3.0.1
+mx4j_3.0.2
+xalan-j_2.7.0
+xerces_2.8.0
+bcprov-jdk14-132
+junit_3.8.1
+xalan-j_2.6.0
+xerces_2.6.2
+ecj_3.2MAINT
+ecj_3.2
+bcel-5.2
+jetty
 bcprov-jdk14-134
+yoko_M1-20061027
+bcprov-jdk15-134
+yoko_M2-200611115
+yoko_M2-20061115
+yoko_M2-20070130
+xerces_2.9.0
+bcprov-jdk15-136
+bcprov-jdk15-137
+derby-10.3.1.4
+
 yoko_M1-20061027
 bcprov-jdk15-134
 yoko_M2-200611115

Modified: harmony/enhanced/classlib/branches/java6/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/build-java.xml?rev=571185&r1=571184&r2=571185&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/build-java.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/build-java.xml Thu Aug 30 07:33:56 2007
@@ -217,6 +217,7 @@
                 <patternset includes="icu4jni_3.4/*.jar" />
                 <patternset includes="mx4j_3.0.2/*.jar" />
                 <patternset includes="xalan-j_2.7.0/*.jar" />
+                <patternset includes="xerces_2.9.0/*.jar" />
                 <patternset includes="yoko_M2-20070130/yoko-rmi-spec.jar" />
                 <patternset includes="yoko_M2-20070130/yoko-rmi-impl.jar" />
                 <patternset includes="yoko_M2-20070130/yoko.jar" />
@@ -224,43 +225,6 @@
             </fileset>
             <fileset dir="${depends.manifests}"/>
         </copy>
-
-	<!-- Unzip xerces jars -->
-	<mkdir dir="${hy.jdk}/jre/lib/boot/xerces-2_9_0" />
-	<unzip src="${depends.jars}/xerces_2.9.0/xerces.zip"
-	       dest="${hy.jdk}/jre/lib/boot" >
-		<patternset>
-			<include name="xerces-2_9_0/resolver.jar" />
-			<include name="xerces-2_9_0/xercesImpl.jar" />
-			<include name="xerces-2_9_0/xml-apis.jar" />
-		</patternset>
-	</unzip>
-	<move todir="${hy.jdk}/jre/lib/boot/xerces_2.9.0">
-		<fileset dir="${hy.jdk}/jre/lib/boot/xerces-2_9_0"/>
-	</move>
-
-	<!-- Unzip xmlsec jars -->
-	<mkdir dir="${hy.jdk}/jre/lib/boot/xmlsec-1.4.0" />
-	<unzip src="${depends.jars}/xmlsec_1.4.0/xmlsec.zip"
-	       dest="${hy.jdk}/jre/lib/boot" >
-		<patternset>
-			<include name="xml-security-1_4_0/libs/xmlsec-1.4.0.jar" />
-			<include name="xml-security-1_4_0/libs/commons-logging.jar" />
-		</patternset>
-
-                <!-- mapper type="flatten" / -->
-	</unzip>
-
-        <!-- TODO: remove this when switch to next ant version -->
-	<move todir="${hy.jdk}/jre/lib/boot/xmlsec-1.4.0">
-		<fileset dir="${hy.jdk}/jre/lib/boot/xml-security-1_4_0/libs"/>
-	</move>
-        <delete dir="${hy.jdk}/jre/lib/boot/xml-security-1_4_0" />
-
-
-        <!-- delete these lines if BC version is greater than jdk15-134 -->
-        <!-- delete the original signed.bcprov.jar                      -->
-        <delete file="${hy.jdk}/jre/lib/ext/signed.bcprov.jar" />
 
         <!-- Copy across the extension dependency jars -->
         <copy todir="${hy.jdk}/jre/lib/ext" flatten="yes" overwrite="true">

Modified: harmony/enhanced/classlib/branches/java6/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.properties?rev=571185&r1=571184&r2=571185&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.properties (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.properties Thu Aug 30 07:33:56 2007
@@ -132,7 +132,7 @@
 dejavu-fonts.url=http://dfn.dl.sourceforge.net/sourceforge/dejavu/dejavu-ttf-2.18-1.zip
 dejavu-fonts.md5=72e0a87ec1f9c5c26c66eabcf1e2018e
 
-derby.dir=${depends.dir}/derby
+derby.dir=${depends.jars}/derby-10.3.1.4
 derby.jar=${derby.dir}/derby.jar
 derby.url=http://www.ibiblio.org/maven/org.apache.derby/jars/derby-10.3.1.4.jar
 derby.md5=f28d6047ab26445de53c4c96126494df

Modified: harmony/enhanced/classlib/branches/java6/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.xml?rev=571185&r1=571184&r2=571185&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.xml Thu Aug 30 07:33:56 2007
@@ -97,13 +97,27 @@
         <antcall target="-awt-tar-extract" />
     </target>
 
-    <target name="-extract" depends="-extract-props,-really-extract-mx4j" />
+    <target name="-extract"
+         depends="-extract-props,-extract-mx4j,-extract-dejavu-fonts,-extract-xerces" />
+
     <target name="-extract-props">
+        <uptodate property="dejavu-fonts.uptodate"
+                  srcfile="${dejavu-fonts.zip}"
+                  targetfile="${dejavu-fonts.fonts.dir}/DejaVuSerif.ttf" />
         <uptodate property="mx4j.uptodate"
                   srcfile="${mx4j.zip}"
                   targetfile="${mx4j.jar}" />
+        <uptodate property="xerces.uptodate"
+                  srcfile="${xerces.zip}"
+                  targetfile="${xerces.dir}/xercesImpl.jar" />
+    </target>
+
+    <target name="-extract-dejavu-fonts" unless="dejavu-fonts.uptodate">
+        <unzip src="${dejavu-fonts.zip}" dest="${dejavu-fonts.dir}" />
     </target>
-    <target name="-really-extract-mx4j" unless="mx4j.uptodate">
+
+    <target name="-extract-mx4j" unless="mx4j.uptodate">
+
         <!-- This doesn't work for me since my ant doesn't support
              mapper in unzip.
 
@@ -126,6 +140,18 @@
         <delete dir="${mx4j.dir}.tmp" />
     </target>
 
+    <target name="-extract-xerces" unless="xerces.uptodate">
+        <unzip src="${xerces.zip}" dest="${xerces.dir}.tmp" />
+        <copy todir="${xerces.dir}" flatten="yes">
+            <fileset dir="${xerces.dir}.tmp/xerces-2_9_0">
+                <include name="resolver.jar" />
+		<include name="xercesImpl.jar" />
+		<include name="xml-apis.jar" />
+            </fileset>
+        </copy>
+        <delete dir="${xerces.dir}.tmp" />
+    </target>
+
     <!-- 
        *  FIXME : the following awful little hack is because we noticed that for whatever
        *  reason, we can't link with libjpg.a et al on at least to kinds of 64-bit linux
@@ -348,7 +374,6 @@
     <mkdir dir="${dejavu-fonts.dir}" />
     <download-one-file src="${dejavu-fonts.url}" dest="${dejavu-fonts.zip}"
                            md5="${dejavu-fonts.md5}" />
-    <unzip src="${dejavu-fonts.zip}" dest="${dejavu-fonts.dir}" />
 
     <mkdir dir="${derby.dir}" />
     <download-one-file src="${derby.url}"

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLDecoder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLDecoder.java?rev=571185&r1=571184&r2=571185&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLDecoder.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLDecoder.java Thu Aug 30 07:33:56 2007
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 package java.beans;
 
 import java.io.InputStream;
@@ -36,13 +35,14 @@
 /**
  * <code>XMLDecoder</code> reads objects from xml created by
  * <code>XMLEncoder</code>.
- * <p>The API is similar to <code>ObjectInputStream</code>.</p>
- *
+ * <p>
+ * The API is similar to <code>ObjectInputStream</code>.
+ * </p>
  */
 public class XMLDecoder {
 
     private ClassLoader defaultClassLoader = null;
-    
+
     private static class DefaultExceptionListener implements ExceptionListener {
 
         public void exceptionThrown(Exception e) {
@@ -113,7 +113,7 @@
                 obtainTarget(elem, attributes);
                 obtainMethod(elem, attributes);
             }
-			
+
             readObjs.push(elem);
         }
 
@@ -127,10 +127,10 @@
                 }
             } else {
                 Elem parent = latestUnclosedElem();
-				if(parent == null) {
-					elem.target = owner;
-					return;
-				}
+                if (parent == null) {
+                    elem.target = owner;
+                    return;
+                }
                 elem.target = execute(parent);
             }
         }
@@ -156,13 +156,13 @@
 
             elem.methodName = attributes.getValue("field");
             if (elem.methodName != null) {
-				elem.fromField = true;
+                elem.fromField = true;
                 return;
             }
 
             elem.methodName = attributes.getValue("owner");
             if (elem.methodName != null) {
-				elem.fromOwner = true;
+                elem.fromOwner = true;
                 return;
             }
 
@@ -201,7 +201,7 @@
             elem.isExpression = true;
             elem.id = attributes.getValue("id");
             try {
-                // find componet class
+                // find component class
                 Class<?> compClass = classForName(attributes.getValue("class"));
                 // find length
                 int length = Integer.parseInt(attributes.getValue("length"));
@@ -316,26 +316,27 @@
                 args.add(0, index);
                 method = args.size() == 1 ? "get" : "set";
             }
-			if(elem.fromField) {
-				Field f = ((Class)elem.target).getField(method);
-		        return (new Expression(f, "get", new Object[] {null})).getValue();
-			}
-			if(elem.fromOwner) {
-				return owner;
-			}
-			
-			if(elem.target == owner) {
-				if("getOwner".equals(method)) {
-					return owner;
-				}
+            if (elem.fromField) {
+                Field f = ((Class) elem.target).getField(method);
+                return (new Expression(f, "get", new Object[] { null }))
+                        .getValue();
+            }
+            if (elem.fromOwner) {
+                return owner;
+            }
+
+            if (elem.target == owner) {
+                if ("getOwner".equals(method)) {
+                    return owner;
+                }
                 Class[] c = new Class[args.size()];
-                for(int i = 0; i < args.size(); i++) {
-                	c[i] = args.get(i).getClass();
+                for (int i = 0; i < args.size(); i++) {
+                    c[i] = args.get(i).getClass();
                 }
                 Method m = owner.getClass().getMethod(method, c);
                 return m.invoke(owner, args.toArray());
-			}
-			
+            }
+
             // execute
             Expression exp = new Expression(elem.target, method, args.toArray());
             return exp.getValue();
@@ -355,7 +356,7 @@
             if ("null".equals(tag)) {
                 return null;
             } else if ("string".equals(tag)) {
-                return value;
+                return value == null ? "" : value;
             } else if ("class".equals(tag)) {
                 return classForName(value);
             } else if ("boolean".equals(tag)) {
@@ -396,7 +397,7 @@
     }
 
     private static class Elem {
-		String id;
+        String id;
 
         String idref;
 
@@ -415,8 +416,8 @@
         boolean fromProperty;
 
         boolean fromIndex;
-		
-		boolean fromField;
+
+        boolean fromField;
 
         boolean fromOwner;
 
@@ -435,8 +436,9 @@
 
     /**
      * Create a decoder to read from specified input stream.
-     *
-     * @param inputStream   an input stream of xml
+     * 
+     * @param inputStream
+     *            an input stream of xml
      */
     public XMLDecoder(InputStream inputStream) {
         this(inputStream, null, null);
@@ -444,9 +446,11 @@
 
     /**
      * Create a decoder to read from specified input stream.
-     *
-     * @param inputStream   an input stream of xml
-     * @param owner         the owner of this decoder
+     * 
+     * @param inputStream
+     *            an input stream of xml
+     * @param owner
+     *            the owner of this decoder
      */
     public XMLDecoder(InputStream inputStream, Object owner) {
         this(inputStream, owner, null);
@@ -454,10 +458,13 @@
 
     /**
      * Create a decoder to read from specified input stream.
-     *
-     * @param inputStream   an input stream of xml
-     * @param owner         the owner of this decoder
-     * @param listener      listen to the exceptions thrown by the decoder
+     * 
+     * @param inputStream
+     *            an input stream of xml
+     * @param owner
+     *            the owner of this decoder
+     * @param listener
+     *            listen to the exceptions thrown by the decoder
      */
     public XMLDecoder(InputStream inputStream, Object owner,
             ExceptionListener listener) {
@@ -466,7 +473,8 @@
         }
         this.inputStream = inputStream;
         this.owner = owner;
-        this.listener = (listener == null)? new DefaultExceptionListener(): listener;
+        this.listener = (listener == null) ? new DefaultExceptionListener()
+                : listener;
 
         try {
             SAXParserFactory.newInstance().newSAXParser().parse(inputStream,
@@ -475,7 +483,7 @@
             this.listener.exceptionThrown(e);
         }
     }
-    
+
     public XMLDecoder(InputStream inputStream, Object owner,
             ExceptionListener listener, ClassLoader cl) {
         this(inputStream, owner, listener);
@@ -495,6 +503,7 @@
 
     /**
      * Returns the exception listener.
+     * 
      * @return the exception listener
      */
     public ExceptionListener getExceptionListener() {
@@ -503,6 +512,7 @@
 
     /**
      * Returns the owner of this decoder.
+     * 
      * @return the owner of this decoder
      */
     public Object getOwner() {
@@ -511,9 +521,10 @@
 
     /**
      * Reads the next object.
-     *
+     * 
      * @return the next object
-     * @exception ArrayIndexOutOfBoundsException if no more objects to read
+     * @exception ArrayIndexOutOfBoundsException
+     *                if no more objects to read
      */
     @SuppressWarnings("nls")
     public Object readObject() {
@@ -522,7 +533,7 @@
         }
         Elem elem = readObjs.get(readObjIndex);
         if (!elem.isClosed) {
-            // bad element, error occured while parsing
+            // bad element, error occurred while parsing
             throw new ArrayIndexOutOfBoundsException("no more objects to read");
         }
         readObjIndex++;
@@ -531,8 +542,9 @@
 
     /**
      * Sets the exception listener.
-     *
-     * @param listener  an exception listener
+     * 
+     * @param listener
+     *            an exception listener
      */
     public void setExceptionListener(ExceptionListener listener) {
         if (listener != null) {
@@ -542,12 +554,11 @@
 
     /**
      * Sets the owner of this decoder.
-     *
-     * @param owner     the owner of this decoder
+     * 
+     * @param owner
+     *            the owner of this decoder
      */
     public void setOwner(Object owner) {
         this.owner = owner;
     }
 }
-
-

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/META-INF/MANIFEST.MF?rev=571185&r1=571184&r2=571185&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/META-INF/MANIFEST.MF Thu Aug 30 07:33:56 2007
@@ -27,7 +27,6 @@
  java.security,
  java.text;resolution:=optional,
  java.util,
- java.util.concurrent.atomic;resolution:=optional,
  java.util.jar,
  java.util.zip;resolution:=optional,
  javax.accessibility;resolution:=optional,

Modified: harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/ConsoleHandler.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/ConsoleHandler.java?rev=571185&r1=571184&r2=571185&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/ConsoleHandler.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/ConsoleHandler.java Thu Aug 30 07:33:56 2007
@@ -42,7 +42,6 @@
  * <p>
  * This class is not thread-safe.
  * </p>
- * 
  */
 public class ConsoleHandler extends StreamHandler {
 
@@ -65,12 +64,12 @@
     /**
      * Logs a record if necessary. A flush operation will be done.
      * 
-     * @param record the log record to be logged
+     * @param record
+     *            the log record to be logged
      */
     @Override
     public void publish(LogRecord record) {
         super.publish(record);
         super.flush();
-
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/ErrorManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/ErrorManager.java?rev=571185&r1=571184&r2=571185&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/ErrorManager.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/ErrorManager.java Thu Aug 30 07:33:56 2007
@@ -20,12 +20,10 @@
 import org.apache.harmony.logging.internal.nls.Messages;
 
 /**
- * <p>
  * An error reporting facility for {@link Handler} implementations to record any
  * error that may happen during logging. <code>Handlers</code> should report
  * errors to an <code>ErrorManager</code>, instead of throwing exceptions,
  * which would interfere with the log issuer's execution.
- * </p>
  */
 public class ErrorManager {
 
@@ -79,12 +77,10 @@
     }
 
     /**
-     * <p>
      * Reports an error using the given message, exception and error code. This
      * implementation will write out the message to {@link System#err} on the
      * first call and all subsequent calls are ignored. A subclass of this class
      * should override this method.
-     * </p>
      * 
      * @param message
      *            The error message, which may be <code>null</code>.
@@ -103,7 +99,7 @@
             called = true;
         }
         System.err.println(this.getClass().getName()
-            + ": " + FAILURES[errorCode]); //$NON-NLS-1$
+                + ": " + FAILURES[errorCode]); //$NON-NLS-1$
         if (message != null) {
             // logging.1E=Error message - {0}
             System.err.println(Messages.getString("logging.1E", message)); //$NON-NLS-1$

Modified: harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/FileHandler.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/FileHandler.java?rev=571185&r1=571184&r2=571185&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/FileHandler.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/FileHandler.java Thu Aug 30 07:33:56 2007
@@ -228,21 +228,22 @@
         setOutputStream(output);
     }
 
+    @SuppressWarnings("nls")
     private void initProperties(String p, Boolean a, Integer l, Integer c) {
-        super.initProperties("ALL", null, "java.util.logging.XMLFormatter", //$NON-NLS-1$//$NON-NLS-2$
+        super.initProperties("ALL", null, "java.util.logging.XMLFormatter",
                 null);
         String className = this.getClass().getName();
-        pattern = (null == p) ? getStringProperty(className + ".pattern", //$NON-NLS-1$
+        pattern = (null == p) ? getStringProperty(className + ".pattern",
                 DEFAULT_PATTERN) : p;
-        if (null == pattern || "".equals(pattern)) { //$NON-NLS-1$
+        if (null == pattern || "".equals(pattern)) {
             // logging.19=Pattern cannot be empty
-            throw new NullPointerException(Messages.getString("logging.19")); //$NON-NLS-1$
+            throw new NullPointerException(Messages.getString("logging.19"));
         }
-        append = (null == a) ? getBooleanProperty(className + ".append", //$NON-NLS-1$
+        append = (null == a) ? getBooleanProperty(className + ".append",
                 DEFAULT_APPEND) : a.booleanValue();
-        count = (null == c) ? getIntProperty(className + ".count", //$NON-NLS-1$
+        count = (null == c) ? getIntProperty(className + ".count",
                 DEFAULT_COUNT) : c.intValue();
-        limit = (null == l) ? getIntProperty(className + ".limit", //$NON-NLS-1$
+        limit = (null == l) ? getIntProperty(className + ".limit",
                 DEFAULT_LIMIT) : l.intValue();
         count = count < 1 ? DEFAULT_COUNT : count;
         limit = limit < 0 ? DEFAULT_LIMIT : limit;

Modified: harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Filter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Filter.java?rev=571185&r1=571184&r2=571185&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Filter.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Filter.java Thu Aug 30 07:33:56 2007
@@ -18,15 +18,16 @@
 package java.util.logging;
 
 /**
- * <p>A Filter provides a mechanism for exercising fine-grained control over
- * what records get logged.</p> 
+ * A Filter provides a mechanism for exercising fine-grained control over what
+ * records get logged.
  */
 public interface Filter {
 
     /**
-     * <p>Checks the {@link LogRecord} to determine if it should be logged.</p>
+     * Checks the {@link LogRecord} to determine if it should be logged.
      * 
-     * @param record The {@link LogRecord} to be checked.
+     * @param record
+     *            The {@link LogRecord} to be checked.
      * @return <code>true</code> if the supplied log record needs to be
      *         logged, otherwise <code>false</code>
      */

Modified: harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Formatter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Formatter.java?rev=571185&r1=571184&r2=571185&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Formatter.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Formatter.java Thu Aug 30 07:33:56 2007
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 package java.util.logging;
 
 import java.text.MessageFormat;
@@ -26,16 +25,9 @@
  * objects into a string representation. Head and tail strings are sometime used
  * to wrap a set of records. The <code>getHead</code> and <code>getTail</code>
  * methods are presented for this purpose.
- * 
  */
 public abstract class Formatter {
 
-    /*
-     * -------------------------------------------------------------------
-     * Constructors
-     * -------------------------------------------------------------------
-     */
-
     /**
      * Constructs a <code>Formatter</code> object.
      */
@@ -43,12 +35,6 @@
         super();
     }
 
-    /*
-     * -------------------------------------------------------------------
-     * Methods
-     * -------------------------------------------------------------------
-     */
-
     /**
      * Formats a <code>LogRecord</code> object into a string representation.
      * The resulted string is usually localized and includes the message field
@@ -128,6 +114,4 @@
     public String getTail(Handler h) {
         return ""; //$NON-NLS-1$
     }
-
 }
-

Modified: harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Handler.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Handler.java?rev=571185&r1=571184&r2=571185&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Handler.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Handler.java Thu Aug 30 07:33:56 2007
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-
 package java.util.logging;
 
+import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.security.AccessController;
 import java.security.PrivilegedExceptionAction;
-import java.io.UnsupportedEncodingException;
 
 import org.apache.harmony.logging.internal.nls.Messages;
 
@@ -29,23 +28,11 @@
  * A <code>Handler</code> object accepts a logging request and exports the
  * desired messages to a target, for example, a file, the console, etc. It can
  * be disabled by setting its logging level to <code>Level.OFF</code>.
- * 
  */
 public abstract class Handler {
 
-    /*
-     * -------------------------------------------------------------------
-     * Constants
-     * -------------------------------------------------------------------
-     */
     private static final Level DEFAULT_LEVEL = Level.ALL;
 
-    /*
-     * -------------------------------------------------------------------
-     * Instance variables
-     * -------------------------------------------------------------------
-     */
-
     // the error manager to report errors during logging
     private ErrorManager errorMan;
 
@@ -64,12 +51,6 @@
     // class name, used for property reading
     private String prefix;
 
-    /*
-     * -------------------------------------------------------------------
-     * Constructors
-     * -------------------------------------------------------------------
-     */
-
     /**
      * Constructs a <code>Handler</code> object with a default error manager,
      * the default encoding, and the default logging level
@@ -84,12 +65,6 @@
         this.prefix = this.getClass().getName();
     }
 
-    /*
-     * -------------------------------------------------------------------
-     * Methods
-     * -------------------------------------------------------------------
-     */
-
     // get a instance from given class name, using Class.forName()
     private Object getDefaultInstance(String className) {
         Object result = null;
@@ -99,7 +74,7 @@
         try {
             result = Class.forName(className).newInstance();
         } catch (Exception e) {
-            //ignore
+            // ignore
         }
         return result;
     }
@@ -107,7 +82,8 @@
     // get a instance from given class name, using context classloader
     private Object getCustomizeInstance(final String className)
             throws Exception {
-        Class<?> c = AccessController.doPrivileged(new PrivilegedExceptionAction<Class<?>>() {
+        Class<?> c = AccessController
+                .doPrivileged(new PrivilegedExceptionAction<Class<?>>() {
                     public Class<?> run() throws Exception {
                         ClassLoader loader = Thread.currentThread()
                                 .getContextClassLoader();
@@ -123,7 +99,8 @@
     // print error message in some format
     void printInvalidPropMessage(String key, String value, Exception e) {
         // logging.12=Invalid property value for
-        String msg = new StringBuilder().append(Messages.getString("logging.12"))  //$NON-NLS-1$
+        String msg = new StringBuilder().append(
+                Messages.getString("logging.12")) //$NON-NLS-1$
                 .append(prefix).append(":").append(key).append("/").append( //$NON-NLS-1$//$NON-NLS-2$
                         value).toString();
         errorMan.error(msg, e, ErrorManager.GENERIC_FAILURE);
@@ -138,7 +115,7 @@
             String defaultFormatter, String defaultEncoding) {
         LogManager manager = LogManager.getLogManager();
 
-        //set filter
+        // set filter
         final String filterName = manager.getProperty(prefix + ".filter"); //$NON-NLS-1$
         if (null != filterName) {
             try {
@@ -151,7 +128,7 @@
             filter = (Filter) getDefaultInstance(defaultFilter);
         }
 
-        //set level
+        // set level
         String levelName = manager.getProperty(prefix + ".level"); //$NON-NLS-1$
         if (null != levelName) {
             try {
@@ -164,7 +141,7 @@
             level = Level.parse(defaultLevel);
         }
 
-        //set formatter
+        // set formatter
         final String formatterName = manager.getProperty(prefix + ".formatter"); //$NON-NLS-1$
         if (null != formatterName) {
             try {
@@ -177,7 +154,7 @@
             formatter = (Formatter) getDefaultInstance(defaultFormatter);
         }
 
-        //set encoding
+        // set encoding
         final String encodingName = manager.getProperty(prefix + ".encoding"); //$NON-NLS-1$
         try {
             internalSetEncoding(encodingName);
@@ -417,4 +394,3 @@
         this.level = newLevel;
     }
 }
-

Modified: harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Level.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Level.java?rev=571185&r1=571184&r2=571185&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Level.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Level.java Thu Aug 30 07:33:56 2007
@@ -26,8 +26,8 @@
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import org.apache.harmony.logging.internal.nls.Messages;
 import org.apache.harmony.kernel.vm.VM;
+import org.apache.harmony.logging.internal.nls.Messages;
 
 /**
  * <code>Level</code> objects are used to indicate the level of logging. There
@@ -40,7 +40,6 @@
  * ALL and OFF. ALL indicates logging all messages, and OFF indicates logging no
  * messages.
  * </p>
- * 
  */
 public class Level implements Serializable {
 
@@ -129,8 +128,8 @@
 
             if (isNameAnInt) {
                 /*
-                 * Loop through levels a second time, so that the
-                 * returned instance will be passed on the order of construction.
+                 * Loop through levels a second time, so that the returned
+                 * instance will be passed on the order of construction.
                  */
                 for (Level level : levels) {
                     if (nameAsInt == level.intValue()) {
@@ -142,7 +141,8 @@
 
         if (!isNameAnInt) {
             // logging.1D=Cannot parse this name: {0}
-            throw new IllegalArgumentException(Messages.getString("logging.1D", name)); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString(
+                    "logging.1D", name)); //$NON-NLS-1$
         }
 
         return new Level(name, nameAsInt);
@@ -179,9 +179,12 @@
      * Constructs an instance of <code>Level</code> taking the supplied name
      * and level value.
      * 
-     * @param name name of the level
-     * @param level an integer value indicating the level
-     * @throws NullPointerException if <code>name</code> is <code>null</code>.
+     * @param name
+     *            name of the level
+     * @param level
+     *            an integer value indicating the level
+     * @throws NullPointerException
+     *             if <code>name</code> is <code>null</code>.
      */
     protected Level(String name, int level) {
         this(name, level, null);
@@ -191,10 +194,14 @@
      * Constructs an instance of <code>Level</code> taking the supplied name
      * and level value.
      * 
-     * @param name name of the level
-     * @param level an integer value indicating the level
-     * @param resourceBundleName the name of the resource bundle to use
-     * @throws NullPointerException if <code>name</code> is <code>null</code>.
+     * @param name
+     *            name of the level
+     * @param level
+     *            an integer value indicating the level
+     * @param resourceBundleName
+     *            the name of the resource bundle to use
+     * @throws NullPointerException
+     *             if <code>name</code> is <code>null</code>.
      */
     protected Level(String name, int level, String resourceBundleName) {
         if (name == null) {
@@ -206,8 +213,8 @@
         this.resourceBundleName = resourceBundleName;
         if (resourceBundleName != null) {
             try {
-                rb = ResourceBundle.getBundle(resourceBundleName, 
-                		Locale.getDefault(), VM.callerClassLoader());
+                rb = ResourceBundle.getBundle(resourceBundleName, Locale
+                        .getDefault(), VM.callerClassLoader());
             } catch (MissingResourceException e) {
                 rb = null;
             }
@@ -247,10 +254,8 @@
     }
 
     /**
-     * <p>
      * Serialization helper method to maintain singletons and add any new
      * levels.
-     * </p>
      * 
      * @return The resolved instance.
      */
@@ -260,7 +265,7 @@
                 if (value != level.value) {
                     continue;
                 }
-                if (!name.equals(name)) {
+                if (!name.equals(level.name)) {
                     continue;
                 }
                 if (resourceBundleName == level.resourceBundleName) {
@@ -277,12 +282,17 @@
     }
 
     /**
-     * <p>Serialization helper to setup transient resource bundle instance.</p>
-     * @param in The input stream to read the instance data from.
-     * @throws IOException if an IO error occurs.
-     * @throws ClassNotFoundException if a class is not found. 
+     * Serialization helper to setup transient resource bundle instance.
+     * 
+     * @param in
+     *            The input stream to read the instance data from.
+     * @throws IOException
+     *             if an IO error occurs.
+     * @throws ClassNotFoundException
+     *             if a class is not found.
      */
-    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+    private void readObject(ObjectInputStream in) throws IOException,
+            ClassNotFoundException {
         in.defaultReadObject();
         if (resourceBundleName != null) {
             try {
@@ -316,7 +326,8 @@
      * Compares two <code>Level</code> objects for equality. They are
      * considered to be equal if they have the same value.
      * 
-     * @param o the other object to be compared with
+     * @param o
+     *            the other object to be compared with
      * @return <code>true</code> if this object equals to the supplied object,
      *         otherwise <code>false</code>
      */

Modified: harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LogManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LogManager.java?rev=571185&r1=571184&r2=571185&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LogManager.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LogManager.java Thu Aug 30 07:33:56 2007
@@ -24,6 +24,8 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.management.ManagementFactory;
+import java.lang.reflect.Method;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.Collection;
@@ -33,12 +35,10 @@
 import java.util.Properties;
 import java.util.Set;
 import java.util.StringTokenizer;
-import java.lang.management.ManagementFactory;
-import java.lang.reflect.Method;
+
 import javax.management.MBeanServer;
-import javax.management.ObjectName;
 import javax.management.ObjectInstance;
-import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
 
 import org.apache.harmony.logging.internal.nls.Messages;
 
@@ -123,15 +123,14 @@
  */
 public class LogManager {
     /*
-     * -------------------------------------------------------------------
-     * Class variables
+     * ------------------------------------------------------------------- Class
+     * variables
      * -------------------------------------------------------------------
      */
 
     // The line separator of the underlying OS
     // Use privileged code to read the line.separator system property
-    private static final String lineSeparator =
-            getPrivilegedSystemProperty("line.separator"); //$NON-NLS-1$
+    private static final String lineSeparator = getPrivilegedSystemProperty("line.separator"); //$NON-NLS-1$
 
     // The shared logging permission
     private static final LoggingPermission perm = new LoggingPermission(
@@ -139,12 +138,13 @@
 
     // the singleton instance
     static LogManager manager;
-    
+
     /**
-     * <p>The String value of the {@link LoggingMXBean}'s ObjectName.</p>
+     * <p>
+     * The String value of the {@link LoggingMXBean}'s ObjectName.
+     * </p>
      */
-    public static final String LOGGING_MXBEAN_NAME =
-            "java.util.logging:type=Logging"; //$NON-NLS-1$
+    public static final String LOGGING_MXBEAN_NAME = "java.util.logging:type=Logging"; //$NON-NLS-1$
 
     /**
      * Get the <code>LoggingMXBean</code> instance
@@ -154,40 +154,35 @@
     public static LoggingMXBean getLoggingMXBean() {
         try {
             ObjectName loggingMXBeanName = new ObjectName(LOGGING_MXBEAN_NAME);
-            MBeanServer platformBeanServer =
-                    ManagementFactory.getPlatformMBeanServer();
+            MBeanServer platformBeanServer = ManagementFactory
+                    .getPlatformMBeanServer();
             Set loggingMXBeanSet = platformBeanServer.queryMBeans(
                     loggingMXBeanName, null);
 
             if (loggingMXBeanSet.size() != 1) {
                 // logging.21=There Can Be Only One logging MX bean.
-                throw new AssertionError(Messages.getString("logging.21"));
+                throw new AssertionError(Messages.getString("logging.21")); //$NON-NLS-1$
             }
 
             Iterator i = loggingMXBeanSet.iterator();
             ObjectInstance loggingMXBeanOI = (ObjectInstance) i.next();
             String lmxbcn = loggingMXBeanOI.getClassName();
             Class lmxbc = Class.forName(lmxbcn);
-            Method giMethod = lmxbc.getDeclaredMethod("getInstance");
+            Method giMethod = lmxbc.getDeclaredMethod("getInstance"); //$NON-NLS-1$
             giMethod.setAccessible(true);
-            LoggingMXBean lmxb = (LoggingMXBean)
-                    giMethod.invoke(null, new Object[] {});
+            LoggingMXBean lmxb = (LoggingMXBean) giMethod.invoke(null,
+                    new Object[] {});
 
             return lmxb;
         } catch (Exception e) {
-            //TODO
-            //e.printStackTrace();
+            // TODO
+            // e.printStackTrace();
         }
         // logging.22=Exception occurred while getting the logging MX bean.
         throw new AssertionError(Messages.getString("logging.22")); //$NON-NLS-1$
     }
 
-    /*
-     * -------------------------------------------------------------------
-     * Instance variables
-     * -------------------------------------------------------------------
-     */
-    //FIXME: use weak reference to avoid heap memory leak    
+    // FIXME: use weak reference to avoid heap memory leak
     private Hashtable<String, Logger> loggers;
 
     // the configuration properties
@@ -196,44 +191,38 @@
     // the property change listener
     private PropertyChangeSupport listeners;
 
-    /*
-     * -------------------------------------------------------------------
-     * Global initialization
-     * -------------------------------------------------------------------
-     */
-
     static {
-		// init LogManager singleton instance
-		AccessController.doPrivileged(new PrivilegedAction<Object>() {
-			public Object run() {
-				String className = System.getProperty(
-                        "java.util.logging.manager"); //$NON-NLS-1$
-                
-				if (null != className) {
-					manager = (LogManager) getInstanceByClass(className);
-				}
-				if (null == manager) {
-					manager = new LogManager();
-				}
-
-				// read configuration
-				try {
-					manager.readConfiguration();
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
+        // init LogManager singleton instance
+        AccessController.doPrivileged(new PrivilegedAction<Object>() {
+            public Object run() {
+                String className = System
+                        .getProperty("java.util.logging.manager"); //$NON-NLS-1$
 
-				// if global logger has been initialized, set root as its parent
+                if (null != className) {
+                    manager = (LogManager) getInstanceByClass(className);
+                }
+                if (null == manager) {
+                    manager = new LogManager();
+                }
+
+                // read configuration
+                try {
+                    manager.readConfiguration();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+                // if global logger has been initialized, set root as its parent
                 Logger root = new Logger("", null); //$NON-NLS-1$
                 root.setLevel(Level.INFO);
                 Logger.global.setParent(root);
-                
+
                 manager.addLogger(root);
                 manager.addLogger(Logger.global);
                 return null;
-			}
-		});
-	}
+            }
+        });
+    }
 
     /**
      * Default constructor. This is not public because there should be only one
@@ -261,11 +250,6 @@
     }
 
     /*
-     * -------------------------------------------------------------------
-     * Methods
-     * -------------------------------------------------------------------
-     */
-    /*
      * Package private utilities Returns the line separator of the underlying
      * OS.
      */
@@ -319,7 +303,6 @@
         return true;
     }
 
-
     private void addToFamilyTree(Logger logger, String name) {
         Logger parent = null;
         // find parent
@@ -331,8 +314,8 @@
             if (parent != null) {
                 logger.internalSetParent(parent);
                 break;
-            } else if (getProperty(parentName+".level") != null || //$NON-NLS-1$
-                    getProperty(parentName+".handlers") != null) { //$NON-NLS-1$
+            } else if (getProperty(parentName + ".level") != null || //$NON-NLS-1$
+                    getProperty(parentName + ".handlers") != null) { //$NON-NLS-1$
                 parent = Logger.getLogger(parentName);
                 logger.internalSetParent(parent);
                 break;
@@ -343,7 +326,7 @@
         }
 
         // find children
-        //TODO: performance can be improved here?
+        // TODO: performance can be improved here?
         Collection<Logger> allLoggers = loggers.values();
         for (final Logger child : allLoggers) {
             Logger oldParent = child.getParent();
@@ -358,7 +341,7 @@
                     }
                 });
                 if (null != oldParent) {
-                    //-- remove from old parent as the parent has been changed
+                    // -- remove from old parent as the parent has been changed
                     oldParent.removeChild(child);
                 }
             }
@@ -406,8 +389,8 @@
     }
 
     /**
-     * Re-initialize the properties and configuration. The initialization process
-     * is same as the <code>LogManager</code> instantiation.
+     * Re-initialize the properties and configuration. The initialization
+     * process is same as the <code>LogManager</code> instantiation.
      * <p>
      * A <code>PropertyChangeEvent</code> must be fired.
      * </p>
@@ -421,19 +404,20 @@
     public void readConfiguration() throws IOException {
         checkAccess();
         // check config class
-        String configClassName = System.getProperty(
-                "java.util.logging.config.class"); //$NON-NLS-1$
-        if (null == configClassName || null == getInstanceByClass(configClassName)) {
-            // if config class failed, check config file       
-            String configFile = System.getProperty(
-                    "java.util.logging.config.file"); //$NON-NLS-1$
+        String configClassName = System
+                .getProperty("java.util.logging.config.class"); //$NON-NLS-1$
+        if (null == configClassName
+                || null == getInstanceByClass(configClassName)) {
+            // if config class failed, check config file
+            String configFile = System
+                    .getProperty("java.util.logging.config.file"); //$NON-NLS-1$
 
             if (null == configFile) {
                 // if cannot find configFile, use default logging.properties
                 configFile = new StringBuilder().append(
                         System.getProperty("java.home")).append(File.separator) //$NON-NLS-1$
                         .append("lib").append(File.separator).append( //$NON-NLS-1$
-                        "logging.properties").toString(); //$NON-NLS-1$
+                                "logging.properties").toString(); //$NON-NLS-1$
             }
 
             InputStream input = null;
@@ -468,13 +452,12 @@
             return clazz.newInstance();
         } catch (Exception e) {
             try {
-                Class<?> clazz = Thread.currentThread()
-                        .getContextClassLoader().loadClass(className);
+                Class<?> clazz = Thread.currentThread().getContextClassLoader()
+                        .loadClass(className);
                 return clazz.newInstance();
             } catch (Exception innerE) {
-                //logging.20=Loading class "{0}" failed
-                System.err.println(Messages.getString(
-                        "logging.20", className)); //$NON-NLS-1$
+                // logging.20=Loading class "{0}" failed
+                System.err.println(Messages.getString("logging.20", className)); //$NON-NLS-1$
                 System.err.println(innerE);
                 return null;
             }
@@ -487,7 +470,7 @@
             throws IOException {
         reset();
         props.load(ins);
-        
+
         // parse property "config" and apply setting
         String configs = props.getProperty("config"); //$NON-NLS-1$
         if (null != configs) {
@@ -497,20 +480,18 @@
                 getInstanceByClass(configerName);
             }
         }
-        
+
         // set levels for logger
         Collection<Logger> allLoggers = loggers.values();
-        for(Logger logger : allLoggers){
-            String property = props.getProperty(
-                    logger.getName()+".level"); //$NON-NLS-1$
-            if(null != property){
+        for (Logger logger : allLoggers) {
+            String property = props.getProperty(logger.getName() + ".level"); //$NON-NLS-1$
+            if (null != property) {
                 logger.setLevel(Level.parse(property));
             }
         }
         listeners.firePropertyChange(null, null, null);
     }
 
-
     /**
      * Re-initialize the properties and configuration from the given
      * <code>InputStream</code>
@@ -547,10 +528,10 @@
         checkAccess();
         props = new Properties();
         Enumeration<String> names = getLoggerNames();
-        while(names.hasMoreElements()){
+        while (names.hasMoreElements()) {
             String name = names.nextElement();
             Logger logger = getLogger(name);
-            if(logger != null){
+            if (logger != null) {
                 logger.reset();
             }
         }
@@ -571,7 +552,7 @@
      *             not have the required permissions to perform this action
      */
     public void addPropertyChangeListener(PropertyChangeListener l) {
-        if(l == null){
+        if (l == null) {
             throw new NullPointerException();
         }
         checkAccess();

Modified: harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LogRecord.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LogRecord.java?rev=571185&r1=571184&r2=571185&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LogRecord.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LogRecord.java Thu Aug 30 07:33:56 2007
@@ -41,7 +41,6 @@
  * they expect to use them after passing the <code>LogRecord</code> object to
  * another thread or transmitting it over RMI.
  * </p>
- * 
  */
 public class LogRecord implements Serializable {
 
@@ -353,7 +352,7 @@
     }
 
     /*
-     *  Init the sourceClass and sourceMethod fields.
+     * Init the sourceClass and sourceMethod fields.
      */
     private void initSource() {
         if (!sourceInited) {
@@ -366,8 +365,9 @@
                     break FINDLOG;
                 }
             }
-            while(++i<elements.length && elements[i].getClassName().equals(current)) {
-            	// do nothing
+            while (++i < elements.length
+                    && elements[i].getClassName().equals(current)) {
+                // do nothing
             }
             if (i < elements.length) {
                 this.sourceClassName = elements[i].getClassName();
@@ -474,12 +474,12 @@
         in.defaultReadObject();
         byte major = in.readByte();
         byte minor = in.readByte();
-        //only check MAJOR version
+        // only check MAJOR version
         if (major != MAJOR) {
             // logging.5=Different version - {0}.{1}
             throw new IOException(Messages.getString("logging.5", major, minor)); //$NON-NLS-1$ 
         }
-        
+
         int length = in.readInt();
         if (length >= 0) {
             parameters = new Object[length];

Modified: harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Logger.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Logger.java?rev=571185&r1=571184&r2=571185&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Logger.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Logger.java Thu Aug 30 07:33:56 2007
@@ -24,7 +24,6 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
-import java.util.StringTokenizer;
 
 import org.apache.harmony.logging.internal.nls.Messages;
 
@@ -121,17 +120,11 @@
     private boolean isNamed;
 
     private List<Logger> childs;
-    
+
     private LogManager manager;
 
     private boolean handlerInited;
 
-    /*
-     * -------------------------------------------------------------------
-     * Constructors
-     * -------------------------------------------------------------------
-     */
-
     /**
      * Constructs a <code>Logger</code> object with the supplied name and
      * resource bundle name.
@@ -161,24 +154,24 @@
         // any logger is not anonymous by default
         this.isNamed = true;
 
-        //-- 'null' means that level will be inherited from parent (see getLevel)
-        //-- Level.INFO is default level if we don't set it. It will be
-        //-- changed to parent level or to configLevel after adding to the
-        //-- family tree. As of this, actually, setting to Level.INFO is
-        //-- not needed here.
+        // -- 'null' means that level will be inherited from parent (see
+        // getLevel)
+        // -- Level.INFO is default level if we don't set it. It will be
+        // -- changed to parent level or to configLevel after adding to the
+        // -- family tree. As of this, actually, setting to Level.INFO is
+        // -- not needed here.
         this.levelObjVal = null;
         this.levelIntVal = Level.INFO.intValue();
     }
 
-    //-- should be called under the lm lock
+    // -- should be called under the lm lock
     private void setLevelImpl(Level newLevel) {
         // update levels for the whole hierarchy
         int oldVal = levelIntVal;
         levelObjVal = newLevel;
         if (null == newLevel) {
-            levelIntVal = null != parent
-                    ? parent.levelIntVal
-                    : Level.INFO.intValue();
+            levelIntVal = null != parent ? parent.levelIntVal : Level.INFO
+                    .intValue();
         } else {
             levelIntVal = newLevel.intValue();
         }
@@ -187,7 +180,7 @@
         }
     }
 
-    //-- should be called under the lm lock
+    // -- should be called under the lm lock
     private void forceChildsToInherit() {
         for (Logger child : childs) {
             if (null == child.levelObjVal) { // should inherit
@@ -196,12 +189,6 @@
         }
     }
 
-    /*
-     * -------------------------------------------------------------------
-     * Methods
-     * -------------------------------------------------------------------
-     */
-
     /**
      * Load the specified resource bundle, use privileged code.
      * 
@@ -213,8 +200,8 @@
      */
     static ResourceBundle loadResourceBundle(String resourceBundleName) {
         // try context class loader to load the resource
-        ClassLoader cl = AccessController.doPrivileged(
-                new PrivilegedAction<ClassLoader>() {
+        ClassLoader cl = AccessController
+                .doPrivileged(new PrivilegedAction<ClassLoader>() {
                     public ClassLoader run() {
                         return Thread.currentThread().getContextClassLoader();
                     }
@@ -228,12 +215,11 @@
             }
         }
         // try system class loader to load the resource
-        cl = AccessController.doPrivileged(
-                new PrivilegedAction<ClassLoader>() {
-                    public ClassLoader run() {
-                        return ClassLoader.getSystemClassLoader();
-                    }
-                });
+        cl = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+            public ClassLoader run() {
+                return ClassLoader.getSystemClassLoader();
+            }
+        });
         if (null != cl) {
             try {
                 return ResourceBundle.getBundle(resourceBundleName, Locale
@@ -254,8 +240,8 @@
         for (int i = 1; i < classes.length; i++) {
             final int index = i;
             try {
-                cl = AccessController.doPrivileged(
-                        new PrivilegedAction<ClassLoader>() {
+                cl = AccessController
+                        .doPrivileged(new PrivilegedAction<ClassLoader>() {
                             public ClassLoader run() {
                                 return classes[index].getClassLoader();
                             }
@@ -271,17 +257,17 @@
         }
         // logging.8=Failed to load the specified resource bundle "{0}".
         throw new MissingResourceException(Messages.getString("logging.8", //$NON-NLS-1$
-                resourceBundleName), resourceBundleName, null);  
+                resourceBundleName), resourceBundleName, null);
     }
 
     /**
      * Gets an anonymous logger to use internally in a thread. Anonymous loggers
      * are not registered in the log manager's namespace. No security checks
-     * will be performed when updating an anonymous logger's control settings
-     * so that they can be used in applets.
+     * will be performed when updating an anonymous logger's control settings so
+     * that they can be used in applets.
      * <p>
-     * Anonymous loggers' parent is set to be the root logger. This enables
-     * them to inherit default logging level and handlers from the root logger.
+     * Anonymous loggers' parent is set to be the root logger. This enables them
+     * to inherit default logging level and handlers from the root logger.
      * </p>
      * 
      * @return a new instance of anonymous logger
@@ -293,11 +279,11 @@
     /**
      * Gets an anonymous logger to use internally in a thread. Anonymous loggers
      * are not registered in the log manager's namespace. No security checks
-     * will be performed when updating an anonymous logger's control settings
-     * so that they can be used in applets.
+     * will be performed when updating an anonymous logger's control settings so
+     * that they can be used in applets.
      * <p>
-     * Anonymous loggers' parent is set to be the root logger. This enables
-     * them to inherit default logging level and handlers from the root logger.
+     * Anonymous loggers' parent is set to be the root logger. This enables them
+     * to inherit default logging level and handlers from the root logger.
      * </p>
      * 
      * @param resourceBundleName
@@ -314,33 +300,30 @@
     }
 
     /*
-     * Check whether the same resource bundle has been specified.
-     * Synchronize to ensure the consistency between resource bundle
-     * and its name.
+     * Check whether the same resource bundle has been specified. Synchronize to
+     * ensure the consistency between resource bundle and its name.
      */
     private static void updateResourceBundle(Logger l, String resourceBundleName) {
         synchronized (l) {
             if (null == l.getResourceBundleName()) {
-                if(null == resourceBundleName){
+                if (null == resourceBundleName) {
                     return;
                 }
                 /*
-                 * load the resource bundle if none is specified
-                 * before
+                 * load the resource bundle if none is specified before
                  */
                 l.resBundle = loadResourceBundle(resourceBundleName);
                 l.resBundleName = resourceBundleName;
             } else if (!l.getResourceBundleName().equals(resourceBundleName)) {
                 /*
-                 * throw exception if the specified resource bundles
-                 * are inconsistent with each other, i.e., different
-                 * names
+                 * throw exception if the specified resource bundles are
+                 * inconsistent with each other, i.e., different names
                  */
-                // logging.9=The specified resource bundle name "{0}" is 
+                // logging.9=The specified resource bundle name "{0}" is
                 // inconsistent with the existing one "{1}".
                 throw new IllegalArgumentException(Messages.getString(
                         "logging.9", //$NON-NLS-1$
-                        resourceBundleName, l.getResourceBundleName())); 
+                        resourceBundleName, l.getResourceBundleName()));
             }
         }
     }
@@ -420,18 +403,18 @@
             LogManager.getLogManager().checkAccess();
         }
         initHandler();
-        synchronized(this){
+        synchronized (this) {
             this.handlers.add(handler);
         }
     }
-    
+
     /*
-     * Be cautious to avoid deadlock when using this method, it gets lock on manager 
-     * at first, and then gets lock on this Logger, so any methods should not hold 
-     * lock on this Logger when invoking this method. 
+     * Be cautious to avoid deadlock when using this method, it gets lock on
+     * manager at first, and then gets lock on this Logger, so any methods
+     * should not hold lock on this Logger when invoking this method.
      */
     private void initHandler() {
-        if(!handlerInited){
+        if (!handlerInited) {
             synchronized (this) {
                 if (!handlerInited) {
                     if (handlers == null) {
@@ -446,10 +429,10 @@
                     if (null == handlerStr) {
                         return;
                     }
-                    String[] strs = handlerStr.split(",|\\s");
+                    String[] strs = handlerStr.split(",|\\s"); //$NON-NLS-1$
                     for (int i = 0; i < strs.length; i++) {
                         String handlerName = strs[i];
-                        if (handlerName.equals("")){
+                        if (handlerName.equals("")) { //$NON-NLS-1$
                             continue;
                         }
                         Handler handler = (Handler) LogManager
@@ -474,7 +457,7 @@
      */
     public Handler[] getHandlers() {
         initHandler();
-        synchronized(this){
+        synchronized (this) {
             return handlers.toArray(new Handler[handlers.size()]);
         }
     }
@@ -498,7 +481,7 @@
             return;
         }
         initHandler();
-        synchronized(this){
+        synchronized (this) {
             this.handlers.remove(handler);
         }
     }
@@ -598,15 +581,16 @@
 
     /**
      * Sets the parent of this logger in the namespace. This method should
-     * usually be used by the <code>LogManager</code> object only. This
-     * method does not check security.
+     * usually be used by the <code>LogManager</code> object only. This method
+     * does not check security.
      * 
      * @param newParent
      *            the parent logger to set
      */
     void internalSetParent(Logger newParent) {
-        //All hierarchy related modifications should get LogManager lock at first
-        synchronized(LogManager.getLogManager()){
+        // All hierarchy related modifications should get LogManager lock at
+        // first
+        synchronized (LogManager.getLogManager()) {
             parent = newParent;
             // -- update level after setting a parent.
             // -- if level == null we should inherit the parent's level
@@ -645,7 +629,6 @@
         childs.remove(child);
     }
 
-
     /**
      * Gets the name of this logger.
      * 
@@ -677,9 +660,9 @@
     }
 
     /**
-     * This method is for compatibility. Tests written to the reference 
-     * implementation API imply that the isLoggable() method is not called 
-     * directly. This behavior is important because subclass may override 
+     * This method is for compatibility. Tests written to the reference
+     * implementation API imply that the isLoggable() method is not called
+     * directly. This behavior is important because subclass may override
      * isLoggable() method, so that affect the result of log methods.
      */
     private boolean internalIsLoggable(Level l) {
@@ -793,14 +776,14 @@
     public void entering(String sourceClass, String sourceMethod,
             Object[] params) {
         if (internalIsLoggable(Level.FINER)) {
-        	String msg = "ENTRY"; //$NON-NLS-1$
-			if (null != params) {
-				StringBuilder msgBuffer = new StringBuilder("ENTRY"); //$NON-NLS-1$
-				for (int i = 0; i < params.length; i++) {
-					msgBuffer.append(" {" + i + "}"); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-				msg = msgBuffer.toString();
-			}
+            String msg = "ENTRY"; //$NON-NLS-1$
+            if (null != params) {
+                StringBuilder msgBuffer = new StringBuilder("ENTRY"); //$NON-NLS-1$
+                for (int i = 0; i < params.length; i++) {
+                    msgBuffer.append(" {" + i + "}"); //$NON-NLS-1$ //$NON-NLS-2$
+                }
+                msg = msgBuffer.toString();
+            }
             LogRecord record = new LogRecord(Level.FINER, msg);
             record.setLoggerName(this.name);
             record.setSourceClassName(sourceClass);
@@ -1092,8 +1075,7 @@
             }
             initHandler();
             /*
-             * call the handlers of this logger, throw any exception that
-             * occurs
+             * call the handlers of this logger, throw any exception that occurs
              */
             Handler[] allHandlers = getHandlers();
             for (Handler element : allHandlers) {
@@ -1383,12 +1365,12 @@
     }
 
     void setManager(LogManager manager) {
-        if(this.manager != manager){
+        if (this.manager != manager) {
             this.manager = manager;
-            handlerInited  = false;
+            handlerInited = false;
         }
-        //init level here, but let handlers be for lazy loading
-        final String configedLevel = manager.getProperty(name+ ".level"); //$NON-NLS-1$
+        // init level here, but let handlers be for lazy loading
+        final String configedLevel = manager.getProperty(name + ".level"); //$NON-NLS-1$
         if (null != configedLevel) {
             try {
                 AccessController.doPrivileged(new PrivilegedAction<Object>() {
@@ -1398,15 +1380,15 @@
                     }
                 });
             } catch (IllegalArgumentException e) {
-                //ignore
+                // ignore
             }
-        }        
+        }
     }
 
     synchronized void reset() {
         levelObjVal = null;
         levelIntVal = Level.INFO.intValue();
-        if(handlers != null){
+        if (handlers != null) {
             for (Handler element : handlers) {
                 // close all handlers, when unknown exceptions happen,
                 // ignore them and go on

Modified: harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LoggingMXBean.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LoggingMXBean.java?rev=571185&r1=571184&r2=571185&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LoggingMXBean.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LoggingMXBean.java Thu Aug 30 07:33:56 2007
@@ -20,10 +20,7 @@
 import java.util.List;
 
 /**
- * <p>
  * The management interface for the logging sub-system.
- * </p>
- * 
  * <p>
  * ObjectName =
  * {@link LogManager#LOGGING_MXBEAN_NAME java.util.logging:type=Logging}
@@ -32,54 +29,51 @@
  * @since 1.5
  */
 public interface LoggingMXBean {
+
     /**
-     * <p>
      * Gets the String value of the logging level of a logger. An empty String
      * is returned when the logger's level is defined by its parent.
-     * </p>
      * 
-     * @param loggerName The name of the logger lookup.
+     * @param loggerName
+     *            The name of the logger lookup.
      * @return A String if the logger was found, otherwise <code>null</code>.
      * @see Level#getName()
      */
     String getLoggerLevel(String loggerName);
 
     /**
-     * <p>
      * Gets a list of all currently registered logger's names. This is performed
      * using the {@link LogManager#getLoggerNames()}.
-     * </p>
      * 
      * @return A List of String instances.
      */
     List<String> getLoggerNames();
 
     /**
-     * <p>
      * Gets the name of the parent logger of a logger. If the logger doesn't
      * exist then <code>null</code> is returned. If the logger is the root
      * logger, then an empty String is returned.
-     * </p>
      * 
-     * @param loggerName The name of the logger to lookup.
+     * @param loggerName
+     *            The name of the logger to lookup.
      * @return A String if the logger was found, otherwise <code>null</code>.
      */
     String getParentLoggerName(String loggerName);
 
     /**
-     * <p>
      * Sets the log level of a logger.
-     * </p>
      * 
-     * @param loggerName The name of the logger to set the level on, which must
-     *        not be <code>null</code>.
-     * @param levelName The level to set on the logger, which may be
-     *        <code>null</code>.
-     * @throws IllegalArgumentException if <code>loggerName</code> is not a
-     *         registered logger or if <code>levelName</code> is not null and
-     *         an invalid value.
-     * @throws SecurityException if a security manager exists and the caller
-     *         doesn't have LoggingPermission("control").
+     * @param loggerName
+     *            The name of the logger to set the level on, which must not be
+     *            <code>null</code>.
+     * @param levelName
+     *            The level to set on the logger, which may be <code>null</code>.
+     * @throws IllegalArgumentException
+     *             if <code>loggerName</code> is not a registered logger or if
+     *             <code>levelName</code> is not null and an invalid value.
+     * @throws SecurityException
+     *             if a security manager exists and the caller doesn't have
+     *             LoggingPermission("control").
      * @see Level#parse(String)
      */
     void setLoggerLevel(String loggerName, String levelName);

Modified: harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LoggingPermission.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LoggingPermission.java?rev=571185&r1=571184&r2=571185&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LoggingPermission.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LoggingPermission.java Thu Aug 30 07:33:56 2007
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 package java.util.logging;
 
 import java.io.Serializable;
@@ -27,20 +26,12 @@
 /**
  * The permission required to control the logging when run with a
  * <code>SecurityManager</code>.
- * 
  */
 public final class LoggingPermission extends BasicPermission implements Guard,
         Serializable {
 
-    //for serialization compatibility with J2SE 1.4.2
-    private static final long serialVersionUID =63564341580231582L;
-    
-    
-    /*
-     * -------------------------------------------------------------------
-     * Constructors
-     * -------------------------------------------------------------------
-     */
+    // for serialization compatibility with J2SE 1.4.2
+    private static final long serialVersionUID = 63564341580231582L;
 
     /**
      * Constructs a <code>LoggingPermission</code> object required to control
@@ -65,4 +56,3 @@
     }
 
 }
-



Mime
View raw message