You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/12/25 04:42:23 UTC
openmeetings git commit: [OPENMEETINGS-1803] compilation errors are
fixed
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x 8ddbf1e2c -> b0935c24e
[OPENMEETINGS-1803] compilation errors are fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/b0935c24
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/b0935c24
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/b0935c24
Branch: refs/heads/4.0.x
Commit: b0935c24e96a0483097f97c0dbde99d12030f1fe
Parents: 8ddbf1e
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Dec 25 11:42:15 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Dec 25 11:42:15 2017 +0700
----------------------------------------------------------------------
.../openmeetings/web/common/InvitationDialog.java | 18 +++++++++++++++---
.../openmeetings/web/common/InvitationForm.java | 8 ++++----
.../web/room/menu/RoomInvitationForm.java | 6 +++---
3 files changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b0935c24/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java
----------------------------------------------------------------------
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 6474653..7d2a626 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
@@ -30,9 +30,9 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class InvitationDialog extends AbstractFormDialog<Invitation> {
private static final long serialVersionUID = 1L;
- DialogButton generate;
- DialogButton send;
- DialogButton cancel;
+ private DialogButton generate;
+ private DialogButton send;
+ private DialogButton cancel;
private final InvitationForm form;
public InvitationDialog(String id, final InvitationForm _form) {
@@ -101,4 +101,16 @@ public class InvitationDialog extends AbstractFormDialog<Invitation> {
protected void onSubmit(AjaxRequestTarget target) {
//designed to be empty because of multiple submit buttons
}
+
+ public DialogButton getGenerate() {
+ return generate;
+ }
+
+ public DialogButton getSend() {
+ return send;
+ }
+
+ public DialogButton getCancel() {
+ return cancel;
+ }
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b0935c24/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
index 21ea16f..8cb391a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
@@ -139,8 +139,8 @@ public abstract class InvitationForm extends Form<Invitation> {
protected void updateButtons(AjaxRequestTarget target) {
Collection<User> recpnts = recipients.getModelObject();
- dialog.send.setEnabled(!recpnts.isEmpty(), target);
- dialog.generate.setEnabled(recpnts.size() == 1, target);
+ dialog.getSend().setEnabled(!recpnts.isEmpty(), target);
+ dialog.getGenerate().setEnabled(recpnts.size() == 1, target);
}
@Override
@@ -207,9 +207,9 @@ public abstract class InvitationForm extends Form<Invitation> {
}
public void onClick(AjaxRequestTarget target, DialogButton button) {
- if (button.equals(dialog.cancel)) {
+ if (button.equals(dialog.getCancel())) {
dialog.onSuperClick(target, button);
- } else if (button.equals(dialog.generate)) {
+ } else if (button.equals(dialog.getGenerate())) {
Invitation i = create(recipients.getModelObject().iterator().next());
setModelObject(i);
url.setModelObject(getInvitationLink(i, WebSession.get().getExtendedProperties().getBaseUrl()));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b0935c24/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
index efa3ab1..4165a7b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
@@ -111,8 +111,8 @@ public class RoomInvitationForm extends InvitationForm {
super.updateButtons(target);
} else {
Collection<Group> to = groups.getModelObject();
- dialog.send.setEnabled(!to.isEmpty(), target);
- dialog.generate.setEnabled(false, target);
+ dialog.getSend().setEnabled(!to.isEmpty(), target);
+ dialog.getGenerate().setEnabled(false, target);
}
}
@@ -131,7 +131,7 @@ public class RoomInvitationForm extends InvitationForm {
@Override
public void onClick(AjaxRequestTarget target, DialogButton button) {
- if (button.equals(dialog.send) && Strings.isEmpty(url.getModelObject()) && rdi.getModelObject() == InviteeType.group) {
+ if (button.equals(dialog.getSend()) && Strings.isEmpty(url.getModelObject()) && rdi.getModelObject() == InviteeType.group) {
for (Group g : groups.getModelObject()) {
for (GroupUser ou : getBean(GroupUserDao.class).get(g.getId(), 0, Integer.MAX_VALUE)) {
Invitation i = create(ou.getUser());