You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/15 12:05:24 UTC
ignite git commit: IGNITE-843 minor XML and Java code generation
fixes.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 dfd927b0d -> e60eddbbf
IGNITE-843 minor XML and Java code generation fixes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e60eddbb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e60eddbb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e60eddbb
Branch: refs/heads/ignite-843
Commit: e60eddbbfbfd46132040911265bc3e9df2221c19
Parents: dfd927b
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Sep 15 17:05:16 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Sep 15 17:05:16 2015 +0700
----------------------------------------------------------------------
.../src/main/js/helpers/common-utils.js | 15 ++++++++++++++-
.../src/main/js/routes/generator/generator-java.js | 2 +-
.../src/main/js/routes/generator/generator-xml.js | 2 +-
3 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e60eddbb/modules/control-center-web/src/main/js/helpers/common-utils.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/common-utils.js b/modules/control-center-web/src/main/js/helpers/common-utils.js
index 15b9534..e881f6a 100644
--- a/modules/control-center-web/src/main/js/helpers/common-utils.js
+++ b/modules/control-center-web/src/main/js/helpers/common-utils.js
@@ -22,11 +22,24 @@ $commonUtils = {};
* @param v Value to check.
* @returns {boolean} 'true' if value defined.
*/
-$commonUtils.isDefined = function isDefined(v) {
+$commonUtils.isDefined = function (v) {
return !(v === undefined || v === null);
};
/**
+ * @param v Value to check.
+ * @returns {boolean} 'true' if value defined and not empty string.
+ */
+$commonUtils.isDefinedAndNotEmpty = function (v) {
+ var definded = $commonUtils.isDefined(v);
+
+ if (definded && typeof(v) == 'string')
+ definded = v.length > 0;
+
+ return definded;
+};
+
+/**
* @param obj Object to check.
* @param props Properties names.
* @returns {boolean} 'true' if object contains at least one from specified properties.
http://git-wip-us.apache.org/repos/asf/ignite/blob/e60eddbb/modules/control-center-web/src/main/js/routes/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-java.js b/modules/control-center-web/src/main/js/routes/generator/generator-java.js
index 2a063d3..9468855 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-java.js
@@ -45,7 +45,7 @@ $generatorJava.toJavaCode = function (val, type) {
return val + 'f';
if (type == 'path')
- return '"' + val.replace('\\', '\\\\') + '"';
+ return '"' + val.replace(/\\/g, '\\\\') + '"';
if (type)
return type + '.' + val;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e60eddbb/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
index f302458..0e2833e 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
@@ -56,7 +56,7 @@ $generatorXml.property = function (res, obj, propName, setterName, dflt) {
if ($commonUtils.isDefined(obj)) {
var val = obj[propName];
- if ($commonUtils.isDefined(val)) {
+ if ($commonUtils.isDefinedAndNotEmpty(val)) {
var hasDflt = $commonUtils.isDefined(dflt);
// Add to result if no default provided or value not equals to default.