Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java?rev=1399091&r1=1399090&r2=1399091&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java Wed Oct 17 04:37:02 2012 @@ -18,23 +18,18 @@ */ package org.apache.openmeetings.web.components.admin.rooms; -import java.util.Iterator; - -import org.apache.openmeetings.data.conference.Roommanagement; +import org.apache.openmeetings.data.conference.RoomDAO; import org.apache.openmeetings.persistence.beans.rooms.Rooms; -import org.apache.openmeetings.web.app.Application; import org.apache.openmeetings.web.components.admin.AdminPanel; +import org.apache.openmeetings.web.components.admin.OmDataView; import org.apache.openmeetings.web.components.admin.PagedEntityListPanel; +import org.apache.openmeetings.web.data.OmDataProvider; import org.apache.wicket.AttributeModifier; 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.markup.repeater.Item; -import org.apache.wicket.markup.repeater.data.DataView; -import org.apache.wicket.markup.repeater.data.IDataProvider; -import org.apache.wicket.model.CompoundPropertyModel; -import org.apache.wicket.model.IModel; public class RoomsPanel extends AdminPanel { @@ -43,26 +38,7 @@ public class RoomsPanel extends AdminPan public RoomsPanel(String id) { super(id); - DataView<Rooms> dataView = new DataView<Rooms>("roomList", new IDataProvider<Rooms>(){ - private static final long serialVersionUID = -1L; - - public void detach() { - //empty - } - - public Iterator<? extends Rooms> iterator(long first, long count) { - return Application.getBean(Roommanagement.class).getNondeletedRooms((int)first, (int)count).iterator(); - } - - public long size() { - return Application.getBean(Roommanagement.class).selectMaxFromRooms(""); - } - - public IModel<Rooms> model(Rooms object) { - return new CompoundPropertyModel<Rooms>(object); - } - - }) { + OmDataView<Rooms> dataView = new OmDataView<Rooms>("roomList", new OmDataProvider<Rooms>(RoomDAO.class)) { private static final long serialVersionUID = 8715559628755439596L; @Override
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java?rev=1399091&r1=1399090&r2=1399091&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java Wed Oct 17 04:37:02 2012 @@ -21,6 +21,7 @@ package org.apache.openmeetings.web.comp import org.apache.openmeetings.data.basic.dao.ServerDaoImpl; import org.apache.openmeetings.persistence.beans.basic.Server; import org.apache.openmeetings.web.components.admin.AdminPanel; +import org.apache.openmeetings.web.components.admin.OmDataView; import org.apache.openmeetings.web.components.admin.PagedEntityListPanel; import org.apache.openmeetings.web.data.OmDataProvider; import org.apache.wicket.AttributeModifier; @@ -29,7 +30,6 @@ import org.apache.wicket.ajax.AjaxReques import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.markup.repeater.data.DataView; /** * Form component with list and form to manipulate {@link Server} @@ -44,7 +44,7 @@ public class ServersPanel extends AdminP public ServersPanel(String id) { super(id); - DataView<Server> dataView = new DataView<Server>("serverList", + OmDataView<Server> dataView = new OmDataView<Server>("serverList", new OmDataProvider<Server>(ServerDaoImpl.class)) { private static final long serialVersionUID = 8715559628755439596L; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java?rev=1399091&r1=1399090&r2=1399091&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java Wed Oct 17 04:37:02 2012 @@ -23,6 +23,7 @@ import org.apache.openmeetings.persisten import org.apache.openmeetings.web.app.Application; import org.apache.openmeetings.web.app.WebSession; import org.apache.openmeetings.web.components.admin.AdminPanel; +import org.apache.openmeetings.web.components.admin.OmDataView; import org.apache.openmeetings.web.components.admin.PagedEntityListPanel; import org.apache.openmeetings.web.data.OmDataProvider; import org.apache.wicket.AttributeModifier; @@ -31,7 +32,6 @@ import org.apache.wicket.ajax.AjaxReques import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.markup.repeater.data.DataView; public class UsersPanel extends AdminPanel { @@ -42,7 +42,7 @@ public class UsersPanel extends AdminPan public UsersPanel(String id) { super(id); - DataView<Users> dataView = new DataView<Users>("userList", + OmDataView<Users> dataView = new OmDataView<Users>("userList", new OmDataProvider<Users>(UsersDaoImpl.class)) { private static final long serialVersionUID = 8715559628755439596L; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OmDataProvider.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OmDataProvider.java?rev=1399091&r1=1399090&r2=1399091&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OmDataProvider.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OmDataProvider.java Wed Oct 17 04:37:02 2012 @@ -30,6 +30,7 @@ import org.apache.wicket.model.IModel; public class OmDataProvider<T extends OmEntity> implements IDataProvider<T> { private static final long serialVersionUID = 4325721185888905204L; protected Class<? extends OmDAO<T>> clazz; + private String search = null; public OmDataProvider(Class<? extends OmDAO<T>> c) { this.clazz = c; @@ -40,15 +41,30 @@ public class OmDataProvider<T extends Om } public Iterator<? extends T> iterator(long first, long count) { - return Application.getBean(clazz).get((int)first, (int)count).iterator(); + return (search == null + ? Application.getBean(clazz).get((int)first, (int)count) + : Application.getBean(clazz).get(search, (int)first, (int)count)).iterator(); } public long size() { - return Application.getBean(clazz).count(); + return search == null + ? Application.getBean(clazz).count() + : Application.getBean(clazz).count(search); } public IModel<T> model(T object) { return new CompoundPropertyModel<T>(object); } + public void setSearch(String search) { + if (search != null && !search.trim().isEmpty()) { + this.search = search.trim(); + } else { + this.search = null; + } + } + + public String getSearch() { + return search; + } }
