Author: tchemit Date: 2012-03-02 19:50:26 +0100 (Fri, 02 Mar 2012) New Revision: 3156 Url: http://chorem.org/repositories/revision/pollen/3156 Log: fix configuration option for enums Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-03-02 13:42:51 UTC (rev 3155) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-03-02 18:50:26 UTC (rev 3156) @@ -94,21 +94,21 @@ } public ChoiceType getDefaultChoiceType() { - ChoiceType result = applicationConfig.getOptionAsObject( + ChoiceType result = applicationConfig.getOption( ChoiceType.class, PollenConfigurationOption.DEFAULT_CHOICE_TYPE.key); return result; } public VoteCountingType getDefaultVoteCountingType() { - VoteCountingType result = applicationConfig.getOptionAsObject( + VoteCountingType result = applicationConfig.getOption( VoteCountingType.class, PollenConfigurationOption.DEFAULT_VOTE_COUNTING_TYPE.key); return result; } public PollType getDefaultPollType() { - PollType result = applicationConfig.getOptionAsObject( + PollType result = applicationConfig.getOption( PollType.class, PollenConfigurationOption.DEFAULT_POLL_TYPE.key); return result;