Author: carnold
Date: Fri Apr 27 12:53:22 2007
New Revision: 533199
URL: http://svn.apache.org/viewvc?view=rev&rev=533199
Log:
Bug 42283: Eclipse compiler warning cleanup
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/Compare.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/ControlFilter.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/ISO8601Filter.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/RelativeTimeFilter.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/Transformer.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/UnexpectedFormatException.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/XMLLineAttributeFilter.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/XMLTimestampFilter.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/CustomLevelTestCase.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XLevel.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/Compare.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/Compare.java?view=diff&rev=533199&r1=533198&r2=533199
==============================================================================
---
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/Compare.java
(original)
+++
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/Compare.java
Fri Apr 27 12:53:22 2007
@@ -17,11 +17,9 @@
package org.apache.log4j.util;
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.FileReader;
import java.io.BufferedReader;
import java.io.FileNotFoundException;
+import java.io.FileReader;
import java.io.IOException;
public class Compare {
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/ControlFilter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/ControlFilter.java?view=diff&rev=533199&r1=533198&r2=533199
==============================================================================
---
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/ControlFilter.java
(original)
+++
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/ControlFilter.java
Fri Apr 27 12:53:22 2007
@@ -17,8 +17,6 @@
package org.apache.log4j.util;
-import java.io.*;
-
import org.apache.oro.text.perl.Perl5Util;
public class ControlFilter implements Filter {
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/ISO8601Filter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/ISO8601Filter.java?view=diff&rev=533199&r1=533198&r2=533199
==============================================================================
---
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/ISO8601Filter.java
(original)
+++
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/ISO8601Filter.java
Fri Apr 27 12:53:22 2007
@@ -17,8 +17,6 @@
package org.apache.log4j.util;
-import java.io.*;
-
import org.apache.oro.text.perl.Perl5Util;
public class ISO8601Filter implements Filter {
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/RelativeTimeFilter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/RelativeTimeFilter.java?view=diff&rev=533199&r1=533198&r2=533199
==============================================================================
---
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/RelativeTimeFilter.java
(original)
+++
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/RelativeTimeFilter.java
Fri Apr 27 12:53:22 2007
@@ -17,8 +17,6 @@
package org.apache.log4j.util;
-import java.io.*;
-
import org.apache.oro.text.perl.Perl5Util;
public class RelativeTimeFilter implements Filter {
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/Transformer.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/Transformer.java?view=diff&rev=533199&r1=533198&r2=533199
==============================================================================
---
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/Transformer.java
(original)
+++
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/Transformer.java
Fri Apr 27 12:53:22 2007
@@ -17,19 +17,20 @@
package org.apache.log4j.util;
-import java.io.*;
-
-import org.apache.oro.text.perl.Perl5Util;
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintStream;
public class Transformer {
public
static
- void transform(String in, String out, Filter[] filters) throws
FileNotFoundException,
- IOException,
+ void transform(String in, String out, Filter[] filters) throws IOException,
UnexpectedFormatException {
- Perl5Util util = new Perl5Util();
String line;
BufferedReader input = new BufferedReader(new FileReader(in));
PrintStream output = new PrintStream(new FileOutputStream(out, false));
@@ -50,11 +51,9 @@
public
static
- void transform(String in, String out, Filter filter) throws
FileNotFoundException,
- IOException,
+ void transform(String in, String out, Filter filter) throws IOException,
UnexpectedFormatException {
- Perl5Util util = new Perl5Util();
String line;
BufferedReader input = new BufferedReader(new FileReader(in));
PrintStream output = new PrintStream(new FileOutputStream(out));
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/UnexpectedFormatException.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/UnexpectedFormatException.java?view=diff&rev=533199&r1=533198&r2=533199
==============================================================================
---
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/UnexpectedFormatException.java
(original)
+++
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/UnexpectedFormatException.java
Fri Apr 27 12:53:22 2007
@@ -18,6 +18,7 @@
package org.apache.log4j.util;
public class UnexpectedFormatException extends Exception {
+ private static final long serialVersionUID = 1787725660780924147L;
public UnexpectedFormatException(String msg) {
super(msg);
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/XMLLineAttributeFilter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/XMLLineAttributeFilter.java?view=diff&rev=533199&r1=533198&r2=533199
==============================================================================
---
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/XMLLineAttributeFilter.java
(original)
+++
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/XMLLineAttributeFilter.java
Fri Apr 27 12:53:22 2007
@@ -17,8 +17,6 @@
package org.apache.log4j.util;
-import java.io.*;
-
import org.apache.oro.text.perl.Perl5Util;
public class XMLLineAttributeFilter implements Filter {
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/XMLTimestampFilter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/XMLTimestampFilter.java?view=diff&rev=533199&r1=533198&r2=533199
==============================================================================
---
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/XMLTimestampFilter.java
(original)
+++
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/XMLTimestampFilter.java
Fri Apr 27 12:53:22 2007
@@ -17,8 +17,6 @@
package org.apache.log4j.util;
-import java.io.*;
-
import org.apache.oro.text.perl.Perl5Util;
public class XMLTimestampFilter implements Filter {
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/CustomLevelTestCase.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/CustomLevelTestCase.java?view=diff&rev=533199&r1=533198&r2=533199
==============================================================================
---
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/CustomLevelTestCase.java
(original)
+++
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/CustomLevelTestCase.java
Fri Apr 27 12:53:22 2007
@@ -17,17 +17,10 @@
package org.apache.log4j.xml;
+import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.framework.Test;
-
import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
-import org.apache.log4j.util.Filter;
-import org.apache.log4j.util.LineNumberFilter;
-import org.apache.log4j.util.ControlFilter;
-import org.apache.log4j.util.ISO8601Filter;
-import org.apache.log4j.util.Transformer;
import org.apache.log4j.util.Compare;
public class CustomLevelTestCase extends TestCase {
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XLevel.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XLevel.java?view=diff&rev=533199&r1=533198&r2=533199
==============================================================================
---
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XLevel.java
(original)
+++
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XLevel.java
Fri Apr 27 12:53:22 2007
@@ -18,7 +18,6 @@
package org.apache.log4j.xml;
import org.apache.log4j.Level;
-import org.apache.log4j.Priority;
/**
@@ -27,6 +26,7 @@
*/
public class XLevel extends Level {
+ private static final long serialVersionUID = 7288304330257085144L;
static public final int TRACE_INT = Level.DEBUG_INT - 1;
static public final int LETHAL_INT = Level.FATAL_INT + 1;
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java?view=diff&rev=533199&r1=533198&r2=533199
==============================================================================
---
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java
(original)
+++
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java
Fri Apr 27 12:53:22 2007
@@ -17,23 +17,20 @@
package org.apache.log4j.xml;
+import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.framework.Test;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
import org.apache.log4j.FileAppender;
-import org.apache.log4j.xml.XMLLayout;
-import org.apache.log4j.util.Filter;
-import org.apache.log4j.util.ControlFilter;
-import org.apache.log4j.util.XMLTimestampFilter;
-import org.apache.log4j.util.XMLLineAttributeFilter;
-import org.apache.log4j.util.LineNumberFilter;
-import org.apache.log4j.util.Transformer;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
import org.apache.log4j.util.Compare;
+import org.apache.log4j.util.Filter;
import org.apache.log4j.util.JunitTestRunnerFilter;
+import org.apache.log4j.util.LineNumberFilter;
import org.apache.log4j.util.SunReflectFilter;
+import org.apache.log4j.util.Transformer;
+import org.apache.log4j.util.XMLLineAttributeFilter;
+import org.apache.log4j.util.XMLTimestampFilter;
public class XMLLayoutTestCase extends TestCase {
@@ -148,7 +145,7 @@
int i = -1;
- X x = new X();
+ new X();
logger.trace("Message " + ++i);
root.trace("Message " + i);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
