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 2016/09/01 04:37:21 UTC
svn commit: r1758699 - in /openmeetings/application:
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/
trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/
Author: solomax
Date: Thu Sep 1 04:37:20 2016
New Revision: 1758699
URL: http://svn.apache.org/viewvc?rev=1758699&view=rev
Log:
[OPENMEETINGS-1458] nickname dialog seems to work as expected
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java?rev=1758699&r1=1758698&r2=1758699&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java Thu Sep 1 04:37:20 2016
@@ -21,8 +21,10 @@ package org.apache.openmeetings.web.room
import static org.apache.wicket.validation.validator.StringValidator.minimumLength;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
+import org.apache.commons.lang3.time.FastDateFormat;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -41,12 +43,18 @@ import com.googlecode.wicket.kendo.ui.pa
public class NicknameDialog extends AbstractFormDialog<User> {
private static final long serialVersionUID = 1L;
+ private static final FastDateFormat TIME_DF = FastDateFormat.getInstance("HH:mm:ss");
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private final DialogButton ok = new DialogButton("ok", Application.getString(54));
+ private final RoomPanel room;
private final Form<User> form;
- public NicknameDialog(String id, User u) {
+ public NicknameDialog(String id, final RoomPanel room) {
super(id, Application.getString(1287));
+ this.room = room;
+ User u = room.getClient().getUser();
+ u.setFirstname(Application.getString(433));
+ u.setLastname(String.format("%s %s", u.getFirstname(), TIME_DF.format(new Date())));
add(form = new Form<>("form", new CompoundPropertyModel<>(u)));
form.add(feedback);
form.add(new RequiredTextField<String>("firstname").setLabel(Model.of(Application.getString(135))).add(minimumLength(4)));
@@ -86,5 +94,6 @@ public class NicknameDialog extends Abst
@Override
protected void onSubmit(AjaxRequestTarget target) {
+ room.broadcast(target, room.getClient());
}
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1758699&r1=1758698&r2=1758699&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Thu Sep 1 04:37:20 2016
@@ -256,7 +256,7 @@ public class RoomPanel extends BasePanel
add(new WebMarkupContainer("wait-for-recording").setVisible(false));
}
if (room.isVisible()) {
- add(new NicknameDialog("nickname", getClient().getUser()));
+ add(new NicknameDialog("nickname", this));
} else {
add(new WebMarkupContainer("nickname").setVisible(false));
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java?rev=1758699&r1=1758698&r2=1758699&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java Thu Sep 1 04:37:20 2016
@@ -21,8 +21,10 @@ package org.apache.openmeetings.web.room
import static org.apache.wicket.validation.validator.StringValidator.minimumLength;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
+import org.apache.commons.lang3.time.FastDateFormat;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -41,12 +43,18 @@ import com.googlecode.wicket.kendo.ui.pa
public class NicknameDialog extends AbstractFormDialog<User> {
private static final long serialVersionUID = 1L;
+ private static final FastDateFormat TIME_DF = FastDateFormat.getInstance("HH:mm:ss");
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private final DialogButton ok = new DialogButton("ok", Application.getString(54));
+ private final RoomPanel room;
private final Form<User> form;
- public NicknameDialog(String id, User u) {
+ public NicknameDialog(String id, final RoomPanel room) {
super(id, Application.getString(1287));
+ this.room = room;
+ User u = room.getClient().getUser();
+ u.setFirstname(Application.getString(433));
+ u.setLastname(String.format("%s %s", u.getFirstname(), TIME_DF.format(new Date())));
add(form = new Form<>("form", new CompoundPropertyModel<>(u)));
form.add(feedback);
form.add(new RequiredTextField<String>("firstname").setLabel(Model.of(Application.getString(135))).add(minimumLength(4)));
@@ -86,5 +94,6 @@ public class NicknameDialog extends Abst
@Override
protected void onSubmit(AjaxRequestTarget target) {
+ room.broadcast(target, room.getClient());
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1758699&r1=1758698&r2=1758699&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Thu Sep 1 04:37:20 2016
@@ -259,7 +259,7 @@ public class RoomPanel extends BasePanel
add(new WebMarkupContainer("wait-for-recording").setVisible(false));
}
if (room.isVisible()) {
- add(new NicknameDialog("nickname", getClient().getUser()));
+ add(new NicknameDialog("nickname", this));
} else {
add(new WebMarkupContainer("nickname").setVisible(false));
}