something nice

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product.java

@@ -42,6 +42,8 @@ public class Product extends GenericEntity {
     @JoinColumn(name = EVENT_ID_COLUMN, nullable = false)
     @JoinColumn(name = EVENT_ID_COLUMN, nullable = false)
     private LanEvent event;
     private LanEvent event;
 
 
+    private String color;
+    
     @Column(name = "product_name")
     @Column(name = "product_name")
     private String name;
     private String name;
 
 
@@ -253,4 +255,12 @@ public class Product extends GenericEntity {
         this.event = event;
         this.event = event;
     }
     }
 
 
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
 }
 }

code/LanBortalWeb/src/fi/insomnia/bortal/servlet/PlaceMap.java

@@ -39,10 +39,9 @@ import fi.insomnia.bortal.model.User;
  */
  */
 public class PlaceMap extends HttpServlet {
 public class PlaceMap extends HttpServlet {
 
 
-	private static final Logger logger = LoggerFactory.getLogger(PlaceMap.class);
-	/**
-     * 
-     */
+	private static final Logger logger = LoggerFactory
+			.getLogger(PlaceMap.class);
+
 	private static final long serialVersionUID = 8769688627918936258L;
 	private static final long serialVersionUID = 8769688627918936258L;
 	@EJB
 	@EJB
 	private transient PlaceMapBeanLocal placemapBean;
 	private transient PlaceMapBeanLocal placemapBean;
@@ -65,8 +64,8 @@ public class PlaceMap extends HttpServlet {
 	 * @throws IOException
 	 * @throws IOException
 	 *             if an I/O error occurs
 	 *             if an I/O error occurs
 	 */
 	 */
-	protected void processRequest(HttpServletRequest request, HttpServletResponse response)
-			throws ServletException, IOException {
+	protected void processRequest(HttpServletRequest request,
+			HttpServletResponse response) throws ServletException, IOException {
 		logger.debug("Begin processing request");
 		logger.debug("Begin processing request");
 		// response.setContentType("text/html;charset=UTF-8");
 		// response.setContentType("text/html;charset=UTF-8");
 
 
@@ -116,9 +115,12 @@ public class PlaceMap extends HttpServlet {
 		}
 		}
 	}
 	}
 
 
-	private void printPlaceMapToStream(OutputStream outputStream, String filetype, EventMap map) throws IOException, PermissionDeniedException {
+	private void printPlaceMapToStream(OutputStream outputStream,
+			String filetype, EventMap map) throws IOException,
+			PermissionDeniedException {
 
 
-		permbean.fatalPermission(MapPermission.VIEW, "User tried to print the placemap to Stream");
+		permbean.fatalPermission(MapPermission.VIEW,
+				"User tried to print the placemap to Stream");
 
 
 		long begin = new Date().getTime();
 		long begin = new Date().getTime();
 
 
@@ -141,7 +143,8 @@ public class PlaceMap extends HttpServlet {
 		User user = permbean.getCurrentUser();
 		User user = permbean.getCurrentUser();
 		// List<Place> selectedPlaces = placemapBean.findSelectedPlaces(map);
 		// List<Place> selectedPlaces = placemapBean.findSelectedPlaces(map);
 
 
-		BufferedImage image = ImageIO.read(new ByteArrayInputStream(map.getMapData()));
+		BufferedImage image = ImageIO.read(new ByteArrayInputStream(map
+				.getMapData()));
 
 
 		Graphics2D g2d = image.createGraphics();
 		Graphics2D g2d = image.createGraphics();
 		for (Place place : places) {
 		for (Place place : places) {
@@ -163,7 +166,8 @@ public class PlaceMap extends HttpServlet {
 	 * @param parameter
 	 * @param parameter
 	 * @return
 	 * @return
 	 */
 	 */
-	private static Integer getIntegerParameter(HttpServletRequest request, String parameter) {
+	private static Integer getIntegerParameter(HttpServletRequest request,
+			String parameter) {
 		try {
 		try {
 			String valueString = request.getParameter(parameter);
 			String valueString = request.getParameter(parameter);
 			Integer value = Integer.parseInt(valueString);
 			Integer value = Integer.parseInt(valueString);
@@ -188,8 +192,8 @@ public class PlaceMap extends HttpServlet {
 	 *             if an I/O error occurs
 	 *             if an I/O error occurs
 	 */
 	 */
 	@Override
 	@Override
-	protected void doGet(HttpServletRequest request, HttpServletResponse response)
-			throws ServletException, IOException {
+	protected void doGet(HttpServletRequest request,
+			HttpServletResponse response) throws ServletException, IOException {
 		processRequest(request, response);
 		processRequest(request, response);
 	}
 	}
 
 
@@ -206,8 +210,8 @@ public class PlaceMap extends HttpServlet {
 	 *             if an I/O error occurs
 	 *             if an I/O error occurs
 	 */
 	 */
 	@Override
 	@Override
-	protected void doPost(HttpServletRequest request, HttpServletResponse response)
-			throws ServletException, IOException {
+	protected void doPost(HttpServletRequest request,
+			HttpServletResponse response) throws ServletException, IOException {
 		processRequest(request, response);
 		processRequest(request, response);
 	}
 	}
 
 
@@ -245,6 +249,16 @@ public class PlaceMap extends HttpServlet {
 			color = OWNED_COLOR;
 			color = OWNED_COLOR;
 		} else if (p.isTaken()) {
 		} else if (p.isTaken()) {
 			color = RESERVED_COLOR;
 			color = RESERVED_COLOR;
+		} else if (p.getProduct().getColor() != null) {
+			
+			
+			try {
+				color = Color.decode(p.getProduct().getColor());
+			} catch(NumberFormatException x) {
+				logger.error("Cannot convert string {} to color.", p.getProduct().getColor());
+			}
+			
+			
 		}
 		}
 
 
 		g.setColor(BORDER_COLOR);
 		g.setColor(BORDER_COLOR);

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/PlaceView.java

@@ -67,6 +67,7 @@ public class PlaceView extends GenericCDIView {
 		return null;
 		return null;
 	}
 	}
 
 
+
 	public void placeSelectActionListener(ActionEvent e) throws PermissionDeniedException {
 	public void placeSelectActionListener(ActionEvent e) throws PermissionDeniedException {
 		super.beginConversation();
 		super.beginConversation();