Merged r1559:r1587 from source:/sandbox/crschmidt/noprototype. OpenLayers is now Prototype-free(tm).

git-svn-id: http://svn.openlayers.org/trunk/openlayers@1588 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf

lib/OpenLayers/Layer/Boxes.js

@@ -8,9 +8,9 @@
  * @requires OpenLayers/Layer.js
  * @requires OpenLayers/Layer/Markers.js
  */
-OpenLayers.Layer.Boxes = Class.create();
+OpenLayers.Layer.Boxes = OpenLayers.Class.create();
 OpenLayers.Layer.Boxes.prototype = 
-    Object.extend( new OpenLayers.Layer.Markers(), {
+    OpenLayers.Util.extend( new OpenLayers.Layer.Markers(), {
 
     initialize: function () {
         OpenLayers.Layer.Markers.prototype.initialize.apply(this, arguments);

lib/OpenLayers/Layer/Canvas.js

@@ -7,9 +7,9 @@
  * 
  * @requires OpenLayers/Layer.js
  */
-OpenLayers.Layer.Canvas = Class.create();
+OpenLayers.Layer.Canvas = OpenLayers.Class.create();
 OpenLayers.Layer.Canvas.prototype = 
-  Object.extend( new OpenLayers.Layer(), {
+  OpenLayers.Util.extend( new OpenLayers.Layer(), {
     
     /** Canvas layer is never a base layer. 
      * 

lib/OpenLayers/Layer/EventPane.js

@@ -8,9 +8,9 @@
  * @requires OpenLayers/Layer.js
  * @requires OpenLayers/Util.js
  */
-OpenLayers.Layer.EventPane = Class.create();
+OpenLayers.Layer.EventPane = OpenLayers.Class.create();
 OpenLayers.Layer.EventPane.prototype = 
-  Object.extend(new OpenLayers.Layer, {
+  OpenLayers.Util.extend(new OpenLayers.Layer, {
 
     /** EventPaned layers are always base layers, by necessity.
      * 

lib/OpenLayers/Layer/FixedZoomLevels.js

@@ -44,7 +44,7 @@
  * 
  * @class
  */
-OpenLayers.Layer.FixedZoomLevels = Class.create();
+OpenLayers.Layer.FixedZoomLevels = OpenLayers.Class.create();
 OpenLayers.Layer.FixedZoomLevels.prototype = {
       
   /********************************************************/

lib/OpenLayers/Layer/GeoRSS.js

@@ -7,9 +7,9 @@
  * 
  * @requires OpenLayers/Layer/Markers.js
  */
-OpenLayers.Layer.GeoRSS = Class.create();
+OpenLayers.Layer.GeoRSS = OpenLayers.Class.create();
 OpenLayers.Layer.GeoRSS.prototype = 
-  Object.extend( new OpenLayers.Layer.Markers(), {
+  OpenLayers.Util.extend( new OpenLayers.Layer.Markers(), {
 
     /** store url of text file
     * @type str */
@@ -130,7 +130,7 @@ OpenLayers.Layer.GeoRSS.prototype =
         }
         if (!sameMarkerClicked) {
             var popup = this.createPopup();
-            Event.observe(popup.div, "click",
+            OpenLayers.Event.observe(popup.div, "click",
             function() { 
               for(var i=0; i < this.layer.map.popups.length; i++) { 
                 this.layer.map.removePopup(this.layer.map.popups[i]); 
@@ -138,7 +138,7 @@ OpenLayers.Layer.GeoRSS.prototype =
             }.bindAsEventListener(this));
             this.layer.map.addPopup(popup); 
         }
-        Event.stop(evt);
+        OpenLayers.Event.stop(evt);
     },
 
     /**

lib/OpenLayers/Layer/Google.js

@@ -10,10 +10,10 @@
  * 
  * @requires OpenLayers/Layer/EventPane.js
  */
-OpenLayers.Layer.Google = Class.create();
+OpenLayers.Layer.Google = OpenLayers.Class.create();
 OpenLayers.Layer.Google.prototype =
-  Object.extend( new OpenLayers.Layer.EventPane(), 
-    Object.extend( new OpenLayers.Layer.FixedZoomLevels(), {
+  OpenLayers.Util.extend( new OpenLayers.Layer.EventPane(), 
+    OpenLayers.Util.extend( new OpenLayers.Layer.FixedZoomLevels(), {
     
     /** @type Boolean */
     isFixed: true,

lib/OpenLayers/Layer/Grid.js

@@ -7,9 +7,9 @@
  * 
  * @requires OpenLayers/Layer/HTTPRequest.js
  */
-OpenLayers.Layer.Grid = Class.create();
+OpenLayers.Layer.Grid = OpenLayers.Class.create();
 OpenLayers.Layer.Grid.prototype = 
-  Object.extend( new OpenLayers.Layer.HTTPRequest(), {
+  OpenLayers.Util.extend( new OpenLayers.Layer.HTTPRequest(), {
     
     /** @type OpenLayers.Size */
     tileSize: null,

lib/OpenLayers/Layer/HTTPRequest.js

@@ -7,9 +7,9 @@
  * 
  * @requires OpenLayers/Layer.js
  */
-OpenLayers.Layer.HTTPRequest = Class.create();
+OpenLayers.Layer.HTTPRequest = OpenLayers.Class.create();
 OpenLayers.Layer.HTTPRequest.prototype = 
-  Object.extend( new OpenLayers.Layer(), {
+  OpenLayers.Util.extend( new OpenLayers.Layer(), {
 
     /** @type String */
     url: null,
@@ -33,7 +33,7 @@ OpenLayers.Layer.HTTPRequest.prototype =
         }          
         OpenLayers.Layer.prototype.initialize.apply(this, newArguments);
         this.url = url;
-        this.params = Object.extend( new Object(), params);
+        this.params = OpenLayers.Util.extend( new Object(), params);
     },
 
     /**
@@ -79,7 +79,7 @@ OpenLayers.Layer.HTTPRequest.prototype =
      * @param {Object} newParams
      */
     mergeNewParams:function(newParams) {
-        this.params = Object.extend(this.params, newParams);
+        this.params = OpenLayers.Util.extend(this.params, newParams);
     },
     
 
@@ -106,8 +106,8 @@ OpenLayers.Layer.HTTPRequest.prototype =
 
         // create a new params hashtable with all the layer params and the 
         // new params together. then convert to string
-        var allParams = Object.extend(new Object(), this.params);
-        var allParams = Object.extend(allParams, newParams);
+        var allParams = OpenLayers.Util.extend(new Object(), this.params);
+        var allParams = OpenLayers.Util.extend(allParams, newParams);
         var paramsString = OpenLayers.Util.getParameterString(allParams);
 
         if (paramsString != "") {

lib/OpenLayers/Layer/KaMap.js

@@ -7,9 +7,9 @@
  * 
  * @requires OpenLayers/Layer/Grid.js
  */
-OpenLayers.Layer.KaMap = Class.create();
+OpenLayers.Layer.KaMap = OpenLayers.Class.create();
 OpenLayers.Layer.KaMap.prototype = 
-  Object.extend( new OpenLayers.Layer.Grid(), {
+  OpenLayers.Util.extend( new OpenLayers.Layer.Grid(), {
 
     /** KaMap Layer is always a base layer 
      * 

lib/OpenLayers/Layer/MapServer.js

@@ -5,9 +5,9 @@
 /**
 * @class
 */
-OpenLayers.Layer.MapServer = Class.create();
+OpenLayers.Layer.MapServer = OpenLayers.Class.create();
 OpenLayers.Layer.MapServer.prototype =
-  Object.extend( new OpenLayers.Layer.Grid(), {
+  OpenLayers.Util.extend( new OpenLayers.Layer.Grid(), {
 
     /** @final @type hash */
     DEFAULT_PARAMS: {
@@ -57,8 +57,8 @@ OpenLayers.Layer.MapServer.prototype =
     */
     clone: function (name, params) {
         var mergedParams = {};
-        Object.extend(mergedParams, this.params);
-        Object.extend(mergedParams, params);
+        OpenLayers.Util.extend(mergedParams, this.params);
+        OpenLayers.Util.extend(mergedParams, params);
         var obj = new OpenLayers.Layer.MapServer(name, this.url, mergedParams);
         obj.setTileSize(this.tileSize);
         return obj;

lib/OpenLayers/Layer/Markers.js

@@ -7,9 +7,9 @@
  * 
  * @requires OpenLayers/Layer.js
  */
-OpenLayers.Layer.Markers = Class.create();
+OpenLayers.Layer.Markers = OpenLayers.Class.create();
 OpenLayers.Layer.Markers.prototype = 
-  Object.extend( new OpenLayers.Layer(), {
+  OpenLayers.Util.extend( new OpenLayers.Layer(), {
     
     /** Markers layer is never a base layer. 
      * 

lib/OpenLayers/Layer/MultiMap.js

@@ -7,9 +7,9 @@
  * 
  * @requires OpenLayers/Layer/EventPane.js
  */
-OpenLayers.Layer.MultiMap = Class.create();
+OpenLayers.Layer.MultiMap = OpenLayers.Class.create();
 OpenLayers.Layer.MultiMap.prototype = 
-  Object.extend( new OpenLayers.Layer.EventPane(), {
+  OpenLayers.Util.extend( new OpenLayers.Layer.EventPane(), {
 
     /** @type MMMap */
     multimap: null,

lib/OpenLayers/Layer/Text.js

@@ -7,9 +7,9 @@
  * 
  * @requires OpenLayers/Layer/Markers.js
  */
-OpenLayers.Layer.Text = Class.create();
+OpenLayers.Layer.Text = OpenLayers.Class.create();
 OpenLayers.Layer.Text.prototype = 
-  Object.extend( new OpenLayers.Layer.Markers(), {
+  OpenLayers.Util.extend( new OpenLayers.Layer.Markers(), {
 
     /** store url of text file - this should be specified in the 
      *   "options" hashtable
@@ -145,7 +145,7 @@ OpenLayers.Layer.Text.prototype =
         if (!sameMarkerClicked) {
             this.layer.map.addPopup(this.createPopup()); 
         }
-        Event.stop(evt);
+        OpenLayers.Event.stop(evt);
     },
 
     /**

lib/OpenLayers/Layer/VirtualEarth.js

@@ -7,10 +7,10 @@
  * 
  * @requires OpenLayers/Layer/EventPane.js
  */
-OpenLayers.Layer.VirtualEarth = Class.create();
+OpenLayers.Layer.VirtualEarth = OpenLayers.Class.create();
 OpenLayers.Layer.VirtualEarth.prototype = 
-  Object.extend( new OpenLayers.Layer.EventPane(), 
-    Object.extend( new OpenLayers.Layer.FixedZoomLevels(), {
+  OpenLayers.Util.extend( new OpenLayers.Layer.EventPane(), 
+    OpenLayers.Util.extend( new OpenLayers.Layer.FixedZoomLevels(), {
         
     /** @type VEMap */
     vemap: null,

lib/OpenLayers/Layer/WFS.js

@@ -8,10 +8,10 @@
  * @requires OpenLayers/Layer/Grid.js
  * @requires OpenLayers/Layer/Markers.js
  */
-OpenLayers.Layer.WFS = Class.create();
+OpenLayers.Layer.WFS = OpenLayers.Class.create();
 OpenLayers.Layer.WFS.prototype = 
-  Object.extend(new OpenLayers.Layer.Grid(),
-    Object.extend(new OpenLayers.Layer.Markers(), {
+  OpenLayers.Util.extend(new OpenLayers.Layer.Grid(),
+    OpenLayers.Util.extend(new OpenLayers.Layer.Markers(), {
 
     /** WFS layer is never a base layer. 
      * 

lib/OpenLayers/Layer/WMS.js

@@ -7,9 +7,9 @@
  * 
  * @requires OpenLayers/Layer/Grid.js
  */
-OpenLayers.Layer.WMS = Class.create();
+OpenLayers.Layer.WMS = OpenLayers.Class.create();
 OpenLayers.Layer.WMS.prototype = 
-  Object.extend( new OpenLayers.Layer.Grid(), {
+  OpenLayers.Util.extend( new OpenLayers.Layer.Grid(), {
 
     /** Hashtable of default parameter key/value pairs 
      * @final @type Object */

lib/OpenLayers/Layer/WMS/Untiled.js

@@ -8,9 +8,9 @@
  * @requires OpenLayers/Layer/HTTPRequest.js
  * @requires OpenLayers/Layer/WMS.js
  */
-OpenLayers.Layer.WMS.Untiled = Class.create();
+OpenLayers.Layer.WMS.Untiled = OpenLayers.Class.create();
 OpenLayers.Layer.WMS.Untiled.prototype = 
-  Object.extend( new OpenLayers.Layer.HTTPRequest(), {
+  OpenLayers.Util.extend( new OpenLayers.Layer.HTTPRequest(), {
 
     /** Hashtable of default parameter key/value pairs
      * @final @type Object */

lib/OpenLayers/Layer/WorldWind.js

@@ -7,9 +7,9 @@
  * 
  * @requires OpenLayers/Layer/Grid.js
  */
-OpenLayers.Layer.WorldWind = Class.create();
+OpenLayers.Layer.WorldWind = OpenLayers.Class.create();
 OpenLayers.Layer.WorldWind.prototype = 
-  Object.extend( new OpenLayers.Layer.Grid(), {
+  OpenLayers.Util.extend( new OpenLayers.Layer.Grid(), {
     
     DEFAULT_PARAMS: {
     },

lib/OpenLayers/Layer/Yahoo.js

@@ -7,9 +7,9 @@
  * 
  * @requires OpenLayers/Layer/EventPane.js
  */
-OpenLayers.Layer.Yahoo = Class.create();
+OpenLayers.Layer.Yahoo = OpenLayers.Class.create();
 OpenLayers.Layer.Yahoo.prototype = 
-  Object.extend( new OpenLayers.Layer.EventPane(), {
+  OpenLayers.Util.extend( new OpenLayers.Layer.EventPane(), {
 
     /** @type YMap */
     yahoomap: null,