Repository: openmeetings Updated Branches: refs/heads/master 5e2dffb96 -> 346970899
[OPENMEETINGS-1720] build should be fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/34697089 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/34697089 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/34697089 Branch: refs/heads/master Commit: 34697089933d60995b1bea5c537e062042a21f17 Parents: 5e2dffb Author: Maxim Solodovnik <[email protected]> Authored: Fri Oct 13 18:39:07 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Oct 13 18:39:07 2017 +0700 ---------------------------------------------------------------------- .../apache/openmeetings/backup/BackupImport.java | 2 +- .../backup/converter/WbConverter.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/34697089/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java index 4efb183..2eaed99 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java @@ -857,7 +857,7 @@ public class BackupImport { /* * ##################### Import File-Explorer Items */ - private List<FileItem> importFiles(File f, boolean old) throws Exception { + private List<FileItem> importFiles(File f) throws Exception { log.info("Private message import complete, starting file explorer item import"); List<FileItem> result = new ArrayList<>(); List<FileItem> list = readFileItemList(f, "fileExplorerItems.xml", "fileExplorerItems"); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/34697089/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 67a4f48..4040b9b 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 @@ -88,7 +88,7 @@ public class WbConverter { if (props.size() < 12) { return; } - String color = getColor((int)props.get(2)); + String color = getColor((Integer)props.get(2)); String style = (String)props.get(4); JSONObject o = setColor(init(wb, props), color, color) .put("type", "i-text") @@ -107,7 +107,7 @@ public class WbConverter { if (props.size() < 13) { return; } - String color = getColor((int)props.get(4)); + String color = getColor((Integer)props.get(4)); JSONObject o = setColor(init(wb, props), color, null) .put("type", "path") .put("strokeWidth", props.get(3)); @@ -116,13 +116,13 @@ public class WbConverter { JSONArray path = new JSONArray(); for (List<?> point : points) { if (path.length() == 0) { - path.put(new JSONArray(Arrays.asList("M", (int)point.get(1), (int)point.get(2)))); + path.put(new JSONArray(Arrays.asList("M", (Integer)point.get(1), (Integer)point.get(2)))); } else if (path.length() == points.size() - 1) { - path.put(new JSONArray(Arrays.asList("L", (int)point.get(3), (int)point.get(4)))); + path.put(new JSONArray(Arrays.asList("L", (Integer)point.get(3), (Integer)point.get(4)))); } else { path.put(new JSONArray(Arrays.asList("Q" - , (int)point.get(1), (int)point.get(2) - , (int)point.get(3), (int)point.get(4)))); + , (Integer)point.get(1), (Integer)point.get(2) + , (Integer)point.get(3), (Integer)point.get(4)))); } } add(wb, o.put("path", path).put("opacity", props.get(5))); @@ -132,7 +132,7 @@ public class WbConverter { if (props.size() < 16) { return; } - String color = getColor((int)props.get(1)); + String color = getColor((Integer)props.get(1)); add(wb, setColor(init(wb, props), color, color) .put("type", "line") .put("strokeWidth", props.get(2)) @@ -148,8 +148,8 @@ public class WbConverter { return null; } return setColor(init(wb, props) - , 1 == (int)props.get(4) ? getColor((int)props.get(1)) : null - , 1 == (int)props.get(5) ? getColor((int)props.get(3)) : null) + , 1 == (Integer)props.get(4) ? getColor((Integer)props.get(1)) : null + , 1 == (Integer)props.get(5) ? getColor((Integer)props.get(3)) : null) .put("type", "rect") .put("strokeWidth", props.get(2)) .put("opacity", props.get(6));
