xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gwt: use slf4j in libgdx

Browse Source
This commit is contained in:
Hannes Janetzek 2014-03-08 16:54:34 +01:00
parent 9a16899824
commit 5f18415bf9
1 changed files with 13 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
vtm-gdx-html/src/org/oscim/gdx/emu/com/badlogic/gdx/backends/gwt/GwtApplication.java
View File

@ -16,6 +16,9 @@
package com.badlogic.gdx.backends.gwt; package com.badlogic.gdx.backends.gwt;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.badlogic.gdx.Application; import com.badlogic.gdx.Application;
import com.badlogic.gdx.ApplicationListener; import com.badlogic.gdx.ApplicationListener;
import com.badlogic.gdx.Audio; import com.badlogic.gdx.Audio;
@ -50,7 +53,6 @@ import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.TextArea;
import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.VerticalPanel;
/** /**
@ -62,14 +64,14 @@ import com.google.gwt.user.client.ui.VerticalPanel;
* @author mzechner * @author mzechner
*/ */
public abstract class GwtApplication implements EntryPoint, Application { public abstract class GwtApplication implements EntryPoint, Application {
private final static Logger log = LoggerFactory.getLogger(GwtApplication.class);
private ApplicationListener listener; private ApplicationListener listener;
private GwtApplicationConfiguration config; private GwtApplicationConfiguration config;
private GwtGraphics graphics; private GwtGraphics graphics;
private GwtInput input; private GwtInput input;
private GwtNet net; private GwtNet net;
private Panel root = null; private Panel root = null;
private TextArea log = null;
private int logLevel = LOG_ERROR;
private Array<Runnable> runnables = new Array<Runnable>(); private Array<Runnable> runnables = new Array<Runnable>();
private Array<Runnable> runnablesHelper = new Array<Runnable>(); private Array<Runnable> runnablesHelper = new Array<Runnable>();
private Array<LifecycleListener> lifecycleListeners = new Array<LifecycleListener>(); private Array<LifecycleListener> lifecycleListeners = new Array<LifecycleListener>();
@ -91,7 +93,6 @@ public abstract class GwtApplication implements EntryPoint, Application {
GwtApplication.agentInfo = computeAgentInfo(); GwtApplication.agentInfo = computeAgentInfo();
this.listener = getApplicationListener(); this.listener = getApplicationListener();
this.config = getConfig(); this.config = getConfig();
this.log = config.log;
if (config.rootPanel != null) { if (config.rootPanel != null) {
this.root = config.rootPanel; this.root = config.rootPanel;
@ -118,11 +119,6 @@ public abstract class GwtApplication implements EntryPoint, Application {
} }
} }
//// initialize SoundManager2
//SoundManager.init(GWT.getModuleBaseURL(), 9, true, new SoundManager.SoundManagerCallback() {
//
// @Override
// public void onready () {
final PreloaderCallback callback = getPreloaderCallback(); final PreloaderCallback callback = getPreloaderCallback();
preloader = createPreloader(); preloader = createPreloader();
preloader.preload("assets.txt", new PreloaderCallback() { preloader.preload("assets.txt", new PreloaderCallback() {
@ -140,16 +136,10 @@ public abstract class GwtApplication implements EntryPoint, Application {
} }
} }
}); });
//}
//@Override
//public void ontimeout (String status, String errorType) {
// error("SoundManager", status + " " + errorType);
// }
//
//});
} }
void setupLoop() { void setupLoop() {
Gdx.app = this;
// setup modules // setup modules
try { try {
graphics = new GwtGraphics(root, config); graphics = new GwtGraphics(root, config);
@ -160,7 +150,6 @@ public abstract class GwtApplication implements EntryPoint, Application {
} }
lastWidth = graphics.getWidth(); lastWidth = graphics.getWidth();
lastHeight = graphics.getHeight(); lastHeight = graphics.getHeight();
Gdx.app = this;
//Gdx.audio = new GwtAudio(); //Gdx.audio = new GwtAudio();
Gdx.graphics = graphics; Gdx.graphics = graphics;
Gdx.gl20 = graphics.getGL20(); Gdx.gl20 = graphics.getGL20();
@ -291,46 +280,32 @@ public abstract class GwtApplication implements EntryPoint, Application {
@Override @Override
public void log(String tag, String message) { public void log(String tag, String message) {
if (logLevel >= LOG_INFO) { log.info("{} : {}", tag, message);
consoleLog(tag + ": " + message);
}
} }
@Override @Override
public void log(String tag, String message, Throwable exception) { public void log(String tag, String message, Throwable exception) {
if (logLevel >= LOG_INFO) { log.info("{} : {}\n{}", tag, exception, getStackTrace(exception));
consoleLog(tag + ": " + message + "\n" + exception.getMessage());
consoleLog(getStackTrace(exception));
}
} }
@Override @Override
public void error(String tag, String message) { public void error(String tag, String message) {
if (logLevel >= LOG_ERROR) { log.error("{} : {}", tag, message);
consoleLog(tag + ": " + message);
}
} }
@Override @Override
public void error(String tag, String message, Throwable exception) { public void error(String tag, String message, Throwable exception) {
if (logLevel >= LOG_ERROR) { log.error("{} : {}\n{}", tag, message, getStackTrace(exception));
consoleLog(getStackTrace(exception));
}
} }
@Override @Override
public void debug(String tag, String message) { public void debug(String tag, String message) {
if (logLevel >= LOG_DEBUG) { log.debug("{} : {}", tag, message);
consoleLog(tag + ": " + message + "\n");
}
} }
@Override @Override
public void debug(String tag, String message, Throwable exception) { public void debug(String tag, String message, Throwable exception) {
if (logLevel >= LOG_DEBUG) { log.debug("{} : {}\n{}", tag, message, getStackTrace(exception));
consoleLog(tag + ": " + message + "\n" + exception.getMessage());
consoleLog(getStackTrace(exception));
}
} }
private String getStackTrace(Throwable e) { private String getStackTrace(Throwable e) {
@ -343,12 +318,11 @@ public abstract class GwtApplication implements EntryPoint, Application {
@Override @Override
public void setLogLevel(int logLevel) { public void setLogLevel(int logLevel) {
this.logLevel = logLevel;
} }
@Override @Override
public int getLogLevel() { public int getLogLevel() {
return logLevel; return LOG_DEBUG;
} }
@Override @Override
@ -489,8 +463,4 @@ public abstract class GwtApplication implements EntryPoint, Application {
lifecycleListeners.removeValue(listener, true); lifecycleListeners.removeValue(listener, true);
} }
} }
private native void consoleLog(String message) /*-{
console.log(message);
}-*/;
} }