You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2019/06/19 09:19:40 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2042] some more
issues are addressed
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 c60a9cc [OPENMEETINGS-2042] some more issues are addressed
c60a9cc is described below
commit c60a9cc256e7996f0b2de4bd5c752a8c9535611a
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Jun 19 16:19:29 2019 +0700
[OPENMEETINGS-2042] some more issues are addressed
---
.../apache/openmeetings/db/dao/label/LabelDao.java | 26 ++++++++++------------
openmeetings-server/src/main/assembly/src.xml | 1 +
.../openmeetings/web/admin/users/UserForm.java | 4 ++--
.../web/common/ConfirmableAjaxBorder.java | 4 ++--
.../openmeetings/web/common/tree/filetree.js | 2 +-
.../src/main/webapp/css/raw-calendar.css | 4 ----
openmeetings-web/src/main/webapp/css/raw-tree.css | 3 ---
pom.xml | 2 +-
8 files changed, 19 insertions(+), 27 deletions(-)
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 114d1ac..35566b1 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
@@ -39,7 +39,8 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
-import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -80,7 +81,7 @@ public class LabelDao implements IDataProviderDao<StringLabel>{
private static void storeLanguages() throws Exception {
Document d = XmlExport.createDocument();
Element r = XmlExport.createRoot(d, "language");
- for (Map.Entry<Long, OmLanguage> e : languages.entrySet()) {
+ for (Entry<Long, OmLanguage> e : languages.entrySet()) {
r.addElement("lang").addAttribute("id", "" + e.getKey()).addAttribute("code", e.getValue().getLocale().toLanguageTag());
}
XmlExport.toXml(getLangFile(), d);
@@ -88,7 +89,7 @@ public class LabelDao implements IDataProviderDao<StringLabel>{
public static void add(Locale l) throws Exception {
long id = 0L;
- for (Map.Entry<Long, OmLanguage> e : languages.entrySet()) {
+ for (Entry<Long, OmLanguage> e : languages.entrySet()) {
id = e.getKey();
}
languages.put(id + 1, new OmLanguage(l));
@@ -214,19 +215,16 @@ public class LabelDao implements IDataProviderDao<StringLabel>{
}
public static Long getLanguage(Locale loc, Long def) {
- if (loc != null) {
- for (Map.Entry<Long, OmLanguage> e : languages.entrySet()) {
- if (loc.equals(e.getValue().getLocale())) {
- return e.getKey();
- }
- }
- }
- return def;
+ Optional<Long> lang = languages.entrySet().stream()
+ .filter(e -> e.getValue().getLocale().equals(loc))
+ .map(Entry::getKey).findFirst();
+ return lang.isPresent() ? lang.get() : def;
}
- public static Set<Map.Entry<Long, Locale>> getLanguages() {
+ public static Set<Entry<Long, Locale>> getLanguages() {
return languages.entrySet().stream()
- .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue().getLocale())).entrySet();
+ .collect(Collectors.toMap(Entry::getKey, e -> e.getValue().getLocale()))
+ .entrySet();
}
public static List<StringLabel> get(Locale l, final String search, long start, long count, final SortParam<String> sort) {
@@ -281,7 +279,7 @@ public class LabelDao implements IDataProviderDao<StringLabel>{
}
public static void delete(Locale l) {
- for (Map.Entry<Long, OmLanguage> e : languages.entrySet()) {
+ for (Entry<Long, OmLanguage> e : languages.entrySet()) {
if (e.getValue().getLocale().equals(l)) {
languages.remove(e.getKey());
break;
diff --git a/openmeetings-server/src/main/assembly/src.xml b/openmeetings-server/src/main/assembly/src.xml
index 8d0b819..0cdb13a 100644
--- a/openmeetings-server/src/main/assembly/src.xml
+++ b/openmeetings-server/src/main/assembly/src.xml
@@ -41,6 +41,7 @@
<excludes>
<exclude>**/openmeetings-*/target/**</exclude>
<exclude>openmeetings-server/web-server/**</exclude>
+ <exclude>openmeetings-server/red5-server/**</exclude>
<exclude>openmeetings-web/test-data/**</exclude>
<exclude>**/.classpath/**</exclude>
<exclude>**/.project/**</exclude>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
index 5fc2343..7daf391 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
@@ -206,7 +206,7 @@ public class UserForm extends AdminBaseForm<User> {
@Override
protected void onPurgeSubmit(AjaxRequestTarget target, Form<?> form) {
if (isAdminPassRequired()) {
- adminPass.setAction((SerializableConsumer<AjaxRequestTarget>)t -> purgeUser(t));
+ adminPass.setAction(this::purgeUser);
adminPass.open(target);
} else {
purgeUser(target);
@@ -293,7 +293,7 @@ public class UserForm extends AdminBaseForm<User> {
@Override
protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
if (isAdminPassRequired()) {
- adminPass.setAction((SerializableConsumer<AjaxRequestTarget>)t -> deleteUser(t));
+ adminPass.setAction(this::deleteUser);
adminPass.open(target);
} else {
deleteUser(target);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java
index a7be4b1..6cb08fc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java
@@ -71,8 +71,8 @@ public abstract class ConfirmableAjaxBorder extends Border {
}
this.userForm = userForm;
this.validate = validate;
- this.dialog.setSubmitHandler((SerializableConsumer<AjaxRequestTarget>)t->onSubmit(t));
- this.dialog.setErrorHandler((SerializableConsumer<AjaxRequestTarget>)t->onError(t));
+ this.dialog.setSubmitHandler(this::onSubmit);
+ this.dialog.setErrorHandler(this::onError);
setOutputMarkupId(true);
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
index 9bcce9d..3b1d555 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
@@ -10,5 +10,5 @@ function dragHelper() {
}
function treeRevert(dropped) {
$('.file.tree .trees')[0].scrollTop = $(this).parent()[0].offsetTop - 32;
- return !dropped || (!!dropped && !!dropped.context && $(dropped.context).hasClass('wb', 'room'));
+ return !dropped || (!!dropped.context && $(dropped.context).hasClass('wb', 'room'));
}
diff --git a/openmeetings-web/src/main/webapp/css/raw-calendar.css b/openmeetings-web/src/main/webapp/css/raw-calendar.css
index 7df74cc..f6f8fbb 100644
--- a/openmeetings-web/src/main/webapp/css/raw-calendar.css
+++ b/openmeetings-web/src/main/webapp/css/raw-calendar.css
@@ -16,10 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-.appointmentPopUp td {
- vertical-align: top;
-}
-
.appointmentPopUp input[type="text"], .appointmentPopUp input[type="url"] {
width: 420px;
}
diff --git a/openmeetings-web/src/main/webapp/css/raw-tree.css b/openmeetings-web/src/main/webapp/css/raw-tree.css
index ed2b590..fc02a2e 100644
--- a/openmeetings-web/src/main/webapp/css/raw-tree.css
+++ b/openmeetings-web/src/main/webapp/css/raw-tree.css
@@ -122,9 +122,6 @@
.folder-open.file.om-icon {
background-image: url(images/folder_open.png);
}
-.chart.file.om-icon {
- background-image: url(images/chart_pie.png);
-}
.drag-container .om-icon {
display: block !important;
}
diff --git a/pom.xml b/pom.xml
index b2d32e7..1c1a3b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
<powermock.version>2.0.2</powermock.version>
<quartz.version>2.3.1</quartz.version>
<!-- Exclude all generated code -->
- <sonar.exclusions>file:**/generated-sources/**, file:**/fabric.js, file:**/cssemoticons.js, file:**/kurento-utils.js, file:**/fileinput*.js, file:**/MathJax.js, file:**/network.js, file:**/jquery.dialogextend.js</sonar.exclusions>
+ <sonar.exclusions>file:**/generated-sources/**, file:**/jquery-ui.css, file:**/fabric.js, file:**/cssemoticons.js, file:**/kurento-utils.js, file:**/fileinput*.js, file:**/MathJax.js, file:**/network.js, file:**/jquery.dialogextend.js</sonar.exclusions>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<sonar.junit.reportPaths>target/surefire-reports</sonar.junit.reportPaths>