Repository: openmeetings Updated Branches: refs/heads/master 6311a6978 -> c95111c1f
[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/c95111c1 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/c95111c1 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/c95111c1 Branch: refs/heads/master Commit: c95111c1f2c53285715c37b5dec9828267aac480 Parents: 6311a69 Author: Maxim Solodovnik <[email protected]> Authored: Sun Oct 8 21:39:25 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sun Oct 8 21:39:25 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/core/documents/LibraryChartLoader.java | 3 +-- .../apache/openmeetings/db/dao/calendar/AppointmentDao.java | 3 +-- .../apache/openmeetings/db/dao/user/PrivateMessageDao.java | 4 +--- .../openmeetings/db/dao/user/PrivateMessageFolderDao.java | 8 ++------ .../java/org/apache/openmeetings/db/util/TimezoneUtil.java | 7 ------- .../main/java/org/apache/openmeetings/util/XmlExport.java | 8 +++----- 6 files changed, 8 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c95111c1/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java index 4244b1b..2d045c3 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java @@ -53,8 +53,7 @@ public class LibraryChartLoader { try (InputStream is = new FileInputStream(file); BufferedReader reader = new BufferedReader(new InputStreamReader(is, UTF_8))) { - ArrayList lMapList = (ArrayList) xStream.fromXML(reader); - return lMapList; + return (ArrayList) xStream.fromXML(reader); } } catch (Exception err) { log.error("Unexpected error while loading chart", err); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c95111c1/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java index 8985b26..e1dfbe6 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java @@ -224,8 +224,7 @@ public class AppointmentDao { query.setParameter("start", startCal.getTime()); query.setParameter("end", endCal.getTime()); - List<Appointment> listAppoints = query.getResultList(); - return listAppoints; + return query.getResultList(); } // --------------------------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c95111c1/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java index 0af3fe4..ad99168 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java @@ -69,9 +69,7 @@ public class PrivateMessageDao implements IDataProviderDao<PrivateMessage> { privateMessage.setUserContactId(userContactId); privateMessage = em.merge(privateMessage); - Long privateMessageId = privateMessage.getFolderId(); - - return privateMessageId; + return privateMessage.getFolderId(); } catch (Exception e) { log.error("[addPrivateMessage]",e); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c95111c1/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java index cabcf53..98aa241 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java @@ -49,9 +49,7 @@ public class PrivateMessageFolderDao implements IDataProviderDao<PrivateMessageF privateMessageFolder.setInserted(new Date()); privateMessageFolder = em.merge(privateMessageFolder); - Long privateMessageFolderId = privateMessageFolder.getId(); - - return privateMessageFolderId; + return privateMessageFolder.getId(); } catch (Exception e) { log.error("[addPrivateMessageFolder]",e); } @@ -62,9 +60,7 @@ public class PrivateMessageFolderDao implements IDataProviderDao<PrivateMessageF folder.setInserted(new Date()); folder = em.merge(folder); - Long privateMessageFolderId = folder.getId(); - - return privateMessageFolderId; + return folder.getId(); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c95111c1/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java index 8592faf..9445136 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java @@ -21,7 +21,6 @@ package org.apache.openmeetings.db.util; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_TIMEZONE; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; -import java.util.Calendar; import java.util.TimeZone; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; @@ -101,10 +100,4 @@ public class TimezoneUtil { // if user has not time zone get one from the server configuration return getDefaultTimeZone(); } - - public static long _getOffset(TimeZone timezone) { - Calendar cal = Calendar.getInstance(); - cal.setTimeZone(timezone); - return (long)cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET); - } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c95111c1/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 9a41752..2600cb1 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 @@ -75,13 +75,11 @@ public class XmlExport { public static Element createRoot(Document document) { document.addDocType("properties", null, "http://java.sun.com/dtd/properties.dtd";); - Element root = document.addElement("properties"); - return root; + return document.addElement("properties"); } - public static Element createRoot(Document document, String _root) { - Element root = document.addElement(_root); - return root; + public static Element createRoot(Document document, String root) { + return document.addElement(root); } public static void toXml(Writer out, Document doc) throws Exception {
