Mergechanges

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

@@ -95,14 +95,12 @@ public class PlaceMapBean implements PlaceMapBeanLocal {
 
     }
 
-   
-
-    public String getSelectPlaceMapUrl(EventMap activeMap, Place selectedPlace, User user) {
+    public String getSelectPlaceMapUrl(EventMap activeMap, List<Place> selectedPlace, User user) {
 
         String parameters = "?";
 
         if (selectedPlace != null) {
-            parameters += "placeid=" + selectedPlace.getId().getId();
+       //     parameters += "placeid=" + selectedPlace.getId().getId();
         } else {
             parameters += "mapid=" + activeMap.getId().getId();
         }

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/PlaceMapBeanLocal.java

@@ -15,7 +15,7 @@ import java.util.List;
 public interface PlaceMapBeanLocal {
 
     void printPlaceMapToStream(OutputStream outputStream, String filetype, Event event, Integer mapId, Integer userId, List<Integer> placeIds) throws IOException;
-    public String getSelectPlaceMapUrl(EventMap activeMap, Place selectedPlace, User user);
+    public String getSelectPlaceMapUrl(EventMap activeMap, List<Place> selectedPlaces, User user);
 
   //  public EventMap findMap(int i);
     

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/TestDataBeanLocal.java

@@ -10,6 +10,7 @@ import fi.insomnia.bortal.model.User;
 @Local
 public interface TestDataBeanLocal {
 
+    
     EventMap generateTestMap(Event event);
 
     void generateTestPlaces(EventMap map);

code/LanBortalWeb/build.xml

@@ -10,7 +10,8 @@
 <project name="LanBortalWeb" default="default" basedir=".">
     <description>Builds, tests, and runs the project LanBortalWeb.</description>
     <import file="nbproject/build-impl.xml"/>
-    <!--
+
+    <import file="nbproject/profiler-build-impl.xml"/>    <!--
 
     There exist several targets which are by default empty and which can be 
     used for execution of your tasks. These targets are usually executed 

code/LanBortalWeb/nbproject/genfiles.properties

@@ -6,3 +6,6 @@ build.xml.stylesheet.CRC32=c0ebde35@1.21.1.1
 nbproject/build-impl.xml.data.CRC32=a85e9fc5
 nbproject/build-impl.xml.script.CRC32=27e0b6a5
 nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.1.1
+nbproject/profiler-build-impl.xml.data.CRC32=a85e9fc5
+nbproject/profiler-build-impl.xml.script.CRC32=a84d8f2e
+nbproject/profiler-build-impl.xml.stylesheet.CRC32=0bb5b37b@1.9.1

code/LanBortalWeb/src/fi/insomnia/bortal/view/MapView.java

@@ -9,6 +9,8 @@ import fi.insomnia.bortal.handler.SessionHandler;
 import fi.insomnia.bortal.model.EventMap;
 import fi.insomnia.bortal.model.Place;
 import fi.insomnia.bortal.model.User;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import javax.ejb.EJB;
 import javax.faces.bean.ManagedBean;
@@ -33,7 +35,8 @@ public class MapView {
     @ManagedProperty("#{sessionHandler}")
     private SessionHandler sessionHandler;
     private EventMap activeMap = null;
-    private Place selectedPlace = null;
+    private List<Place> selectedPlaces = new ArrayList<Place>();
+    //private Place selectedPlace = null;
 
     /** Creates a new instance of MapView */
     public MapView() {
@@ -47,8 +50,13 @@ public class MapView {
         int y = new Integer((String) requestParams.get(clientId + ".y")).intValue();
 
         Place place = getActiveMap().findPlace(x, y);
-        selectedPlace = place;
-        //throw new UnsupportedOperationException("We got place, but are doing nothing with it");
+
+        if (selectedPlaces.contains(place)) {
+            selectedPlaces.remove(place);
+        } else {
+            selectedPlaces.add(place);
+        }
+        
     }
 
     public String getSelectPlaceMapUrl() {
@@ -59,7 +67,7 @@ public class MapView {
             return "";
         }
 
-        return placeMapBean.getSelectPlaceMapUrl(getActiveMap(), selectedPlace, user);
+        return placeMapBean.getSelectPlaceMapUrl(getActiveMap(), selectedPlaces, user);
     }
 
     /**
@@ -85,20 +93,6 @@ public class MapView {
     }
 
     /**
-     * @return the selectedPlace
-     */
-    public Place getSelectedPlace() {
-        return selectedPlace;
-    }
-
-    /**
-     * @param selectedPlace the selectedPlace to set
-     */
-    public void setSelectedPlace(Place selectedPlace) {
-        this.selectedPlace = selectedPlace;
-    }
-
-    /**
      * @return the sessionHandler
      */
     public SessionHandler getSessionHandler() {

code/LanBortalWeb/src/fi/insomnia/bortal/view/TestDataView.java

@@ -37,7 +37,7 @@ public class TestDataView {
         EventMap map = testdatabean.generateTestMap(event);
         testdatabean.generateTestPlaces(map);
 
-        testdatabean.generateTestCompos(event);
+   //     testdatabean.generateTestCompos(event);
     }
 
     /** Creates a new instance of TestDataView */