svn commit: r569889 - in /wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput: FormInput.java FormInputApplication.java

[ehillenius]

Author: ehillenius
Date: Sun Aug 26 14:40:12 2007
New Revision: 569889

URL: http://svn.apache.org/viewvc?rev=569889&view=rev
Log:
set default locale if not in list of available locales

Modified:
    
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
    
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java

Modified: 
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java?rev=569889&r1=569888&r2=569889&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
 (original)
+++ 
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
 Sun Aug 26 14:40:12 2007
@@ -258,7 +258,7 @@
                 */
                public LocaleDropDownChoice(String id)
                {
-                       super(id, LOCALES, new LocaleChoiceRenderer());
+                       super(id, FormInputApplication.LOCALES, new 
LocaleChoiceRenderer());
 
                        // set the model that gets the current locale, and that 
is used for
                        // updating the current locale to property 'locale' of 
FormInput
@@ -289,12 +289,6 @@
                        return true;
                }
        }
-
-       /** Relevant locales wrapped in a list. */
-       private static final List LOCALES = Arrays.asList(new Locale[] { 
Locale.ENGLISH,
-                       new Locale("nl", "NL"), Locale.GERMAN, 
Locale.SIMPLIFIED_CHINESE, Locale.JAPANESE,
-                       new Locale("pt", "BR"), new Locale("fa", "IR"), new 
Locale("da", "DK"),
-                       new Locale("th", "TH"), new Locale("ru") });
 
        /** available sites for the multiple select. */
        private static final List SITES = Arrays.asList(new String[] { "The 
Server Side", "Java Lobby",

Modified: 
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java?rev=569889&r1=569888&r2=569889&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java
 (original)
+++ 
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java
 Sun Aug 26 14:40:12 2007
@@ -17,11 +17,17 @@
 package org.apache.wicket.examples.forminput;
 
 import java.awt.Font;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Locale;
 
+import org.apache.wicket.Request;
+import org.apache.wicket.Response;
+import org.apache.wicket.Session;
 import org.apache.wicket.SharedResources;
 import org.apache.wicket.examples.WicketExampleApplication;
 import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource;
+import org.apache.wicket.protocol.http.WebSession;
 
 
 /**
@@ -31,6 +37,12 @@
  */
 public class FormInputApplication extends WicketExampleApplication
 {
+       /** Relevant locales wrapped in a list. */
+       public static final List LOCALES = Arrays.asList(new Locale[] { 
Locale.ENGLISH,
+                       new Locale("nl", "NL"), Locale.GERMAN, 
Locale.SIMPLIFIED_CHINESE, Locale.JAPANESE,
+                       new Locale("pt", "BR"), new Locale("fa", "IR"), new 
Locale("da", "DK"),
+                       new Locale("th", "TH"), new Locale("ru") });
+
        /**
         * Constructor.
         */
@@ -47,6 +59,22 @@
        }
 
        /**
+        * @see 
org.apache.wicket.protocol.http.WebApplication#newSession(org.apache.wicket.Request,
+        *      org.apache.wicket.Response)
+        */
+       @Override
+       public Session newSession(Request request, Response response)
+       {
+               WebSession session = new WebSession(request);
+               Locale locale = session.getLocale();
+               if (!LOCALES.contains(locale))
+               {
+                       session.setLocale(Locale.ENGLISH);
+               }
+               return session;
+       }
+
+       /**
         * @see org.apache.wicket.protocol.http.WebApplication#init()
         */
        protected void init()
@@ -62,7 +90,7 @@
                SharedResources sharedResources = getSharedResources();
                sharedResources.add("save", Locale.SIMPLIFIED_CHINESE, imgSave);
                sharedResources.add("reset", Locale.SIMPLIFIED_CHINESE, 
imgReset);
-               
+
                // Japanese buttons
                Font fontJa = new Font("Serif", Font.BOLD, 16);
                DefaultButtonImageResource imgSaveJa = new 
DefaultButtonImageResource("\u4fdd\u5b58");