Bug 1134 - Logging's formatter now takes care of Type -> getDebugString() when desired, not at 'log' call

Removes load to assemble the getDebugString() of Type and JavaType
when invoking log function. Note: the log may be skipped if log-level is not reached.

1 files changed, 13 insertions, 0 deletions

diff --git a/src/java/com/jogamp/gluegen/Logging.java b/src/java/com/jogamp/gluegen/Logging.java
index f1ba39b..f57c485 100644
--- a/src/java/com/jogamp/gluegen/Logging.java
+++ b/src/java/com/jogamp/gluegen/Logging.java
@@ -41,6 +41,7 @@ import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
 import com.jogamp.common.util.PropertyAccess;
+import com.jogamp.gluegen.cgram.types.Type;
 
 /**
  *
@@ -224,6 +225,18 @@ public class Logging {
         public void setASTLocusTag(final ASTLocusTag loc) { astLocus = loc; }
         @Override
         public String format(final LogRecord record) {
+            // Replace [Type, JavaType] -> its debug string!
+            final Object[] params = record.getParameters();
+            if( null != params ) {
+                for(int i=params.length-1; 0<=i; i--) {
+                    final Object o = params[i];
+                    if( o instanceof Type ) {
+                        params[i] = ((Type)o).getDebugString();
+                    } else if( o instanceof JavaType ) {
+                        params[i] = ((JavaType)o).getDebugString();
+                    }
+                }
+            }
             final StringBuilder sb = new StringBuilder(256);
             if( null != astLocus ) {
                 astLocus.toString(sb, getCanonicalName(record.getLevel())).append(": ");