Repository: logging-log4j2 Updated Branches: refs/heads/master e31adf7a6 -> 28bb99a7c
Sort methods. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/28bb99a7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/28bb99a7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/28bb99a7 Branch: refs/heads/master Commit: 28bb99a7c337a687362f83ebe2e11fc402dd2ab4 Parents: e31adf7 Author: ggregory <[email protected]> Authored: Mon Jun 22 11:44:53 2015 -0700 Committer: ggregory <[email protected]> Committed: Mon Jun 22 11:44:53 2015 -0700 ---------------------------------------------------------------------- .../org/apache/logging/slf4j/Log4jMarker.java | 36 ++++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/28bb99a7/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java ---------------------------------------------------------------------- diff --git a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java index 0e05d6e..a146ee9 100644 --- a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java +++ b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java @@ -44,10 +44,6 @@ public class Log4jMarker implements Marker { this.marker = marker; } - public org.apache.logging.log4j.Marker getLog4jMarker() { - return marker; - } - @Override public void add(final Marker marker) { if (marker == null) { @@ -58,22 +54,34 @@ public class Log4jMarker implements Marker { } @Override - public boolean remove(final Marker marker) { - return marker != null ? this.marker.remove(MarkerManager.getMarker(marker.getName())) : false; + public boolean contains(final org.slf4j.Marker marker) { + if (marker == null) { + throw new IllegalArgumentException(); + } + return this.marker.isInstanceOf(marker.getName()); } @Override + public boolean contains(final String s) { + return s != null ? this.marker.isInstanceOf(s) : false; + } + + public org.apache.logging.log4j.Marker getLog4jMarker() { + return marker; + } + + @Override public String getName() { return marker.getName(); } @Override - public boolean hasReferences() { + public boolean hasChildren() { return marker.hasParents(); } @Override - public boolean hasChildren() { + public boolean hasReferences() { return marker.hasParents(); } @@ -88,15 +96,7 @@ public class Log4jMarker implements Marker { } @Override - public boolean contains(final org.slf4j.Marker marker) { - if (marker == null) { - throw new IllegalArgumentException(); - } - return this.marker.isInstanceOf(marker.getName()); - } - - @Override - public boolean contains(final String s) { - return s != null ? this.marker.isInstanceOf(s) : false; + public boolean remove(final Marker marker) { + return marker != null ? this.marker.remove(MarkerManager.getMarker(marker.getName())) : false; } }
