Repository: openmeetings Updated Branches: refs/heads/master 26c244524 -> ce4e69d2a
[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/ce4e69d2 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/ce4e69d2 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/ce4e69d2 Branch: refs/heads/master Commit: ce4e69d2a79ec8c202289ec14c72370099feac5d Parents: 26c2445 Author: Maxim Solodovnik <[email protected]> Authored: Sat Sep 30 23:39:36 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sat Sep 30 23:39:36 2017 +0700 ---------------------------------------------------------------------- .../core/data/whiteboard/WhiteboardCache.java | 2 + .../core/remote/RecordingService.java | 24 +++--- .../openmeetings/core/rss/LoadAtomRssFeed.java | 2 + .../db/dao/file/FileItemLogDao.java | 16 ++-- .../openmeetings/db/dao/label/LabelDao.java | 8 +- .../db/entity/room/StreamClient.java | 6 +- .../openmeetings/db/util/ApplicationHelper.java | 4 +- .../openmeetings/db/util/AuthLevelUtil.java | 8 +- .../apache/openmeetings/db/util/DtoHelper.java | 2 + .../openmeetings/db/util/FormatHelper.java | 2 + .../openmeetings/db/util/LocaleHelper.java | 3 + .../apache/openmeetings/db/util/RoomHelper.java | 2 + .../apache/openmeetings/db/util/UserHelper.java | 2 + .../java/org/apache/openmeetings/cli/Admin.java | 14 ++-- .../apache/openmeetings/cli/CleanupHelper.java | 2 + .../openmeetings/cli/OmHelpFormatter.java | 16 +--- .../InstallationDocumentHandler.java | 2 + .../openmeetings/screenshare/AudioTone.java | 2 + .../screenshare/ScreenV1Encoder.java | 12 +-- .../screenshare/gui/ScreenSharerFrame.java | 82 +++++--------------- .../screenshare/job/OmKeyEvent.java | 16 ++-- .../openmeetings/screenshare/util/Util.java | 3 +- .../calendar/caldav/methods/SyncReportInfo.java | 4 +- .../openmeetings/util/CalendarPatterns.java | 2 + .../org/apache/openmeetings/util/DaoHelper.java | 1 + .../apache/openmeetings/util/ImportHelper.java | 2 + .../apache/openmeetings/util/OmFileHelper.java | 2 + .../util/OpenmeetingsVariables.java | 2 + .../org/apache/openmeetings/util/Version.java | 43 ++++------ .../org/apache/openmeetings/util/XmlExport.java | 2 + .../openmeetings/util/crypt/CryptProvider.java | 2 + .../org/apache/openmeetings/util/crypt/MD5.java | 2 + .../util/crypt/MD5Implementation.java | 2 + .../util/crypt/SHA256Implementation.java | 2 + .../apache/openmeetings/util/mail/MailUtil.java | 2 + .../util/process/ProcessHelper.java | 2 + .../openmeetings/web/app/Application.java | 17 ++-- .../apache/openmeetings/web/app/WebSession.java | 48 ++++++------ .../openmeetings/web/common/InvitationForm.java | 6 +- .../openmeetings/web/common/MainPanel.java | 20 ++--- .../web/common/tree/OmTreeProvider.java | 10 +-- .../openmeetings/web/pages/auth/SignInPage.java | 10 +-- .../web/pages/install/InstallWizard.java | 6 +- .../openmeetings/web/room/RoomBroadcaster.java | 2 + .../apache/openmeetings/web/room/RoomPanel.java | 3 +- .../web/room/activities/ActivitiesPanel.java | 4 +- .../web/room/sidebar/RoomFilePanel.java | 3 +- .../web/room/sidebar/UploadDialog.java | 6 +- .../web/room/wb/InterviewWbPanel.java | 4 +- .../openmeetings/web/user/AboutDialog.java | 1 + .../web/user/InviteUserToRoomDialog.java | 1 + .../web/user/calendar/AppointmentDialog.java | 16 ++-- .../web/user/calendar/CalendarPanel.java | 6 +- .../apache/openmeetings/web/user/chat/Chat.java | 4 - .../dashboard/admin/AdminCleanupInfoDialog.java | 1 + .../web/user/profile/MessagesContactsPanel.java | 4 - .../web/user/profile/UserSearchPanel.java | 4 - .../web/user/rooms/RoomListPanel.java | 2 + .../web/util/CallbackFunctionHelper.java | 2 + .../openmeetings/web/util/ContactsHelper.java | 2 + .../web/util/UserChoiceProvider.java | 4 - .../openmeetings/webservice/Constants.java | 2 + 62 files changed, 214 insertions(+), 274 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java index 555186a..65d70aa 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java @@ -36,6 +36,8 @@ import com.hazelcast.core.IMap; * */ public class WhiteboardCache { + private WhiteboardCache() {} + private static IMap<Long, Whiteboards> getCache() { return getApp().getWhiteboards(); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java index 3346aa6..35bafe3 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java @@ -154,10 +154,8 @@ public class RecordingService implements IPendingServiceCallback { // get all stream and start recording them for (IConnection conn : scope.getClientConnections()) { - if (conn != null) { - if (conn instanceof IServiceCapableConnection) { - startStreamRecord(conn, recordingId, isInterview); - } + if (conn != null && conn instanceof IServiceCapableConnection) { + startStreamRecord(conn, recordingId, isInterview); } } // Send every user a notification that the recording did start @@ -188,11 +186,9 @@ public class RecordingService implements IPendingServiceCallback { // get all stream and stop recording them for (IConnection conn : scope.getClientConnections()) { - if (conn != null) { - if (conn instanceof IServiceCapableConnection) { - StreamClient rcl = sessionManager.get(IClientUtil.getId(conn.getClient())); - stopStreamRecord(scope, rcl); - } + if (conn != null && conn instanceof IServiceCapableConnection) { + StreamClient rcl = sessionManager.get(IClientUtil.getId(conn.getClient())); + stopStreamRecord(scope, rcl); } } // Store to database @@ -264,12 +260,10 @@ public class RecordingService implements IPendingServiceCallback { // the stream can be null if the user just closes the browser // without canceling the recording before leaving - if (stream != null) { - // Iterate through all stream listeners and stop the appropriate - if (stream.getStreamListeners() != null) { - for (IStreamListener iStreamListener : stream.getStreamListeners()) { - stream.removeStreamListener(iStreamListener); - } + // Iterate through all stream listeners and stop the appropriate + if (stream != null && stream.getStreamListeners() != null) { + for (IStreamListener iStreamListener : stream.getStreamListeners()) { + stream.removeStreamListener(iStreamListener); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java index 004a728..5715812 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java @@ -30,6 +30,8 @@ import org.slf4j.Logger; public class LoadAtomRssFeed { private static final Logger log = Red5LoggerFactory.getLogger(LoadAtomRssFeed.class, getWebAppRootKey()); + private LoadAtomRssFeed() {} + public static HttpURLConnection getFeedConnection(String _url) throws IOException { log.debug("getFeedConnection:: " + _url); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemLogDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemLogDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemLogDao.java index 166edb0..33b3960 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemLogDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemLogDao.java @@ -58,14 +58,14 @@ public class FileItemLogDao { public FileItemLog add(String name, BaseFileItem f, ConverterProcessResult returnMap) { log.trace("Adding log: {}, {}, {}", name, f, returnMap); - FileItemLog log = new FileItemLog(); - log.setInserted(new Date()); - log.setExitCode(returnMap.getExitCode()); - log.setFileId(f.getId()); - log.setMessage(returnMap.buildLogMessage()); - log.setName(name); + FileItemLog l = new FileItemLog(); + l.setInserted(new Date()); + l.setExitCode(returnMap.getExitCode()); + l.setFileId(f.getId()); + l.setMessage(returnMap.buildLogMessage()); + l.setName(name); - em.persist(log); - return log; + em.persist(l); + return l; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java index 025e8e1..1e26f1c 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java @@ -41,7 +41,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.Predicate; import org.apache.openmeetings.db.dao.IDataProviderDao; import org.apache.openmeetings.db.entity.label.StringLabel; import org.apache.openmeetings.util.OmFileHelper; @@ -185,12 +184,7 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ } List<StringLabel> result = new ArrayList<>(labelCache.containsKey(l) ? labelCache.get(l) : new ArrayList<StringLabel>()); if (!Strings.isEmpty(search)) { - CollectionUtils.filter(result, new Predicate<StringLabel>() { - @Override - public boolean evaluate(StringLabel o) { - return o != null && (o.getKey().contains(search) || o.getValue().contains(search)); - } - }); + CollectionUtils.filter(result, o -> o != null && (o.getKey().contains(search) || o.getValue().contains(search))); } return result; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java index 72ec691..1e0058f 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java @@ -90,9 +90,9 @@ public class StreamClient implements IClient { public void setScope(String scope) { this.scope = scope; StringValue scn = StringValue.valueOf(scope); - long roomId = scn.toLong(Long.MIN_VALUE); - if (roomId > 0) { - this.roomId = roomId; + long rId = scn.toLong(Long.MIN_VALUE); + if (rId > 0) { + this.roomId = rId; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java index 188ca42..21f536d 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java @@ -18,9 +18,9 @@ */ package org.apache.openmeetings.db.util; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplicationName; import static org.apache.openmeetings.util.OpenmeetingsVariables.setInitComplete; -import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import static org.red5.logging.Red5LoggerFactory.getLogger; import static org.springframework.web.context.WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE; import static org.springframework.web.context.support.WebApplicationContextUtils.getWebApplicationContext; @@ -53,6 +53,8 @@ public class ApplicationHelper { private static final Logger log = getLogger(ApplicationHelper.class, getWebAppRootKey()); private static final Object SYNC_OBJ = new Object(); + private ApplicationHelper() {} + public static WicketTester getWicketTester() { return getWicketTester(-1); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java index 4d8606f..5e65cd5 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java @@ -35,6 +35,8 @@ import org.slf4j.Logger; public class AuthLevelUtil { private static final Logger log = Red5LoggerFactory.getLogger(AuthLevelUtil.class, getWebAppRootKey()); + private AuthLevelUtil() {} + private static boolean check(Set<User.Right> rights, User.Right level) { boolean result = rights.contains(level); log.debug(String.format("Level %s :: %s", level, result ? "[GRANTED]" : "[DENIED]")); @@ -53,11 +55,9 @@ public class AuthLevelUtil { if (hasAdminLevel(u.getRights())) { //admin user get superModerator level, no-one can kick him/her result.add(Room.Right.superModerator); - } else if (r.isAppointment() && a != null) { + } else if (r.isAppointment() && a != null && u.getId().equals(a.getOwner().getId())) { // appointment owner is super moderator - if (u.getId().equals(a.getOwner().getId())) { - result.add(Room.Right.superModerator); - } + result.add(Room.Right.superModerator); } if (result.isEmpty()) { if (!r.isModerated() && 1 == userCount) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/DtoHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/DtoHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/DtoHelper.java index e39458d..2ef6788 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/DtoHelper.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/DtoHelper.java @@ -25,6 +25,8 @@ import com.github.openjson.JSONArray; import com.github.openjson.JSONObject; public class DtoHelper { + private DtoHelper() {} + public static Integer optInt(JSONObject o, String key) { return o.has(key) && !o.isNull(key) ? o.getInt(key) : null; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java index ea9a80f..542232d 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java @@ -34,6 +34,8 @@ public class FormatHelper { private static final Pattern RtlLocalesRe = Pattern.compile("^(ar|dv|he|iw|fa|nqo|ps|sd|ug|ur|yi|.*[-_](Arab|Hebr|Thaa|Nkoo|Tfng))" + "(?!.*[-_](Latn|Cyrl)($|-|_))($|-|_)"); + private FormatHelper() {} + /** * Check if a BCP 47 / III language code indicates an RTL language, i.e. * either: - a language code explicitly specifying one of the right-to-left http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java index ae6a19d..92ad78b 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java @@ -33,6 +33,9 @@ import org.slf4j.Logger; public class LocaleHelper { private static final Logger log = Red5LoggerFactory.getLogger(LocaleHelper.class, getWebAppRootKey()); + + private LocaleHelper() {} + public static List<String> getCountries() { return Arrays.asList(Locale.getISOCountries()); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/RoomHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/RoomHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/RoomHelper.java index bf70fd9..333f5b7 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/RoomHelper.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/RoomHelper.java @@ -26,6 +26,8 @@ import com.github.openjson.JSONArray; import com.github.openjson.JSONObject; public class RoomHelper { + private RoomHelper() {} + public static JSONObject videoJson(Client c, boolean self, String sid, ISessionManager mgr, String uid) { StreamClient sc = mgr.get(uid); JSONObject o = c.toJson(self) http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/UserHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/UserHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/UserHelper.java index d9f3461..36a7a9a 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/UserHelper.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/UserHelper.java @@ -26,6 +26,8 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.USER_PASSWORD_M import org.apache.openmeetings.db.dao.basic.ConfigurationDao; public class UserHelper { + private UserHelper() {} + public static int getMinLoginLength(ConfigurationDao cfgDao) { return cfgDao.getInt(CONFIG_LOGIN_MIN_LENGTH, USER_LOGIN_MINIMUM_LENGTH); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java index 505d8f8..3afd80e 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java @@ -81,7 +81,7 @@ public class Admin { private InstallationConfig cfg = null; private Options opts = null; private CommandLine cmdl = null; - private WebApplicationContext ctx = null; + private WebApplicationContext context = null; private Admin() { cfg = new InstallationConfig(); @@ -171,17 +171,17 @@ public class Admin { } private WebApplicationContext getApplicationContext() { - if (ctx == null) { + if (context == null) { Long lngId = (long)cfg.getDefaultLangId(); - ctx = ApplicationHelper.getApplicationContext(lngId); - SchedulerFactoryBean sfb = ctx.getBean(SchedulerFactoryBean.class); + context = ApplicationHelper.getApplicationContext(lngId); + SchedulerFactoryBean sfb = context.getBean(SchedulerFactoryBean.class); try { sfb.getScheduler().shutdown(false); } catch (Exception e) { handleError("Unable to shutdown schedulers", e); } } - return ctx; + return context; } private void process(String[] args) { @@ -483,9 +483,9 @@ public class Admin { } private void immediateDropDB(ConnectionProperties props) throws Exception { - if (ctx != null) { + if (context != null) { destroyApplication(); - ctx = null; + context = null; } JDBCConfigurationImpl conf = new JDBCConfigurationImpl(); try { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java index dc53e90..b67c1e0 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java @@ -41,6 +41,8 @@ public class CleanupHelper { private static final Logger log = Red5LoggerFactory.getLogger(CleanupHelper.class); private static File hibernateDir = OmFileHelper.getStreamsHibernateDir(); + private CleanupHelper() {} + public static CleanupEntityUnit getProfileUnit(final UserDao udao) { File parent = OmFileHelper.getUploadProfilesDir(); List<File> invalid = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java index 28e6f64..89aaff9 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java @@ -22,7 +22,6 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.Comparator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -45,12 +44,7 @@ public class OmHelpFormatter extends HelpFormatter { for (Option o : g.getOptions()) { result.add((OmOption)o); } - Collections.sort(result, new Comparator<OmOption>() { - @Override - public int compare(OmOption o1, OmOption o2) { - return o1.getOrder() - o2.getOrder(); - } - }); + Collections.sort(result, (o1, o2) -> o1.getOrder() - o2.getOrder()); return result; } @@ -118,15 +112,11 @@ public class OmHelpFormatter extends HelpFormatter { for (Map.Entry<String, List<OmOption>> me : map.entrySet()) { final String key = me.getKey(); List<OmOption> options = me.getValue(); - Collections.sort(options, new Comparator<OmOption>(){ - @Override - public int compare(OmOption o1, OmOption o2) { + Collections.sort(options, (o1, o2) -> { boolean o1opt = !o1.isOptional(key); boolean o2opt = !o2.isOptional(key); return (o1opt && o2opt || !o1opt && !o2opt) ? (o1.getOpt() == null ? 1 : -1) : (o1opt ? -1 : 1); - } - - }); + }); if (opts.hasOption(key)) { options.add(0, (OmOption)opts.getOption(key)); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java index 4540e92..1947c20 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java @@ -33,6 +33,8 @@ import org.dom4j.io.SAXReader; import org.dom4j.io.XMLWriter; public class InstallationDocumentHandler { + private InstallationDocumentHandler() {} + public static void createDocument(int stepNo) throws Exception { Document document = DocumentHelper.createDocument(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/AudioTone.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/AudioTone.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/AudioTone.java index 8cfe2e2..e5e9018 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/AudioTone.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/AudioTone.java @@ -26,6 +26,8 @@ import javax.sound.sampled.SourceDataLine; public class AudioTone { public static final float SAMPLE_RATE = 44100F; + private AudioTone() {} + public static void play() { byte[] buf = new byte[1]; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java index 96f26b9..302194a 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java @@ -74,19 +74,19 @@ public class ScreenV1Encoder extends BaseScreenEncoder { return; } if (unalteredFrame == null) { - ByteArrayOutputStream ba = new ByteArrayOutputStream(200); + ByteArrayOutputStream arr = new ByteArrayOutputStream(200); Rectangle _area = new Rectangle(dim.getResizeX(), dim.getResizeY()); //header - ba.write(getTag(FLAG_FRAMETYPE_INTERFRAME, FLAG_CODEC_SCREEN)); - writeShort(ba, _area.width + ((blockSize / 16 - 1) << 12)); - writeShort(ba, _area.height + ((blockSize / 16 - 1) << 12)); + arr.write(getTag(FLAG_FRAMETYPE_INTERFRAME, FLAG_CODEC_SCREEN)); + writeShort(arr, _area.width + ((blockSize / 16 - 1) << 12)); + writeShort(arr, _area.height + ((blockSize / 16 - 1) << 12)); Rectangle area = getNextBlock(_area, null); while (area.width > 0 && area.height > 0) { - writeShort(ba, 0); + writeShort(arr, 0); area = getNextBlock(_area, area); } - unalteredFrame = getData(ba.toByteArray()); + unalteredFrame = getData(arr.toByteArray()); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/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 327e065..fa3bca1 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 @@ -29,8 +29,6 @@ import java.awt.Rectangle; import java.awt.Robot; import java.awt.SystemColor; import java.awt.Toolkit; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.IOException; @@ -268,9 +266,7 @@ public class ScreenSharerFrame extends JFrame { btnStartStopSharing.setToolTipText(startSharingLabel); btnStartStopSharing.setIcon(startIcon); btnStartStopSharing.setSize(200, 32); - btnStartStopSharing.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent arg0) { + btnStartStopSharing.addActionListener(evt -> { if (sharingStarted) { if (!sharingActionRequested) { sharingActionRequested = true; @@ -286,20 +282,14 @@ public class ScreenSharerFrame extends JFrame { logger.warn("Sharing action is already requested"); } } - } - }); + }); JLabel lblSelectArea = new JLabel(getTextLabel(textLabels, 4)); //#id 734 JPanel panelStatus = new JPanel(); audioNotify = new JCheckBox(getTextLabel(textLabels, 36)); //#id 1589 audioNotify.setBackground(Color.WHITE); audioNotify.setSelected(core.isAudioNotify()); - audioNotify.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - core.setAudioNotify(audioNotify.isSelected()); - } - }); + audioNotify.addActionListener(e -> core.setAudioNotify(audioNotify.isSelected())); GroupLayout gl_contentPane = new GroupLayout(contentPane); gl_contentPane.setHorizontalGroup( @@ -405,12 +395,7 @@ public class ScreenSharerFrame extends JFrame { spinnerHeight = new NumberSpinner(getDim().getSpinnerHeight(), 0, getDim().getHeightMax(), 1); spinnerHeight.setBounds(400, 50, 60, 24); - spinnerHeight.addChangeListener( new ChangeListener(){ - @Override - public void stateChanged(ChangeEvent arg0) { - calcNewValueHeightSpin(); - } - }); + spinnerHeight.addChangeListener(e -> calcNewValueHeightSpin()); panelScreen.add(spinnerHeight); //Spinner X @@ -421,12 +406,7 @@ public class ScreenSharerFrame extends JFrame { spinnerX = new NumberSpinner(getDim().getSpinnerX(), 0, getDim().getWidthMax(), 1); spinnerX.setBounds(400, 80, 60, 24); - spinnerX.addChangeListener(new ChangeListener(){ - @Override - public void stateChanged(ChangeEvent arg0) { - calcNewValueXSpin(); - } - }); + spinnerX.addChangeListener(e -> calcNewValueXSpin()); panelScreen.add(spinnerX); //Spinner Y @@ -437,12 +417,7 @@ public class ScreenSharerFrame extends JFrame { spinnerY = new NumberSpinner(getDim().getSpinnerY(), 0, getDim().getHeightMax(), 1); spinnerY.setBounds(400, 110, 60, 24); - spinnerY.addChangeListener(new ChangeListener(){ - @Override - public void stateChanged(ChangeEvent arg0) { - calcNewValueYSpin(); - } - }); + spinnerY.addChangeListener(e -> calcNewValueYSpin()); panelScreen.add(spinnerY); //Quality @@ -457,14 +432,12 @@ public class ScreenSharerFrame extends JFrame { comboQuality.addItem(new KeyValue<>(getTextLabel(textLabels, 21), ScreenQuality.Medium)); //#id 1092 comboQuality.addItem(new KeyValue<>(getTextLabel(textLabels, 22), ScreenQuality.Low)); //#id 1093 comboQuality.setBounds(250, 170, 130, 24); - comboQuality.addActionListener(new ActionListener() { - @Override - @SuppressWarnings("unchecked") - public void actionPerformed(ActionEvent e) { - getDim().setQuality(((KeyValue<ScreenQuality>)comboQuality.getSelectedItem()).getValue()); + comboQuality.addActionListener(e -> { + @SuppressWarnings("unchecked") + ScreenQuality q = ((KeyValue<ScreenQuality>)comboQuality.getSelectedItem()).getValue(); + getDim().setQuality(q); calcRescaleFactors(); - } - }); + }); comboQuality.setSelectedIndex(core.getDefaultQuality()); panelScreen.add(comboQuality); comboFPS = new JComboBox<>(); @@ -475,14 +448,12 @@ public class ScreenSharerFrame extends JFrame { comboFPS.addItem(new KeyValue<>("20 FPS", 20)); comboFPS.addItem(new KeyValue<>("25 FPS", 25)); comboFPS.addItem(new KeyValue<>("30 FPS", 30)); - comboFPS.addActionListener(new ActionListener() { - @Override - @SuppressWarnings("unchecked") - public void actionPerformed(ActionEvent e) { - getDim().setFps(((KeyValue<Integer>)comboFPS.getSelectedItem()).getValue()); + comboFPS.addActionListener(e -> { + @SuppressWarnings("unchecked") + Integer v = ((KeyValue<Integer>)comboFPS.getSelectedItem()).getValue(); + getDim().setFps(v); calcRescaleFactors(); - } - }); + }); boolean fpsSelected = false; for (int i = 0; i < comboFPS.getItemCount(); ++i) { KeyValue<Integer> v = comboFPS.getItemAt(i); @@ -515,9 +486,7 @@ public class ScreenSharerFrame extends JFrame { btnStartStopRecording.setToolTipText(getTextLabel(textLabels, 15)); //#id 871 btnStartStopRecording.setIcon(startIcon); btnStartStopRecording.setBounds(10, 82, 200, 32); - btnStartStopRecording.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent arg0) { + btnStartStopRecording.addActionListener(e -> { if (recordingStarted) { if (!recordingActionRequested) { recordingActionRequested = true; @@ -533,8 +502,7 @@ public class ScreenSharerFrame extends JFrame { logger.warn("Recording action is already requested"); } } - } - }); + }); panelRecording.add(btnStartStopRecording); panelPublish.setBackground(Color.WHITE); @@ -583,9 +551,7 @@ public class ScreenSharerFrame extends JFrame { btnStartStopPublish.setToolTipText(getTextLabel(textLabels, 24)); //#id 1466 btnStartStopPublish.setIcon(startIcon); btnStartStopPublish.setBounds(10, 86, 200, 32); - btnStartStopPublish.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent arg0) { + btnStartStopPublish.addActionListener(e -> { if (publishStarted) { if (!publishingActionRequested) { publishingActionRequested = true; @@ -601,8 +567,7 @@ public class ScreenSharerFrame extends JFrame { logger.warn("Publishing action is already requested"); } } - } - }); + }); panelPublish.add(btnStartStopPublish); JPanel panelSecurity = new JPanel(); @@ -615,12 +580,7 @@ public class ScreenSharerFrame extends JFrame { remoteEnabled.setSelected(core.isRemoteEnabled()); remoteEnabled.setBounds(10, 10, 450, 24); remoteEnabled.setEnabled(core.isRemoteEnabled()); - remoteEnabled.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - core.setRemoteEnabled(remoteEnabled.isSelected()); - } - }); + remoteEnabled.addActionListener(e -> core.setRemoteEnabled(remoteEnabled.isSelected())); panelSecurity.add(remoteEnabled); panelStatus.setBackground(SystemColor.control); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java index 254b22e..7f93139 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java @@ -159,16 +159,14 @@ public class OmKeyEvent { r.press(list); } } - } else if (SystemUtils.IS_OS_WINDOWS) { - if (UMLAUTS.contains(ch)) { - list.add(KeyEvent.VK_ALT); - list.add(KeyEvent.VK_ADD); - String code = String.format("%04d", (int)ch); - for (int i = 0; i < code.length(); ++i) { - list.add(KeyEvent.VK_NUMPAD0 + code.charAt(i)); - } - r.press(list); + } else if (SystemUtils.IS_OS_WINDOWS && UMLAUTS.contains(ch)) { + list.add(KeyEvent.VK_ALT); + list.add(KeyEvent.VK_ADD); + String code = String.format("%04d", (int)ch); + for (int i = 0; i < code.length(); ++i) { + list.add(KeyEvent.VK_NUMPAD0 + code.charAt(i)); } + r.press(list); } } else { if (shift) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/util/Util.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/util/Util.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/util/Util.java index 2aeb02b..17f810b 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/util/Util.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/util/Util.java @@ -24,6 +24,8 @@ import java.util.Map; import java.util.Properties; public class Util { + private Util() {} + public static Properties getQurtzProps(String name) { final Properties p = new Properties(); p.put(PROP_SCHED_INSTANCE_NAME, name); @@ -46,5 +48,4 @@ public class Util { public static float getFloat(Map<String, Object> map, String key) { return getDouble(map, key).floatValue(); } - } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncReportInfo.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncReportInfo.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncReportInfo.java index 2dfd856..c1242f6 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncReportInfo.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncReportInfo.java @@ -145,8 +145,8 @@ public class SyncReportInfo implements XmlSerializable { DomUtil.addChildElement(syncCollection, XML_SYNC_TOKEN, NAMESPACE, syncToken); if (limit > 0) { - Element limit = DomUtil.addChildElement(syncCollection, XML_LIMIT, NAMESPACE); - DomUtil.addChildElement(limit, XML_NRESULTS, NAMESPACE, Integer.toString(this.limit)); + Element xlimit = DomUtil.addChildElement(syncCollection, XML_LIMIT, NAMESPACE); + DomUtil.addChildElement(xlimit, XML_NRESULTS, NAMESPACE, Integer.toString(this.limit)); } DomUtil.addChildElement(syncCollection, XML_SYNC_LEVEL, NAMESPACE, http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java index fa38340..7407904 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java @@ -49,6 +49,8 @@ public class CalendarPatterns { public static final FastDateFormat ISO8601_DATETIME_FORMAT = FastDateFormat.getInstance(ISO8601_DATETIME_FORMAT_STRING); public static final FastDateFormat ISO8601_DATE_FORMAT = FastDateFormat.getInstance(ISO8601_DATE_FORMAT_STRING); + private CalendarPatterns() {} + public static String getDateByMiliSeconds(Date t) { return dateFormat__yyyyMMddHHmmss.format(t); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java index 598be67..05b5748 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java @@ -22,6 +22,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.wicket.util.string.Strings; public class DaoHelper { + private DaoHelper() {} public static String getSearchQuery(String table, String alias, String search, boolean filterDeleted, boolean count, String sort, String... fields) { return getSearchQuery(table, alias, search, false, filterDeleted, count, sort, fields); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java index 52f27ec..d5488c1 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java @@ -29,6 +29,8 @@ import java.util.Map; * */ public class ImportHelper { + private ImportHelper() {} + /** * returns a list of all timezones as a {@link Map} * http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java index 6126b15..aa6c4b1 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java @@ -78,6 +78,8 @@ public class OmFileHelper { public static final Long SIP_USER_ID = -1L; public static final String SIP_PICTURE_URI = "phone.png"; + private OmFileHelper() {} + public static void setOmHome(File omHome) { OmFileHelper.OM_HOME = omHome; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java index d2e9650..e171531 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java @@ -116,6 +116,8 @@ public class OpenmeetingsVariables { private static JSONObject roomSettings = new JSONObject(); private static boolean initComplete = false; + private OpenmeetingsVariables() {} + public static String getApplicationName() { return applicationName; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java index dc74023..000bdb6 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java @@ -18,7 +18,6 @@ */ package org.apache.openmeetings.util; -import java.io.IOException; import java.io.InputStream; import java.util.Properties; @@ -31,47 +30,31 @@ public class Version { private static String version = null; private static String revision = null; private static String buildDate = null; - - private static void init() throws IOException { - Properties props = new Properties(); - try (InputStream is = Version.class.getResourceAsStream("version.properties")) { - props.load(is); + static { + try { + Properties props = new Properties(); + try (InputStream is = Version.class.getResourceAsStream("version.properties")) { + props.load(is); + } + version = props.getProperty("version"); + revision = props.getProperty("revision"); + buildDate = props.getProperty("date"); + } catch (Exception e) { + log.error("Error", e); } - version = props.getProperty("version"); - revision = props.getProperty("revision"); - buildDate = props.getProperty("date"); } + private Version() {} + public static String getVersion() { - if (version == null) { - try { - init(); - } catch (Exception e) { - log.error("Error", e); - } - } return version; } public static String getRevision() { - if (revision == null) { - try { - init(); - } catch (Exception e) { - log.error("Error", e); - } - } return revision; } public static String getBuildDate() { - if (buildDate == null) { - try { - init(); - } catch (Exception e) { - log.error("Error", e); - } - } return buildDate; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java index a010bfa..9a41752 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java @@ -64,6 +64,8 @@ public class XmlExport { + "see http://openmeetings.apache.org/LanguageEditor.html for Details\n" + "###############################################\n"; + private XmlExport() {} + public static Document createDocument() { Document document = DocumentHelper.createDocument(); document.setXMLEncoding(UTF_8.name()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java index 2833354..38996c3 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java @@ -28,6 +28,8 @@ public class CryptProvider { private static final Logger log = Red5LoggerFactory.getLogger(CryptProvider.class, getWebAppRootKey()); private static volatile ICrypt crypt; + private CryptProvider() {} + public static ICrypt get() { if (crypt == null) { synchronized (CryptProvider.class) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5.java index 22056d3..3a96380 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5.java @@ -26,6 +26,8 @@ import java.security.NoSuchAlgorithmException; import org.apache.commons.codec.binary.Hex; public class MD5 { + private MD5() {} + public static String checksum(String data) throws NoSuchAlgorithmException { MessageDigest md5 = MessageDigest.getInstance("MD5"); byte[] b = data == null ? new byte[0] : data.getBytes(UTF_8); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java index 5705e5d..3879741 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java @@ -32,6 +32,8 @@ import org.slf4j.Logger; class MD5Implementation { private static final Logger log = Red5LoggerFactory.getLogger(MD5Implementation.class, getWebAppRootKey()); + private MD5Implementation() {} + private static String hash(String str) { String passPhrase = null; try { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SHA256Implementation.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SHA256Implementation.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SHA256Implementation.java index 1fd8dcd..88f7824 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SHA256Implementation.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SHA256Implementation.java @@ -32,6 +32,8 @@ import org.bouncycastle.crypto.params.KeyParameter; class SHA256Implementation { private static final int KEY_LENGTH = 128 * 8; + private SHA256Implementation() {} + private static String hash(String str, byte[] salt, int iter) { PKCS5S2ParametersGenerator gen = new PKCS5S2ParametersGenerator(new SHA256Digest()); gen.init(str.getBytes(StandardCharsets.UTF_8), salt, iter); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/MailUtil.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/MailUtil.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/MailUtil.java index 3805521..c7ab2dd 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/MailUtil.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/MailUtil.java @@ -23,6 +23,8 @@ import org.apache.wicket.util.string.Strings; import org.apache.wicket.validation.Validatable; public class MailUtil { + private MailUtil() {} + public static boolean isValid(String email) { if (Strings.isEmpty(email)) { return false; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java index 1e49c36..b92c538 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java @@ -33,6 +33,8 @@ import org.slf4j.Logger; public class ProcessHelper { public static final Logger log = Red5LoggerFactory.getLogger(ProcessHelper.class, OpenmeetingsVariables.getWebAppRootKey()); + private ProcessHelper() {} + public static ConverterProcessResult executeScriptWindows(String process, String[] argv) { try { String[] cmd = new String[argv.length + 2]; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java index 53b8700..d105238 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java @@ -143,8 +143,6 @@ import com.hazelcast.core.Member; import com.hazelcast.core.MemberAttributeEvent; import com.hazelcast.core.MembershipEvent; import com.hazelcast.core.MembershipListener; -import com.hazelcast.core.Message; -import com.hazelcast.core.MessageListener; public class Application extends AuthenticatedWebApplication implements IApplication { private static final Logger log = getLogger(Application.class, getWebAppRootKey()); @@ -180,16 +178,13 @@ public class Application extends AuthenticatedWebApplication implements IApplica hazelcast.getCluster().getLocalMember().setStringAttribute(NAME_ATTR_KEY, hazelcast.getName()); hazelWsTopic = hazelcast.getTopic("default"); - hazelWsTopic.addMessageListener(new MessageListener<IClusterWsMessage>() { - @Override - public void onMessage(Message<IClusterWsMessage> msg) { + hazelWsTopic.addMessageListener(msg -> { String serverId = msg.getPublishingMember().getStringAttribute(NAME_ATTR_KEY); if (serverId.equals(hazelcast.getName())) { return; } WbWebSocketHelper.send(msg.getMessageObject()); - } - }); + }); hazelcast.getCluster().addMembershipListener(new MembershipListener() { @Override public void memberRemoved(MembershipEvent evt) { @@ -743,11 +738,9 @@ public class Application extends AuthenticatedWebApplication implements IApplica public static boolean isInstalled() { boolean result = isInstalled; - if (!isInstalled) { - if (isInitComplete()) { - //TODO can also check crypt class here - isInstalled = result = get()._getBean(UserDao.class).count() > 0; - } + if (!isInstalled && isInitComplete()) { + //TODO can also check crypt class here + isInstalled = result = get()._getBean(UserDao.class).count() > 0; } return result; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java index 27be7d8..49df48b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java @@ -180,35 +180,31 @@ public class WebSession extends AbstractAuthenticatedWebSession implements IWebS public void checkHashes(StringValue secure, StringValue invitation) { try { - if (!secure.isEmpty()) { - if (!isSignedIn() || soap == null || !soap.getHash().equals(secure.toString())) { - // otherwise already logged-in with the same hash - if (isSignedIn()) { - invalidateNow(); - } - signIn(secure.toString(), true); + if (!secure.isEmpty() && (soap == null || !soap.getHash().equals(secure.toString()))) { + // otherwise already logged-in with the same hash + if (isSignedIn()) { + invalidateNow(); } + signIn(secure.toString(), true); } - if (!invitation.isEmpty()) { - if (!isSignedIn() || i == null || !i.getHash().equals(invitation.toString())) { - // otherwise already logged-in with the same hash - if (isSignedIn()) { - invalidateNow(); - } - i = getBean(InvitationDao.class).getByHash(invitation.toString(), false, true); - if (i != null && i.isAllowEntry()) { - Set<Right> rights = new HashSet<>(); - if (i.getRoom() != null) { - rights.add(Right.Room); - roomId = i.getRoom().getId(); - } else if (i.getAppointment() != null && i.getAppointment().getRoom() != null) { - rights.add(Right.Room); - roomId = i.getAppointment().getRoom().getId(); - } else if (i.getRecording() != null) { - recordingId = i.getRecording().getId(); - } - setUser(i.getInvitee(), rights); + if (!invitation.isEmpty() && (i == null || !i.getHash().equals(invitation.toString()))) { + // otherwise already logged-in with the same hash + if (isSignedIn()) { + invalidateNow(); + } + i = getBean(InvitationDao.class).getByHash(invitation.toString(), false, true); + if (i != null && i.isAllowEntry()) { + Set<Right> hrights = new HashSet<>(); + if (i.getRoom() != null) { + hrights.add(Right.Room); + roomId = i.getRoom().getId(); + } else if (i.getAppointment() != null && i.getAppointment().getRoom() != null) { + hrights.add(Right.Room); + roomId = i.getAppointment().getRoom().getId(); + } else if (i.getRecording() != null) { + recordingId = i.getRecording().getId(); } + setUser(i.getInvitee(), hrights); } } } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java index 247b52c..116e5ce 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java @@ -138,9 +138,9 @@ public abstract class InvitationForm extends Form<Invitation> { } protected void updateButtons(AjaxRequestTarget target) { - Collection<User> to = recipients.getModelObject(); - dialog.send.setEnabled(!to.isEmpty(), target); - dialog.generate.setEnabled(to.size() == 1, target); + Collection<User> recpnts = recipients.getModelObject(); + dialog.send.setEnabled(!recpnts.isEmpty(), target); + dialog.generate.setEnabled(recpnts.size() == 1, target); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java index c727a34..c8367e6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java @@ -315,13 +315,13 @@ public class MainPanel extends Panel { } private List<IMenuItem> getMainMenu() { - List<IMenuItem> menu = new ArrayList<>(); + List<IMenuItem> mmenu = new ArrayList<>(); { // Dashboard Menu Points List<IMenuItem> l = new ArrayList<>(); l.add(getSubItem("290", "1450", MenuActions.dashboardModuleStartScreen, null)); l.add(getSubItem("291", "1451", MenuActions.dashboardModuleCalendar, null)); - menu.add(new MenuItem(Application.getString("124"), l)); + mmenu.add(new MenuItem(Application.getString("124"), l)); } { // Conference Menu Points @@ -346,13 +346,13 @@ public class MainPanel extends Panel { } }); } - menu.add(new MenuItem(Application.getString("792"), l)); + mmenu.add(new MenuItem(Application.getString("792"), l)); } { // Recording Menu Points List<IMenuItem> l = new ArrayList<>(); l.add(getSubItem("395", "1452", MenuActions.recordModule, null)); - menu.add(new MenuItem(Application.getString("395"), l)); + mmenu.add(new MenuItem(Application.getString("395"), l)); } Set<Right> r = WebSession.getRights(); boolean isAdmin = hasAdminLevel(r); @@ -373,9 +373,9 @@ public class MainPanel extends Panel { l.add(getSubItem("367", "1461", MenuActions.adminModuleBackup, null)); l.add(getSubItem("main.menu.admin.email", "main.menu.admin.email.desc", MenuActions.adminModuleEmail, null)); } - menu.add(new MenuItem(Application.getString("6"), l)); + mmenu.add(new MenuItem(Application.getString("6"), l)); } - return menu; + return mmenu; } public void updateContents(OmUrlFragment f, IPartialPageRequestHandler handler) { @@ -391,12 +391,12 @@ public class MainPanel extends Panel { } public void updateContents(OmUrlFragment f, IPartialPageRequestHandler handler, boolean updateFragment) { - BasePanel panel = getPanel(f.getArea(), f.getType()); - if (panel != null) { + BasePanel npanel = getPanel(f.getArea(), f.getType()); + if (npanel != null) { if (getClient() != null) { - updateContents(panel, handler); + updateContents(npanel, handler); } else { - this.panel = panel; + this.panel = npanel; } if (updateFragment) { UrlFragment uf = new UrlFragment(handler); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java index c772b52..ee12d32 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java @@ -65,12 +65,10 @@ public class OmTreeProvider implements ITreeProvider<BaseFileItem> { public void refreshRoots(boolean all) { List<BaseFileItem> fRoot = new ArrayList<>(), rRoot = new ArrayList<>(); - if (all) { - if (roomId != null) { - BaseFileItem r = createRoot(Application.getString("706"), FILES_MY, false); - r.setOwnerId(getUserId()); - fRoot.add(r); - } + if (all && roomId != null) { + BaseFileItem r = createRoot(Application.getString("706"), FILES_MY, false); + r.setOwnerId(getUserId()); + fRoot.add(r); } if (roomId != null) { BaseFileItem r = createRoot(Application.getString("707"), FILES_ROOM, false); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java index 95c8c9d..7970346 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java @@ -39,10 +39,8 @@ import java.security.cert.X509Certificate; import java.util.HashMap; import java.util.Map; -import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; @@ -225,13 +223,7 @@ public class SignInPage extends BaseInitedPage { sslContext.init(null, trustAllCerts, new java.security.SecureRandom()); SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory(); connection.setSSLSocketFactory(sslSocketFactory); - connection.setHostnameVerifier(new HostnameVerifier() { - - @Override - public boolean verify(String arg0, SSLSession arg1) { - return true; - } - }); + connection.setHostnameVerifier((arg0, arg1) -> true); } catch (Exception e) { log.error("[prepareConnection]", e); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/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 663db75..1730457 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 @@ -591,10 +591,8 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { @Override public IDynamicWizardStep next() { - if (!isAllChecked) { - if (!checkAllPath()) { - return this; - } + if (!isAllChecked && !checkAllPath()) { + return this; } return paramsStep4; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java index 98631ac..7d0faae 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java @@ -33,6 +33,8 @@ import org.slf4j.Logger; public class RoomBroadcaster { private static final Logger log = Red5LoggerFactory.getLogger(RoomBroadcaster.class, getWebAppRootKey()); + private RoomBroadcaster() {} + public static StreamClient getClient(String publicSid) { return getBean(ISessionManager.class).get(publicSid); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java index 8a42311..cd6a2f3 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java @@ -190,6 +190,7 @@ public class RoomPanel extends BasePanel { @Override public void close() throws IOException { + //no-op } }; } @@ -369,6 +370,7 @@ public class RoomPanel extends BasePanel { @Override public void onClose(IPartialPageRequestHandler handler, DialogButton button) { + //no-op } }); } else { @@ -824,7 +826,6 @@ public class RoomPanel extends BasePanel { } public boolean screenShareAllowed() { - Room r = getRoom(); return !isInterview && !r.isHidden(RoomElement.ScreenSharing) && r.isAllowRecording() && getClient().hasRight(Right.share) && sharingUser == null; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java index 86eb83a..9fddc22 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java @@ -80,13 +80,13 @@ public class ActivitiesPanel extends Panel { try { String id = getRequest().getRequestParameters().getParameterValue(PARAM_ID).toString(); long roomId = getRequest().getRequestParameters().getParameterValue(PARAM_ROOM_ID).toLong(); - Action action = Action.valueOf(getRequest().getRequestParameters().getParameterValue(ACTION).toString()); + Action act = Action.valueOf(getRequest().getRequestParameters().getParameterValue(ACTION).toString()); Activity a = activities.get(id); if (a == null || !room.getRoom().getId().equals(roomId)) { log.error("It seems like we are being hacked!!!!"); return; } - switch (action) { + switch (act) { case close: remove(id, target); break; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java index 33c5af0..98b96df 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java @@ -26,8 +26,8 @@ import org.apache.openmeetings.db.dao.file.FileItemDao; import org.apache.openmeetings.db.dao.record.RecordingDao; import org.apache.openmeetings.db.dto.record.RecordingContainerData; import org.apache.openmeetings.db.entity.file.BaseFileItem; -import org.apache.openmeetings.web.common.NameDialog; import org.apache.openmeetings.web.common.ConfirmableAjaxBorder.ConfirmableBorderDialog; +import org.apache.openmeetings.web.common.NameDialog; import org.apache.openmeetings.web.common.tree.FileTreePanel; import org.apache.openmeetings.web.room.RoomPanel; import org.apache.wicket.Component; @@ -59,6 +59,7 @@ public class RoomFilePanel extends FileTreePanel { @Override protected void update(AjaxRequestTarget target, BaseFileItem f) { + //no-op } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java index 5bf35db..ad5c434 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java @@ -109,13 +109,9 @@ public class UploadDialog extends AbstractFormDialog<String> { form.add(uploadField = new FileUploadField("file", new IModel<List<FileUpload>>() { private static final long serialVersionUID = 1L; - //FIXME this need to be eliminated - @Override - public void detach() { - } - @Override public void setObject(List<FileUpload> object) { + //no-op } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.java index 4517bb6..1aa379e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.java @@ -49,7 +49,9 @@ public class InterviewWbPanel extends AbstractWbPanel { } @Override - public void sendFileToWb(final BaseFileItem fi, boolean clean) {} + public void sendFileToWb(final BaseFileItem fi, boolean clean) { + //no-op + } @Override protected void processWbAction(WbAction a, JSONObject obj, AjaxRequestTarget target) throws IOException { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java index 7613844..c5b50a8 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java @@ -53,5 +53,6 @@ public class AboutDialog extends AbstractDialog<String> { @Override public void onClose(IPartialPageRequestHandler handler, DialogButton arg1) { + //no-op } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java index d05f783..f7b4861 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java @@ -99,5 +99,6 @@ public class InviteUserToRoomDialog extends AbstractDialog<String> { @Override public void onClose(IPartialPageRequestHandler handler, DialogButton button) { + //no-op } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java index ea7568a..a1eaa78 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java @@ -345,14 +345,14 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> { createRoomBlock.setEnabled(createRoom); groom.setEnabled(!createRoom); if (a.getId() == null) { - java.util.Calendar start = WebSession.getCalendar(); - start.setTime(a.getStart()); - java.util.Calendar end = WebSession.getCalendar(); - end.setTime(a.getEnd()); - - if (start.equals(end)) { - end.add(java.util.Calendar.HOUR_OF_DAY, 1); - a.setEnd(end.getTime()); + java.util.Calendar from = WebSession.getCalendar(); + from.setTime(a.getStart()); + java.util.Calendar to = WebSession.getCalendar(); + to.setTime(a.getEnd()); + + if (from.equals(to)) { + to.add(java.util.Calendar.HOUR_OF_DAY, 1); + a.setEnd(to.getTime()); } cals.setEnabled(true); } else { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java index d732b50..0fe6b24 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java @@ -322,13 +322,13 @@ public class CalendarPanel extends UserBasePanel { @Override protected void populateItem(final ListItem<OmCalendar> item) { item.setOutputMarkupId(true); - final OmCalendar calendar = item.getModelObject(); - item.add(new Button("item", new PropertyModel<String>(calendar, "title")).add(new AjaxEventBehavior("click") { + final OmCalendar cal = item.getModelObject(); + item.add(new Button("item", new PropertyModel<String>(cal, "title")).add(new AjaxEventBehavior("click") { private static final long serialVersionUID = 1L; @Override protected void onEvent(AjaxRequestTarget target) { - calendarDialog.open(target, CalendarDialog.DIALOG_TYPE.UPDATE_CALENDAR, calendar); + calendarDialog.open(target, CalendarDialog.DIALOG_TYPE.UPDATE_CALENDAR, cal); target.add(calendarDialog); } })); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java index acfed84..148dea2 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java @@ -246,10 +246,6 @@ public class Chat extends Panel { private static final long serialVersionUID = 1L; @Override - protected void onError(AjaxRequestTarget target) { - } - - @Override protected void onSubmit(AjaxRequestTarget target) { ChatDao dao = getBean(ChatDao.class); String scope = activeTab.getModelObject(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java index c79ac0b..1497912 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java @@ -104,6 +104,7 @@ public class AdminCleanupInfoDialog extends AbstractDialog<String> { @Override public void onClose(IPartialPageRequestHandler handler, DialogButton button) { + //no-op } private void update(AjaxRequestTarget target) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/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 6b07106..4bd760d 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 @@ -525,10 +525,6 @@ public class MessagesContactsPanel extends UserBasePanel { private static final long serialVersionUID = 1L; @Override - public void detach() { - } - - @Override public Iterator<? extends UserContact> iterator(long first, long count) { return getBean(UserContactDao.class).get(getUserId(), (int)first, (int)count).iterator(); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java index d1e4151..f458a70 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java @@ -91,10 +91,6 @@ public class UserSearchPanel extends UserBasePanel { private static final long serialVersionUID = 1L; @Override - public void detach() { - } - - @Override public Iterator<? extends User> iterator(long first, long count) { return searched ? getBean(UserDao.class).searchUserProfile(getUserId(), text, offer, search, orderBy, (int)first, (int)count, asc).iterator() : new ArrayList<User>().iterator(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java index 1cfde98..451a546 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java @@ -109,6 +109,7 @@ public class RoomListPanel extends Panel { * @param r */ public void onContainerClick(AjaxRequestTarget target, Room r) { + //no-op } /** @@ -117,6 +118,7 @@ public class RoomListPanel extends Panel { * @param r */ public void onRefreshClick(AjaxRequestTarget target, Room r) { + //no-op } /** http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java index 6e334bb..a013be3 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java @@ -25,6 +25,8 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.util.string.StringValue; public class CallbackFunctionHelper { + private CallbackFunctionHelper() {} + private static StringBuilder getNamedFunctionStr(String name, AbstractDefaultAjaxBehavior b, CallbackParameter... extraParameters) { StringBuilder sb = new StringBuilder(); sb.append("function ").append(name).append("("); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java index 2100a4d..633cdf4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java @@ -31,6 +31,8 @@ import org.apache.openmeetings.service.mail.template.RequestContactTemplate; import org.apache.openmeetings.web.app.Application; public class ContactsHelper { + private ContactsHelper() {} + public static Object addUserToContactList(long userIdToAdd) { boolean isContact = getBean(UserContactDao.class).isContact(userIdToAdd, getUserId()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java index cd3ac9b..1dc6e0f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java @@ -122,8 +122,4 @@ public class UserChoiceProvider extends RestrictiveChoiceProvider<User> { super.toJson(choice, stringer); stringer.key("contact").value(choice.getType() == Type.contact); } - - @Override - public void detach() { - } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce4e69d2/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/Constants.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/Constants.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/Constants.java index de60fd3..af05b2b 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/Constants.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/Constants.java @@ -22,4 +22,6 @@ public class Constants { public static final String TNS = "http://webservice.openmeetings.apache.org/";; public static final String USER_SERVICE_NAME = "org.apache.openmeetings.webservice.UserWebService"; public static final String USER_SERVICE_PORT_NAME = "UserService"; + + private Constants() {} }
