Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java Tue Nov 10 02:59:26 2015 @@ -20,6 +20,7 @@ package org.apache.openmeetings.web.page import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.apache.openmeetings.web.app.Application.addOnlineUser; +import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.Application.getClientByKeys; import static org.apache.openmeetings.web.app.Application.removeOnlineUser; import static org.apache.openmeetings.web.app.WebSession.getUserId; @@ -28,19 +29,27 @@ import static org.apache.openmeetings.we import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES; import static org.apache.openmeetings.web.util.OmUrlFragment.getPanel; +import java.util.ArrayList; +import java.util.List; + +import org.apache.openmeetings.db.dao.basic.NavigationDao; +import org.apache.openmeetings.db.entity.basic.Naviglobal; +import org.apache.openmeetings.db.entity.basic.Navimain; +import org.apache.openmeetings.db.util.AuthLevelUtil; import org.apache.openmeetings.web.app.Application; import org.apache.openmeetings.web.app.Client; import org.apache.openmeetings.web.app.WebSession; import org.apache.openmeetings.web.common.BasePanel; import org.apache.openmeetings.web.common.ConfirmableAjaxBorder; -import org.apache.openmeetings.web.common.MenuPanel; +import org.apache.openmeetings.web.common.menu.MainMenuItem; +import org.apache.openmeetings.web.common.menu.MenuItem; +import org.apache.openmeetings.web.common.menu.MenuPanel; import org.apache.openmeetings.web.user.AboutDialog; import org.apache.openmeetings.web.user.ChatPanel; import org.apache.openmeetings.web.util.OmUrlFragment; import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AbstractAjaxTimerBehavior; -import org.apache.wicket.ajax.AjaxClientInfoBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation; @@ -65,26 +74,28 @@ public class MainPage extends BaseInited private static final long serialVersionUID = 1L; private static final Logger log = Red5LoggerFactory.getLogger(MainPage.class, webAppRootKey); private final MenuPanel menu; + private final WebMarkupContainer topLinks = new WebMarkupContainer("topLinks"); private final MarkupContainer contents; private final AbstractAjaxTimerBehavior areaBehavior; private final Component dev; + private final ChatPanel chat; public MainPage(PageParameters pp) { super(); - add(new AjaxClientInfoBehavior()); + getHeader().setVisible(false); + menu = new MenuPanel("menu", getMainMenu()); contents = new WebMarkupContainer("contents"); add(contents.add(new WebMarkupContainer(CHILD_ID)).setOutputMarkupId(true).setMarkupId("contents")); - menu = new MenuPanel("menu"); - add(menu); - add(new AjaxLink<Void>("messages") { - private static final long serialVersionUID = 4065339709905366840L; + add(menu.setVisible(false), topLinks.setVisible(false).setOutputMarkupPlaceholderTag(true).setMarkupId("topLinks")); + topLinks.add(new AjaxLink<Void>("messages") { + private static final long serialVersionUID = 1L; @Override public void onClick(AjaxRequestTarget target) { updateContents(PROFILE_MESSAGES, target); } }); - add(new ConfirmableAjaxBorder("logout", getString("310"), getString("634")) { + topLinks.add(new ConfirmableAjaxBorder("logout", getString("310"), getString("634")) { private static final long serialVersionUID = 1L; @Override @@ -93,8 +104,8 @@ public class MainPage extends BaseInited setResponsePage(Application.get().getSignInPageClass()); } }); - add(new AjaxLink<Void>("profile") { - private static final long serialVersionUID = 4065339709905366840L; + topLinks.add(new AjaxLink<Void>("profile") { + private static final long serialVersionUID = 1L; @Override public void onClick(AjaxRequestTarget target) { @@ -102,8 +113,8 @@ public class MainPage extends BaseInited } }); final AboutDialog about = new AboutDialog("aboutDialog"); - add(new AjaxLink<Void>("about") { - private static final long serialVersionUID = 4065339709905366840L; + topLinks.add(new AjaxLink<Void>("about") { + private static final long serialVersionUID = 1L; @Override public void onClick(AjaxRequestTarget target) { @@ -118,17 +129,17 @@ public class MainPage extends BaseInited dev = null; add(new EmptyPanel("dev").setVisible(false)); } - add(new ExternalLink("bug", "https://issues.apache.org/jira/browse/OPENMEETINGS";));//FIXME hardcoded + topLinks.add(new ExternalLink("bug", "https://issues.apache.org/jira/browse/OPENMEETINGS";));//FIXME hardcoded - add(new ChatPanel("chatPanel")); + add(chat = new ChatPanel("chatPanel")); add(new WebSocketBehavior() { - private static final long serialVersionUID = -3311970325911992958L; + private static final long serialVersionUID = 1L; @Override protected void onConnect(ConnectedMessage message) { super.onConnect(message); - addOnlineUser(new Client(WebSession.get().getId(), message.getKey(), getUserId())); - log.debug("WebSocketBehavior::onConnect"); + addOnlineUser(new Client(message.getSessionId(), message.getKey(), getUserId())); + log.debug(String.format("WebSocketBehavior::onConnect [session: %s, key: %s]", message.getSessionId(), message.getKey())); } @Override @@ -141,7 +152,7 @@ public class MainPage extends BaseInited }); //load preselected content add(areaBehavior = new AbstractAjaxTimerBehavior(Duration.ONE_SECOND) { - private static final long serialVersionUID = -1551197896975384329L; + private static final long serialVersionUID = 1L; @Override protected void onTimer(AjaxRequestTarget target) { @@ -153,23 +164,44 @@ public class MainPage extends BaseInited }); } - public void updateContents(OmUrlFragment f, IPartialPageRequestHandler target) { - updateContents(f, target, true); + private List<MenuItem> getMainMenu() { + List<MenuItem> menu = new ArrayList<MenuItem>(); + for (Naviglobal gl : getBean(NavigationDao.class).getMainMenu(AuthLevelUtil.hasAdminLevel(WebSession.getRights()))) { + MenuItem g = new MenuItem(Application.getString(gl.getLabelId())) { + private static final long serialVersionUID = 1L; + + @Override + public void onClick(MainPage page, AjaxRequestTarget terget) {} + }; + List<MenuItem> l = new ArrayList<MenuItem>(); + for (Navimain nm : gl.getMainnavi()) { + l.add(new MainMenuItem(nm)); + } + if (!l.isEmpty()) { + g.setChildren(l); + } + menu.add(g); + } + return menu; } - public void updateContents(OmUrlFragment f, IPartialPageRequestHandler target, boolean updateFragment) { + public void updateContents(OmUrlFragment f, IPartialPageRequestHandler handler) { + updateContents(f, handler, true); + } + + 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); } /* FIXME commented until wicket 7.2.0 will be released TODO check if this call is necessary @@ -187,4 +219,16 @@ public class MainPage extends BaseInited updateContents(uf, target, false); } } + + public MenuPanel getMenu() { + return menu; + } + + public WebMarkupContainer getTopLinks() { + return topLinks; + } + + public ChatPanel getChat() { + return chat; + } }
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java Tue Nov 10 02:59:26 2015 @@ -23,7 +23,7 @@ import org.apache.openmeetings.web.app.A import org.apache.wicket.RestartResponseException; public class NotInitedPage extends BaseNotInitedPage { - private static final long serialVersionUID = 5002281516467955607L; + private static final long serialVersionUID = 1L; public NotInitedPage() { if (InitializationContainer.initComplete) { Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java Tue Nov 10 02:59:26 2015 @@ -61,8 +61,7 @@ import com.googlecode.wicket.jquery.ui.w public class ForgetPasswordDialog extends AbstractFormDialog<String> { private static final Logger log = Red5LoggerFactory.getLogger(ForgetPasswordDialog.class, webAppRootKey); private static final long serialVersionUID = 1L; - private String sendLbl = Application.getString(317); - private DialogButton send = new DialogButton("send", sendLbl); + private DialogButton send = new DialogButton("send", Application.getString(317)); private DialogButton cancel = new DialogButton("cancel", Application.getString(122)); private FeedbackPanel feedback = new FeedbackPanel("feedback"); private RequiredTextField<String> nameField; @@ -148,8 +147,9 @@ public class ForgetPasswordDialog extend behavior.setOption("closeOnEscape", false); } - public void onClose(IPartialPageRequestHandler target, DialogButton button) { - s.open(target); + @Override + public void onClose(IPartialPageRequestHandler handler, DialogButton button) { + s.open(handler); } }; add(confirmDialog); @@ -214,7 +214,6 @@ public class ForgetPasswordDialog extend // check if Mail given if (email.length() > 0) { - // log.debug("getAdresses_id "+addr_e.getAdresses_id()); User us = userDao.getByEmail(email); if (us != null) { sendHashByUser(us, appLink, userDao); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java Tue Nov 10 02:59:26 2015 @@ -62,7 +62,7 @@ public class KickMessageDialog extends A } @Override - public void onClose(IPartialPageRequestHandler target, DialogButton button) { + public void onClose(IPartialPageRequestHandler handler, DialogButton button) { WebSession.setKickedByAdmin(false); Application.get().restartResponseAtSignInPage(); } Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java Tue Nov 10 02:59:26 2015 @@ -207,6 +207,7 @@ public class RegisterDialog extends Abst } catch (Exception e) { log.error("[registerUser]", e); } + confirmRegistration.open(target); } @@ -255,7 +256,7 @@ public class RegisterDialog extends Abst langField.setRequired(true).setLabel(Model.of(Application.getString(111))); add(tzDropDown.setRequired(true).setLabel(Model.of(Application.getString(1143)))); add(stateField = new DropDownChoice<State>("state", new PropertyModel<State>(RegisterDialog.this, "state"), - getBean(StateDao.class).get(), new ChoiceRenderer<State>("name", "state_id"))); + getBean(StateDao.class).get(), new ChoiceRenderer<State>("name", "id"))); stateField.setRequired(true).setLabel(Model.of(Application.getString(120))); add(new AjaxButton("submit") { // FAKE button so "submit-on-enter" works as expected private static final long serialVersionUID = 1L; Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java Tue Nov 10 02:59:26 2015 @@ -49,7 +49,7 @@ import com.googlecode.wicket.jquery.ui.w import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog; public class ResetPasswordDialog extends AbstractFormDialog<String> { - private static final long serialVersionUID = -523469331995677748L; + private static final long serialVersionUID = 1L; private DialogButton resetBtn = new DialogButton("reset", Application.getString(327)); private Form<String> form; private FeedbackPanel feedback = new FeedbackPanel("feedback"); @@ -61,7 +61,7 @@ public class ResetPasswordDialog extends super(id, Application.getString(325)); this.user = user; add(form = new Form<String>("form"){ - private static final long serialVersionUID = -4553809631029292229L; + private static final long serialVersionUID = 1L; private TextField<String> login; private PasswordTextField confirmPassword; { @@ -79,7 +79,7 @@ public class ResetPasswordDialog extends confirmPassword.setRequired(true).add(minimumLength(getMinPasswdLength(cfgDao))); add(new AjaxButton("submit") { //FAKE button so "submit-on-enter" works as expected - private static final long serialVersionUID = 5257502637636428620L; + private static final long serialVersionUID = 1L; @Override protected void onSubmit(AjaxRequestTarget target, Form<?> form) { @@ -113,7 +113,8 @@ public class ResetPasswordDialog extends behavior.setOption("closeOnEscape", false); } - public void onClose(IPartialPageRequestHandler target, DialogButton button) { + @Override + public void onClose(IPartialPageRequestHandler handler, DialogButton button) { setResponsePage(Application.get().getSignInPageClass()); } }; @@ -162,9 +163,9 @@ public class ResetPasswordDialog extends } @Override - public void onClose(IPartialPageRequestHandler 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()); } @@ -174,7 +175,7 @@ public class ResetPasswordDialog extends protected void onInitialize() { super.onInitialize(); add(new JQueryBehavior(JQueryWidget.getSelector(this), "dialog") { - private static final long serialVersionUID = -8870674570404919597L; + private static final long serialVersionUID = 1L; @Override protected String $() Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java Tue Nov 10 02:59:26 2015 @@ -122,10 +122,10 @@ public class SignInDialog extends Abstra } @Override - public void onClose(IPartialPageRequestHandler target, DialogButton button) { + public void onClose(IPartialPageRequestHandler handler, DialogButton button) { if (registerBtn.equals(button)) { r.setClientTimeZone(); - r.open(target); + r.open(handler); } } @@ -214,7 +214,7 @@ public class SignInDialog extends Abstra domain = ldaps.get(selectedLdap < ldaps.size() && selectedLdap > 0 ? selectedLdap : 0); add(new WebMarkupContainer("ldap") .add(new DropDownChoice<LdapConfig>("domain", new PropertyModel<LdapConfig>(SignInDialog.this, "domain") - , ldaps, new ChoiceRenderer<LdapConfig>("name", "ldapConfigId"))).setVisible(ldaps.size() > 1)); + , ldaps, new ChoiceRenderer<LdapConfig>("name", "id"))).setVisible(ldaps.size() > 1)); add(new CheckBox("rememberMe", new PropertyModel<Boolean>(SignInDialog.this, "rememberMe")).setOutputMarkupId(true)); AjaxButton ab = new AjaxButton("submit") { //FAKE button so "submit-on-enter" works as expected private static final long serialVersionUID = 1L; Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep1.html?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html Tue Nov 10 02:59:26 2015 @@ -38,7 +38,7 @@ </ul> </fieldset> - <fieldset class="ui-widget-content" id="userOrga"> + <fieldset class="ui-widget-content" id="userGroupa"> <legend class="ui-widget-header"><wicket:message key="install.wizard.params.step1.groupdata"/></legend> <ul class="paramList"> <li><label wicket:for="group"><wicket:message key="install.wizard.params.step1.group"/></label> Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java Tue Nov 10 02:59:26 2015 @@ -40,7 +40,6 @@ import org.apache.openmeetings.db.dao.us import org.apache.openmeetings.db.entity.room.Invitation; import org.apache.openmeetings.db.entity.room.Invitation.MessageType; import org.apache.openmeetings.db.entity.room.Invitation.Valid; -import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.user.Organisation; import org.apache.openmeetings.db.entity.user.Organisation_Users; import org.apache.openmeetings.db.entity.user.User; @@ -161,8 +160,7 @@ public class InvitationDialog extends Ab Invitation i = new Invitation(); User u = getBean(UserDao.class).get(getUserId()); i.setInvitedBy(u); - Room r = getBean(RoomDao.class).get(roomId); - i.setRoom(r); + i.setRoom(getBean(RoomDao.class).get(roomId)); Calendar d = Calendar.getInstance(); i.setValidFrom(d.getTime()); d.add(Calendar.DATE, 1); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java Tue Nov 10 02:59:26 2015 @@ -35,7 +35,7 @@ public class RoomBroadcaster { public static void broadcast(String publicSid, String method, Object obj) { Client rc = getClient(publicSid); - final Long roomId = rc.getRoom_id(); + final Long roomId = rc.getRoomId(); final SessionManager sessionMgr = getBean(SessionManager.class); final UserDao userDao = getBean(UserDao.class); ScopeApplicationAdapter sa = getBean(ScopeApplicationAdapter.class); @@ -43,7 +43,7 @@ public class RoomBroadcaster { public boolean filter(IConnection conn) { Client rcl = sessionMgr.getClientByStreamId(conn.getClient().getId(), null); return rcl.isScreenClient() - || rcl.getRoom_id() == null || !rcl.getRoom_id().equals(roomId) || userDao.get(rcl.getUser_id()) == null; + || rcl.getRoomId() == null || !rcl.getRoomId().equals(roomId) || userDao.get(rcl.getUserId()) == null; } }.start(); } Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Tue Nov 10 02:59:26 2015 @@ -51,6 +51,7 @@ import org.apache.wicket.RuntimeConfigur import org.apache.wicket.ajax.AbstractAjaxTimerBehavior; 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; @@ -241,6 +242,13 @@ public class RoomPanel extends BasePanel return false; } + @Override + public void onMenuPanelLoad(IPartialPageRequestHandler handler) { + handler.add(getMainPage().getHeader().setVisible(false), getMainPage().getMenu().setVisible(false) + , getMainPage().getTopLinks().setVisible(false)); + //handler.appendJavaScript("roomLoad();"); + } + private ResourceReference newResourceReference() { return new JavaScriptResourceReference(RoomPanel.class, "swf-functions.js"); } Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html Tue Nov 10 02:59:26 2015 @@ -26,16 +26,16 @@ <th colspan="2"><wicket:message key="19" /></th> </tr> <tr> - <td><label wicket:for="pollName"><wicket:message key="1410" /></label></td> - <td><input type="text" wicket:id="pollName" class="input"/></td> + <td><label wicket:for="name"><wicket:message key="1410" /></label></td> + <td><input type="text" wicket:id="name" class="input"/></td> </tr> <tr> - <td><label wicket:for="pollQuestion"><wicket:message key="20" /></label></td> - <td><textarea wicket:id="pollQuestion" style="width: 280px; height: 70px;"></textarea></td> + <td><label wicket:for="question"><wicket:message key="20" /></label></td> + <td><textarea wicket:id="question" style="width: 280px; height: 70px;"></textarea></td> </tr> <tr> - <td><label wicket:for="pollType"><wicket:message key="21" /></label></td> - <td><select wicket:id="pollType"/></td> + <td><label wicket:for="type"><wicket:message key="21" /></label></td> + <td><select wicket:id="type"/></td> </tr> <tr> <td colspan="2" style="color: red;"><wicket:message key="23" /></td> Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java Tue Nov 10 02:59:26 2015 @@ -28,7 +28,6 @@ import java.util.List; import org.apache.openmeetings.db.dao.room.PollDao; import org.apache.openmeetings.db.dao.room.RoomDao; import org.apache.openmeetings.db.dao.user.UserDao; -import org.apache.openmeetings.db.entity.room.PollType; import org.apache.openmeetings.db.entity.room.RoomPoll; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.web.app.Application; @@ -66,9 +65,9 @@ public class CreatePollDialog extends Ab this.publicSid = publicSid; RoomPoll p = new RoomPoll(); User u = getBean(UserDao.class).get(getUserId()); - p.setCreatedBy(u); + p.setCreator(u); p.setRoom(getBean(RoomDao.class).get(roomId)); - p.setPollType(getBean(PollDao.class).getPollTypes().get(0)); + p.setType(RoomPoll.Type.yesNo); form.setModelObject(p); target.add(form); } @@ -95,8 +94,8 @@ public class CreatePollDialog extends Ab @Override protected void onSubmit(AjaxRequestTarget target) { - getBean(PollDao.class).closePoll(roomId); - RoomPoll p = getBean(PollDao.class).updatePoll(form.getModelObject()); + getBean(PollDao.class).close(roomId); + RoomPoll p = getBean(PollDao.class).update(form.getModelObject()); broadcast(publicSid, "newPoll", p); } @@ -105,20 +104,20 @@ public class CreatePollDialog extends Ab public PollForm(String id, IModel<RoomPoll> model) { super(id, model); - add(new RequiredTextField<String>("pollName").setLabel(Model.of(Application.getString(1410)))); - add(new TextArea<String>("pollQuestion")); - add(new DropDownChoice<PollType>("pollType", getBean(PollDao.class).getPollTypes() - , new ChoiceRenderer<PollType>() { + add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString(1410)))); + add(new TextArea<String>("question")); + add(new DropDownChoice<RoomPoll.Type>("type", Arrays.asList(RoomPoll.Type.values()) + , new ChoiceRenderer<RoomPoll.Type>() { private static final long serialVersionUID = 1L; @Override - public Object getDisplayValue(PollType pt) { - return getString("" + pt.getLabel()); + public Object getDisplayValue(RoomPoll.Type pt) { + return getString("poll.type." + pt.name()); } @Override - public String getIdValue(PollType pt, int index) { - return "" + pt.getPollTypesId(); + public String getIdValue(RoomPoll.Type pt, int index) { + return pt.name(); } }) .setRequired(true).setLabel(Model.of(Application.getString(21)))); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java Tue Nov 10 02:59:26 2015 @@ -46,12 +46,6 @@ import org.wicketstuff.jqplot.behavior.J import org.wicketstuff.jqplot.behavior.JqPlotCssResourceReference; import org.wicketstuff.jqplot.behavior.JqPlotJavascriptResourceReference; -import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog; -import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton; -import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons; -import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon; -import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog; - import br.com.digilabs.jqplot.Chart; import br.com.digilabs.jqplot.ChartConfiguration; import br.com.digilabs.jqplot.JqPlotResources; @@ -62,6 +56,12 @@ import br.com.digilabs.jqplot.elements.H import br.com.digilabs.jqplot.elements.Location; import br.com.digilabs.jqplot.elements.RendererOptions; +import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog; +import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton; +import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons; +import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon; +import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog; + /** * @author solomax * @@ -91,11 +91,11 @@ public class PollResultsDialog extends A public void onClose(IPartialPageRequestHandler handler, DialogButton button) { // TODO should rights be additionally checked here???? if(button != null && button.match(YES)) { - Long id = dispForm.getModelObject().getRoomPollId(); - getBean(PollDao.class).closePoll(roomId); + Long id = dispForm.getModelObject().getId(); + getBean(PollDao.class).close(roomId); selForm.updateModel(handler); - RoomPoll p = getBean(PollDao.class).getPoll(id); + RoomPoll p = getBean(PollDao.class).get(id); selForm.select.setModelObject(p); dispForm.updateModel(p, false, handler); //TODO result dialogs of other users should also be updated @@ -109,7 +109,7 @@ public class PollResultsDialog extends A public void onClose(IPartialPageRequestHandler handler, DialogButton button) { // TODO should rights be additionally checked here???? if(button != null && button.match(YES)) { - getBean(PollDao.class).deletePoll(dispForm.getModelObject().getRoomPollId()); + getBean(PollDao.class).delete(dispForm.getModelObject()); selForm.updateModel(handler); dispForm.updateModel(selForm.select.getModelObject(), true, handler); //TODO result dialogs of other users should also be updated @@ -196,7 +196,7 @@ public class PollResultsDialog extends A } private String[] getTicks(RoomPoll p) { - return p != null && p.getPollType().getIsNumericAnswer() + return p != null && RoomPoll.Type.numeric == p.getType() ? new String[] {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10"} : new String[] {Application.getString(34), Application.getString(35)}; } @@ -210,13 +210,13 @@ public class PollResultsDialog extends A } private Integer[] getValues(RoomPoll p) { - Integer[] values = initValues(p != null && p.getPollType().getIsNumericAnswer() ? 10 : 2); - if (p != null && p.getPollType().getIsNumericAnswer()) { - for (RoomPollAnswer a : p.getRoomPollAnswerList()) { + Integer[] values = initValues(p != null && RoomPoll.Type.numeric == p.getType() ? 10 : 2); + if (p != null && RoomPoll.Type.numeric == p.getType()) { + for (RoomPollAnswer a : p.getAnswers()) { values[a.getPointList() - 1] ++; } } else if (p != null) { - for (RoomPollAnswer a : p.getRoomPollAnswerList()) { + for (RoomPollAnswer a : p.getAnswers()) { values[a.getAnswer() ? 0 : 1] ++; } } @@ -284,12 +284,12 @@ public class PollResultsDialog extends A @Override public Object getDisplayValue(RoomPoll object) { - return object == null ? "" : String.format("%s%s", object.getPollName(), object.isArchived() ? "" : String.format(" (%s)", Application.getString(1413))); + return object == null ? "" : String.format("%s%s", object.getName(), object.isArchived() ? "" : String.format(" (%s)", Application.getString(1413))); } @Override public String getIdValue(RoomPoll object, int index) { - return object == null ? "" : "" + object.getRoomPollId(); + return object == null ? "" : "" + object.getId(); } })).add(new AjaxFormComponentUpdatingBehavior("change") { private static final long serialVersionUID = 1L; @@ -304,11 +304,11 @@ public class PollResultsDialog extends A public void updateModel(IPartialPageRequestHandler handler) { List<RoomPoll> list = new ArrayList<RoomPoll>(); - RoomPoll p = getBean(PollDao.class).getPoll(roomId); + RoomPoll p = getBean(PollDao.class).getByRoom(roomId); if (p != null) { list.add(p); } - list.addAll(getBean(PollDao.class).getArchivedPollList(roomId)); + list.addAll(getBean(PollDao.class).getArchived(roomId)); select.setChoices(list); select.setModelObject(list.isEmpty() ? null : list.get(0)); if (handler != null) { @@ -344,8 +344,8 @@ public class PollResultsDialog extends A public void updateModel(RoomPoll poll, boolean redraw, IPartialPageRequestHandler handler) { setModelObject(poll); - name.setObject(poll == null ? "" : VoteDialog.getName(poll.getCreatedBy())); - count.setObject(poll == null ? 0 : poll.getRoomPollAnswerList().size()); + name.setObject(poll == null ? "" : VoteDialog.getName(poll.getCreator())); + count.setObject(poll == null ? 0 : poll.getAnswers().size()); handler.add(this); close.setVisible(moderator && (poll != null && !poll.isArchived()), handler); delete.setVisible(moderator, handler); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html Tue Nov 10 02:59:26 2015 @@ -26,7 +26,7 @@ <td colspan="2"><span wicket:id="user"></span> <wicket:message key="36" /></td> </tr> <tr> - <td colspan="2"><span wicket:id="roomPoll.pollQuestion"></span></td> + <td colspan="2"><span wicket:id="roomPoll.question"></span></td> </tr> <tr> <td><wicket:message key="33" /></td> Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java Tue Nov 10 02:59:26 2015 @@ -27,10 +27,12 @@ import java.util.List; import org.apache.openmeetings.db.dao.room.PollDao; import org.apache.openmeetings.db.dao.user.UserDao; +import org.apache.openmeetings.db.entity.room.RoomPoll; import org.apache.openmeetings.db.entity.room.RoomPollAnswer; import org.apache.openmeetings.db.entity.user.User; 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.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.DropDownChoice; @@ -70,14 +72,14 @@ 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)); + a.setRoomPoll(getBean(PollDao.class).getByRoom(roomId)); User u = getBean(UserDao.class).get(getUserId()); a.setVotedUser(u); - user.setObject(getName(a.getRoomPoll().getCreatedBy())); + user.setObject(getName(a.getRoomPoll().getCreator())); form.setModelObject(a); - boolean typeNum = a.getRoomPoll() != null && a.getRoomPoll().getPollType() != null && a.getRoomPoll().getPollType().getIsNumericAnswer(); + boolean typeNum = a.getRoomPoll() != null && RoomPoll.Type.numeric == a.getRoomPoll().getType(); form.typeBool.setVisible(!typeNum); form.typeInt.setVisible(typeNum); target.add(form); @@ -119,8 +121,8 @@ public class VoteDialog extends Abstract protected void onSubmit(AjaxRequestTarget target) { RoomPollAnswer a = form.getModelObject(); a.setVoteDate(new Date()); - a.getRoomPoll().getRoomPollAnswerList().add(a); - getBean(PollDao.class).updatePoll(a.getRoomPoll()); + a.getRoomPoll().getAnswers().add(a); + getBean(PollDao.class).update(a.getRoomPoll()); } @Override @@ -137,7 +139,7 @@ public class VoteDialog extends Abstract super(id, model); add(feedback); add(new Label("user", user)); - add(new Label("roomPoll.pollQuestion")); + add(new Label("roomPoll.question")); add(typeBool.add(new RadioGroup<Boolean>("answer").setRequired(true) .add(new Radio<Boolean>("true", Model.of(Boolean.TRUE))).add(new Radio<Boolean>("false", Model.of(Boolean.FALSE))) ).setOutputMarkupPlaceholderTag(true).setVisible(false)); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java Tue Nov 10 02:59:26 2015 @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.web.user.dashboard; +import org.apache.openmeetings.db.util.FormatHelper; import org.apache.openmeetings.web.app.WebSession; import org.apache.openmeetings.web.common.UserPanel; import org.apache.wicket.model.Model; @@ -26,11 +27,12 @@ import ro.fortsoft.wicket.dashboard.Dash import ro.fortsoft.wicket.dashboard.web.DashboardPanel; public class OmDashboardPanel extends UserPanel { - private static final long serialVersionUID = 7815949875883825949L; + private static final long serialVersionUID = 1L; public OmDashboardPanel(String id) { super(id); - add(new DashboardPanel("dashboard", new Model<Dashboard>(WebSession.getDashboard())).setRtlModel(Model.of(isRtl()))); + boolean isRtl = FormatHelper.isRtlLanguage(WebSession.get().getLocale().toLanguageTag()); + add(new DashboardPanel("dashboard", new Model<Dashboard>(WebSession.getDashboard())).setRtlModel(Model.of(isRtl))); } } Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java Tue Nov 10 02:59:26 2015 @@ -23,7 +23,7 @@ import org.apache.openmeetings.web.app.A import ro.fortsoft.wicket.dashboard.WidgetDescriptor; public class RssWidgetDescriptor implements WidgetDescriptor { - private static final long serialVersionUID = -9113376703084624276L; + private static final long serialVersionUID = 1L; public String getName() { return Application.getString(277L); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java Tue Nov 10 02:59:26 2015 @@ -41,7 +41,7 @@ import ro.fortsoft.wicket.dashboard.Widg import ro.fortsoft.wicket.dashboard.web.WidgetView; public class RssWidgetView extends WidgetView { - private static final long serialVersionUID = -6257866996099503210L; + private static final long serialVersionUID = 1L; private RSSFeedBehavior feed1; private RSSFeedBehavior feed2; @@ -59,8 +59,8 @@ public class RssWidgetView extends Widge + "'" + feed2.getCallbackUrl() + "');")) ; } - class RSSFeedBehavior extends AbstractAjaxBehavior { - private static final long serialVersionUID = 721009368063152450L; + static class RSSFeedBehavior extends AbstractAjaxBehavior { + private static final long serialVersionUID = 1L; private String url; RSSFeedBehavior(String url) { @@ -69,8 +69,8 @@ public class RssWidgetView extends Widge public void onRequest() { ResourceStreamRequestHandler handler = new ResourceStreamRequestHandler(new AbstractResourceStream() { - private static final long serialVersionUID = -322593118428697261L; - HttpURLConnection con; + private static final long serialVersionUID = 1L; + transient HttpURLConnection con; public InputStream getInputStream() throws ResourceStreamNotFoundException { try { Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java Tue Nov 10 02:59:26 2015 @@ -23,7 +23,7 @@ import org.apache.openmeetings.web.app.A import ro.fortsoft.wicket.dashboard.WidgetDescriptor; public class StartWidgetDescriptor implements WidgetDescriptor { - private static final long serialVersionUID = 2533010836978961930L; + private static final long serialVersionUID = 1L; public String getName() { return Application.getString(774L); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html Tue Nov 10 02:59:26 2015 @@ -27,7 +27,7 @@ <div><div wicket:id="step4" class="clickable start_step4"><wicket:message key="773"/></div></div> <table> <tr> - <td><span wicket:id="desc"></span></td> + <td><wicket:message key="804" escape="false"/></td> <td> <button wicket:id="start" type="button"><wicket:message key="788"/></button><br/> <button wicket:id="calendar" type="button"><wicket:message key="291"/></button> Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java Tue Nov 10 02:59:26 2015 @@ -21,21 +21,19 @@ package org.apache.openmeetings.web.user import static org.apache.openmeetings.web.util.OmUrlFragment.CALENDAR; import static org.apache.openmeetings.web.util.OmUrlFragment.ROOMS_PUBLIC; -import org.apache.openmeetings.web.app.Application; import org.apache.openmeetings.web.pages.MainPage; import org.apache.wicket.ajax.AjaxEventBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.html.WebMarkupContainer; -import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.Model; -import com.googlecode.wicket.jquery.ui.form.button.Button; - import ro.fortsoft.wicket.dashboard.Widget; import ro.fortsoft.wicket.dashboard.web.WidgetView; +import com.googlecode.wicket.jquery.ui.form.button.Button; + public class StartWidgetView extends WidgetView { - private static final long serialVersionUID = -3886388347737468022L; + private static final long serialVersionUID = 1L; public StartWidgetView(String id, Model<Widget> model) { super(id, model); @@ -43,7 +41,6 @@ public class StartWidgetView extends Wid add(new WebMarkupContainer("step2").add(new PublicRoomsEventBehavior())); add(new WebMarkupContainer("step3").add(new PublicRoomsEventBehavior())); add(new WebMarkupContainer("step4").add(new PublicRoomsEventBehavior())); - add(new Label("desc", Application.getString(804L))); add(new Button("start").add(new PublicRoomsEventBehavior())); add(new Button("calendar").add(new AjaxEventBehavior("click") { private static final long serialVersionUID = 1L; Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java Tue Nov 10 02:59:26 2015 @@ -23,7 +23,7 @@ import org.apache.openmeetings.web.app.A import ro.fortsoft.wicket.dashboard.WidgetDescriptor; public class WelcomeWidgetDescriptor implements WidgetDescriptor { - private static final long serialVersionUID = 7835392425157215242L; + private static final long serialVersionUID = 1L; public String getName() { return Application.getString(1546L); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java Tue Nov 10 02:59:26 2015 @@ -41,7 +41,7 @@ import ro.fortsoft.wicket.dashboard.Widg import ro.fortsoft.wicket.dashboard.web.WidgetView; public class WelcomeWidgetView extends WidgetView { - private static final long serialVersionUID = -6257866996099503210L; + private static final long serialVersionUID = 1L; public WelcomeWidgetView(String id, Model<Widget> model) { super(id, model); @@ -53,7 +53,7 @@ public class WelcomeWidgetView extends W add(new Label("lastname", Model.of(u.getLastname()))); add(new Label("tz", Model.of(u.getTimeZoneId()))); add(new AjaxLink<Void>("openUnread") { - private static final long serialVersionUID = -1847619557485964386L; + private static final long serialVersionUID = 1L; @Override public void onClick(AjaxRequestTarget target) { @@ -61,7 +61,7 @@ public class WelcomeWidgetView extends W } }.add(new Label("unread", Model.of("" + getBean(PrivateMessageDao.class).count(getUserId(), INBOX_FOLDER_ID, null))))); add(new AjaxLink<Void>("editProfile") { - private static final long serialVersionUID = -1847619557485964386L; + private static final long serialVersionUID = 1L; @Override public void onClick(AjaxRequestTarget target) { @@ -69,7 +69,7 @@ public class WelcomeWidgetView extends W } }); add(new Link<Void>("netTest") { - private static final long serialVersionUID = -9055312659797800331L; + private static final long serialVersionUID = 1L; @Override public void onClick() { Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java Tue Nov 10 02:59:26 2015 @@ -33,8 +33,8 @@ import java.util.List; import java.util.Set; import org.apache.openmeetings.db.dao.calendar.AppointmentDao; -import org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao; import org.apache.openmeetings.db.dao.user.PrivateMessageDao; +import org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao; import org.apache.openmeetings.db.dao.user.UserContactDao; import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.db.entity.room.Room; @@ -160,7 +160,7 @@ public class MessagesContactsPanel exten private void setFolderClass(ListItem<PrivateMessageFolder> folder) { folder.add(AttributeAppender.replace("class", "email folder clickable")); - if (folder.getModelObject().getId() == selectedFolderModel.getObject()) { + if (folder.getModelObject().getId().equals(selectedFolderModel.getObject())) { selectFolder(folder); } } @@ -267,9 +267,9 @@ public class MessagesContactsPanel exten private static final long serialVersionUID = 1L; @Override - public void onClose(IPartialPageRequestHandler target, DialogButton button) { + public void onClose(IPartialPageRequestHandler handler, DialogButton button) { if (send.equals(button)) { - target.add(container); + handler.add(container); } } }); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java Tue Nov 10 02:59:26 2015 @@ -42,7 +42,7 @@ public class ProfileForm extends Form<Us super(id, new CompoundPropertyModel<User>(getBean(UserDao.class).get(getUserId()))); add(new FormSaveRefreshPanel<User>("buttons", this) { - private static final long serialVersionUID = 6578425915881674309L; + private static final long serialVersionUID = 1L; @Override protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) { Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java Tue Nov 10 02:59:26 2015 @@ -21,7 +21,7 @@ package org.apache.openmeetings.web.user import org.apache.openmeetings.web.common.UserPanel; public class ProfilePanel extends UserPanel { - private static final long serialVersionUID = -5837090230776586182L; + private static final long serialVersionUID = 1L; public ProfilePanel(String id) { super(id); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.java Tue Nov 10 02:59:26 2015 @@ -26,7 +26,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; public class UserForm extends GeneralUserForm { - private static final long serialVersionUID = 1305752513494262480L; + private static final long serialVersionUID = 1L; private final PasswordTextField confirmPassword; public UserForm(String id, IModel<User> model) { Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java Tue Nov 10 02:59:26 2015 @@ -27,7 +27,6 @@ import java.util.List; import org.apache.openmeetings.db.dao.user.UserContactDao; 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; @@ -35,7 +34,7 @@ import com.googlecode.wicket.jquery.ui.w import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton; public class UserInfoDialog extends AbstractDialog<String> { - private static final long serialVersionUID = 6393565468567393270L; + private static final long serialVersionUID = 1L; private WebMarkupContainer container = new WebMarkupContainer("container"); private DialogButton cancel = new DialogButton("cancel", Application.getString(61)); private DialogButton message = new DialogButton("message", Application.getString(1253)); @@ -49,13 +48,13 @@ 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; - contacts.setVisible(userId != getUserId() && getBean(UserContactDao.class).get(userId, getUserId()) == null, target); - message.setVisible(userId != getUserId(), target); + contacts.setVisible(userId != getUserId() && getBean(UserContactDao.class).get(userId, getUserId()) == null, handler); + message.setVisible(userId != getUserId(), handler); container.replace(new UserProfilePanel("body", userId)); - target.add(container); - open(target); + handler.add(container); + open(handler); } public WebMarkupContainer getContainer() { @@ -72,9 +71,10 @@ public class UserInfoDialog extends Abst return Arrays.asList(contacts, message, cancel); } - public void onClose(IPartialPageRequestHandler 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html Tue Nov 10 02:59:26 2015 @@ -72,7 +72,7 @@ </tr> <tr> <td><wicket:message key="141" /></td> - <td><span wicket:id="address.states.name"></span></td> + <td><span wicket:id="address.state.name"></span></td> </tr> <tr> <td><wicket:message key="142" /></td> Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java Tue Nov 10 02:59:26 2015 @@ -51,8 +51,8 @@ public class UserProfilePanel extends Us add(new Label("regdate")); add(new TextArea<String>("userOffers").setEnabled(false)); add(new TextArea<String>("userSearchs").setEnabled(false)); - if (getUserId() == model.getObject().getId() || model.getObject().getShowContactData() - || (model.getObject().getShowContactDataToContacts() && getBean(UserContactDao.class).isContact(model.getObject().getId(), getUserId()))) + if (getUserId() == model.getObject().getId() || model.getObject().isShowContactData() + || (model.getObject().isShowContactDataToContacts() && getBean(UserContactDao.class).isContact(model.getObject().getId(), getUserId()))) { addressDenied.setVisible(false); address.add(new Label("address.phone")); @@ -60,11 +60,11 @@ public class UserProfilePanel extends Us address.add(new Label("address.additionalname")); address.add(new Label("address.zip")); address.add(new Label("address.town")); - address.add(new Label("address.states.name")); + address.add(new Label("address.state.name")); address.add(new Label("address.comment")); } else { address.setVisible(false); - addressDenied.setDefaultModelObject(Application.getString(Boolean.TRUE.equals(model.getObject().getShowContactDataToContacts()) ? 1269 : 1268)); + addressDenied.setDefaultModelObject(Application.getString(Boolean.TRUE.equals(model.getObject().isShowContactDataToContacts()) ? 1269 : 1268)); } add(address.setDefaultModel(model)); add(addressDenied); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java Tue Nov 10 02:59:26 2015 @@ -68,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(IPartialPageRequestHandler target) { - target.add(container.add(fixedHeader)); + private void refresh(IPartialPageRequestHandler handler) { + handler.add(container.add(fixedHeader)); } public UserSearchPanel(String id) { @@ -96,9 +96,9 @@ public class UserSearchPanel extends Use private static final long serialVersionUID = 1L; @Override - public void onClose(IPartialPageRequestHandler target, DialogButton button) { + public void onClose(IPartialPageRequestHandler handler, DialogButton button) { if (send.equals(button)) { - refresh(target); + refresh(handler); } } }); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html Tue Nov 10 02:59:26 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java Tue Nov 10 02:59:26 2015 @@ -105,7 +105,7 @@ public class RoomsPanel extends UserPane @Override protected void populateItem(final ListItem<Client> item) { Client client = item.getModelObject(); - final Long userId = client.getUser_id(); + final Long userId = client.getUserId(); item.add(new Image("clientImage", new ByteArrayResource("image/jpeg") { private static final long serialVersionUID = 1L; Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/AviRecordingResourceReference.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/AviRecordingResourceReference.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/AviRecordingResourceReference.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/AviRecordingResourceReference.java Tue Nov 10 02:59:26 2015 @@ -25,7 +25,7 @@ import java.io.File; import org.apache.openmeetings.db.entity.record.Recording; public class AviRecordingResourceReference extends RecordingResourceReference { - private static final long serialVersionUID = 6181482949621024822L; + private static final long serialVersionUID = 1L; public AviRecordingResourceReference() { super(AviRecordingResourceReference.class); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java Tue Nov 10 02:59:26 2015 @@ -20,7 +20,6 @@ package org.apache.openmeetings.web.util import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.WebSession.getUserId; -import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES; import java.util.Date; @@ -96,8 +95,4 @@ public class ContactsHelper { } return userContactId; } - - public static String getLink() { - return PROFILE_MESSAGES.getLink(); - } } Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FlvRecordingResourceReference.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FlvRecordingResourceReference.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FlvRecordingResourceReference.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FlvRecordingResourceReference.java Tue Nov 10 02:59:26 2015 @@ -25,7 +25,7 @@ import java.io.File; import org.apache.openmeetings.db.entity.record.Recording; public class FlvRecordingResourceReference extends RecordingResourceReference { - private static final long serialVersionUID = 6181482949621024822L; + private static final long serialVersionUID = 1L; public FlvRecordingResourceReference() { super(FlvRecordingResourceReference.class); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/JpgRecordingResourceReference.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/JpgRecordingResourceReference.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/JpgRecordingResourceReference.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/JpgRecordingResourceReference.java Tue Nov 10 02:59:26 2015 @@ -25,7 +25,7 @@ import java.io.File; import org.apache.openmeetings.db.entity.record.Recording; public class JpgRecordingResourceReference extends RecordingResourceReference { - private static final long serialVersionUID = 6181482949621024822L; + private static final long serialVersionUID = 1L; public JpgRecordingResourceReference() { super(JpgRecordingResourceReference.class); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/Mp4RecordingResourceReference.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/Mp4RecordingResourceReference.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/Mp4RecordingResourceReference.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/Mp4RecordingResourceReference.java Tue Nov 10 02:59:26 2015 @@ -26,7 +26,7 @@ import java.io.File; import org.apache.openmeetings.db.entity.record.Recording; public class Mp4RecordingResourceReference extends RecordingResourceReference { - private static final long serialVersionUID = 6181482949621024822L; + private static final long serialVersionUID = 1L; public Mp4RecordingResourceReference() { super(Mp4RecordingResourceReference.class); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OggRecordingResourceReference.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OggRecordingResourceReference.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OggRecordingResourceReference.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OggRecordingResourceReference.java Tue Nov 10 02:59:26 2015 @@ -26,7 +26,7 @@ import java.io.File; import org.apache.openmeetings.db.entity.record.Recording; public class OggRecordingResourceReference extends RecordingResourceReference { - private static final long serialVersionUID = 6181482949621024822L; + private static final long serialVersionUID = 1L; public OggRecordingResourceReference() { super(OggRecordingResourceReference.class); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java Tue Nov 10 02:59:26 2015 @@ -26,6 +26,8 @@ import static org.apache.openmeetings.we import java.io.Serializable; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; +import org.apache.openmeetings.db.dao.room.RoomDao; +import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.web.admin.backup.BackupPanel; import org.apache.openmeetings.web.admin.configurations.ConfigsPanel; import org.apache.openmeetings.web.admin.connection.ConnectionsPanel; @@ -45,7 +47,7 @@ import org.apache.openmeetings.web.user. import org.apache.openmeetings.web.user.rooms.RoomsSelectorPanel; public class OmUrlFragment implements Serializable { - private static final long serialVersionUID = 7382435810352033914L; + private static final long serialVersionUID = 1L; private AreaKeys area = AreaKeys.user; private String type = ""; public static final String CHILD_ID = "child"; @@ -256,10 +258,16 @@ public class OmUrlFragment implements Se try { Long roomId = Long.parseLong(type); if (roomId != null) { - basePanel = new RoomPanel(CHILD_ID, roomId); + Room r = getBean(RoomDao.class).get(roomId); + if (r != null) { + basePanel = new RoomPanel(CHILD_ID, roomId); + } } } catch(NumberFormatException ne) { - //skipit, bad roomid passed + //skip it, bad roomid passed + } + if (basePanel == null) { + basePanel = new OmDashboardPanel(CHILD_ID); } break; case rooms: @@ -287,10 +295,6 @@ public class OmUrlFragment implements Se } public String getLink() { - return getLink(getBean(ConfigurationDao.class).getBaseUrl()); - } - - public String getLink(String baseUrl) { - return baseUrl + "#" + getArea().name() + "/" + getType(); + return getBean(ConfigurationDao.class).getBaseUrl() + "#" + getArea().name() + "/" + getType(); } } Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java Tue Nov 10 02:59:26 2015 @@ -25,29 +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.RecordingDao; import org.apache.openmeetings.db.dao.user.OrganisationUserDao; import org.apache.openmeetings.db.entity.record.Recording; 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.io.Streams; -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; @@ -67,111 +65,58 @@ 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 = 2546785247219805747L; - 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(); Recording 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(); + 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 { - final Response response = attributes.getResponse(); - Streams.copy(rStream.getInputStream(), response.getOutputStream()); - } 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(); + IOUtils.close(rs); + } catch (IOException e) { + log.warn("Unable to close the resource stream", e); } } - }); + } } else { rr.setError(HttpServletResponse.SC_NOT_FOUND); } @@ -180,6 +125,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(Recording r); abstract File getFile(Recording r); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java Tue Nov 10 02:59:26 2015 @@ -99,7 +99,7 @@ public class UserChoiceProvider implemen @Override public Collection<User> toChoices(Collection<String> ids) { - Collection<User> c = new ArrayList<User>(); + Collection<User> c = new ArrayList<>(); for (String id : ids) { if (newContacts.containsKey(id)) { c.add(newContacts.get(id)); @@ -110,12 +110,13 @@ public class UserChoiceProvider implemen return c; } - public void toJson(User choice, JSONWriter writer) throws JSONException { - writer - .key("id").value(getId(choice)) - .key("text").value(FormatHelper.formatUser(choice, true)) - .key("contact").value(choice.getType() == Type.contact); - }; + @Override + public void toJson(User choice, JSONWriter writer) throws JSONException { + writer + .key("id").value(getId(choice)) + .key("text").value(FormatHelper.formatUser(choice, true)) + .key("contact").value(choice.getType() == Type.contact); + } @Override public void detach() { Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java?rev=1713575&r1=1713574&r2=1713575&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java Tue Nov 10 02:59:26 2015 @@ -48,7 +48,7 @@ public class UserDashboardPersister impl new XStreamDashboardPersister().save(dashboard); } - public class XStreamDashboardPersister implements DashboardPersister { + public static class XStreamDashboardPersister implements DashboardPersister { private File file; private XStream xstream;
