svn commit: r769389 - /wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java

[jcompagner]

Author: jcompagner
Date: Tue Apr 28 13:27:30 2009
New Revision: 769389

URL: http://svn.apache.org/viewvc?rev=769389&view=rev
Log:
backport of WebClientInfo does not set browerMajorVersion for IE8
Issue: WICKET-2215

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

Modified: 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.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/request/WebClientInfo.java?rev=769389&r1=769388&r2=769389&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
 (original)
+++ 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
 Tue Apr 28 13:27:30 2009
@@ -16,6 +16,9 @@
  */
 package org.apache.wicket.protocol.http.request;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.wicket.protocol.http.ClientProperties;
@@ -183,13 +186,10 @@
                else if (browserInternetExplorer)
                {
                        properties.setBrowserInternetExplorer(true);
-                       if (userAgent.indexOf("msie 6.") != -1)
-                       {
-                               majorVersion = 6;
-                       }
-                       else if (userAgent.indexOf("msie 7.") != -1)
+                       Matcher matcher = Pattern.compile("msie 
(\\d+)").matcher(userAgent);
+                       if (matcher.find())
                        {
-                               majorVersion = 7;
+                               majorVersion = 
Integer.parseInt(matcher.group(1));
                        }
                }