You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/10/21 13:45:56 UTC

svn commit: r1400628 - in /incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web: components/admin/configurations/ components/admin/groups/ components/admin/labels/ components/admin/ldaps/ components/admin/rooms/ components/admin/se...

Author: solomax
Date: Sun Oct 21 11:45:56 2012
New Revision: 1400628

URL: http://svn.apache.org/viewvc?rev=1400628&view=rev
Log:
Wicket: sorting is added to all admin panels

Modified:
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/DataViewContainer.java

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html?rev=1400628&r1=1400627&r2=1400628&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html Sun Oct 21 11:45:56 2012
@@ -36,9 +36,9 @@
 				<table class="adminListTable">
 					<thead>
 						<tr>
-							<th class="three_column_layout_column1"><wicket:ommessage key="264" /></th>
-							<th class="three_column_layout_column2"><wicket:ommessage key="265" /></th>
-							<th class="three_column_layout_column3"><wicket:ommessage key="598" /></th>
+							<th class="three_column_layout_column1"><span wicket:id="orderById"></span><wicket:ommessage key="264" /></th>
+							<th class="three_column_layout_column2"><span wicket:id="orderByKey"></span><wicket:ommessage key="265" /></th>
+							<th class="three_column_layout_column3"><span wicket:id="orderByValue"></span><wicket:ommessage key="598" /></th>
 						</tr>	
 					</thead>
 				</table>

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=1400628&r1=1400627&r2=1400628&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 Sun Oct 21 11:45:56 2012
@@ -23,7 +23,9 @@ import org.apache.openmeetings.persisten
 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.DataViewContainer;
 import org.apache.openmeetings.web.data.OmDataProvider;
+import org.apache.openmeetings.web.data.OmOrderByBorder;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -47,6 +49,7 @@ public class ConfigsPanel extends AdminP
 		target.appendJavaScript("omConfigPanelInit();");
 	}
 
+	@SuppressWarnings("unchecked")
 	public ConfigsPanel(String id) {
 		super(id);
 		
@@ -76,6 +79,11 @@ 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));
+		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/GroupsPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html?rev=1400628&r1=1400627&r2=1400628&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html Sun Oct 21 11:45:56 2012
@@ -46,8 +46,8 @@
 				<span wicket:id="navigator">[dataview navigator]</span>
 				<table class="adminListTable">
 					<tr>
-						<th class="two_column_layout_column1"><wicket:ommessage key="164" /></th>
-						<th class="two_column_layout_column2"><wicket:ommessage key="165" /></th>
+						<th class="two_column_layout_column1"><span wicket:id="orderById"></span><wicket:ommessage key="164" /></th>
+						<th class="two_column_layout_column2"><span wicket:id="orderByName"></span><wicket:ommessage key="165" /></th>
 					</tr>	
 				</table>
 				<div class="tableWrapper" id="adminTable">

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=1400628&r1=1400627&r2=1400628&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 Sun Oct 21 11:45:56 2012
@@ -24,7 +24,9 @@ import org.apache.openmeetings.persisten
 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.DataViewContainer;
 import org.apache.openmeetings.web.data.OmDataProvider;
+import org.apache.openmeetings.web.data.OmOrderByBorder;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -48,6 +50,7 @@ public class GroupsPanel extends AdminPa
 		target.appendJavaScript("groupsInit();");
 	}
 
+	@SuppressWarnings("unchecked")
 	public GroupsPanel(String id) {
 		super(id);
 		final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
@@ -105,6 +108,10 @@ 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));
+		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.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html?rev=1400628&r1=1400627&r2=1400628&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html Sun Oct 21 11:45:56 2012
@@ -45,9 +45,9 @@
 				<table class="adminListTable">
 					<thead>
 						<tr>
-							<th class="three_column_layout_column1"><wicket:ommessage key="350" /></th>
-							<th class="three_column_layout_column2"><wicket:ommessage key="351" /></th>
-							<th class="three_column_layout_column3"><wicket:ommessage key="352" /></th>
+							<th class="three_column_layout_column1"><span wicket:id="orderById"></span><wicket:ommessage key="350" /></th>
+							<th class="three_column_layout_column2"><span wicket:id="orderByName"></span><wicket:ommessage key="351" /></th>
+							<th class="three_column_layout_column3"><span wicket:id="orderByValue"></span><wicket:ommessage key="352" /></th>
 						</tr>
 					</thead>	
 				</table>

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=1400628&r1=1400627&r2=1400628&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 Sun Oct 21 11:45:56 2012
@@ -29,7 +29,9 @@ import org.apache.openmeetings.web.app.A
 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.DataViewContainer;
 import org.apache.openmeetings.web.data.OmDataProvider;
+import org.apache.openmeetings.web.data.OmOrderByBorder;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -56,6 +58,7 @@ public class LangPanel extends AdminPane
 		target.appendJavaScript("labelsInit();");
 	}
 
+	@SuppressWarnings("unchecked")
 	public LangPanel(String id) {
 		super(id);
 		FieldLanguageDaoImpl langDao = Application
@@ -111,6 +114,11 @@ 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));
+		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/LdapsPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html?rev=1400628&r1=1400627&r2=1400628&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html Sun Oct 21 11:45:56 2012
@@ -36,9 +36,9 @@
 				<table class="adminListTable">
 					<thead>
 						<tr>
-							<th class="three_column_layout_column1"><wicket:ommessage key="1104" /></th>
-							<th class="three_column_layout_column2"><wicket:ommessage key="1105" /></th>
-							<th class="three_column_layout_column3"><wicket:ommessage key="1106" /></th>
+							<th class="three_column_layout_column1"><span wicket:id="orderById"></span><wicket:ommessage key="1104" /></th>
+							<th class="three_column_layout_column2"><span wicket:id="orderByName"></span><wicket:ommessage key="1105" /></th>
+							<th class="three_column_layout_column3"><span wicket:id="orderByFile"></span><wicket:ommessage key="1106" /></th>
 						</tr>
 					</thead>
 				</table>

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=1400628&r1=1400627&r2=1400628&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 Sun Oct 21 11:45:56 2012
@@ -23,7 +23,9 @@ import org.apache.openmeetings.persisten
 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.DataViewContainer;
 import org.apache.openmeetings.web.data.OmDataProvider;
+import org.apache.openmeetings.web.data.OmOrderByBorder;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -38,19 +40,15 @@ import org.apache.wicket.markup.repeater
  * 
  */
 public class LdapsPanel extends AdminPanel {
-
 	private static final long serialVersionUID = -1L;
 	private LdapForm form;
 	
-	
-	
 	@Override
 	public void onMenuPanelLoad(AjaxRequestTarget target) {
 		target.appendJavaScript("omLdapPanelInit();");
 	}
 
-
-
+	@SuppressWarnings("unchecked")
 	public LdapsPanel(String id) {
 		super(id);
 		OmDataView<LdapConfig> dataView = new OmDataView<LdapConfig>("ldapList"
@@ -78,6 +76,11 @@ 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));
+		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.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html?rev=1400628&r1=1400627&r2=1400628&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html Sun Oct 21 11:45:56 2012
@@ -36,9 +36,9 @@
 				<table class="adminListTable">
 					<thead>
 						<tr>
-							<th class="three_column_layout_column1"><wicket:ommessage key="188" /></th>
-							<th class="three_column_layout_column2"><wicket:ommessage key="189" /></th>
-							<th class="three_column_layout_column3"><wicket:ommessage key="190" /></th>
+							<th class="three_column_layout_column1"><span wicket:id="orderById"></span><wicket:ommessage key="188" /></th>
+							<th class="three_column_layout_column2"><span wicket:id="orderByName"></span><wicket:ommessage key="189" /></th>
+							<th class="three_column_layout_column3"><span wicket:id="orderByPublic"></span><wicket:ommessage key="190" /></th>
 						</tr>	
 					</thead>
 				</table>

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=1400628&r1=1400627&r2=1400628&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 Sun Oct 21 11:45:56 2012
@@ -23,7 +23,9 @@ import org.apache.openmeetings.persisten
 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.DataViewContainer;
 import org.apache.openmeetings.web.data.OmDataProvider;
+import org.apache.openmeetings.web.data.OmOrderByBorder;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -41,6 +43,7 @@ public class RoomsPanel extends AdminPan
 		target.appendJavaScript("omRoomPanelInit();");
 	}
 
+	@SuppressWarnings("unchecked")
 	public RoomsPanel(String id) {
 		super(id);
 		OmDataView<Rooms> dataView = new OmDataView<Rooms>("roomList", new OmDataProvider<Rooms>(RoomDAO.class)) {
@@ -68,6 +71,11 @@ 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));
+		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/ServersPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html?rev=1400628&r1=1400627&r2=1400628&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html Sun Oct 21 11:45:56 2012
@@ -28,9 +28,9 @@
 					<table class="adminListTable">
 						<thead>
 							<tr>
-								<th class="three_column_layout_column1"><wicket:ommessage key="188" /></th>
-								<th class="three_column_layout_column2"><wicket:ommessage key="1500" /></th>
-								<th class="three_column_layout_column3"><wicket:ommessage key="1501" /></th>
+								<th class="three_column_layout_column1"><span wicket:id="orderById"></span><wicket:ommessage key="188" /></th>
+								<th class="three_column_layout_column2"><span wicket:id="orderByName"></span><wicket:ommessage key="1500" /></th>
+								<th class="three_column_layout_column3"><span wicket:id="orderByAddress"></span><wicket:ommessage key="1501" /></th>
 							</tr>	
 						</thead>
 					</table>

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=1400628&r1=1400627&r2=1400628&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 Sun Oct 21 11:45:56 2012
@@ -23,7 +23,9 @@ import org.apache.openmeetings.persisten
 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.DataViewContainer;
 import org.apache.openmeetings.web.data.OmDataProvider;
+import org.apache.openmeetings.web.data.OmOrderByBorder;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -38,10 +40,10 @@ import org.apache.wicket.markup.repeater
  * 
  */
 public class ServersPanel extends AdminPanel {
-
-	private static final long serialVersionUID = -1L;
+	private static final long serialVersionUID = -2197334608577346569L;
 	private ServerForm form;
 	
+	@SuppressWarnings("unchecked")
 	public ServersPanel(String id) {
 		super(id);
 		OmDataView<Server> dataView = new OmDataView<Server>("serverList",
@@ -69,6 +71,11 @@ 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));
+		add(container.orderLinks);
 		add(new PagedEntityListPanel("navigator", dataView) {
 			private static final long serialVersionUID = 5097048616003411362L;
 

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=1400628&r1=1400627&r2=1400628&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 Sun Oct 21 11:45:56 2012
@@ -18,11 +18,14 @@
  */
 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.wicket.markup.html.WebMarkupContainer;
 
-public class DataViewContainer<T extends OmEntity> {
+public class DataViewContainer<T extends OmEntity> implements Serializable {
+	private static final long serialVersionUID = -1027478954223527890L;
 	public WebMarkupContainer container;
 	public OmDataView<T> view;
 	public OmOrderByBorder<T>[] orderLinks;