svn commit: r655974 - in /wicket: branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java

[marrink]

Author: marrink
Date: Tue May 13 11:57:08 2008
New Revision: 655974

URL: http://svn.apache.org/viewvc?rev=655974&view=rev
Log:
RESOLVED - issue WICKET-1626: Typo in 
src/main/java/org/apache/wicket/protocol/http/WebApplication.java 
https://issues.apache.org/jira/browse/WICKET-1626

Modified:
    
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java

Modified: 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?rev=655974&r1=655973&r2=655974&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
 (original)
+++ 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
 Tue May 13 11:57:08 2008
@@ -147,7 +147,7 @@
        }
 
        /**
-        * Gets an init parameter from the filter's context.
+        * Gets an init parameter of the filter, or null if the parameter does 
not exist.
         * 
         * @param key
         *            the key to search for
@@ -159,9 +159,10 @@
                {
                        return 
wicketFilter.getFilterConfig().getInitParameter(key);
                }
-               throw new IllegalStateException("servletContext is not set yet. 
Any code in your"
-                       + " Application object that uses the 
wicketServlet/Filter instance should be put"
-                       + " in the init() method instead of your constructor");
+               throw new IllegalStateException("init parameter '" + key +
+                       "' is not set yet. Any code in your" +
+                       " Application object that uses the wicketServlet/Filter 
instance should be put" +
+                       " in the init() method instead of your constructor");
        }
 
        /**
@@ -182,7 +183,7 @@
 
        /**
         * Gets the servlet context for this application. Use this to get 
references to absolute paths,
-        * global web.xml parameters (<context-param>), etc.
+        * global web.xml parameters (&lt;context-param&gt;), etc.
         * 
         * @return The servlet context for this application
         */
@@ -509,7 +510,7 @@
                 * namespaced param. see WICKET-1317
                 */
 
-               // If no system parameter check filter/servert initparam and 
context param
+               // If no system parameter check filter/servlet <init-param> and 
<context-param>
                if (result == null)
                {
                        result = getInitParameter("wicket." + 
Application.CONFIGURATION);

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?rev=655974&r1=655973&r2=655974&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
 Tue May 13 11:57:08 2008
@@ -167,7 +167,7 @@
        }
 
        /**
-        * Gets an init parameter from the filter's context.
+        * Gets an init parameter of the filter, or null if the parameter does 
not exist.
         * 
         * @param key
         *            the key to search for
@@ -179,9 +179,10 @@
                {
                        return 
wicketFilter.getFilterConfig().getInitParameter(key);
                }
-               throw new IllegalStateException("servletContext is not set yet. 
Any code in your"
-                       + " Application object that uses the 
wicketServlet/Filter instance should be put"
-                       + " in the init() method instead of your constructor");
+               throw new IllegalStateException("init parameter '" + key +
+                       "' is not set yet. Any code in your" +
+                       " Application object that uses the wicketServlet/Filter 
instance should be put" +
+                       " in the init() method instead of your constructor");
        }
 
        /**
@@ -202,7 +203,7 @@
 
        /**
         * Gets the servlet context for this application. Use this to get 
references to absolute paths,
-        * global web.xml parameters (<context-param>), etc.
+        * global web.xml parameters (&lt;context-param&gt;), etc.
         * 
         * @return The servlet context for this application
         */
@@ -555,7 +556,7 @@
                 * namespaced param. see WICKET-1317
                 */
 
-               // If no system parameter check filter/servert initparam and 
context param
+               // If no system parameter check filter/servlet <init-param> and 
<context-param>
                if (result == null)
                {
                        result = getInitParameter("wicket." + 
Application.CONFIGURATION);