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

switch to slf4j

Browse Source
This commit is contained in:
Hannes Janetzek
2013-10-08 22:02:14 +02:00
parent 1cf2ea60a7
commit 2d18e7d25f
79 changed files with 418 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
vtm-gdx-html/src/org/oscim/gdx/GwtDefinition.gwt.xml
View File

@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<module>
<entry-point class="org.oscim.gdx.client.GwtLauncher"/>
<entry-point class="org.oscim.gdx.client.GwtLauncher" />
<inherits name="com.google.gwt.xml.XML" />
<inherits name="GdxMap"/>
<inherits name="com.badlogic.gdx.backends.gdx_backends_gwt"/>
<inherits name="com.google.gwt.user.theme.chrome.Chrome"/>
<inherits name="org.slf4j.Slf4j" />
<!-- <inherits name="de.benediktmeurer.gwt.slf4j.api.API"/>
<inherits name="de.benediktmeurer.gwt.slf4j.jul.JUL"/> -->
<set-property name='gwt.logging.enabled' value='TRUE' />
<set-property name='gwt.logging.consoleHandler' value='ENABLED' />
<set-property name='gwt.logging.firebugHandler' value='ENABLED' />
<set-property name='gwt.logging.popupHandler' value='DISABLED' />
<inherits name="GdxMap" />
<inherits name="com.badlogic.gdx.backends.gdx_backends_gwt" />
<inherits name="com.google.gwt.user.theme.chrome.Chrome" />
<super-source path="emu" />
<set-configuration-property name="gdx.assetpath" value="../vtm/assets"/>
<!--<set-property name="user.agent" value="safari"/>-->
<set-configuration-property name="gdx.assetpath" value="../vtm/assets" />
<!--<set-property name="user.agent" value="safari"/> -->
</module>

3
vtm-gdx-html/src/org/oscim/gdx/client/GwtBitmap.java
View File

@@ -1,6 +1,5 @@
package org.oscim.gdx.client;
import org.oscim.backend.Log;
import org.oscim.backend.canvas.Bitmap;
import com.badlogic.gdx.Gdx;
@@ -65,7 +64,7 @@ public class GwtBitmap implements Bitmap {
pixmap.getGLFormat(), pixmap.getGLType(), pixmap.getPixels());
if (disposable || image != null) {
Log.d("", "dispose pixmap " + getWidth() + "/" + getHeight());
//log.debug("dispose pixmap " + getWidth() + "/" + getHeight());
pixmap.dispose();
if (image != null)

3
vtm-gdx-html/src/org/oscim/gdx/client/GwtCanvas.java
View File

@@ -1,6 +1,5 @@
package org.oscim.gdx.client;
import org.oscim.backend.Log;
import org.oscim.backend.canvas.Bitmap;
import org.oscim.backend.canvas.Paint;
@@ -26,7 +25,7 @@ public class GwtCanvas implements org.oscim.backend.canvas.Canvas {
@Override
public void drawText(String string, float x, float y, Paint paint) {
if (bitmap == null) {
Log.d("BUG", "no bitmap set");
//log.debug("no bitmap set");
return;
}

7
vtm-gdx-html/src/org/oscim/gdx/client/GwtGdxMap.java
View File

@@ -3,7 +3,8 @@ package org.oscim.gdx.client;
import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.GL20;
import org.oscim.backend.GLAdapter;
import org.oscim.backend.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.oscim.core.MapPosition;
import org.oscim.core.MercatorProjection;
import org.oscim.gdx.GdxMap;
@@ -20,7 +21,7 @@ import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.Window;
class GwtGdxMap extends GdxMap {
private static final String TAG = GwtGdxMap.class.getName();
static final Logger log = LoggerFactory.getLogger(GwtGdxMap.class);
SearchBox mSearchBox;
@@ -77,7 +78,7 @@ class GwtGdxMap extends GdxMap {
MapPosition p = new MapPosition();
p.setZoomLevel(zoom);
p.setPosition(lat, lon);
Log.d(TAG, "map position: " + p.x + "/" + p.y + " " + lat + "/" + lon);
log.debug("map position: " + p.x + "/" + p.y + " " + lat + "/" + lon);
p.angle = rotation;
p.tilt = tilt;

3
vtm-gdx-html/src/org/oscim/gdx/client/GwtLauncher.java
View File

@@ -1,7 +1,6 @@
package org.oscim.gdx.client;
// -draftCompile -localWorkers 2
import org.oscim.backend.Log;
import org.oscim.core.Tile;
import com.badlogic.gdx.ApplicationListener;
@@ -66,7 +65,7 @@ public class GwtLauncher extends GwtApplication {
@Override
public void error(String file) {
Log.d(this.getClass().getName(), "error loading " + file);
//log.debug("error loading " + file);
}
};
}

13
vtm-gdx-html/src/org/oscim/gdx/client/SearchBox.java
View File

@@ -3,7 +3,8 @@ package org.oscim.gdx.client;
import java.util.ArrayList;
import java.util.List;
import org.oscim.backend.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.oscim.core.BoundingBox;
import org.oscim.core.GeometryBuffer;
import org.oscim.core.MapPosition;
@@ -40,7 +41,7 @@ import com.google.gwt.view.client.SingleSelectionModel;
*/
public class SearchBox {
protected static final String TAG = SearchBox.class.getName();
protected static final Logger log = LoggerFactory.getLogger(SearchBox.class);
private static final String NOMINATIM_GLOBAL = "http://nominatim.openstreetmap.org/search?polygon_text=1&addressdetails=0&format=json&limit=25&q=";
@@ -230,7 +231,7 @@ public class SearchBox {
mOverlay.clearPath();
//Log.d(TAG, "selected " + d.getName() + " " + d.getLatitude() + " "
//log.debug("selected " + d.getName() + " " + d.getLatitude() + " "
// + d.getLongitude());
BoundingBox b = d.getBoundingBox();
@@ -249,11 +250,11 @@ public class SearchBox {
try {
r.parse(wkt, g);
} catch (Exception e) {
Log.d(TAG, wkt);
log.debug(wkt);
}
mOverlay.setGeom(g);
//Log.d(TAG, "add polygon " + p.length());
//log.debug("add polygon " + p.length());
} else {
mOverlay.addPoint(b.maxLatitudeE6, b.minLongitudeE6);
mOverlay.addPoint(b.maxLatitudeE6, b.maxLongitudeE6);
@@ -319,7 +320,7 @@ public class SearchBox {
builder.setCallbackParam("json_callback");
builder.requestObject(url, new AsyncCallback<JsArray<NominatimData>>() {
public void onFailure(Throwable caught) {
Log.d(TAG, "request failed");
log.debug("request failed");
searchButton.setEnabled(true);
}

8
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/backend/MyAttributes.java
View File

@@ -34,49 +34,41 @@ public class MyAttributes implements Attributes {
@Override
public String getURI(int paramInt) {
Log.d("..", "missing");
return null;
}
@Override
public String getQName(int paramInt) {
Log.d("..", "missing");
return null;
}
@Override
public String getType(int paramInt) {
Log.d("..", "missing");
return null;
}
@Override
public int getIndex(String paramString1, String paramString2) {
Log.d("..", "missing");
return 0;
}
@Override
public int getIndex(String paramString) {
Log.d("..", "missing");
return 0;
}
@Override
public String getType(String paramString1, String paramString2) {
Log.d("..", "missing");
return null;
}
@Override
public String getType(String paramString) {
Log.d("..", "missing");
return null;
}
@Override
public String getValue(String paramString1, String paramString2) {
Log.d("..", "missing");
return null;
}

2
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/backend/MyXMLReader.java
View File

@@ -3,7 +3,6 @@ package org.oscim.backend;
import java.io.IOException;
import java.io.InputStream;
import org.oscim.backend.Log;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
@@ -14,7 +13,6 @@ import com.google.gwt.xml.client.XMLParser;
public class MyXMLReader {
public void parse(InputStream is) throws SAXException {
Log.d("..", "read theme");
StringBuilder sb = new StringBuilder();
byte[] buf = new byte[8192];
int read;

11
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/vector/VectorTileLoader.java
View File

@@ -14,7 +14,8 @@
*/
package org.oscim.layers.tile.vector;
import org.oscim.backend.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.oscim.core.GeometryBuffer.GeometryType;
import org.oscim.core.MapElement;
import org.oscim.core.MercatorProjection;
@@ -49,7 +50,7 @@ import org.oscim.utils.LineClipper;
public class VectorTileLoader extends TileLoader implements IRenderTheme.Callback, ITileDataSink {
private static final String TAG = VectorTileLoader.class.getName();
static final Logger log = LoggerFactory.getLogger(VectorTileLoader.class);
private static final double STROKE_INCREASE = Math.sqrt(2.5);
private static final byte LAYERS = 11;
@@ -230,7 +231,7 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
}
//private void debugUnmatched(boolean closed, TagSet tags) {
// Log.d(TAG, "DBG way not matched: " + closed + " "
// log.debug("DBG way not matched: " + closed + " "
// + Arrays.deepToString(tags));
//
// mTagName = new Tag("name", tags[0].key + ":"
@@ -268,7 +269,7 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
if (line.stipple == 0) {
if (line.outline && mCurLineLayer == null) {
Log.e(TAG, "BUG in theme: line must come before outline!");
log.error("BUG in theme: line must come before outline!");
return;
}
@@ -378,7 +379,7 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
@Override
public void renderPointSymbol(Symbol symbol) {
if (symbol.texture == null) {
Log.d(TAG, "missing symbol for " + mElement.tags.toString());
log.debug("missing symbol for " + mElement.tags.toString());
return;
}
for (int i = 0, n = mElement.getNumPoints(); i < n; i++) {

4
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/LwHttp.java
View File

@@ -27,7 +27,7 @@ import com.google.gwt.xhr.client.XMLHttpRequest;
import com.google.gwt.xhr.client.XMLHttpRequest.ResponseType;
public class LwHttp {
//private static final String TAG = LwHttp.class.getName();
//static final Logger log = LoggerFactory.getLogger(LwHttp.class);
private final String mUrlFileExtension;
private final String mUrlPath;
@@ -107,7 +107,7 @@ public class LwHttp {
@Override
public void onReadyStateChange(XMLHttpRequest xhr) {
int state = xhr.getReadyState();
//Log.d(TAG, mCurrentUrl + "response " + status + "/" + state);
//log.debug(mCurrentUrl + "response " + status + "/" + state);
if (state == XMLHttpRequest.DONE) {

7
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/PbfTileDataSource.java
View File

@@ -17,7 +17,8 @@ package org.oscim.tiling.source.common;
import java.io.IOException;
import java.io.InputStream;
import org.oscim.backend.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.oscim.tiling.MapTile;
import org.oscim.tiling.source.ITileDataSink;
import org.oscim.tiling.source.ITileDataSource;
@@ -27,7 +28,7 @@ import org.oscim.tiling.source.ITileDataSource;
*
*/
public abstract class PbfTileDataSource implements ITileDataSource {
private static final String TAG = PbfTileDataSource.class.getName();
static final Logger log = LoggerFactory.getLogger(PbfTileDataSource.class);
protected LwHttp mConn;
protected final PbfDecoder mTileDecoder;
@@ -65,7 +66,7 @@ public abstract class PbfTileDataSource implements ITileDataSource {
}
}
if (!win)
Log.d(TAG, mTile + " failed");
log.debug(mTile + " failed");
mConn.requestCompleted();
mSink.completed(win);

6
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/utils/IOUtils.java
View File

@@ -20,8 +20,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.logging.Level;
import org.oscim.backend.Log;
/**
* A utility class with IO-specific helper methods.
*/
@@ -41,7 +39,7 @@ public final class IOUtils {
closeable.close();
}
} catch (IOException e) {
Log.d(IOUtils.class.getName(), e.getMessage() + " " + e);
//log.debug(e.getMessage() + " " + e);
}
}
@@ -51,7 +49,7 @@ public final class IOUtils {
closeable.close();
}
} catch (IOException e) {
Log.d(IOUtils.class.getName(), e.getMessage() + " " + e);
//log.debug(e.getMessage() + " " + e);
}
}

9
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/utils/Tessellator.java
View File

@@ -1,6 +1,5 @@
package org.oscim.utils;
import org.oscim.backend.Log;
import org.oscim.core.GeometryBuffer;
import org.oscim.renderer.elements.VertexItem;
@@ -29,18 +28,18 @@ public class Tessellator {
//Int32Array io = getIndices(o);
if (io == null) {
Log.d("Triangulator", "building tessellation failed");
//log.debug("building tessellation failed");
return 0;
}
// if (vo.length() != plen) {
// // TODO handle different output points
// Log.d("", "other points out" + plen + ":" + vo.length() + ", " + io.length());
// log.debug(" + io.length());
//
// //for (int i = 0; i < vo.length(); i += 2)
// // Log.d("<", vo.get(i) + " " + vo.get(i + 1));
// // log.debug(vo.get(i) + " " + vo.get(i + 1));
// //for (int i = ppos; i < ppos + plen; i += 2)
// // Log.d(">", points[i]+ " " + points[i + 1]);
// // log.debug( points[i]+ " " + points[i + 1]);
//
// return 0;
// }