You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2015/01/12 09:53:08 UTC
[11/18] logging-log4j2 git commit: removed FormattingInfo (because it
is now internal to the PatternConverter)
removed FormattingInfo (because it is now internal to the
PatternConverter)
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2b5e4ba1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2b5e4ba1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2b5e4ba1
Branch: refs/heads/LOG4J2-930
Commit: 2b5e4ba1a7fe838161e8402fe7383913367db67d
Parents: ad38f0d
Author: rpopma <rp...@apache.org>
Authored: Mon Jan 12 17:37:09 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Mon Jan 12 17:37:09 2015 +0900
----------------------------------------------------------------------
.../log4j/core/pattern/PatternFormatter.java | 152 +++++++++----------
1 file changed, 75 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2b5e4ba1/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternFormatter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternFormatter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternFormatter.java
index 014a1ed..fb03f6d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternFormatter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternFormatter.java
@@ -1,77 +1,75 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.core.pattern;
-
-import org.apache.logging.log4j.core.LogEvent;
-
-
-/**
- *
- */
-public class PatternFormatter {
- private final LogEventPatternConverter converter;
- private final FormattingInfo field;
-
- public PatternFormatter(final LogEventPatternConverter converter, final FormattingInfo field) {
- this.converter = converter;
- this.field = field;
- }
-
- public void format(final LogEvent event, final StringBuilder buf) {
- final int startField = buf.length();
- converter.format(event, buf);
- field.format(startField, buf);
- }
-
- public LogEventPatternConverter getConverter() {
- return converter;
- }
-
- public FormattingInfo getFormattingInfo() {
- return field;
- }
-
- /**
- * Normally pattern formatters are not meant to handle Exceptions although few pattern formatters might.
- * <p>
- * By examining the return values for this method, the containing layout will determine whether it handles
- * throwables or not.
- * </p>
- *
- * @return true if this PatternConverter handles throwables
- */
- public boolean handlesThrowable() {
- return converter.handlesThrowable();
- }
-
- /**
- * Returns a String suitable for debugging.
- *
- * @return a String suitable for debugging.
- */
- @Override
- public String toString() {
- final StringBuilder sb = new StringBuilder();
- sb.append(super.toString());
- sb.append("[converter=");
- sb.append(converter);
- sb.append(", field=");
- sb.append(field);
- sb.append(']');
- return sb.toString();
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.core.pattern;
+
+import java.nio.charset.Charset;
+
+import org.apache.logging.log4j.core.LogEvent;
+
+
+/**
+ *
+ */
+public class PatternFormatter {
+ private final LogEventPatternConverter converter;
+
+ public PatternFormatter(final LogEventPatternConverter converter) {
+ this.converter = converter;
+ }
+
+ public void format(final LogEvent event, final TextBuffer buf) {
+ converter.format(event, buf);
+ }
+
+ public void format(final LogEvent event, final BinaryBuffer buf, Charset charset) {
+ converter.format(event, buf, charset);
+ }
+
+ public LogEventPatternConverter getConverter() {
+ return converter;
+ }
+
+ /**
+ * Normally pattern formatters are not meant to handle Exceptions although few pattern formatters might.
+ * <p>
+ * By examining the return values for this method, the containing layout will determine whether it handles
+ * throwables or not.
+ * </p>
+ *
+ * @return true if this PatternConverter handles throwables
+ */
+ public boolean handlesThrowable() {
+ return converter.handlesThrowable();
+ }
+
+ /**
+ * Returns a String suitable for debugging.
+ *
+ * @return a String suitable for debugging.
+ */
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append(super.toString());
+ sb.append("[converter=");
+ sb.append(converter);
+// sb.append(", field=");
+// sb.append(field);
+ sb.append(']');
+ return sb.toString();
+ }
+}