Author: cpopetz Date: 2009-09-28 17:46:57 -0400 (Mon, 28 Sep 2009) New Revision: 3795 Added: examples/trunk/wicket/numberguess/src/main/resources/META-INF/ examples/trunk/wicket/numberguess/src/main/resources/META-INF/beans.xml Removed: examples/trunk/wicket/numberguess/src/main/resources/beans.xml Modified: examples/trunk/wicket/numberguess/pom.xml examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Game.java examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Random.java Log: Update for PFD2. Modified: examples/trunk/wicket/numberguess/pom.xml =================================================================== --- examples/trunk/wicket/numberguess/pom.xml 2009-09-28 21:44:25 UTC (rev 3794) +++ examples/trunk/wicket/numberguess/pom.xml 2009-09-28 21:46:57 UTC (rev 3795) @@ -21,6 +21,11 @@ <artifactId>jsr299-api</artifactId> <scope>provided</scope> </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </dependency> <dependency> <groupId>org.jboss.webbeans</groupId> @@ -36,6 +41,11 @@ <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> </dependency> + <dependency> + <groupId>org.jboss.webbeans.servlet</groupId> + <artifactId>webbeans-servlet</artifactId> + <scope>runtime</scope> + </dependency> <!-- JETTY DEPENDENCIES FOR IN IDE TESTING --> Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Game.java =================================================================== --- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Game.java 2009-09-28 21:44:25 UTC (rev 3794) +++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Game.java 2009-09-28 21:46:57 UTC (rev 3795) @@ -6,11 +6,9 @@ import javax.annotation.PostConstruct; import javax.enterprise.context.SessionScoped; import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Named; -import javax.inject.Obtains; +import javax.inject.Inject; import javax.naming.NamingException; -@Named @SessionScoped public class Game implements Serializable { @@ -19,13 +17,16 @@ private int guess; private int smallest; + @Inject @MaxNumber private int maxNumber; private int biggest; private int remainingGuesses; - @Obtains @Random Instance<Integer> randomNumber; + @Inject + @Random + Instance<Integer> randomNumber; public Game() throws NamingException {} @@ -74,6 +75,9 @@ } + @Inject + Generator generator; + @PostConstruct public void reset() { Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java =================================================================== --- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java 2009-09-28 21:44:25 UTC (rev 3794) +++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java 2009-09-28 21:46:57 UTC (rev 3795) @@ -7,6 +7,7 @@ import javax.enterprise.inject.Produces; + @ApplicationScoped public class Generator implements Serializable { Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java =================================================================== --- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java 2009-09-28 21:44:25 UTC (rev 3794) +++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java 2009-09-28 21:46:57 UTC (rev 3795) @@ -1,7 +1,9 @@ package org.jboss.webbeans.examples.wicket; -import javax.enterprise.inject.Current; +import java.io.Serializable; +import javax.inject.Inject; + import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxButton; @@ -16,7 +18,8 @@ private static final long serialVersionUID = 1L; - @Current Game game; + @Inject + Game game; public HomePage() { @@ -27,7 +30,8 @@ final Component prompt = new Label("prompt", new Model() { @Override - public Object getObject() { + public Serializable getObject() + { return "I'm thinking of a number between " + game.getSmallest() + " and " + game.getBiggest() + ". You have " + game.getRemainingGuesses() + " guesses."; } @@ -37,7 +41,8 @@ final Component guessLabel = new Label("guessLabel","Your Guess:"); form.add(guessLabel); final Component inputGuess = new TextField("inputGuess",new Model() { - public Object getObject() { + public Serializable getObject() + { return game.getGuess(); } public void setObject(Object object) { @@ -55,6 +60,12 @@ guessLabel.setVisible(false); inputGuess.setVisible(false); } + else if (game.getRemainingGuesses() == 0) { + info("Sorry, the answer was " + game.getNumber()); + setVisible(false); + guessLabel.setVisible(false); + inputGuess.setVisible(false); + } else if (game.getNumber() > game.getGuess()) info("Higher!"); else if (game.getNumber() < game.getGuess()) Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java =================================================================== --- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java 2009-09-28 21:44:25 UTC (rev 3794) +++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java 2009-09-28 21:46:57 UTC (rev 3795) @@ -11,12 +11,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; + @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier public @interface MaxNumber { Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Random.java =================================================================== --- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Random.java 2009-09-28 21:44:25 UTC (rev 3794) +++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Random.java 2009-09-28 21:46:57 UTC (rev 3795) @@ -11,12 +11,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; + @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier public @interface Random { Copied: examples/trunk/wicket/numberguess/src/main/resources/META-INF/beans.xml (from rev 3781, examples/trunk/wicket/numberguess/src/main/resources/beans.xml) =================================================================== Deleted: examples/trunk/wicket/numberguess/src/main/resources/beans.xml ===================================================================