Repository: openmeetings Updated Branches: refs/heads/master 553148106 -> 33e9b563a
[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/33e9b563 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/33e9b563 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/33e9b563 Branch: refs/heads/master Commit: 33e9b563aa15a27ad79fe3a3a81333b6bae5c19a Parents: 5531481 Author: Maxim Solodovnik <[email protected]> Authored: Sat Sep 30 00:15:12 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sat Sep 30 00:15:12 2017 +0700 ---------------------------------------------------------------------- .../apache/openmeetings/screenshare/Core.java | 32 ++++++++++++++------ .../screenshare/gui/ScreenSharerFrame.java | 8 ++--- .../web/data/DataViewContainer.java | 18 +++++++++-- .../openmeetings/web/data/OmOrderByBorder.java | 6 ++-- .../web/pages/install/InstallWizard.java | 4 +-- .../apache/openmeetings/web/room/settings.js | 1 - .../web/user/profile/MessagesContactsPanel.java | 2 +- 7 files changed, 47 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e9b563/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java index 0deb5a0..b5c2760 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java @@ -77,15 +77,15 @@ public class Core implements IPendingServiceCallback, INetStreamEventHandler { private String app; private int port; - public String sid; + private String sid; private CaptureScreen _capture = null; private RTMPClientPublish publishClient = null; private ScreenSharerFrame frame; - public int defaultQuality = 1; - public int defaultFPS = 10; - public boolean showFPS = true; + private int defaultQuality = 1; + private int defaultFps = 10; + private boolean showFps = true; private boolean allowRecording = true; private boolean allowPublishing = true; @@ -93,7 +93,7 @@ public class Core implements IPendingServiceCallback, INetStreamEventHandler { private boolean startSharing = false; private boolean startRecording = false; private boolean startPublishing = false; - public boolean isConnected = false; + private boolean connected = false; private boolean readyToRecord = false; private boolean audioNotify = false; private boolean remoteEnabled = true; @@ -129,8 +129,8 @@ public class Core implements IPendingServiceCallback, INetStreamEventHandler { sid = args[2]; String labelTexts = args[3]; defaultQuality = Integer.parseInt(args[4]); - defaultFPS = Integer.parseInt(args[5]); - showFPS = bool(args[6]); + defaultFps = Integer.parseInt(args[5]); + showFps = bool(args[6]); remoteEnabled = bool(args[7]); allowRecording = bool(args[8]); allowPublishing = bool(args[9]); @@ -314,7 +314,7 @@ public class Core implements IPendingServiceCallback, INetStreamEventHandler { try { log.debug("captureScreenStart"); - if (!isConnected) { + if (!connected) { connect(sid); } else { setConnectionAsSharingClient(); @@ -432,7 +432,7 @@ public class Core implements IPendingServiceCallback, INetStreamEventHandler { stopSharing(); stopRecording(); stopPublishing(); - isConnected = false; + connected = false; if (instance != null) { instance.disconnect(); @@ -507,7 +507,7 @@ public class Core implements IPendingServiceCallback, INetStreamEventHandler { frame.setStatus(String.format("Error: %s %s", code, returnMap.get("description"))); return; } - isConnected = true; + connected = true; setConnectionAsSharingClient(); } else if ("setConnectionAsSharingClient".equals(method)) { if (!bool(returnMap.get("alreadyPublished"))) { @@ -613,4 +613,16 @@ public class Core implements IPendingServiceCallback, INetStreamEventHandler { public ScreenDimensions getDim() { return dim; } + + public int getDefaultQuality() { + return defaultQuality; + } + + public int getDefaultFps() { + return defaultFps; + } + + public boolean isShowFps() { + return showFps; + } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e9b563/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java index e8a8008..327e065 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java @@ -465,7 +465,7 @@ public class ScreenSharerFrame extends JFrame { calcRescaleFactors(); } }); - comboQuality.setSelectedIndex(core.defaultQuality); + comboQuality.setSelectedIndex(core.getDefaultQuality()); panelScreen.add(comboQuality); comboFPS = new JComboBox<>(); comboFPS.addItem(new KeyValue<>("2 FPS", 2)); @@ -486,18 +486,18 @@ public class ScreenSharerFrame extends JFrame { boolean fpsSelected = false; for (int i = 0; i < comboFPS.getItemCount(); ++i) { KeyValue<Integer> v = comboFPS.getItemAt(i); - if (core.defaultFPS == v.value) { + if (core.getDefaultFps() == v.value) { comboFPS.setSelectedIndex(i); fpsSelected = true; break; } } if (!fpsSelected) { - comboFPS.addItem(new KeyValue<>(core.defaultFPS + " FPS", core.defaultFPS)); + comboFPS.addItem(new KeyValue<>(core.getDefaultFps() + " FPS", core.getDefaultFps())); comboFPS.setSelectedIndex(comboFPS.getItemCount() - 1); } comboFPS.setBounds(390, 170, 70, 24); - comboFPS.setVisible(core.showFPS); + comboFPS.setVisible(core.isShowFps()); panelScreen.add(comboFPS); panelRecording.setBackground(Color.WHITE); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e9b563/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java index 5d2b07e..5fb1259 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java @@ -29,9 +29,9 @@ import org.apache.wicket.markup.html.WebMarkupContainer; public class DataViewContainer<T extends IDataProviderEntity> implements Serializable { private static final long serialVersionUID = 1L; - public WebMarkupContainer container; - public SearchableDataView<T> view; - public PagedEntityListPanel navigator; + private final WebMarkupContainer container; + private final SearchableDataView<T> view; + private final PagedEntityListPanel navigator; private List<OmOrderByBorder<T>> orderLinks = new ArrayList<>(); public DataViewContainer(WebMarkupContainer container, SearchableDataView<T> view, PagedEntityListPanel navigator) { @@ -51,4 +51,16 @@ public class DataViewContainer<T extends IDataProviderEntity> implements Seriali OmOrderByBorder<T>[] a = new OmOrderByBorder[0]; return orderLinks.toArray(a); } + + public WebMarkupContainer getContainer() { + return container; + } + + public SearchableDataView<T> getView() { + return view; + } + + public PagedEntityListPanel getNavigator() { + return navigator; + } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e9b563/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java index 7625924..96604b8 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java @@ -27,19 +27,19 @@ public class OmOrderByBorder<T extends IDataProviderEntity> extends AjaxFallback private DataViewContainer<T> container; public OmOrderByBorder(final String id, final String property, DataViewContainer<T> container) { - super(id, property, container.view.getDataProvider()); + super(id, property, container.getView().getDataProvider()); this.container = container; setOutputMarkupId(true); } @Override protected void onSortChanged() { - container.view.setCurrentPage(0); + container.getView().setCurrentPage(0); } @Override protected void onAjaxClick(AjaxRequestTarget target) { - target.add(container.container, container.navigator); + target.add(container.getContainer(), container.getNavigator()); target.add(container.getLinks()); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e9b563/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 6bdb77e..663db75 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 @@ -753,9 +753,9 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { private static class SelectOption implements Serializable { private static final long serialVersionUID = 1L; - public String key; + private final String key; @SuppressWarnings("unused") - public String value; + private final String value; SelectOption(String key, String value) { this.key = key; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e9b563/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js index 10f6369..b473e5b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js @@ -116,7 +116,6 @@ var VideoSettings = (function() { playBtn.prop('disabled', false).button('refresh'); } function _micActivity(level) { - console.log("activity: ", level) lm.progressbar("value", Math.max(0, level)); } function _initSwf() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e9b563/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java index d5d0e70..6b07106 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java @@ -222,7 +222,7 @@ public class MessagesContactsPanel extends UserBasePanel { if (target != null) { updateTable(target); target.add(folders, unread, selectDropDown, moveDropDown); - target.add(dataContainer.container, dataContainer.navigator); + target.add(dataContainer.getContainer(), dataContainer.getNavigator()); target.add(dataContainer.getLinks()); } }
