OpenLayers OpenLayers

Changeset 3767

Show
Ignore:
Timestamp:
07/16/07 16:25:11 (1 year ago)
Author:
tschaub
Message:

#823 New class style. Instead of OldStyle = Class.create(); OldStyle.prototype = Class.inherit(Parent, prototype), we now use NewStyle = OpenLayers.Class(Parent, prototype). New style classes allow for backwards compatibility [you can use OldStyle = Class.create(); Class.inherit(NewStyle, prototype)]. The Class.create and Class.inherit functions are deprecated. Backwards compatibility will be removed at 3.0. Thanks Erik for the careful review.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/openlayers/lib/OpenLayers.js

    r3763 r3767  
    6666    if(!singleFile) { 
    6767        var jsfiles = new Array( 
     68            "OpenLayers/Util.js", 
    6869            "OpenLayers/BaseTypes.js", 
    6970            "OpenLayers/BaseTypes/Class.js", 
    …… 
    7374            "OpenLayers/BaseTypes/Pixel.js", 
    7475            "OpenLayers/BaseTypes/Size.js", 
    75             "OpenLayers/Util.js", 
    7676            "OpenLayers/Console.js", 
    7777            "Rico/Corner.js", 

  • trunk/openlayers/lib/OpenLayers/Ajax.js

    r3545 r3767  
    259259}; 
    260260 
     261 
    261262/** 
    262263 * Class: OpenLayers.Ajax.Request 
    …… 
    265266 *  - <OpenLayers.Ajax.Base> 
    266267 */ 
    267 OpenLayers.Ajax.Request = OpenLayers.Class.create(); 
    268  
    269 /**  
    270  * Property: Events 
    271  * {Array(String)} 
    272  */ 
    273 OpenLayers.Ajax.Request.Events = 
    274   ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete']; 
    275  
    276 OpenLayers.Ajax.Request.prototype =  
    277   OpenLayers.Class.inherit( OpenLayers.Ajax.Base, { 
     268OpenLayers.Ajax.Request = OpenLayers.Class(OpenLayers.Ajax.Base, { 
    278269       
    279270      /** 
    …… 
    488479}); 
    489480 
     481/**  
     482 * Property: Events 
     483 * {Array(String)} 
     484 */ 
     485OpenLayers.Ajax.Request.Events = 
     486  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete']; 
     487 
    490488/** 
    491489 * Function: getElementsByTagNameNS 

  • trunk/openlayers/lib/OpenLayers/BaseTypes/Bounds.js

    r3731 r3767  
    88 * bottom, right, top floats 
    99 */ 
    10 OpenLayers.Bounds = OpenLayers.Class.create(); 
    11 OpenLayers.Bounds.prototype = { 
     10OpenLayers.Bounds = OpenLayers.Class({ 
    1211 
    1312    /** 
    …… 
    458457    /** @final @type String */ 
    459458    CLASS_NAME: "OpenLayers.Bounds" 
    460 }; 
     459}); 
    461460 
    462461/**  

  • trunk/openlayers/lib/OpenLayers/BaseTypes/Class.js

    r3601 r3767  
    44 
    55/** 
    6  * Namespace: OpenLayers.Class 
    7  * Contains functions to create OpenLayers style classes. 
    8  */  
    9 OpenLayers.Class = { 
    10     isPrototype: function () {}, // magic anonymous value 
     6 * Constructor: OpenLayers.Class 
     7 * Base class used to construct all other classes. Includes support for  
     8 *     multiple inheritance.  
     9 *      
     10 * This constructor is new in OpenLayers 2.5.  At OpenLayers 3.0, the old  
     11 *     syntax for creating classes and dealing with inheritance  
     12 *     will be removed. 
     13 *  
     14 * To create a new OpenLayers-style class, use the following syntax: 
     15 * > var MyClass = OpenLayers.Class(prototype); 
     16 * 
     17 * To create a new OpenLayers-style class with multiple inheritance, use the 
     18 *     following syntax: 
     19 * > var MyClass = OpenLayers.Class(Class1, Class2, prototype); 
     20 * 
     21 */ 
     22OpenLayers.Class = function() { 
     23    var Class = function() { 
     24        /** 
     25         * This following condition can be removed at 3.0 - this is only for 
     26         * backwards compatibility while the Class.inherit method is still 
     27         * in use.  So at 3.0, the following three lines would be replaced with 
     28         * simply: 
     29         * this.initialize.apply(this, arguments); 
     30         */ 
     31        if (arguments && arguments[0] != OpenLayers.Class.isPrototype) { 
     32            this.initialize.apply(this, arguments); 
     33        } 
     34    } 
     35    var extended = new Object(); 
     36    var parent; 
     37    for(var i=0; i<arguments.length; ++i) { 
     38        if(typeof arguments[i] == "function") { 
     39            // get the prototype of the superclass 
     40            parent = arguments[i].prototype; 
     41        } else { 
     42            // in this case we're extending with the prototype 
     43            parent = arguments[i]; 
     44        } 
     45        OpenLayers.Util.extend(extended, parent); 
     46    } 
     47    Class.prototype = extended; 
     48    return Class; 
     49} 
    1150 
    12     /** 
    13      * APIFunction: create 
    14      * Create an OpenLayers style class 
    15      * 
    16      * Return: 
    17      * An OpenLayers class 
    18      */ 
    19     create: function() { 
    20         return function() { 
    21             if (arguments && arguments[0] != OpenLayers.Class.isPrototype) 
    22                 this.initialize.apply(this, arguments); 
     51/** 
     52 * Property: isPrototype 
     53 * *Deprecated*.  This is no longer needed and will be removed at 3.0. 
     54 */ 
     55OpenLayers.Class.isPrototype = function () {}; 
     56 
     57/** 
     58 * APIFunction: OpenLayers.create 
     59 * *Deprecated*.  Old method to create an OpenLayers style class.  Use the 
     60 *     <OpenLayers.Class> constructor instead. 
     61 * 
     62 * Return: 
     63 * An OpenLayers class 
     64 */ 
     65OpenLayers.Class.create = function() { 
     66    return function() { 
     67        if (arguments && arguments[0] != OpenLayers.Class.isPrototype) 
     68            this.initialize.apply(this, arguments); 
     69    } 
     70} 
     71 
     72 
     73/** 
     74 * APIFunction: inherit 
     75 * *Deprecated*.  Old method to inherit from one or more OpenLayers style 
     76 *     classes.  Use the <OpenLayers.Class> constructor instead. 
     77 * 
     78 * Parameters: 
     79 * class - One or more classes can be provided as arguments 
     80 * 
     81 * Return: 
     82 * An object prototype 
     83 */ 
     84OpenLayers.Class.inherit = function () { 
     85    var superClass = arguments[0]; 
     86    var proto = new superClass(OpenLayers.Class.isPrototype); 
     87    for (var i = 1; i < arguments.length; i++) { 
     88        if (typeof arguments[i] == "function") { 
     89            var mixin = arguments[i]; 
     90            arguments[i] = new mixin(OpenLayers.Class.isPrototype); 
    2391        } 
    24     }, 
    25   
    26     /** 
    27      * APIFunction: inherit 
    28      * Inherit from one or more OpenLayers style classes 
    29      * 
    30      * Parameters: 
    31      * class - One or more classes can be provided as arguments 
    32      * 
    33      * Return: 
    34      * An object prototype 
    35      */ 
    36     inherit: function () { 
    37         var superClass = arguments[0]; 
    38         var proto = new superClass(OpenLayers.Class.isPrototype); 
    39         for (var i = 1; i < arguments.length; i++) { 
    40             if (typeof arguments[i] == "function") { 
    41                 var mixin = arguments[i]; 
    42                 arguments[i] = new mixin(OpenLayers.Class.isPrototype); 
    43             } 
    44             OpenLayers.Util.extend(proto, arguments[i]); 
    45  
    46             // This is a hack for IE see 
    47             // http://trac.openlayers.org/attachment/ticket/552 
    48             //  
    49             // The problem is that ie doesnt recognize toString as a property 
    50             //  so the util.extend() doesnt copy it over. we do it manually. 
    51             //  
    52             // to be revisited in 3.0 
    53             // 
    54             if((arguments[i].hasOwnProperty && arguments[i].hasOwnProperty('toString')) || 
    55                (!arguments[i].hasOwnProperty && arguments[i].toString)) { 
    56                 proto.toString = arguments[i].toString; 
    57             } 
    58         } 
    59         return proto; 
     92        OpenLayers.Util.extend(proto, arguments[i]); 
    6093    } 
    61 }; 
    62  
    63 /* 
    64     OpenLayers.Class.inherit( OpenLayers.Layer.Grid, OpenLayers.Layer.HTTPRequest, { 
    65         some stuff 
    66     }); 
    67 */ 
     94    return proto; 
     95} 

  • trunk/openlayers/lib/OpenLayers/BaseTypes/LonLat.js

    r3731 r3767  
    77 * This class represents a longitude and latitude pair 
    88 */ 
    9 OpenLayers.LonLat = OpenLayers.Class.create(); 
    10 OpenLayers.LonLat.prototype = { 
     9OpenLayers.LonLat = OpenLayers.Class({ 
    1110 
    1211    /**  
    …… 
    147146    /** @final @type String */ 
    148147    CLASS_NAME: "OpenLayers.LonLat" 
    149 }; 
     148}); 
    150149 
    151150/**  

  • trunk/openlayers/lib/OpenLayers/BaseTypes/Pixel.js

    r3731 r3767  
    77 * This class represents a screen coordinate, in x and y coordinates 
    88 */ 
    9 OpenLayers.Pixel = OpenLayers.Class.create(); 
    10 OpenLayers.Pixel.prototype = { 
     9OpenLayers.Pixel = OpenLayers.Class({ 
    1110     
    1211    /** 
    …… 
    120119    /** @final @type str */ 
    121120    CLASS_NAME: "OpenLayers.Pixel" 
    122 }; 
     121}); 

  • trunk/openlayers/lib/OpenLayers/BaseTypes/Size.js

    r3601 r3767  
    77 * Instances of this class represent a width/height pair 
    88 */ 
    9 OpenLayers.Size = OpenLayers.Class.create(); 
    10 OpenLayers.Size.prototype = { 
     9OpenLayers.Size = OpenLayers.Class({ 
    1110 
    1211    /** 
    …… 
    8483    /** @final @type String */ 
    8584    CLASS_NAME: "OpenLayers.Size" 
    86 }; 
     85}); 

  • trunk/openlayers/lib/OpenLayers/Control.js

    r3728 r3767  
    5050 *  
    5151 */ 
    52 OpenLayers.Control = OpenLayers.Class.create(); 
    53  
    54 OpenLayers.Control.TYPE_BUTTON = 1; 
    55 OpenLayers.Control.TYPE_TOGGLE = 2; 
    56 OpenLayers.Control.TYPE_TOOL   = 3; 
    57  
    58 OpenLayers.Control.prototype = { 
     52OpenLayers.Control = OpenLayers.Class({ 
    5953 
    6054    /**  
    …… 
    242236    /** @final @type String */ 
    243237    CLASS_NAME: "OpenLayers.Control" 
    244 }; 
     238}); 
     239 
     240OpenLayers.Control.TYPE_BUTTON = 1; 
     241OpenLayers.Control.TYPE_TOGGLE = 2; 
     242OpenLayers.Control.TYPE_TOOL   = 3; 

  • trunk/openlayers/lib/OpenLayers/Control/ArgParser.js

    r3545 r3767  
    1212 *  - <OpenLayers.Control> 
    1313 */ 
    14 OpenLayers.Control.ArgParser = OpenLayers.Class.create(); 
    15 OpenLayers.Control.ArgParser.prototype =  
    16   OpenLayers.Class.inherit( OpenLayers.Control, { 
     14OpenLayers.Control.ArgParser = OpenLayers.Class(OpenLayers.Control, { 
    1715 
    1816    /** 

  • trunk/openlayers/lib/OpenLayers/Control/DragPan.js

    r3545 r3767  
    1313 *  - <OpenLayers.Control> 
    1414 */ 
    15 OpenLayers.Control.DragPan = OpenLayers.Class.create(); 
    16 OpenLayers.Control.DragPan.prototype =  
    17   OpenLayers.Class.inherit( OpenLayers.Control, { 
     15OpenLayers.Control.DragPan = OpenLayers.Class(OpenLayers.Control, { 
    1816 
    1917    /**  

  • trunk/openlayers/lib/OpenLayers/Control/DrawFeature.js

    r3545 r3767  
    1414 *  - <OpenLayers.Control> 
    1515 */ 
    16 OpenLayers.Control.DrawFeature = OpenLayers.Class.create(); 
    17 OpenLayers.Control.DrawFeature.prototype =  
    18   OpenLayers.Class.inherit(OpenLayers.Control, { 
     16OpenLayers.Control.DrawFeature = OpenLayers.Class(OpenLayers.Control, { 
    1917     
    2018    /** 

  • trunk/openlayers/lib/OpenLayers/Control/EditingToolbar.js

    r3545 r3767  
    1111  
    1212 */ 
    13 OpenLayers.Control.EditingToolbar = OpenLayers.Class.create(); 
    14 OpenLayers.Control.EditingToolbar.prototype =  
    15   OpenLayers.Class.inherit( OpenLayers.Control.Panel, { 
     13OpenLayers.Control.EditingToolbar = OpenLayers.Class( 
     14  OpenLayers.Control.Panel, { 
    1615 
    1716    /** 

  • trunk/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js

    r3545 r3767  
    1313 *  - <OpenLayers.Control> 
    1414 */ 
    15 OpenLayers.Control.KeyboardDefaults = OpenLayers.Class.create(); 
    16 OpenLayers.Control.KeyboardDefaults.prototype =  
    17   OpenLayers.Class.inherit( OpenLayers.Control, { 
     15OpenLayers.Control.KeyboardDefaults = OpenLayers.Class(OpenLayers.Control, { 
    1816 
    1917    /** 

  • trunk/openlayers/lib/OpenLayers/Control/LayerSwitcher.js

    r3545 r3767  
    1111 *  - <OpenLayers.Control> 
    1212 */ 
    13 OpenLayers.Control.LayerSwitcher = OpenLayers.Class.create(); 
    14 OpenLayers.Control.LayerSwitcher.prototype =  
    15   OpenLayers.Class.inherit( OpenLayers.Control, { 
     13OpenLayers.Control.LayerSwitcher = OpenLayers.Class(OpenLayers.Control, { 
    1614 
    1715    /**   

  • trunk/openlayers/lib/OpenLayers/Control/MouseDefaults.js

    r3545 r3767  
    1111 *  - <OpenLayers.Control> 
    1212 */ 
    13 OpenLayers.Control.MouseDefaults = OpenLayers.Class.create(); 
    14 OpenLayers.Control.MouseDefaults.prototype =  
    15   OpenLayers.Class.inherit( OpenLayers.Control, { 
     13OpenLayers.Control.MouseDefaults = OpenLayers.Class(OpenLayers.Control, { 
    1614 
    1715    /** WARNING WARNING WARNING!!! 

  • trunk/openlayers/lib/OpenLayers/Control/MousePosition.js

    r3545 r3767  
    99 * Class: OpenLayers.Control.MousePosition 
    1010 */ 
    11 OpenLayers.Control.MousePosition = OpenLayers.Class.create(); 
    12 OpenLayers.Control.MousePosition.prototype =  
    13   OpenLayers.Class.inherit( OpenLayers.Control, { 
     11OpenLayers.Control.MousePosition = OpenLayers.Class(OpenLayers.Control, { 
    1412     
    1513    /**  

  • trunk/openlayers/lib/OpenLayers/Control/MouseToolbar.js

    r3545 r3767  
    1212 * If you need this functionality, use Control.NavToolbar instead!!!  
    1313 */ 
    14 OpenLayers.Control.MouseToolbar = OpenLayers.Class.create(); 
    15 OpenLayers.Control.MouseToolbar.X = 6; 
    16 OpenLayers.Control.MouseToolbar.Y = 300; 
    17 OpenLayers.Control.MouseToolbar.prototype =  
    18   OpenLayers.Class.inherit( OpenLayers.Control.MouseDefaults, { 
     14OpenLayers.Control.MouseToolbar = OpenLayers.Class( 
     15                                            OpenLayers.Control.MouseDefaults, { 
    1916     
    2017    /** 
    …… 
    385382}); 
    386383 
     384OpenLayers.Control.MouseToolbar.X = 6; 
     385OpenLayers.Control.MouseToolbar.Y = 300; 

  • trunk/openlayers/lib/OpenLayers/Control/NavToolbar.js

    r3682 r3767  
    1010 * Class: OpenLayers.Control.NavToolbar 
    1111 */ 
    12 OpenLayers.Control.NavToolbar = OpenLayers.Class.create(); 
    13 OpenLayers.Control.NavToolbar.prototype =  
    14   OpenLayers.Class.inherit( OpenLayers.Control.Panel, { 
     12OpenLayers.Control.NavToolbar = OpenLayers.Class(OpenLayers.Control.Panel, { 
    1513 
    1614    /** 

  • trunk/openlayers/lib/OpenLayers/Control/Navigation.js

    r3595 r3767  
    2020 *  - <OpenLayers.Control> 
    2121 */ 
    22 OpenLayers.Control.Navigation = OpenLayers.Class.create(); 
    23 OpenLayers.Control.Navigation.prototype =  
    24   OpenLayers.Class.inherit( OpenLayers.Control, { 
     22OpenLayers.Control.Navigation = OpenLayers.Class(OpenLayers.Control, { 
    2523 
    2624    /**  

  • trunk/openlayers/lib/OpenLayers/Control/OverviewMap.js

    r3587 r3767  
    1616 *  - <OpenLayers.Control> 
    1717 */ 
    18 OpenLayers.Control.OverviewMap = OpenLayers.Class.create(); 
    19 OpenLayers.Control.OverviewMap.prototype =  
    20   OpenLayers.Class.inherit( OpenLayers.Control, { 
     18OpenLayers.Control.OverviewMap = OpenLayers.Class(OpenLayers.Control, { 
    2119 
    2220    /** 

  • trunk/openlayers/lib/OpenLayers/Control/PanZoom.js

    r3766 r3767  
    1212 *  - <OpenLayers.Control> 
    1313 */ 
    14 OpenLayers.Control.PanZoom = OpenLayers.Class.create(); 
    15 OpenLayers.Control.PanZoom.X = 4; 
    16 OpenLayers.Control.PanZoom.Y = 4; 
    17 OpenLayers.Control.PanZoom.prototype =  
    18   OpenLayers.Class.inherit( OpenLayers.Control, { 
     14OpenLayers.Control.PanZoom = OpenLayers.Class(OpenLayers.Control, { 
    1915 
    2016    /**  
    …… 
    183179    CLASS_NAME: "OpenLayers.Control.PanZoom" 
    184180}); 
     181 
     182OpenLayers.Control.PanZoom.X = 4; 
     183OpenLayers.Control.PanZoom.Y = 4; 

  • trunk/openlayers/lib/OpenLayers/Control/PanZoomBar.js

    r3545 r3767  
    1313 *  - <OpenLayers.Control> 
    1414 */ 
    15 OpenLayers.Control.PanZoomBar = OpenLayers.Class.create(); 
    16 OpenLayers.Control.PanZoomBar.prototype =  
    17   OpenLayers.Class.inherit( OpenLayers.Control.PanZoom, { 
     15OpenLayers.Control.PanZoomBar = OpenLayers.Class(OpenLayers.Control.PanZoom, { 
    1816 
    1917    /**  

  • trunk/openlayers/lib/OpenLayers/Control/Panel.js

    r3682 r3767  
    1111 *  - <OpenLayers.Control> 
    1212 */ 
    13 OpenLayers.Control.Panel = OpenLayers.Class.create(); 
    14 OpenLayers.Control.Panel.prototype =  
    15   OpenLayers.Class.inherit( OpenLayers.Control, { 
     13OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, { 
    1614    /** 
    1715     * Property: controls 

  • trunk/openlayers/lib/OpenLayers/Control/Permalink.js

    r3545 r3767  
    1212 *  - <OpenLayers.Control> 
    1313 */ 
    14 OpenLayers.Control.Permalink = OpenLayers.Class.create(); 
    15 OpenLayers.Control.Permalink.prototype =  
    16   OpenLayers.Class.inherit( OpenLayers.Control, { 
     14OpenLayers.Control.Permalink = OpenLayers.Class(OpenLayers.Control, { 
    1715 
    1816    /**  

  • trunk/openlayers/lib/OpenLayers/Control/Scale.js

    r3545 r3767  
    1212 *  - <OpenLayers.Control> 
    1313 */ 
    14 OpenLayers.Control.Scale = OpenLayers.Class.create(); 
    15 OpenLayers.Control.Scale.prototype =  
    16   OpenLayers.Class.inherit( OpenLayers.Control, { 
     14OpenLayers.Control.Scale = OpenLayers.Class(OpenLayers.Control, { 
    1715     
    1816    /** 

  • trunk/openlayers/lib/OpenLayers/Control/SelectFeature.js

    r3749 r3767  
    1414 *  - <OpenLayers.Control> 
    1515 */ 
    16 OpenLayers.Control.SelectFeature = OpenLayers.Class.create(); 
    17 OpenLayers.Control.SelectFeature.prototype =  
    18   OpenLayers.Class.inherit(OpenLayers.Control, { 
     16OpenLayers.Control.SelectFeature = OpenLayers.Class(OpenLayers.Control, { 
    1917     
    2018    /** 

  • trunk/openlayers/lib/OpenLayers/Control/ZoomBox.js

    r3545 r3767  
    1212 *  - <OpenLayers.Control> 
    1313 */ 
    14 OpenLayers.Control.ZoomBox = OpenLayers.Class.create(); 
    15 OpenLayers.Control.ZoomBox.prototype =  
    16   OpenLayers.Class.inherit( OpenLayers.Control, { 
     14OpenLayers.Control.ZoomBox = OpenLayers.Class(OpenLayers.Control, { 
    1715    /** 
    1816     * Property: type 

  • trunk/openlayers/lib/OpenLayers/Control/ZoomToMaxExtent.js

    r3545 r3767  
    1313 *  - <OpenLayers.Control> 
    1414 */ 
    15 OpenLayers.Control.ZoomToMaxExtent = OpenLayers.Class.create(); 
    16 OpenLayers.Control.ZoomToMaxExtent.prototype =  
    17   OpenLayers.Class.inherit( OpenLayers.Control, { 
     15OpenLayers.Control.ZoomToMaxExtent = OpenLayers.Class(OpenLayers.Control, { 
    1816    /** 
    1917     * Property: type 

  • trunk/openlayers/lib/OpenLayers/Events.js

    r3684 r3767  
    335335 * Class: OpenLayers.Events 
    336336 */ 
    337 OpenLayers.Events = OpenLayers.Class.create(); 
    338 OpenLayers.Events.prototype = { 
     337OpenLayers.Events = OpenLayers.Class({ 
    339338 
    340339    /**  
    …… 
    667666    /** @final @type String */ 
    668667    CLASS_NAME: "OpenLayers.Events" 
    669 }; 
     668}); 

  • trunk/openlayers/lib/OpenLayers/Feature.js

    r3686 r3767  
    1212 * class specifically combines a marker and a lonlat. 
    1313 */ 
    14 OpenLayers.Feature = OpenLayers.Class.create(); 
    15 OpenLayers.Feature.prototype= { 
     14OpenLayers.Feature = OpenLayers.Class({ 
    1615 
    1716    /**  
    …… 
    204203    /** @final @type String */ 
    205204    CLASS_NAME: "OpenLayers.Feature" 
    206 }; 
     205}); 

  • trunk/openlayers/lib/OpenLayers/Feature/Vector.js

    r3717 r3767  
    2525 *  - <OpenLayers.Feature> 
    2626 */ 
    27 OpenLayers.Feature.Vector = OpenLayers.Class.create(); 
    28 OpenLayers.Feature.Vector.prototype = 
    29   OpenLayers.Class.inherit( OpenLayers.Feature, { 
     27OpenLayers.Feature.Vector = OpenLayers.Class(OpenLayers.Feature, { 
    3028 
    3129    /**  

  • trunk/openlayers/lib/OpenLayers/Feature/WFS.js

    r3545 r3767  
    1515 *  - <OpenLayers.Feature> 
    1616 */ 
    17 OpenLayers.Feature.WFS = OpenLayers.Class.create(); 
    18 OpenLayers.Feature.WFS.prototype =  
    19   OpenLayers.Class.inherit( OpenLayers.Feature, { 
     17OpenLayers.Feature.WFS = OpenLayers.Class(OpenLayers.Feature, { 
    2018       
    2119    /**  

  • trunk/openlayers/lib/OpenLayers/Format.js

    r3587 r3767  
    1010 * of OpenLayers.Format are expected to have read and write methods. 
    1111 */ 
    12 OpenLayers.Format = OpenLayers.Class.create(); 
    13 OpenLayers.Format.prototype = { 
     12OpenLayers.Format = OpenLayers.Class({ 
    1413     
    1514    /** 
    …… 
    6059    CLASS_NAME: "OpenLayers.Format" 
    6160 
    62 };      
     61});      

  • trunk/openlayers/lib/OpenLayers/Format/GML.js

    r3595 r3767  
    1616 *  - <OpenLayers.Format> 
    1717 */ 
    18 OpenLayers.Format.GML = OpenLayers.Class.create(); 
    19 OpenLayers.Format.GML.prototype =  
    20   OpenLayers.Class.inherit( OpenLayers.Format, { 
     18OpenLayers.Format.GML = OpenLayers.Class(OpenLayers.Format, { 
    2119     
    2220    /* 

  • trunk/openlayers/lib/OpenLayers/Format/GeoRSS.js

    r3595 r3767  
    1313 *  - <OpenLayers.Format> 
    1414 */ 
    15 OpenLayers.Format.GeoRSS = OpenLayers.Class.create(); 
    16 OpenLayers.Format.GeoRSS.prototype =  
    17   OpenLayers.Class.inherit( OpenLayers.Format, { 
     15OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format, { 
    1816     
    1917    /** 

  • trunk/openlayers/lib/OpenLayers/Format/KML.js

    r3595 r3767  
    1616 *  - <OpenLayers.Format> 
    1717 */ 
    18 OpenLayers.Format.KML = OpenLayers.Class.create(); 
    19 OpenLayers.Format.KML.prototype =  
    20   OpenLayers.Class.inherit( OpenLayers.Format, { 
     18OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format, { 
    2119     
    2220    /** 

  • trunk/openlayers/lib/OpenLayers/Format/WFS.js

    r3686 r3767  
    99 * Read/Write WFS.  
    1010 */ 
    11 OpenLayers.Format.WFS = OpenLayers.Class.create(); 
    12 OpenLayers.Format.WFS.prototype =  
    13   OpenLayers.Class.inherit( OpenLayers.Format.GML, { 
     11OpenLayers.Format.WFS = OpenLayers.Class(OpenLayers.Format.GML, { 
    1412     
    1513    /**  

  • trunk/openlayers/lib/OpenLayers/Format/WKT.js

    r3545 r3767  
    1313 *  - <OpenLayers.Format> 
    1414 */ 
    15 OpenLayers.Format.WKT = OpenLayers.Class.create(); 
    16 OpenLayers.Format.WKT.prototype =  
    17   OpenLayers.Class.inherit(OpenLayers.Format, { 
     15OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, { 
    1816     
    1917    /** 

  • trunk/openlayers/lib/OpenLayers/Geometry.js

    r3545 r3767  
    1212 * typical geometry types are described by subclasses of this class. 
    1313 */ 
    14 OpenLayers.Geometry = OpenLayers.Class.create(); 
    15 OpenLayers.Geometry.prototype = { 
     14OpenLayers.Geometry = OpenLayers.Class({