Skip to content

Codecrew / Moya

Go to a project
Commit dbf03868 by Tuukka Kivilahti
Options

bug hunt

1 parent 7031e766
Inline Side-by-side
Showing with 18 additions and 3 deletions
code/LanBortalWeb/WebContent/WEB-INF/web.xml
...@@ -19,6 +19,10 @@ ...@@ -19,6 +19,10 @@
<servlet-name>Faces Servlet</servlet-name> <servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
</servlet> </servlet>
<servlet>
<servlet-name>PlaceMap</servlet-name>
<servlet-class>fi.insomnia.bortal.servlet.PlaceMap</servlet-class>
</servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>Faces Servlet</servlet-name> <servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.jsf</url-pattern> <url-pattern>*.jsf</url-pattern>
......
code/LanBortalWeb/nbproject/project.properties
...@@ -27,7 +27,7 @@ file.reference.slf4j-api-1.5.8.jar=../LanBortal/EarContent/lib/slf4j-api-1.5.8.j ...@@ -27,7 +27,7 @@ file.reference.slf4j-api-1.5.8.jar=../LanBortal/EarContent/lib/slf4j-api-1.5.8.j
file.reference.slf4j-jdk14-1.5.8.jar=../LanBortal/EarContent/lib/slf4j-jdk14-1.5.8.jar file.reference.slf4j-jdk14-1.5.8.jar=../LanBortal/EarContent/lib/slf4j-jdk14-1.5.8.jar
includes=** includes=**
j2ee.deploy.on.save=true j2ee.deploy.on.save=true
j2ee.platform=1.6-web j2ee.platform=1.6
j2ee.server.type=gfv3ee6 j2ee.server.type=gfv3ee6
jar.compress=false jar.compress=false
java.source.based=true java.source.based=true
......
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/PlaceMap.java
...@@ -8,6 +8,7 @@ import fi.insomnia.bortal.facade.EventMapFacade; ...@@ -8,6 +8,7 @@ import fi.insomnia.bortal.facade.EventMapFacade;
import fi.insomnia.bortal.facade.PlaceFacade; import fi.insomnia.bortal.facade.PlaceFacade;
import fi.insomnia.bortal.facade.UserFacade; import fi.insomnia.bortal.facade.UserFacade;
import fi.insomnia.bortal.model.EventMap; import fi.insomnia.bortal.model.EventMap;
import fi.insomnia.bortal.model.EventPk;
import fi.insomnia.bortal.model.Place; import fi.insomnia.bortal.model.Place;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
...@@ -29,6 +30,7 @@ public class PlaceMap extends HttpServlet { ...@@ -29,6 +30,7 @@ public class PlaceMap extends HttpServlet {
public static final String PARAMETER_EVENT_MAP_ID = "mapid"; public static final String PARAMETER_EVENT_MAP_ID = "mapid";
public static final String PARAMETER_SELECTED_PLACE_ID = "placeid"; public static final String PARAMETER_SELECTED_PLACE_ID = "placeid";
public static final String PARAMETER_CURRENT_USER_ID = "userid"; public static final String PARAMETER_CURRENT_USER_ID = "userid";
public static final String PARAMETER_EVENT_ID = "eventid";
@EJB @EJB
private PlaceFacade placeFacade; private PlaceFacade placeFacade;
@EJB @EJB
...@@ -49,6 +51,7 @@ public class PlaceMap extends HttpServlet { ...@@ -49,6 +51,7 @@ public class PlaceMap extends HttpServlet {
PrintWriter out = response.getWriter(); PrintWriter out = response.getWriter();
try { try {
Integer eventId = getIntegerParameter(request, PARAMETER_EVENT_ID);
Integer placeId = getIntegerParameter(request, PARAMETER_SELECTED_PLACE_ID); Integer placeId = getIntegerParameter(request, PARAMETER_SELECTED_PLACE_ID);
Integer mapId = getIntegerParameter(request, PARAMETER_EVENT_MAP_ID); Integer mapId = getIntegerParameter(request, PARAMETER_EVENT_MAP_ID);
Integer userId = getIntegerParameter(request, PARAMETER_CURRENT_USER_ID); Integer userId = getIntegerParameter(request, PARAMETER_CURRENT_USER_ID);
...@@ -57,13 +60,21 @@ public class PlaceMap extends HttpServlet { ...@@ -57,13 +60,21 @@ public class PlaceMap extends HttpServlet {
EventMap map = null; EventMap map = null;
if (placeId != null) { if (placeId != null) {
place = placeFacade.find(placeId); EventPk pk = new EventPk();
pk.setEventId(eventId);
pk.setId(placeId);
place = placeFacade.find(pk);
} }
if (place != null) { if (place != null) {
map = place.getMap(); map = place.getMap();
} else { } else {
map = getEventMapFacade().find(mapId); EventPk pk = new EventPk();
pk.setEventId(eventId);
pk.setId(mapId);
map = getEventMapFacade().find(pk);
} }
BufferedImage image = map.getMapWithPlaces(); BufferedImage image = map.getMapWithPlaces();
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!