svn commit: r1594060 - /logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java

[ggregory]

Author: ggregory
Date: Mon May 12 19:17:52 2014
New Revision: 1594060

URL: http://svn.apache.org/r1594060
Log:
Rename ivar callerPackageData and API to stackTracePackages. Working toward new 
XML and JSON Serialization and Deserialization.

Modified:
    
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java

Modified: 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java?rev=1594060&r1=1594059&r2=1594060&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
 Mon May 12 19:17:52 2014
@@ -61,7 +61,7 @@ public class ThrowableProxy implements S
 
     private final String name;
 
-    private final StackTracePackageElement[] callerPackageData;
+    private final StackTracePackageElement[] stackTracePackages;
 
     private int commonElementCount;
 
@@ -108,7 +108,7 @@ public class ThrowableProxy implements S
         this.localizedMessage = throwable.getLocalizedMessage();
         final Map<String, CacheEntry> map = new HashMap<String, CacheEntry>();
         final Stack<Class<?>> stack = getCurrentStack();
-        callerPackageData = resolvePackageData(stack, map, null, 
throwable.getStackTrace());
+        stackTracePackages = resolvePackageData(stack, map, null, 
throwable.getStackTrace());
         this.causeProxy = throwable.getCause() == null ? null :
             new ThrowableProxy(throwable, stack, map, throwable.getCause());
         setSuppressed(throwable);
@@ -128,7 +128,7 @@ public class ThrowableProxy implements S
         this.name = cause.getClass().getName();
         this.message = throwable.getMessage();
         this.localizedMessage = throwable.getLocalizedMessage();
-        callerPackageData = resolvePackageData(stack, map, 
parent.getStackTrace(), cause.getStackTrace());
+        stackTracePackages = resolvePackageData(stack, map, 
parent.getStackTrace(), cause.getStackTrace());
         this.causeProxy = cause.getCause() == null ? null :
             new ThrowableProxy(parent, stack, map, cause.getCause());
         setSuppressed(cause);
@@ -171,8 +171,8 @@ public class ThrowableProxy implements S
      * Return the package data associated with the stack trace.
      * @return The package data associated with the stack trace.
      */
-    public StackTracePackageElement[] getPackageData() {
-        return callerPackageData;
+    public StackTracePackageElement[] getStackTracePackages() {
+        return stackTracePackages;
     }
 
     @Override
@@ -202,7 +202,7 @@ public class ThrowableProxy implements S
         }
         sb.append(toString());
         sb.append(EOL);
-        formatElements(sb, 0, throwable.getStackTrace(), callerPackageData, 
packages);
+        formatElements(sb, 0, throwable.getStackTrace(), stackTracePackages, 
packages);
         return sb.toString();
     }
 
@@ -229,7 +229,7 @@ public class ThrowableProxy implements S
             sb.append("Wrapped by: ");
         }
         sb.append(cause).append(EOL);
-        formatElements(sb, cause.commonElementCount, 
cause.getThrowable().getStackTrace(), cause.callerPackageData,
+        formatElements(sb, cause.commonElementCount, 
cause.getThrowable().getStackTrace(), cause.stackTracePackages,
             packages);
     }
 
@@ -253,7 +253,7 @@ public class ThrowableProxy implements S
             sb.append(": ").append(throwable.getMessage());
         }
         sb.append(EOL);
-        formatElements(sb, 0, throwable.getStackTrace(), callerPackageData, 
packages);
+        formatElements(sb, 0, throwable.getStackTrace(), stackTracePackages, 
packages);
         if (causeProxy != null) {
             formatCause(sb, causeProxy, packages);
         }
@@ -279,7 +279,7 @@ public class ThrowableProxy implements S
     @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
     private void formatCause(final StringBuilder sb, final ThrowableProxy 
cause, final List<String> packages) {
         sb.append("Caused by: ").append(cause).append(EOL);
-        formatElements(sb, cause.commonElementCount, 
cause.getThrowable().getStackTrace(), cause.callerPackageData,
+        formatElements(sb, cause.commonElementCount, 
cause.getThrowable().getStackTrace(), cause.stackTracePackages,
             packages);
         if (cause.getCauseProxy() != null) {
             formatCause(sb, cause.causeProxy, packages);