Rename ol.render.RenderEvent to ol.render.Event

src/ol/render/dragbox.js

@@ -5,7 +5,7 @@ goog.provide('ol.render.DragBox');
 goog.require('goog.Disposable');
 goog.require('goog.events');
 goog.require('ol.geom.Polygon');
-goog.require('ol.render.RenderEventType');
+goog.require('ol.render.EventType');
 goog.require('ol.style.Style');
 
 
@@ -70,7 +70,7 @@ ol.render.DragBox.prototype.disposeInternal = function() {
 
 
 /**
- * @param {ol.render.RenderEvent} event Event.
+ * @param {ol.render.Event} event Event.
  * @private
  */
 ol.render.DragBox.prototype.handleMapPostCompose_ = function(event) {
@@ -115,8 +115,8 @@ ol.render.DragBox.prototype.setMap = function(map) {
   this.map_ = map;
   if (!goog.isNull(this.map_)) {
     this.postComposeListenKey_ = goog.events.listen(
-        map, ol.render.RenderEventType.POSTCOMPOSE,
+        map, ol.render.EventType.POSTCOMPOSE, this.handleMapPostCompose_, false,
-        this.handleMapPostCompose_, false, this);
+        this);
     this.requestMapRenderFrame_();
   }
 };

src/ol/render/renderevent.exports

@@ -1,3 +1,3 @@
-@exportProperty ol.render.RenderEvent.prototype.getContext
+@exportProperty ol.render.Event.prototype.getContext
-@exportProperty ol.render.RenderEvent.prototype.getGL
+@exportProperty ol.render.Event.prototype.getGL
-@exportProperty ol.render.RenderEvent.prototype.getRender
+@exportProperty ol.render.Event.prototype.getRender

src/ol/render/renderevent.js

@@ -1,5 +1,5 @@
-goog.provide('ol.render.RenderEvent');
+goog.provide('ol.render.Event');
-goog.provide('ol.render.RenderEventType');
+goog.provide('ol.render.EventType');
 
 goog.require('goog.events.Event');
 goog.require('ol.render.IRender');
@@ -8,7 +8,7 @@ goog.require('ol.render.IRender');
 /**
  * @enum {string}
  */
-ol.render.RenderEventType = {
+ol.render.EventType = {
   POSTCOMPOSE: 'postcompose'
 };
 
@@ -17,14 +17,14 @@ ol.render.RenderEventType = {
 /**
  * @constructor
  * @extends {goog.events.Event}
- * @param {ol.render.RenderEventType} type Type.
+ * @param {ol.render.EventType} type Type.
  * @param {Object=} opt_target Target.
  * @param {ol.render.IRender=} opt_render Render.
  * @param {ol.FrameState=} opt_frameState Frame state.
  * @param {?CanvasRenderingContext2D=} opt_context Context.
  * @param {?WebGLRenderingContext=} opt_gl GL.
  */
-ol.render.RenderEvent = function(
+ol.render.Event = function(
     type, opt_target, opt_render, opt_frameState, opt_context, opt_gl) {
 
   goog.base(this, type, opt_target);
@@ -54,13 +54,13 @@ ol.render.RenderEvent = function(
   this.gl_ = opt_gl;
 
 };
-goog.inherits(ol.render.RenderEvent, goog.events.Event);
+goog.inherits(ol.render.Event, goog.events.Event);
 
 
 /**
  * @return {CanvasRenderingContext2D|null|undefined} Context.
  */
-ol.render.RenderEvent.prototype.getContext = function() {
+ol.render.Event.prototype.getContext = function() {
   return this.context_;
 };
 
@@ -68,7 +68,7 @@ ol.render.RenderEvent.prototype.getContext = function() {
 /**
  * @return {ol.FrameState|undefined} Frame state.
  */
-ol.render.RenderEvent.prototype.getFrameState = function() {
+ol.render.Event.prototype.getFrameState = function() {
   return this.frameState_;
 };
 
@@ -76,7 +76,7 @@ ol.render.RenderEvent.prototype.getFrameState = function() {
 /**
  * @return {WebGLRenderingContext|null|undefined} GL.
  */
-ol.render.RenderEvent.prototype.getGL = function() {
+ol.render.Event.prototype.getGL = function() {
   return this.gl_;
 };
 
@@ -84,6 +84,6 @@ ol.render.RenderEvent.prototype.getGL = function() {
 /**
  * @return {ol.render.IRender|undefined} Render.
  */
-ol.render.RenderEvent.prototype.getRender = function() {
+ol.render.Event.prototype.getRender = function() {
   return this.render_;
 };

src/ol/renderer/canvas/canvaslayerrenderer.js

@@ -2,8 +2,8 @@ goog.provide('ol.renderer.canvas.Layer');
 
 goog.require('goog.vec.Mat4');
 goog.require('ol.layer.Layer');
-goog.require('ol.render.RenderEvent');
+goog.require('ol.render.Event');
-goog.require('ol.render.RenderEventType');
+goog.require('ol.render.EventType');
 goog.require('ol.render.canvas.Immediate');
 goog.require('ol.renderer.Layer');
 
@@ -78,14 +78,13 @@ ol.renderer.canvas.Layer.prototype.composeFrame =
 ol.renderer.canvas.Layer.prototype.dispatchPostComposeEvent =
     function(context, frameState, opt_transform) {
   var layer = this.getLayer();
-  if (layer.hasListener(ol.render.RenderEventType.POSTCOMPOSE)) {
+  if (layer.hasListener(ol.render.EventType.POSTCOMPOSE)) {
     var transform = goog.isDef(opt_transform) ?
         opt_transform : this.getTransform(frameState);
     var render = new ol.render.canvas.Immediate(context, frameState.extent,
         transform);
-    var postComposeEvent = new ol.render.RenderEvent(
+    var postComposeEvent = new ol.render.Event(ol.render.EventType.POSTCOMPOSE,
-        ol.render.RenderEventType.POSTCOMPOSE, layer, render, frameState,
+        layer, render, frameState, context, null);
-        context, null);
     layer.dispatchEvent(postComposeEvent);
   }
 };

src/ol/renderer/canvas/canvasmaprenderer.js

@@ -10,8 +10,8 @@ goog.require('ol.css');
 goog.require('ol.layer.Image');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
-goog.require('ol.render.RenderEvent');
+goog.require('ol.render.Event');
-goog.require('ol.render.RenderEventType');
+goog.require('ol.render.EventType');
 goog.require('ol.render.canvas.Immediate');
 goog.require('ol.renderer.Map');
 goog.require('ol.renderer.canvas.ImageLayer');
@@ -126,12 +126,11 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
   }
 
   var map = this.getMap();
-  if (map.hasListener(ol.render.RenderEventType.POSTCOMPOSE)) {
+  if (map.hasListener(ol.render.EventType.POSTCOMPOSE)) {
     var render = new ol.render.canvas.Immediate(
         context, frameState.extent, frameState.coordinateToPixelMatrix);
-    var postComposeEvent = new ol.render.RenderEvent(
+    var postComposeEvent = new ol.render.Event(ol.render.EventType.POSTCOMPOSE,
-        ol.render.RenderEventType.POSTCOMPOSE, map, render, frameState, context,
+        map, render, frameState, context, null);
-        null);
     map.dispatchEvent(postComposeEvent);
   }