merged truncate feature from extras to trunk

grobmeier · grobmeier · commit 07576bfa83e1 · 2013-05-13T10:40:20.000Z
git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/trunk@1481783 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -21,6 +21,7 @@
   </properties>
   <body>
     <release version="1.2.18" date="2012-??-??" description="Maintenance release">    
+       <action action="update" dev="grobmeier">Merged truncate feature to FormattingInfo from extras</action>
        <action issue="54845" action="fix" dev="ggregory" due-to="Robert Balent">Typo in log4j 1.2 manual</action>
        <action issue="53299" action="update" dev="grobmeier">Simplify log4j build</action>
        <action issue="44370" action="fix" dev="grobmeier">MANIFEST.MF broken in log4j-1.2.15.jar</action>
diff --git a/src/main/java/org/apache/log4j/pattern/FormattingInfo.java b/src/main/java/org/apache/log4j/pattern/FormattingInfo.java
@@ -56,17 +56,46 @@ public final class FormattingInfo {
    */
   private final boolean leftAlign;
 
+  /**
+   * Right truncation.
+   * @since 1.2.17
+   */
+  private final boolean rightTruncate;
+
   /**
    * Creates new instance.
    * @param leftAlign left align if true.
    * @param minLength minimum length.
    * @param maxLength maximum length.
+   * @deprecated since 1.2.17
    */
   public FormattingInfo(
-    final boolean leftAlign, final int minLength, final int maxLength) {
+    final boolean leftAlign, 
+    final int minLength, 
+    final int maxLength) {
     this.leftAlign = leftAlign;
     this.minLength = minLength;
     this.maxLength = maxLength;
+    this.rightTruncate = false;
+  }
+
+  /**
+   * Creates new instance.
+   * @param leftAlign left align if true.
+   * @param rightTruncate right truncate if true.
+   * @param minLength minimum length.
+   * @param maxLength maximum length.
+   * @since 1.2.17
+   */
+  public FormattingInfo(
+    final boolean leftAlign, 
+    final boolean rightTruncate,
+    final int minLength, 
+    final int maxLength) {
+    this.leftAlign = leftAlign;
+    this.minLength = minLength;
+    this.maxLength = maxLength;
+    this.rightTruncate = rightTruncate;
   }
 
   /**
@@ -85,6 +114,15 @@ public boolean isLeftAligned() {
     return leftAlign;
   }
 
+  /**
+   * Determine if right truncated.
+   * @return true if right truncated.
+   * @since 1.2.17
+   */
+  public boolean isRightTruncated() {
+    return rightTruncate;
+  }
+
   /**
    * Get minimum length.
    * @return minimum length.
@@ -111,7 +149,11 @@ public void format(final int fieldStart, final StringBuffer buffer) {
     final int rawLength = buffer.length() - fieldStart;
 
     if (rawLength > maxLength) {
-      buffer.delete(fieldStart, buffer.length() - maxLength);
+      if(rightTruncate) {
+         buffer.setLength(fieldStart + maxLength);
+      } else {
+         buffer.delete(fieldStart, buffer.length() - maxLength);
+      }
     } else if (rawLength < minLength) {
       if (leftAlign) {
         final int fieldEnd = buffer.length();
diff --git a/src/main/java/org/apache/log4j/pattern/PatternParser.java b/src/main/java/org/apache/log4j/pattern/PatternParser.java
@@ -304,11 +304,22 @@ public static void parse(
         case '-':
           formattingInfo =
             new FormattingInfo(
-              true, formattingInfo.getMinLength(),
+              true, 
+              formattingInfo.isRightTruncated(),
+              formattingInfo.getMinLength(),
               formattingInfo.getMaxLength());
+          break;
 
+        case '!':
+          formattingInfo =
+            new FormattingInfo(
+              formattingInfo.isLeftAligned(), 
+              true,
+              formattingInfo.getMinLength(),
+              formattingInfo.getMaxLength());
           break;
 
+
         case '.':
           state = DOT_STATE;
 
@@ -319,7 +330,9 @@ public static void parse(
           if ((c >= '0') && (c <= '9')) {
             formattingInfo =
               new FormattingInfo(
-                formattingInfo.isLeftAligned(), c - '0',
+                formattingInfo.isLeftAligned(), 
+                formattingInfo.isRightTruncated(),
+                c - '0',
                 formattingInfo.getMaxLength());
             state = MIN_STATE;
           } else {
@@ -343,6 +356,7 @@ public static void parse(
           formattingInfo =
             new FormattingInfo(
               formattingInfo.isLeftAligned(),
+              formattingInfo.isRightTruncated(),
               (formattingInfo.getMinLength() * 10) + (c - '0'),
               formattingInfo.getMaxLength());
         } else if (c == '.') {
@@ -364,7 +378,9 @@ public static void parse(
         if ((c >= '0') && (c <= '9')) {
           formattingInfo =
             new FormattingInfo(
-              formattingInfo.isLeftAligned(), formattingInfo.getMinLength(),
+              formattingInfo.isLeftAligned(), 
+              formattingInfo.isRightTruncated(),
+              formattingInfo.getMinLength(),
               c - '0');
           state = MAX_STATE;
         } else {
@@ -383,7 +399,9 @@ public static void parse(
         if ((c >= '0') && (c <= '9')) {
           formattingInfo =
             new FormattingInfo(
-              formattingInfo.isLeftAligned(), formattingInfo.getMinLength(),
+              formattingInfo.isLeftAligned(), 
+              formattingInfo.isRightTruncated(),
+              formattingInfo.getMinLength(),
               (formattingInfo.getMaxLength() * 10) + (c - '0'));
         } else {
           i = finalizeConverter(
