From a990f0921e3464ad110e4c4fbeb0047624e7a440 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Mon, 11 Nov 2013 03:12:58 +0100
Subject: [PATCH] Rename ol.layer.VectorEvent to ol.render.RenderEvent

---
 src/ol/layer/vectorevent.exports               |  3 ---
 src/ol/render/renderevent.exports              |  3 +++
 .../vectorevent.js => render/renderevent.js}   | 18 +++++++++---------
 .../canvas/canvasvectorlayerrenderer.js        | 10 +++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 src/ol/layer/vectorevent.exports
 create mode 100644 src/ol/render/renderevent.exports
 rename src/ol/{layer/vectorevent.js => render/renderevent.js} (72%)

diff --git a/src/ol/layer/vectorevent.exports b/src/ol/layer/vectorevent.exports
deleted file mode 100644
index fae99b489d..0000000000
--- a/src/ol/layer/vectorevent.exports
+++ /dev/null
@@ -1,3 +0,0 @@
-@exportProperty ol.layer.VectorEvent.prototype.getContext
-@exportProperty ol.layer.VectorEvent.prototype.getGL
-@exportProperty ol.layer.VectorEvent.prototype.getRender
diff --git a/src/ol/render/renderevent.exports b/src/ol/render/renderevent.exports
new file mode 100644
index 0000000000..7d9ce51558
--- /dev/null
+++ b/src/ol/render/renderevent.exports
@@ -0,0 +1,3 @@
+@exportProperty ol.render.RenderEvent.prototype.getContext
+@exportProperty ol.render.RenderEvent.prototype.getGL
+@exportProperty ol.render.RenderEvent.prototype.getRender
diff --git a/src/ol/layer/vectorevent.js b/src/ol/render/renderevent.js
similarity index 72%
rename from src/ol/layer/vectorevent.js
rename to src/ol/render/renderevent.js
index 29ae328c80..3aa4eb72a9 100644
--- a/src/ol/layer/vectorevent.js
+++ b/src/ol/render/renderevent.js
@@ -1,5 +1,5 @@
-goog.provide('ol.layer.VectorEvent');
-goog.provide('ol.layer.VectorEventType');
+goog.provide('ol.render.RenderEvent');
+goog.provide('ol.render.RenderEventType');
 
 goog.require('goog.events.Event');
 goog.require('ol.render.IRender');
@@ -8,7 +8,7 @@ goog.require('ol.render.IRender');
 /**
  * @enum {string}
  */
-ol.layer.VectorEventType = {
+ol.render.RenderEventType = {
   POSTRENDER: 'postrender'
 };
 
@@ -17,13 +17,13 @@ ol.layer.VectorEventType = {
 /**
  * @constructor
  * @extends {goog.events.Event}
- * @param {ol.layer.VectorEventType} type Type.
+ * @param {ol.render.RenderEventType} type Type.
  * @param {Object=} opt_target Target.
  * @param {ol.render.IRender=} opt_render Render.
  * @param {?CanvasRenderingContext2D=} opt_context Context.
  * @param {?WebGLRenderingContext=} opt_gl GL.
  */
-ol.layer.VectorEvent =
+ol.render.RenderEvent =
     function(type, opt_target, opt_render, opt_context, opt_gl) {
 
   goog.base(this, type, opt_target);
@@ -47,13 +47,13 @@ ol.layer.VectorEvent =
   this.gl_ = opt_gl;
 
 };
-goog.inherits(ol.layer.VectorEvent, goog.events.Event);
+goog.inherits(ol.render.RenderEvent, goog.events.Event);
 
 
 /**
  * @return {CanvasRenderingContext2D|null|undefined} Context.
  */
-ol.layer.VectorEvent.prototype.getContext = function() {
+ol.render.RenderEvent.prototype.getContext = function() {
   return this.context_;
 };
 
@@ -61,7 +61,7 @@ ol.layer.VectorEvent.prototype.getContext = function() {
 /**
  * @return {WebGLRenderingContext|null|undefined} GL.
  */
-ol.layer.VectorEvent.prototype.getGL = function() {
+ol.render.RenderEvent.prototype.getGL = function() {
   return this.gl_;
 };
 
@@ -69,6 +69,6 @@ ol.layer.VectorEvent.prototype.getGL = function() {
 /**
  * @return {ol.render.IRender|undefined} Render.
  */
-ol.layer.VectorEvent.prototype.getRender = function() {
+ol.render.RenderEvent.prototype.getRender = function() {
   return this.render_;
 };
diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
index e959763bc4..3ad24a1480 100644
--- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
+++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
@@ -3,8 +3,8 @@ goog.provide('ol.renderer.canvas.VectorLayer');
 goog.require('goog.vec.Mat4');
 goog.require('ol.ViewHint');
 goog.require('ol.extent');
-goog.require('ol.layer.VectorEvent');
-goog.require('ol.layer.VectorEventType');
+goog.require('ol.render.RenderEvent');
+goog.require('ol.render.RenderEventType');
 goog.require('ol.render.canvas.Immediate');
 goog.require('ol.render.canvas.ReplayGroup');
 goog.require('ol.renderer.canvas.Layer');
@@ -93,11 +93,11 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame =
   replayGroup.draw(context, frameState.extent, transform);
 
   var vectorLayer = this.getVectorLayer();
-  if (vectorLayer.hasListener(ol.layer.VectorEventType.POSTRENDER)) {
+  if (vectorLayer.hasListener(ol.render.RenderEventType.POSTRENDER)) {
     var render = new ol.render.canvas.Immediate(
         context, frameState.extent, transform);
-    var postRenderEvent = new ol.layer.VectorEvent(
-        ol.layer.VectorEventType.POSTRENDER, vectorLayer, render, context,
+    var postRenderEvent = new ol.render.RenderEvent(
+        ol.render.RenderEventType.POSTRENDER, vectorLayer, render, context,
         null);
     vectorLayer.dispatchEvent(postRenderEvent);
   }