Author: tchemit Date: 2012-06-10 22:41:43 +0200 (Sun, 10 Jun 2012) New Revision: 3431 Url: http://chorem.org/repositories/revision/pollen/3431 Log: remove old commented code Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-06-10 20:39:26 UTC (rev 3430) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-06-10 20:41:43 UTC (rev 3431) @@ -74,8 +74,9 @@ PollService pollService = getPollService(); - List<Poll> pollList = pollService.getCreatedPolls(pager, - getPollenUserAccount()); + List<Poll> pollList = pollService.getCreatedPolls( + pager, + getPollenUserAccount()); polls = new Map[pollList.size()]; Binder<Poll, Poll> binder = @@ -105,35 +106,8 @@ result.add("novote"); } result.add("summary"); -// result.add("result"); -// if (!poll.isClosed()) { -// -// // poll is not closed -// result.add("edit"); -// result.add("close"); -// } -// result.add("export"); -// result.add("clone"); result.add("delete"); return result; } -// /** -// * Retrieve the id for result page depends on {@code poll}. -// * It's not necessary to use {@code adminId} if the poll results are public. -// * But the {@code adminId} is mandatory if the poll is restricted (security). -// * -// * @param poll Poll -// * @return the pollId if results are public or the adminId if not -// */ -// protected String getResultId(Poll poll) { -// String result; -// if (PollType.FREE == poll.getPollType() && poll.isPublicResults()) { -// result = poll.getPollId(); -// -// } else { -// result = poll.getAdminId(); -// } -// return result; -// } } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-06-10 20:39:26 UTC (rev 3430) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-06-10 20:41:43 UTC (rev 3431) @@ -76,8 +76,8 @@ PollService pollService = getPollService(); - List<Pair<Poll, PollAccount>> invitedPolls = pollService.getInvitedPolls(pager, - getPollenUserAccount()); + List<Pair<Poll, PollAccount>> invitedPolls = + pollService.getInvitedPolls(pager, getPollenUserAccount()); polls = new Map[invitedPolls.size()]; Binder<Poll, Poll> binder =