Fix function name

code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/PlaceGroupBeanLocal.java

@@ -50,8 +50,8 @@ public interface PlaceGroupBeanLocal {
 
 
 	boolean associateToToken(EventUser user, String token);
 	boolean associateToToken(EventUser user, String token);
 
 
-	void markGrouMembershipEntered(GroupMembership row);
+	GroupMembership markGroupMembershipEntered(GroupMembership membership);
 
 
-	void markGrouMembershipNotEntered(GroupMembership row);
+	GroupMembership markGroupMembershipNotEntered(GroupMembership membership);
 
 
 }
 }

code/moya-beans/ejbModule/fi/codecrew/moya/beans/PlaceGroupBean.java

@@ -30,6 +30,7 @@ import javax.ejb.EJBAccessException;
 import javax.ejb.Stateless;
 import javax.ejb.Stateless;
 
 
 import fi.codecrew.moya.model.*;
 import fi.codecrew.moya.model.*;
+
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
@@ -157,12 +158,10 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
 	public void getGroupMembershipPdf(EventUser usr, OutputStream ostream) {
 	public void getGroupMembershipPdf(EventUser usr, OutputStream ostream) {
 		List<GroupMembership> memberships = getMembershipsAndCreations(usr);
 		List<GroupMembership> memberships = getMembershipsAndCreations(usr);
 
 
-
 		boolean placecodeFromUser = eventbean.getPropertyBoolean(LanEventPropertyKey.PLACECODE_FROM_USER);
 		boolean placecodeFromUser = eventbean.getPropertyBoolean(LanEventPropertyKey.PLACECODE_FROM_USER);
 
 
 		boolean printOnlyOwn = eventbean.getPropertyBoolean(LanEventPropertyKey.PLACECODE_PRINT_ONLY_OWN);
 		boolean printOnlyOwn = eventbean.getPropertyBoolean(LanEventPropertyKey.PLACECODE_PRINT_ONLY_OWN);
 
 
-
 		try {
 		try {
 			PDF pdf = new PDF(ostream);
 			PDF pdf = new PDF(ostream);
 			Font font = new Font(pdf, CoreFont.TIMES_ROMAN);
 			Font font = new Font(pdf, CoreFont.TIMES_ROMAN);
@@ -279,13 +278,13 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
 	@Override
 	@Override
 	@RolesAllowed({ SpecialPermission.S_USER, MapPermission.S_MANAGE_MAPS })
 	@RolesAllowed({ SpecialPermission.S_USER, MapPermission.S_MANAGE_MAPS })
 	public void releaseAndGenerateToken(GroupMembership gmem) {
 	public void releaseAndGenerateToken(GroupMembership gmem) {
-	
-		if(gmem.getEnteredEvent() != null && !permbean.hasPermission(MapPermission.MANAGE_OTHERS)) {
+
+		if (gmem.getEnteredEvent() != null && !permbean.hasPermission(MapPermission.MANAGE_OTHERS)) {
 			throw new EJBAccessException("Token already entered to event, Not enough rights to release token.");
 			throw new EJBAccessException("Token already entered to event, Not enough rights to release token.");
 		}
 		}
-		
+
 		gmem = gmemfacade.reload(gmem);
 		gmem = gmemfacade.reload(gmem);
-		
+
 		if (!(permbean.getCurrentUser().getId().equals(gmem.getPlaceGroup().getCreator().getId()) || permbean.hasPermission(MapPermission.MANAGE_OTHERS))) {
 		if (!(permbean.getCurrentUser().getId().equals(gmem.getPlaceGroup().getCreator().getId()) || permbean.hasPermission(MapPermission.MANAGE_OTHERS))) {
 			loggerbean.sendMessage(MoyaEventType.PLACE_ERROR, permbean.getCurrentUser(), "User tried to release and generate group membership: " + gmem);
 			loggerbean.sendMessage(MoyaEventType.PLACE_ERROR, permbean.getCurrentUser(), "User tried to release and generate group membership: " + gmem);
 			throw new EJBAccessException("Not enough rights to release token");
 			throw new EJBAccessException("Not enough rights to release token");
@@ -304,17 +303,17 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
 	}
 	}
 
 
 	@Override
 	@Override
-	public void markGrouMembershipEntered(GroupMembership membership) {
+	public GroupMembership markGroupMembershipEntered(GroupMembership membership) {
 		membership.setEnteredEvent(Calendar.getInstance());
 		membership.setEnteredEvent(Calendar.getInstance());
 		membership = gmemfacade.merge(membership);
 		membership = gmemfacade.merge(membership);
+		return membership;
 	}
 	}
 
 
 	@Override
 	@Override
-	public void markGrouMembershipNotEntered(GroupMembership membership) {
+	public GroupMembership markGroupMembershipNotEntered(GroupMembership membership) {
 		membership.setEnteredEvent(null);
 		membership.setEnteredEvent(null);
 		membership = gmemfacade.merge(membership);
 		membership = gmemfacade.merge(membership);
-
+		return membership;
 	}
 	}
 
 
-
 }
 }

code/moya-web/src/main/java/fi/codecrew/moya/web/flow/CardlessIncomingView.java

@@ -145,7 +145,7 @@ public class CardlessIncomingView extends GenericCDIView {
 	public void givePlace() {
 	public void givePlace() {
 		GroupMembership row = memberlist.getRowData();
 		GroupMembership row = memberlist.getRowData();
 		if (row != null) {
 		if (row != null) {
-			placegroupBean.markGrouMembershipEntered(row);
+			placegroupBean.markGroupMembershipEntered(row);
 			memberlist = null;
 			memberlist = null;
 		}
 		}
 	}
 	}
@@ -153,7 +153,7 @@ public class CardlessIncomingView extends GenericCDIView {
 	public void ungivePlace() {
 	public void ungivePlace() {
 		GroupMembership row = memberlist.getRowData();
 		GroupMembership row = memberlist.getRowData();
 		if (row != null) {
 		if (row != null) {
-			placegroupBean.markGrouMembershipNotEntered(row);
+			placegroupBean.markGroupMembershipNotEntered(row);
 			memberlist = null;
 			memberlist = null;
 		}
 		}
 	}
 	}
@@ -165,7 +165,7 @@ public class CardlessIncomingView extends GenericCDIView {
 		int count = 0;
 		int count = 0;
 		for(GroupMembership gm : memberships) {
 		for(GroupMembership gm : memberships) {
 			if(gm.getEnteredEvent() == null) {
 			if(gm.getEnteredEvent() == null) {
-				placegroupBean.markGrouMembershipEntered(gm);
+				placegroupBean.markGroupMembershipEntered(gm);
 				count++;
 				count++;
 			}
 			}
 		}
 		}

code/moya-web/src/main/java/fi/codecrew/moya/web/flow/IncomingView.java

@@ -29,7 +29,6 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Named;
 import javax.json.JsonObject;
 import javax.json.JsonObject;
 
 
-import org.primefaces.event.SelectEvent;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
@@ -302,7 +301,7 @@ public class IncomingView extends GenericCDIView {
 	public String givePlace() {
 	public String givePlace() {
 		GroupMembership row = memberlist.getRowData();
 		GroupMembership row = memberlist.getRowData();
 		if (row != null) {
 		if (row != null) {
-			placegroupBean.markGrouMembershipEntered(row);
+			placegroupBean.markGroupMembershipEntered(row);
 			memberlist = null;
 			memberlist = null;
 		}
 		}
 		return null;
 		return null;
@@ -311,7 +310,7 @@ public class IncomingView extends GenericCDIView {
 	public String ungivePlace() {
 	public String ungivePlace() {
 		GroupMembership row = memberlist.getRowData();
 		GroupMembership row = memberlist.getRowData();
 		if (row != null) {
 		if (row != null) {
-			placegroupBean.markGrouMembershipNotEntered(row);
+			placegroupBean.markGroupMembershipNotEntered(row);
 			memberlist = null;
 			memberlist = null;
 		}
 		}
 		return null;
 		return null;