svn commit: r358083 - /incubator/roller/trunk/src/org/roller/presentation/velocity/MathCommentAuthenticator.java

[agilliland]

Author: agilliland
Date: Tue Dec 20 11:59:56 2005
New Revision: 358083

URL: http://svn.apache.org/viewcvs?rev=358083&view=rev
Log:
code reformatting.


Modified:
    
incubator/roller/trunk/src/org/roller/presentation/velocity/MathCommentAuthenticator.java

Modified: 
incubator/roller/trunk/src/org/roller/presentation/velocity/MathCommentAuthenticator.java
URL: 
http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/velocity/MathCommentAuthenticator.java?rev=358083&r1=358082&r2=358083&view=diff
==============================================================================
--- 
incubator/roller/trunk/src/org/roller/presentation/velocity/MathCommentAuthenticator.java
 (original)
+++ 
incubator/roller/trunk/src/org/roller/presentation/velocity/MathCommentAuthenticator.java
 Tue Dec 20 11:59:56 2005
@@ -1,37 +1,35 @@
 package org.roller.presentation.velocity;
 
 import java.util.ResourceBundle;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.velocity.context.Context;
 import org.roller.pojos.CommentData;
 
+
 /**
  * Asks the commenter to answer a simple math question.
+ *
  * @author David M Johnson
  */
-public class MathCommentAuthenticator implements CommentAuthenticator 
-{   
-    private transient ResourceBundle bundle = 
-        ResourceBundle.getBundle("ApplicationResources");
+public class MathCommentAuthenticator implements CommentAuthenticator {
+    
+    private transient ResourceBundle bundle =
+            ResourceBundle.getBundle("ApplicationResources");
     
-    private static Log mLogger =
-        LogFactory.getFactory().getInstance(MathCommentAuthenticator.class);
+    private static Log mLogger = 
LogFactory.getLog(MathCommentAuthenticator.class);
+    
+    public String getHtml(Context context, 
+                    HttpServletRequest request, 
+                    HttpServletResponse response) {
 
-    public String getHtml(
-                        Context context,
-                        HttpServletRequest request, 
-                        HttpServletResponse response)
-    {
         String answer = "";
+        
         HttpSession session = request.getSession();
-        if (session.getAttribute("mathAnswer") == null)
-        {
+        if (session.getAttribute("mathAnswer") == null) {
             // starting a new test
             int value1 = (int)(Math.random()*10.0);
             int value2 = (int)(Math.random()*100.0);
@@ -39,19 +37,15 @@
             session.setAttribute("mathValue1", new Integer(value1));
             session.setAttribute("mathValue2", new Integer(value2));
             session.setAttribute("mathAnswer", new Integer(sum));
-        }
-        else
-        {
+        } else {
             // preserve user's answer
             answer = request.getParameter("answer");
             answer = (answer == null) ? "" : answer;
         }
-
+        
         // pull existing values out of session
-        Integer value1o = 
-            (Integer)request.getSession().getAttribute("mathValue1");
-        Integer value2o = 
-            (Integer)request.getSession().getAttribute("mathValue2");
+        Integer value1o = 
(Integer)request.getSession().getAttribute("mathValue1");
+        Integer value2o = 
(Integer)request.getSession().getAttribute("mathValue2");
         
         StringBuffer sb = new StringBuffer();
         
@@ -69,34 +63,29 @@
         return sb.toString();
     }
     
-    public boolean authenticate(
-                        CommentData comment,
-                        HttpServletRequest request) 
-    {
+    public boolean authenticate(CommentData comment, HttpServletRequest 
request) {
+        
         boolean ret = false;
+        
         String answerString = request.getParameter("answer");
-        if (answerString != null || answerString.trim().length()==0)
-        {
-            try 
-            {   
+        if (answerString != null || answerString.trim().length()==0) {
+            try {
                 int answer = Integer.parseInt(answerString);
-                Integer sum = 
-                    (Integer)request.getSession().getAttribute("mathAnswer");  
          
-                if (answer == sum.intValue()) 
-                {
-                    ret = true;           
+                Integer sum =
+                        
(Integer)request.getSession().getAttribute("mathAnswer");
+                if (answer == sum.intValue()) {
+                    ret = true;
                     request.getSession().removeAttribute("mathAnswer");
                     request.getSession().removeAttribute("mathValue1");
                     request.getSession().removeAttribute("mathValue2");
                 }
-            }
-            catch (NumberFormatException ignored) {}
-            catch (Exception e) 
-            {
+            } catch (NumberFormatException ignored) {} catch (Exception e) {
                 mLogger.error(e);
             }
         }
+        
         return ret;
     }
+    
 }