2 new revisions: Revision: 876312c873fa Branch: default Author: Michael Whapples Date: Wed Jul 16 08:12:31 2014 UTCLog: Register the callback for liblouis as well as liblouisutdml and use lo...
http://code.google.com/p/brailleblaster/source/detail?r=876312c873fa Revision: 549f3624510d Branch: default Author: Michael Whapples Date: Wed Jul 16 08:15:35 2014 UTC Log: Merge http://code.google.com/p/brailleblaster/source/detail?r=549f3624510d ============================================================================== Revision: 876312c873fa Branch: default Author: Michael Whapples Date: Wed Jul 16 08:12:31 2014 UTCLog: Register the callback for liblouis as well as liblouisutdml and use logger org.brailleblaster.louisutdml
http://code.google.com/p/brailleblaster/source/detail?r=876312c873fa Modified: /src/main/org/brailleblaster/BBIni.java /src/main/org/brailleblaster/louisutdml/LogHandler.java ======================================= --- /src/main/org/brailleblaster/BBIni.java Tue Jul 15 13:30:29 2014 UTC +++ /src/main/org/brailleblaster/BBIni.java Wed Jul 16 08:12:31 2014 UTC @@ -48,6 +48,7 @@ import org.brailleblaster.util.FileUtils; import org.brailleblaster.util.PropertyFileManager; import org.eclipse.swt.SWT; +import org.liblouis.LibLouis; import org.liblouis.LibLouisUTDML; import org.liblouis.LogLevel; @@ -258,7 +259,9 @@ try { LibLouisUTDML.loadLibrary(nativeLibraryPath, nativeLibrarySuffix); // LibLouisUTDML.getInstance().setLogLevel(LogLevel.ERROR);- LibLouisUTDML.getInstance().registerLogCallback(new org.brailleblaster.louisutdml.LogHandler(logger)); + org.brailleblaster.louisutdml.LogHandler louisutdmlLogHandler = new org.brailleblaster.louisutdml.LogHandler();
+ LibLouis.getInstance().registerLogCallback(louisutdmlLogHandler); + LibLouisUTDML.getInstance().registerLogCallback(louisutdmlLogHandler);LibLouisUTDML.initialize(programDataPath, tempFilesPath, "liblouisutdml.log");
hLiblouisutdml = true; } =======================================--- /src/main/org/brailleblaster/louisutdml/LogHandler.java Tue Jul 15 13:30:29 2014 UTC +++ /src/main/org/brailleblaster/louisutdml/LogHandler.java Wed Jul 16 08:12:31 2014 UTC
@@ -21,8 +21,8 @@ LEVEL_MAPPINGS.put(LogLevel.ALL, Level.ALL); } private Logger logger; - public LogHandler(Logger logger) { - this.logger = logger; + public LogHandler() { + this.logger = Logger.getLogger("org.brailleblaster.louisutdml"); } @Override public void logMessage(int level, String message) { ============================================================================== Revision: 549f3624510d Branch: default Author: Michael Whapples Date: Wed Jul 16 08:15:35 2014 UTC Log: Merge http://code.google.com/p/brailleblaster/source/detail?r=549f3624510d