@qooxdoo/framework 7.9.2 → 8.0.0-beta.2

package/source/class/qx/data/controller/Tree.js

@@ -335,12 +335,7 @@ qx.Class.define("qx.data.controller.Tree", {
       // get the old ref and delete it
       var oldRef = this.__childrenRef[oldChildren.toHashCode()];
       oldChildren.removeListenerById(oldRef.changeListenerId);
-      this.debug(
-        "1: removing children=" +
-          oldChildren.toHashCode() +
-          " from this=" +
-          this.toHashCode()
-      );
+      this.debug("1: removing children=" + oldChildren.toHashCode() + " from this=" + this.toHashCode());
 
       delete this.__childrenRef[oldChildren.toHashCode()];
       // remove the old change listener for the children
@@ -348,26 +343,14 @@ qx.Class.define("qx.data.controller.Tree", {
 
       // add a new change listener
       var modelNode = oldRef.modelNode;
-      var property = qx.Class.getPropertyDefinition(
-        oldRef.modelNode.constructor,
-        this.getChildPath()
-      );
-
-      var eventName = property.event;
-      var changeChildernListenerId = modelNode.addListener(
-        eventName,
-        this.__changeChildrenArray,
-        this
-      );
+      var property = qx.Class.getByProperty(oldRef.modelNode.constructor, this.getChildPath());
+
+      var eventName = property.getEventName();
+      var changeChildernListenerId = modelNode.addListener(eventName, this.__changeChildrenArray, this);
 
       // add the new ref
       var treeNode = oldRef.treeNode;
-      this.debug(
-        "1: adding children=" +
-          children.toHashCode() +
-          " to this=" +
-          this.toHashCode()
-      );
+      this.debug("1: adding children=" + children.toHashCode() + " to this=" + this.toHashCode());
 
       this.__childrenRef[children.toHashCode()] = {
         modelNode: modelNode,
@@ -426,9 +409,7 @@ qx.Class.define("qx.data.controller.Tree", {
       // check for the binding knowledge
       if (
         (this.getLabelPath() == null && this.getDelegate() == null) ||
-        (this.getLabelPath() == null &&
-          this.getDelegate() != null &&
-          this.getDelegate().bindItem == null)
+        (this.getLabelPath() == null && this.getDelegate() != null && this.getDelegate().bindItem == null)
       ) {
         return;
       }
@@ -461,44 +442,24 @@ qx.Class.define("qx.data.controller.Tree", {
      */
     __updateTreeChildren(rootNode, modelNode) {
       // ignore items which don't have children
-      if (
-        modelNode["get" + qx.lang.String.firstUp(this.getChildPath())] ==
-        undefined
-      ) {
+      if (modelNode["get" + qx.lang.String.firstUp(this.getChildPath())] == undefined) {
         return;
       }
       // get all children of the current model node
-      var children =
-        modelNode["get" + qx.lang.String.firstUp(this.getChildPath())]();
+      var children = modelNode["get" + qx.lang.String.firstUp(this.getChildPath())]();
 
       // store the children reference
       if (this.__childrenRef[children.toHashCode()] == undefined) {
         // add the listener for the change
-        var changeListenerId = children.addListener(
-          "change",
-          this.__changeModelChildren,
-          this
-        );
+        var changeListenerId = children.addListener("change", this.__changeModelChildren, this);
 
         // add a listener for the change of the children array itself
-        var property = qx.Class.getPropertyDefinition(
-          modelNode.constructor,
-          this.getChildPath()
-        );
-
-        var eventName = property.event;
-        var changeChildernListenerId = modelNode.addListener(
-          eventName,
-          this.__changeChildrenArray,
-          this
-        );
-
-        this.debug(
-          "2: adding children=" +
-            children.toHashCode() +
-            " to this=" +
-            this.toHashCode()
-        );
+        var property = qx.Class.getByProperty(modelNode.constructor, this.getChildPath());
+
+        var eventName = property.getEventName();
+        var changeChildernListenerId = modelNode.addListener(eventName, this.__changeChildrenArray, this);
+
+        this.debug("2: adding children=" + children.toHashCode() + " to this=" + this.toHashCode());
 
         this.__childrenRef[children.toHashCode()] = {
           modelNode: modelNode,
@@ -511,10 +472,7 @@ qx.Class.define("qx.data.controller.Tree", {
       // go threw all children in the model
       for (var i = 0; i < children.length; i++) {
         // if there is no node in the tree or the current node does not fit
-        if (
-          rootNode.getChildren()[i] == null ||
-          children.getItem(i) != rootNode.getChildren()[i].getModel()
-        ) {
+        if (rootNode.getChildren()[i] == null || children.getItem(i) != rootNode.getChildren()[i].getModel()) {
           //check if the node was just moved
           for (var j = i; j < rootNode.getChildren().length; j++) {
             if (rootNode.getChildren()[j].getModel() === children.getItem(i)) {
@@ -553,11 +511,7 @@ qx.Class.define("qx.data.controller.Tree", {
         }
       }
       // remove the rest of the tree items if they exist
-      for (
-        var i = rootNode.getChildren().length - 1;
-        i >= children.length;
-        i--
-      ) {
+      for (var i = rootNode.getChildren().length - 1; i >= children.length; i--) {
         var treeFolder = rootNode.getChildren()[i];
         this.__removeFolder(treeFolder, rootNode);
       }
@@ -626,12 +580,7 @@ qx.Class.define("qx.data.controller.Tree", {
       if (model[childrenGetterName] != undefined) {
         // remove the old children listener
         var children = model[childrenGetterName]();
-        this.debug(
-          "2: removing children=" +
-            children.toHashCode() +
-            " from this=" +
-            this.toHashCode()
-        );
+        this.debug("2: removing children=" + children.toHashCode() + " from this=" + this.toHashCode());
 
         var oldRef = this.__childrenRef[children.toHashCode()];
         children.removeListenerById(oldRef.changeListenerId);
@@ -683,9 +632,7 @@ qx.Class.define("qx.data.controller.Tree", {
       qx.core.ObjectRegistry.register(modelNode);
       if (storage[modelNode.toHashCode()]) {
         if (storage[modelNode.toHashCode()].id) {
-          throw new Error(
-            "Can not bind the same target property '" + targetPath + "' twice."
-          );
+          throw new Error("Can not bind the same target property '" + targetPath + "' twice.");
         }
         storage[modelNode.toHashCode()].id = id;
       } else {
@@ -717,13 +664,7 @@ qx.Class.define("qx.data.controller.Tree", {
      * @param sourceWidget {qx.ui.tree.core.AbstractTreeItem} The source widget.
      * @param modelNode {var} The model node which should be bound to the target.
      */
-    bindPropertyReverse(
-      targetPath,
-      sourcePath,
-      options,
-      sourceWidget,
-      modelNode
-    ) {
+    bindPropertyReverse(targetPath, sourcePath, options, sourceWidget, modelNode) {
       // set up the binding
       var id = sourceWidget.bind(sourcePath, modelNode, targetPath, options);
 
@@ -736,11 +677,7 @@ qx.Class.define("qx.data.controller.Tree", {
       qx.core.ObjectRegistry.register(modelNode);
       if (storage[modelNode.toHashCode()]) {
         if (storage[modelNode.toHashCode()].reverseId) {
-          throw new Error(
-            "Can not reverse bind the same target property '" +
-              targetPath +
-              "' twice."
-          );
+          throw new Error("Can not reverse bind the same target property '" + targetPath + "' twice.");
         }
         storage[modelNode.toHashCode()].reverseId = id;
       } else {
@@ -771,23 +708,11 @@ qx.Class.define("qx.data.controller.Tree", {
      */
     bindDefaultProperties(treeNode, modelNode) {
       // label binding
-      this.bindProperty(
-        this.getLabelPath(),
-        "label",
-        this.getLabelOptions(),
-        treeNode,
-        modelNode
-      );
+      this.bindProperty(this.getLabelPath(), "label", this.getLabelOptions(), treeNode, modelNode);
 
       // icon binding
       if (this.getIconPath() != null) {
-        this.bindProperty(
-          this.getIconPath(),
-          "icon",
-          this.getIconOptions(),
-          treeNode,
-          modelNode
-        );
+        this.bindProperty(this.getIconPath(), "icon", this.getIconOptions(), treeNode, modelNode);
       }
     },
 
@@ -872,12 +797,7 @@ qx.Class.define("qx.data.controller.Tree", {
      * @param old {Object} The old delegate.
      */
     _setConfigureItem(value, old) {
-      if (
-        value != null &&
-        value.configureItem != null &&
-        this.getTarget() != null &&
-        this.getModel() != null
-      ) {
+      if (value != null && value.configureItem != null && this.getTarget() != null && this.getModel() != null) {
         var children = this.getTarget().getRoot().getItems(true, true, false);
         for (var i = 0; i < children.length; i++) {
           value.configureItem(children[i]);
@@ -902,13 +822,7 @@ qx.Class.define("qx.data.controller.Tree", {
         return;
       }
       // do nothing it the delegate function has not changed
-      if (
-        old &&
-        old.createItem &&
-        value &&
-        value.createItem &&
-        old.createItem == value.createItem
-      ) {
+      if (old && old.createItem && value && value.createItem && old.createItem == value.createItem) {
         return;
       }
       this._startSelectionModification();
@@ -931,11 +845,7 @@ qx.Class.define("qx.data.controller.Tree", {
       // if a new bindItem function is set
       if (value != null && value.bindItem != null) {
         // do nothing if the bindItem function did not change
-        if (
-          old != null &&
-          old.bindItem != null &&
-          value.bindItem == old.bindItem
-        ) {
+        if (old != null && old.bindItem != null && value.bindItem == old.bindItem) {
           return;
         }
         this.__buildTree();

package/source/class/qx/data/marshal/Json.js

@@ -37,10 +37,6 @@ qx.Class.define("qx.data.marshal.Json", {
   },
 
   statics: {
-    /**
-     * Set to true when a warning has been shown that we are using the deprecated behaviour of trying to marshall non-POJO objects into Qooxdoo objects.
-     */
-    __shownNotBreakingOnNonPojosWarning: false,
     $$instance: null,
 
     /**
@@ -76,29 +72,7 @@ qx.Class.define("qx.data.marshal.Json", {
      * </code>
      */
     legacyJsonHash(data, includeBubbleEvents) {
-      return (
-        Object.keys(data).sort().join('"') +
-        (includeBubbleEvents === true ? "♥" : "")
-      );
-    },
-
-    /**
-     * If the environment setting "qx.data.marshal.Json.breakOnNonPojos" is not set,
-     * it means we are using the old behaviour of marshalling non-POJO objects.
-     * A warning is shown if it hasn't been shown already.
-     */
-    checkIfWarnAboutNotBreakingOnNonPojos() {
-      if (
-        !qx.core.Environment.get("qx.data.marshal.Json.breakOnNonPojos") &&
-        !this.__shownNotBreakingOnNonPojosWarning
-      ) {
-        console.warn(
-          `Using deprecated behaviour of not breaking on non-POJOs when marshalling.
-          Please set the environment setting "qx.data.marshal.Json.breakOnNonPojos" to enable the new behaviour.
-          The old behaviour will be removed in the next major release of Qooxdoo.`
-        );
-        this.__shownNotBreakingOnNonPojosWarning = true;
-      }
+      return Object.keys(data).sort().join('"') + (includeBubbleEvents === true ? "♥" : "");
     }
   },
 
@@ -119,10 +93,7 @@ qx.Class.define("qx.data.marshal.Json", {
       if (this.__delegate && this.__delegate.getJsonHash) {
         return this.__delegate.getJsonHash(data, includeBubbleEvents);
       }
-      return (
-        Object.keys(data).sort().join("|") +
-        (includeBubbleEvents === true ? "♥" : "")
-      );
+      return Object.keys(data).sort().join("|") + (includeBubbleEvents === true ? "♥" : "");
     },
 
     /**
@@ -193,35 +164,18 @@ qx.Class.define("qx.data.marshal.Json", {
      * @param depth {Number} The depth of the data relative to the data's root.
      */
     __toClass(data, includeBubbleEvents, parentProperty, depth) {
-      const breakOnNonPojos = qx.core.Environment.get(
-        "qx.data.marshal.Json.breakOnNonPojos"
-      );
-      this.constructor.checkIfWarnAboutNotBreakingOnNonPojos();
-
       // break on all primitive json types and qooxdoo objects
-      let shouldBreak;
-      if (breakOnNonPojos) {
-        shouldBreak =
-          !qx.lang.Type.isPojo(data) ||
-          !!data.$$isString || // check for localized strings
-          data instanceof qx.core.Object;
-      } else {
-        shouldBreak =
-          !qx.lang.Type.isObject(data) ||
-          !!data.$$isString || // check for localized strings
-          data instanceof qx.core.Object;
-      }
+      let shouldBreak =
+        !qx.lang.Type.isPojo(data) ||
+        !!data.$$isString || // check for localized strings
+        data instanceof qx.core.Object;
+      
 
       if (shouldBreak) {
         // check for arrays
         if (data instanceof Array || qx.Bootstrap.getClass(data) == "Array") {
           for (var i = 0; i < data.length; i++) {
-            this.__toClass(
-              data[i],
-              includeBubbleEvents,
-              parentProperty + "[" + i + "]",
-              depth + 1
-            );
+            this.__toClass(data[i], includeBubbleEvents, parentProperty + "[" + i + "]", depth + 1);
           }
         }
 
@@ -247,15 +201,15 @@ qx.Class.define("qx.data.marshal.Json", {
       }
 
       // class is defined by the delegate
-      if (
-        this.__delegate &&
-        this.__delegate.getModelClass &&
-        this.__delegate.getModelClass(hash, data, parentProperty, depth) != null
-      ) {
+      if (this.__delegate && this.__delegate.getModelClass && this.__delegate.getModelClass(hash, data, parentProperty, depth) != null) {
         return;
       }
 
       // create the properties map
+      let defaultProperties = {};
+      for (let propName of qx.Class.getProperties(qx.core.Object)) {
+        defaultProperties[propName] = true;
+      }
       var properties = {};
       // include the disposeItem for the dispose process.
       var members = { __disposeItem: this.__disposeItem };
@@ -269,34 +223,31 @@ qx.Class.define("qx.data.marshal.Json", {
         key = key.replace(/-|\.|\s+/g, "");
         // check for valid JavaScript identifier (leading numbers are ok)
         if (qx.core.Environment.get("qx.debug")) {
-          this.assertTrue(
-            /^[$0-9A-Za-z_]*$/.test(key),
-            "The key '" + key + "' is not a valid JavaScript identifier."
-          );
+          this.assertTrue(/^[$0-9A-Za-z_]*$/.test(key), "The key '" + key + "' is not a valid JavaScript identifier.");
         }
 
-        properties[key] = {};
-        properties[key].nullable = true;
-        properties[key].event = "change" + qx.lang.String.firstUp(key);
-        // bubble events
-        if (includeBubbleEvents) {
-          properties[key].apply = "_applyEventPropagation";
-        }
-        // validation rules
-        if (this.__delegate && this.__delegate.getValidationRule) {
-          var rule = this.__delegate.getValidationRule(hash, key);
-          if (rule) {
-            properties[key].validate = "_validate" + key;
-            members["_validate" + key] = rule;
+        if (!defaultProperties[key]) {
+          properties[key] = {};
+          properties[key].nullable = true;
+          properties[key].event = "change" + qx.lang.String.firstUp(key);
+          // bubble events
+          if (includeBubbleEvents) {
+            properties[key].apply = "_applyEventPropagation";
+          }
+          // validation rules
+          if (this.__delegate && this.__delegate.getValidationRule) {
+            var rule = this.__delegate.getValidationRule(hash, key);
+            if (rule) {
+              properties[key].validate = "_validate" + key;
+              members["_validate" + key] = rule;
+            }
           }
         }
       }
 
       // try to get the superclass, qx.core.Object as default
       if (this.__delegate && this.__delegate.getModelSuperClass) {
-        var superClass =
-          this.__delegate.getModelSuperClass(hash, parentProperty, depth) ||
-          qx.core.Object;
+        var superClass = this.__delegate.getModelSuperClass(hash, parentProperty, depth) || qx.core.Object;
       } else {
         var superClass = qx.core.Object;
       }
@@ -304,11 +255,7 @@ qx.Class.define("qx.data.marshal.Json", {
       // try to get the mixins
       var mixins = [];
       if (this.__delegate && this.__delegate.getModelMixins) {
-        var delegateMixins = this.__delegate.getModelMixins(
-          hash,
-          parentProperty,
-          depth
-        );
+        var delegateMixins = this.__delegate.getModelMixins(hash, parentProperty, depth);
 
         // check if its an array
         if (!qx.lang.Type.isArray(delegateMixins)) {
@@ -368,12 +315,7 @@ qx.Class.define("qx.data.marshal.Json", {
       var delegateClass;
       // get the class from the delegate
       if (this.__delegate && this.__delegate.getModelClass) {
-        delegateClass = this.__delegate.getModelClass(
-          hash,
-          data,
-          parentProperty,
-          depth
-        );
+        delegateClass = this.__delegate.getModelClass(hash, data, parentProperty, depth);
       }
       if (delegateClass != null) {
         return new delegateClass();
@@ -384,12 +326,7 @@ qx.Class.define("qx.data.marshal.Json", {
           // Extra check for possible bubble-event feature inconsistency
           var noBubbleClassName = className.replace("♥", "");
           if (qx.Class.getByName(noBubbleClassName)) {
-            throw new Error(
-              "Class '" +
-                noBubbleClassName +
-                "' found, " +
-                "but it does not support changeBubble event."
-            );
+            throw new Error("Class '" + noBubbleClassName + "' found, " + "but it does not support changeBubble event.");
           }
           throw new Error("Class '" + className + "' could not be found.");
         }
@@ -442,49 +379,27 @@ qx.Class.define("qx.data.marshal.Json", {
      * @return {qx.core.Object} The created model object.
      */
     __toModel(data, includeBubbleEvents, parentProperty, depth) {
-      const breakOnNonPojos = qx.core.Environment.get(
-        "qx.data.marshal.Json.breakOnNonPojos"
-      );
-      this.constructor.checkIfWarnAboutNotBreakingOnNonPojos();
-
       var isObject = qx.lang.Type.isObject(data);
       var isPojo = qx.lang.Type.isPojo(data);
 
-      var isArray =
-        data instanceof Array || qx.Bootstrap.getClass(data) == "Array";
+      var isArray = data instanceof Array || qx.Bootstrap.getClass(data) == "Array";
 
-      let shouldBreak;
-      if (breakOnNonPojos) {
-        shouldBreak =
-          (!isPojo && !isArray) ||
-          !!data.$$isString || // check for localized strings
-          data instanceof qx.core.Object;
-      } else {
-        shouldBreak =
-          (!isObject && !isArray) ||
-          !!data.$$isString || // check for localized strings
-          data instanceof qx.core.Object;
-      }
+      let shouldBreak =
+        (!isPojo && !isArray) ||
+        !!data.$$isString || // check for localized strings
+        data instanceof qx.core.Object;
+      
 
       if (shouldBreak) {
         return data;
 
         // ignore rules
-      } else if (
-        this.__ignore(
-          this.__jsonToBestHash(data, includeBubbleEvents),
-          parentProperty,
-          depth
-        )
-      ) {
+      } else if (this.__ignore(this.__jsonToBestHash(data, includeBubbleEvents), parentProperty, depth)) {
         return data;
       } else if (isArray) {
         var arrayClass = qx.data.Array;
         if (this.__delegate && this.__delegate.getArrayClass) {
-          var customArrayClass = this.__delegate.getArrayClass(
-            parentProperty,
-            depth
-          );
+          var customArrayClass = this.__delegate.getArrayClass(parentProperty, depth);
 
           arrayClass = customArrayClass || arrayClass;
         }
@@ -494,17 +409,10 @@ qx.Class.define("qx.data.marshal.Json", {
         array.setAutoDisposeItems(true);
 
         for (var i = 0; i < data.length; i++) {
-          array.push(
-            this.__toModel(
-              data[i],
-              includeBubbleEvents,
-              parentProperty + "[" + i + "]",
-              depth + 1
-            )
-          );
+          array.push(this.__toModel(data[i], includeBubbleEvents, parentProperty + "[" + i + "]", depth + 1));
         }
         return array;
-      } else if (breakOnNonPojos ? isPojo : isObject) {
+      } else if (isPojo) {
         // create an instance for the object
         var hash = this.__jsonToBestHash(data, includeBubbleEvents);
         var model = this.__createInstance(hash, data, parentProperty, depth);
@@ -518,27 +426,16 @@ qx.Class.define("qx.data.marshal.Json", {
           }
           var propertyNameReplaced = propertyName.replace(/-|\.|\s+/g, "");
           // warn if there has been a replacement
-          if (
-            qx.core.Environment.get("qx.debug") &&
-            qx.core.Environment.get("qx.debug.databinding")
-          ) {
+          if (qx.core.Environment.get("qx.debug") && qx.core.Environment.get("qx.debug.databinding")) {
             if (propertyNameReplaced != propertyName) {
-              this.warn(
-                "The model contained an illegal name: '" +
-                  key +
-                  "'. Replaced it with '" +
-                  propertyName +
-                  "'."
-              );
+              this.warn("The model contained an illegal name: '" + key + "'. Replaced it with '" + propertyName + "'.");
             }
           }
           propertyName = propertyNameReplaced;
           // only set the properties if they are available [BUG #5909]
           var setterName = "set" + qx.lang.String.firstUp(propertyName);
           if (model[setterName]) {
-            model[setterName](
-              this.__toModel(data[key], includeBubbleEvents, key, depth + 1)
-            );
+            model[setterName](this.__toModel(data[key], includeBubbleEvents, key, depth + 1));
           }
         }
         return model;

package/source/class/qx/data/store/Json.js

@@ -112,8 +112,6 @@ qx.Class.define("qx.data.store.Json", {
         "timeout",
         "failed"
       ],
-
-      init: "configured",
       event: "changeState"
     },
 

package/source/class/qx/dev/Debug.js

@@ -295,7 +295,7 @@ qx.Class.define("qx.dev.Debug", {
         return message + newLine;
       } else if (model.constructor != null) {
         // go threw all properties
-        var properties = model.constructor.$$properties;
+        var properties = model.constructor.prototype.$$properties;
         for (var key in properties) {
           message += newLine;
           // print out the indentation