Repository: openmeetings Updated Branches: refs/heads/master 8eb27129f -> 58598dbc0
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/58598dbc Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/58598dbc Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/58598dbc Branch: refs/heads/master Commit: 58598dbc08e135997c112957fee669cc41506daa Parents: 8eb2712 Author: Maxim Solodovnik <[email protected]> Authored: Wed Oct 11 22:18:26 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Oct 11 22:18:26 2017 +0700 ---------------------------------------------------------------------- .../core/converter/DocumentConverter.java | 40 ++++++++++++-------- .../gui/listener/ScreenHeightMouseListener.java | 2 +- .../gui/listener/ScreenWidthMouseListener.java | 2 +- .../gui/listener/ScreenXMouseListener.java | 2 +- .../gui/listener/ScreenYMouseListener.java | 2 +- .../template/subject/SubjectEmailTemplate.java | 4 +- .../web/pages/install/InstallWizard.java | 22 ++--------- .../web/room/wb/WbWebSocketHelper.java | 4 +- 8 files changed, 35 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/58598dbc/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java index ab495fc..76b6305 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java @@ -24,6 +24,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_OFF import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.io.File; +import java.util.function.Consumer; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.entity.file.FileItem; @@ -33,7 +34,6 @@ import org.apache.openmeetings.util.process.ProcessResultList; import org.apache.wicket.util.string.Strings; import org.artofsolving.jodconverter.OfficeDocumentConverter; import org.artofsolving.jodconverter.office.DefaultOfficeManagerConfiguration; -import org.artofsolving.jodconverter.office.OfficeException; import org.artofsolving.jodconverter.office.OfficeManager; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -67,27 +67,35 @@ public class DocumentConverter { return imageConverter.convertDocument(result, f, pdf); } - /** - * Generates PDF using JOD Library (external library) - */ - public ProcessResult doJodConvert(File in, File out) { + public static void createOfficeManager(String officePath, Consumer<OfficeManager> consumer) { + OfficeManager manager = null; try { - String officePath = cfgDao.getString(CONFIG_PATH_OFFICE, null); DefaultOfficeManagerConfiguration configuration = new DefaultOfficeManagerConfiguration(); if (!Strings.isEmpty(officePath)) { configuration.setOfficeHome(officePath); } - OfficeManager officeManager = configuration.buildOfficeManager(); - officeManager.start(); - OfficeDocumentConverter converter = new OfficeDocumentConverter(officeManager); - try { - converter.convert(in, out); - } catch (OfficeException ex) { - log.error("doJodConvert", ex); - return new ProcessResult("doJodConvert", ex.getMessage(), ex); - } finally { - officeManager.stop(); + manager = configuration.buildOfficeManager(); + manager.start(); + if (consumer != null) { + consumer.accept(manager); } + } finally { + if (manager != null) { + manager.stop(); + } + } + } + + /** + * Generates PDF using JOD Library (external library) + */ + public ProcessResult doJodConvert(File in, File out) { + try { + createOfficeManager(cfgDao.getString(CONFIG_PATH_OFFICE, null) + , man -> { + OfficeDocumentConverter converter = new OfficeDocumentConverter(man); + converter.convert(in, out); + }); } catch (Exception ex) { log.error("doJodConvert", ex); return new ProcessResult("doJodConvert", ex.getMessage(), ex); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/58598dbc/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenHeightMouseListener.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenHeightMouseListener.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenHeightMouseListener.java index beb1e47..640c788 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenHeightMouseListener.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenHeightMouseListener.java @@ -29,7 +29,7 @@ public class ScreenHeightMouseListener extends OmMouseInputAdapter { public ScreenHeightMouseListener(ScreenSharerFrame frame) { super(frame, Cursor.N_RESIZE_CURSOR); - cons = e -> {this.y = e.getY();}; + cons = e -> y = e.getY(); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/58598dbc/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenWidthMouseListener.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenWidthMouseListener.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenWidthMouseListener.java index 053fd15..0acc50a 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenWidthMouseListener.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenWidthMouseListener.java @@ -29,7 +29,7 @@ public class ScreenWidthMouseListener extends OmMouseInputAdapter { public ScreenWidthMouseListener(ScreenSharerFrame frame) { super(frame, Cursor.W_RESIZE_CURSOR); - cons = e -> {this.x = e.getX();}; + cons = e -> x = e.getX(); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/58598dbc/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenXMouseListener.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenXMouseListener.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenXMouseListener.java index 8d61331..5438370 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenXMouseListener.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenXMouseListener.java @@ -29,7 +29,7 @@ public class ScreenXMouseListener extends OmMouseInputAdapter { public ScreenXMouseListener(ScreenSharerFrame frame) { super(frame, Cursor.W_RESIZE_CURSOR); - cons = e -> {this.x = e.getX();}; + cons = e -> x = e.getX(); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/58598dbc/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenYMouseListener.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenYMouseListener.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenYMouseListener.java index 445f397..648fce3 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenYMouseListener.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/listener/ScreenYMouseListener.java @@ -29,7 +29,7 @@ public class ScreenYMouseListener extends OmMouseInputAdapter { public ScreenYMouseListener(ScreenSharerFrame frame) { super(frame, Cursor.N_RESIZE_CURSOR); - cons = e -> {this.y = e.getY();}; + cons = e -> y = e.getY(); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/58598dbc/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/SubjectEmailTemplate.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/SubjectEmailTemplate.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/SubjectEmailTemplate.java index fbf146d..eddd604 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/SubjectEmailTemplate.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/SubjectEmailTemplate.java @@ -45,14 +45,14 @@ public abstract class SubjectEmailTemplate extends AbstractTemplatePanel { public final String getEmail() { if (!created) { - throw new RuntimeException("Not created!!"); + throw new IllegalStateException("Not created!!"); } return email; } public final String getSubject() { if (!created) { - throw new RuntimeException("Not created!!"); + throw new IllegalStateException("Not created!!"); } return subject; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/58598dbc/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java index ad8e21c..fcc61d3 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java @@ -41,6 +41,7 @@ import java.util.Locale; import java.util.Map; import org.apache.openmeetings.cli.ConnectionPropertiesPatcher; +import org.apache.openmeetings.core.converter.DocumentConverter; import org.apache.openmeetings.core.util.StrongPasswordValidator; import org.apache.openmeetings.db.dao.label.LabelDao; import org.apache.openmeetings.db.entity.user.User; @@ -78,9 +79,6 @@ import org.apache.wicket.model.PropertyModel; import org.apache.wicket.model.StringResourceModel; import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.time.Duration; -import org.artofsolving.jodconverter.office.DefaultOfficeManagerConfiguration; -import org.artofsolving.jodconverter.office.OfficeException; -import org.artofsolving.jodconverter.office.OfficeManager; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.orm.jpa.LocalEntityManagerFactoryBean; @@ -553,23 +551,9 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { private boolean checkOfficePath() { String err = ""; try { - DefaultOfficeManagerConfiguration configuration = new DefaultOfficeManagerConfiguration(); - if (!Strings.isEmpty(officePath.getValue())) { - configuration.setOfficeHome(officePath.getValue()); - } - OfficeManager officeManager = configuration.buildOfficeManager(); - try { - officeManager.start(); - } catch (OfficeException ex) { - err = ex.getMessage().replaceAll(REGEX, ""); - } finally { - officeManager.stop(); - } + DocumentConverter.createOfficeManager(officePath.getValue(), null); } catch (Exception ex) { - err = ex.getMessage().replaceAll(REGEX, ""); - } - if (!err.isEmpty()) { - officePath.error(err); + officePath.error(err = ex.getMessage().replaceAll(REGEX, "")); } return err.isEmpty(); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/58598dbc/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java index 7102f38..207bc99 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java @@ -132,7 +132,7 @@ public class WbWebSocketHelper extends WebSocketHelper { , new JSONObject().put("type", "wb") , null , (o, c) -> o.put("func", WbAction.createObj.name()) - .put("param", getObjWbJson(wbId, addFileUrl(ruid, file, fi, c)).toString()).toString()); + .put("param", getObjWbJson(wbId, addFileUrl(ruid, file, fi, c))).toString(new NullStringer())); } private static void sendWb(Long roomId, WbAction meth, JSONObject obj, Predicate<Client> check) { @@ -141,7 +141,7 @@ public class WbWebSocketHelper extends WebSocketHelper { , new JSONObject().put("type", "wb") , check , (o, c) -> o.put("func", meth.name()) - .put("param", obj.toString(new NullStringer())).toString() + .put("param", obj).toString(new NullStringer()) ); } }
