svn commit: r1508814 - in /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web: app/WebSession.java pages/auth/RegisterDialog.java pages/auth/SignInDialog.java

[vdegtyarev]

Author: vdegtyarev
Date: Wed Jul 31 11:35:56 2013
New Revision: 1508814

URL: http://svn.apache.org/r1508814
Log:
OPENMEETINGS-722 minor changes.

Modified:
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java?rev=1508814&r1=1508813&r2=1508814&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
 Wed Jul 31 11:35:56 2013
@@ -248,13 +248,13 @@ public class WebSession extends Abstract
                return states.get(0);
        }
 
-       public OmTimeZone getOmTimeZoneByBrowserLocale(int offset){
+       public OmTimeZone getOmTimeZoneByBrowserLocale(double offset){
                TimeZone tz = 
Calendar.getInstance(getBrowserLocale()).getTimeZone();
                OmTimeZone omTZ = 
getBean(OmTimeZoneDao.class).getOmTimeZoneByIcal(tz.getID());
                if (omTZ == null){
                        List<OmTimeZone> omTimeZones = 
getBean(OmTimeZoneDao.class).getOmTimeZones();
                        for (OmTimeZone timeZone : omTimeZones){
-                               long tzOffset = 
TimeZone.getTimeZone(timeZone.getIcal()).getRawOffset() / 3600000;
+                               double tzOffset = 
TimeZone.getTimeZone(timeZone.getIcal()).getRawOffset() / 3600000;
                                if (tzOffset ==  offset){
                                        return timeZone;  
                                }

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1508814&r1=1508813&r2=1508814&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
 Wed Jul 31 11:35:56 2013
@@ -96,7 +96,7 @@ public class RegisterDialog extends Abst
                this.s = s;
        }
 
-       public void setBrowserTZOffset(AjaxRequestTarget target, int 
browserTZOffset) {
+       public void setBrowserTZOffset(AjaxRequestTarget target, double 
browserTZOffset) {
                
tzModel.setObject(WebSession.get().getOmTimeZoneByBrowserLocale(browserTZOffset));
                target.add(tzDropDown);
        }

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1508814&r1=1508813&r2=1508814&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
 Wed Jul 31 11:35:56 2013
@@ -75,12 +75,12 @@ public class SignInDialog extends Abstra
     private ForgetPasswordDialog f;
     private LdapConfig domain;
     private String ldapConfigFileName;
-       private HiddenField<Integer> browserTZOffset;
+       private HiddenField<Double> browserTZOffset;
        
        public SignInDialog(String id) {
                super(id, WebSession.getString(108));
                add(form = new SignInForm("signin"));
-               browserTZOffset = new HiddenField<Integer>("tzOffset", 
Model.of(new Integer(0)));
+               browserTZOffset = new HiddenField<Double>("tzOffset", 
Model.of(new Double(0)));
                add(browserTZOffset);
 
                // This code is required to detect time zone offset
@@ -96,7 +96,9 @@ public class SignInDialog extends Abstra
                        @Override
                        protected void respond(AjaxRequestTarget target) {
                                StringValue offset = 
getRequestCycle().getRequest().getRequestParameters().getParameterValue("tzOffset");
-                               
browserTZOffset.setModelObject(offset.toInteger()); 
+                               try {
+                                       
browserTZOffset.setModelObject(Double.parseDouble(offset.toString()));
+                               } catch (NumberFormatException ex) { }
                        }
                });
        }