stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6925868: Eliminate pack200's dependency on logging

Browse Source 
Replace j.u.l.Logger with sun.util.logging.PlatformLogger

Reviewed-by: alanb, forax
This commit is contained in:
Mandy Chung 2010-02-12 11:33:33 -08:00
parent d9eac222f1
commit 652882e3b4
3 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
View File

@ -27,7 +27,6 @@ package com.sun.java.util.jar.pack;
import java.io.*;
import java.util.*;
import java.util.logging.Level;
import com.sun.java.util.jar.pack.Package.Class;
import com.sun.java.util.jar.pack.Package.File;
import com.sun.java.util.jar.pack.Package.InnerClass;
@ -162,7 +161,7 @@ class PackageReader extends BandStructure {
ok = true;
} catch (Exception ee) {
Utils.log.log(Level.WARNING, "Error on input: "+ee, ee);
Utils.log.warning("Error on input: "+ee, ee);
if (verbose > 0)
Utils.log.info("Stream offsets:"+
" served="+in.getBytesServed()+

3
jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
View File

@ -27,7 +27,6 @@ package com.sun.java.util.jar.pack;
import java.io.*;
import java.util.*;
import java.util.logging.Level;
import com.sun.java.util.jar.pack.Package.Class;
import com.sun.java.util.jar.pack.Package.File;
import com.sun.java.util.jar.pack.Package.InnerClass;
@ -84,7 +83,7 @@ class PackageWriter extends BandStructure {
ok = true;
} catch (Exception ee) {
Utils.log.log(Level.WARNING, "Error on output: "+ee, ee);
Utils.log.warning("Error on output: "+ee, ee);
//if (verbose > 0) ee.printStackTrace();
// Write partial output only if we are verbose.
if (verbose > 0) finalOut.close();

65
jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java
View File

@ -28,9 +28,10 @@ package com.sun.java.util.jar.pack;
import java.util.*;
import java.util.jar.*;
import java.util.zip.*;
import java.util.logging.*;
import java.io.*;
import sun.util.logging.PlatformLogger;
class Utils {
static final String COM_PREFIX = "com.sun.java.util.jar.pack.";
static final String METAINF = "META-INF";
@ -130,31 +131,53 @@ class Utils {
= Boolean.getBoolean(Utils.COM_PREFIX+"nolog");
static final Logger log
= new Logger("java.util.jar.Pack200", null) {
public void log(LogRecord record) {
int verbose = currentPropMap().getInteger(DEBUG_VERBOSE);
if (verbose > 0) {
if (nolog &&
record.getLevel().intValue() < Level.WARNING.intValue()) {
System.out.println(record.getMessage());
} else {
super.log(record);
}
}
}
static class Pack200Logger {
private final String name;
private PlatformLogger log;
Pack200Logger(String name) {
this.name = name;
}
public void fine(String msg) {
int verbose = currentPropMap().getInteger(DEBUG_VERBOSE);
if (verbose > 0) {
System.out.println(msg);
private synchronized PlatformLogger getLogger() {
if (log == null) {
log = PlatformLogger.getLogger(name);
}
return log;
}
public void warning(String msg, Object param) {
int verbose = currentPropMap().getInteger(DEBUG_VERBOSE);
if (verbose > 0) {
getLogger().warning(msg, param);
}
}
public void warning(String msg) {
warning(msg, null);
}
public void info(String msg) {
int verbose = currentPropMap().getInteger(DEBUG_VERBOSE);
if (verbose > 0) {
if (nolog) {
System.out.println(msg);
} else {
getLogger().info(msg);
}
}
};
static {
LogManager.getLogManager().addLogger(log);
}
public void fine(String msg) {
int verbose = currentPropMap().getInteger(DEBUG_VERBOSE);
if (verbose > 0) {
System.out.println(msg);
}
}
}
static final Pack200Logger log
= new Pack200Logger("java.util.jar.Pack200");
// Returns the Max Version String of this implementation
static String getVersionString() {
return "Pack200, Vendor: Sun Microsystems, Version: " +