Remove (mostly unused) logger

This commit is contained in:
Tom Payne
2013-04-06 17:32:41 +02:00
parent f3415f3631
commit 4d1ec1ff90
4 changed files with 7 additions and 55 deletions

View File

@@ -264,7 +264,7 @@ def main(argv):
components = m.group('name').split('.') components = m.group('name').split('.')
if re.match(r'[A-Z]', components[-1]): if re.match(r'[A-Z]', components[-1]):
requires.add(name) requires.add(name)
else: elif len(components) > 2:
requires.add('.'.join(components[:-1])) requires.add('.'.join(components[:-1]))
continue continue
raise RuntimeError(line) raise RuntimeError(line)

View File

@@ -12,7 +12,6 @@ goog.require('goog.array');
goog.require('goog.asserts'); 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.Logger');
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');
@@ -157,14 +156,6 @@ ol.Map = function(mapOptions) {
goog.base(this); goog.base(this);
if (goog.DEBUG) {
/**
* @protected
* @type {goog.debug.Logger}
*/
this.logger = goog.debug.Logger.getLogger('ol.map.' + goog.getUid(this));
}
var mapOptionsInternal = ol.Map.createOptionsInternal(mapOptions); var mapOptionsInternal = ol.Map.createOptionsInternal(mapOptions);
/** /**
@@ -739,10 +730,6 @@ ol.Map.prototype.renderFrame_ = function(time) {
return; return;
} }
if (goog.DEBUG) {
this.logger.info('renderFrame_');
}
var size = this.getSize(); var size = this.getSize();
var layers = this.getLayers(); var layers = this.getLayers();
var layersArray = goog.isDef(layers) ? var layersArray = goog.isDef(layers) ?

View File

@@ -1,10 +0,0 @@
goog.provide('ol');
goog.require('goog.debug.Logger');
goog.require('goog.debug.Logger.Level');
if (goog.DEBUG) {
var logger = goog.debug.Logger.getLogger('ol');
logger.setLevel(goog.debug.Logger.Level.FINEST);
}

View File

@@ -4,7 +4,6 @@ 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');
@@ -62,14 +61,6 @@ ol.renderer.webgl.Map = function(container, map) {
goog.base(this, container, map); goog.base(this, container, map);
if (goog.DEBUG) {
/**
* @inheritDoc
*/
this.logger = goog.debug.Logger.getLogger(
'ol.renderer.webgl.maprenderer.' + goog.getUid(this));
}
/** /**
* @private * @private
* @type {Element} * @type {Element}
@@ -432,14 +423,9 @@ ol.renderer.webgl.Map.prototype.getProgram = function(
gl.attachShader(program, this.getShader(fragmentShaderObject)); gl.attachShader(program, this.getShader(fragmentShaderObject));
gl.attachShader(program, this.getShader(vertexShaderObject)); gl.attachShader(program, this.getShader(vertexShaderObject));
gl.linkProgram(program); gl.linkProgram(program);
if (goog.DEBUG) { goog.asserts.assert(
if (!gl.getProgramParameter(program, goog.webgl.LINK_STATUS) && gl.getProgramParameter(program, goog.webgl.LINK_STATUS) ||
!gl.isContextLost()) { gl.isContextLost());
this.logger.severe(gl.getProgramInfoLog(program));
goog.asserts.assert(
gl.getProgramParameter(program, goog.webgl.LINK_STATUS));
}
}
this.programCache_[programKey] = program; this.programCache_[programKey] = program;
return program; return program;
} }
@@ -459,14 +445,9 @@ ol.renderer.webgl.Map.prototype.getShader = function(shaderObject) {
var shader = gl.createShader(shaderObject.getType()); var shader = gl.createShader(shaderObject.getType());
gl.shaderSource(shader, shaderObject.getSource()); gl.shaderSource(shader, shaderObject.getSource());
gl.compileShader(shader); gl.compileShader(shader);
if (goog.DEBUG) { goog.asserts.assert(
if (!gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS) && gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS) ||
!gl.isContextLost()) { gl.isContextLost());
this.logger.severe(gl.getShaderInfoLog(shader));
goog.asserts.assert(
gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS));
}
}
this.shaderCache_[shaderKey] = shader; this.shaderCache_[shaderKey] = shader;
return shader; return shader;
} }
@@ -486,9 +467,6 @@ ol.renderer.webgl.Map.prototype.getTileTextureQueue = function() {
* @protected * @protected
*/ */
ol.renderer.webgl.Map.prototype.handleWebGLContextLost = function(event) { ol.renderer.webgl.Map.prototype.handleWebGLContextLost = function(event) {
if (goog.DEBUG) {
this.logger.info('WebGLContextLost');
}
event.preventDefault(); event.preventDefault();
this.locations_ = null; this.locations_ = null;
this.bufferCache_ = {}; this.bufferCache_ = {};
@@ -506,9 +484,6 @@ ol.renderer.webgl.Map.prototype.handleWebGLContextLost = function(event) {
* @protected * @protected
*/ */
ol.renderer.webgl.Map.prototype.handleWebGLContextRestored = function() { ol.renderer.webgl.Map.prototype.handleWebGLContextRestored = function() {
if (goog.DEBUG) {
this.logger.info('WebGLContextRestored');
}
this.initializeGL_(); this.initializeGL_();
this.getMap().render(); this.getMap().render();
}; };