This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 357ee24 [OPENMEETINGS-2176] some Sonar issues are addressed
357ee24 is described below
commit 357ee24a252fcb6513784fca38bbe627deff461b
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Fri Feb 28 16:16:43 2020 +0700
[OPENMEETINGS-2176] some Sonar issues are addressed
---
.../openmeetings/core/converter/BaseConverter.java | 4 +-
.../openmeetings/core/ldap/LdapLoginManager.java | 8 ++--
.../openmeetings/core/remote/KTestStream.java | 24 +++++------
.../openmeetings/core/remote/KurentoHandler.java | 32 +++++++-------
.../openmeetings/core/rss/LoadAtomRssFeed.java | 6 +--
.../openmeetings/db/dao/file/BaseFileItemDao.java | 4 +-
.../openmeetings/db/dao/file/FileItemDao.java | 2 +-
.../openmeetings/db/dao/record/RecordingDao.java | 2 +-
.../db/dao/room/IInvitationManager.java | 2 +-
.../openmeetings/db/entity/basic/Client.java | 24 +++++------
.../openmeetings/db/util/ApplicationHelper.java | 4 +-
.../org/apache/openmeetings/db/util/DaoHelper.java | 22 +++++-----
.../apache/openmeetings/db/util/LocaleHelper.java | 4 +-
.../apache/openmeetings/backup/BackupImport.java | 2 +-
.../java/org/apache/openmeetings/cli/Admin.java | 50 +++++++++++-----------
.../apache/openmeetings/cli/OmHelpFormatter.java | 4 +-
.../openmeetings/screenshare/ScreenV1Encoder.java | 8 ++--
.../openmeetings/screenshare/job/OmKeyEvent.java | 6 +--
.../service/calendar/caldav/IcalUtils.java | 6 +--
.../apache/openmeetings/web/room/wb/WbPanel.java | 36 ++++++++--------
.../openmeetings/web/user/OmWysiwygToolbar.html | 1 +
.../openmeetings/webservice/RoomWebService.java | 6 +--
22 files changed, 128 insertions(+), 129 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
index 37f8cdd..f968885 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
@@ -329,10 +329,10 @@ public abstract class BaseConverter {
return argv;
}
- protected String convertToMp4(Recording r, List<String> _argv,
ProcessResultList logs) throws IOException {
+ protected String convertToMp4(Recording r, List<String> inArgv,
ProcessResultList logs) throws IOException {
String mp4path = r.getFile().getCanonicalPath();
List<String> argv = new
ArrayList<>(Arrays.asList(getPathToFFMPEG(), "-y"));
- argv.addAll(_argv);
+ argv.addAll(inArgv);
logs.add(ProcessHelper.executeScript("generate MP4",
addMp4OutParams(r, argv, mp4path).toArray(new String[]{})));
return mp4path;
}
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
index c7ecace..79e9ac6 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
@@ -162,22 +162,22 @@ public class LdapLoginManager {
*
* Connection Data is retrieved from ConfigurationFile
*
- * @param _login - user login
+ * @param inLogin - user login
* @param passwd - user password
* @param domainId - user domain id
* @return - {@link User} with this credentials or <code>null</code>
* @throws OmException - in case of any error
*/
- public User login(String _login, String passwd, Long domainId) throws
OmException {
+ public User login(String inLogin, String passwd, Long domainId) throws
OmException {
log.debug("LdapLoginmanager.doLdapLogin");
- if (!userDao.validLogin(_login)) {
+ if (!userDao.validLogin(inLogin)) {
log.error("Invalid login provided");
return null;
}
User u = null;
try (LdapWorker w = new LdapWorker(domainId)) {
- String login = w.options.useLowerCase ?
_login.toLowerCase(Locale.ROOT) : _login;
+ String login = w.options.useLowerCase ?
inLogin.toLowerCase(Locale.ROOT) : inLogin;
boolean authenticated = true;
Dn userDn = null;
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KTestStream.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KTestStream.java
index b167220..7da1a1e 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KTestStream.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KTestStream.java
@@ -122,20 +122,20 @@ public class KTestStream extends AbstractStream {
});
}
- public void play(final IWsClient _c, JSONObject msg, MediaPipeline
pipeline) {
- this.pipeline = pipeline;
+ public void play(final IWsClient inClient, JSONObject msg,
MediaPipeline inPipeline) {
+ this.pipeline = inPipeline;
webRtcEndpoint = createWebRtcEndpoint(pipeline);
player = createPlayerEndpoint(pipeline, recPath);
player.connect(webRtcEndpoint);
webRtcEndpoint.addMediaSessionStartedListener(evt -> {
log.info("Media session started {}", evt);
player.addErrorListener(event -> {
- log.info("ErrorEvent for player
with uid '{}': {}", _c.getUid(), event.getDescription());
- sendPlayEnd(_c);
+ log.info("ErrorEvent for player
with uid '{}': {}", inClient.getUid(), event.getDescription());
+ sendPlayEnd(inClient);
});
player.addEndOfStreamListener(event -> {
- log.info("EndOfStreamEvent for
player with uid '{}'", _c.getUid());
- sendPlayEnd(_c);
+ log.info("EndOfStreamEvent for
player with uid '{}'", inClient.getUid());
+ sendPlayEnd(inClient);
});
player.play();
});
@@ -143,9 +143,9 @@ public class KTestStream extends AbstractStream {
String sdpOffer = msg.getString("sdpOffer");
String sdpAnswer = webRtcEndpoint.processOffer(sdpOffer);
- addIceListener(_c);
+ addIceListener(inClient);
- WebSocketHelper.sendClient(_c, newTestKurentoMsg()
+ WebSocketHelper.sendClient(inClient, newTestKurentoMsg()
.put("id", "playResponse")
.put("sdpAnswer", sdpAnswer));
@@ -158,10 +158,10 @@ public class KTestStream extends AbstractStream {
}
}
- private void addIceListener(IWsClient _c) {
+ private void addIceListener(IWsClient inClient) {
webRtcEndpoint.addIceCandidateFoundListener(evt -> {
IceCandidate cand = evt.getCandidate();
- WebSocketHelper.sendClient(_c,
newTestKurentoMsg()
+ WebSocketHelper.sendClient(inClient,
newTestKurentoMsg()
.put("id", "iceCandidate")
.put(PARAM_CANDIDATE, new
JSONObject()
.put(PARAM_CANDIDATE, cand.getCandidate())
@@ -170,8 +170,8 @@ public class KTestStream extends AbstractStream {
});
}
- private void sendPlayEnd(IWsClient _c) {
- WebSocketHelper.sendClient(_c, newTestKurentoMsg().put("id",
"playStopped"));
+ private void sendPlayEnd(IWsClient inClient) {
+ WebSocketHelper.sendClient(inClient,
newTestKurentoMsg().put("id", "playStopped"));
releasePlayer();
}
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
index 2f8a1d8..59954f7 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
@@ -155,16 +155,16 @@ public class KurentoHandler {
return client.beginTransaction();
}
- public void onMessage(IWsClient _c, JSONObject msg) {
+ public void onMessage(IWsClient inClient, JSONObject msg) {
if (!isConnected()) {
- sendError(_c, "Multimedia server is inaccessible");
+ sendError(inClient, "Multimedia server is
inaccessible");
return;
}
final String cmdId = msg.getString("id");
if (MODE_TEST.equals(msg.optString(TAG_MODE))) {
- testProcessor.onMessage(_c, cmdId, msg);
+ testProcessor.onMessage(inClient, cmdId, msg);
} else {
- final Client c = (Client)_c;
+ final Client c = (Client)inClient;
if (c == null || c.getRoomId() == null) {
log.warn("Incoming message from invalid user");
@@ -422,23 +422,23 @@ public class KurentoHandler {
}, objCheckTimeout, MILLISECONDS);
} else if (evt.getObject() instanceof Endpoint) {
// endpoint created
- Endpoint _point = (Endpoint)evt.getObject();
- final String eoid = _point.getId();
- Class<? extends Endpoint> _clazz = null;
- if (_point instanceof WebRtcEndpoint) {
- _clazz = WebRtcEndpoint.class;
- } else if (_point instanceof RecorderEndpoint) {
- _clazz = RecorderEndpoint.class;
- } else if (_point instanceof PlayerEndpoint) {
- _clazz = PlayerEndpoint.class;
+ Endpoint curPoint = (Endpoint)evt.getObject();
+ final String eoid = curPoint.getId();
+ Class<? extends Endpoint> clazz = null;
+ if (curPoint instanceof WebRtcEndpoint) {
+ clazz = WebRtcEndpoint.class;
+ } else if (curPoint instanceof
RecorderEndpoint) {
+ clazz = RecorderEndpoint.class;
+ } else if (curPoint instanceof PlayerEndpoint) {
+ clazz = PlayerEndpoint.class;
}
- final Class<? extends Endpoint> clazz = _clazz;
+ final Class<? extends Endpoint> fClazz = clazz;
scheduler.schedule(() -> {
- if (client == null || clazz == null) {
+ if (client == null || fClazz == null) {
return;
}
// still alive
- Endpoint point = client.getById(eoid,
clazz);
+ Endpoint point = client.getById(eoid,
fClazz);
if
(validTestPipeline(point.getMediaPipeline())) {
return;
}
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 a16f8d8..3c80a23 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
@@ -33,10 +33,10 @@ public class LoadAtomRssFeed {
private LoadAtomRssFeed() {}
- public static HttpURLConnection getFeedConnection(String _url) throws
IOException {
- log.trace("getFeedConnection:: {}", _url);
+ public static HttpURLConnection getFeedConnection(String urlStr) throws
IOException {
+ log.trace("getFeedConnection:: {}", urlStr);
- URL url = new URL(_url);
+ URL url = new URL(urlStr);
HttpURLConnection conn = (HttpURLConnection)
url.openConnection();
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/BaseFileItemDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/BaseFileItemDao.java
index cecc025..f2992fe 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/BaseFileItemDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/BaseFileItemDao.java
@@ -80,10 +80,10 @@ public class BaseFileItemDao {
f.setDeleted(true);
f.setUpdated(new Date());
- _update(f);
+ updateBase(f);
}
- public BaseFileItem _update(BaseFileItem f) {
+ public BaseFileItem updateBase(BaseFileItem f) {
f.setExternalType(null);
BaseFileItem parent = get(f.getParentId());
if (parent != null) {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
index 6fcef93..64ce52b 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
@@ -153,7 +153,7 @@ public class FileItemDao extends BaseFileItemDao {
}
public FileItem update(FileItem f) {
- return (FileItem)super._update(f);
+ return (FileItem)super.updateBase(f);
}
private void updateChilds(FileItem f) {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
index 1aeb34e..9c77f3a 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
@@ -119,7 +119,7 @@ public class RecordingDao extends BaseFileItemDao {
}
public Recording update(Recording f) {
- return (Recording)_update(f);
+ return (Recording)updateBase(f);
}
public void resetProcessingStatus() {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java
index a9280c2..6b2dc50 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java
@@ -33,7 +33,7 @@ public interface IInvitationManager {
void processInvitation(Appointment a, MeetingMember mm, MessageType
type, boolean sendMail);
- Invitation getInvitation(Invitation _invitation, User inveetee, Room
room
+ Invitation getInvitation(Invitation invitation, User inveetee, Room room
, boolean isPasswordProtected, String invitationpass,
Valid valid,
User createdBy, Long languageId, Date gmtTimeStart,
Date gmtTimeEnd
, Appointment appointment);
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
index b53a833..36bfe1c 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
@@ -139,21 +139,21 @@ public class Client implements IDataProviderEntity,
IWsClient {
return rights.contains(Right.superModerator) ||
rights.contains(Right.moderator) || rights.contains(right);
}
- public Client allow(Right... _rights) {
- allow(Arrays.asList(_rights));
+ public Client allow(Right... inRights) {
+ allow(Arrays.asList(inRights));
return this;
}
- public void allow(Iterable<Right> _rights) {
- for (Right right : _rights) {
+ public void allow(Iterable<Right> inRights) {
+ for (Right right : inRights) {
if (!hasRight(right)) {
rights.add(right);
}
}
}
- public void deny(Right... _rights) {
- for (Right right : _rights) {
+ public void deny(Right... inRights) {
+ for (Right right : inRights) {
rights.remove(right);
}
}
@@ -219,22 +219,22 @@ public class Client implements IDataProviderEntity,
IWsClient {
return this;
}
- public StreamDesc addStream(StreamType stype, Activity...activities) {
- StreamDesc sd = new StreamDesc(stype, activities);
+ public StreamDesc addStream(StreamType stype, Activity...inActivities) {
+ StreamDesc sd = new StreamDesc(stype, inActivities);
streams.put(sd.getUid(), sd);
return sd;
}
- public StreamDesc removeStream(String _uid) {
- return streams.remove(_uid);
+ public StreamDesc removeStream(String inUid) {
+ return streams.remove(inUid);
}
public List<StreamDesc> getStreams() {
return new ArrayList<>(streams.values());
}
- public StreamDesc getStream(String _uid) {
- return streams.get(_uid);
+ public StreamDesc getStream(String inUid) {
+ return streams.get(inUid);
}
public Optional<StreamDesc> getScreenStream() {
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 5f941ce..ec39aaf 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
@@ -57,8 +57,8 @@ public class ApplicationHelper {
private ApplicationHelper() {}
- private static WebApplication createApp(WebApplication _app) {
- WebApplication app = _app;
+ private static WebApplication createApp(WebApplication inApp) {
+ WebApplication app = inApp;
if (app == null) {
// This is the case for non-web-app applications
(command line admin)
try {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/DaoHelper.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/DaoHelper.java
index 7bb5649..9263055 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/DaoHelper.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/DaoHelper.java
@@ -74,10 +74,10 @@ public class DaoHelper {
return appendSort(sb, alias, sort).toString();
}
- public static StringBuilder appendWhereClause(StringBuilder _sb, String
search, String alias, String... fields) {
+ public static StringBuilder appendWhereClause(StringBuilder sb, String
search, String alias, String... fields) {
if (!Strings.isEmpty(search) && fields != null) {
boolean notEmpty = false;
- StringBuilder sb = new StringBuilder();
+ StringBuilder inSb = new StringBuilder();
String[] searchItems = search.replace("\'",
"").replace("\"", "").split(" ");
for (int i = 0; i < searchItems.length; ++i) {
if (searchItems[i].isEmpty()) {
@@ -85,28 +85,28 @@ public class DaoHelper {
}
if (i == 0) {
notEmpty = true;
- sb.append(" (");
+ inSb.append(" (");
} else {
- sb.append(" OR ");
+ inSb.append(" OR ");
}
StringBuilder placeholder = new StringBuilder();
placeholder.append("%").append(StringUtils.lowerCase(searchItems[i])).append("%");
- sb.append("(");
+ inSb.append("(");
for (int j = 0; j < fields.length; ++j) {
if (j != 0) {
- sb.append(" OR ");
+ inSb.append(" OR ");
}
-
sb.append("lower(").append(alias).append(".").append(fields[j]).append(") LIKE
'").append(placeholder).append("' ");
+
inSb.append("lower(").append(alias).append(".").append(fields[j]).append(")
LIKE '").append(placeholder).append("' ");
}
- sb.append(")");
+ inSb.append(")");
}
if (notEmpty) {
- sb.append(") ");
- _sb.append(" AND").append(sb);
+ inSb.append(") ");
+ sb.append(" AND").append(inSb);
}
}
- return _sb;
+ return sb;
}
public static StringBuilder appendSort(StringBuilder sb, String alias,
String sort) {
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 ba1c9f4..01483f9 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
@@ -46,10 +46,10 @@ public class LocaleHelper {
return new
Locale.Builder().setRegion(code).build().getDisplayCountry();
}
- public static String validateCountry(String _code) {
+ public static String validateCountry(String inCode) {
List<String> list = getCountries();
Set<String> countries = new HashSet<>(list);
- String code = _code == null ? "" :
_code.toUpperCase(Locale.ROOT);
+ String code = inCode == null ? "" :
inCode.toUpperCase(Locale.ROOT);
if (!countries.contains(code)) {
String newCountry = list.get(0);
log.warn("Invalid country found: {}, will be replaced
with: {}", code, newCountry);
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index fe14b5b..b5661cb 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -440,7 +440,7 @@ public class BackupImport {
}
if (BaseFileItem.Type.Presentation ==
bfi.getType()) {
convertOldPresentation((FileItem)bfi);
- fileItemDao._update(bfi);
+ fileItemDao.updateBase(bfi);
}
if (BaseFileItem.Type.WmlFile == bfi.getType())
{
try {
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 281a6ff..9301086 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
@@ -75,7 +75,7 @@ import
org.springframework.scheduling.quartz.SchedulerFactoryBean;
import org.springframework.web.context.WebApplicationContext;
public class Admin {
- private static final Logger _log = LoggerFactory.getLogger(Admin.class);
+ private static final Logger log = LoggerFactory.getLogger(Admin.class);
private static final String OPTION_EMAIL = "email";
private static final String OPTION_GROUP = "group";
private static final String OPTION_PWD = "password";
@@ -110,7 +110,7 @@ public class Admin {
opts = buildOptions();
step = "Initialization";
if (!System.getProperties().containsKey("context")) {
- log(String.format("System.property 'context' is not
set, defaulting to %s", DEFAULT_CONTEXT_NAME));
+ doLog(String.format("System.property 'context' is not
set, defaulting to %s", DEFAULT_CONTEXT_NAME));
}
String ctxName = System.getProperty("context",
DEFAULT_CONTEXT_NAME);
setWicketApplicationName(ctxName);
@@ -120,8 +120,8 @@ public class Admin {
}
}
- private static void log(CharSequence msg) {
- _log.info(msg.toString());
+ private static void doLog(CharSequence msg) {
+ log.info(msg.toString());
System.out.println(msg);
}
@@ -195,31 +195,31 @@ public class Admin {
handleError(e, false, true);
}
- private void handleError(Exception e, boolean printUsage, boolean
_throw) {
+ private void handleError(Exception e, boolean printUsage, boolean
willThrow) {
if (printUsage) {
usage();
}
if (verbose) {
String msg = String.format("%s failed", step);
- _log.error(msg, e);
+ log.error(msg, e);
} else {
- _log.error("{} failed: {}", step, e.getMessage());
+ log.error("{} failed: {}", step, e.getMessage());
}
- if (_throw) {
+ if (willThrow) {
throw new ExitException();
}
}
private WebApplicationContext getApplicationContext() {
if (context == null) {
- String _step = step; //preserve step
+ String curStep = step; //preserve step
step = "Shutdown schedulers";
Long lngId = (long)cfg.getDefaultLangId();
context =
ApplicationHelper.getApplicationContext(lngId);
SchedulerFactoryBean sfb =
context.getBean(SchedulerFactoryBean.class);
try {
sfb.getScheduler().shutdown(false);
- step = _step; //restore
+ step = curStep; //restore
} catch (Exception e) {
handleError(e);
}
@@ -233,7 +233,7 @@ public class Admin {
try {
cmdl = parser.parse(opts, args);
} catch (ParseException e) {
- log(e.getMessage());
+ doLog(e.getMessage());
usage();
throw new ExitException();
}
@@ -283,7 +283,7 @@ public class Admin {
private void processInstall(String file) throws Exception {
if (cmdl.hasOption("file") && (cmdl.hasOption("user") ||
cmdl.hasOption(OPTION_EMAIL) || cmdl.hasOption(OPTION_GROUP))) {
- log("Please specify even 'file' option or 'admin
user'.");
+ doLog("Please specify even 'file' option or 'admin
user'.");
throw new ExitException();
}
boolean force = cmdl.hasOption("force");
@@ -353,7 +353,7 @@ public class Admin {
if (!cmdl.hasOption("file")) {
String fn = "backup_" +
CalendarPatterns.getTimeForStreamId(new Date()) + ".zip";
f = new File(home, fn);
- log("File name was not specified, '" + fn + "' will be
used");
+ doLog("File name was not specified, '" + fn + "' will
be used");
} else {
f = new File(file);
}
@@ -370,17 +370,17 @@ public class Admin {
private void processFiles() throws IOException {
boolean cleanup = cmdl.hasOption("cleanup");
if (cleanup) {
- log("WARNING: all intermediate files will be clean
up!");
+ doLog("WARNING: all intermediate files will be clean
up!");
}
StringBuilder report = new StringBuilder();
reportUploads(report, cleanup);
reportStreams(report, cleanup);
- log(report);
+ doLog(report);
}
private void processLdap() throws OmException {
if (!cmdl.hasOption("d")) {
- log("Please specify LDAP domain Id.");
+ doLog("Please specify LDAP domain Id.");
throw new ExitException();
}
Long domainId = Long.valueOf(cmdl.getOptionValue('d'));
@@ -450,16 +450,16 @@ public class Admin {
cfg.setEmail(cmdl.getOptionValue(OPTION_EMAIL));
cfg.setGroup(cmdl.getOptionValue(OPTION_GROUP));
if (cfg.getUsername() == null || cfg.getUsername().length() <
USER_LOGIN_MINIMUM_LENGTH) {
- log("User login was not provided, or too short, should
be at least " + USER_LOGIN_MINIMUM_LENGTH + " character long.");
+ doLog("User login was not provided, or too short,
should be at least " + USER_LOGIN_MINIMUM_LENGTH + " character long.");
throw new ExitException();
}
if (!MailUtil.isValid(cfg.getEmail())) {
- log(String.format("Please provide non-empty valid
email: '%s' is not valid.", cfg.getEmail()));
+ doLog(String.format("Please provide non-empty valid
email: '%s' is not valid.", cfg.getEmail()));
throw new ExitException();
}
if (Strings.isEmpty(cfg.getGroup())) {
- log(String.format("User group was not provided, or too
short, should be at least 1 character long: %s", cfg.getGroup()));
+ doLog(String.format("User group was not provided, or
too short, should be at least 1 character long: %s", cfg.getGroup()));
throw new ExitException();
}
if (cmdl.hasOption(OPTION_PWD)) {
@@ -471,7 +471,7 @@ public class Admin {
passVal = new Validatable<>(cfg.getPassword());
passValidator.validate(passVal);
if (!passVal.isValid()) {
- log(String.format("Please enter password for
the user '%s':", cfg.getUsername()));
+ doLog(String.format("Please enter password for
the user '%s':", cfg.getUsername()));
cfg.setPassword(new BufferedReader(new
InputStreamReader(System.in, UTF_8)).readLine());
}
} while (!passVal.isValid());
@@ -482,10 +482,10 @@ public class Admin {
cfg.setTimeZone(tzMap.containsKey(tz) ? tz : null);
}
if (cfg.getTimeZone() == null) {
- log("Please enter timezone, Possible timezones are:");
+ doLog("Please enter timezone, Possible timezones are:");
for (Map.Entry<String,String> me : tzMap.entrySet()) {
- log(String.format("%1$-25s%2$s", "\"" +
me.getKey() + "\"", me.getValue()));
+ doLog(String.format("%1$-25s%2$s", "\"" +
me.getKey() + "\"", me.getValue()));
}
throw new ExitException();
}
@@ -543,7 +543,7 @@ public class Admin {
private File checkRestoreFile(String file) {
File backup = new File(file);
if (!cmdl.hasOption("file") || !backup.exists() ||
!backup.isFile()) {
- log("File should be specified, and point the existent
zip file");
+ doLog("File should be specified, and point the existent
zip file");
usage();
throw new ExitException();
}
@@ -562,13 +562,13 @@ public class Admin {
try {
a.process(args);
- log("... Done");
+ doLog("... Done");
System.exit(0);
} catch (ExitException e) {
a.handleError(e, false, false);
System.exit(1);
} catch (Exception e) {
- _log.error("Unexpected error", e);
+ log.error("Unexpected error", e);
e.printStackTrace();
System.exit(1);
}
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 c0bbc19..dcef51b 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
@@ -58,8 +58,8 @@ public class OmHelpFormatter extends HelpFormatter {
for (OmOption o : reqOptions) {
map.put(o.getOpt(), new ArrayList<OmOption>());
}
- for (Option _o : opts.getOptions()) {
- OmOption o = (OmOption)_o;
+ for (Option option : opts.getOptions()) {
+ OmOption o = (OmOption)option;
boolean skipOption = map.containsKey(o.getOpt());
boolean mainOption = skipOption || o.getGroup() == null;
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 4b1e292..19ec8bf 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
@@ -146,7 +146,7 @@ public class ScreenV1Encoder extends BaseScreenEncoder {
return img.intersection(prev);
}
- private void writeBytesIfChanged(ByteArrayOutputStream ba, boolean
isKeyFrame, int[][] img, Rectangle area) throws IOException {
+ private void writeBytesIfChanged(ByteArrayOutputStream inBstream,
boolean isKeyFrame, int[][] img, Rectangle area) throws IOException {
boolean changed = isKeyFrame;
int count = 0;
for (int y = area.y + area.height - 1; y >= area.y; --y) {
@@ -165,10 +165,10 @@ public class ScreenV1Encoder extends BaseScreenEncoder {
d.setInput(areaBuf, 0, count);
d.finish();
int written = d.deflate(zipBuf);
- writeShort(ba, written);
- ba.write(zipBuf, 0, written);
+ writeShort(inBstream, written);
+ inBstream.write(zipBuf, 0, written);
} else {
- writeShort(ba, 0);
+ writeShort(inBstream, 0);
}
}
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 7f93139..9745e58 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
@@ -46,9 +46,9 @@ public class OmKeyEvent {
private static final Logger log = getLogger(OmKeyEvent.class);
private static final Map<Integer, Integer> KEY_MAP = new HashMap<>();
private static final Map<Character, Integer> CHAR_MAP = new HashMap<>();
- private static final List<Character> _UMLAUTS = Arrays.asList('ß', 'ö',
'Ö', 'ä', 'Ä', 'ü', 'Ü');
- private static final Set<Character> UMLAUTS =
Collections.unmodifiableSet(_UMLAUTS.stream().collect(Collectors.toSet()));
- private static final Set<Character> UNPRINTABLE =
Collections.unmodifiableSet(Stream.concat(_UMLAUTS.stream(),
Stream.of('§')).collect(Collectors.toSet()));
+ private static final List<Character> UMLAUT_LIST = Arrays.asList('ß',
'ö', 'Ö', 'ä', 'Ä', 'ü', 'Ü');
+ private static final Set<Character> UMLAUTS =
Collections.unmodifiableSet(UMLAUT_LIST.stream().collect(Collectors.toSet()));
+ private static final Set<Character> UNPRINTABLE =
Collections.unmodifiableSet(Stream.concat(UMLAUT_LIST.stream(),
Stream.of('§')).collect(Collectors.toSet()));
static {
KEY_MAP.put(13, KeyEvent.VK_ENTER);
KEY_MAP.put(16, 0);
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
index f414d4e..badd0a9 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
@@ -340,15 +340,15 @@ public class IcalUtils {
*
* @param str Date representation in String.
* @param patterns Patterns to parse the date against
- * @param _timeZone Timezone of the Date.
+ * @param inTimeZone Timezone of the Date.
* @return <code>java.util.Date</code> representation of string or
* <code>null</code> if the Date could not be parsed.
*/
- public Date parseDate(String str, String[] patterns, TimeZone
_timeZone) {
+ public Date parseDate(String str, String[] patterns, TimeZone
inTimeZone) {
FastDateFormat parser;
Locale locale = WebSession.get().getLocale();
- TimeZone timeZone = str.endsWith("Z") ?
TimeZone.getTimeZone("UTC") : _timeZone;
+ TimeZone timeZone = str.endsWith("Z") ?
TimeZone.getTimeZone("UTC") : inTimeZone;
ParsePosition pos = new ParsePosition(0);
for (String pattern : patterns) {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index 0f31456..3d423cc 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -253,11 +253,11 @@ public class WbPanel extends AbstractWbPanel {
for (JSONObject o : wb.list()) {
String ft =
o.optString(ATTR_FILE_TYPE);
if
(BaseFileItem.Type.Recording.name().equals(ft) ||
BaseFileItem.Type.Video.name().equals(ft)) {
- JSONObject _sts =
o.optJSONObject(PARAM_STATUS);
- if (_sts == null) {
+ JSONObject status =
o.optJSONObject(PARAM_STATUS);
+ if (status == null) {
continue;
}
- JSONObject sts = new
JSONObject(_sts.toString()); //copy
+ JSONObject sts = new
JSONObject(status.toString()); //copy
sts.put("pos",
sts.getDouble("pos") + (System.currentTimeMillis() -
sts.getLong(PARAM_UPDATED)) * 1. / 1000);
arr.put(new JSONObject()
.put("wbId", wb.getId())
@@ -295,9 +295,9 @@ public class WbPanel extends AbstractWbPanel {
break;
case activateWb:
{
- long _id = obj.optLong("wbId", -1);
- if (_id > -1) {
- wbm.activate(roomId, _id);
+ long wbId = obj.optLong("wbId", -1);
+ if (wbId > -1) {
+ wbm.activate(roomId, wbId);
sendWbAll(WbAction.activateWb,
obj);
}
}
@@ -360,12 +360,12 @@ public class WbPanel extends AbstractWbPanel {
JSONArray arr = obj.getJSONArray("obj");
JSONArray undo = new JSONArray();
for (int i = 0; i < arr.length(); ++i) {
- JSONObject _o =
arr.getJSONObject(i);
- String uid =
_o.getString("uid");
+ JSONObject oi =
arr.getJSONObject(i);
+ String uid =
oi.getString("uid");
JSONObject po = wb.get(uid);
if (po != null) {
undo.put(po);
- wb.put(uid, _o);
+ wb.put(uid, oi);
}
}
if (arr.length() != 0) {
@@ -381,8 +381,8 @@ public class WbPanel extends AbstractWbPanel {
JSONArray arr = obj.getJSONArray("obj");
JSONArray undo = new JSONArray();
for (int i = 0; i < arr.length(); ++i) {
- JSONObject _o =
arr.getJSONObject(i);
- JSONObject u =
wb.remove(_o.getString("uid"));
+ JSONObject oi =
arr.getJSONObject(i);
+ JSONObject u =
wb.remove(oi.getString("uid"));
if (u != null) {
undo.put(u);
}
@@ -477,26 +477,26 @@ public class WbPanel extends AbstractWbPanel {
return role;
}
- private JSONObject addFileUrl(Client cl, String ruid, JSONObject _file)
{
- return addFileUrl(cl, ruid, _file, null);
+ private JSONObject addFileUrl(Client cl, String ruid, JSONObject file) {
+ return addFileUrl(cl, ruid, file, null);
}
- private JSONObject addFileUrl(Client cl, String ruid, JSONObject _file,
Consumer<BaseFileItem> consumer) {
+ private JSONObject addFileUrl(Client cl, String ruid, JSONObject file,
Consumer<BaseFileItem> consumer) {
try {
- final long fid = _file.optLong(ATTR_FILE_ID, -1);
+ final long fid = file.optLong(ATTR_FILE_ID, -1);
if (fid > 0) {
BaseFileItem fi = fileDao.getAny(fid);
if (fi != null) {
if (consumer != null) {
consumer.accept(fi);
}
- return
WbWebSocketHelper.addFileUrl(ruid, _file, fi, cl);
+ return
WbWebSocketHelper.addFileUrl(ruid, file, fi, cl);
}
}
} catch (Exception e) {
//no-op, non-file object
}
- return _file;
+ return file;
}
private static JSONArray getArray(JSONObject wb, Function<JSONObject,
JSONObject> postprocess) {
@@ -542,7 +542,7 @@ public class WbPanel extends AbstractWbPanel {
JSONArray arr =
getArray(new JSONObject(new JSONTokener(br)), o -> {
wb.put(o.getString("uid"), o);
updated[0] = true;
- return
addFileUrl(rp.getClient(), wbs.getUid(), o, _f -> updateWbSize(wb, _f));
+ return
addFileUrl(rp.getClient(), wbs.getUid(), o, bf -> updateWbSize(wb, bf));
});
if (updated[0]) {
wbm.update(roomId, wb);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/OmWysiwygToolbar.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/OmWysiwygToolbar.html
index 1f450de..0ebca7b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/OmWysiwygToolbar.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/OmWysiwygToolbar.html
@@ -15,6 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<div wicket:id="toolbar" class="btn-toolbar wysiwyg-toolbar"
data-role="editor-toolbar">
diff --git
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
index 1c27964..eda7e71 100644
---
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
+++
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
@@ -294,8 +294,7 @@ public class RoomWebService extends BaseWebService {
* kick all uses of a certain room
*
* @param sid
- * The SID of the User. This SID must be marked as Loggedin
- * _Admin
+ * The SID of the User. This SID must be marked as Loggedin
with SOAP privileges
* @param id
* the room id
*
@@ -315,8 +314,7 @@ public class RoomWebService extends BaseWebService {
* kick external user from given room
*
* @param sid
- * The SID of the User. This SID must be marked as Loggedin
- * _Admin
+ * The SID of the User. This SID must be marked as Loggedin
with SOAP privileges
* @param id
* the room id
* @param externalType
