Merge pull request #201 from marcjansen/version

Refactor namespace and version setup

Author: marcjansen

src/GeoExt/Action.js

@@ -25,6 +25,9 @@
 Ext.define('GeoExt.Action', {
     extend: 'Ext.Action',
     alias : 'widget.gx_action',
+    requires: [
+        'GeoExt.Version'
+    ],
 
     /**
      * The OpenLayers control wrapped in this action.

src/GeoExt/FeatureRenderer.js

@@ -23,6 +23,9 @@
 Ext.define('GeoExt.FeatureRenderer', {
     extend: 'Ext.Component',
     alias: 'widget.gx_renderer',
+    requires: [
+        'GeoExt.Version'
+    ],
 
     /**
      * Optional vector to be drawn.  If not provided, and if `symbolizers`

src/GeoExt/Form.js

@@ -46,6 +46,10 @@
     };
 
     Ext.define('GeoExt.Form', {
+        requires: [
+            'GeoExt.Version'
+        ],
+
         singleton: true,
 
         /**

src/GeoExt/GeoExt.js

@@ -15,6 +15,9 @@
 Ext.define('GeoExt.Lang', {
     extend: 'Ext.util.Observable',
     singleton: true,
+    requires: [
+        'GeoExt.Version'
+    ],
 
     /**
      * The current language tag.  Use `#set` to set the locale. Defaults

src/GeoExt/Lang.js

@@ -18,7 +18,9 @@
 Ext.define('GeoExt.LegendImage', {
     extend : 'Ext.Component',
     alias : 'widget.gx_legendimage',
-
+    requires: [
+        'GeoExt.Version'
+    ],
     /**
      * The url of the image to load.
      *

src/GeoExt/LegendImage.js

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2008-2013 The Open Source Geospatial Foundation
+ *
+ * Published under the BSD license.
+ * See https://github.com/geoext/geoext2/blob/master/license.txt for the full
+ * text of the license.
+ */
+(function() {
+    var major = 2,
+        minor = 0,
+        patch = 1,
+        label = 'dev',
+        environment = [],
+        v = '';
+
+    // Concatenate GeoExt version.
+    v = 'v' + major + '.' + minor + '.' + patch + (label ? '.' + label : '');
+
+    // Grab versions of libraries in the environment
+    if ( Ext.versions.extjs.version ) {
+        environment.push('ExtJS: ' + Ext.versions.extjs.version);
+    }
+    if ( OpenLayers ) {
+        environment.push('OpenLayers: ' + OpenLayers.VERSION_NUMBER);
+    }
+    environment.push('GeoExt: ' + v);
+
+    /**
+     * A singleton class holding the properties #version with the current
+     * GeoExt version and #environment with a string about the surrounding
+     * libraries ExtJS and OpenLayers.
+     */
+    Ext.define('GeoExt.Version', {
+        singleton: true,
+
+        /**
+         * The version number of GeoExt.
+         *
+         * @property {String} version
+         */
+        version: v,
+
+        /**
+         * Lists the versions of the currently loaded libraries and contains the
+         * versions of `ExtJS`, `OpenLayers` and `GeoExt`.
+         *
+         * @property {String} environment
+         */
+        environment: (environment.join(', '))
+    }, function() {
+        /**
+         * The GeoExt root object.
+         *
+         * @class GeoExt
+         * @singleton
+         */
+        /**
+         * @inheritdoc GeoExt.Version#version
+         * @member GeoExt
+         * @property version
+         */
+        GeoExt.version = GeoExt.Version.version;
+    });
+})();

src/GeoExt/Version.js

@@ -13,7 +13,10 @@
  */
 Ext.define('GeoExt.container.LayerLegend', {
     extend : 'Ext.container.Container',
-    requires: ['Ext.form.Label'],
+    requires: [
+        'GeoExt.Version',
+        'Ext.form.Label'
+    ],
     alias : 'widget.gx_layerlegend',
     alternateClassName : 'GeoExt.LayerLegend',
 

src/GeoExt/container/LayerLegend.js

@@ -18,7 +18,9 @@
  */
 Ext.define('GeoExt.data.FeatureStore', {
     extend: 'Ext.data.Store',
-    requires: ['GeoExt.data.reader.Feature'],
+    requires: [
+        'GeoExt.data.reader.Feature'
+    ],
 
     statics: {
         /**

src/GeoExt/data/FeatureStore.js

@@ -14,7 +14,11 @@
 Ext.define('GeoExt.data.LayerModel',{
     alternateClassName: 'GeoExt.data.LayerRecord',
     extend: 'Ext.data.Model',
-    requires: ['Ext.data.proxy.Memory', 'Ext.data.reader.Json'],
+    requires: [
+        'Ext.data.proxy.Memory',
+        'Ext.data.reader.Json',
+        'GeoExt.Version'
+    ],
     alias: 'model.gx_layer',
     statics: {
         /**

src/GeoExt/data/LayerModel.js

@@ -51,7 +51,8 @@ Ext.define('GeoExt.data.LayerTreeModel',{
     extend: 'Ext.data.Model',
     requires: [
         'Ext.data.proxy.Memory',
-        'Ext.data.reader.Json'
+        'Ext.data.reader.Json',
+        'GeoExt.Version'
     ],
     alias: 'model.gx_layertree',
     fields: [

src/GeoExt/data/LayerTreeModel.js

@@ -51,7 +51,10 @@
  */
 Ext.define('GeoExt.data.MapfishPrintProvider', {
     extend: 'Ext.util.Observable',
-    requires: ['Ext.data.JsonStore'],
+    requires: [
+        'Ext.data.JsonStore',
+        'GeoExt.Version'
+    ],
 
     /**
      * Base url of the print service. Will always have a trailing "/".

src/GeoExt/data/MapfishPrintProvider.js

@@ -19,6 +19,9 @@
  */
 Ext.define('GeoExt.data.OwsStore', {
     extend: 'Ext.data.Store',
+    requires: [
+        'GeoExt.Version'
+    ],
     alternateClassName: ['GeoExt.data.OWSStore'],
 
     config: {

src/GeoExt/data/OwsStore.js

@@ -19,7 +19,10 @@
  */
 Ext.define('GeoExt.data.RasterStyleModel',{
     extend: 'Ext.data.Model',
-    requires : ['Ext.data.JsonReader'],
+    requires : [
+         'Ext.data.JsonReader',
+         'GeoExt.Version'
+    ],
     idProperty: "filter",
     fields: [
         {name: "symbolizers", mapping: function(v) {

src/GeoExt/data/RasterStyleModel.js

@@ -15,7 +15,8 @@ Ext.define('GeoExt.data.ScaleModel', {
     extend: 'Ext.data.Model',
     requires: [
         'Ext.data.proxy.Memory',
-        'Ext.data.reader.Json'
+        'Ext.data.reader.Json',
+        'GeoExt.Version'
     ],
     alias: 'model.gx_scale',
     fields: [

src/GeoExt/data/ScaleModel.js

@@ -19,7 +19,10 @@
  */
 Ext.define('GeoExt.data.VectorStyleModel', {
     extend : 'Ext.data.Model',
-    requires : ['Ext.data.JsonReader'],
+    requires : [
+        'Ext.data.JsonReader',
+        'GeoExt.Version'
+    ],
     fields : [{
         name : "elseFilter",
         defaultValue : null

src/GeoExt/data/VectorStyleModel.js

@@ -13,6 +13,9 @@
  */
 Ext.define('GeoExt.data.proxy.Protocol', {
     extend: 'Ext.data.proxy.Server',
+    requires: [
+        'GeoExt.Version'
+    ],
     alias: 'proxy.gx_protocol',
 
     /**

src/GeoExt/data/proxy/Protocol.js

@@ -33,7 +33,10 @@
  */
 Ext.define('GeoExt.data.reader.Attribute', {
     extend: 'Ext.data.reader.Json',
-    requires: ['Ext.data.Field'],
+    requires: [
+        'GeoExt.Version',
+        'Ext.data.Field'
+    ],
     alternateClassName: 'GeoExt.data.AttributeReader',
     alias: 'reader.gx_attribute',
 

src/GeoExt/data/reader/Attribute.js

@@ -32,7 +32,9 @@ Ext.define('GeoExt.data.reader.CswRecords', {
     alternateClassName: ['GeoExt.data.CSWRecordsReader'],
     extend: 'Ext.data.reader.Json',
     alias: 'reader.gx_cswrecords',
-
+    requires: [
+        'GeoExt.Version'
+    ],
     /**
      * Creates new Reader.
      *

src/GeoExt/data/reader/CswRecords.js

@@ -18,7 +18,9 @@
 Ext.define('GeoExt.data.reader.Feature', {
     extend: 'Ext.data.reader.Json',
     alias : 'reader.feature',
-
+    requires: [
+        'GeoExt.Version'
+    ],
     /**
      * Force to have our convertRecordData.
      *

src/GeoExt/data/reader/Feature.js

@@ -26,7 +26,9 @@ Ext.define('GeoExt.data.reader.WfsCapabilities', {
     ],
     extend: 'Ext.data.reader.Json',
     alias: 'reader.gx_wfscapabilities',
-
+    requires: [
+        'GeoExt.Version'
+    ],
     /**
      * Creates new Reader.
      *

src/GeoExt/data/reader/WfsCapabilities.js

@@ -19,6 +19,9 @@ Ext.define('GeoExt.data.reader.Wmc', {
     alternateClassName: ['GeoExt.data.WMCReader'],
     extend: 'Ext.data.reader.Json',
     alias: 'reader.gx_wmc',
+    requires: [
+        'GeoExt.Version'
+    ],
 
     /**
      * Creates new Reader.

src/GeoExt/data/reader/Wmc.js

@@ -25,7 +25,9 @@ Ext.define('GeoExt.data.reader.WmsCapabilities', {
     ],
     extend: 'Ext.data.reader.Json',
     alias: 'reader.gx_wmscapabilities',
-
+    requires: [
+        'GeoExt.Version'
+    ],
     /**
      * Creates new Reader.
      *

src/GeoExt/data/reader/WmsCapabilities.js

@@ -20,7 +20,9 @@ Ext.define('GeoExt.data.reader.WmsDescribeLayer', {
     alternateClassName: ['GeoExt.data.reader.WMSDescribeLayer', 'GeoExt.data.WMSCapabilitiesReader'],
     extend: 'Ext.data.reader.Json',
     alias: 'reader.gx_wmsdescribelayer',
-
+    requires: [
+        'GeoExt.Version'
+    ],
     /**
      * Creates new Reader.
      *

src/GeoExt/data/reader/WmsDescribeLayer.js

@@ -48,7 +48,9 @@
  */
 Ext.define('GeoExt.panel.Map', {
     extend: 'Ext.panel.Panel',
-    requires: ['GeoExt.data.LayerStore'],
+    requires: [
+        'GeoExt.data.LayerStore'
+    ],
     alias: 'widget.gx_mappanel',
     alternateClassName: 'GeoExt.MapPanel',
 

src/GeoExt/panel/Map.js

@@ -43,6 +43,9 @@
 Ext.define('GeoExt.selection.FeatureModel', {
     extend: 'Ext.selection.RowModel',
     alias: 'selection.featuremodel',
+    requires: [
+        'GeoExt.Version'
+    ],
 
     /**
      * If true the select feature control is activated and deactivated when

src/GeoExt/selection/FeatureModel.js

@@ -32,7 +32,9 @@
 Ext.define('GeoExt.slider.Tip', {
     extend : 'Ext.slider.Tip',
     alternateClassName : 'GeoExt.SliderTip',
-
+    requires: [
+        'GeoExt.Version'
+    ],
     /**
      * Display the tip when hovering over the thumb.  If `false`, tip will
      * only be displayed while dragging.  Default is `true`.

src/GeoExt/slider/Tip.js

@@ -43,7 +43,9 @@
  */
 Ext.define('GeoExt.state.PermalinkProvider', {
     extend : 'Ext.state.Provider',
-    requires : [],
+    requires : [
+        'GeoExt.Version'
+    ],
     alias : 'widget.gx_permalinkprovider',
 
     /**

src/GeoExt/state/PermalinkProvider.js

@@ -15,6 +15,9 @@
  */
 Ext.define('GeoExt.tree.Column', {
     extend: 'Ext.tree.Column',
+    requires: [
+        'GeoExt.Version'
+    ],
     alias: 'widget.gx_treecolumn',
 
     initComponent: function() {

src/GeoExt/tree/Column.js

@@ -24,7 +24,9 @@
 Ext.define('GeoExt.tree.LayerNode', {
     extend: 'Ext.AbstractPlugin',
     alias: 'plugin.gx_layer',
-
+    requires: [
+        'GeoExt.Version'
+    ],
     /**
      * The init method is invoked after initComponent method has been run for
      * the client Component. It performs plugin initialization.

src/GeoExt/tree/LayerNode.js

@@ -27,7 +27,9 @@
 Ext.define('GeoExt.tree.View', {
     extend: 'Ext.tree.View',
     alias: 'widget.gx_treeview',
-
+    requires: [
+        'GeoExt.Version'
+    ],
     initComponent : function() {
         var me = this;