Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PlaceMapBean.java

@@ -35,6 +35,7 @@ public class PlaceMapBean implements PlaceMapBeanLocal {
     public PlaceMapBean() {
     public PlaceMapBean() {
         // TODO Auto-generated constructor stub
         // TODO Auto-generated constructor stub
     }
     }
+
     @EJB
     @EJB
     private PlaceFacade placeFacade;
     private PlaceFacade placeFacade;
     @EJB
     @EJB
@@ -83,5 +84,4 @@ public class PlaceMapBean implements PlaceMapBeanLocal {
 
 
     }
     }
 
 
-    
 }
 }

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/enums/EventStatusEnum.java

@@ -6,19 +6,21 @@
 package fi.insomnia.bortal.enums;
 package fi.insomnia.bortal.enums;
 
 
 /**
 /**
- *
+ * 
  * @author tuukka
  * @author tuukka
  */
  */
 public enum EventStatusEnum {
 public enum EventStatusEnum {
-    NOT_STARTED,
-    SPLITTED;
-
+    INACTIVE, // Not yet public
+    NOT_STARTED, // Upcoming event
+    RUNNING, // Ongoing event
+    SPLITTED, // Detached: The event has a copy of it's database. SPLITTED event
+              // cannot be modified.
+    ARCHIVED; // Past events are archived
 
 
     public static EventStatusEnum getEventStatusEnum(String name) {
     public static EventStatusEnum getEventStatusEnum(String name) {
         return EventStatusEnum.valueOf(name);
         return EventStatusEnum.valueOf(name);
     }
     }
 
 
-
     public static EventStatusEnum getDefaultEventStatusEnum() {
     public static EventStatusEnum getDefaultEventStatusEnum() {
         return NOT_STARTED;
         return NOT_STARTED;
     }
     }