Author: skitching
Date: Sun May 22 18:04:54 2005
New Revision: 177071
URL: http://svn.apache.org/viewcvs?rev=177071&view=rev
Log:
Fix javadoc and fix java1.5 compile warnings.
Modified:
jakarta/commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogFactory.java
jakarta/commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
jakarta/commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/SimpleLog.java
Modified:
jakarta/commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogFactory.java?rev=177071&r1=177070&r2=177071&view=diff
==============================================================================
---
jakarta/commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogFactory.java
(original)
+++
jakarta/commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogFactory.java
Sun May 22 18:04:54 2005
@@ -729,11 +729,13 @@
try {
// Are we running on a JDK 1.2 or later system?
- Method method = Thread.class.getMethod("getContextClassLoader",
null);
+ Method method = Thread.class.getMethod("getContextClassLoader",
+ (Class[]) null);
// Get the thread context class loader (if there is one)
try {
- classLoader =
(ClassLoader)method.invoke(Thread.currentThread(), null);
+ classLoader =
(ClassLoader)method.invoke(Thread.currentThread(),
+ (Object[]) null);
} catch (IllegalAccessException e) {
throw new LogConfigurationException
("Unexpected IllegalAccessException", e);
@@ -915,7 +917,7 @@
* @param factoryClass
* @param classLoader
*
- * @returns either a LogFactory object or a LogConfigurationException
object.
+ * @return either a LogFactory object or a LogConfigurationException
object.
*/
protected static Object createFactory(String factoryClass, ClassLoader
classLoader) {
@@ -1215,7 +1217,7 @@
* the specified object's class has overidden the toString method.
*
* @param o may be null.
- * @return
+ * @return a string of form [EMAIL PROTECTED], or "null" if param o is
null.
*/
public static String objectId(Object o) {
if (o == null) {
Modified:
jakarta/commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java?rev=177071&r1=177070&r2=177071&view=diff
==============================================================================
---
jakarta/commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
(original)
+++
jakarta/commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
Sun May 22 18:04:54 2005
@@ -660,7 +660,7 @@
loadClass("java.util.logging.Logger");
loadClass("org.apache.commons.logging.impl.Jdk14Logger");
Class throwable = loadClass("java.lang.Throwable");
- if (throwable.getDeclaredMethod("getStackTrace", null) == null) {
+ if (throwable.getDeclaredMethod("getStackTrace", (Class[]) null)
== null) {
return (false);
}
logDiagnostic("Found Jdk14.");
Modified:
jakarta/commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/SimpleLog.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/SimpleLog.java?rev=177071&r1=177070&r2=177071&view=diff
==============================================================================
---
jakarta/commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/SimpleLog.java
(original)
+++
jakarta/commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/SimpleLog.java
Sun May 22 18:04:54 2005
@@ -586,11 +586,13 @@
if (classLoader == null) {
try {
// Are we running on a JDK 1.2 or later system?
- Method method =
Thread.class.getMethod("getContextClassLoader", null);
+ Method method = Thread.class.getMethod("getContextClassLoader",
+ (Class[]) null);
// Get the thread context class loader (if there is one)
try {
- classLoader =
(ClassLoader)method.invoke(Thread.currentThread(), null);
+ classLoader =
(ClassLoader)method.invoke(Thread.currentThread(),
+ (Class[]) null);
} catch (IllegalAccessException e) {
; // ignore
} catch (InvocationTargetException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
