Repository: openmeetings Updated Branches: refs/heads/4.0.x 870ca9f9a -> 48f2a9787
no jira: code is optimized Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/48f2a978 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/48f2a978 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/48f2a978 Branch: refs/heads/4.0.x Commit: 48f2a97878ffad778f8de8dd46efb288b35d5772 Parents: 870ca9f Author: Maxim Solodovnik <[email protected]> Authored: Sun Nov 5 15:43:32 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sun Nov 5 15:43:32 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/web/room/wb/WbPanel.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/48f2a978/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java index fac3f9a..79eae47 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java @@ -112,14 +112,7 @@ public class WbPanel extends AbstractWbPanel { @Override protected void onSubmit(AjaxRequestTarget target) { - Whiteboard wb = WhiteboardCache.get(roomId).get(wb2save); - FileItem f = new FileItem(); - f.setType(BaseFileItem.Type.WmlFile); - f.setRoomId(roomId); - f.setHash(UUID.randomUUID().toString()); - f.setName(getModelObject()); - f = getBean(FileItemDao.class).update(f); - String res = wb.save(f.getFile().toPath()); + String res = saveWb(roomId, wb2save, getModelObject()); if (!Strings.isEmpty(res)) { error("Unexpected error while saving WB: " + res); target.add(feedback); @@ -659,4 +652,15 @@ public class WbPanel extends AbstractWbPanel { } } } + + public static String saveWb(Long roomId, Long wbId, String name) { + Whiteboard wb = WhiteboardCache.get(roomId).get(wbId); + FileItem f = new FileItem(); + f.setType(BaseFileItem.Type.WmlFile); + f.setRoomId(roomId); + f.setHash(UUID.randomUUID().toString()); + f.setName(name); + f = getBean(FileItemDao.class).update(f); + return wb.save(f.getFile().toPath()); + } }
