From 25f248669f603c2bbd6ad97f31e0c72ce780f507 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 11 Mar 2015 11:50:58 +0100
Subject: Bug 1134 - LOG AliasedSymbol: Don't issue getAliasedString(), logger
takes care of that, when it logs.
---
src/java/com/jogamp/gluegen/JavaConfiguration.java | 18 +++++++++---------
src/java/com/jogamp/gluegen/JavaEmitter.java | 4 ++--
.../gluegen/procaddress/ProcAddressConfiguration.java | 4 ++--
.../jogamp/gluegen/procaddress/ProcAddressEmitter.java | 10 +++++-----
4 files changed, 18 insertions(+), 18 deletions(-)
(limited to 'src')
diff --git a/src/java/com/jogamp/gluegen/JavaConfiguration.java b/src/java/com/jogamp/gluegen/JavaConfiguration.java
index 987d27a..21ba8d9 100644
--- a/src/java/com/jogamp/gluegen/JavaConfiguration.java
+++ b/src/java/com/jogamp/gluegen/JavaConfiguration.java
@@ -869,7 +869,7 @@ public class JavaConfiguration {
oneInSet(manuallyImplement, aliases)
)
{
- LOG.log(INFO, getASTLocusTag(symbol), "ManuallyImplement: {0}", symbol.getAliasedString());
+ LOG.log(INFO, getASTLocusTag(symbol), "ManuallyImplement: {0}", symbol);
return true;
} else {
return false;
@@ -920,7 +920,7 @@ public class JavaConfiguration {
return null;
}
}
- LOG.log(INFO, getASTLocusTag(symbol), "DelegatedImplementation: {0}", symbol.getAliasedString());
+ LOG.log(INFO, getASTLocusTag(symbol), "DelegatedImplementation: {0} -> {1}", symbol, res);
return res;
}
@@ -961,14 +961,14 @@ public class JavaConfiguration {
oneInSet(extendedIntfSymbolsIgnore, aliases)
)
{
- LOG.log(INFO, getASTLocusTag(symbol), "Ignore Intf ignore (one): {0}", symbol.getAliasedString());
+ LOG.log(INFO, getASTLocusTag(symbol), "Ignore Intf ignore (one): {0}", symbol);
return true;
}
// Simple case-2; the entire symbol (orig and renamed) is _not_ in the not-empty interface only table
if ( !extendedIntfSymbolsOnly.isEmpty() &&
!extendedIntfSymbolsOnly.contains( name ) &&
!oneInSet(extendedIntfSymbolsOnly, aliases) ) {
- LOG.log(INFO, getASTLocusTag(symbol), "Ignore Intf !extended (all): {0}", symbol.getAliasedString());
+ LOG.log(INFO, getASTLocusTag(symbol), "Ignore Intf !extended (all): {0}", symbol);
return true;
}
return shouldIgnoreInImpl_Int(symbol);
@@ -1000,14 +1000,14 @@ public class JavaConfiguration {
oneInSet(extendedImplSymbolsIgnore, aliases)
)
{
- LOG.log(INFO, getASTLocusTag(symbol), "Ignore Impl ignore (one): {0}", symbol.getAliasedString());
+ LOG.log(INFO, getASTLocusTag(symbol), "Ignore Impl ignore (one): {0}", symbol);
return true;
}
// Simple case-2; the entire symbol (orig and renamed) is _not_ in the not-empty interface only table
if ( !extendedImplSymbolsOnly.isEmpty() &&
!extendedImplSymbolsOnly.contains( name ) &&
!oneInSet(extendedImplSymbolsOnly, aliases) ) {
- LOG.log(INFO, getASTLocusTag(symbol), "Ignore Impl !extended (all): {0}", symbol.getAliasedString());
+ LOG.log(INFO, getASTLocusTag(symbol), "Ignore Impl !extended (all): {0}", symbol);
return true;
}
@@ -1016,7 +1016,7 @@ public class JavaConfiguration {
for (final Pattern ignoreRegexp : ignores) {
final Matcher matcher = ignoreRegexp.matcher(name);
if ( matcher.matches() || onePatternMatch(ignoreRegexp, aliases) ) {
- LOG.log(INFO, getASTLocusTag(symbol), "Ignore Impl RegEx: {0}", symbol.getAliasedString());
+ LOG.log(INFO, getASTLocusTag(symbol), "Ignore Impl RegEx: {0}", symbol);
return true;
}
}
@@ -1031,7 +1031,7 @@ public class JavaConfiguration {
// Special case as this is most often likely to be the case.
// Unignores are not used very often.
if(unignores.isEmpty()) {
- LOG.log(INFO, getASTLocusTag(symbol), "Ignore Impl unignores==0: {0} -> {1}", symbol.getAliasedString(), name);
+ LOG.log(INFO, getASTLocusTag(symbol), "Ignore Impl unignores==0: {0} -> {1}", symbol, name);
return true;
}
boolean unignoreFound = false;
@@ -1044,7 +1044,7 @@ public class JavaConfiguration {
}
if (!unignoreFound) {
- LOG.log(INFO, getASTLocusTag(symbol), "Ignore Impl !unignore: {0} -> {1}", symbol.getAliasedString(), name);
+ LOG.log(INFO, getASTLocusTag(symbol), "Ignore Impl !unignore: {0} -> {1}", symbol, name);
return true;
}
}
diff --git a/src/java/com/jogamp/gluegen/JavaEmitter.java b/src/java/com/jogamp/gluegen/JavaEmitter.java
index 2601929..5264531 100644
--- a/src/java/com/jogamp/gluegen/JavaEmitter.java
+++ b/src/java/com/jogamp/gluegen/JavaEmitter.java
@@ -492,7 +492,7 @@ public class JavaEmitter implements GlueEmitter {
// Check to see whether this function should be ignored
if ( !cfg.shouldIgnoreInImpl(cFunc) ) {
methodBindingEmitters.addAll(generateMethodBindingEmitters(methodBindingSet, cFunc));
- LOG.log(INFO, cFunc.getASTLocusTag(), "Non-Ignored Impl[{0}]: {1}", i++, cFunc.getAliasedString());
+ LOG.log(INFO, cFunc.getASTLocusTag(), "Non-Ignored Impl[{0}]: {1}", i++, cFunc);
}
}
@@ -507,7 +507,7 @@ public class JavaEmitter implements GlueEmitter {
if ( !emitter.isInterface() || !cfg.shouldIgnoreInInterface(cFunc) ) {
emitter.emit();
emitter.getDefaultOutput().println(); // put newline after method body
- LOG.log(INFO, cFunc.getASTLocusTag(), "Non-Ignored Intf[{0}]: {1}", i++, cFunc.getAliasedString());
+ LOG.log(INFO, cFunc.getASTLocusTag(), "Non-Ignored Intf[{0}]: {1}", i++, cFunc);
}
} catch (final Exception e) {
throw new GlueGenException(
diff --git a/src/java/com/jogamp/gluegen/procaddress/ProcAddressConfiguration.java b/src/java/com/jogamp/gluegen/procaddress/ProcAddressConfiguration.java
index c10e03b..36d433a 100644
--- a/src/java/com/jogamp/gluegen/procaddress/ProcAddressConfiguration.java
+++ b/src/java/com/jogamp/gluegen/procaddress/ProcAddressConfiguration.java
@@ -279,7 +279,7 @@ public class ProcAddressConfiguration extends JavaConfiguration {
oneInSet(skipProcAddressGen, symbol.getAliasedNames())
)
{
- LOG.log(INFO, symbol.getASTLocusTag(), "Skip ProcAddress: {0}", symbol.getAliasedString());
+ LOG.log(INFO, symbol.getASTLocusTag(), "Skip ProcAddress: {0}", symbol);
return true;
}
return false;
@@ -323,7 +323,7 @@ public class ProcAddressConfiguration extends JavaConfiguration {
oneInSet(forceProcAddressGenSet, symbol.getAliasedNames())
)
{
- LOG.log(INFO, symbol.getASTLocusTag(), "Force ProcAddress: {0}", symbol.getAliasedString());
+ LOG.log(INFO, symbol.getASTLocusTag(), "Force ProcAddress: {0}", symbol);
return true;
}
return false;
diff --git a/src/java/com/jogamp/gluegen/procaddress/ProcAddressEmitter.java b/src/java/com/jogamp/gluegen/procaddress/ProcAddressEmitter.java
index 25e5a66..423efe9 100644
--- a/src/java/com/jogamp/gluegen/procaddress/ProcAddressEmitter.java
+++ b/src/java/com/jogamp/gluegen/procaddress/ProcAddressEmitter.java
@@ -134,7 +134,7 @@ public class ProcAddressEmitter extends JavaEmitter {
// honor that (for example, the superclass might have caught an Ignore
// direction that matched the symbol's name).
if (defaultEmitters.isEmpty()) {
- LOG.log(Level.INFO, sym.getASTLocusTag(), "genModProcAddrEmitter: SKIP, empty binding set: {0}", sym.getAliasedString());
+ LOG.log(Level.INFO, sym.getASTLocusTag(), "genModProcAddrEmitter: SKIP, empty binding set: {0}", sym);
return defaultEmitters;
}
@@ -144,7 +144,7 @@ public class ProcAddressEmitter extends JavaEmitter {
// Don't do anything special if this symbol doesn't require modifications
if( !callThroughProcAddress || isUnimplemented ) {
LOG.log(Level.INFO, sym.getASTLocusTag(), "genModProcAddrEmitter: SKIP, not needed: callThrough {0}, isUnimplemented {1}: {2}",
- callThroughProcAddress, isUnimplemented, sym.getAliasedString());
+ callThroughProcAddress, isUnimplemented, sym);
return defaultEmitters;
}
@@ -248,7 +248,7 @@ public class ProcAddressEmitter extends JavaEmitter {
final String localProcCallingConvention = getProcAddressConfig().getLocalProcAddressCallingConvention(cSymbol);
LOG.log(Level.INFO, cSymbol.getASTLocusTag(), "genModProcAddrEmitter: callThrough {0}, hasTypedef {1}, localCallConv {2}: {3}",
- callThroughProcAddress, hasProcAddrTypedef, localProcCallingConvention, cSymbol.getAliasedString());
+ callThroughProcAddress, hasProcAddrTypedef, localProcCallingConvention, cSymbol);
// Note that we don't care much about the naming of the C argument
// variables so to keep things simple we ignore the buffer object
@@ -291,13 +291,13 @@ public class ProcAddressEmitter extends JavaEmitter {
mode = 3;
}
}
- LOG.log(Level.INFO, sym.getASTLocusTag(), "callThroughProcAddress: {0} [m {1}]: {2}", res, mode, sym.getAliasedString());
+ LOG.log(Level.INFO, sym.getASTLocusTag(), "callThroughProcAddress: {0} [m {1}]: {2}", res, mode, sym);
return res;
}
protected boolean hasFunctionPointerTypedef(final FunctionSymbol sym) {
final String funcPointerTypedefName = getFunctionPointerTypedefName(sym);
final boolean res = typedefDictionary.containsKey(funcPointerTypedefName);
- LOG.log(Level.INFO, sym.getASTLocusTag(), "hasFunctionPointerTypedef: {0}: {1}", res, sym.getAliasedString());
+ LOG.log(Level.INFO, sym.getASTLocusTag(), "hasFunctionPointerTypedef: {0}: {1}", res, sym);
return res;
}
--
cgit v1.2.3