This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 66e6779 [OPENMEETINGS-1872] wicketstuff and wicket-jquery-ui are
updated
66e6779 is described below
commit 66e67790fddbf208b2670a96becf18f250dc9684
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Wed May 23 09:03:24 2018 +0700
[OPENMEETINGS-1872] wicketstuff and wicket-jquery-ui are updated
---
.../apache/openmeetings/web/admin/labels/AddLanguageDialog.java | 4 ++--
.../org/apache/openmeetings/web/admin/users/PasswordDialog.java | 4 ++--
.../org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java | 4 ++--
.../java/org/apache/openmeetings/web/common/InvitationDialog.java | 4 ++--
.../main/java/org/apache/openmeetings/web/common/NameDialog.java | 8 ++++----
.../apache/openmeetings/web/pages/InvitationPasswordDialog.java | 8 ++++----
.../apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java | 8 ++++----
.../org/apache/openmeetings/web/pages/auth/RegisterDialog.java | 8 ++++----
.../apache/openmeetings/web/pages/auth/ResetPasswordDialog.java | 8 ++++----
.../java/org/apache/openmeetings/web/pages/auth/SignInDialog.java | 8 ++++----
.../java/org/apache/openmeetings/web/room/NicknameDialog.java | 4 ++--
.../org/apache/openmeetings/web/room/menu/SipDialerDialog.java | 8 ++++----
.../org/apache/openmeetings/web/room/poll/CreatePollDialog.java | 4 ++--
.../java/org/apache/openmeetings/web/room/poll/VoteDialog.java | 4 ++--
.../org/apache/openmeetings/web/room/sidebar/RoomSidebar.java | 3 ++-
.../org/apache/openmeetings/web/room/sidebar/UploadDialog.java | 6 +++---
.../main/java/org/apache/openmeetings/web/room/wb/WbPanel.java | 3 ++-
.../org/apache/openmeetings/web/user/InviteUserMessageDialog.java | 4 ++--
.../main/java/org/apache/openmeetings/web/user/MessageDialog.java | 4 ++--
.../apache/openmeetings/web/user/calendar/AppointmentDialog.java | 4 ++--
.../org/apache/openmeetings/web/user/calendar/CalendarDialog.java | 4 ++--
.../openmeetings/web/user/profile/ChangePasswordDialog.java | 4 ++--
.../openmeetings/web/user/profile/MessagesContactsPanel.java | 5 +++--
.../org/apache/openmeetings/web/user/record/RecordingsPanel.java | 4 +++-
pom.xml | 4 ++--
25 files changed, 67 insertions(+), 62 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java
index 69fed3d..7afd892 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java
@@ -103,12 +103,12 @@ public class AddLanguageDialog extends
AbstractFormDialog<String> {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
target.add(feedback);
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
try {
LabelDao.add(Locale.forLanguageTag(iso.getModelObject()));
langPanel.getLangForm().updateLanguages(target);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
index be11434..c5a6edb 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
@@ -79,7 +79,7 @@ public class PasswordDialog extends
AbstractFormDialog<String> {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
target.add(feedback);
}
@@ -101,7 +101,7 @@ public class PasswordDialog extends
AbstractFormDialog<String> {
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
final UserForm uf = getUserForm();
if (uf.isAdminPassRequired()) {
final UserDao dao = getBean(UserDao.class);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java
index e7bf7b9..a7be4b1 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java
@@ -183,7 +183,7 @@ public abstract class ConfirmableAjaxBorder extends Border {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton
btn) {
super.close(target, null); // closes the dialog on
error.
if (errorHandler != null) {
errorHandler.accept(target);
@@ -191,7 +191,7 @@ public abstract class ConfirmableAjaxBorder extends Border {
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton
btn) {
if (submitHandler != null) {
submitHandler.accept(target);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java
index 7d2a626..c3185ed 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java
@@ -84,7 +84,7 @@ public class InvitationDialog extends
AbstractFormDialog<Invitation> {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
form.onError(target);
}
@@ -98,7 +98,7 @@ public class InvitationDialog extends
AbstractFormDialog<Invitation> {
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
//designed to be empty because of multiple submit buttons
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java
index 97396df..c85e29a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java
@@ -66,12 +66,12 @@ public abstract class NameDialog extends
AbstractFormDialog<String> {
@Override
protected void
onSubmit(AjaxRequestTarget target) {
-
NameDialog.this.onSubmit(target);
+
NameDialog.this.onSubmit(target, add);
}
@Override
protected void
onError(AjaxRequestTarget target) {
- NameDialog.this.onError(target);
+ NameDialog.this.onError(target,
add);
}
});
title.setLabel(Model.of(getLabelStr()));
@@ -87,7 +87,7 @@ public abstract class NameDialog extends
AbstractFormDialog<String> {
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
close(target, getSubmitButton());
}
@@ -107,7 +107,7 @@ public abstract class NameDialog extends
AbstractFormDialog<String> {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
target.add(feedback);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
index 55a687b..8b3be39 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
@@ -68,13 +68,13 @@ public class InvitationPasswordDialog extends
NonClosableDialog<Invitation> {
@Override
protected void onSubmit(AjaxRequestTarget target) {
- InvitationPasswordDialog.this.onSubmit(target);
+ InvitationPasswordDialog.this.onSubmit(target,
check);
InvitationPasswordDialog.this.close(target,
null);
}
@Override
protected void onError(AjaxRequestTarget target) {
- InvitationPasswordDialog.this.onError(target);
+ InvitationPasswordDialog.this.onError(target,
check);
}
};
form.add(ab);
@@ -123,12 +123,12 @@ public class InvitationPasswordDialog extends
NonClosableDialog<Invitation> {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
target.add(feedback);
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
comp.update(target);
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
index 0441e68..efe9d05 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
@@ -98,12 +98,12 @@ public class ForgetPasswordDialog extends
AbstractFormDialog<String> {
@Override
protected void onSubmit(AjaxRequestTarget
target) {
-
ForgetPasswordDialog.this.onSubmit(target);
+
ForgetPasswordDialog.this.onSubmit(target, send);
}
@Override
protected void onError(AjaxRequestTarget
target) {
-
ForgetPasswordDialog.this.onError(target);
+
ForgetPasswordDialog.this.onError(target, send);
}
});
updateLabel(null);
@@ -210,12 +210,12 @@ public class ForgetPasswordDialog extends
AbstractFormDialog<String> {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
target.add(feedback);
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
String nm = name.getModelObject();
Type type = rg.getModelObject();
resetUser(type == Type.email ? nm : "", type == Type.login ? nm
: "");
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
index eda396b..872c278 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
@@ -182,12 +182,12 @@ public class RegisterDialog extends
NonClosableDialog<String> {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
target.add(feedback);
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
try {
getBean(IUserManager.class).registerUser(login,
password, lastName
, firstName, email, country, lang,
tzModel.getObject());
@@ -252,12 +252,12 @@ public class RegisterDialog extends
NonClosableDialog<String> {
@Override
protected void onSubmit(AjaxRequestTarget
target) {
- RegisterDialog.this.onSubmit(target);
+ RegisterDialog.this.onSubmit(target,
registerBtn);
}
@Override
protected void onError(AjaxRequestTarget
target) {
- RegisterDialog.this.onError(target);
+ RegisterDialog.this.onError(target,
registerBtn);
}
});
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
index 42416b4..5fe2ad3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
@@ -97,12 +97,12 @@ public class ResetPasswordDialog extends
NonClosableDialog<String> {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
target.add(feedback);
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
try {
getBean(UserDao.class).resetPassword(user,
password.getConvertedInput());
} catch (Exception e) {
@@ -145,12 +145,12 @@ public class ResetPasswordDialog extends
NonClosableDialog<String> {
@Override
protected void onSubmit(AjaxRequestTarget
target) {
-
ResetPasswordDialog.this.onSubmit(target);
+
ResetPasswordDialog.this.onSubmit(target, resetBtn);
}
@Override
protected void onError(AjaxRequestTarget
target) {
-
ResetPasswordDialog.this.onError(target);
+
ResetPasswordDialog.this.onError(target, resetBtn);
}
});
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index e512e77..b757cd0 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -177,12 +177,12 @@ public class SignInDialog extends
NonClosableDialog<String> {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
shake(target);
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
if (domain.getAddDomainToUserName()) {
login = login + "@" + domain.getDomain();
}
@@ -245,12 +245,12 @@ public class SignInDialog extends
NonClosableDialog<String> {
@Override
protected void onSubmit(AjaxRequestTarget
target) {
- SignInDialog.this.onSubmit(target);
+ SignInDialog.this.onSubmit(target,
loginBtn);
}
@Override
protected void onError(AjaxRequestTarget
target) {
- SignInDialog.this.onError(target);
+ SignInDialog.this.onError(target,
loginBtn);
}
};
add(ab);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
index 5d81981..566db07 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
@@ -104,12 +104,12 @@ public class NicknameDialog extends
NonClosableDialog<User> {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
target.add(feedback);
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
final User u = form.getModelObject();
final Client c = room.getClient();
c.getUser().setFirstname(u.getFirstname()).setLastname(u.getLastname());
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
index 80fc131..00edb63 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
@@ -53,12 +53,12 @@ public class SipDialerDialog extends
AbstractFormDialog<String> {
@Override
protected void onSubmit(AjaxRequestTarget target) {
- SipDialerDialog.this.onSubmit(target);
+ SipDialerDialog.this.onSubmit(target, call);
}
@Override
protected void onError(AjaxRequestTarget target) {
- SipDialerDialog.this.onError(target);
+ SipDialerDialog.this.onError(target, call);
}
};
form.setDefaultButton(ab);
@@ -94,12 +94,12 @@ public class SipDialerDialog extends
AbstractFormDialog<String> {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
target.add(feedback);
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
getBean(SipDao.class).joinToConfCall(number.getModelObject(),
room.getRoom());
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
index 19f233a..872ff98 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
@@ -95,12 +95,12 @@ public class CreatePollDialog extends
AbstractFormDialog<RoomPoll> {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
target.add(feedback);
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
PollDao dao = getBean(PollDao.class);
dao.close(roomId);
dao.update(form.getModelObject());
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
index a5d805b..cea6921 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
@@ -119,7 +119,7 @@ public class VoteDialog extends
AbstractFormDialog<RoomPollAnswer> {
* @see
com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog#onError(org.apache.wicket.ajax.AjaxRequestTarget)
*/
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
target.add(feedback);
}
@@ -127,7 +127,7 @@ public class VoteDialog extends
AbstractFormDialog<RoomPollAnswer> {
* @see
com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog#onSubmit(org.apache.wicket.ajax.AjaxRequestTarget)
*/
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
RoomPollAnswer a = form.getModelObject();
PollDao dao = getBean(PollDao.class);
Long roomId = a.getRoomPoll().getRoom().getId();
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index 32e90a7..c2f29fc 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -66,6 +66,7 @@ import org.slf4j.Logger;
import com.github.openjson.JSONObject;
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.JQueryUIBehavior;
+import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class RoomSidebar extends Panel {
private static final long serialVersionUID = 1L;
@@ -245,7 +246,7 @@ public class RoomSidebar extends Panel {
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target,
DialogButton btn) {
roomFiles.createFolder(target,
getModelObject());
}
};
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
index f176519..26db937 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
@@ -174,12 +174,12 @@ public class UploadDialog extends
AbstractFormDialog<String> {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
target.add(feedback);
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
List<FileUpload> ful = uploadField.getFileUploads();
if (ful != null) {
boolean clean = cleanWb.getModelObject();
@@ -223,7 +223,7 @@ public class UploadDialog extends
AbstractFormDialog<String> {
}
}
if (form.hasError()) {
- onError(target);
+ onError(target, null);
} else {
close(target, null);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index a819e0b..17c420e 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -92,6 +92,7 @@ import org.slf4j.Logger;
import com.github.openjson.JSONArray;
import com.github.openjson.JSONObject;
import com.github.openjson.JSONTokener;
+import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class WbPanel extends AbstractWbPanel {
private static final long serialVersionUID = 1L;
@@ -109,7 +110,7 @@ public class WbPanel extends AbstractWbPanel {
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton
btn) {
String res = saveWb(roomId, wb2save, getModelObject());
if (!Strings.isEmpty(res)) {
error("Unexpected error while saving WB: " +
res);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java
index 74b79c0..241ddd2 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java
@@ -83,12 +83,12 @@ public class InviteUserMessageDialog extends
AbstractFormDialog<String> {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
// no-op
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
// no-op
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
index cbf7b4b..d2fac04 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
@@ -186,12 +186,12 @@ public class MessageDialog extends
AbstractFormDialog<PrivateMessage> {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
target.add(feedback);
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
PrivateMessage m = getModelObject();
m.setInserted(new Date());
UserDao userDao = getBean(UserDao.class);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
index 81cec34..2f8b03d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
@@ -222,12 +222,12 @@ public class AppointmentDialog extends
AbstractFormDialog<Appointment> {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
target.add(feedback);
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
Appointment a = form.getModelObject();
a.setRoom(form.createRoom ? form.appRoom :
form.groom.getModelObject());
final List<MeetingMember> mms = a.getMeetingMembers() == null ?
new ArrayList<>() : a.getMeetingMembers();
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
index 4104c6d..f9b3b1d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
@@ -204,7 +204,7 @@ public class CalendarDialog extends
AbstractFormDialog<OmCalendar> {
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
switch (type) {
case UPDATE_CALENDAR:
OmCalendar c = form.getModelObject();
@@ -409,7 +409,7 @@ public class CalendarDialog extends
AbstractFormDialog<OmCalendar> {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
target.add(feedback);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
index ab1bd1a..2866490 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
@@ -115,12 +115,12 @@ public class ChangePasswordDialog extends
AbstractFormDialog<String> {
}
@Override
- protected void onError(AjaxRequestTarget target) {
+ protected void onError(AjaxRequestTarget target, DialogButton btn) {
target.add(feedback);
}
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
try {
getBean(UserDao.class).update(getBean(UserDao.class).get(getUserId()),
pass.getModelObject(), getUserId());
} catch (Exception e) {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
index c88c734..c216090 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
@@ -83,6 +83,7 @@ import org.apache.wicket.model.util.ListModel;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
import com.googlecode.wicket.jquery.core.Options;
import
com.googlecode.wicket.jquery.ui.plugins.fixedheadertable.FixedHeaderTableBehavior;
+import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class MessagesContactsPanel extends UserBasePanel {
private static final long serialVersionUID = 1L;
@@ -161,8 +162,8 @@ public class MessagesContactsPanel extends UserBasePanel {
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target) {
- super.onSubmit(target);
+ protected void onSubmit(AjaxRequestTarget target,
DialogButton btn) {
+ super.onSubmit(target, btn);
PrivateMessageFolderDao fDao =
getBean(PrivateMessageFolderDao.class);
fDao.addPrivateMessageFolder(getModelObject(),
getUserId());
foldersModel.setObject(fDao.get(0,
Integer.MAX_VALUE));
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
index 9a7f18b..3708e04 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
@@ -30,6 +30,8 @@ import org.apache.openmeetings.web.common.UserBasePanel;
import org.apache.openmeetings.web.common.tree.FileTreePanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
+
public class RecordingsPanel extends UserBasePanel {
private static final long serialVersionUID = 1L;
private final VideoPlayer video = new VideoPlayer("video");
@@ -46,7 +48,7 @@ public class RecordingsPanel extends UserBasePanel {
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target) {
+ protected void onSubmit(AjaxRequestTarget target,
DialogButton btn) {
fileTree.createFolder(target, getModelObject());
}
};
diff --git a/pom.xml b/pom.xml
index 2835fa3..49d3848 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,8 +72,8 @@
<!-- dependency versions -->
<junit.version>4.12</junit.version>
<wicket.version>8.0.0</wicket.version>
- <wicketju.version>8.0.0-SNAPSHOT</wicketju.version>
- <wickets.version>8.0.0-M9</wickets.version>
+ <wicketju.version>8.0.0</wicketju.version>
+ <wickets.version>8.0.0</wickets.version>
<red5-server.version>1.0.10-M7</red5-server.version>
<red5-client.version>1.0.10-M7</red5-client.version>
<spring.version>4.3.17.RELEASE</spring.version>
--
To stop receiving notification emails like this one, please contact
[email protected].
