ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use goog.log instead of goog.debug.Logger

Browse Source
This commit is contained in:
Tom Payne
2013-07-23 13:06:06 +02:00
parent f533f6b654
commit 45c0e27c36
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
buildcfg/base.json
View File

@@ -98,7 +98,8 @@
"goog.debug.logRecordSerializer", "goog.debug.logRecordSerializer",
"goog.debug.makeWhitespaceVisible", "goog.debug.makeWhitespaceVisible",
"goog.debug.normalizeErrorObject", "goog.debug.normalizeErrorObject",
"goog.debug.reflect" "goog.debug.reflect",
"goog.log"
] ]
} }

8
src/ol/map.js
View File

@@ -13,8 +13,6 @@ goog.require('goog.asserts');
goog.require('goog.async.AnimationDelay'); goog.require('goog.async.AnimationDelay');
goog.require('goog.async.Delay'); goog.require('goog.async.Delay');
goog.require('goog.debug.Console'); goog.require('goog.debug.Console');
goog.require('goog.debug.Logger');
goog.require('goog.debug.Logger.Level');
goog.require('goog.dispose'); goog.require('goog.dispose');
goog.require('goog.dom'); goog.require('goog.dom');
goog.require('goog.dom.TagName'); goog.require('goog.dom.TagName');
@@ -27,6 +25,8 @@ goog.require('goog.events.KeyHandler');
goog.require('goog.events.KeyHandler.EventType'); goog.require('goog.events.KeyHandler.EventType');
goog.require('goog.events.MouseWheelHandler'); goog.require('goog.events.MouseWheelHandler');
goog.require('goog.events.MouseWheelHandler.EventType'); goog.require('goog.events.MouseWheelHandler.EventType');
goog.require('goog.log');
goog.require('goog.log.Level');
goog.require('goog.object'); goog.require('goog.object');
goog.require('goog.style'); goog.require('goog.style');
goog.require('goog.vec.Mat4'); goog.require('goog.vec.Mat4');
@@ -1169,7 +1169,7 @@ ol.proj.addCommonProjections();
if (goog.DEBUG) { if (goog.DEBUG) {
(function() { (function() {
goog.debug.Console.autoInstall(); goog.debug.Console.autoInstall();
var logger = goog.debug.Logger.getLogger('ol'); var logger = goog.log.getLogger('ol');
logger.setLevel(goog.debug.Logger.Level.FINEST); logger.setLevel(goog.log.Level.FINEST);
})(); })();
} }

11
src/ol/renderer/webgl/webglmaprenderer.js
View File

@@ -4,11 +4,12 @@ goog.provide('ol.renderer.webgl.Map');
goog.require('goog.array'); goog.require('goog.array');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('goog.debug.Logger');
goog.require('goog.dom'); goog.require('goog.dom');
goog.require('goog.dom.TagName'); goog.require('goog.dom.TagName');
goog.require('goog.events'); goog.require('goog.events');
goog.require('goog.events.Event'); goog.require('goog.events.Event');
goog.require('goog.log');
goog.require('goog.log.Logger');
goog.require('goog.object'); goog.require('goog.object');
goog.require('goog.style'); goog.require('goog.style');
goog.require('goog.webgl'); goog.require('goog.webgl');
@@ -417,7 +418,7 @@ ol.renderer.webgl.Map.prototype.getProgram = function(
if (goog.DEBUG) { if (goog.DEBUG) {
if (!gl.getProgramParameter(program, goog.webgl.LINK_STATUS) && if (!gl.getProgramParameter(program, goog.webgl.LINK_STATUS) &&
!gl.isContextLost()) { !gl.isContextLost()) {
this.logger_.severe(gl.getProgramInfoLog(program)); goog.log.error(this.logger_, gl.getProgramInfoLog(program));
} }
} }
goog.asserts.assert( goog.asserts.assert(
@@ -445,7 +446,7 @@ ol.renderer.webgl.Map.prototype.getShader = function(shaderObject) {
if (goog.DEBUG) { if (goog.DEBUG) {
if (!gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS) && if (!gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS) &&
!gl.isContextLost()) { !gl.isContextLost()) {
this.logger_.severe(gl.getShaderInfoLog(shader)); goog.log.error(this.logger_, gl.getShaderInfoLog(shader));
} }
} }
goog.asserts.assert( goog.asserts.assert(
@@ -519,10 +520,10 @@ ol.renderer.webgl.Map.prototype.isTileTextureLoaded = function(tile) {
/** /**
* @private * @private
* @type {goog.debug.Logger} * @type {goog.log.Logger}
*/ */
ol.renderer.webgl.Map.prototype.logger_ = ol.renderer.webgl.Map.prototype.logger_ =
goog.debug.Logger.getLogger('ol.renderer.webgl.Map'); goog.log.getLogger('ol.renderer.webgl.Map');
/** /**