Move functions from PlaceMapBean to PlaceBean... (some cleanup)

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/PlaceBean.java

@@ -10,7 +10,6 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -42,6 +41,7 @@ import com.pdfjet.TextLine;
 import fi.codecrew.moya.enums.apps.MapPermission;
 import fi.codecrew.moya.enums.apps.SpecialPermission;
 import fi.codecrew.moya.exceptions.BortalCatchableException;
+import fi.codecrew.moya.facade.EventMapFacade;
 import fi.codecrew.moya.facade.EventUserFacade;
 import fi.codecrew.moya.facade.GroupMembershipFacade;
 import fi.codecrew.moya.facade.PlaceFacade;
@@ -107,6 +107,8 @@ public class PlaceBean implements PlaceBeanLocal {
 
 	@EJB
 	private BarcodeBeanLocal barcodeBean;
+	@EJB
+	private EventMapFacade eventMapFacade;
 
 	@Override
 	@RolesAllowed(MapPermission.S_MANAGE_MAPS)
@@ -637,4 +639,33 @@ public class PlaceBean implements PlaceBeanLocal {
 		}
 	}
 
+	@Override
+	public Long selectablePlaceCount(EventMap map) {
+
+		return placeFacade.countSelectable(map);
+	}
+
+	@Override
+	public EventMap findMap(Integer mapId) {
+		return eventMapFacade.find(mapId);
+	}
+
+	@Override
+	public Long availablePlaceCount(EventMap map) {
+		return placeFacade.countAvailable(map);
+	}
+
+	@Override
+	public EventMap getActiveMap() {
+		LanEvent event = eventBean.getCurrentEvent();
+		logger.info("Current event: {}, maps {}", event, event.getEventMaps());
+		for (EventMap map : event.getEventMaps()) {
+			logger.info("Checking active map {}, is active {}", map, map.isActive());
+			if (map.isActive()) {
+				return map;
+			}
+		}
+		return null;
+	}
+
 }

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/PlaceMapBean.java

-package fi.codecrew.moya.beans;
-
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.List;
-
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.imageio.ImageIO;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.pdfjet.CoreFont;
-import com.pdfjet.Image;
-import com.pdfjet.ImageType;
-import com.pdfjet.PDF;
-import com.pdfjet.Page;
-import com.pdfjet.TextLine;
-
-import fi.codecrew.moya.facade.EventMapFacade;
-import fi.codecrew.moya.facade.PlaceFacade;
-import fi.codecrew.moya.model.CardTemplate;
-import fi.codecrew.moya.model.EventMap;
-import fi.codecrew.moya.model.LanEvent;
-import fi.codecrew.moya.model.Place;
-import fi.codecrew.moya.model.PrintedCard;
-import fi.codecrew.moya.util.MassPrintResult;
-
-/**
- * Session Bean implementation class PlaceMapBean
- */
-@Stateless
-public class PlaceMapBean implements PlaceMapBeanLocal {
-
-	/**
-	 * Default constructor.
-	 */
-	public PlaceMapBean() {
-		// TODO Auto-generated constructor stub
-	}
-
-	@EJB
-	private PlaceFacade placeFacade;
-	@EJB
-	// private EventMapBean eventmapBean;
-	private EventMapFacade eventMapFacade;
-	@EJB
-	private EventBeanLocal eventbean;
-	private static final Logger logger = LoggerFactory.getLogger(PlaceMapBean.class);
-
-	@Override
-	public Long selectablePlaceCount(EventMap map) {
-
-		return eventMapFacade.countSelectable(map);
-	}
-
-	@Override
-	public EventMap findMap(Integer mapId) {
-		return eventMapFacade.find(mapId);
-	}
-
-	@Override
-	public Long availablePlaceCount(EventMap map) {
-		return eventMapFacade.countAvailable(map);
-	}
-
-	@Override
-	public EventMap getActiveMap() {
-		LanEvent event = eventbean.getCurrentEvent();
-		logger.info("Current event: {}, maps {}", event, event.getEventMaps());
-		for (EventMap map : event.getEventMaps()) {
-			logger.info("Checking active map {}, is active {}", map, map.isActive());
-			if (map.isActive()) {
-				return map;
-			}
-		}
-		return null;
-	}
-	
-}

code/MoyaBeansClient/ejbModule/fi/codecrew/moya/beans/PlaceBeanLocal.java

@@ -72,4 +72,12 @@ public interface PlaceBeanLocal {
 
 	PlaceGroup reserveSelectedPlaces(EventUser eventuser) throws BortalCatchableException;
 
+	public Long selectablePlaceCount(EventMap activeMap);
+
+	public EventMap findMap(Integer mapId);
+
+	public Long availablePlaceCount(EventMap activeMap);
+
+	public EventMap getActiveMap();
+
 }

code/MoyaBeansClient/ejbModule/fi/codecrew/moya/beans/PlaceMapBeanLocal.java

-package fi.codecrew.moya.beans;
-
-import java.util.List;
-
-import javax.ejb.Local;
-
-import fi.codecrew.moya.model.EventMap;
-import fi.codecrew.moya.model.Place;
-
-@Local
-public interface PlaceMapBeanLocal {
-
-	// public String getSelectPlaceMapUrl(EventMap activeMap, List<Place>
-	// selectedPlaces, User user);
-
-	public Long selectablePlaceCount(EventMap activeMap);
-
-	public EventMap findMap(Integer mapId);
-
-	public Long availablePlaceCount(EventMap activeMap);
-
-	public EventMap getActiveMap();
-	
-	// wanha poistoon, see placebean
-	// public byte[] placeCodesPdf(List<Place> places);
-
-	// public List<Place> findSelectedPlaces(EventMap map);
-
-	// public EventMap findMap(int i);
-
-}