Mergefiksauksia.

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

@@ -9,6 +9,7 @@ import javax.ejb.Stateless;
 
 
 import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 import fi.insomnia.bortal.enums.apps.ShopPermission;
 import fi.insomnia.bortal.enums.apps.ShopPermission;
+import fi.insomnia.bortal.facade.FoodWaveFacade;
 import fi.insomnia.bortal.facade.FoodWaveTemplateFacade;
 import fi.insomnia.bortal.facade.FoodWaveTemplateFacade;
 import fi.insomnia.bortal.model.FoodWave;
 import fi.insomnia.bortal.model.FoodWave;
 import fi.insomnia.bortal.model.FoodWaveTemplate;
 import fi.insomnia.bortal.model.FoodWaveTemplate;
@@ -70,4 +71,9 @@ public class FoodWaveBean implements FoodWaveBeanLocal {
 		return foodWaveFacade.merge(foodWave);
 		return foodWaveFacade.merge(foodWave);
 	}
 	}
 
 
+	@Override
+	public FoodWaveTemplate findTemplate(Integer templateId) {
+		return fwtFacade.find(templateId);
+	}
+
 }
 }

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/FoodWaveView.java

@@ -3,8 +3,8 @@ package fi.insomnia.bortal.web.cdiview.shop;
 import javax.ejb.EJB;
 import javax.ejb.EJB;
 import javax.enterprise.context.ConversationScoped;
 import javax.enterprise.context.ConversationScoped;
 import javax.faces.model.ListDataModel;
 import javax.faces.model.ListDataModel;
-import javax.inject.Named;
 import javax.inject.Inject;
 import javax.inject.Inject;
+import javax.inject.Named;
 
 
 import fi.insomnia.bortal.beans.EventBeanLocal;
 import fi.insomnia.bortal.beans.EventBeanLocal;
 import fi.insomnia.bortal.beans.FoodWaveBeanLocal;
 import fi.insomnia.bortal.beans.FoodWaveBeanLocal;
@@ -21,7 +21,6 @@ public class FoodWaveView extends GenericCDIView {
 	@EJB
 	@EJB
 	private FoodWaveBeanLocal foodWaveBean;
 	private FoodWaveBeanLocal foodWaveBean;
 
 
-	
 	@Inject
 	@Inject
 	private FoodWaveFoodView foodWaveFoodView;
 	private FoodWaveFoodView foodWaveFoodView;
 
 
@@ -49,7 +48,7 @@ public class FoodWaveView extends GenericCDIView {
 
 
 		if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS) && template == null)
 		if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS) && template == null)
 		{
 		{
-			template = foodwaveBean.findTemplate(templateId);
+			template = foodWaveBean.findTemplate(templateId);
 
 
 			super.beginConversation();
 			super.beginConversation();
 		}
 		}
@@ -77,7 +76,7 @@ public class FoodWaveView extends GenericCDIView {
 
 
 	public String saveTemplate()
 	public String saveTemplate()
 	{
 	{
-		setTemplate(foodwaveBean.saveOrCreateTemplate(getTemplate()));
+		setTemplate(foodWaveBean.saveOrCreateTemplate(getTemplate()));
 
 
 		return "/foodadmin/editTemplate";
 		return "/foodadmin/editTemplate";
 	}
 	}
@@ -104,7 +103,7 @@ public class FoodWaveView extends GenericCDIView {
 
 
 	public String selectFoodWave() {
 	public String selectFoodWave() {
 		if (foodWaves.isRowAvailable()) {
 		if (foodWaves.isRowAvailable()) {
-			//setSelectedFoodWave(foodWaves.getRowData());
+			// setSelectedFoodWave(foodWaves.getRowData());
 
 
 		}
 		}