[webbeans-commits] Webbeans SVN: r3730 - examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-09-22 11:00:40 -0400 (Tue, 22 Sep 2009)
New Revision: 3730

Modified:
   examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java
   examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java
   examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java
   examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java
Log:
Fix build errors, example not working

Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java	2009-09-22 14:52:13 UTC (rev 3729)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java	2009-09-22 15:00:40 UTC (rev 3730)
@@ -20,7 +20,7 @@
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
 
 /**
  * This class contains the pure logic of the Number Guess game.
@@ -32,20 +32,22 @@
  * @author Peter Royle
  */
 @ApplicationScoped
-public class Game
-    implements Serializable
+public class Game implements Serializable
 {
     public static final int MAX_NUM_GUESSES = 10;
     
     private Integer number;
     private int guess = 0;
     private int smallest = 0;
-    @MaxNumber private int maxNumber;
+    
+    @Inject @MaxNumber 
+    private int maxNumber;
+    
     private int biggest;
     private int remainingGuesses = MAX_NUM_GUESSES;
     private boolean validNumberRange = true;
 
-    @Current Generator rndGenerator;
+    @Inject Generator rndGenerator;
 
     public Game()
     {

Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java	2009-09-22 14:52:13 UTC (rev 3729)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java	2009-09-22 15:00:40 UTC (rev 3730)
@@ -22,8 +22,7 @@
 import javax.enterprise.inject.Produces;
 
 @ApplicationScoped
-public class Generator
-    implements Serializable
+public class Generator implements Serializable
 {
     private static final long serialVersionUID = -7213673465118041882L;
     private java.util.Random random = new java.util.Random( System.currentTimeMillis() );

Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java	2009-09-22 14:52:13 UTC (rev 3729)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java	2009-09-22 15:00:40 UTC (rev 3730)
@@ -16,7 +16,7 @@
  */
 package org.jboss.webbeans.environment.se.example.numberguess;
 
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
 
 /**
  * This class generates on demand appropriate messages depending on the current
@@ -25,7 +25,7 @@
  */
 public class MessageGenerator
 {
-    @Current Game game;
+    @Inject Game game;
 
     public String getChallengeMessage()
     {

Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java	2009-09-22 14:52:13 UTC (rev 3729)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java	2009-09-22 15:00:40 UTC (rev 3730)
@@ -19,24 +19,21 @@
 import java.awt.CardLayout;
 
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Current;
 import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.inject.Inject;
 
 /**
  * Swing-based number guess example, main application frame.
  * @author Peter Royle
  */
-public class NumberGuessFrame
-    extends javax.swing.JFrame
+public class NumberGuessFrame extends javax.swing.JFrame
 {
-    private @Current Game game;
-    private @Current MessageGenerator msgGenerator;
+    @Inject
+    private Game game;
+    
+    @Inject
+    private MessageGenerator msgGenerator;
 
-    /** Creates new form NumberGuessFrame */
-    public NumberGuessFrame()
-    {
-    }
-
     public void start( @Observes AfterDeploymentValidation event )
     {
         java.awt.EventQueue.invokeLater( new Runnable()