Author: solomax
Date: Sun Jul 5 06:19:12 2015
New Revision: 1689221
URL: http://svn.apache.org/r1689221
Log:
[OPENMEETINGS-980] code is refactored according to the latest changes in wicket
library
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Sun Jul 5
06:19:12 2015
@@ -434,11 +434,6 @@
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
- <artifactId>wicketstuff-html5</artifactId>
- <version>${wickets.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-whiteboard</artifactId>
<version>${wickets.version}</version>
</dependency>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
Sun Jul 5 06:19:12 2015
@@ -29,6 +29,7 @@ import org.apache.openmeetings.web.data.
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@@ -45,9 +46,9 @@ public class ConfigsPanel extends AdminP
private final WebMarkupContainer listContainer = new
WebMarkupContainer("listContainer");
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
- super.onMenuPanelLoad(target);
- target.appendJavaScript("omConfigPanelInit();");
+ public void onMenuPanelLoad(IPartialPageRequestHandler handler) {
+ super.onMenuPanelLoad(handler);
+ handler.appendJavaScript("omConfigPanelInit();");
}
public ConfigsPanel(String id) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
Sun Jul 5 06:19:12 2015
@@ -38,6 +38,7 @@ import org.apache.openmeetings.web.data.
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@@ -135,7 +136,7 @@ public class ConnectionsPanel extends Ad
}
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
- super.onMenuPanelLoad(target);
+ public void onMenuPanelLoad(IPartialPageRequestHandler handler) {
+ super.onMenuPanelLoad(handler);
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
Sun Jul 5 06:19:12 2015
@@ -30,6 +30,7 @@ import org.apache.openmeetings.web.data.
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@@ -46,9 +47,9 @@ public class GroupsPanel extends AdminPa
private GroupForm form;
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
- super.onMenuPanelLoad(target);
- target.appendJavaScript("groupsInit();");
+ public void onMenuPanelLoad(IPartialPageRequestHandler handler) {
+ super.onMenuPanelLoad(handler);
+ handler.appendJavaScript("groupsInit();");
}
public GroupsPanel(String id) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
Sun Jul 5 06:19:12 2015
@@ -42,6 +42,7 @@ import org.apache.wicket.AttributeModifi
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import
org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -76,9 +77,9 @@ public class LangPanel extends AdminPane
private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
- super.onMenuPanelLoad(target);
- target.appendJavaScript("labelsInit();");
+ public void onMenuPanelLoad(IPartialPageRequestHandler handler) {
+ super.onMenuPanelLoad(handler);
+ handler.appendJavaScript("labelsInit();");
}
public LangPanel(String id) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
Sun Jul 5 06:19:12 2015
@@ -29,6 +29,7 @@ import org.apache.openmeetings.web.data.
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@@ -45,9 +46,9 @@ public class LdapsPanel extends AdminPan
private LdapForm form;
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
- super.onMenuPanelLoad(target);
- target.appendJavaScript("omLdapPanelInit();");
+ public void onMenuPanelLoad(IPartialPageRequestHandler handler) {
+ super.onMenuPanelLoad(handler);
+ handler.appendJavaScript("omLdapPanelInit();");
}
public LdapsPanel(String id) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
Sun Jul 5 06:19:12 2015
@@ -31,6 +31,7 @@ import org.apache.openmeetings.web.data.
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@@ -41,9 +42,9 @@ public class RoomsPanel extends AdminPan
private RoomForm form;
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
- super.onMenuPanelLoad(target);
- target.appendJavaScript("omRoomPanelInit();");
+ public void onMenuPanelLoad(IPartialPageRequestHandler handler) {
+ super.onMenuPanelLoad(handler);
+ handler.appendJavaScript("omRoomPanelInit();");
}
public RoomsPanel(String id) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
Sun Jul 5 06:19:12 2015
@@ -29,6 +29,7 @@ import org.apache.openmeetings.web.data.
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@@ -45,9 +46,9 @@ public class ServersPanel extends AdminP
private ServerForm form;
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
- super.onMenuPanelLoad(target);
- target.appendJavaScript("omServerPanelInit();");
+ public void onMenuPanelLoad(IPartialPageRequestHandler handler) {
+ super.onMenuPanelLoad(handler);
+ handler.appendJavaScript("omServerPanelInit();");
}
public ServersPanel(String id) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
Sun Jul 5 06:19:12 2015
@@ -33,6 +33,7 @@ import org.apache.openmeetings.web.data.
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@@ -48,14 +49,15 @@ public class UsersPanel extends AdminPan
private final MessageDialog warning = new MessageDialog("warning",
Application.getString(797), Application.getString(343), DialogButtons.OK,
DialogIcon.WARN) {
private static final long serialVersionUID = 1L;
- public void onClose(AjaxRequestTarget target, DialogButton
button) {
+ @Override
+ public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
}
};
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
- super.onMenuPanelLoad(target);
- target.appendJavaScript("omUserPanelInit();");
+ public void onMenuPanelLoad(IPartialPageRequestHandler handler) {
+ super.onMenuPanelLoad(handler);
+ handler.appendJavaScript("omUserPanelInit();");
}
private UserForm form;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
Sun Jul 5 06:19:12 2015
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
@@ -73,8 +74,8 @@ public abstract class AddFolderDialog ex
}
@Override
- protected void onOpen(AjaxRequestTarget target) {
- super.onOpen(target);
+ protected void onOpen(IPartialPageRequestHandler handler) {
+ super.onOpen(handler);
setModelObject(name);
getFeedbackMessages().clear();
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
Sun Jul 5 06:19:12 2015
@@ -22,7 +22,7 @@ import org.apache.openmeetings.db.util.F
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.menu.MenuPanel;
import org.apache.openmeetings.web.pages.MainPage;
-import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
@@ -53,8 +53,8 @@ public abstract class BasePanel extends
*
* @param target
*/
- public void onMenuPanelLoad(AjaxRequestTarget target) {
- target.add(getMainPage().getHeader().setVisible(true),
getMainPage().getMenu().setVisible(true)
+ public void onMenuPanelLoad(IPartialPageRequestHandler handler) {
+ handler.add(getMainPage().getHeader().setVisible(true),
getMainPage().getMenu().setVisible(true)
, getMainPage().getTopLinks().setVisible(true));
}
@@ -63,6 +63,6 @@ public abstract class BasePanel extends
*
* @param target
*/
- public void cleanup(AjaxRequestTarget target) {
+ public void cleanup(IPartialPageRequestHandler handler) {
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
Sun Jul 5 06:19:12 2015
@@ -30,7 +30,7 @@ public abstract class MenuItem implement
protected String desc;
protected String cssClass;
protected boolean active = true;
- protected List<? extends MenuItem> children = null;
+ protected List<MenuItem> children = null;
public MenuItem() {}
@@ -69,11 +69,11 @@ public abstract class MenuItem implement
this.active = active;
}
- public List<? extends MenuItem> getChildren() {
+ public List<MenuItem> getChildren() {
return children;
}
- public void setChildren(List<? extends MenuItem> children) {
+ public void setChildren(List<MenuItem> children) {
this.children = children;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
Sun Jul 5 06:19:12 2015
@@ -24,6 +24,7 @@ import org.apache.openmeetings.web.commo
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -98,7 +99,7 @@ public class MenuPanel extends BasePanel
add(mfb = new
MenuFunctionsBehavior(menuContainer.getMarkupId(), id));
}
- public void update(AjaxRequestTarget target) {
+ public void update(IPartialPageRequestHandler target) {
target.add(menuContainer);
//target.appendJavaScript(String.format("$(function() {%s;});",
mfb.getInitScript()));
target.appendJavaScript(mfb.getInitScript());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
Sun Jul 5 06:19:12 2015
@@ -30,7 +30,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.record.FlvRecordingLog;
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
@@ -80,7 +80,7 @@ public class ConvertingErrorsDialog exte
}
@Override
- protected void onOpen(AjaxRequestTarget target) {
+ protected void onOpen(IPartialPageRequestHandler handler) {
FlvRecording f = getModelObject();
List<FlvRecordingLog> logs =
getBean(FlvRecordingLogDao.class).getByRecordingId(f.getId());
if (f.getFileHash() == null) {
@@ -96,11 +96,12 @@ public class ConvertingErrorsDialog exte
logView.setVisible(false);
logView.setList(logs).setVisible(true);
}
- target.add(container);
- super.onOpen(target);
+ handler.add(container);
+ super.onOpen(handler);
}
- public void onClose(AjaxRequestTarget target, DialogButton button) {
+ @Override
+ public void onClose(IPartialPageRequestHandler handler, DialogButton
button) {
}
@Override
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
Sun Jul 5 06:19:12 2015
@@ -54,6 +54,7 @@ import org.apache.wicket.ajax.AbstractAj
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import
org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.devutils.debugbar.DebugBar;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.link.ExternalLink;
@@ -175,7 +176,7 @@ public class MainPage extends BaseInited
@Override
public void onClick(MainPage page,
AjaxRequestTarget terget) {}
};
- List<MainMenuItem> l = new ArrayList<MainMenuItem>();
+ List<MenuItem> l = new ArrayList<MenuItem>();
for (Navimain nm : gl.getMainnavi()) {
l.add(new MainMenuItem(nm));
}
@@ -187,26 +188,26 @@ public class MainPage extends BaseInited
return menu;
}
- public void updateContents(OmUrlFragment f, AjaxRequestTarget target) {
- updateContents(f, target, true);
+ public void updateContents(OmUrlFragment f, IPartialPageRequestHandler
handler) {
+ updateContents(f, handler, true);
}
- public void updateContents(OmUrlFragment f, AjaxRequestTarget target,
boolean updateFragment) {
+ public void updateContents(OmUrlFragment f, IPartialPageRequestHandler
handler, boolean updateFragment) {
BasePanel panel = getPanel(f.getArea(), f.getType());
if (panel != null) {
Component prev = contents.get(CHILD_ID);
if (prev != null && prev instanceof BasePanel) {
- ((BasePanel)prev).cleanup(target);
+ ((BasePanel)prev).cleanup(handler);
}
- target.add(contents.replace(panel));
+ handler.add(contents.replace(panel));
if (updateFragment) {
- UrlFragment uf = new UrlFragment(target);
+ UrlFragment uf = new UrlFragment(handler);
uf.set(f.getArea().name(), f.getType());
}
- panel.onMenuPanelLoad(target);
+ panel.onMenuPanelLoad(handler);
}
if (dev != null){
- target.add(dev);
+ handler.add(dev);
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
Sun Jul 5 06:19:12 2015
@@ -36,6 +36,7 @@ import org.apache.openmeetings.web.pages
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.Radio;
@@ -146,8 +147,9 @@ public class ForgetPasswordDialog extend
behavior.setOption("closeOnEscape", false);
}
- public void onClose(AjaxRequestTarget target,
DialogButton button) {
- s.open(target);
+ @Override
+ public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
+ s.open(handler);
}
};
add(confirmDialog);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Sun Jul 5 06:19:12 2015
@@ -45,6 +45,7 @@ import org.apache.openmeetings.web.commo
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import
org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -106,8 +107,9 @@ public class RegisterDialog extends Abst
behavior.setOption("closeOnEscape", false);
}
- public void onClose(AjaxRequestTarget target,
DialogButton button) {
- s.open(target);
+ @Override
+ public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
+ s.open(handler);
}
};
add(confirmRegistration);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
Sun Jul 5 06:19:12 2015
@@ -31,6 +31,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.CssContentHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.form.Form;
@@ -112,7 +113,8 @@ public class ResetPasswordDialog extends
behavior.setOption("closeOnEscape", false);
}
- public void onClose(AjaxRequestTarget target,
DialogButton button) {
+ @Override
+ public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
setResponsePage(Application.get().getSignInPageClass());
}
};
@@ -161,9 +163,9 @@ public class ResetPasswordDialog extends
}
@Override
- public void onClose(AjaxRequestTarget target, DialogButton button) {
+ public void onClose(IPartialPageRequestHandler handler, DialogButton
button) {
if (resetBtn.equals(button)){
- confirmReset.open(target);
+ confirmReset.open(handler);
} else {
setResponsePage(Application.get().getSignInPageClass());
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
Sun Jul 5 06:19:12 2015
@@ -47,6 +47,7 @@ import org.apache.wicket.ajax.AjaxEventB
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox;
@@ -135,10 +136,10 @@ public class SignInDialog extends Abstra
}
@Override
- public void onClose(AjaxRequestTarget target, DialogButton button) {
+ public void onClose(IPartialPageRequestHandler handler, DialogButton
button) {
if (registerBtn.equals(button)) {
r.setClientTimeZone();
- r.open(target);
+ r.open(handler);
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Sun Jul 5 06:19:12 2015
@@ -85,6 +85,7 @@ import org.apache.wicket.ajax.json.JSONE
import org.apache.wicket.ajax.json.JSONObject;
import
org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -533,12 +534,12 @@ public class RoomPanel extends BasePanel
exitMenuItem.setActive(false);
menu.add(exitMenuItem);
- List<RoomMenuItem> fileItems = new ArrayList<RoomMenuItem>();
+ List<MenuItem> fileItems = new ArrayList<MenuItem>();
fileItems.add(new RoomMenuItem(Application.getString(15),
Application.getString(1479)));
filesMenu.setChildren(fileItems);
menu.add(filesMenu);
- List<RoomMenuItem> actionItems = new ArrayList<RoomMenuItem>();
+ List<MenuItem> actionItems = new ArrayList<MenuItem>();
actionItems.add(inviteMenuItem);
actionItems.add(shareMenuItem); //FIXME enable/disable
actionItems.add(applyModerMenuItem); //FIXME enable/disable
@@ -555,21 +556,21 @@ public class RoomPanel extends BasePanel
}
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
- target.add(getMainPage().getHeader().setVisible(false),
getMainPage().getMenu().setVisible(false)
+ public void onMenuPanelLoad(IPartialPageRequestHandler handler) {
+ handler.add(getMainPage().getHeader().setVisible(false),
getMainPage().getMenu().setVisible(false)
,
getMainPage().getTopLinks().setVisible(false));
- target.appendJavaScript("roomLoad();");
+ handler.appendJavaScript("roomLoad();");
}
@Override
- public void cleanup(AjaxRequestTarget target) {
- target.add(getMainPage().getHeader().setVisible(true),
getMainPage().getMenu().setVisible(true)
+ public void cleanup(IPartialPageRequestHandler handler) {
+ handler.add(getMainPage().getHeader().setVisible(true),
getMainPage().getMenu().setVisible(true)
, getMainPage().getTopLinks().setVisible(true));
Room r = getBean(RoomDao.class).get(roomId);
if (r.isChatHidden()) {
- target.add(getMainPage().getChat().setVisible(true));
//FIXME chat is broken on this step
+ handler.add(getMainPage().getChat().setVisible(true));
//FIXME chat is broken on this step
}
- target.appendJavaScript("$(window).off('resize.openmeetings');
$('.room.video').dialog('destroy');");
+ handler.appendJavaScript("$(window).off('resize.openmeetings');
$('.room.video').dialog('destroy');");
}
private ResourceReference newResourceReference() {
@@ -593,9 +594,9 @@ public class RoomPanel extends BasePanel
return list;
}
- private void exit(AjaxRequestTarget target) {
+ private void exit(IPartialPageRequestHandler handler) {
if (WebSession.getRights().contains(Right.Dashboard)) {
- getMainPage().updateContents(ROOMS_PUBLIC, target);
+ getMainPage().updateContents(ROOMS_PUBLIC, handler);
} else {
String url =
getBean(ConfigurationDao.class).getConfValue(CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY,
String.class, "");
if (Strings.isEmpty(url)) {
@@ -687,8 +688,8 @@ public class RoomPanel extends BasePanel
}
@Override
- public void onClose(AjaxRequestTarget target, DialogButton
button) {
- RoomPanel.this.exit(target);
+ public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
+ RoomPanel.this.exit(handler);
}
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
Sun Jul 5 06:19:12 2015
@@ -35,6 +35,7 @@ import org.apache.openmeetings.web.commo
import org.apache.openmeetings.web.room.activities.Activity.Type;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -128,7 +129,7 @@ public class ActivitiesPanel extends Bas
}
};
- public void addActivity(Long userId, Activity.Type type,
AjaxRequestTarget target) {
+ public void addActivity(Long userId, Activity.Type type,
IPartialPageRequestHandler target) {
//if (getUserId() != userId) {//FIXME should be replaced with
client-id
activities.add(new Activity(userId, type));
target.add(container);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
Sun Jul 5 06:19:12 2015
@@ -33,6 +33,7 @@ import org.apache.openmeetings.web.room.
import org.apache.openmeetings.web.room.message.RoomMessage;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -90,16 +91,16 @@ public class PollResultsDialog extends A
private static final long serialVersionUID = 1L;
@Override
- public void onClose(AjaxRequestTarget target,
DialogButton button) {
+ public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
// TODO should rights be additionally checked
here????
if(button != null && button.match(YES)) {
Long id =
dispForm.getModelObject().getId();
getBean(PollDao.class).close(roomId);
- selForm.updateModel(target);
+ selForm.updateModel(handler);
RoomPoll p =
getBean(PollDao.class).get(id);
selForm.select.setModelObject(p);
- dispForm.updateModel(p, false, target);
+ dispForm.updateModel(p, false, handler);
RoomPanel.broadcast(new
RoomMessage(roomId, getUserId(), RoomMessage.Type.pollClosed));
//TODO result dialogs of other users
should also be updated
}
@@ -109,12 +110,12 @@ public class PollResultsDialog extends A
private static final long serialVersionUID = 1L;
@Override
- public void onClose(AjaxRequestTarget target,
DialogButton button) {
+ public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
// TODO should rights be additionally checked
here????
if(button != null && button.match(YES)) {
getBean(PollDao.class).delete(dispForm.getModelObject());
- selForm.updateModel(target);
-
dispForm.updateModel(selForm.select.getModelObject(), true, target);
+ selForm.updateModel(handler);
+
dispForm.updateModel(selForm.select.getModelObject(), true, handler);
RoomPanel.broadcast(new
RoomMessage(roomId, getUserId(), RoomMessage.Type.pollDeleted));
//TODO result dialogs of other users
should also be updated
}
@@ -196,7 +197,7 @@ public class PollResultsDialog extends A
}
@Override
- public void onClose(AjaxRequestTarget target, DialogButton button) {
+ public void onClose(IPartialPageRequestHandler handler, DialogButton
button) {
}
private String[] getTicks(RoomPoll p) {
@@ -306,7 +307,7 @@ public class PollResultsDialog extends A
updateModel(null);
}
- public void updateModel(AjaxRequestTarget target) {
+ public void updateModel(IPartialPageRequestHandler handler) {
List<RoomPoll> list = new ArrayList<RoomPoll>();
RoomPoll p = getBean(PollDao.class).getPoll(roomId);
if (p != null) {
@@ -315,8 +316,8 @@ public class PollResultsDialog extends A
list.addAll(getBean(PollDao.class).getArchived(roomId));
select.setChoices(list);
select.setModelObject(list.isEmpty() ? null :
list.get(0));
- if (target != null) {
- target.add(this);
+ if (handler != null) {
+ handler.add(this);
}
}
}
@@ -346,22 +347,22 @@ public class PollResultsDialog extends A
add(chartDiv.setOutputMarkupId(true));
}
- public void updateModel(RoomPoll poll, boolean redraw,
AjaxRequestTarget target) {
+ public void updateModel(RoomPoll poll, boolean redraw,
IPartialPageRequestHandler handler) {
setModelObject(poll);
name.setObject(poll == null ? "" :
VoteDialog.getName(poll.getCreator()));
count.setObject(poll == null ? 0 :
poll.getAnswers().size());
- target.add(this);
- close.setVisible(moderator && (poll != null &&
!poll.isArchived()), target);
- delete.setVisible(moderator, target);
+ handler.add(this);
+ close.setVisible(moderator && (poll != null &&
!poll.isArchived()), handler);
+ delete.setVisible(moderator, handler);
if (redraw) {
- redraw(target);
+ redraw(handler);
}
}
- private void redraw(AjaxRequestTarget target) {
+ private void redraw(IPartialPageRequestHandler handler) {
RoomPoll poll = getModelObject();
Chart<?> chart =
SIMPLE_CHART.equals(chartType.getModelObject()) ? barChart(poll) :
pieChart(poll);
- target.appendJavaScript(getScript(chart));
+ handler.appendJavaScript(getScript(chart));
}
@Override
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
Sun Jul 5 06:19:12 2015
@@ -33,6 +33,7 @@ import org.apache.openmeetings.web.app.A
import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.openmeetings.web.room.message.RoomMessage;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -72,7 +73,7 @@ public class VoteDialog extends Abstract
return u == null ? "" : getUserId() == u.getId() ?
Application.getString(1411) : u.getFirstname() + " " + u.getLastname();
}
- public void updateModel(AjaxRequestTarget target) {
+ public void updateModel(IPartialPageRequestHandler target) {
RoomPollAnswer a = new RoomPollAnswer();
a.setRoomPoll(getBean(PollDao.class).getPoll(roomId));
User u = getBean(UserDao.class).get(getUserId());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java
Sun Jul 5 06:19:12 2015
@@ -28,7 +28,7 @@ import java.util.List;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.web.app.Application;
-import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.basic.Label;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog;
@@ -51,6 +51,7 @@ public class AboutDialog extends Abstrac
return new ArrayList<DialogButton>();
}
- public void onClose(AjaxRequestTarget arg0, DialogButton arg1) {
+ @Override
+ public void onClose(IPartialPageRequestHandler handler, DialogButton
arg1) {
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Sun Jul 5 06:19:12 2015
@@ -53,6 +53,7 @@ import org.apache.openmeetings.web.util.
import org.apache.openmeetings.web.util.UserMultiChoice;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -128,18 +129,19 @@ public class AppointmentDialog extends A
confirmDelete = new MessageDialog("confirmDelete",
Application.getString(814), Application.getString(833),
DialogButtons.OK_CANCEL, DialogIcon.WARN){
private static final long serialVersionUID = 1L;
- public void onClose(AjaxRequestTarget target,
DialogButton button) {
+ @Override
+ public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
if (button != null &&
button.match(AbstractDialog.OK)){
- deleteAppointment(target);
+ deleteAppointment(handler);
}
}
};
add(confirmDelete);
}
- protected void deleteAppointment(AjaxRequestTarget target) {
+ protected void deleteAppointment(IPartialPageRequestHandler handler) {
getBean(AppointmentDao.class).delete(getModelObject(),
getUserId());
- calendarPanel.refresh(target);
+ calendarPanel.refresh(handler);
}
@Override
@@ -158,16 +160,16 @@ public class AppointmentDialog extends A
}
@Override
- protected void onOpen(AjaxRequestTarget target) {
- target.add(this.form);
+ protected void onOpen(IPartialPageRequestHandler handler) {
+ handler.add(this.form);
}
@Override
- public void onClose(AjaxRequestTarget target, DialogButton button) {
+ public void onClose(IPartialPageRequestHandler handler, DialogButton
button) {
if (delete.equals(button)) {
- confirmDelete.open(target);
+ confirmDelete.open(handler);
} else if (enterRoom.equals(button)) {
- RoomEnterBehavior.roomEnter((MainPage)getPage(),
target, getModelObject().getRoom().getId());
+ RoomEnterBehavior.roomEnter((MainPage)getPage(),
handler, getModelObject().getRoom().getId());
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Sun Jul 5 06:19:12 2015
@@ -38,6 +38,7 @@ import org.apache.wicket.ajax.AbstractAj
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.json.JSONArray;
import org.apache.wicket.ajax.json.JSONException;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.form.Form;
@@ -70,13 +71,13 @@ public class CalendarPanel extends UserP
private Calendar calendar;
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
- super.onMenuPanelLoad(target);
+ public void onMenuPanelLoad(IPartialPageRequestHandler handler) {
+ super.onMenuPanelLoad(handler);
}
@Override
- public void cleanup(AjaxRequestTarget target) {
- refreshTimer.stop(target);
+ public void cleanup(IPartialPageRequestHandler handler) {
+ refreshTimer.stop((AjaxRequestTarget)handler);
}
private AppointmentDao getDao() {
@@ -87,8 +88,8 @@ public class CalendarPanel extends UserP
return getBean(AppointmentReminderTypDao.class);
}
- public void refresh(AjaxRequestTarget target) {
- calendar.refresh(target);
+ public void refresh(IPartialPageRequestHandler handler) {
+ calendar.refresh(handler);
}
Calendar getCalendar() {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
Sun Jul 5 06:19:12 2015
@@ -51,6 +51,7 @@ import org.apache.openmeetings.web.util.
import org.apache.openmeetings.web.util.UserMultiChoice;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.Form;
@@ -87,9 +88,9 @@ public class MessageDialog extends Abstr
return 650;
}
- public void open(AjaxRequestTarget target, long userId) {
+ public void open(IPartialPageRequestHandler handler, long userId) {
getModelObject().setTo(getBean(UserDao.class).get(userId));
- open(target);
+ open(handler);
}
public MessageDialog reset(boolean isPrivate) {
@@ -113,12 +114,12 @@ public class MessageDialog extends Abstr
}
@Override
- protected void onOpen(AjaxRequestTarget target) {
+ protected void onOpen(IPartialPageRequestHandler handler) {
if (getModel().getObject().getTo() != null) {
modelTo.getObject().add(getModel().getObject().getTo());
}
- target.add(form);
- super.onOpen(target);
+ handler.add(form);
+ super.onOpen(handler);
}
public MessageDialog(String id, CompoundPropertyModel<PrivateMessage>
model) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
Sun Jul 5 06:19:12 2015
@@ -56,6 +56,7 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -250,9 +251,9 @@ public class MessagesContactsPanel exten
private static final long serialVersionUID = 1L;
@Override
- public void onClose(AjaxRequestTarget target,
DialogButton button) {
+ public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
if (send.equals(button)) {
- target.add(container);
+ handler.add(container);
}
}
});
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
Sun Jul 5 06:19:12 2015
@@ -27,7 +27,7 @@ import java.util.List;
import org.apache.openmeetings.db.dao.user.UserContactsDao;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.util.ContactsHelper;
-import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog;
@@ -48,11 +48,11 @@ public class UserInfoDialog extends Abst
this.newMessage = newMessage;
}
- public void open(AjaxRequestTarget target, long userId) {
+ public void open(IPartialPageRequestHandler handler, long userId) {
this.userId = userId;
container.replace(new UserProfilePanel("body", userId));
- target.add(container);
- open(target);
+ handler.add(container);
+ open(handler);
}
public WebMarkupContainer getContainer() {
@@ -70,9 +70,10 @@ public class UserInfoDialog extends Abst
? Arrays.asList(message, cancel) :
Arrays.asList(contacts, message, cancel);
}
- public void onClose(AjaxRequestTarget target, DialogButton button) {
+ @Override
+ public void onClose(IPartialPageRequestHandler handler, DialogButton
button) {
if (message.equals(button)) {
- newMessage.reset(false).open(target, userId);
+ newMessage.reset(false).open(handler, userId);
} else if (contacts.equals(button)) {
ContactsHelper.addUserToContactList(userId);
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
Sun Jul 5 06:19:12 2015
@@ -39,6 +39,7 @@ import org.apache.wicket.AttributeModifi
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -67,8 +68,8 @@ public class UserSearchPanel extends Use
private final WebMarkupContainer container = new
WebMarkupContainer("container");
private final FixedHeaderTableBehavior fixedHeader = new
FixedHeaderTableBehavior("#searchUsersTable", new Options("height", 400));
- private void refresh(AjaxRequestTarget target) {
- target.add(container.add(fixedHeader));
+ private void refresh(IPartialPageRequestHandler handler) {
+ handler.add(container.add(fixedHeader));
}
public UserSearchPanel(String id) {
@@ -95,9 +96,9 @@ public class UserSearchPanel extends Use
private static final long serialVersionUID = 1L;
@Override
- public void onClose(AjaxRequestTarget target,
DialogButton button) {
+ public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
if (send.equals(button)) {
- refresh(target);
+ refresh(handler);
}
}
});
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
Sun Jul 5 06:19:12 2015
@@ -23,7 +23,8 @@
<div class="video" wicket:id="container">
<div wicket:id="wait"></div>
<video wicket:id="player">
- Your browser does not support HTML5 video. <!-- FIXME
hardcoded -->
+ <source wicket:id="mp4" />
+ <source wicket:id="ogg" />
</video>
</div>
</wicket:panel>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
Sun Jul 5 06:19:12 2015
@@ -20,21 +20,18 @@ package org.apache.openmeetings.web.user
import static org.apache.openmeetings.util.OmFileHelper.getMp4Recording;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.web.util.Mp4RecordingResourceReference;
import org.apache.openmeetings.web.util.OggRecordingResourceReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.media.Source;
+import org.apache.wicket.markup.html.media.video.Video;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.util.ListModel;
+import org.apache.wicket.request.Url;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.wicketstuff.html5.media.MediaSource;
-import org.wicketstuff.html5.media.video.Html5Video;
+import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.request.resource.UrlResourceReference;
public class VideoPlayer extends Panel {
private static final long serialVersionUID = 1L;
@@ -42,8 +39,9 @@ public class VideoPlayer extends Panel {
private final WebMarkupContainer container = new
WebMarkupContainer("container");
private final Mp4RecordingResourceReference mp4res = new
Mp4RecordingResourceReference();
private final OggRecordingResourceReference oggres = new
OggRecordingResourceReference();
- private final IModel<List<MediaSource>> playerModel = new
ListModel<MediaSource>(new ArrayList<MediaSource>());
- private final OmHtml5Video player = new OmHtml5Video("player",
playerModel, null);
+ private final OmVideo player = new OmVideo("player", null);
+ private final Source mp4 = new Source("mp4", mp4res);
+ private final Source ogg = new Source("ogg", oggres);
public VideoPlayer(String id) {
this(id, null);
@@ -52,6 +50,11 @@ public class VideoPlayer extends Panel {
public VideoPlayer(String id, FlvRecording r) {
super(id);
add(container.setOutputMarkupPlaceholderTag(true));
+ mp4.setDisplayType(true);
+ mp4.setType("video/mp4");
+ ogg.setDisplayType(true);
+ ogg.setType("video/ogg");
+ player.add(mp4, ogg);
container.add(wait.setVisible(false), player);
update(null, r);
}
@@ -60,9 +63,8 @@ public class VideoPlayer extends Panel {
boolean videoExists = r != null &&
getMp4Recording(r.getFileHash()).exists();
if (videoExists) {
PageParameters pp = new PageParameters().add("id",
r.getId());
- playerModel.setObject(Arrays.asList(
- new MediaSource("" +
getRequestCycle().urlFor(mp4res, pp), "video/mp4")
- , new MediaSource("" +
getRequestCycle().urlFor(oggres, pp), "video/ogg")));
+ mp4.setPageParameters(pp);
+ ogg.setPageParameters(pp);
player.recId = r.getId();
}
container.setVisible(videoExists);
@@ -73,34 +75,28 @@ public class VideoPlayer extends Panel {
return this;
}
- @Override
- protected void onDetach() {
- playerModel.detach();
- super.onDetach();
- }
-
- private static class OmHtml5Video extends Html5Video {
+ private static class OmVideo extends Video {
private static final long serialVersionUID = 1L;
Long recId = null;
- OmHtml5Video(String id, IModel<List<MediaSource>> model, Long
recId) {
- super(id, model);
+ OmVideo(String id, Long recId) {
+ super(id);
this.recId = recId;
}
@Override
- protected boolean isAutoPlay() {
+ public boolean isAutoplay() {
return false;
}
@Override
- protected boolean isControls() {
+ public boolean hasControls() {
return true;
}
@Override
- protected String getPoster() {
- return recId == null ? null : "recordings/jpg/" + recId;
+ public ResourceReference getPoster() {
+ return recId == null ? null : new
UrlResourceReference(Url.parse("recordings/jpg/" +
recId)).setContextRelative(true);
}
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java
Sun Jul 5 06:19:12 2015
@@ -23,6 +23,7 @@ import org.apache.openmeetings.web.util.
import org.apache.openmeetings.web.util.OmUrlFragment.AreaKeys;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
public class RoomEnterBehavior extends AjaxEventBehavior {
private static final long serialVersionUID = 1L;
@@ -37,8 +38,8 @@ public class RoomEnterBehavior extends A
return new OmUrlFragment(AreaKeys.room, "" + roomId);
}
- public static void roomEnter(MainPage page, AjaxRequestTarget target,
long roomId) {
- page.updateContents(getRoomUrlFragment(roomId), target);
+ public static void roomEnter(MainPage page, IPartialPageRequestHandler
handler, long roomId) {
+ page.updateContents(getRoomUrlFragment(roomId), handler);
}
@Override
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java
Sun Jul 5 06:19:12 2015
@@ -25,28 +25,27 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.red5.logging.Red5LoggerFactory.getLogger;
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.io.input.BoundedInputStream;
import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
import org.apache.openmeetings.db.dao.user.OrganisationUserDao;
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.wicket.protocol.http.servlet.ResponseIOException;
-import org.apache.wicket.request.Response;
-import org.apache.wicket.request.http.WebResponse;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.AbstractResource;
+import org.apache.wicket.request.resource.AbstractResource.ResourceResponse;
import org.apache.wicket.request.resource.ContentDisposition;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.IResource.Attributes;
+import org.apache.wicket.request.resource.PartWriterCallback;
import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.wicket.util.lang.Bytes;
+import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.resource.FileResourceStream;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
@@ -66,112 +65,59 @@ public abstract class RecordingResourceR
public IResource getResource() {
return new AbstractResource() {
private static final long serialVersionUID = 1L;
- private final static String ACCEPT_RANGES_HEADER =
"Accept-Ranges";
- private final static String RANGE_HEADER = "Range";
- private final static String CONTENT_RANGE_HEADER =
"Content-Range";
- private final static String RANGES_BYTES = "bytes";
private File file;
- private boolean isRange = false;
- private long start = 0;
- private long end = 0;
- private long getChunkLength() {
- return isRange ? end - start + 1 : (file ==
null ? -1 : file.length());
- }
-
- private IResourceStream getResourceStream() {
- return file == null ? null : new
FileResourceStream(file) {
- private static final long
serialVersionUID = 1L;
- private transient BoundedInputStream bi;
-
- @Override
- public InputStream getInputStream()
throws ResourceStreamNotFoundException {
- if (bi == null) {
- //bi = new
BoundedInputStream(super.getInputStream(), end + 1);
- bi = new
BoundedInputStream(super.getInputStream(), isRange ? end + 1 : (file == null ?
-1 : file.length()));
- try {
- bi.skip(start);
- } catch (IOException e)
{
- throw new
ResourceStreamNotFoundException(e);
- }
- }
- return bi;
- }
-
- @Override
- public Bytes length() {
- return
Bytes.bytes(getChunkLength());
- }
-
- @Override
- public void close() throws IOException {
- if (bi != null) {
- bi.close(); //also will
close original stream
- bi = null;
- }
- }
-
- @Override
- public String getContentType() {
- return
RecordingResourceReference.this.getContentType();
- }
- };
- }
-
- @Override
- protected void setResponseHeaders(ResourceResponse
data, Attributes attributes) {
- Response response = attributes.getResponse();
- if (response instanceof WebResponse) {
- WebResponse webResponse =
(WebResponse)response;
- webResponse.setStatus(isRange ?
HttpServletResponse.SC_PARTIAL_CONTENT : HttpServletResponse.SC_OK);
- }
- super.setResponseHeaders(data, attributes);
- }
-
@Override
protected ResourceResponse
newResourceResponse(Attributes attributes) {
ResourceResponse rr = new ResourceResponse();
FlvRecording r = getRecording(attributes);
if (r != null) {
- isRange = false;
file = getFile(r);
- rr.setFileName(getFileName(r));
-
rr.setContentType(RecordingResourceReference.this.getContentType());
-
rr.setContentDisposition(ContentDisposition.INLINE);
-
rr.setLastModified(Time.millis(file.lastModified()));
-
rr.getHeaders().addHeader(ACCEPT_RANGES_HEADER, RANGES_BYTES);
- String range =
((HttpServletRequest)attributes.getRequest().getContainerRequest()).getHeader(RANGE_HEADER);
- if (range != null &&
range.startsWith(RANGES_BYTES)) {
- String[] bounds =
range.substring(RANGES_BYTES.length() + 1).split("-");
- if (bounds != null &&
bounds.length > 0) {
- long length =
file.length();
- isRange = true;
- start =
Long.parseLong(bounds[0]);
- end = bounds.length > 1
? Long.parseLong(bounds[1]) : length - 1;
- //Content-Range: bytes
229376-232468/232469
-
rr.getHeaders().addHeader(CONTENT_RANGE_HEADER, String.format("%s %d-%d/%d",
RANGES_BYTES, start, end, length));
- }
- }
- rr.setContentLength(getChunkLength());
- rr.setWriteCallback(new WriteCallback()
{
- @Override
- public void
writeData(Attributes attributes) throws IOException {
- IResourceStream rStream
= getResourceStream();
- if (rStream != null) {
- try {
-
writeStream(attributes, rStream.getInputStream());
- } catch
(ResourceStreamNotFoundException e1) {
- } catch
(ResponseIOException e) {
- // in
case of range operations we expecting such exceptions
- if
(!isRange) {
-
log.error("Error while playing the stream", e);
- }
- } finally {
-
rStream.close();
- }
+ IResourceStream rs = file == null ?
null : new FileResourceStream(file);
+
+ if (rs != null) {
+ rr.setFileName(getFileName(r));
+
rr.setContentType(RecordingResourceReference.this.getContentType());
+
rr.setContentDisposition(ContentDisposition.INLINE);
+
rr.setLastModified(Time.millis(file.lastModified()));
+
rr.setAcceptRange(ContentRangeType.BYTES);
+
+ try {
+ // read resource data
to get the content length
+ InputStream inputStream
= rs.getInputStream();
+
+ byte[] bytes = null;
+ // send Content-Length
header
+ bytes =
IOUtils.toByteArray(inputStream);
+
rr.setContentLength(bytes.length);
+
+ // get content range
information
+ RequestCycle cycle =
RequestCycle.get();
+ Long startbyte =
cycle.getMetaData(CONTENT_RANGE_STARTBYTE);
+ Long endbyte =
cycle.getMetaData(CONTENT_RANGE_ENDBYTE);
+
+ // send response body
with resource data
+ PartWriterCallback
partWriterCallback = new PartWriterCallback(bytes != null
+ ? new
ByteArrayInputStream(bytes) : inputStream, rr.getContentLength(), startbyte,
endbyte);
+
+ // If read buffered is
set to false ensure the part writer callback is going to
+ // close the input
stream
+
rr.setWriteCallback(partWriterCallback.setClose(false));
+ } catch (IOException e) {
+
log.debug(e.getMessage(), e);
+ return
sendResourceError(rr, file, 500, "Unable to read resource stream");
+ } catch
(ResourceStreamNotFoundException e) {
+
log.debug(e.getMessage(), e);
+ return
sendResourceError(rr, file, 500, "Unable to open resource stream");
+ } finally {
+ try {
+
IOUtils.close(rs);
+ } catch (IOException e)
{
+
log.warn("Unable to close the resource stream", e);
}
}
- });
+ }
+
} else {
rr.setError(HttpServletResponse.SC_NOT_FOUND);
}
@@ -180,6 +126,15 @@ public abstract class RecordingResourceR
};
}
+ private ResourceResponse sendResourceError(ResourceResponse
resourceResponse, File file, int errorCode, String errorMessage) {
+ String msg = String.format("resource [file = %s]: %s
(status=%d)", file == null ? null : file.getAbsolutePath(), errorMessage,
errorCode);
+
+ log.warn(msg);
+
+ resourceResponse.setError(errorCode, errorMessage);
+ return resourceResponse;
+ }
+
abstract String getContentType();
abstract String getFileName(FlvRecording r);
abstract File getFile(FlvRecording r);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
Sun Jul 5 06:19:12 2015
@@ -24,7 +24,7 @@ import java.util.Date;
import org.apache.openmeetings.core.remote.InvitationService;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.server.Sessiondata;
+import org.apache.openmeetings.db.dto.basic.ServiceResult;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.apache.openmeetings.webservice.UserWebService;
@@ -43,13 +43,11 @@ public class TestInvitation extends Abst
@Test
public void testSendInvitationLink() {
- Sessiondata sessionData = sessDao.startsession();
-
- Long uid = userWebService.login(sessionData.getSessionId(),
username, userpass);
- User us = userDao.get(uid);
+ ServiceResult result = userWebService.login(username, userpass);
+ User us = userDao.get(result.getCode());
String date = new SimpleDateFormat("dd.MM.yyyy").format(new
Date());
-
invitationService.sendInvitationHash(sessionData.getSessionId(), "Testname",
"Testlastname", "message", "[email protected]",
+ invitationService.sendInvitationHash(result.getMessage(),
"Testname", "Testlastname", "message", "[email protected]",
"subject", 1L, "", false, "", 1, date, "12:00",
date, "14:00", 1L, us.getTimeZoneId(), true);
}
}
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1689221&r1=1689220&r2=1689221&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Sun Jul 5 06:19:12 2015
@@ -41,9 +41,9 @@
<maven.javadoc.version>2.10.3</maven.javadoc.version>
<maven.surefire.version>2.18.1</maven.surefire.version>
<maven-site.version>3.4</maven-site.version>
- <wicket.version>7.0.0-M6</wicket.version>
- <wicketju.version>7.0.0-M6</wicketju.version>
- <wickets.version>7.0.0-M5</wickets.version>
+ <wicket.version>7.0.0-SNAPSHOT</wicket.version>
+ <wicketju.version>7.0.0-SNAPSHOT</wicketju.version>
+ <wickets.version>7.0.0-SNAPSHOT</wickets.version>
<red5-server.version>1.0.5-RELEASE</red5-server.version>
<red5-client.version>1.0.5-RELEASE</red5-client.version>
<batik.version>1.7</batik.version>
