Author: onealj
Date: Wed Sep 21 02:45:39 2016
New Revision: 1761665
URL: http://svn.apache.org/viewvc?rev=1761665&view=rev
Log:
bug 59933: demote accessibility of POILogger implementations of log(int,
Object) and log(int, Object, Throwable) to be consistent with the POILogger
abstract class
Modified:
poi/trunk/src/java/org/apache/poi/util/CommonsLogger.java
poi/trunk/src/java/org/apache/poi/util/NullLogger.java
poi/trunk/src/java/org/apache/poi/util/POILogger.java
poi/trunk/src/java/org/apache/poi/util/SystemOutLogger.java
poi/trunk/src/testcases/org/apache/poi/util/DummyPOILogger.java
poi/trunk/src/testcases/org/apache/poi/util/TestPOILogger.java
Modified: poi/trunk/src/java/org/apache/poi/util/CommonsLogger.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/util/CommonsLogger.java?rev=1761665&r1=1761664&r2=1761665&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/util/CommonsLogger.java (original)
+++ poi/trunk/src/java/org/apache/poi/util/CommonsLogger.java Wed Sep 21
02:45:39 2016
@@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFac
*/
public class CommonsLogger extends POILogger
{
- private static LogFactory _creator = LogFactory.getFactory();
+ private static final LogFactory _creator = LogFactory.getFactory();
private Log log = null;
@Override
@@ -46,8 +46,10 @@ public class CommonsLogger extends POILo
* @param obj1 The object to log.
*/
@Override
- public void log(final int level, final Object obj1)
+ protected void log(final int level, final Object obj1)
{
+ // FIXME: What happens if level is in between two levels (an even
number)?
+ // Should this be `if (level >= FATAL) ...`?
if(level==FATAL)
{
if(log.isFatalEnabled())
@@ -100,9 +102,11 @@ public class CommonsLogger extends POILo
* @param exception An exception to be logged
*/
@Override
- public void log(final int level, final Object obj1,
+ protected void log(final int level, final Object obj1,
final Throwable exception)
{
+ // FIXME: What happens if level is in between two levels (an even
number)?
+ // Should this be `if (level >= FATAL) ...`?
if(level==FATAL)
{
if(log.isFatalEnabled())
@@ -174,6 +178,8 @@ public class CommonsLogger extends POILo
@Override
public boolean check(final int level)
{
+ // FIXME: What happens if level is in between two levels (an even
number)?
+ // Should this be `if (level >= FATAL) ...`?
if(level==FATAL)
{
if(log.isFatalEnabled())
Modified: poi/trunk/src/java/org/apache/poi/util/NullLogger.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/util/NullLogger.java?rev=1761665&r1=1761664&r2=1761665&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/util/NullLogger.java (original)
+++ poi/trunk/src/java/org/apache/poi/util/NullLogger.java Wed Sep 21 02:45:39
2016
@@ -38,7 +38,7 @@ public class NullLogger extends POILogge
*/
@Override
- protected void log(final int level, final Object obj1) {
+ protected void _log(final int level, final Object obj1) {
// do nothing
}
@@ -50,7 +50,7 @@ public class NullLogger extends POILogge
* @param exception An exception to be logged
*/
@Override
- protected void log(int level, Object obj1, final Throwable exception) {
+ protected void _log(int level, Object obj1, final Throwable exception) {
// do nothing
}
Modified: poi/trunk/src/java/org/apache/poi/util/POILogger.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/util/POILogger.java?rev=1761665&r1=1761664&r2=1761665&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/util/POILogger.java (original)
+++ poi/trunk/src/java/org/apache/poi/util/POILogger.java Wed Sep 21 02:45:39
2016
@@ -54,7 +54,7 @@ public abstract class POILogger {
* @param level One of DEBUG, INFO, WARN, ERROR, FATAL
* @param obj1 The object to log. This is converted to a string.
*/
- abstract protected void log(int level, Object obj1);
+ abstract protected void _log(int level, Object obj1);
/**
* Log a message
@@ -63,7 +63,7 @@ public abstract class POILogger {
* @param obj1 The object to log. This is converted to a string.
* @param exception An exception to be logged
*/
- abstract protected void log(int level, Object obj1, final Throwable
exception);
+ abstract protected void _log(int level, Object obj1, final Throwable
exception);
/**
@@ -107,9 +107,9 @@ public abstract class POILogger {
// somehow this ambiguity works and doesn't lead to a loop,
// but it's confusing ...
if (lastEx == null) {
- log(level, msg);
+ _log(level, msg);
} else {
- log(level, msg, lastEx);
+ _log(level, msg, lastEx);
}
}
}
Modified: poi/trunk/src/java/org/apache/poi/util/SystemOutLogger.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/util/SystemOutLogger.java?rev=1761665&r1=1761664&r2=1761665&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/util/SystemOutLogger.java (original)
+++ poi/trunk/src/java/org/apache/poi/util/SystemOutLogger.java Wed Sep 21
02:45:39 2016
@@ -42,9 +42,9 @@ public class SystemOutLogger extends POI
* @param obj1 The object to log.
*/
@Override
- public void log(final int level, final Object obj1)
+ protected void _log(final int level, final Object obj1)
{
- log(level, obj1, null);
+ _log(level, obj1, null);
}
/**
@@ -56,7 +56,7 @@ public class SystemOutLogger extends POI
*/
@Override
@SuppressForbidden("uses printStackTrace")
- public void log(final int level, final Object obj1,
+ protected void _log(final int level, final Object obj1,
final Throwable exception) {
if (check(level)) {
System.out.println("[" + _cat + "]" +
LEVEL_STRINGS_SHORT[Math.min(LEVEL_STRINGS_SHORT.length-1, level)] + " " +
obj1);
Modified: poi/trunk/src/testcases/org/apache/poi/util/DummyPOILogger.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/DummyPOILogger.java?rev=1761665&r1=1761664&r2=1761665&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/util/DummyPOILogger.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/DummyPOILogger.java Wed Sep 21
02:45:39 2016
@@ -23,6 +23,7 @@ import java.util.List;
* POILogger which logs into an ArrayList, so that
* tests can see what got logged
*/
+@Internal
public class DummyPOILogger extends POILogger {
public List<String>logged = new ArrayList<String>();
@@ -39,12 +40,12 @@ public class DummyPOILogger extends POIL
public void initialize(String cat) {}
@Override
- public void log(int level, Object obj1) {
+ protected void _log(int level, Object obj1) {
logged.add(level + " - " + obj1);
}
@Override
- public void log(int level, Object obj1, Throwable exception) {
+ protected void _log(int level, Object obj1, Throwable exception) {
logged.add(level + " - " + obj1 + " - " + exception);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestPOILogger.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestPOILogger.java?rev=1761665&r1=1761664&r2=1761665&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/util/TestPOILogger.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestPOILogger.java Wed Sep 21
02:45:39 2016
@@ -65,13 +65,13 @@ public final class TestPOILogger extends
}
@Override
- public void log(int level, Object obj1) {
+ protected void _log(int level, Object obj1) {
lastLog = (obj1 == null) ? "" : obj1.toString();
lastEx = null;
}
@Override
- public void log(int level, Object obj1, Throwable exception) {
+ protected void _log(int level, Object obj1, Throwable exception) {
lastLog = (obj1 == null) ? "" : obj1.toString();
lastEx = exception;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
