svn commit: r1622823 - /openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java

[solomax]

Author: solomax
Date: Sat Sep  6 02:45:45 2014
New Revision: 1622823

URL: http://svn.apache.org/r1622823
Log:
getFieldLanguageById method was refactored

Modified:
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1622823&r1=1622822&r2=1622823&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
 Sat Sep  6 02:45:45 2014
@@ -290,7 +290,7 @@ public class WebSession extends Abstract
                String s = getBean(FieldLanguagesValuesDao.class).getString(id, 
getLanguage());
                s = s == null ? "[Missing]" :
                        (STRINGS_WITH_APP.contains(id) ? 
s.replaceAll("\\$APP_NAME", getBean(ConfigurationDao.class).getAppName()) : s);
-               return s;// + 
(Application.get().getDebugSettings().isDevelopmentUtilitiesEnabled() ? "[" + 
id + "]" : "");
+               return s;// + 
(Application.get().getDebugSettings().isDevelopmentUtilitiesEnabled() ? " [" + 
id + "]" : "");
        }
        
        public void setLanguage(long languageId) {
@@ -310,7 +310,7 @@ public class WebSession extends Abstract
        }
        
        public static FieldLanguage getLanguageObj() {
-               return 
getBean(FieldLanguageDao.class).getFieldLanguageById(getLanguage());
+               return getBean(FieldLanguageDao.class).get(getLanguage());
        }
        
        public String getValidatedSid() {
@@ -394,7 +394,7 @@ public class WebSession extends Abstract
        }
 
        public FieldLanguage getLanguageByBrowserLocale() {
-               List<FieldLanguage> languages = 
getBean(FieldLanguageDao.class).getLanguages();
+               List<FieldLanguage> languages = 
getBean(FieldLanguageDao.class).get();
                for (FieldLanguage l : languages) {
                        if (getBrowserLocale().getLanguage().equals(new 
Locale(l.getCode()).getLanguage())){
                                return l;