You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by ma...@apache.org on 2006/01/21 18:55:59 UTC

svn commit: r371094 - /jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/BrowserSnifferTool.java

Author: marino
Date: Sat Jan 21 09:55:45 2006
New Revision: 371094

URL: http://svn.apache.org/viewcvs?rev=371094&view=rev
Log:
added gecko major and minor version fields.

Modified:
    jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/BrowserSnifferTool.java

Modified: jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/BrowserSnifferTool.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/BrowserSnifferTool.java?rev=371094&r1=371093&r2=371094&view=diff
==============================================================================
--- jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/BrowserSnifferTool.java (original)
+++ jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/BrowserSnifferTool.java Sat Jan 21 09:55:45 2006
@@ -62,6 +62,8 @@
     private int majorVersion = -1;
     private int minorVersion = -1;
     private String geckoVersion = null;
+    private int geckoMajorVersion = -1;
+    private int geckoMinorVersion = -1;
 
     public BrowserSnifferTool()
     {
@@ -119,6 +121,18 @@
         return geckoVersion;
     }
 
+    public int getGeckoMajorVersion()
+    {
+        parseVersion();
+        return geckoMajorVersion;
+    }
+
+    public int getGeckoMinorVersion()
+    {
+        parseVersion();
+        return geckoMinorVersion;
+    }
+
     /* Browsers */
 
     public boolean getGecko()
@@ -997,12 +1011,21 @@
             /* gecko engine version */
             if(getGecko())
             {
-                Matcher g = Pattern.compile(
-                        "\\([^)]*rv:(.*?)\\)"
+            	Matcher g = Pattern.compile(
+                        "\\([^)]*rv:(([\\d]*)\\.([\\d]*).*?)\\)"
                         ).matcher(userAgent);
                 if(g.find())
                 {
                     geckoVersion = g.group(1);
+                    try
+                    {
+                    	geckoMajorVersion = Integer.parseInt(g.group(2));
+                    	String minor = g.group(3);
+                        if(minor.startsWith("0"))geckoMinorVersion = 0;
+                        else geckoMinorVersion = Integer.parseInt(minor);
+                    }
+                    catch(NumberFormatException nfe)
+                    {}
                 }
             }
         }
@@ -1011,4 +1034,6 @@
             // where should I log ?!
         }
     }
+    
+    
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org