From 6a93731feebcbdcdd1771b43a1a0e14cc9fe9861 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 5 Nov 2013 23:24:11 +0100 Subject: [PATCH] Rename ol.replay base classes --- src/ol/replay/canvas.js | 12 ++++++------ src/ol/replay/replaybase.js | 28 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/ol/replay/canvas.js b/src/ol/replay/canvas.js index 7c863439b2..135e393157 100644 --- a/src/ol/replay/canvas.js +++ b/src/ol/replay/canvas.js @@ -4,8 +4,8 @@ goog.require('goog.array'); goog.require('goog.asserts'); goog.require('goog.vec.Mat4'); goog.require('ol.replay'); -goog.require('ol.replay.BatchBase'); -goog.require('ol.replay.CanvasBase'); +goog.require('ol.replay.Base'); +goog.require('ol.replay.Batch'); goog.require('ol.replay.FillStyle'); goog.require('ol.replay.StrokeStyle'); @@ -37,7 +37,7 @@ ol.replay.CanvasInstruction; /** * @constructor - * @extends {ol.replay.BatchBase} + * @extends {ol.replay.Batch} * @param {ol.replay.BatchType} type Type. * FIXME make this private? * FIXME accumulate all coordinates between style sets in a single array. @@ -66,7 +66,7 @@ ol.replay.CanvasBatch = function(type) { this.path_ = []; }; -goog.inherits(ol.replay.CanvasBatch, ol.replay.BatchBase); +goog.inherits(ol.replay.CanvasBatch, ol.replay.Batch); /** @@ -204,7 +204,7 @@ ol.replay.CanvasBatch.prototype.drawInternal = function(context, transform) { /** * @constructor - * @extends {ol.replay.CanvasBase} + * @extends {ol.replay.Base} * @param {CanvasRenderingContext2D} context Context. */ ol.replay.Canvas = function(context) { @@ -224,7 +224,7 @@ ol.replay.Canvas = function(context) { this.transform_ = goog.vec.Mat4.createNumberIdentity(); }; -goog.inherits(ol.replay.Canvas, ol.replay.CanvasBase); +goog.inherits(ol.replay.Canvas, ol.replay.Base); /** diff --git a/src/ol/replay/replaybase.js b/src/ol/replay/replaybase.js index ac82137f66..eee09c2d3a 100644 --- a/src/ol/replay/replaybase.js +++ b/src/ol/replay/replaybase.js @@ -1,5 +1,5 @@ -goog.provide('ol.replay.BatchBase'); -goog.provide('ol.replay.CanvasBase'); +goog.provide('ol.replay.Base'); +goog.provide('ol.replay.Batch'); goog.provide('ol.replay.FillStyle'); goog.provide('ol.replay.StrokeStyle'); @@ -34,7 +34,7 @@ ol.replay.StrokeStyle; /** * @constructor */ -ol.replay.BatchBase = function() { +ol.replay.Batch = function() { }; @@ -44,55 +44,55 @@ ol.replay.BatchBase = function() { * @param {number} stride Stride. * @param {boolean} close Close. */ -ol.replay.BatchBase.prototype.addPath = goog.abstractMethod; +ol.replay.Batch.prototype.addPath = goog.abstractMethod; /** * FIXME empty description for jsdoc */ -ol.replay.BatchBase.prototype.beginPath = goog.abstractMethod; +ol.replay.Batch.prototype.beginPath = goog.abstractMethod; /** * FIXME empty description for jsdoc */ -ol.replay.BatchBase.prototype.draw = goog.abstractMethod; +ol.replay.Batch.prototype.draw = goog.abstractMethod; /** * @param {ol.replay.FillStyle} fillStyle Fill style. */ -ol.replay.BatchBase.prototype.setFillStyle = goog.abstractMethod; +ol.replay.Batch.prototype.setFillStyle = goog.abstractMethod; /** * @param {ol.replay.StrokeStyle} strokeStyle Stroke style. */ -ol.replay.BatchBase.prototype.setStrokeStyle = goog.abstractMethod; +ol.replay.Batch.prototype.setStrokeStyle = goog.abstractMethod; /** * @constructor */ -ol.replay.CanvasBase = function() { +ol.replay.Base = function() { }; /** * @param {ol.replay.BatchType} batchType Batch type. - * @return {ol.replay.BatchBase} Batch. + * @return {ol.replay.Batch} Batch. */ -ol.replay.CanvasBase.prototype.createBatch = goog.abstractMethod; +ol.replay.Base.prototype.createBatch = goog.abstractMethod; /** - * @param {ol.replay.BatchBase} batch Batch. + * @param {ol.replay.Batch} batch Batch. */ -ol.replay.CanvasBase.prototype.drawBatch = goog.abstractMethod; +ol.replay.Base.prototype.drawBatch = goog.abstractMethod; /** * @param {goog.vec.Mat4.AnyType} transform Transform. */ -ol.replay.CanvasBase.prototype.setTransform = goog.abstractMethod; +ol.replay.Base.prototype.setTransform = goog.abstractMethod;