You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/10/25 20:48:10 UTC
svn commit: r1402268 [4/4] - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/WEB-INF/ src/org/apache/openmeetings/axis/services/
src/org/apache/openmeetings/backup/ src/org/apache/openmeetings/cli/
src/org/apache/openmeetings/data/ src/org/ap...
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java Thu Oct 25 18:48:03 2012
@@ -18,14 +18,14 @@
*/
package org.apache.openmeetings.web.components.admin.configurations;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.web.components.admin.AdminPanel;
-import org.apache.openmeetings.web.components.admin.OmDataView;
+import org.apache.openmeetings.web.components.admin.SearchableDataView;
import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
-import org.apache.openmeetings.web.data.OmDataProvider;
-import org.apache.openmeetings.web.data.OmOrderByBorder;
+import org.apache.openmeetings.web.data.SearchableDataProvider;
+import org.apache.openmeetings.web.data.OrderByBorder;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -53,8 +53,8 @@ public class ConfigsPanel extends AdminP
public ConfigsPanel(String id) {
super(id);
- OmDataView<Configuration> dataView = new OmDataView<Configuration>("configList"
- , new OmDataProvider<Configuration>(ConfigurationDaoImpl.class)) {
+ SearchableDataView<Configuration> dataView = new SearchableDataView<Configuration>("configList"
+ , new SearchableDataProvider<Configuration>(ConfigurationDao.class)) {
private static final long serialVersionUID = 8715559628755439596L;
@Override
@@ -80,9 +80,9 @@ public class ConfigsPanel extends AdminP
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
DataViewContainer<Configuration> container = new DataViewContainer<Configuration>(listContainer, dataView);
- container.setLinks(new OmOrderByBorder<Configuration>("orderById", "configuration_id", container)
- , new OmOrderByBorder<Configuration>("orderByKey", "conf_key", container)
- , new OmOrderByBorder<Configuration>("orderByValue", "conf_value", container));
+ container.setLinks(new OrderByBorder<Configuration>("orderById", "configuration_id", container)
+ , new OrderByBorder<Configuration>("orderByKey", "conf_key", container)
+ , new OrderByBorder<Configuration>("orderByValue", "conf_value", container));
add(container.orderLinks);
add(new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = 5097048616003411362L;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java Thu Oct 25 18:48:03 2012
@@ -23,7 +23,7 @@ import static org.apache.openmeetings.we
import java.util.ArrayList;
import java.util.List;
-import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.web.app.Application;
@@ -72,7 +72,7 @@ public class AddUsersForm extends Form<V
protected void onAfterSubmit(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form<?> form) {
usersToAdd.clear();
usersInList.clear();
- usersInList.addAll(Application.getBean(UsersDaoImpl.class).get(userSearchText));
+ usersInList.addAll(Application.getBean(UsersDao.class).get(userSearchText));
target.add(users);
}
});
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupForm.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupForm.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupForm.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupForm.java Thu Oct 25 18:48:03 2012
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.components.admin.groups;
-import org.apache.openmeetings.data.user.dao.OrganisationDAO;
+import org.apache.openmeetings.data.user.dao.OrganisationDao;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
@@ -71,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 = Application.getBean(OrganisationDao.class).get(org.getOrganisation_id());
} else {
org = new Organisation();
}
@@ -81,14 +81,14 @@ public class GroupForm extends AdminBase
@Override
protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
- Application.getBean(OrganisationDAO.class).delete(getModelObject(), WebSession.getUserId());
+ Application.getBean(OrganisationDao.class).delete(getModelObject(), WebSession.getUserId());
target.add(groupList);
target.appendJavaScript("groupsInit();");
}
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
- Application.getBean(OrganisationDAO.class).update(getModelObject(), WebSession.getUserId());
+ Application.getBean(OrganisationDao.class).update(getModelObject(), WebSession.getUserId());
hideNewRecord();
target.add(groupList);
target.appendJavaScript("groupsInit();");
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.java Thu Oct 25 18:48:03 2012
@@ -18,15 +18,15 @@
*/
package org.apache.openmeetings.web.components.admin.groups;
-import org.apache.openmeetings.data.user.dao.OrganisationUserDAO;
+import org.apache.openmeetings.data.user.dao.OrganisationUserDao;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.components.ConfirmCallListener;
-import org.apache.openmeetings.web.components.admin.OmDataView;
+import org.apache.openmeetings.web.components.admin.SearchableDataView;
import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
-import org.apache.openmeetings.web.data.OmDataProvider;
+import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -50,19 +50,19 @@ public class GroupUsersPanel extends Pan
this.organisationId = orgId;
setOutputMarkupId(true);
- OmDataView<Organisation_Users> dataView = new OmDataView<Organisation_Users>("userList", new OmDataProvider<Organisation_Users>(OrganisationUserDAO.class){
+ SearchableDataView<Organisation_Users> dataView = new SearchableDataView<Organisation_Users>("userList", new SearchableDataProvider<Organisation_Users>(OrganisationUserDao.class){
private static final long serialVersionUID = 1L;
public long size() {
return search == null
- ? Application.getBean(OrganisationUserDAO.class).count(organisationId)
- : Application.getBean(OrganisationUserDAO.class).count(organisationId, search);
+ ? Application.getBean(OrganisationUserDao.class).count(organisationId)
+ : Application.getBean(OrganisationUserDao.class).count(organisationId, search);
}
public java.util.Iterator<? extends Organisation_Users> iterator(long first, long count) {
return (search == null && getSort() == null
- ? Application.getBean(OrganisationUserDAO.class).get(organisationId, (int)first, (int)count)
- : Application.getBean(OrganisationUserDAO.class).get(organisationId, search, (int)first, (int)count, getSortStr())).iterator();
+ ? Application.getBean(OrganisationUserDao.class).get(organisationId, (int)first, (int)count)
+ : Application.getBean(OrganisationUserDao.class).get(organisationId, search, (int)first, (int)count, getSortStr())).iterator();
}
}) {
private static final long serialVersionUID = 8715559628755439596L;
@@ -87,7 +87,7 @@ public class GroupUsersPanel extends Pan
@Override
protected void onEvent(AjaxRequestTarget target) {
- Application.getBean(OrganisationUserDAO.class).delete(orgUser, WebSession.getUserId());
+ Application.getBean(OrganisationUserDao.class).delete(orgUser, WebSession.getUserId());
target.add(GroupUsersPanel.this);
}
}));
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java Thu Oct 25 18:48:03 2012
@@ -18,15 +18,15 @@
*/
package org.apache.openmeetings.web.components.admin.groups;
-import org.apache.openmeetings.data.user.dao.OrganisationDAO;
+import org.apache.openmeetings.data.user.dao.OrganisationDao;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.apache.openmeetings.web.components.admin.AdminPanel;
-import org.apache.openmeetings.web.components.admin.OmDataView;
+import org.apache.openmeetings.web.components.admin.SearchableDataView;
import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
-import org.apache.openmeetings.web.data.OmDataProvider;
-import org.apache.openmeetings.web.data.OmOrderByBorder;
+import org.apache.openmeetings.web.data.SearchableDataProvider;
+import org.apache.openmeetings.web.data.OrderByBorder;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -84,7 +84,7 @@ public class GroupsPanel extends AdminPa
add(form.add(addUsersBtn.setOutputMarkupId(true)));
//List view
- OmDataView<Organisation> dataView = new OmDataView<Organisation>("groupList", new OmDataProvider<Organisation>(OrganisationDAO.class)) {
+ SearchableDataView<Organisation> dataView = new SearchableDataView<Organisation>("groupList", new SearchableDataProvider<Organisation>(OrganisationDao.class)) {
private static final long serialVersionUID = 8715559628755439596L;
@Override
@@ -109,8 +109,8 @@ public class GroupsPanel extends AdminPa
//Paging
add(listContainer.add(dataView).setOutputMarkupId(true));
DataViewContainer<Organisation> container = new DataViewContainer<Organisation>(listContainer, dataView);
- container.setLinks(new OmOrderByBorder<Organisation>("orderById", "organisation_id", container)
- , new OmOrderByBorder<Organisation>("orderByName", "name", container));
+ container.setLinks(new OrderByBorder<Organisation>("orderById", "organisation_id", container)
+ , new OrderByBorder<Organisation>("orderByName", "name", container));
add(container.orderLinks);
add(new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = 5097048616003411362L;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java Thu Oct 25 18:48:03 2012
@@ -27,11 +27,11 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
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.SearchableDataView;
import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
-import org.apache.openmeetings.web.data.OmDataProvider;
-import org.apache.openmeetings.web.data.OmOrderByBorder;
+import org.apache.openmeetings.web.data.SearchableDataProvider;
+import org.apache.openmeetings.web.data.OrderByBorder;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -71,9 +71,9 @@ public class LangPanel extends AdminPane
form.showNewRecord();
add(form);
- final OmDataView<Fieldvalues> dataView = new OmDataView<Fieldvalues>(
+ final SearchableDataView<Fieldvalues> dataView = new SearchableDataView<Fieldvalues>(
"langList"
- , new OmDataProvider<Fieldvalues>(FieldValueDaoImpl.class) {
+ , new SearchableDataProvider<Fieldvalues>(FieldValueDaoImpl.class) {
private static final long serialVersionUID = -6822789354860988626L;
@Override
@@ -115,9 +115,9 @@ public class LangPanel extends AdminPane
listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
DataViewContainer<Fieldvalues> container = new DataViewContainer<Fieldvalues>(listContainer, dataView);
- container.setLinks(new OmOrderByBorder<Fieldvalues>("orderById", "fieldvalues.fieldvalues_id", container)
- , new OmOrderByBorder<Fieldvalues>("orderByName", "fieldvalues.name", container)
- , new OmOrderByBorder<Fieldvalues>("orderByValue", "value", container));
+ container.setLinks(new OrderByBorder<Fieldvalues>("orderById", "fieldvalues.fieldvalues_id", container)
+ , new OrderByBorder<Fieldvalues>("orderByName", "fieldvalues.name", container)
+ , new OrderByBorder<Fieldvalues>("orderByValue", "value", container));
add(container.orderLinks);
add(new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = 5097048616003411362L;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapForm.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapForm.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapForm.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapForm.java Thu Oct 25 18:48:03 2012
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.components.admin.ldaps;
-import org.apache.openmeetings.data.basic.dao.LdapConfigDaoImpl;
+import org.apache.openmeetings.data.basic.dao.LdapConfigDao;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
@@ -72,9 +72,9 @@ public class LdapForm extends AdminBaseF
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
- Application.getBean(LdapConfigDaoImpl.class).update(getModelObject(),
+ Application.getBean(LdapConfigDao.class).update(getModelObject(),
WebSession.getUserId());
- LdapConfig ldapConfig = Application.getBean(LdapConfigDaoImpl.class)
+ LdapConfig ldapConfig = Application.getBean(LdapConfigDao.class)
.get(getModelObject().getLdapConfigId());
this.setModelObject(ldapConfig);
hideNewRecord();
@@ -94,7 +94,7 @@ public class LdapForm extends AdminBaseF
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
LdapConfig ldapConfig = this.getModelObject();
if (ldapConfig.getLdapConfigId() <= 0) {
- ldapConfig = Application.getBean(LdapConfigDaoImpl.class).get(
+ ldapConfig = Application.getBean(LdapConfigDao.class).get(
ldapConfig.getLdapConfigId());
} else {
ldapConfig = new LdapConfig();
@@ -106,7 +106,7 @@ public class LdapForm extends AdminBaseF
@Override
protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
- Application.getBean(LdapConfigDaoImpl.class).delete(
+ Application.getBean(LdapConfigDao.class).delete(
this.getModelObject(), WebSession.getUserId());
this.setModelObject(new LdapConfig());
target.add(listContainer);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java Thu Oct 25 18:48:03 2012
@@ -18,14 +18,14 @@
*/
package org.apache.openmeetings.web.components.admin.ldaps;
-import org.apache.openmeetings.data.basic.dao.LdapConfigDaoImpl;
+import org.apache.openmeetings.data.basic.dao.LdapConfigDao;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
import org.apache.openmeetings.web.components.admin.AdminPanel;
-import org.apache.openmeetings.web.components.admin.OmDataView;
+import org.apache.openmeetings.web.components.admin.SearchableDataView;
import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
-import org.apache.openmeetings.web.data.OmDataProvider;
-import org.apache.openmeetings.web.data.OmOrderByBorder;
+import org.apache.openmeetings.web.data.SearchableDataProvider;
+import org.apache.openmeetings.web.data.OrderByBorder;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -51,8 +51,8 @@ public class LdapsPanel extends AdminPan
@SuppressWarnings("unchecked")
public LdapsPanel(String id) {
super(id);
- OmDataView<LdapConfig> dataView = new OmDataView<LdapConfig>("ldapList"
- , new OmDataProvider<LdapConfig>(LdapConfigDaoImpl.class)) {
+ SearchableDataView<LdapConfig> dataView = new SearchableDataView<LdapConfig>("ldapList"
+ , new SearchableDataProvider<LdapConfig>(LdapConfigDao.class)) {
private static final long serialVersionUID = 8715559628755439596L;
@Override
@@ -77,9 +77,9 @@ public class LdapsPanel extends AdminPan
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
DataViewContainer<LdapConfig> container = new DataViewContainer<LdapConfig>(listContainer, dataView);
- container.setLinks(new OmOrderByBorder<LdapConfig>("orderById", "ldapConfigId", container)
- , new OmOrderByBorder<LdapConfig>("orderByName", "name", container)
- , new OmOrderByBorder<LdapConfig>("orderByFile", "configFileName", container));
+ container.setLinks(new OrderByBorder<LdapConfig>("orderById", "ldapConfigId", container)
+ , new OrderByBorder<LdapConfig>("orderByName", "name", container)
+ , new OrderByBorder<LdapConfig>("orderByFile", "configFileName", container));
add(container.orderLinks);
add(new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = -1L;
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=1402268&r1=1402267&r2=1402268&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 Thu Oct 25 18:48:03 2012
@@ -21,11 +21,11 @@ package org.apache.openmeetings.web.comp
import org.apache.openmeetings.data.conference.RoomDAO;
import org.apache.openmeetings.persistence.beans.rooms.Rooms;
import org.apache.openmeetings.web.components.admin.AdminPanel;
-import org.apache.openmeetings.web.components.admin.OmDataView;
+import org.apache.openmeetings.web.components.admin.SearchableDataView;
import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
-import org.apache.openmeetings.web.data.OmDataProvider;
-import org.apache.openmeetings.web.data.OmOrderByBorder;
+import org.apache.openmeetings.web.data.SearchableDataProvider;
+import org.apache.openmeetings.web.data.OrderByBorder;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -46,7 +46,7 @@ public class RoomsPanel extends AdminPan
@SuppressWarnings("unchecked")
public RoomsPanel(String id) {
super(id);
- OmDataView<Rooms> dataView = new OmDataView<Rooms>("roomList", new OmDataProvider<Rooms>(RoomDAO.class)) {
+ SearchableDataView<Rooms> dataView = new SearchableDataView<Rooms>("roomList", new SearchableDataProvider<Rooms>(RoomDAO.class)) {
private static final long serialVersionUID = 8715559628755439596L;
@Override
@@ -72,9 +72,9 @@ public class RoomsPanel extends AdminPan
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
DataViewContainer<Rooms> container = new DataViewContainer<Rooms>(listContainer, dataView);
- container.setLinks(new OmOrderByBorder<Rooms>("orderById", "rooms_id", container)
- , new OmOrderByBorder<Rooms>("orderByName", "name", container)
- , new OmOrderByBorder<Rooms>("orderByPublic", "ispublic", container));
+ container.setLinks(new OrderByBorder<Rooms>("orderById", "rooms_id", container)
+ , new OrderByBorder<Rooms>("orderByName", "name", container)
+ , new OrderByBorder<Rooms>("orderByPublic", "ispublic", container));
add(container.orderLinks);
add(new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = -1L;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServerForm.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServerForm.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServerForm.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServerForm.java Thu Oct 25 18:48:03 2012
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.components.admin.servers;
-import org.apache.openmeetings.data.basic.dao.ServerDaoImpl;
+import org.apache.openmeetings.data.basic.dao.ServerDao;
import org.apache.openmeetings.persistence.beans.basic.Server;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
@@ -67,9 +67,9 @@ public class ServerForm extends AdminBas
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
- Application.getBean(ServerDaoImpl.class).update(getModelObject(),
+ Application.getBean(ServerDao.class).update(getModelObject(),
WebSession.getUserId());
- Server server = Application.getBean(ServerDaoImpl.class).get(
+ Server server = Application.getBean(ServerDao.class).get(
getModelObject().getId());
setModelObject(server);
hideNewRecord();
@@ -89,7 +89,7 @@ public class ServerForm extends AdminBas
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
Server server = getModelObject();
if (server.getId() <= 0) {
- server = Application.getBean(ServerDaoImpl.class).get(
+ server = Application.getBean(ServerDao.class).get(
server.getId());
} else {
server = new Server();
@@ -101,7 +101,7 @@ public class ServerForm extends AdminBas
@Override
protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
- Application.getBean(ServerDaoImpl.class).delete(getModelObject(),
+ Application.getBean(ServerDao.class).delete(getModelObject(),
WebSession.getUserId());
this.setModelObject(new Server());
target.add(listContainer);
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=1402268&r1=1402267&r2=1402268&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 Thu Oct 25 18:48:03 2012
@@ -18,14 +18,14 @@
*/
package org.apache.openmeetings.web.components.admin.servers;
-import org.apache.openmeetings.data.basic.dao.ServerDaoImpl;
+import org.apache.openmeetings.data.basic.dao.ServerDao;
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.SearchableDataView;
import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
-import org.apache.openmeetings.web.data.OmDataProvider;
-import org.apache.openmeetings.web.data.OmOrderByBorder;
+import org.apache.openmeetings.web.data.SearchableDataProvider;
+import org.apache.openmeetings.web.data.OrderByBorder;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -51,8 +51,8 @@ public class ServersPanel extends AdminP
@SuppressWarnings("unchecked")
public ServersPanel(String id) {
super(id);
- OmDataView<Server> dataView = new OmDataView<Server>("serverList",
- new OmDataProvider<Server>(ServerDaoImpl.class)) {
+ SearchableDataView<Server> dataView = new SearchableDataView<Server>("serverList",
+ new SearchableDataProvider<Server>(ServerDao.class)) {
private static final long serialVersionUID = 8715559628755439596L;
@Override
@@ -78,9 +78,9 @@ public class ServersPanel extends AdminP
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
DataViewContainer<Server> container = new DataViewContainer<Server>(listContainer, dataView);
- container.setLinks(new OmOrderByBorder<Server>("orderById", "id", container)
- , new OmOrderByBorder<Server>("orderByName", "name", container)
- , new OmOrderByBorder<Server>("orderByAddress", "address", container));
+ container.setLinks(new OrderByBorder<Server>("orderById", "id", container)
+ , new OrderByBorder<Server>("orderByName", "name", container)
+ , new OrderByBorder<Server>("orderByAddress", "address", container));
add(container.orderLinks);
add(new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = 5097048616003411362L;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java Thu Oct 25 18:48:03 2012
@@ -23,12 +23,12 @@ import java.util.Arrays;
import java.util.List;
import org.apache.openmeetings.data.basic.FieldLanguageDaoImpl;
-import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
-import org.apache.openmeetings.data.basic.dao.ServerDaoImpl;
+import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
+import org.apache.openmeetings.data.basic.dao.ServerDao;
import org.apache.openmeetings.data.user.Organisationmanagement;
-import org.apache.openmeetings.data.user.dao.SalutationDaoImpl;
-import org.apache.openmeetings.data.user.dao.StateDaoImpl;
-import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.data.user.dao.SalutationDao;
+import org.apache.openmeetings.data.user.dao.StateDao;
+import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.adresses.States;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.basic.Server;
@@ -78,7 +78,7 @@ public class UserForm extends AdminBaseF
private Users user;
private final List<Salutations> saluationList = Application.getBean(
- SalutationDaoImpl.class).getUserSalutations(
+ SalutationDao.class).getUserSalutations(
WebSession.getLanguage());
private final List<FieldLanguage> languageList = Application.getBean(
FieldLanguageDaoImpl.class).getLanguages();
@@ -162,9 +162,9 @@ public class UserForm extends AdminBaseF
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
- Application.getBean(UsersDaoImpl.class).update(getModelObject(),
+ Application.getBean(UsersDao.class).update(getModelObject(),
WebSession.getUserId());
- Users userStored = Application.getBean(UsersDaoImpl.class).get(
+ Users userStored = Application.getBean(UsersDao.class).get(
getModelObject().getUser_id());
// TODO: Why the password field is not set via the Model is because its
// FetchType is Lazy, this extra hook here might be not needed with a
@@ -172,7 +172,7 @@ public class UserForm extends AdminBaseF
// sebawagner, 01.10.2012
if (passwordField.getConvertedInput() != null
&& !passwordField.getConvertedInput().isEmpty()) {
- Application.getBean(UsersDaoImpl.class).updatePassword(userStored,
+ Application.getBean(UsersDao.class).updatePassword(userStored,
passwordField.getConvertedInput());
}
setModelObject(userStored);
@@ -184,7 +184,7 @@ public class UserForm extends AdminBaseF
@Override
protected void onNewSubmit(AjaxRequestTarget target, Form<?> form) {
- UsersDaoImpl usersDaoImpl = Application.getBean(UsersDaoImpl.class);
+ UsersDao usersDaoImpl = Application.getBean(UsersDao.class);
setModelObject(usersDaoImpl.getNewUserInstance(usersDaoImpl
.get(WebSession.getUserId())));
target.add(this);
@@ -195,7 +195,7 @@ public class UserForm extends AdminBaseF
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
Users user = getModelObject();
if (user.getUser_id() <= 0) {
- user = Application.getBean(UsersDaoImpl.class).get(
+ user = Application.getBean(UsersDao.class).get(
user.getUser_id());
} else {
user = new Users();
@@ -207,7 +207,7 @@ public class UserForm extends AdminBaseF
@Override
protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
- UsersDaoImpl usersDaoImpl = Application.getBean(UsersDaoImpl.class);
+ UsersDao usersDaoImpl = Application.getBean(UsersDao.class);
usersDaoImpl.delete(this.getModelObject(),
WebSession.getUserId());
this.setModelObject(usersDaoImpl.getNewUserInstance(usersDaoImpl
@@ -249,7 +249,7 @@ public class UserForm extends AdminBaseF
add(new TextField<String>("lastname"));
add(new DropDownChoice<OmTimeZone>("omTimeZone", Application.getBean(
- OmTimeZoneDaoImpl.class).getOmTimeZones(),
+ OmTimeZoneDao.class).getOmTimeZones(),
new ChoiceRenderer<OmTimeZone>("frontEndLabel", "jname")));
add(new DropDownChoice<Long>("language_id", getFieldLanguageIds(),
@@ -295,7 +295,7 @@ public class UserForm extends AdminBaseF
add(new TextField<String>("adresses.zip"));
add(new TextField<String>("adresses.town"));
add(new DropDownChoice<States>("adresses.states", Application.getBean(
- StateDaoImpl.class).getStates(), new ChoiceRenderer<States>(
+ StateDao.class).getStates(), new ChoiceRenderer<States>(
"name", "state_id")));
final String field159 = WebSession.getString(159);
@@ -366,7 +366,7 @@ public class UserForm extends AdminBaseF
add(orgChoiceList);
add(new DropDownChoice<Server>("server", Application.getBean(
- ServerDaoImpl.class).getServerList(),
+ ServerDao.class).getServerList(),
new ChoiceRenderer<Server>("name", "id")));
final String field1160 = WebSession.getString(1160); // 1160 everybody
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=1402268&r1=1402267&r2=1402268&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 Thu Oct 25 18:48:03 2012
@@ -18,16 +18,16 @@
*/
package org.apache.openmeetings.web.components.admin.users;
-import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.user.Users;
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.SearchableDataView;
import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
-import org.apache.openmeetings.web.data.OmDataProvider;
-import org.apache.openmeetings.web.data.OmOrderByBorder;
+import org.apache.openmeetings.web.data.SearchableDataProvider;
+import org.apache.openmeetings.web.data.OrderByBorder;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -50,8 +50,8 @@ public class UsersPanel extends AdminPan
public UsersPanel(String id) {
super(id);
- final OmDataView<Users> dataView = new OmDataView<Users>("userList"
- , new OmDataProvider<Users>(UsersDaoImpl.class)) {
+ final SearchableDataView<Users> dataView = new SearchableDataView<Users>("userList"
+ , new SearchableDataProvider<Users>(UsersDao.class)) {
private static final long serialVersionUID = 8715559628755439596L;
@Override
@@ -80,10 +80,10 @@ public class UsersPanel extends AdminPan
"listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
DataViewContainer<Users> container = new DataViewContainer<Users>(listContainer, dataView);
- container.setLinks(new OmOrderByBorder<Users>("orderById", "user_id", container)
- , new OmOrderByBorder<Users>("orderByLogin", "login", container)
- , new OmOrderByBorder<Users>("orderByFirstName", "firstname", container)
- , new OmOrderByBorder<Users>("orderByLastName", "lastname", container));
+ container.setLinks(new OrderByBorder<Users>("orderById", "user_id", container)
+ , new OrderByBorder<Users>("orderByLogin", "login", container)
+ , new OrderByBorder<Users>("orderByFirstName", "firstname", container)
+ , new OrderByBorder<Users>("orderByLastName", "lastname", container));
add(container.orderLinks);
add(new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = 5097048616003411362L;
@@ -94,7 +94,7 @@ public class UsersPanel extends AdminPan
}
});
- UsersDaoImpl usersDaoImpl = Application.getBean(UsersDaoImpl.class);
+ UsersDao usersDaoImpl = Application.getBean(UsersDao.class);
form = new UserForm("form", listContainer,
usersDaoImpl.getNewUserInstance(usersDaoImpl.get(WebSession
.getUserId())));
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarForm.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarForm.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarForm.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarForm.java Thu Oct 25 18:48:03 2012
@@ -21,10 +21,10 @@ package org.apache.openmeetings.web.comp
import java.util.ArrayList;
import java.util.List;
-import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDaoImpl;
+import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
import org.apache.openmeetings.data.conference.RoomDAO;
import org.apache.openmeetings.data.conference.Roommanagement;
-import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
@@ -65,7 +65,7 @@ public class CalendarForm extends Form<A
add(new DropDownChoice<AppointmentReminderTyps>(
"remind"
- , Application.getBean(AppointmentReminderTypDaoImpl.class).getAppointmentReminderTypList()
+ , Application.getBean(AppointmentReminderTypDao.class).getAppointmentReminderTypList()
, new ChoiceRenderer<AppointmentReminderTyps>("name", "typId")));
final DropDownChoice<RoomTypes> roomType = new DropDownChoice<RoomTypes>(
@@ -114,7 +114,7 @@ public class CalendarForm extends Form<A
List<Rooms> result = new ArrayList<Rooms>();
RoomDAO dao = Application.getBean(RoomDAO.class);
result.addAll(dao.getPublicRooms());
- for (Organisation_Users ou : Application.getBean(UsersDaoImpl.class).get(WebSession.getUserId()).getOrganisation_users()) {
+ for (Organisation_Users ou : Application.getBean(UsersDao.class).get(WebSession.getUserId()).getOrganisation_users()) {
result.addAll(dao.getOrganisationRooms(ou.getOrganisation().getOrganisation_id()));
}
if (getModelObject().getRoom() != null && getModelObject().getRoom().getAppointment()) { //FIXME review
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java Thu Oct 25 18:48:03 2012
@@ -24,7 +24,7 @@ import static org.apache.wicket.ajax.att
import java.util.Calendar;
-import org.apache.openmeetings.data.calendar.daos.AppointmentDaoImpl;
+import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
@@ -95,7 +95,7 @@ public class CalendarPanel extends UserP
Calendar end = WebSession.getCalendar();
end.setTimeInMillis(getRequestCycle().getRequest().getRequestParameters().getParameterValue("_end").toLong());
JSONArray events = new JSONArray();
- for (Appointment a : Application.getBean(AppointmentDaoImpl.class).getAppointmentsByRange(WebSession.getUserId(),
+ for (Appointment a : Application.getBean(AppointmentDao.class).getAppointmentsByRange(WebSession.getUserId(),
start.getTime(), end.getTime())) {
try {
events.put(new JSONObject()
@@ -186,7 +186,7 @@ public class CalendarPanel extends UserP
@Override
protected void respond(AjaxRequestTarget target) {
- Appointment a = Application.getBean(AppointmentDaoImpl.class).getAppointmentById(
+ Appointment a = Application.getBean(AppointmentDao.class).getAppointmentById(
getRequestCycle().getRequest().getRequestParameters().getParameterValue("_id").toLong());
form.setModelObject(a);
@@ -241,7 +241,7 @@ public class CalendarPanel extends UserP
@Override
protected void respond(AjaxRequestTarget target) {
- AppointmentDaoImpl dao = Application.getBean(AppointmentDaoImpl.class);
+ AppointmentDao dao = Application.getBean(AppointmentDao.class);
Appointment a = dao.getAppointmentById(
getRequestCycle().getRequest().getRequestParameters().getParameterValue("_id").toLong());
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/DataViewContainer.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/DataViewContainer.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/DataViewContainer.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/DataViewContainer.java Thu Oct 25 18:48:03 2012
@@ -20,22 +20,22 @@ package org.apache.openmeetings.web.data
import java.io.Serializable;
-import org.apache.openmeetings.persistence.beans.OmEntity;
-import org.apache.openmeetings.web.components.admin.OmDataView;
+import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
+import org.apache.openmeetings.web.components.admin.SearchableDataView;
import org.apache.wicket.markup.html.WebMarkupContainer;
-public class DataViewContainer<T extends OmEntity> implements Serializable {
+public class DataViewContainer<T extends IDataProviderEntity> implements Serializable {
private static final long serialVersionUID = -1027478954223527890L;
public WebMarkupContainer container;
- public OmDataView<T> view;
- public OmOrderByBorder<T>[] orderLinks;
+ public SearchableDataView<T> view;
+ public OrderByBorder<T>[] orderLinks;
- public DataViewContainer(WebMarkupContainer container, OmDataView<T> view) {
+ public DataViewContainer(WebMarkupContainer container, SearchableDataView<T> view) {
this.container = container;
this.view = view;
}
- public void setLinks(OmOrderByBorder<T>... orderLinks) {
+ public void setLinks(OrderByBorder<T>... orderLinks) {
this.orderLinks = orderLinks;
}
}
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OrderByBorder.java (from r1401615, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OmOrderByBorder.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OrderByBorder.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OrderByBorder.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OmOrderByBorder.java&r1=1401615&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OmOrderByBorder.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OrderByBorder.java Thu Oct 25 18:48:03 2012
@@ -18,17 +18,17 @@
*/
package org.apache.openmeetings.web.data;
-import org.apache.openmeetings.persistence.beans.OmEntity;
+import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.sort.AjaxFallbackOrderByBorder;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.CssProvider;
-public class OmOrderByBorder<T extends OmEntity> extends AjaxFallbackOrderByBorder<String> {
+public class OrderByBorder<T extends IDataProviderEntity> extends AjaxFallbackOrderByBorder<String> {
private static final long serialVersionUID = -867341109912297431L;
private DataViewContainer<T> container;
- public OmOrderByBorder(final String id, final String property, DataViewContainer<T> container) {
- super(id, property, container.view.getDataProvider(), new OmCssProvider());
+ public OrderByBorder(final String id, final String property, DataViewContainer<T> container) {
+ super(id, property, container.view.getDataProvider(), new SortIconCssProvider());
this.container = container;
setOutputMarkupId(true);
}
@@ -43,10 +43,10 @@ public class OmOrderByBorder<T extends O
target.add(container.orderLinks);
}
- static class OmCssProvider extends CssProvider<String> {
+ static class SortIconCssProvider extends CssProvider<String> {
private static final long serialVersionUID = 60178231250586887L;
- public OmCssProvider() {
+ public SortIconCssProvider() {
super("ui-icon ui-icon-carat-1-n sort-icon", "ui-icon ui-icon-carat-1-s sort-icon", "ui-icon ui-icon-carat-2-n-s sort-icon");
}
}
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/SearchableDataProvider.java (from r1401615, 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/SearchableDataProvider.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/SearchableDataProvider.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OmDataProvider.java&r1=1401615&r2=1402268&rev=1402268&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/SearchableDataProvider.java Thu Oct 25 18:48:03 2012
@@ -20,19 +20,26 @@ package org.apache.openmeetings.web.data
import java.util.Iterator;
-import org.apache.openmeetings.data.OmDAO;
-import org.apache.openmeetings.persistence.beans.OmEntity;
+import org.apache.openmeetings.data.IDataProviderDao;
+import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
-public class OmDataProvider<T extends OmEntity> extends SortableDataProvider<T, String> {
+/**
+ * provides function to fill paging tables
+ *
+ * @author swagner
+ *
+ * @param <T>
+ */
+public class SearchableDataProvider<T extends IDataProviderEntity> extends SortableDataProvider<T, String> {
private static final long serialVersionUID = 4325721185888905204L;
- protected Class<? extends OmDAO<T>> clazz;
+ protected Class<? extends IDataProviderDao<T>> clazz;
protected String search = null;
- public OmDataProvider(Class<? extends OmDAO<T>> c) {
+ public SearchableDataProvider(Class<? extends IDataProviderDao<T>> c) {
this.clazz = c;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java Thu Oct 25 18:48:03 2012
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.pages;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.components.HeaderPanel;
import org.apache.wicket.markup.html.WebPage;
@@ -28,7 +28,7 @@ public abstract class BasePage extends W
private static final long serialVersionUID = -6237917782433412496L;
public BasePage() {
- String appName = Application.getBean(ConfigurationDaoImpl.class).getAppName();
+ String appName = Application.getBean(ConfigurationDao.class).getAppName();
add(new Label("pageTitle", appName));
add(new HeaderPanel("header", appName));
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java Thu Oct 25 18:48:03 2012
@@ -24,8 +24,8 @@ import org.apache.openmeetings.Openmeeti
import org.apache.openmeetings.data.user.Emailmanagement;
import org.apache.openmeetings.data.user.Organisationmanagement;
import org.apache.openmeetings.data.user.Usermanagement;
-import org.apache.openmeetings.data.user.dao.StateDaoImpl;
-import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.data.user.dao.StateDao;
+import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.servlet.outputhandler.BackupImportController;
import org.red5.logging.Red5LoggerFactory;
@@ -43,9 +43,9 @@ public class UserImport {
@Autowired
private Emailmanagement emailManagement;
@Autowired
- private UsersDaoImpl usersDao;
+ private UsersDao usersDao;
@Autowired
- private StateDaoImpl statemanagement;
+ private StateDao statemanagement;
@Autowired
private BackupImportController backupController;