You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/01/12 05:39:08 UTC
[1/2] openmeetings git commit: [OPENMEETINGS-1773] saved WB import is
further fixed
Repository: openmeetings
Updated Branches:
refs/heads/master 02b5c82cb -> d25ada0eb
[OPENMEETINGS-1773] saved WB import is further fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/f7cad786
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/f7cad786
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/f7cad786
Branch: refs/heads/master
Commit: f7cad78647f9900baba39912c233798083217700
Parents: 5e366a2
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Jan 12 12:38:19 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Jan 12 12:38:40 2018 +0700
----------------------------------------------------------------------
.../backup/converter/WbConverter.java | 29 ++++++++++++++------
1 file changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f7cad786/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
index da30ec9..d2b6025 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
@@ -39,6 +39,7 @@ import java.util.List;
import java.util.Set;
import java.util.UUID;
+import org.apache.commons.lang.math.NumberUtils;
import org.apache.openmeetings.db.dto.room.Whiteboard;
import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.db.entity.file.FileItem;
@@ -99,7 +100,7 @@ public class WbConverter {
if (props.size() < 12) {
return;
}
- String color = getColor((Integer)props.get(2));
+ String color = getColor(getInt(props, 2));
String style = (String)props.get(4);
JSONObject o = setColor(init(wb, props), color, color)
.put(ATTR_TYPE, "i-text")
@@ -118,7 +119,7 @@ public class WbConverter {
if (props.size() < 13) {
return;
}
- String color = getColor((Integer)props.get(4));
+ String color = getColor(getInt(props, 4));
JSONObject o = setColor(init(wb, props), color, null)
.put(ATTR_TYPE, "path")
.put(ATTR_STROKE, props.get(3));
@@ -127,13 +128,13 @@ public class WbConverter {
JSONArray path = new JSONArray();
for (List<?> point : points) {
if (path.length() == 0) {
- path.put(new JSONArray(Arrays.asList("M", (Integer)point.get(1), (Integer)point.get(2))));
+ path.put(new JSONArray(Arrays.asList("M", getInt(point, 1), getInt(point, 2))));
} else if (path.length() == points.size() - 1) {
- path.put(new JSONArray(Arrays.asList("L", (Integer)point.get(3), (Integer)point.get(4))));
+ path.put(new JSONArray(Arrays.asList("L", getInt(point, 3), getInt(point, 4))));
} else {
path.put(new JSONArray(Arrays.asList("Q"
- , (Integer)point.get(1), (Integer)point.get(2)
- , (Integer)point.get(3), (Integer)point.get(4))));
+ , getInt(point, 1), getInt(point, 2)
+ , getInt(point, 3), getInt(point, 4))));
}
}
add(wb, o.put("path", path).put(ATTR_OPACITY, props.get(5)));
@@ -143,7 +144,7 @@ public class WbConverter {
if (props.size() < 16) {
return;
}
- String color = getColor((Integer)props.get(1));
+ String color = getColor(getInt(props, 1));
add(wb, setColor(init(wb, props), color, color)
.put(ATTR_TYPE, "line")
.put(ATTR_STROKE, props.get(2))
@@ -154,13 +155,23 @@ public class WbConverter {
.put("y2", props.get(7)));
}
+ private static int getInt(List<?> props, int idx) {
+ Object o = props.get(idx);
+ if (o instanceof Number) {
+ return ((Number) o).intValue();
+ } else if (o instanceof String) {
+ return NumberUtils.toInt((String)o);
+ }
+ return 0;
+ }
+
private static JSONObject processRect(Whiteboard wb, List<?> props) {
if (props.size() < 15) {
return null;
}
return setColor(init(wb, props)
- , 1 == (Integer)props.get(4) ? getColor((Integer)props.get(1)) : null
- , 1 == (Integer)props.get(5) ? getColor((Integer)props.get(3)) : null)
+ , 1 == getInt(props, 4) ? getColor(getInt(props, 1)) : null
+ , 1 == getInt(props, 5) ? getColor(getInt(props, 3)) : null)
.put(ATTR_TYPE, "rect")
.put(ATTR_STROKE, props.get(2))
.put(ATTR_OPACITY, props.get(6));
[2/2] openmeetings git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/openmeetings
Posted by so...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/openmeetings
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d25ada0e
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d25ada0e
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d25ada0e
Branch: refs/heads/master
Commit: d25ada0eb15ff583741284cd5726821c3566a763
Parents: f7cad78 02b5c82
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Jan 12 12:38:57 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Jan 12 12:38:57 2018 +0700
----------------------------------------------------------------------
.../apache/openmeetings/backup/BackupImport.java | 5 ++++-
.../web/admin/users/PasswordDialog.java | 19 +++++++++++++++++--
.../openmeetings/web/admin/users/UserForm.java | 15 +++++++++++++--
3 files changed, 34 insertions(+), 5 deletions(-)
----------------------------------------------------------------------