archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 03:24:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8149328: remove the dependency on java.logging from java.compiler

Browse source 
Reviewed-by: jjg
This commit is contained in:
Vicente Romero 2016-02-23 16:25:01 -08:00
parent bf5a096440
commit 2cdc922f31
1 changed files with 3 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

52
langtools/src/java.compiler/share/classes/javax/tools/ToolProvider.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -28,12 +28,7 @@ package javax.tools;
import java.lang.ref.Reference; import java.lang.ref.Reference;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger;
import java.util.logging.Level;
import static java.util.logging.Level.*;
/** /**
* Provides methods for locating tool providers, for example, * Provides methods for locating tool providers, for example,
@ -45,47 +40,6 @@ import static java.util.logging.Level.*;
*/ */
public class ToolProvider { public class ToolProvider {
private static final String propertyName = "sun.tools.ToolProvider";
private static final String loggerName = "javax.tools";
/*
* Define the system property "sun.tools.ToolProvider" to enable
* debugging:
*
* java ... -Dsun.tools.ToolProvider ...
*/
static <T> T trace(Level level, Object reason) {
// NOTE: do not make this method private as it affects stack traces
try {
if (System.getProperty(propertyName) != null) {
StackTraceElement[] st = Thread.currentThread().getStackTrace();
String method = "???";
String cls = ToolProvider.class.getName();
if (st.length > 2) {
StackTraceElement frame = st[2];
method = String.format((Locale)null, "%s(%s:%s)",
frame.getMethodName(),
frame.getFileName(),
frame.getLineNumber());
cls = frame.getClassName();
}
Logger logger = Logger.getLogger(loggerName);
if (reason instanceof Throwable) {
logger.logp(level, cls, method,
reason.getClass().getName(), (Throwable)reason);
} else {
logger.logp(level, cls, method, String.valueOf(reason));
}
}
} catch (SecurityException ex) {
System.err.format((Locale)null, "%s: %s; %s%n",
ToolProvider.class.getName(),
reason,
ex.getLocalizedMessage());
}
return null;
}
private static final String systemJavaCompilerName private static final String systemJavaCompilerName
= "com.sun.tools.javac.api.JavacTool"; = "com.sun.tools.javac.api.JavacTool";
@ -153,7 +107,7 @@ public class ToolProvider {
try { try {
return c.asSubclass(clazz).newInstance(); return c.asSubclass(clazz).newInstance();
} catch (InstantiationException | IllegalAccessException | RuntimeException | Error e) { } catch (InstantiationException | IllegalAccessException | RuntimeException | Error e) {
return trace(WARNING, e); throw new Error(e);
} }
} }
@ -164,7 +118,7 @@ public class ToolProvider {
try { try {
c = Class.forName(name, false, ClassLoader.getSystemClassLoader()); c = Class.forName(name, false, ClassLoader.getSystemClassLoader());
} catch (ClassNotFoundException | RuntimeException | Error e) { } catch (ClassNotFoundException | RuntimeException | Error e) {
return trace(WARNING, e); throw new Error(e);
} }
toolClasses.put(name, new WeakReference<>(c)); toolClasses.put(name, new WeakReference<>(c));
} }