- Pollen-commits - mailman.cloud.codelutin.com

r3396 - in trunk: pollen-persistence/src/main/resources/i18n pollen-services/src/main/resources/i18n pollen-ui-struts2/src/main/resources/i18n pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org 28 May '12

28 May '12

Author: tchemit Date: 2012-05-28 18:10:06 +0200 (Mon, 28 May 2012) New Revision: 3396 Url: http://chorem.org/repositories/revision/pollen/3396 Log: optimize i18n Modified: trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties =================================================================== --- trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties 2012-05-28 15:34:46 UTC (rev 3395) +++ trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties 2012-05-28 16:10:06 UTC (rev 3396) @@ -1,6 +1,5 @@ pollen.application.config=Pollen configuration pollen.configuration.adminEmail=email for default admin -pollen.configuration.applicationVersion=Application version pollen.configuration.charset=Charset used by Pollen pollen.configuration.contactEmail=email for contact link pollen.configuration.dataDirectory=Directory where to put pollen data Modified: trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties =================================================================== --- trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties 2012-05-28 15:34:46 UTC (rev 3395) +++ trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties 2012-05-28 16:10:06 UTC (rev 3396) @@ -1,6 +1,5 @@ pollen.application.config=Configuration de Pollen pollen.configuration.adminEmail=Email de l'utilisateur par défaut (Utilisateur crée lors du premier lancement de pollen) -pollen.configuration.applicationVersion=Version de l'application pollen.configuration.charset=Encoding utilisé par Pollen pollen.configuration.contactEmail=Email pour le lien Contact pollen.configuration.dataDirectory=Répertoire des données de Pollen Modified: trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties =================================================================== --- trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-05-28 15:34:46 UTC (rev 3395) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-05-28 16:10:06 UTC (rev 3396) @@ -1,8 +1,3 @@ -add=Add -create=Create -delete=Delete -edit=Edit -help=Help pollen.common.addingChoicesAlways=Always pollen.common.addingChoicesContent=From %s to %s pollen.common.addingChoicesFrom=From %s @@ -43,14 +38,3 @@ pollen.feed.pollTitle=Pollen \: %s pollen.info.admin.created=Super admin was created with login %1$s pollen.info.admin.exists=Super admin already exists -pollen.ui.user.delete=Delete this user account -pollen.ui.user.edit=Edit this user account -reminderEmail_msg=You have not yet voted for the poll "%s".\nYou can still participate with the identifier %s by following this link\: \n%s -reminderEmail_subject=[Pollen] Reminder (%s) -return=Return -save=Save -validate=Validate -voteEmail_msg=A vote has been submitted for the poll "%s". There are now %d votes for this poll.\nYou can access to this poll by following the links below.\n\nVote page\: \n%s\nEdit page\: \n%s -voteEmail_subject=[Pollen] Vote reporting (%s) -votingEmail_msg=A new poll has been created\: "%s".\nYou can participate with the identifier %s by following this link\: \n%s -votingEmail_subject=[Pollen] Invitation to vote (%s) Modified: trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties =================================================================== --- trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-05-28 15:34:46 UTC (rev 3395) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-05-28 16:10:06 UTC (rev 3396) @@ -1,8 +1,3 @@ -email-label=Email -firstName-label=Prénom -lastName-label=Nom -login-label=Identifiant -name-label=Nom pollen.common.addingChoicesAlways=Toujours pollen.common.addingChoicesContent=Du %s au %s pollen.common.addingChoicesFrom=Depuis le %s Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-28 15:34:46 UTC (rev 3395) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-28 16:10:06 UTC (rev 3396) @@ -132,7 +132,6 @@ pollen.common.vote.return=Back to poll pollen.common.vote.return-help=Back to poll pollen.common.voteAction=Vote -pollen.common.voteCounting-label=Vote Counting\: pollen.common.voteCountingType=Response type pollen.common.voteCountingType.help=Normal\: selecting 1 to n choices among available choices <br/><br/> Percentage\: allocating a percentage to each choice <br/><br/> Condorcet\: ranking choices in order of preference <br/><br/> Number \: Free response. Summed and the average numbers. pollen.common.voteCountingTypeHelp.condorcet=Condorcet vote\: rank choices by preference order from 1 to N (1\=favorite). Only the rank is taken into account, not the values. Two choices can have the same value. @@ -212,14 +211,12 @@ pollen.image.not.loaded=Image not loaded pollen.information.confirmClonePoll=Confirm clone of poll\: pollen.information.confirmClosePoll=Confirm close of poll\: -pollen.information.confirmDeleteChoice=Confirm delete of choice %s pollen.information.confirmDeleteFavoriteList=Confirm delete of favorite list\: pollen.information.confirmDeletePoll=Confirm delete of poll\: pollen.information.confirmDeletePollAccount=Confirm to delete voting\: pollen.information.confirmDeletePollChoice=Confir to delete choice %s pollen.information.confirmDeletePollVote=Confirm delete of vote of %s pollen.information.confirmDeleteUser=Confirm delete of user\: -pollen.information.confirmDeleteVote=Confirm delete of vote for %s pollen.information.favoriteList.created=Favorite list %s created. pollen.information.favoriteList.deleted=Favorite list %s deleted. pollen.information.irreversible.operation=Be ware, this operation is irreversible. Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-28 15:34:46 UTC (rev 3395) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-28 16:10:06 UTC (rev 3396) @@ -110,6 +110,7 @@ pollen.common.pollOption.maxChoiceNb=Limite pollen.common.pollOption.notification=Recevoir des emails de notification pollen.common.pollOption.notification.help=Un email vous est envoyé à chaque vote +pollen.common.pollOption.notificationNumber=Après n votes pollen.common.pollOption.publicResults=Résultats publics pollen.common.pollOption.publicResults.help=Les résultats du sondage sont consultables par tout le monde pollen.common.pollOption.reminder=Envoyer des emails de rappel Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-05-28 15:34:46 UTC (rev 3395) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-05-28 16:10:06 UTC (rev 3396) @@ -260,7 +260,7 @@ <tr> <s:if test="accountFieldDisplayed"> <th id="voterName"> - <s:textfield key='pollAccount.votingId' required="true" + <s:textfield key='pollAccount.votingId' required="true" label='' value="%{pollAccount.votingId}" theme="simple"/> </th> </s:if>

1 0

r3395 - in trunk: pollen-persistence/src/main/java/org/chorem/pollen pollen-persistence/src/main/java/org/chorem/pollen/business/persistence pollen-persistence/src/main/java/org/chorem/pollen/entities/migration pollen-services/src/main/java/org/chorem/pollen/bean pollen-services/src/main/java/org/chorem/pollen/services pollen-services/src/main/java/org/chorem/pollen/services/exceptions pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/p
by tchemit＠users.chorem.org 28 May '12

28 May '12

Author: tchemit Date: 2012-05-28 17:34:46 +0200 (Mon, 28 May 2012) New Revision: 3395 Url: http://chorem.org/repositories/revision/pollen/3395 Log: add myself to copyright + reformat code Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/ChoiceHelper.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResultList.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultLink.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ResultAccessRequired.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/ChoiceHelper.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/ChoiceHelper.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/ChoiceHelper.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -37,10 +37,11 @@ * Created: 30/03/12 * * @author fdesbois <desbois(a)codelutin.com> + * @since 1.3 */ public final class ChoiceHelper { - - private ChoiceHelper() { + + private ChoiceHelper() { } public static Object toValue(Choice choice, ChoiceType choiceType) { @@ -48,14 +49,14 @@ switch (choiceType) { case DATE: if (choice instanceof PollDateChoice) { - result = ((PollDateChoice)choice).getDate(); + result = ((PollDateChoice) choice).getDate(); } else { result = new Date(Long.parseLong(choice.getName())); } break; case IMAGE: if (choice instanceof PollImageChoice) { - result = ((PollImageChoice)choice).getLocation(); + result = ((PollImageChoice) choice).getLocation(); } else { result = choice.getName(); } @@ -97,5 +98,5 @@ } return result; } - + } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -36,7 +36,7 @@ public class PollImageChoice extends ChoiceImpl { private static final long serialVersionUID = 1L; - + public static final String PROPERTY_LOCATION = "location"; protected String location; @@ -55,7 +55,7 @@ setTopiaId(choice.getTopiaId()); setValidate(choice.isValidate()); } - + public void toChoice(Choice choice) { choice.setName(getName()); choice.setDescription(getDescription()); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResultList.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResultList.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResultList.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -31,7 +31,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since TODO + * @since 1.3 */ public class PollResultList { Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -54,9 +54,9 @@ public static PollUri newPollUri(String pollId, String accountId) { Preconditions.checkNotNull(pollId); - + PollUri result = new PollUri(); - + result.pollId = pollId; result.accountId = accountId; return result; @@ -66,7 +66,8 @@ protected String accountId; - private PollUri() { } + private PollUri() { + } public String getPollId() { return pollId; Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -52,8 +52,8 @@ /** * Create a new PollUrl which is a copy of the given {@code pollUrl} with * an other {@code accountId} for {@link PollUri}. - * - * @param pollUrl PollUrl to copy + * + * @param pollUrl PollUrl to copy * @param accountId New accountId to use for copy * @return the new PollUrl */ @@ -65,7 +65,8 @@ return result; } - private PollUrl() { } + private PollUrl() { + } public String getBaseUrl() { return baseUrl; @@ -74,7 +75,7 @@ public PollUri getPollUri() { return pollUri; } - + public String getUrl() { return getBaseUrl() + getPollUri().getUri(); } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -33,13 +33,13 @@ /** * Used to import a favorite List or a List of {@link PollAccount} from a given * source url (file, external service, ...) - * + * <p/> * Created: 16/04/12 * * @author fdesbois <desbois(a)codelutin.com> - * @since 1.3 * @see FavoriteListImportLDAP * @see FavoriteListImportCSV + * @since 1.3 */ public interface FavoriteListImport { @@ -48,7 +48,7 @@ * successful list of {@link PollAccount} instanciated during import. No * database save is done here, only the extraction from an input url to * a list of entities to manage. - * + * * @param url Url of the file or service that contains data to import * @return the List of PollAccount imported * @throws FavoriteListImportException for any import error Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -113,7 +113,7 @@ public static Function<PersonToList, PersonToList> newPersonToListCreator() { return new PersonToListCreator(); } - + public static class TopiaIdExtractor implements Function<TopiaEntity, String> { @Override Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -33,14 +33,12 @@ * @author fdesbois <desbois(a)codelutin.com> */ public final class PollenServicePredicates { - + private PollenServicePredicates() { // never instanciate a class with static methods } - /** - * Check if the PollAccount is empty, i.e. has empty votingId or email. - */ + /** Check if the PollAccount is empty, i.e. has empty votingId or email. */ public static final Predicate<PollAccount> POLL_ACCOUNT_NOT_EMPTY = new Predicate<PollAccount>() { @Override Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -21,22 +21,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -/* *##% Pollen - * Copyright (C) 2010 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - package org.chorem.pollen.services.exceptions; import org.chorem.pollen.services.FavoriteListImport; @@ -49,8 +33,8 @@ /** * Exception during {@link FavoriteListImport#execute(String)} error. There is - * always a cause from librairies used for import. - * + * always a cause from librairies used for import. + * * @author fdesbois <desbois(a)codelutin.com> */ public class FavoriteListImportException extends Exception { @@ -73,23 +57,19 @@ this(importName, cause.getMessage(), cause); } - /** - * @return the name of import (CSV, LDAP, ...) - */ + /** @return the name of import (CSV, LDAP, ...) */ public String getImportName() { return importName; } - /** - * @return the error message source from import execution. - */ + /** @return the error message source from import execution. */ public String getCauseMessage() { return causeMessage; } /** * Get the message depends on {@code locale}. - * + * * @param locale Locale to translate the message * @return the localized message or default one if locale is null */ Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -110,7 +110,7 @@ if (StringUtils.isNotEmpty(poll.getCreator().getEmail())) { int nbVotes = poll.sizeVote(); - + String subject = l_(locale, "pollen.email.voteEmail.subject", pollTitle); String content = l_(locale, "pollen.email.voteEmail.content", @@ -137,7 +137,7 @@ // Mail au créateur if (StringUtils.isNotEmpty(poll.getCreator().getEmail())) { - + String subject, content; if (PollType.FREE == poll.getPollType()) { subject = l_(locale, "pollen.email.createPoll.subject", @@ -178,7 +178,7 @@ } } } - + public void onRestrictedPersonAdded(Poll poll, PollAccount account, PollUrl voteURL) { URL url = serviceContext.getApplicationURL(); @@ -233,9 +233,9 @@ } private PollenEmail createVotingEmail(Locale locale, - String pollTitle, - PollAccount account, - PollUrl voteURL) { + String pollTitle, + PollAccount account, + PollUrl voteURL) { String subject = l_(locale, "pollen.email.votingEmail.subject", pollTitle); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -55,14 +55,14 @@ * Implementation of {@link FavoriteListImport} as a service for CSV import. * Nuiton-CSV is used to manage the {@link Import} using a specific {@link * ImportModel} for pollen. Empty rows (no votingId or no email) are ignored. - * + * <p/> * Created: 16/04/12 * * @author fdesbois <desbois(a)codelutin.com> * @since 1.3 */ public class FavoriteListImportCSV extends PollenServiceSupport implements FavoriteListImport { - + private static final Log log = LogFactory.getLog(FavoriteListImportCSV.class); private static final ValueParser<String> EMAIL_PARSER = new ValueParser<String>() { @@ -75,7 +75,7 @@ return value; } }; - + protected class FavoriteListImportModel implements ImportModel<PollAccount> { @Override @@ -95,10 +95,10 @@ @Override public Iterable<ImportableColumn<PollAccount, Object>> getColumnsForImport() { ModelBuilder modelBuilder = new ModelBuilder(); - modelBuilder.newMandatoryColumn(PollAccount.PROPERTY_VOTING_ID, + modelBuilder.newMandatoryColumn(PollAccount.PROPERTY_VOTING_ID, PollAccount.PROPERTY_VOTING_ID); - modelBuilder.newMandatoryColumn(PollAccount.PROPERTY_EMAIL, - PollAccount.PROPERTY_EMAIL, + modelBuilder.newMandatoryColumn(PollAccount.PROPERTY_EMAIL, + PollAccount.PROPERTY_EMAIL, EMAIL_PARSER); return modelBuilder.getColumnsForImport(); } @@ -138,7 +138,7 @@ } return results; } - + // @Override // public List<PollAccount> execute(String url) throws FavoriteListImportException { // Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -45,9 +45,9 @@ /** * LDAP Import of {@link PollAccount}. The behavior is the same than the one * from pollen 1.2.x - * + * <p/> * TODO-fdesbois-2012-04-17 : tests and documentation - * + * <p/> * Created: 16/04/12 * * @author fdesbois <desbois(a)codelutin.com> @@ -56,12 +56,12 @@ public class FavoriteListImportLDAP extends PollenServiceSupport implements FavoriteListImport { private static final Log log = LogFactory.getLog(FavoriteListImportLDAP.class); - + @Override public List<PollAccount> execute(String url) throws FavoriteListImportException { - + long start = System.nanoTime(); - + List<PollAccount> results = Lists.newArrayList(); try { Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -136,7 +136,7 @@ UserAccountDAO userDAO = getDAO(UserAccount.class); PersonListDAO dao = getDAO(PersonList.class); - + PersonList result; try { Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -40,9 +40,9 @@ * @since 1.3 */ public class PreventRuleService extends PollenServiceSupport { - + public static final String SCOPE_VOTE = "vote"; - + public static final String SCOPE_REMINDER = "rappel"; /** Logger. */ Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -60,30 +60,30 @@ /** Logger. */ private static final Log log = LogFactory.getLog(VoteService.class); - + public Vote getNewVote(Poll poll, PollAccount account) { - + Preconditions.checkNotNull(poll); - + VoteDAO voteDAO = getDAO(Vote.class); VoteToChoiceDAO voteToChoiceDAO = getDAO(VoteToChoice.class); - + Vote result = newInstance(voteDAO); result.setPollAccount(account); result.setWeight(1.); - + // Prepare the List of VoteToChoice with Poll's choices for (Choice choice : poll.getChoice()) { VoteToChoice element = newInstance(voteToChoiceDAO); element.setChoice(choice); result.addChoiceVoteToChoice(element); } - - return result; + + return result; } - + public Vote getVoteEditable(Poll poll, PollAccount accountEditable) { - + Preconditions.checkNotNull(poll); Preconditions.checkNotNull(accountEditable); @@ -94,7 +94,7 @@ } catch (TopiaException e) { throw new PollenTechnicalException(e); } - + Vote result; if (voteLoaded != null) { @@ -126,8 +126,8 @@ voteToChoices.add(i, voteToChoice); } result.setChoiceVoteToChoice(voteToChoices); - - } else { + + } else { result = getNewVote(poll, accountEditable); } @@ -142,7 +142,7 @@ /** * Retrieve the URL to update a vote based on {@link PollUri}. - * + * * @param pollUri Uri with pollId and accountId * @return the URL that allow the voting person to update his vote */ @@ -153,7 +153,7 @@ String.format("%s/poll/votefor/%s", baseUrl, pollUri.getUri()); return result; } - + public Vote createVote(Vote vote) throws PollAccountNotFound { VoteDAO voteDAO = getDAO(Vote.class); @@ -170,7 +170,7 @@ // Load existing account (restricted poll) if (pollAccountId != null) { pollAccountLoaded = getEntityById(PollAccount.class, pollAccountId); - + // Create new account } else { PollAccountDAO pollAccountDAO = getDAO(PollAccount.class); @@ -244,7 +244,7 @@ if (voteToChoiceEntity != null) { voteToChoiceEntity.setVoteValue(value); - + } else { createVoteToChoice(result, input); } @@ -262,24 +262,24 @@ return result; } - + protected VoteToChoice createVoteToChoice(Vote vote, VoteToChoice source) { - + VoteToChoiceDAO voteToChoiceDao = getDAO(VoteToChoice.class); VoteToChoice result = create(voteToChoiceDao); - + String choiceId = source.getChoice().getTopiaId(); Choice choiceLoaded = getEntityById(Choice.class, choiceId); result.setChoice(choiceLoaded); - - result.setVote(vote); + + result.setVote(vote); result.setVoteValue(source.getVoteValue()); - + vote.addChoiceVoteToChoice(result); - + return result; } - + protected void deleteVoteToChoice(Vote vote, VoteToChoice entity) { VoteToChoiceDAO voteToChoiceDao = getDAO(VoteToChoice.class); @@ -293,7 +293,7 @@ * deleted for a {@link PollType#FREE} poll where vote will be removed. This * remove implied an new execution of poll vote counting if continuous results * is activated. - * + * * @param voteId TopiaId of the vote * @throws VoteNotFoundException if vote doesn't exist */ @@ -306,7 +306,7 @@ } VoteDAO dao = getDAO(Vote.class); - VoteToChoiceDAO voteToChoiceDao = getDAO(VoteToChoice.class); + VoteToChoiceDAO voteToChoiceDao = getDAO(VoteToChoice.class); // Delete all VoteToChoice List<VoteToChoice> voteToChoices = ImmutableList.copyOf(entityToDelete.getChoiceVoteToChoice()); @@ -357,23 +357,23 @@ } /** - * Vote is allowed if {@code poll} is running and {@code pollAccount} is - * defined in the {@code poll} restricted list if it's not a {@link PollType#FREE} + * Vote is allowed if {@code poll} is running and {@code pollAccount} is + * defined in the {@code poll} restricted list if it's not a {@link PollType#FREE} * poll. The account must be defined previously using * {@link PollService#getPollAccountEditable(String, UserAccount, Poll)} to * have a proper link between userAccount and pollAccount even if not already * created in dabase. The poll creator can't vote. The token is just use * for moderate purpose. - * - * @param poll Poll + * + * @param poll Poll * @param accountEditable Account to check * @return true if vote is allowed, false otherwise */ public boolean isVoteAllowed(Poll poll, PollAccount accountEditable) { - + Preconditions.checkNotNull(poll); Preconditions.checkNotNull(accountEditable); - + Date now = serviceContext.getCurrentTime(); boolean result; @@ -395,11 +395,11 @@ } return result; } - + public boolean isUpdateAllowed(Poll poll, String voteId, String accountId, UserAccount userConnected) { - + Date now = serviceContext.getCurrentTime(); - + boolean result = false; Vote vote = poll.getVoteByTopiaId(voteId); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -40,9 +40,7 @@ */ public class PollenUIUtils { - /** - * Keep the servlet context - */ + /** Keep the servlet context */ private static ServletContext servletContext; public static ServletContext getServletContext() { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -30,17 +30,17 @@ * @since 1.3 */ public enum PageSkin { - + INDEX("Index", "yellow"), - + VOTE("Vote", "green"), - + RESULT("VoteCounting", "cupertino"), - + EDITION("Creation", "cupertino"); - + private String cssSuffix; - + private String theme; private PageSkin(String cssSuffix, String theme) { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -57,6 +57,7 @@ public void setUserId(String userId) { this.userId = userId; } + public void setPollId(String pollId) { this.pollId = pollId; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -233,7 +233,7 @@ public boolean isVoteStarted() { return isEdit() && poll.sizeVote() > 0; } - + // public boolean isPersonEditable(PersonToList personToList) { // boolean result; // // If vote is started, the person is editable if he hasn't vote yet Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -26,8 +26,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.bean.PollUri; +import org.chorem.pollen.ui.actions.PollenActionSupport; import org.chorem.pollen.ui.converters.PollUriConverter; -import org.chorem.pollen.ui.actions.PollenActionSupport; import java.util.Map; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -68,11 +68,11 @@ private static final Log log = LogFactory.getLog(AbstractVoteAction.class); private transient PollResultsService pollResultsService; - + private transient PollService pollService; private transient VoteService voteService; - + private transient PollCommentService pollCommentService; private Poll poll; @@ -86,11 +86,11 @@ private boolean alreadyVoted; private boolean voteAllowed; - + private List<Vote> votes; - + private Vote vote; - + private String commentAuthor; // private String voteSizeMessage; @@ -98,7 +98,7 @@ private List<PollResult> results; private List<Comment> comments; - + private Map<String, String[]> parameters; @Override @@ -112,7 +112,7 @@ } return pollResultsService; } - + protected PollService getPollService() { if (pollService == null) { pollService = newService(PollService.class); @@ -257,7 +257,7 @@ public String getCommentAuthor() { if (commentAuthor == null) { - + UserAccount user = getPollenUserAccount(); if (user == null) { @@ -300,13 +300,13 @@ PollFeedService pollFeedService = newService(PollFeedService.class); feedFileExisting = pollFeedService.isFeedExists(poll); - + PollAccount pollCreator = poll.getCreator(); if (getPollenUserAccount() == null) { // User is creator if loaded pollAccount is the creator creatorUser = pollCreator.equals(pollAccount); - + } else { // User is creator if the userAccount is the same @@ -382,7 +382,7 @@ public boolean isDeleteCommentAllowed(Comment comment) { return getPollCommentService().isCanDeleteComment(comment, getPollAccount(), getPollenUserAccount()); } - + public boolean isDeleteVoteAllowed(Vote vote) { return isUserAdmin(); } @@ -405,7 +405,7 @@ // Ensure uri for poll and pollAccount loading preparePollUri(parameters); - + String pollId = getPollId(); if (StringUtils.isNotEmpty(pollId)) { poll = getPollService().getPollByPollId(pollId); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -37,7 +37,7 @@ public class AddComment extends AbstractVoteAction implements Preparable { private static final long serialVersionUID = 1L; - + private String commentText; public void setCommentText(String commentText) { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -51,9 +51,9 @@ PollService service = newService(PollService.class); service.closePoll(getPollId(), getPollenUserAccount(), getAccountId()); - + addFlashMessage(_("pollen.information.poll.closed")); - + return SUCCESS; } } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -33,9 +33,9 @@ public class EditVote extends AbstractPollUriIdAction { private static final long serialVersionUID = 1L; - + private String accountId; - + private String pollId; public void setAccountId(String accountId) { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultLink.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultLink.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultLink.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -38,9 +38,9 @@ private static final long serialVersionUID = 1L; protected PollService pollService; - + protected Poll poll; - + protected String pollResultUrl; protected PollService getPollService() { @@ -65,7 +65,7 @@ @Override public String execute() throws Exception { - + String pollUid = getPollId(); poll = getPollService().getPollByPollId(pollUid); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -51,8 +51,8 @@ import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.common.PollType; import org.chorem.pollen.services.impl.PreventRuleService; +import org.chorem.pollen.ui.actions.FileUploadAware; import org.chorem.pollen.ui.converters.DateConverter; -import org.chorem.pollen.ui.actions.FileUploadAware; import org.nuiton.util.StringUtil; import java.io.File; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -43,7 +43,7 @@ * @since 1.3 */ public class VoteForPoll extends AbstractVoteAction implements Preparable { - + private static final Log log = LogFactory.getLog(VoteForPoll.class); private static final long serialVersionUID = 1L; @@ -81,11 +81,11 @@ } } - + int nbVotes = 0; int totalValues = 0; for (VoteToChoice voteToChoice : vote.getChoiceVoteToChoice()) { - + Integer value = voteToChoice.getVoteValue(); // XXX-fdesbois-2012-04-11 : for a VoteCountingType#NUMBER the difference between 0 and null value could be important if (value != null && value != 0) { @@ -113,10 +113,10 @@ // REMARQUES : // - pas le droit de modif si le pollAccount est rattaché a un userAccount et qu'on est pas loggé ?!? // - Ce serait plus simple que l'Admin ne puisse jamais voter, il ne peut que modérer les votes - + if (getVote().getTopiaId() != null) { getVoteService().updateVote(getVote()); - + } else { Vote voteCreated = getVoteService().createVote(getVote()); getPollService().addVoteToPoll(getPoll(), voteCreated); @@ -143,8 +143,8 @@ addFlashMessage( _("pollen.information.vote.createdWithUpdateUrl", updateUrl)); - } else{ - + } else { + addFlashMessage(_("pollen.information.vote.created")); } return SUCCESS; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -39,7 +39,7 @@ public class Login extends PollenActionSupport { private static final long serialVersionUID = 1L; - + private static final String HOME = "home"; protected String login; @@ -76,7 +76,7 @@ public String execute() throws Exception { UserService service = newService(UserService.class); - + if (StringUtils.isBlank(login) || StringUtils.isBlank(password)) { addFlashError(_("pollen.error.user.bad.login.or.password")); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -38,7 +38,7 @@ public class LostPassword extends PollenActionSupport { private static final long serialVersionUID = 1L; - + private String email; public String getEmail() { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -62,9 +62,9 @@ protected String ldapImport; protected String action; - + private FavoriteService favoriteService; - + public FavoriteService getFavoriteService() { if (favoriteService == null) { favoriteService = newService(FavoriteService.class); @@ -119,14 +119,14 @@ Preconditions.checkNotNull(favoriteList.getName()); try { - PersonList personList = + PersonList personList = getFavoriteService().createFavoriteList(getPollenUserAccount(), - favoriteList.getName()); - + favoriteList.getName()); + if (csvImportFileName != null) { FavoriteListImport importService = newService(FavoriteListImportCSV.class); - + addImport(importService, csvImport.getAbsolutePath(), personList); } @@ -162,7 +162,7 @@ Preconditions.checkNotNull(favoriteList); - PersonList deletedFavoritedList = + PersonList deletedFavoritedList = getFavoriteService().deleteFavoriteList(getPollenUserAccount(), favoriteList); getTransaction().commitTransaction(); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -33,29 +33,29 @@ * @author fdesbois <desbois(a)codelutin.com> */ public class BooleanIntegerConverter extends StrutsTypeConverter { - + @Override - public Integer convertFromString(Map context, String[] values, Class toClass) { + public Integer convertFromString(Map context, String[] values, Class toClass) { Integer result; if (values.length == 1) { result = parseValue(values[0]); - + } else { result = null; } return result; } - + protected Integer parseValue(String value) { Integer result; if ("true".equals(value)) { result = 1; - + } else if ("false".equals(value)) { result = 0; - + } else { - result = Integer.parseInt(value); + result = Integer.parseInt(value); } return result; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -44,14 +44,14 @@ } return instance; } - + @Override public PollUri convertFromString(Map context, String[] values, Class toClass) { PollUri result; if (values.length == 1) { String value = values[0]; result = PollUri.newPollUri(value); - + } else { result = null; } @@ -62,14 +62,14 @@ public String convertToString(Map context, Object o) { String result; if (o != null) { - result = ((PollUri)o).getUri(); + result = ((PollUri) o).getUri(); } else { result = ""; } return result; } - + public static PollUri convertFromString(String[] values) { Preconditions.checkNotNull(values); PollUri result = getInstance().convertFromString(null, values, PollUri.class); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ResultAccessRequired.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ResultAccessRequired.java 2012-05-28 15:27:04 UTC (rev 3394) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ResultAccessRequired.java 2012-05-28 15:34:46 UTC (rev 3395) @@ -63,14 +63,12 @@ // user is connected ans admin, so isAccessAllowed = true; - } - else if (pollCreatorFilter.isAccessAllowed(request, response, mappedValue)) { + } else if (pollCreatorFilter.isAccessAllowed(request, response, mappedValue)) { // account is creator isAccessAllowed = true; - } - else if (pollAccountFilter.isAccessAllowed(request, response, mappedValue)) { + } else if (pollAccountFilter.isAccessAllowed(request, response, mappedValue)) { PollUri pollUri = getPollUri(request); @@ -99,8 +97,7 @@ isAccessAllowed = false; } - } - else { + } else { isAccessAllowed = false; }

1 0

28 May '12

Author: tchemit Date: 2012-05-28 17:27:04 +0200 (Mon, 28 May 2012) New Revision: 3394 Url: http://chorem.org/repositories/revision/pollen/3394 Log: add myself on copyright remove unused jsp move converters to his own package Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java Removed: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/BooleanIntegerConverter.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollUriConverter.java trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/poll/ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/clone.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/delete.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/export.jsp Modified: trunk/pollen-ui-struts2/src/main/assembly/bin.xml trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.properties trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/FileUploadAware.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java 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/poll/AbstractDisplayChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteComment.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteVote.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmPollAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayVotingList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/InvitedList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SelectPersonListToVotingList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeletePollAccount.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AdminUserRequired.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ConnectedUserRequired.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollAccessRequired.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorRequired.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollRequired.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ResultAccessRequired.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoice-conversion.properties trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoiceImpl-conversion.properties trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css trunk/pollen-ui-struts2/src/main/resources/xwork-conversion.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personListToVotingList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToAddToVotingList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToCreateNewVotingList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css trunk/pollen-ui-struts2/src/main/webapp/css/results.css trunk/pollen-ui-struts2/src/main/webapp/css/vote.css trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js trunk/pollen-ui-struts2/src/main/webapp/js/favoriteList.js trunk/pollen-ui-struts2/src/main/webapp/js/favoriteLists.js trunk/pollen-ui-struts2/src/main/webapp/js/usersList.js trunk/pollen-ui-struts2/src/site/fr/rst/index.rst trunk/pollen-ui-struts2/src/site/rst/index.rst trunk/pollen-ui-struts2/src/site/site_en.xml trunk/pollen-ui-struts2/src/site/site_fr.xml Modified: trunk/pollen-ui-struts2/src/main/assembly/bin.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/bin.xml 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/assembly/bin.xml 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.properties 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.properties 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 CodeLutin +# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by Deleted: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/BooleanIntegerConverter.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/BooleanIntegerConverter.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/BooleanIntegerConverter.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -1,67 +0,0 @@ -/* - * #%L - * Pollen :: UI (strust2) - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui.actions; - -import org.apache.struts2.util.StrutsTypeConverter; - -import java.util.Map; - -/** - * Created: 26/03/12 - * - * @author fdesbois <desbois(a)codelutin.com> - */ -public class BooleanIntegerConverter extends StrutsTypeConverter { - - @Override - public Integer convertFromString(Map context, String[] values, Class toClass) { - Integer result; - if (values.length == 1) { - result = parseValue(values[0]); - - } else { - result = null; - } - return result; - } - - protected Integer parseValue(String value) { - Integer result; - if ("true".equals(value)) { - result = 1; - - } else if ("false".equals(value)) { - result = 0; - - } else { - result = Integer.parseInt(value); - } - return result; - } - - @Override - public String convertToString(Map context, Object object) { - return object == null ? "" : String.valueOf(object); - } -} Deleted: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -1,101 +0,0 @@ -/* - * #%L - * Pollen :: UI (strust2) - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui.actions; - -import com.opensymphony.xwork2.ActionContext; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.util.StrutsTypeConverter; -import org.nuiton.util.DateUtil; - -import java.text.ParseException; -import java.util.Date; -import java.util.Locale; -import java.util.Map; - -import static org.nuiton.i18n.I18n.l_; - -/** - * Created: 18/04/12 - * - * @author fdesbois <desbois(a)codelutin.com> - * @since 1.3 - */ -public class DateConverter extends StrutsTypeConverter { - - private static final Log log = LogFactory.getLog(DateConverter.class); - - @Override - public Date convertFromString(Map context, String[] values, Class toClass) { - String value = values[0]; - Date result = convertFromString(value); - return result; - } - - @Override - public String convertToString(Map context, Object o) { - Date date = (Date) o; - String result = convertToString(date); - return result; - } - - public static String convertToString(Date date) { - String result = DateUtil.formatDate(date, getDateTimePattern()); - return result; - } - - public static Date convertFromString(String value) { - Date result = null; - if (StringUtils.isNotBlank(value)) { - // try first with a date-time pattern - try { - result = DateUtil.parseDate(value, getDateTimePattern()); - } catch (ParseException e) { - - // fall-back, try with a date pattern - try { - result = DateUtil.parseDate(value, getDatePattern()); - } catch (ParseException e1) { - if (log.isErrorEnabled()) { - log.error("Error parsing date '" + value + "'", e1); - } - } - } - } - return result; - } - - private static String getDateTimePattern() { - Locale locale = ActionContext.getContext().getLocale(); - String result = l_(locale, "pollen.common.dateTimePattern"); - return result; - } - - private static String getDatePattern() { - Locale locale = ActionContext.getContext().getLocale(); - String result = l_(locale, "pollen.common.datePattern"); - return result; - } -} Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/FileUploadAware.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/FileUploadAware.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/FileUploadAware.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Deleted: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollUriConverter.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollUriConverter.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollUriConverter.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -1,78 +0,0 @@ -/* - * #%L - * Pollen :: UI (strust2) - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui.actions; - -import com.google.common.base.Preconditions; -import org.apache.struts2.util.StrutsTypeConverter; -import org.chorem.pollen.bean.PollUri; - -import java.util.Map; - -/** - * Created: 27/03/12 - * - * @author fdesbois <desbois(a)codelutin.com> - */ -public class PollUriConverter extends StrutsTypeConverter { - - private static PollUriConverter instance; - - public static PollUriConverter getInstance() { - if (instance == null) { - instance = new PollUriConverter(); - } - return instance; - } - - @Override - public PollUri convertFromString(Map context, String[] values, Class toClass) { - PollUri result; - if (values.length == 1) { - String value = values[0]; - result = PollUri.newPollUri(value); - - } else { - result = null; - } - return result; - } - - @Override - public String convertToString(Map context, Object o) { - String result; - if (o != null) { - result = ((PollUri)o).getUri(); - - } else { - result = ""; - } - return result; - } - - public static PollUri convertFromString(String[] values) { - Preconditions.checkNotNull(values); - PollUri result = getInstance().convertFromString(null, values, PollUri.class); - return result; - } -} Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by 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-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -28,7 +28,6 @@ import org.chorem.pollen.common.PollType; import org.chorem.pollen.entities.PollenBinderHelper; import org.chorem.pollen.services.impl.PollService; -import org.chorem.pollen.ui.actions.DateConverter; import org.nuiton.util.beans.Binder; import java.util.List; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -26,7 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.bean.PollUri; -import org.chorem.pollen.ui.actions.PollUriConverter; +import org.chorem.pollen.ui.converters.PollUriConverter; import org.chorem.pollen.ui.actions.PollenActionSupport; import java.util.Map; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteChoice.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteChoice.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteComment.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteComment.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteComment.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteVote.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteVote.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteVote.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmPollAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmPollAction.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmPollAction.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayVotingList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayVotingList.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayVotingList.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/InvitedList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/InvitedList.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/InvitedList.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -45,8 +45,8 @@ import org.chorem.pollen.services.exceptions.PollNotFoundException; import org.chorem.pollen.services.impl.PollResultsService; import org.chorem.pollen.services.impl.PollService; -import org.chorem.pollen.ui.actions.DateConverter; import org.chorem.pollen.ui.actions.PageSkin; +import org.chorem.pollen.ui.converters.DateConverter; import org.nuiton.util.StringUtil; import java.net.URL; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -51,7 +51,7 @@ import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.common.PollType; import org.chorem.pollen.services.impl.PreventRuleService; -import org.chorem.pollen.ui.actions.DateConverter; +import org.chorem.pollen.ui.converters.DateConverter; import org.chorem.pollen.ui.actions.FileUploadAware; import org.nuiton.util.StringUtil; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SelectPersonListToVotingList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SelectPersonListToVotingList.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SelectPersonListToVotingList.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -101,11 +101,6 @@ _("pollen.error.vote.maxChoiceNb", maxChoice)); } - if (nbVotes==0) { - addFieldError("vote.choices", - _("pollen.error.vote.noVote")); - } - // check for percentage that the sum of all values equals 100 if (isPercentageVoteCounting() && totalValues != 100) { addFieldError("vote.choices", _("pollen.error.vote.percentage")); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeletePollAccount.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeletePollAccount.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeletePollAccount.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Copied: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java (from rev 3391, trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/BooleanIntegerConverter.java) =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java (rev 0) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -0,0 +1,67 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.converters; + +import org.apache.struts2.util.StrutsTypeConverter; + +import java.util.Map; + +/** + * Created: 26/03/12 + * + * @author fdesbois <desbois(a)codelutin.com> + */ +public class BooleanIntegerConverter extends StrutsTypeConverter { + + @Override + public Integer convertFromString(Map context, String[] values, Class toClass) { + Integer result; + if (values.length == 1) { + result = parseValue(values[0]); + + } else { + result = null; + } + return result; + } + + protected Integer parseValue(String value) { + Integer result; + if ("true".equals(value)) { + result = 1; + + } else if ("false".equals(value)) { + result = 0; + + } else { + result = Integer.parseInt(value); + } + return result; + } + + @Override + public String convertToString(Map context, Object object) { + return object == null ? "" : String.valueOf(object); + } +} Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java (from rev 3391, trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java) =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java (rev 0) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -0,0 +1,101 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.converters; + +import com.opensymphony.xwork2.ActionContext; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts2.util.StrutsTypeConverter; +import org.nuiton.util.DateUtil; + +import java.text.ParseException; +import java.util.Date; +import java.util.Locale; +import java.util.Map; + +import static org.nuiton.i18n.I18n.l_; + +/** + * Created: 18/04/12 + * + * @author fdesbois <desbois(a)codelutin.com> + * @since 1.3 + */ +public class DateConverter extends StrutsTypeConverter { + + private static final Log log = LogFactory.getLog(DateConverter.class); + + @Override + public Date convertFromString(Map context, String[] values, Class toClass) { + String value = values[0]; + Date result = convertFromString(value); + return result; + } + + @Override + public String convertToString(Map context, Object o) { + Date date = (Date) o; + String result = convertToString(date); + return result; + } + + public static String convertToString(Date date) { + String result = DateUtil.formatDate(date, getDateTimePattern()); + return result; + } + + public static Date convertFromString(String value) { + Date result = null; + if (StringUtils.isNotBlank(value)) { + // try first with a date-time pattern + try { + result = DateUtil.parseDate(value, getDateTimePattern()); + } catch (ParseException e) { + + // fall-back, try with a date pattern + try { + result = DateUtil.parseDate(value, getDatePattern()); + } catch (ParseException e1) { + if (log.isErrorEnabled()) { + log.error("Error parsing date '" + value + "'", e1); + } + } + } + } + return result; + } + + private static String getDateTimePattern() { + Locale locale = ActionContext.getContext().getLocale(); + String result = l_(locale, "pollen.common.dateTimePattern"); + return result; + } + + private static String getDatePattern() { + Locale locale = ActionContext.getContext().getLocale(); + String result = l_(locale, "pollen.common.datePattern"); + return result; + } +} Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java (from rev 3391, trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollUriConverter.java) =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java (rev 0) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -0,0 +1,78 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.converters; + +import com.google.common.base.Preconditions; +import org.apache.struts2.util.StrutsTypeConverter; +import org.chorem.pollen.bean.PollUri; + +import java.util.Map; + +/** + * Created: 27/03/12 + * + * @author fdesbois <desbois(a)codelutin.com> + */ +public class PollUriConverter extends StrutsTypeConverter { + + private static PollUriConverter instance; + + public static PollUriConverter getInstance() { + if (instance == null) { + instance = new PollUriConverter(); + } + return instance; + } + + @Override + public PollUri convertFromString(Map context, String[] values, Class toClass) { + PollUri result; + if (values.length == 1) { + String value = values[0]; + result = PollUri.newPollUri(value); + + } else { + result = null; + } + return result; + } + + @Override + public String convertToString(Map context, Object o) { + String result; + if (o != null) { + result = ((PollUri)o).getUri(); + + } else { + result = ""; + } + return result; + } + + public static PollUri convertFromString(String[] values) { + Preconditions.checkNotNull(values); + PollUri result = getInstance().convertFromString(null, values, PollUri.class); + return result; + } +} Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AdminUserRequired.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AdminUserRequired.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AdminUserRequired.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ConnectedUserRequired.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ConnectedUserRequired.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ConnectedUserRequired.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollAccessRequired.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollAccessRequired.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollAccessRequired.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorRequired.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorRequired.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorRequired.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollRequired.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollRequired.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollRequired.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ResultAccessRequired.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ResultAccessRequired.java 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ResultAccessRequired.java 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-28 15:27:04 UTC (rev 3394) @@ -193,7 +193,6 @@ pollen.error.user.restrictedListsForbidden=The poll is restricted and you are not allowed to vote. Check if you have correctly used the link sent to you by email. pollen.error.userNotAllowed=You are not allowed to count the votes for this poll. pollen.error.vote.maxChoiceNb=The maximal number of choices is %d. -pollen.error.vote.noVote=No vote filled pollen.error.vote.percentage=The sum of the values must be equals to 100. pollen.fieldset.connexionInformation=Connexion informations pollen.fieldset.login=Login Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-28 15:27:04 UTC (rev 3394) @@ -191,7 +191,6 @@ pollen.error.user.restrictedListsForbidden=Le sondage est restreint et vous n'êtes pas autorisé à voter. Vérifiez que vous avez bien utiliser le lien qui vous a été envoyé. pollen.error.userNotAllowed=Vous n'êtes pas autorisé à dépouiller ce sondage. pollen.error.vote.maxChoiceNb=Le nombre de choix maximal est de %d. -pollen.error.vote.noVote=Aucun vote renseigné pollen.error.vote.percentage=La somme des valeurs doit être égale à 100. pollen.fieldset.connexionInformation=Information de connexion pollen.fieldset.login=Connexion Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoice-conversion.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoice-conversion.properties 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoice-conversion.properties 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 CodeLutin +# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -21,4 +21,4 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -voteValue=org.chorem.pollen.ui.actions.BooleanIntegerConverter \ No newline at end of file +voteValue=org.chorem.pollen.ui.converters.BooleanIntegerConverter \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoiceImpl-conversion.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoiceImpl-conversion.properties 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoiceImpl-conversion.properties 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 CodeLutin +# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -21,4 +21,4 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -voteValue=org.chorem.pollen.ui.actions.BooleanIntegerConverter \ No newline at end of file +voteValue=org.chorem.pollen.ui.converters.BooleanIntegerConverter \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/resources/xwork-conversion.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/xwork-conversion.properties 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/resources/xwork-conversion.properties 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 CodeLutin +# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -21,5 +21,5 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -org.chorem.pollen.bean.PollUri=org.chorem.pollen.ui.actions.PollUriConverter -java.util.Date=org.chorem.pollen.ui.actions.DateConverter \ No newline at end of file +org.chorem.pollen.bean.PollUri=org.chorem.pollen.ui.converters.PollUriConverter +java.util.Date=org.chorem.pollen.ui.converters.DateConverter \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Deleted: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/clone.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/clone.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/clone.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -1,25 +0,0 @@ -<%-- - #%L - Pollen :: UI (strust2) - - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<h2>clone poll TODO</h2> \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Deleted: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/delete.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/delete.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/delete.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -1,25 +0,0 @@ -<%-- - #%L - Pollen :: UI (strust2) - - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<h2>delete poll TODO</h2> \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -2,8 +2,8 @@ #%L Pollen :: UI (strust2) - $Id: vote.jsp 3369 2012-05-18 00:53:19Z tchemit $ - $HeadURL: http://svn.chorem.org/svn/pollen/trunk/pollen-ui-struts2/src/main/webapp/WE… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% Property changes on: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Deleted: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/export.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/export.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/export.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -1,25 +0,0 @@ -<%-- - #%L - Pollen :: UI (strust2) - - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<h2>export poll TODO</h2> \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personListToVotingList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personListToVotingList.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personListToVotingList.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToAddToVotingList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToAddToVotingList.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToAddToVotingList.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToCreateNewVotingList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToCreateNewVotingList.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToCreateNewVotingList.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/css/results.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/results.css 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/css/results.css 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/css/vote.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/vote.css 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/css/vote.css 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/js/favoriteList.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/favoriteList.js 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/js/favoriteList.js 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/js/favoriteLists.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/favoriteLists.js 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/js/favoriteLists.js 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/main/webapp/js/usersList.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/usersList.js 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/main/webapp/js/usersList.js 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/site/fr/rst/index.rst =================================================================== --- trunk/pollen-ui-struts2/src/site/fr/rst/index.rst 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/site/fr/rst/index.rst 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2009 - 2012 CodeLutin +.. * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/site/rst/index.rst =================================================================== --- trunk/pollen-ui-struts2/src/site/rst/index.rst 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/site/rst/index.rst 2012-05-28 15:27:04 UTC (rev 3394) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2009 - 2012 CodeLutin +.. * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/site/site_en.xml =================================================================== --- trunk/pollen-ui-struts2/src/site/site_en.xml 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/site/site_en.xml 2012-05-28 15:27:04 UTC (rev 3394) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/pollen-ui-struts2/src/site/site_fr.xml =================================================================== --- trunk/pollen-ui-struts2/src/site/site_fr.xml 2012-05-28 15:00:39 UTC (rev 3393) +++ trunk/pollen-ui-struts2/src/site/site_fr.xml 2012-05-28 15:27:04 UTC (rev 3394) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by

1 0

r3393 - in trunk/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions/poll resources/i18n resources/org/chorem/pollen/business/persistence
by tchemit＠users.chorem.org 28 May '12

28 May '12

Author: tchemit Date: 2012-05-28 17:00:39 +0200 (Mon, 28 May 2012) New Revision: 3393 Url: http://chorem.org/repositories/revision/pollen/3393 Log: fixes #571: Can not vote with a Number vote type add a error message when no vote is filled Added: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoiceImpl-conversion.properties Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-05-28 13:42:01 UTC (rev 3392) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-05-28 15:00:39 UTC (rev 3393) @@ -69,12 +69,15 @@ String name = pollAccount.getVotingId(); if (StringUtils.isBlank(name)) { - addFieldError("pollAccount.votingId", _("pollen.error.pollAccount.votingId.required")); + addFieldError("pollAccount.votingId", + _("pollen.error.pollAccount.votingId.required")); } // check if the new pollAccount (topiaId = null) has already voted - if (pollAccount.getTopiaId() == null && getVoteService().hasAlreadyVoted(name, poll)) { - addFieldError("pollAccount.votingId", _("pollen.error.user.alreadyVoted")); + if (pollAccount.getTopiaId() == null && + getVoteService().hasAlreadyVoted(name, poll)) { + addFieldError("pollAccount.votingId", + _("pollen.error.user.alreadyVoted")); } } @@ -94,9 +97,15 @@ // check that the number of choices is not greater than maxChoiceNb int maxChoice = getPoll().getMaxChoiceNb(); if (maxChoice != 0 && nbVotes > maxChoice) { - addFieldError("vote.choices", _("pollen.error.vote.maxChoiceNb", maxChoice)); + addFieldError("vote.choices", + _("pollen.error.vote.maxChoiceNb", maxChoice)); } + if (nbVotes==0) { + addFieldError("vote.choices", + _("pollen.error.vote.noVote")); + } + // check for percentage that the sum of all values equals 100 if (isPercentageVoteCounting() && totalValues != 100) { addFieldError("vote.choices", _("pollen.error.vote.percentage")); @@ -131,10 +140,13 @@ String updateUrl = getVoteService().getUpdateVoteUrl(pollUri); if (log.isDebugEnabled()) { - log.debug(String.format("UpdateURL for poll '%s' and account '%s' = %s", pollId, accountId, updateUrl)); + log.debug(String.format( + "UpdateURL for poll '%s' and account '%s' = %s", + pollId, accountId, updateUrl)); } - addFlashMessage(_("pollen.information.vote.createdWithUpdateUrl", updateUrl)); + addFlashMessage( + _("pollen.information.vote.createdWithUpdateUrl", updateUrl)); } else{ Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-28 13:42:01 UTC (rev 3392) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-28 15:00:39 UTC (rev 3393) @@ -193,6 +193,7 @@ pollen.error.user.restrictedListsForbidden=The poll is restricted and you are not allowed to vote. Check if you have correctly used the link sent to you by email. pollen.error.userNotAllowed=You are not allowed to count the votes for this poll. pollen.error.vote.maxChoiceNb=The maximal number of choices is %d. +pollen.error.vote.noVote=No vote filled pollen.error.vote.percentage=The sum of the values must be equals to 100. pollen.fieldset.connexionInformation=Connexion informations pollen.fieldset.login=Login Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-28 13:42:01 UTC (rev 3392) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-28 15:00:39 UTC (rev 3393) @@ -191,6 +191,7 @@ pollen.error.user.restrictedListsForbidden=Le sondage est restreint et vous n'êtes pas autorisé à voter. Vérifiez que vous avez bien utiliser le lien qui vous a été envoyé. pollen.error.userNotAllowed=Vous n'êtes pas autorisé à dépouiller ce sondage. pollen.error.vote.maxChoiceNb=Le nombre de choix maximal est de %d. +pollen.error.vote.noVote=Aucun vote renseigné pollen.error.vote.percentage=La somme des valeurs doit être égale à 100. pollen.fieldset.connexionInformation=Information de connexion pollen.fieldset.login=Connexion Copied: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoiceImpl-conversion.properties (from rev 3391, trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoice-conversion.properties) =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoiceImpl-conversion.properties (rev 0) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoiceImpl-conversion.properties 2012-05-28 15:00:39 UTC (rev 3393) @@ -0,0 +1,24 @@ +### +# #%L +# Pollen :: UI (strust2) +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +voteValue=org.chorem.pollen.ui.actions.BooleanIntegerConverter \ No newline at end of file

1 0

r3392 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting
by tchemit＠users.chorem.org 28 May '12

28 May '12

Author: tchemit Date: 2012-05-28 15:42:01 +0200 (Mon, 28 May 2012) New Revision: 3392 Url: http://chorem.org/repositories/revision/pollen/3392 Log: prepare release (version 1.3.1) Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-05-28 13:37:38 UTC (rev 3391) +++ trunk/pollen-persistence/pom.xml 2012-05-28 13:42:01 UTC (rev 3392) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-05-28 13:37:38 UTC (rev 3391) +++ trunk/pollen-services/pom.xml 2012-05-28 13:42:01 UTC (rev 3392) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-05-28 13:37:38 UTC (rev 3391) +++ trunk/pollen-ui-struts2/pom.xml 2012-05-28 13:42:01 UTC (rev 3392) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-05-28 13:37:38 UTC (rev 3391) +++ trunk/pollen-votecounting/pom.xml 2012-05-28 13:42:01 UTC (rev 3392) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-28 13:37:38 UTC (rev 3391) +++ trunk/pom.xml 2012-05-28 13:42:01 UTC (rev 3392) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <modules> <module>pollen-votecounting</module>

1 0

r3391 - in trunk: . pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results pollen-ui-struts2/src/main/resources/i18n src/site
by tchemit＠users.chorem.org 28 May '12

28 May '12

Author: tchemit Date: 2012-05-28 15:37:38 +0200 (Mon, 28 May 2012) New Revision: 3391 Url: http://chorem.org/repositories/revision/pollen/3391 Log: use depedencies Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-05-28 13:36:48 UTC (rev 3390) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-05-28 13:37:38 UTC (rev 3391) @@ -29,6 +29,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; +import com.opensymphony.xwork2.inject.Inject; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -85,10 +86,11 @@ private List<PollResult> results; -// private List<PollResult> ranking; - private List<PollResult> topRanking; + @Inject(required = true) + private UrlHelper urlHelper; + @Override public PageSkin getSkin() { return PageSkin.RESULT; @@ -320,7 +322,7 @@ params.put("values", getChoices()); - UrlHelper.buildParametersString(params, url, "&"); + urlHelper.buildParametersString(params, url, "&"); String chartUrl = url.toString(); return chartUrl; @@ -346,7 +348,7 @@ params.put("values", choicesResults.get(choiceName)); params.put("subtitles", subtitles.get(choiceName)); - UrlHelper.buildParametersString(params, url, "&"); + urlHelper.buildParametersString(params, url, "&"); String chartUrl = url.toString(); return chartUrl; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java 2012-05-28 13:36:48 UTC (rev 3390) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java 2012-05-28 13:37:38 UTC (rev 3391) @@ -47,6 +47,7 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.config.entities.ResultConfig; +import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.logging.Logger; import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.struts2.ServletActionContext; @@ -72,6 +73,9 @@ private static final Logger LOG = LoggerFactory.getLogger(PollenServletActionRedirectResult.class); + @Inject(value = "struts", required = true) + private UrlHelper urlHelper; + /** * Redirects to the location specified by calling * {@link HttpServletResponse#sendRedirect(String)}. @@ -121,7 +125,7 @@ } StringBuilder tmpLocation = new StringBuilder(finalLocation); - UrlHelper.buildParametersString(requestParameters, tmpLocation, "&"); + urlHelper.buildParametersString(requestParameters, tmpLocation, "&"); // add the anchor if (anchor != null) { Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-28 13:36:48 UTC (rev 3390) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-28 13:37:38 UTC (rev 3391) @@ -66,7 +66,9 @@ pollen.common.commentText=Comment pollen.common.comments=Comments about this poll pollen.common.csvImport=CSV import +pollen.common.datePattern= pollen.common.datePickerPattern=mm/dd/yy +pollen.common.dateTimePattern= pollen.common.description=Description pollen.common.displayType-group=Results by groups pollen.common.displayType-normal=Results Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-28 13:36:48 UTC (rev 3390) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-28 13:37:38 UTC (rev 3391) @@ -66,7 +66,9 @@ pollen.common.commentText=Commentaire pollen.common.comments=Commentaire à propos du sondage pollen.common.csvImport=Import CSV +pollen.common.datePattern= pollen.common.datePickerPattern=dd/mm/yy +pollen.common.dateTimePattern= pollen.common.description=Description pollen.common.displayType-group=Résultats par groupes pollen.common.displayType-normal=Résultats Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-28 13:36:48 UTC (rev 3390) +++ trunk/pom.xml 2012-05-28 13:37:38 UTC (rev 3391) @@ -176,16 +176,16 @@ <projectId>pollen</projectId>  - <topiaVersion>2.6.9</topiaVersion> + <topiaVersion>2.6.10</topiaVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.11</nuitonWebVersion> <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> - <h2Version>1.3.166</h2Version> + <h2Version>1.3.167</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <struts2Version>2.3.1.2</struts2Version> - <jqueryPluginVersion>3.3.0</jqueryPluginVersion> + <struts2Version>2.3.4</struts2Version> + <jqueryPluginVersion>3.3.1</jqueryPluginVersion> <shiroVersion>1.2.0</shiroVersion> <slf4jVersion>1.6.4</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-05-28 13:36:48 UTC (rev 3390) +++ trunk/src/site/site_en.xml 2012-05-28 13:37:38 UTC (rev 3391) @@ -26,7 +26,7 @@ <project name="${project.name}"> <bannerLeft> - <src alt="Pollen">logo.jpg</src> + <src alt="Pollen">${project.url}/logo.jpg</src> <name>${project.name}</name> <href>index.html</href> </bannerLeft> @@ -117,7 +117,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-05-28 13:36:48 UTC (rev 3390) +++ trunk/src/site/site_fr.xml 2012-05-28 13:37:38 UTC (rev 3391) @@ -26,7 +26,7 @@ <project name="${project.name}"> <bannerLeft> - <src alt="Pollen">logo.jpg</src> + <src alt="Pollen">${project.url}/logo.jpg</src> <name>${project.name}</name> <href>index.html</href> </bannerLeft> @@ -57,23 +57,23 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="images/logos/maven-feather.png"/> + img="${project.url}/images/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="images/logos/struts2-logo.png"/> + img="${project.url}/images/logos/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="images/logos/restructuredtext-logo.png"/> + img="${project.url}/images/logos/restructuredtext-logo.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="images/logos/jrst-logo.png"/> + img="${project.url}/images/logos/jrst-logo.png"/> <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="images/logos/topia-logo.png"/> + img="${project.url}/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="images/logos/argouml-logo.png"/> + img="${project.url}/images/logos/argouml-logo.png"/> </poweredBy> <body> @@ -118,7 +118,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}'

1 0

r3390 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org 28 May '12

28 May '12

Author: tchemit Date: 2012-05-28 15:36:48 +0200 (Mon, 28 May 2012) New Revision: 3390 Url: http://chorem.org/repositories/revision/pollen/3390 Log: comment code while agination not on comments Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp 2012-05-28 12:50:04 UTC (rev 3389) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp 2012-05-28 13:36:48 UTC (rev 3390) @@ -24,9 +24,9 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<link rel="stylesheet" href="<s:url value='/css/pagination.css'/>"/> -<script type="text/javascript" - src="<s:url value='/js/jquery.pagination.js' />"></script> +<%--<link rel="stylesheet" href="<s:url value='/css/pagination.css'/>"/>--%> +<%--<script type="text/javascript"--%> + <%--src="<s:url value='/js/jquery.pagination.js' />"></script>--%> <%-- <input type="text" value="5" name="items_per_page" id="items_per_page" class="numeric"/> @@ -42,9 +42,9 @@ $('#commentsDiv div:even').addClass('even'); $('#commentsDiv div:odd').addClass('odd'); - var optInit = getOptionsFromForm(); - - $("#Pagination").pagination(members.length, optInit); +// var optInit = getOptionsFromForm(); +// +// $("#Pagination").pagination(members.length, optInit); }); </script>

1 0

r3389 - in trunk/pollen-ui-struts2/src: . main site
by tchemit＠users.chorem.org 28 May '12

28 May '12

Author: tchemit Date: 2012-05-28 14:50:04 +0200 (Mon, 28 May 2012) New Revision: 3389 Url: http://chorem.org/repositories/revision/pollen/3389 Log: fixes #570: Fix site generation of ui module Added: trunk/pollen-ui-struts2/src/site/ Removed: trunk/pollen-ui-struts2/src/main/site/ Modified: trunk/pollen-ui-struts2/src/site/site_en.xml trunk/pollen-ui-struts2/src/site/site_fr.xml Modified: trunk/pollen-ui-struts2/src/site/site_en.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/site/site_en.xml 2012-05-28 07:54:22 UTC (rev 3388) +++ trunk/pollen-ui-struts2/src/site/site_en.xml 2012-05-28 12:50:04 UTC (rev 3389) @@ -25,6 +25,27 @@ <project name="${project.name}"> + <bannerLeft> + <src alt="Pollen">${project.url}/logo.jpg</src> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + <body> <breadcrumbs> @@ -61,7 +82,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/pollen-ui-struts2/src/site/site_fr.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/site/site_fr.xml 2012-05-28 07:54:22 UTC (rev 3388) +++ trunk/pollen-ui-struts2/src/site/site_fr.xml 2012-05-28 12:50:04 UTC (rev 3389) @@ -25,6 +25,27 @@ <project name="${project.name}"> + <bannerLeft> + <src alt="Pollen">${project.url}/logo.jpg</src> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + <body> <breadcrumbs> @@ -60,7 +81,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}'

1 0

r3388 - trunk
by maven-release＠users.chorem.org 28 May '12

28 May '12

Author: maven-release Date: 2012-05-28 09:54:22 +0200 (Mon, 28 May 2012) New Revision: 3388 Url: http://chorem.org/repositories/revision/pollen/3388 Log: updates to mavenpom 3.3.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-25 07:56:56 UTC (rev 3387) +++ trunk/pom.xml 2012-05-28 07:54:22 UTC (rev 3388) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.1</version> + <version>3.3.2</version> </parent> <groupId>org.chorem</groupId>

1 0

r3387 - in trunk: pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org 25 May '12

25 May '12

Author: tchemit Date: 2012-05-25 09:56:56 +0200 (Fri, 25 May 2012) New Revision: 3387 Url: http://chorem.org/repositories/revision/pollen/3387 Log: refs #561: Can not create a image poll (add choice in a vote page does not work also :( Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-05-24 18:13:06 UTC (rev 3386) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-05-25 07:56:56 UTC (rev 3387) @@ -783,10 +783,8 @@ throw new PollNotFoundException(); } - Choice choiceAdded = saveChoice(poll, choice); + saveChoice(poll, choice); - poll.addChoice(choiceAdded); - commitTransaction("Can't create new choice [" + poll.getChoiceType() + "] for poll '" + pollId + "'"); } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-05-24 18:13:06 UTC (rev 3386) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-05-25 07:56:56 UTC (rev 3387) @@ -411,8 +411,10 @@ poll = getPollService().getPollByPollId(pollId); } Preconditions.checkNotNull(poll, "Can't load poll with id = [" + pollId + "]"); - - log.debug("Poll TopiaId: " + poll.getTopiaId()); + + if (log.isDebugEnabled()) { + log.debug("Poll TopiaId: " + poll.getTopiaId()); + } } protected void loadPollComments() { Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-05-24 18:13:06 UTC (rev 3386) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-05-25 07:56:56 UTC (rev 3387) @@ -443,7 +443,7 @@ required="true"/> </s:elseif> <s:elseif test="imageType"> - <s:file key="choice.location" + <s:file key="imageChoice[0]" label="%{getText('pollen.common.choice')}" cssClass="nameField" required="true"/>

1 0