@qooxdoo/framework 7.0.0-beta.1 → 7.0.0-beta.10

package/source/class/qx/util/RingBuffer.js

@@ -29,41 +29,36 @@
  * and processed. Whenever this happens, a mark() call can be used so that the
  * next extraction will only get new data.
  */
-qx.Bootstrap.define("qx.util.RingBuffer",
-{
-  extend : Object,
+qx.Bootstrap.define("qx.util.RingBuffer", {
+  extend: Object,
 
   /**
    * Constructor.
    *
    * @param maxEntries {Integer ? 50} Maximum number of entries in the buffer
    */
-  construct : function(maxEntries)
-  {
+  construct(maxEntries) {
     this.setMaxEntries(maxEntries || 50);
   },
 
-
-  members :
-  {
+  members: {
     //Next slot in ringbuffer to use
-    __nextIndexToStoreTo : 0,
+    __nextIndexToStoreTo: 0,
 
     //Number of elements in ring buffer
-    __entriesStored : 0,
+    __entriesStored: 0,
 
     //Was a mark set?
     __isMarkActive: false,
 
     //How many elements were stored since setting of mark?
-    __entriesStoredSinceMark : 0,
+    __entriesStoredSinceMark: 0,
 
     //ring buffer
-    __entries : null,
+    __entries: null,
 
     //Maximum number of messages to store. Could be converted to a qx property.
-    __maxEntries : null,
-
+    __maxEntries: null,
 
     /**
      * Set the maximum number of messages to hold. If null the number of
@@ -73,84 +68,78 @@ qx.Bootstrap.define("qx.util.RingBuffer",
      *
      * @param maxEntries {Integer} the maximum number of messages to hold
      */
-    setMaxEntries : function(maxEntries)
-    {
+    setMaxEntries(maxEntries) {
       this.__maxEntries = maxEntries;
       this.clear();
     },
 
-
     /**
      * Get the maximum number of entries to hold
      *
      * @return {Integer}
      */
-    getMaxEntries : function() {
+    getMaxEntries() {
       return this.__maxEntries;
     },
 
-
     /**
      * Adds a single entry
      *
      * @param entry {var} The data to store
      */
-    addEntry : function(entry)
-    {
+    addEntry(entry) {
       this.__entries[this.__nextIndexToStoreTo] = entry;
 
-      this.__nextIndexToStoreTo = this.__addToIndex(this.__nextIndexToStoreTo, 1);
+      this.__nextIndexToStoreTo = this.__addToIndex(
+        this.__nextIndexToStoreTo,
+        1
+      );
 
       //Count # of stored entries
       var max = this.getMaxEntries();
-      if (this.__entriesStored < max){
+      if (this.__entriesStored < max) {
         this.__entriesStored++;
       }
 
       //Count # of stored elements since last mark call
-      if (this.__isMarkActive && (this.__entriesStoredSinceMark < max)){
+      if (this.__isMarkActive && this.__entriesStoredSinceMark < max) {
         this.__entriesStoredSinceMark++;
       }
     },
-    
-    
+
     /**
      * Returns the number of entries stored
      * @return {Integer}
      */
-    getNumEntriesStored: function() {
+    getNumEntriesStored() {
       return this.__entriesStored;
     },
 
-
     /**
      * Remembers the current position in the ring buffer
      *
      */
-    mark : function(){
+    mark() {
       this.__isMarkActive = true;
       this.__entriesStoredSinceMark = 0;
     },
 
-
     /**
      * Removes the current mark position
      */
-    clearMark : function(){
+    clearMark() {
       this.__isMarkActive = false;
     },
 
-
     /**
      * Returns all stored entries. Mark is ignored.
      *
      * @return {Array} array of stored entries
      */
-    getAllEntries : function() {
+    getAllEntries() {
       return this.getEntries(this.getMaxEntries(), false);
     },
 
-
     /**
      * Returns entries which have been added previously.
      *
@@ -161,8 +150,7 @@ qx.Bootstrap.define("qx.util.RingBuffer",
      *   the last call to mark() will be returned
      * @return {Array} array of stored entries
      */
-    getEntries : function(count, startingFromMark)
-    {
+    getEntries(count, startingFromMark) {
       //Trim count so it does not exceed ringbuffer size
       if (count > this.__entriesStored) {
         count = this.__entriesStored;
@@ -173,24 +161,37 @@ qx.Bootstrap.define("qx.util.RingBuffer",
       if (
         startingFromMark &&
         this.__isMarkActive &&
-        (count > this.__entriesStoredSinceMark)
+        count > this.__entriesStoredSinceMark
       ) {
         count = this.__entriesStoredSinceMark;
       }
 
-      if (count > 0){
+      if (count > 0) {
+        var indexOfYoungestElementInHistory = this.__addToIndex(
+          this.__nextIndexToStoreTo,
+          -1
+        );
 
-        var indexOfYoungestElementInHistory = this.__addToIndex(this.__nextIndexToStoreTo,  -1);
-        var startIndex = this.__addToIndex(indexOfYoungestElementInHistory, - count + 1);
+        var startIndex = this.__addToIndex(
+          indexOfYoungestElementInHistory,
+          -count + 1
+        );
 
         var result;
 
         if (startIndex <= indexOfYoungestElementInHistory) {
           //Requested segment not wrapping around ringbuffer boundary, get in one run
-          result = this.__entries.slice(startIndex, indexOfYoungestElementInHistory + 1);
+          result = this.__entries.slice(
+            startIndex,
+            indexOfYoungestElementInHistory + 1
+          );
         } else {
           //Requested segment wrapping around ringbuffer boundary, get two parts & concat
-          result = this.__entries.slice(startIndex, this.__entriesStored).concat(this.__entries.slice(0, indexOfYoungestElementInHistory + 1));
+          result = this.__entries
+            .slice(startIndex, this.__entriesStored)
+            .concat(
+              this.__entries.slice(0, indexOfYoungestElementInHistory + 1)
+            );
         }
       } else {
         result = [];
@@ -199,19 +200,16 @@ qx.Bootstrap.define("qx.util.RingBuffer",
       return result;
     },
 
-
     /**
      * Clears all entries
      */
-    clear : function()
-    {
+    clear() {
       this.__entries = new Array(this.getMaxEntries());
       this.__entriesStored = 0;
       this.__entriesStoredSinceMark = 0;
       this.__nextIndexToStoreTo = 0;
     },
 
-
     /**
      * Adds a number to an ringbuffer index. Does a modulus calculation,
      * i. e. if the index leaves the ringbuffer space it will wrap around to
@@ -221,12 +219,12 @@ qx.Bootstrap.define("qx.util.RingBuffer",
      * @param addMe {Number} The number to add.
      * @return {Number} The new index
      */
-    __addToIndex : function (idx, addMe){
+    __addToIndex(idx, addMe) {
       var max = this.getMaxEntries();
       var result = (idx + addMe) % max;
 
       //If negative, wrap up into the ringbuffer space
-      if (result < 0){
+      if (result < 0) {
         result += max;
       }
       return result;

package/source/class/qx/util/Serializer.js

@@ -22,11 +22,8 @@
  * @ignore(qx.data, qx.data.IListData)
  * @ignore(qx.locale, qx.locale.LocalizedString)
  */
-qx.Class.define("qx.util.Serializer",
-{
-  statics :
-  {
-
+qx.Class.define("qx.util.Serializer", {
+  statics: {
     /**
      * Serializes the properties of the given qooxdoo object. To get the
      * serialization working, every property needs to have a string
@@ -43,10 +40,11 @@ qx.Class.define("qx.util.Serializer",
      *   objects into strings.
      * @return {String} The serialized object.
      */
-    toUriParameter : function(object, qxSerializer, dateFormat)
-    {
+    toUriParameter(object, qxSerializer, dateFormat) {
       var result = "";
-      var properties = qx.util.PropertyUtil.getAllProperties(object.constructor);
+      var properties = qx.util.PropertyUtil.getAllProperties(
+        object.constructor
+      );
 
       for (var name in properties) {
         // ignore property groups
@@ -57,15 +55,23 @@ qx.Class.define("qx.util.Serializer",
 
         // handle arrays
         if (qx.lang.Type.isArray(value)) {
-          var isdataArray = qx.data && qx.data.IListData &&
-            qx.Class.hasInterface(value && value.constructor, qx.data.IListData);
+          var isdataArray =
+            qx.data &&
+            qx.data.IListData &&
+            qx.Class.hasInterface(
+              value && value.constructor,
+              qx.data.IListData
+            );
+
           for (var i = 0; i < value.length; i++) {
             var valueAtI = isdataArray ? value.getItem(i) : value[i];
             result += this.__toUriParameter(name, valueAtI, qxSerializer);
           }
         } else if (qx.lang.Type.isDate(value) && dateFormat != null) {
           result += this.__toUriParameter(
-            name, dateFormat.format(value), qxSerializer
+            name,
+            dateFormat.format(value),
+            qxSerializer
           );
         } else {
           result += this.__toUriParameter(name, value, qxSerializer);
@@ -74,7 +80,6 @@ qx.Class.define("qx.util.Serializer",
       return result.substring(0, result.length - 1);
     },
 
-
     /**
      * Helper method for {@link #toUriParameter}. Check for qooxdoo objects
      * and returns the serialized name value pair for the given parameter.
@@ -84,9 +89,7 @@ qx.Class.define("qx.util.Serializer",
      * @param qxSerializer {Function?} The serializer for qooxdoo objects.
      * @return {String} The serialized name value pair.
      */
-    __toUriParameter : function(name, value, qxSerializer)
-    {
-
+    __toUriParameter(name, value, qxSerializer) {
       if (value && value.$$type == "Class") {
         value = value.classname;
       }
@@ -106,7 +109,6 @@ qx.Class.define("qx.util.Serializer",
       return encodeURIComponent(name) + "=" + encValue + "&";
     },
 
-
     /**
      * Serializes the properties of the given qooxdoo object into a native
      * object.
@@ -126,24 +128,28 @@ qx.Class.define("qx.util.Serializer",
      *   The serialized object. Depending on the input qooxdoo object, the returning
      *   type will vary.
      */
-    toNativeObject : function(object, qxSerializer, dateFormat)
-    {
+    toNativeObject(object, qxSerializer, dateFormat) {
       var result;
 
       // null or undefined
-      if (object == null)
-      {
+      if (object == null) {
         return null;
       }
 
       // data array
-      if (qx.data && qx.data.IListData && qx.Class.hasInterface(object.constructor, qx.data.IListData))
-      {
+      if (
+        qx.data &&
+        qx.data.IListData &&
+        qx.Class.hasInterface(object.constructor, qx.data.IListData)
+      ) {
         result = [];
-        for (var i = 0; i < object.getLength(); i++)
-        {
-          result.push(qx.util.Serializer.toNativeObject(
-            object.getItem(i), qxSerializer, dateFormat)
+        for (var i = 0; i < object.getLength(); i++) {
+          result.push(
+            qx.util.Serializer.toNativeObject(
+              object.getItem(i),
+              qxSerializer,
+              dateFormat
+            )
           );
         }
 
@@ -151,13 +157,15 @@ qx.Class.define("qx.util.Serializer",
       }
 
       // other arrays
-      if (qx.lang.Type.isArray(object))
-      {
+      if (qx.lang.Type.isArray(object)) {
         result = [];
-        for (var i = 0; i < object.length; i++)
-        {
-          result.push(qx.util.Serializer.toNativeObject(
-            object[i], qxSerializer, dateFormat)
+        for (var i = 0; i < object.length; i++) {
+          result.push(
+            qx.util.Serializer.toNativeObject(
+              object[i],
+              qxSerializer,
+              dateFormat
+            )
           );
         }
 
@@ -175,15 +183,12 @@ qx.Class.define("qx.util.Serializer",
       }
 
       // qooxdoo object
-      if (object instanceof qx.core.Object)
-      {
-        if (qxSerializer != null)
-        {
+      if (object instanceof qx.core.Object) {
+        if (qxSerializer != null) {
           var returnValue = qxSerializer(object);
 
           // if we have something returned, return that
-          if (returnValue != undefined)
-          {
+          if (returnValue != undefined) {
             return returnValue;
           }
 
@@ -192,20 +197,21 @@ qx.Class.define("qx.util.Serializer",
 
         result = {};
 
-        var properties =
-          qx.util.PropertyUtil.getAllProperties(object.constructor);
+        var properties = qx.util.PropertyUtil.getAllProperties(
+          object.constructor
+        );
 
-        for (var name in properties)
-        {
+        for (var name in properties) {
           // ignore property groups
-          if (properties[name].group != undefined)
-          {
+          if (properties[name].group != undefined) {
             continue;
           }
 
           var value = object["get" + qx.lang.String.firstUp(name)]();
           result[name] = qx.util.Serializer.toNativeObject(
-            value, qxSerializer, dateFormat
+            value,
+            qxSerializer,
+            dateFormat
           );
         }
 
@@ -218,19 +224,23 @@ qx.Class.define("qx.util.Serializer",
       }
 
       // localized strings
-      if (qx.locale && qx.locale.LocalizedString && object instanceof qx.locale.LocalizedString) {
+      if (
+        qx.locale &&
+        qx.locale.LocalizedString &&
+        object instanceof qx.locale.LocalizedString
+      ) {
         return object.toString();
       }
 
       // JavaScript objects
-      if (qx.lang.Type.isObject(object))
-      {
+      if (qx.lang.Type.isObject(object)) {
         result = {};
 
-        for (var key in object)
-        {
+        for (var key in object) {
           result[key] = qx.util.Serializer.toNativeObject(
-            object[key], qxSerializer, dateFormat
+            object[key],
+            qxSerializer,
+            dateFormat
           );
         }
 
@@ -241,7 +251,6 @@ qx.Class.define("qx.util.Serializer",
       return object;
     },
 
-
     /**
      * Serializes the properties of the given qooxdoo object into a json object.
      *
@@ -255,7 +264,7 @@ qx.Class.define("qx.util.Serializer",
      *   objects into strings.
      * @return {String} The serialized object.
      */
-    toJson : function(object, qxSerializer, dateFormat) {
+    toJson(object, qxSerializer, dateFormat) {
       var result = "";
 
       // null or undefined
@@ -264,10 +273,19 @@ qx.Class.define("qx.util.Serializer",
       }
 
       // data array
-      if (qx.data && qx.data.IListData && qx.Class.hasInterface(object.constructor, qx.data.IListData)) {
+      if (
+        qx.data &&
+        qx.data.IListData &&
+        qx.Class.hasInterface(object.constructor, qx.data.IListData)
+      ) {
         result += "[";
         for (var i = 0; i < object.getLength(); i++) {
-          result += qx.util.Serializer.toJson(object.getItem(i), qxSerializer, dateFormat) + ",";
+          result +=
+            qx.util.Serializer.toJson(
+              object.getItem(i),
+              qxSerializer,
+              dateFormat
+            ) + ",";
         }
         if (result != "[") {
           result = result.substring(0, result.length - 1);
@@ -279,7 +297,9 @@ qx.Class.define("qx.util.Serializer",
       if (qx.lang.Type.isArray(object)) {
         result += "[";
         for (var i = 0; i < object.length; i++) {
-          result += qx.util.Serializer.toJson(object[i], qxSerializer, dateFormat) + ",";
+          result +=
+            qx.util.Serializer.toJson(object[i], qxSerializer, dateFormat) +
+            ",";
         }
         if (result != "[") {
           result = result.substring(0, result.length - 1);
@@ -297,7 +317,6 @@ qx.Class.define("qx.util.Serializer",
         return '"' + object.name + '"';
       }
 
-
       // qooxdoo object
       if (object instanceof qx.core.Object) {
         if (qxSerializer != null) {
@@ -309,14 +328,22 @@ qx.Class.define("qx.util.Serializer",
           // continue otherwise
         }
         result += "{";
-        var properties = qx.util.PropertyUtil.getAllProperties(object.constructor);
+        var properties = qx.util.PropertyUtil.getAllProperties(
+          object.constructor
+        );
+
         for (var name in properties) {
           // ignore property groups
           if (properties[name].group != undefined) {
             continue;
           }
           var value = object["get" + qx.lang.String.firstUp(name)]();
-          result += '"' + name + '":' + qx.util.Serializer.toJson(value, qxSerializer, dateFormat) + ",";
+          result +=
+            '"' +
+            name +
+            '":' +
+            qx.util.Serializer.toJson(value, qxSerializer, dateFormat) +
+            ",";
         }
         if (result != "{") {
           result = result.substring(0, result.length - 1);
@@ -325,7 +352,11 @@ qx.Class.define("qx.util.Serializer",
       }
 
       // localized strings
-      if (qx.locale && qx.locale.LocalizedString && object instanceof qx.locale.LocalizedString) {
+      if (
+        qx.locale &&
+        qx.locale.LocalizedString &&
+        object instanceof qx.locale.LocalizedString
+      ) {
         object = object.toString();
         // no return here because we want to have the string checks as well!
       }
@@ -339,8 +370,12 @@ qx.Class.define("qx.util.Serializer",
       if (qx.lang.Type.isObject(object)) {
         result += "{";
         for (var key in object) {
-          result += '"' + key + '":' +
-                    qx.util.Serializer.toJson(object[key], qxSerializer, dateFormat) + ",";
+          result +=
+            '"' +
+            key +
+            '":' +
+            qx.util.Serializer.toJson(object[key], qxSerializer, dateFormat) +
+            ",";
         }
         if (result != "{") {
           result = result.substring(0, result.length - 1);
@@ -351,13 +386,13 @@ qx.Class.define("qx.util.Serializer",
       // strings
       if (qx.lang.Type.isString(object)) {
         // escape
-        object = object.replace(/([\\])/g, '\\\\');
+        object = object.replace(/([\\])/g, "\\\\");
         object = object.replace(/(["])/g, '\\"');
-        object = object.replace(/([\r])/g, '\\r');
-        object = object.replace(/([\f])/g, '\\f');
-        object = object.replace(/([\n])/g, '\\n');
-        object = object.replace(/([\t])/g, '\\t');
-        object = object.replace(/([\b])/g, '\\b');
+        object = object.replace(/([\r])/g, "\\r");
+        object = object.replace(/([\f])/g, "\\f");
+        object = object.replace(/([\n])/g, "\\n");
+        object = object.replace(/([\t])/g, "\\t");
+        object = object.replace(/([\b])/g, "\\b");
 
         return '"' + object + '"';
       }

package/source/class/qx/util/StringBuilder.js

@@ -31,10 +31,8 @@
  * So this class seems to be the best compromise to handle
  * string concatenation.
  */
-qx.Class.define("qx.util.StringBuilder",
-{
-  extend : qx.type.BaseArray,
-
+qx.Class.define("qx.util.StringBuilder", {
+  extend: qx.type.BaseArray,
 
   /*
   *****************************************************************************
@@ -58,7 +56,7 @@ qx.Class.define("qx.util.StringBuilder",
    * @param length_or_items {Integer|var?null} The initial length of the StringBuilder
    *        OR an argument list of values.
    */
-  construct : function(length_or_items) {
+  construct(length_or_items) {
     qx.type.BaseArray.apply(this, arguments);
   },
 
@@ -68,69 +66,60 @@ qx.Class.define("qx.util.StringBuilder",
   *****************************************************************************
   */
 
-  members :
-  {
+  members: {
     /**
      * Removes all content
      *
      */
-    clear : function() {
+    clear() {
       this.length = 0;
     },
 
-
     /**
      * Returns the concatted strings.
      *
      * @return {String} Concatted strings
      */
-    get : function() {
+    get() {
       return this.join("");
     },
 
-
     /**
      * Adds new strings. Supports multiple arguments.
      *
      * @signature function(varargs)
      * @param varargs {String} The separate strings to add
      */
-    add : null,
-
+    add: null,
 
     /**
      * Whether the string builder is empty
      *
      * @return {Boolean} <code>true</code> when the builder is empty
      */
-    isEmpty : function() {
+    isEmpty() {
       return this.length === 0;
     },
 
-
     /**
      * Returns the size of the strings
      *
      * @return {Integer} The string length
      */
-    size : function(){
+    size() {
       return this.join("").length;
     }
   },
 
-
-
-
   /*
   *****************************************************************************
      DEFER
   *****************************************************************************
   */
 
-  defer : function(statics, members)
-  {
+  defer(statics, members) {
     members.add = members.push;
     members.toString = members.get;
     members.valueOf = members.get;
   }
-});
+});