svn commit: r1763411 - in /openmeetings/application/trunk: openmeetings-install/src/main/java/org/apache/openmeetings/installation/ openmeetings-util/src/main/java/org/apache/openmeetings/util/ openmeetings-web/src/main/java/org/apache/openmeetings/web...

[vdegtyarev]

Author: vdegtyarev
Date: Wed Oct  5 11:01:42 2016
New Revision: 1763411

URL: http://svn.apache.org/viewvc?rev=1763411&view=rev
Log:
OPENMEETINGS-1479 Minor changes. Merge to trunk

Modified:
    
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
    
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
    
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java

Modified: 
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1763411&r1=1763410&r2=1763411&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
 Wed Oct  5 11:01:42 2016
@@ -25,6 +25,7 @@ import static org.apache.openmeetings.ut
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPOINTMENT_REMINDER_MINUTES;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CALENDAR_FIRST_DAY;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT_KEY;
+import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_SHOW_CHAT;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_SHOW_MYROOMS_KEY;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_SHOW_RSS_KEY;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
@@ -298,7 +299,7 @@ public class ImportInitvalues {
 
                cfgDao.add(CONFIG_DASHBOARD_SHOW_MYROOMS_KEY, "1", null, "Show 
My Rooms Tab");
 
-               cfgDao.add("dashboard.show.chat", "1", null, "Show Chat Tab");
+               cfgDao.add(CONFIG_DASHBOARD_SHOW_CHAT, "1", null, "Show Chat 
Tab");
 
                cfgDao.add(CONFIG_DASHBOARD_SHOW_RSS_KEY, "0", null, "Show RSS 
Tab");
 

Modified: 
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java?rev=1763411&r1=1763410&r2=1763411&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
 Wed Oct  5 11:01:42 2016
@@ -20,6 +20,7 @@ package org.apache.openmeetings.util;
 
 public class OpenmeetingsVariables {
        public static final String CONFIG_CRYPT_KEY = "crypt_ClassName";
+       public static final String CONFIG_DASHBOARD_SHOW_CHAT = 
"dashboard.show.chat";
        public static final String CONFIG_DASHBOARD_SHOW_MYROOMS_KEY = 
"dashboard.show.myrooms";
        public static final String CONFIG_DASHBOARD_SHOW_RSS_KEY = 
"dashboard.show.rssfeed";
        public static final String CONFIG_DEFAULT_LANG_KEY = "default_lang_id";

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java?rev=1763411&r1=1763410&r2=1763411&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
 Wed Oct  5 11:01:42 2016
@@ -18,6 +18,7 @@
  */
 package org.apache.openmeetings.web.user;
 
+import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_SHOW_CHAT;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 import static org.apache.openmeetings.web.app.Application.getBean;
 import static org.apache.openmeetings.web.app.Application.getRoomClients;
@@ -88,7 +89,7 @@ public class ChatPanel extends BasePanel
        private static final String ID_ALL = ID_TAB_PREFIX + "all";
        private static final String PARAM_MSG_ID = "msgid";
        private static final String PARAM_ROOM_ID = "roomid";
-       private boolean  showDashboardChat = 
getBean(ConfigurationDao.class).getConfValue("dashboard.show.chat", 
Integer.class, "1") == 1;
+       private boolean  showDashboardChat = 
getBean(ConfigurationDao.class).getConfValue(CONFIG_DASHBOARD_SHOW_CHAT, 
Integer.class, "1") == 1;
        private final AbstractDefaultAjaxBehavior acceptMessage = new 
AbstractDefaultAjaxBehavior() {
                private static final long serialVersionUID = 1L;