From 4d1ec1ff90c2a1d48908c049069997ac9bb9d97e Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Sat, 6 Apr 2013 17:32:41 +0200
Subject: [PATCH] Remove (mostly unused) logger

---
 bin/generate-exports.py                   |  2 +-
 src/ol/map.js                             | 13 --------
 src/ol/ol.js                              | 10 ------
 src/ol/renderer/webgl/webglmaprenderer.js | 37 ++++-------------------
 4 files changed, 7 insertions(+), 55 deletions(-)
 delete mode 100644 src/ol/ol.js

diff --git a/bin/generate-exports.py b/bin/generate-exports.py
index 41d2b06226..09ccfdc2ab 100755
--- a/bin/generate-exports.py
+++ b/bin/generate-exports.py
@@ -264,7 +264,7 @@ def main(argv):
                     components = m.group('name').split('.')
                     if re.match(r'[A-Z]', components[-1]):
                         requires.add(name)
-                    else:
+                    elif len(components) > 2:
                         requires.add('.'.join(components[:-1]))
                 continue
             raise RuntimeError(line)
diff --git a/src/ol/map.js b/src/ol/map.js
index e2269b3169..fe24e4ecca 100644
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -12,7 +12,6 @@ goog.require('goog.array');
 goog.require('goog.asserts');
 goog.require('goog.async.AnimationDelay');
 goog.require('goog.async.Delay');
-goog.require('goog.debug.Logger');
 goog.require('goog.dispose');
 goog.require('goog.dom');
 goog.require('goog.dom.TagName');
@@ -157,14 +156,6 @@ ol.Map = function(mapOptions) {
 
   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);
 
   /**
@@ -739,10 +730,6 @@ ol.Map.prototype.renderFrame_ = function(time) {
     return;
   }
 
-  if (goog.DEBUG) {
-    this.logger.info('renderFrame_');
-  }
-
   var size = this.getSize();
   var layers = this.getLayers();
   var layersArray = goog.isDef(layers) ?
diff --git a/src/ol/ol.js b/src/ol/ol.js
deleted file mode 100644
index 40532661c9..0000000000
--- a/src/ol/ol.js
+++ /dev/null
@@ -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);
-}
diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js
index eccff5740d..9bbc4888ef 100644
--- a/src/ol/renderer/webgl/webglmaprenderer.js
+++ b/src/ol/renderer/webgl/webglmaprenderer.js
@@ -4,7 +4,6 @@ goog.provide('ol.renderer.webgl.Map');
 
 goog.require('goog.array');
 goog.require('goog.asserts');
-goog.require('goog.debug.Logger');
 goog.require('goog.dom');
 goog.require('goog.dom.TagName');
 goog.require('goog.events');
@@ -62,14 +61,6 @@ ol.renderer.webgl.Map = function(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
    * @type {Element}
@@ -432,14 +423,9 @@ ol.renderer.webgl.Map.prototype.getProgram = function(
     gl.attachShader(program, this.getShader(fragmentShaderObject));
     gl.attachShader(program, this.getShader(vertexShaderObject));
     gl.linkProgram(program);
-    if (goog.DEBUG) {
-      if (!gl.getProgramParameter(program, goog.webgl.LINK_STATUS) &&
-          !gl.isContextLost()) {
-        this.logger.severe(gl.getProgramInfoLog(program));
-        goog.asserts.assert(
-            gl.getProgramParameter(program, goog.webgl.LINK_STATUS));
-      }
-    }
+    goog.asserts.assert(
+        gl.getProgramParameter(program, goog.webgl.LINK_STATUS) ||
+        gl.isContextLost());
     this.programCache_[programKey] = program;
     return program;
   }
@@ -459,14 +445,9 @@ ol.renderer.webgl.Map.prototype.getShader = function(shaderObject) {
     var shader = gl.createShader(shaderObject.getType());
     gl.shaderSource(shader, shaderObject.getSource());
     gl.compileShader(shader);
-    if (goog.DEBUG) {
-      if (!gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS) &&
-          !gl.isContextLost()) {
-        this.logger.severe(gl.getShaderInfoLog(shader));
-        goog.asserts.assert(
-            gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS));
-      }
-    }
+    goog.asserts.assert(
+        gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS) ||
+        gl.isContextLost());
     this.shaderCache_[shaderKey] = shader;
     return shader;
   }
@@ -486,9 +467,6 @@ ol.renderer.webgl.Map.prototype.getTileTextureQueue = function() {
  * @protected
  */
 ol.renderer.webgl.Map.prototype.handleWebGLContextLost = function(event) {
-  if (goog.DEBUG) {
-    this.logger.info('WebGLContextLost');
-  }
   event.preventDefault();
   this.locations_ = null;
   this.bufferCache_ = {};
@@ -506,9 +484,6 @@ ol.renderer.webgl.Map.prototype.handleWebGLContextLost = function(event) {
  * @protected
  */
 ol.renderer.webgl.Map.prototype.handleWebGLContextRestored = function() {
-  if (goog.DEBUG) {
-    this.logger.info('WebGLContextRestored');
-  }
   this.initializeGL_();
   this.getMap().render();
 };