svn commit: r1733948 - in /openmeetings/application: branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/

[solomax]

Author: solomax
Date: Mon Mar  7 17:46:08 2016
New Revision: 1733948

URL: http://svn.apache.org/viewvc?rev=1733948&view=rev
Log:
[OPENMEETINGS-1341] signin dialog is displayed on close of forget password and 
register dialogs

Modified:
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
    
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
    
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java

Modified: 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1733948&r1=1733947&r2=1733948&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
 Mon Mar  7 17:46:08 2016
@@ -160,11 +160,12 @@ public class ForgetPasswordDialog extend
                return true;
        }
        
-       public void onClose(AjaxRequestTarget target, DialogButton button) {
+       @Override
+       public void onClose(IPartialPageRequestHandler handler, DialogButton 
button) {
                if (send.equals(button)){
-                       confirmDialog.open(target);
+                       confirmDialog.open(handler);
                } else {
-                       s.open(target);
+                       s.open(handler);
                }
        }
 

Modified: 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1733948&r1=1733947&r2=1733948&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
 Mon Mar  7 17:46:08 2016
@@ -169,9 +169,10 @@ public class RegisterDialog extends Abst
                target.add(form);
        }
 
-       public void onClose(AjaxRequestTarget target, DialogButton button) {
+       @Override
+       public void onClose(IPartialPageRequestHandler handler, DialogButton 
button) {
                if (!registerBtn.equals(button)) {
-                       s.open(target);
+                       s.open(handler);
                }
        }
 

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1733948&r1=1733947&r2=1733948&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
 Mon Mar  7 17:46:08 2016
@@ -160,11 +160,12 @@ public class ForgetPasswordDialog extend
                return true;
        }
        
-       public void onClose(AjaxRequestTarget target, DialogButton button) {
+       @Override
+       public void onClose(IPartialPageRequestHandler handler, DialogButton 
button) {
                if (send.equals(button)){
-                       confirmDialog.open(target);
+                       confirmDialog.open(handler);
                } else {
-                       s.open(target);
+                       s.open(handler);
                }
        }
 

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1733948&r1=1733947&r2=1733948&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
 Mon Mar  7 17:46:08 2016
@@ -169,9 +169,10 @@ public class RegisterDialog extends Abst
                target.add(form);
        }
 
-       public void onClose(AjaxRequestTarget target, DialogButton button) {
+       @Override
+       public void onClose(IPartialPageRequestHandler handler, DialogButton 
button) {
                if (!registerBtn.equals(button)) {
-                       s.open(target);
+                       s.open(handler);
                }
        }