From 02fb48e15dcaa6fa174458778107bfeb470345a3 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sun, 17 Dec 2017 02:23:17 -0700 Subject: [PATCH] Rename _ol_format_XML_ to XML --- src/ol/format/OWS.js | 6 +++--- src/ol/format/WMSCapabilities.js | 6 +++--- src/ol/format/WMTSCapabilities.js | 6 +++--- src/ol/format/XML.js | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/ol/format/OWS.js b/src/ol/format/OWS.js index 6b5033829e..2d90d8d355 100644 --- a/src/ol/format/OWS.js +++ b/src/ol/format/OWS.js @@ -3,7 +3,7 @@ */ import {inherits} from '../index.js'; import XLink from '../format/XLink.js'; -import _ol_format_XML_ from '../format/XML.js'; +import XML from '../format/XML.js'; import _ol_format_XSD_ from '../format/XSD.js'; import _ol_xml_ from '../xml.js'; @@ -12,10 +12,10 @@ import _ol_xml_ from '../xml.js'; * @extends {ol.format.XML} */ var OWS = function() { - _ol_format_XML_.call(this); + XML.call(this); }; -inherits(OWS, _ol_format_XML_); +inherits(OWS, XML); /** diff --git a/src/ol/format/WMSCapabilities.js b/src/ol/format/WMSCapabilities.js index 2af551e1d9..530beeec52 100644 --- a/src/ol/format/WMSCapabilities.js +++ b/src/ol/format/WMSCapabilities.js @@ -3,7 +3,7 @@ */ import {inherits} from '../index.js'; import XLink from '../format/XLink.js'; -import _ol_format_XML_ from '../format/XML.js'; +import XML from '../format/XML.js'; import _ol_format_XSD_ from '../format/XSD.js'; import _ol_xml_ from '../xml.js'; @@ -17,7 +17,7 @@ import _ol_xml_ from '../xml.js'; */ var WMSCapabilities = function() { - _ol_format_XML_.call(this); + XML.call(this); /** * @type {string|undefined} @@ -25,7 +25,7 @@ var WMSCapabilities = function() { this.version = undefined; }; -inherits(WMSCapabilities, _ol_format_XML_); +inherits(WMSCapabilities, XML); /** diff --git a/src/ol/format/WMTSCapabilities.js b/src/ol/format/WMTSCapabilities.js index 0c240ba383..a8ac5d0f3c 100644 --- a/src/ol/format/WMTSCapabilities.js +++ b/src/ol/format/WMTSCapabilities.js @@ -5,7 +5,7 @@ import {inherits} from '../index.js'; import {boundingExtent} from '../extent.js'; import OWS from '../format/OWS.js'; import XLink from '../format/XLink.js'; -import _ol_format_XML_ from '../format/XML.js'; +import XML from '../format/XML.js'; import _ol_format_XSD_ from '../format/XSD.js'; import _ol_xml_ from '../xml.js'; @@ -18,7 +18,7 @@ import _ol_xml_ from '../xml.js'; * @api */ var _ol_format_WMTSCapabilities_ = function() { - _ol_format_XML_.call(this); + XML.call(this); /** * @type {ol.format.OWS} @@ -27,7 +27,7 @@ var _ol_format_WMTSCapabilities_ = function() { this.owsParser_ = new OWS(); }; -inherits(_ol_format_WMTSCapabilities_, _ol_format_XML_); +inherits(_ol_format_WMTSCapabilities_, XML); /** diff --git a/src/ol/format/XML.js b/src/ol/format/XML.js index 17ab8d234a..c5e6af0649 100644 --- a/src/ol/format/XML.js +++ b/src/ol/format/XML.js @@ -11,7 +11,7 @@ import _ol_xml_ from '../xml.js'; * @abstract * @struct */ -var _ol_format_XML_ = function() { +var XML = function() { }; @@ -19,7 +19,7 @@ var _ol_format_XML_ = function() { * @param {Document|Node|string} source Source. * @return {Object} The parsed result. */ -_ol_format_XML_.prototype.read = function(source) { +XML.prototype.read = function(source) { if (_ol_xml_.isDocument(source)) { return this.readFromDocument(/** @type {Document} */ (source)); } else if (_ol_xml_.isNode(source)) { @@ -38,7 +38,7 @@ _ol_format_XML_.prototype.read = function(source) { * @param {Document} doc Document. * @return {Object} Object */ -_ol_format_XML_.prototype.readFromDocument = function(doc) {}; +XML.prototype.readFromDocument = function(doc) {}; /** @@ -46,5 +46,5 @@ _ol_format_XML_.prototype.readFromDocument = function(doc) {}; * @param {Node} node Node. * @return {Object} Object */ -_ol_format_XML_.prototype.readFromNode = function(node) {}; -export default _ol_format_XML_; +XML.prototype.readFromNode = function(node) {}; +export default XML;