svn commit: r1581471 - in /openmeetings: branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java

[solomax]

Author: solomax
Date: Tue Mar 25 19:13:47 2014
New Revision: 1581471

URL: http://svn.apache.org/r1581471
Log:
Room types are not being cached between sessions anymore

Modified:
    
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java
    
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java

Modified: 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java?rev=1581471&r1=1581470&r2=1581471&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java
 Tue Mar 25 19:13:47 2014
@@ -30,16 +30,14 @@ import org.apache.wicket.markup.html.for
 
 public class RoomTypeDropDown extends DropDownChoice<RoomType> {
        private static final long serialVersionUID = 1L;
-       private static List<RoomType> roomTypes;
        
        public static List<RoomType> getRoomTypes() {
-               if (roomTypes == null) {
-                       roomTypes = 
getBean(RoomTypeDao.class).getAll(getLanguage());
-               }
-               return roomTypes;
+               return getBean(RoomTypeDao.class).getAll(getLanguage());
        }
        
        public RoomTypeDropDown(String id) {
-               super(id, getRoomTypes(), new 
ChoiceRenderer<RoomType>("label.value", "roomtypes_id"));
+               super(id);
+               setChoices(getRoomTypes());
+               setChoiceRenderer(new ChoiceRenderer<RoomType>("label.value", 
"roomtypes_id"));
        }
 }

Modified: 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java?rev=1581471&r1=1581470&r2=1581471&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java
 Tue Mar 25 19:13:47 2014
@@ -30,16 +30,14 @@ import org.apache.wicket.markup.html.for
 
 public class RoomTypeDropDown extends DropDownChoice<RoomType> {
        private static final long serialVersionUID = 1L;
-       private static List<RoomType> roomTypes;
        
        public static List<RoomType> getRoomTypes() {
-               if (roomTypes == null) {
-                       roomTypes = 
getBean(RoomTypeDao.class).getAll(getLanguage());
-               }
-               return roomTypes;
+               return getBean(RoomTypeDao.class).getAll(getLanguage());
        }
        
        public RoomTypeDropDown(String id) {
-               super(id, getRoomTypes(), new 
ChoiceRenderer<RoomType>("label.value", "roomtypes_id"));
+               super(id);
+               setChoices(getRoomTypes());
+               setChoiceRenderer(new ChoiceRenderer<RoomType>("label.value", 
"roomtypes_id"));
        }
 }