Author: solomax
Date: Tue May 28 11:49:49 2013
New Revision: 1486889
URL: http://svn.apache.org/r1486889
Log:
[OPENMEETINGS-650] room creation/editing works as expected
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminBaseForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LabelsForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminBaseForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminBaseForm.java?rev=1486889&r1=1486888&r2=1486889&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminBaseForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminBaseForm.java
Tue May 28 11:49:49 2013
@@ -30,7 +30,7 @@ import org.apache.wicket.model.IModel;
*
* @param <T>
*/
-public class AdminBaseForm<T> extends Form<T> {
+public abstract class AdminBaseForm<T> extends Form<T> {
private static final long serialVersionUID = 1L;
private AdminSavePanel<T> savePanel;
@@ -106,8 +106,7 @@ public class AdminBaseForm<T> extends Fo
* @param target
* @param form
*/
- protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
- }
+ protected abstract void onSaveSubmit(AjaxRequestTarget target, Form<?>
form);
/**
* invoked when save has error
@@ -115,8 +114,7 @@ public class AdminBaseForm<T> extends Fo
* @param target
* @param form
*/
- protected void onSaveError(AjaxRequestTarget target, Form<?> form) {
- }
+ protected abstract void onSaveError(AjaxRequestTarget target, Form<?>
form);
/**
* invoked when new button is pressed
@@ -124,8 +122,7 @@ public class AdminBaseForm<T> extends Fo
* @param target
* @param form
*/
- protected void onNewSubmit(AjaxRequestTarget target, Form<?> form) {
- }
+ protected abstract void onNewSubmit(AjaxRequestTarget target, Form<?>
form);
/**
* invoked if new has error
@@ -133,8 +130,7 @@ public class AdminBaseForm<T> extends Fo
* @param target
* @param form
*/
- protected void onNewError(AjaxRequestTarget target, Form<?> form) {
- }
+ protected abstract void onNewError(AjaxRequestTarget target, Form<?>
form);
/**
* invoked when refresh button is pressed
@@ -142,8 +138,7 @@ public class AdminBaseForm<T> extends Fo
* @param target
* @param form
*/
- protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
- }
+ protected abstract void onRefreshSubmit(AjaxRequestTarget target,
Form<?> form);
/**
* invoked when refresh has error
@@ -151,8 +146,7 @@ public class AdminBaseForm<T> extends Fo
* @param target
* @param form
*/
- protected void onRefreshError(AjaxRequestTarget target, Form<?> form) {
- }
+ protected abstract void onRefreshError(AjaxRequestTarget target,
Form<?> form);
/**
* invoked when delete button is pressed
@@ -160,8 +154,7 @@ public class AdminBaseForm<T> extends Fo
* @param target
* @param form
*/
- protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
- }
+ protected abstract void onDeleteSubmit(AjaxRequestTarget target,
Form<?> form);
/**
* invoked when delete has error
@@ -169,7 +162,6 @@ public class AdminBaseForm<T> extends Fo
* @param target
* @param form
*/
- protected void onDeleteError(AjaxRequestTarget target, Form<?> form) {
- }
+ protected abstract void onDeleteError(AjaxRequestTarget target, Form<?>
form);
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java?rev=1486889&r1=1486888&r2=1486889&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
Tue May 28 11:49:49 2013
@@ -114,4 +114,24 @@ public class ConfigForm extends AdminBas
target.add(listContainer);
refresh(target);
}
+
+ @Override
+ protected void onSaveError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onNewError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onRefreshError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onDeleteError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1486889&r1=1486888&r2=1486889&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java
Tue May 28 11:49:49 2013
@@ -18,11 +18,12 @@
*/
package org.apache.openmeetings.web.admin.groups;
+import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
+
import org.apache.openmeetings.data.user.dao.OrganisationDao;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.apache.openmeetings.web.admin.AdminBaseForm;
-import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.OmAjaxFormValidatingBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -70,7 +71,7 @@ public class GroupForm extends AdminBase
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
Organisation org = getModelObject();
if (org.getOrganisation_id() != null) {
- org =
Application.getBean(OrganisationDao.class).get(org.getOrganisation_id());
+ org =
getBean(OrganisationDao.class).get(org.getOrganisation_id());
} else {
org = new Organisation();
}
@@ -80,16 +81,36 @@ public class GroupForm extends AdminBase
@Override
protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
-
Application.getBean(OrganisationDao.class).delete(getModelObject(),
WebSession.getUserId());
+ getBean(OrganisationDao.class).delete(getModelObject(),
getUserId());
target.add(groupList);
target.appendJavaScript("groupsInit();");
}
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
-
Application.getBean(OrganisationDao.class).update(getModelObject(),
WebSession.getUserId());
+ getBean(OrganisationDao.class).update(getModelObject(),
getUserId());
hideNewRecord();
target.add(groupList);
target.appendJavaScript("groupsInit();");
}
+
+ @Override
+ protected void onSaveError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onNewError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onRefreshError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onDeleteError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LabelsForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LabelsForm.java?rev=1486889&r1=1486888&r2=1486889&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LabelsForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LabelsForm.java
Tue May 28 11:49:49 2013
@@ -96,4 +96,23 @@ public class LabelsForm extends AdminBas
target.appendJavaScript("labelsInit();");
}
+ @Override
+ protected void onSaveError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onNewError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onRefreshError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onDeleteError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java?rev=1486889&r1=1486888&r2=1486889&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
Tue May 28 11:49:49 2013
@@ -113,4 +113,23 @@ public class LdapForm extends AdminBaseF
target.appendJavaScript("omLdapPanelInit();");
}
+ @Override
+ protected void onSaveError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onNewError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onRefreshError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onDeleteError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1486889&r1=1486888&r2=1486889&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomForm.java
Tue May 28 11:49:49 2013
@@ -18,10 +18,15 @@
*/
package org.apache.openmeetings.web.admin.rooms;
+import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
+
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.apache.openmeetings.data.conference.RoomManager;
+import org.apache.openmeetings.data.conference.dao.RoomDao;
import org.apache.openmeetings.data.user.OrganisationManager;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.apache.openmeetings.persistence.beans.room.Room;
@@ -31,9 +36,12 @@ import org.apache.openmeetings.web.admin
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.OmAjaxFormValidatingBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.form.ListMultipleChoice;
import org.apache.wicket.markup.html.form.RequiredTextField;
@@ -43,19 +51,15 @@ import org.apache.wicket.model.CompoundP
import org.apache.wicket.model.Model;
import org.apache.wicket.util.time.Duration;
-import edu.emory.mathcs.backport.java.util.Arrays;
-
public class RoomForm extends AdminBaseForm<Room> {
-
private static final long serialVersionUID = 1L;
+ private final static List<Long> DROPDOWN_NUMBER_OF_PARTICIPANTS =
Arrays.asList(2L, 4L, 6L, 8L, 10L, 12L, 14L, 16L, 20L, 25L, 32L, 50L,
+ 100L, 150L, 200L, 500L, 1000L);
+ private final WebMarkupContainer roomList;
- Object[] array = { 2L, 4L, 6L, 8L, 10L, 12L, 14L, 16L, 20L, 25L, 32L,
50L,
- 100L, 150L, 200L, 500L, 1000L };
- @SuppressWarnings("unchecked")
- List<Long> DROPDOWN_NUMBER_OF_PARTICIPANTS = Arrays.asList(array);
-
- public RoomForm(String id, final Room room) {
+ public RoomForm(String id, WebMarkupContainer roomList, final Room
room) {
super(id, new CompoundPropertyModel<Room>(room));
+ this.roomList = roomList;
setOutputMarkupId(true);
RequiredTextField<String> name = new
RequiredTextField<String>("name");
name.setLabel(new Model<String>(WebSession.getString(193)));
@@ -129,4 +133,62 @@ public class RoomForm extends AdminBaseF
// event and throttle it down to once per second
OmAjaxFormValidatingBehavior.addToAllFormComponents(this,
"keydown", Duration.ONE_SECOND);
}
+
+ private void updateView(AjaxRequestTarget target) {
+ target.add(this);
+ target.add(roomList);
+ target.appendJavaScript("omRoomPanelInit();");
+ }
+
+ @Override
+ protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
+ getBean(RoomDao.class).update(getModelObject(), getUserId());
+ hideNewRecord();
+ updateView(target);
+ }
+
+ @Override
+ protected void onSaveError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onNewSubmit(AjaxRequestTarget target, Form<?> form) {
+ setModelObject(new Room());
+ updateView(target);
+ }
+
+ @Override
+ protected void onNewError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
+ Room r = getModelObject();
+ if (r.getRooms_id() != null) {
+ r = getBean(RoomDao.class).get(r.getRooms_id());
+ } else {
+ r = new Room();
+ }
+ setModelObject(r);
+ updateView(target);
+ }
+
+ @Override
+ protected void onRefreshError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
+ getBean(RoomDao.class).delete(getModelObject(), getUserId());
+ target.add(roomList);
+ updateView(target);
+ }
+
+ @Override
+ protected void onDeleteError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1486889&r1=1486888&r2=1486889&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
Tue May 28 11:49:49 2013
@@ -24,8 +24,8 @@ import org.apache.openmeetings.web.admin
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
-import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.openmeetings.web.data.OrderByBorder;
+import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -85,7 +85,7 @@ public class RoomsPanel extends AdminPan
}
});
- form = new RoomForm("form", new Room());
+ form = new RoomForm("form", listContainer, new Room());
form.showNewRecord();
add(form);
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java?rev=1486889&r1=1486888&r2=1486889&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java
Tue May 28 11:49:49 2013
@@ -121,4 +121,23 @@ public class ServerForm extends AdminBas
target.appendJavaScript("omServerPanelInit();");
}
+ @Override
+ protected void onSaveError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onNewError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onRefreshError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onDeleteError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1486889&r1=1486888&r2=1486889&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java
Tue May 28 11:49:49 2013
@@ -199,4 +199,24 @@ public class UserForm extends AdminBaseF
error(WebSession.getString(105));
}
}
+
+ @Override
+ protected void onSaveError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onNewError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onRefreshError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ protected void onDeleteError(AjaxRequestTarget target, Form<?> form) {
+ // TODO Auto-generated method stub
+ }
}
