Make the bean Serializable so I can use the example to test/demo session persistence...

Add required getters/setters
Indent using 4 spaces
Fix FindBugs warning

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@964816 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/webapps/examples/WEB-INF/classes/num/NumberGuessBean.java b/webapps/examples/WEB-INF/classes/num/NumberGuessBean.java
index 5900ad8..1d3b1af 100644 (file)
--- a/webapps/examples/WEB-INF/classes/num/NumberGuessBean.java
+++ b/webapps/examples/WEB-INF/classes/num/NumberGuessBean.java
@@ -1,19 +1,19 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 /*
  * Originally written by Jason Hunter, http://www.servlets.com.
@@ -21,59 +21,79 @@
 
 package num;
 
-import java.util.*;
+import java.io.Serializable;
+import java.util.Random;
+
+public class NumberGuessBean implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
-public class NumberGuessBean {
+    private int answer;
+    private String hint;
+    private int numGuesses;
+    private boolean success;
+    private Random random = new Random();
 
-  int answer;
-  boolean success;
-  String hint;
-  int numGuesses;
+    public NumberGuessBean() {
+        reset();
+    }
 
-  public NumberGuessBean() {
-    reset();
-  }
+    public int getAnswer() {
+        return answer;
+    }
 
-  public void setGuess(String guess) {
-    numGuesses++;
+    public void setAnswer(int answer) {
+        this.answer = answer;
+    }
 
-    int g;
-    try {
-      g = Integer.parseInt(guess);
+    public String getHint() {
+        return "" + hint;
     }
-    catch (NumberFormatException e) {
-      g = -1;
+
+    public void setHint(String hint) {
+        this.hint = hint;
     }
 
-    if (g == answer) {
-      success = true;
+    public void setNumGuesses(int numGuesses) {
+        this.numGuesses = numGuesses;
     }
-    else if (g == -1) {
-      hint = "a number next time";
+
+    public int getNumGuesses() {
+        return numGuesses;
     }
-    else if (g < answer) {
-      hint = "higher";
+
+    public boolean getSuccess() {
+        return success;
     }
-    else if (g > answer) {
-      hint = "lower";
+
+    public void setSuccess(boolean success) {
+        this.success = success;
     }
-  }
 
-  public boolean getSuccess() {
-    return success;
-  }
+    public void setGuess(String guess) {
+        numGuesses++;
 
-  public String getHint() {
-    return "" + hint;
-  }
+        int g;
+        try {
+            g = Integer.parseInt(guess);
+        } catch (NumberFormatException e) {
+            g = -1;
+        }
 
-  public int getNumGuesses() {
-    return numGuesses;
-  }
+        if (g == answer) {
+            success = true;
+        } else if (g == -1) {
+            hint = "a number next time";
+        } else if (g < answer) {
+            hint = "higher";
+        } else if (g > answer) {
+            hint = "lower";
+        }
+    }
 
-  public void reset() {
-    answer = Math.abs(new Random().nextInt() % 100) + 1;
-    success = false;
-    numGuesses = 0;
-  }
+    public void reset() {
+        answer = Math.abs(random.nextInt() % 100) + 1;
+        success = false;
+        numGuesses = 0;
+    }
 }