From 756417ee2c1748eb839a9cdb063944db3cfc34af Mon Sep 17 00:00:00 2001 From: tsauerwein Date: Thu, 19 Jan 2017 09:20:29 +0100 Subject: [PATCH] Remove ol.format.filter.Logical --- src/ol/format/filter/logical.js | 19 ------------------- src/ol/format/filter/logicalnary.js | 8 ++++---- src/ol/format/filter/not.js | 8 ++++---- 3 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 src/ol/format/filter/logical.js diff --git a/src/ol/format/filter/logical.js b/src/ol/format/filter/logical.js deleted file mode 100644 index bec00ce144..0000000000 --- a/src/ol/format/filter/logical.js +++ /dev/null @@ -1,19 +0,0 @@ -goog.provide('ol.format.filter.Logical'); - -goog.require('ol'); -goog.require('ol.format.filter.Filter'); - - -/** - * @classdesc - * Abstract class; normally only used for creating subclasses and not instantiated in apps. - * Base class for WFS GetFeature logical filters. - * - * @constructor - * @param {!string} tagName The XML tag name for this filter. - * @extends {ol.format.filter.Filter} - */ -ol.format.filter.Logical = function(tagName) { - ol.format.filter.Filter.call(this, tagName); -}; -ol.inherits(ol.format.filter.Logical, ol.format.filter.Filter); diff --git a/src/ol/format/filter/logicalnary.js b/src/ol/format/filter/logicalnary.js index edd295d57a..fd19fe8909 100644 --- a/src/ol/format/filter/logicalnary.js +++ b/src/ol/format/filter/logicalnary.js @@ -1,7 +1,7 @@ goog.provide('ol.format.filter.LogicalNary'); goog.require('ol'); -goog.require('ol.format.filter.Logical'); +goog.require('ol.format.filter.Filter'); /** @@ -12,11 +12,11 @@ goog.require('ol.format.filter.Logical'); * @constructor * @param {!string} tagName The XML tag name for this filter. * @param {...ol.format.filter.Filter} conditions Conditions. - * @extends {ol.format.filter.Logical} + * @extends {ol.format.filter.Filter} */ ol.format.filter.LogicalNary = function(tagName, conditions) { - ol.format.filter.Logical.call(this, tagName); + ol.format.filter.Filter.call(this, tagName); /** * @public @@ -25,4 +25,4 @@ ol.format.filter.LogicalNary = function(tagName, conditions) { this.conditions = Array.prototype.slice.call(arguments, 1); ol.asserts.assert(this.conditions.length >= 2, 57); // At least 2 conditions are required. }; -ol.inherits(ol.format.filter.LogicalNary, ol.format.filter.Logical); +ol.inherits(ol.format.filter.LogicalNary, ol.format.filter.Filter); diff --git a/src/ol/format/filter/not.js b/src/ol/format/filter/not.js index 98cd6f49c0..e07f9f00e6 100644 --- a/src/ol/format/filter/not.js +++ b/src/ol/format/filter/not.js @@ -1,7 +1,7 @@ goog.provide('ol.format.filter.Not'); goog.require('ol'); -goog.require('ol.format.filter.Logical'); +goog.require('ol.format.filter.Filter'); /** @@ -10,12 +10,12 @@ goog.require('ol.format.filter.Logical'); * * @constructor * @param {!ol.format.filter.Filter} condition Filter condition. - * @extends {ol.format.filter.Logical} + * @extends {ol.format.filter.Filter} * @api */ ol.format.filter.Not = function(condition) { - ol.format.filter.Logical.call(this, 'Not'); + ol.format.filter.Filter.call(this, 'Not'); /** * @public @@ -23,4 +23,4 @@ ol.format.filter.Not = function(condition) { */ this.condition = condition; }; -ol.inherits(ol.format.filter.Not, ol.format.filter.Logical); +ol.inherits(ol.format.filter.Not, ol.format.filter.Filter);