From a53212096114899af1568d620ecb221ff96d0454 Mon Sep 17 00:00:00 2001 From: RainerW Date: Tue, 24 Apr 2012 19:34:05 +0200 Subject: [PATCH] fixed #46 : Default sorting not working --- .../sonferenz/web/ConfigMainNavigation.java | 2 +- .../SortableServiceDataProvider.java | 9 ++++++++- .../sonferenz/web/component/TableBuilder.java | 11 +++++++++++ .../web/component/lvl1/FirstLevelBar.java | 2 +- .../web/pages/base/AbstractListPanel.java | 19 +++++++++++++++++++ .../conference/ListConferencesPanel.java | 9 +++++++++ .../conference/action/EditConference.java | 4 ++-- .../web/pages/config/ListConfigPanel.java | 3 +++ .../pages/{talks => paper}/EditTalkPanel.html | 0 .../pages/{talks => paper}/EditTalkPanel.java | 2 +- .../{talks => paper}/ListTalksPanel.html | 0 .../{talks => paper}/ListTalksPanel.java | 16 +++++++++++++--- .../pages/{talks => paper}/ModelTalkList.java | 2 +- .../web/pages/{talks => paper}/RefToTalk.java | 2 +- .../{talks => paper}/TalksOverviewPage.java | 4 ++-- .../pages/{talks => paper}/ViewTalkPage.java | 6 +++--- .../pages/{talks => paper}/ViewTalkPanel.html | 0 .../pages/{talks => paper}/ViewTalkPanel.java | 2 +- .../{talks => paper}/action/CreateTalk.java | 4 ++-- .../action/EditOrViewTalk.java | 10 +++++----- .../web/pages/profile/MyOverviewPanel.java | 6 +++--- .../web/pages/users/ListUserPanel.java | 8 ++++++++ .../web/pages/voting/ListVotesPanel.java | 10 +++++++++- .../web/pages/whish/ListWhishesPanel.java | 12 ++++++++++-- 24 files changed, 113 insertions(+), 30 deletions(-) rename sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/{talks => paper}/EditTalkPanel.html (100%) rename sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/{talks => paper}/EditTalkPanel.java (98%) rename sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/{talks => paper}/ListTalksPanel.html (100%) rename sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/{talks => paper}/ListTalksPanel.java (90%) rename sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/{talks => paper}/ModelTalkList.java (88%) rename sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/{talks => paper}/RefToTalk.java (68%) rename sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/{talks => paper}/TalksOverviewPage.java (94%) rename sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/{talks => paper}/ViewTalkPage.java (84%) rename sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/{talks => paper}/ViewTalkPanel.html (100%) rename sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/{talks => paper}/ViewTalkPanel.java (94%) rename sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/{talks => paper}/action/CreateTalk.java (82%) rename sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/{talks => paper}/action/EditOrViewTalk.java (89%) diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/ConfigMainNavigation.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/ConfigMainNavigation.java index a8de8ac..53d3a93 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/ConfigMainNavigation.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/ConfigMainNavigation.java @@ -27,10 +27,10 @@ import de.bitnoise.sonferenz.web.pages.config.EditConfigurationPage; import de.bitnoise.sonferenz.web.pages.config.EditTextePage; import de.bitnoise.sonferenz.web.pages.config.EditUserRolesPage; +import de.bitnoise.sonferenz.web.pages.paper.TalksOverviewPage; import de.bitnoise.sonferenz.web.pages.profile.MyProfilePage; import de.bitnoise.sonferenz.web.pages.settings.SettingsPage; import de.bitnoise.sonferenz.web.pages.statics.ConferencePage; -import de.bitnoise.sonferenz.web.pages.talks.TalksOverviewPage; import de.bitnoise.sonferenz.web.pages.timetable.TimeTablePage; import de.bitnoise.sonferenz.web.pages.users.UserOverviewPage; import de.bitnoise.sonferenz.web.pages.voting.VotingOverviewPage; diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/component/SortableServiceDataProvider.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/component/SortableServiceDataProvider.java index e24adac..5efd4cb 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/component/SortableServiceDataProvider.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/component/SortableServiceDataProvider.java @@ -72,12 +72,19 @@ protected List getAllItemList(int first, int count, String propertyToSo Sort sort=new Sort(new Order(direction, propertyToSort)); request = new PageRequest(f, count,sort); } else { - request = new PageRequest(f, count); + Sort sort=createDefaultSorting(); + if(sort!=null) { + request = new PageRequest(f, count, sort); + } else { + request = new PageRequest(f, count); + } } Page result = getAllItems(request); return result.getContent(); } + protected abstract Sort createDefaultSorting(); + protected abstract Page getAllItems(PageRequest request); public abstract int size(); diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/component/TableBuilder.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/component/TableBuilder.java index d2bd800..6841207 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/component/TableBuilder.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/component/TableBuilder.java @@ -32,6 +32,8 @@ public class TableBuilder implements Serializable private String _prefix; + private String _defaultSort; + public TableBuilder(String resourceTableName) { _prefix = resourceTableName; @@ -251,9 +253,18 @@ protected void onInitPanels(RepeatingView view) }; add(column); } + + public void setDefaultSort(String column) { + _defaultSort=column; + } public abstract static class ActionColumn implements Serializable { abstract public Component populate(String id, T row); } + + public String getDefaultSorting() + { + return _defaultSort; + } } diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/component/lvl1/FirstLevelBar.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/component/lvl1/FirstLevelBar.java index a55c9ef..a774723 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/component/lvl1/FirstLevelBar.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/component/lvl1/FirstLevelBar.java @@ -4,11 +4,11 @@ import org.apache.wicket.markup.repeater.RepeatingView; import de.bitnoise.sonferenz.KonferenzSession; +import de.bitnoise.sonferenz.web.pages.paper.TalksOverviewPage; import de.bitnoise.sonferenz.web.pages.statics.ConferencePage; import de.bitnoise.sonferenz.web.pages.statics.ContactPage; import de.bitnoise.sonferenz.web.pages.statics.InfoPage; import de.bitnoise.sonferenz.web.pages.statics.RegisterPage; -import de.bitnoise.sonferenz.web.pages.talks.TalksOverviewPage; import de.bitnoise.sonferenz.web.pages.whish.WhishOverviewPage; public class FirstLevelBar extends Panel { diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/base/AbstractListPanel.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/base/AbstractListPanel.java index 805bd6a..af57e09 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/base/AbstractListPanel.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/base/AbstractListPanel.java @@ -15,6 +15,9 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.data.domain.Sort.Direction; +import org.springframework.data.domain.Sort.Order; import de.bitnoise.sonferenz.service.v2.services.ConfigurationService; import de.bitnoise.sonferenz.web.component.SortableServiceDataProvider; @@ -30,6 +33,8 @@ public abstract class AbstractListPanel table; + private String _defaultSort; + public AbstractListPanel(String id, String headingId) { super(id); @@ -37,6 +42,7 @@ public AbstractListPanel(String id, String headingId) initColumns(builder); SortableServiceDataProvider provider = createProvider(); List> columns = builder.getColumns(); + _defaultSort = builder.getDefaultSorting(); Integer maxPageSize = config.getIntegerValue(100, "table." + headingId + ".paginationSize", "table.paginationSize"); @@ -99,9 +105,22 @@ protected VIEW_MODEL transferType(DB_MODEL dbObject) { return transferDbToViewModel(dbObject); } + + @Override + protected Sort createDefaultSorting() + { + return createDefaultSort(); + } }; } + protected Sort createDefaultSort() { + if(_defaultSort==null) { + return null; + } + return new Sort(Direction.ASC,_defaultSort); + } + protected abstract VIEW_MODEL transferDbToViewModel(DB_MODEL dbObject); protected abstract Page getItems(PageRequest request); diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/conference/ListConferencesPanel.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/conference/ListConferencesPanel.java index 460fe27..5107a34 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/conference/ListConferencesPanel.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/conference/ListConferencesPanel.java @@ -7,6 +7,9 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.data.domain.Sort.Direction; +import org.springframework.data.domain.Sort.Order; import de.bitnoise.sonferenz.facade.UiFacade; import de.bitnoise.sonferenz.model.ConferenceModel; @@ -82,6 +85,12 @@ public int size() { return facade.getAllConferencesCount(); } + + @Override + protected Sort createDefaultSorting() + { + return new Sort(new Order(Direction.ASC, "shortName")); + } }; DefaultDataTable table = new DefaultDataTable( "conferenceTable", builder.getColumns(), provider, 20); diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/conference/action/EditConference.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/conference/action/EditConference.java index 2af3ce9..5c8e4dc 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/conference/action/EditConference.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/conference/action/EditConference.java @@ -7,8 +7,8 @@ import de.bitnoise.sonferenz.web.action.WebAction; import de.bitnoise.sonferenz.web.pages.conference.ConferenceOverviewPage; import de.bitnoise.sonferenz.web.pages.conference.table.ConferenceListItem; -import de.bitnoise.sonferenz.web.pages.talks.ModelTalkList; -import de.bitnoise.sonferenz.web.pages.talks.TalksOverviewPage; +import de.bitnoise.sonferenz.web.pages.paper.ModelTalkList; +import de.bitnoise.sonferenz.web.pages.paper.TalksOverviewPage; public class EditConference extends WebAction> { diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/config/ListConfigPanel.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/config/ListConfigPanel.java index 7a8ca80..3f888c3 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/config/ListConfigPanel.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/config/ListConfigPanel.java @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; import de.bitnoise.sonferenz.facade.UiFacade; import de.bitnoise.sonferenz.model.ConfigurationModel; @@ -51,7 +52,9 @@ protected void initColumns(TableBuilder builder) builder.addActions("actions", new Edit()); builder.addColumn("name"); builder.addColumn("value"); + builder.setDefaultSort("name"); } + @Override protected Component createAbovePanel(String id) diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/EditTalkPanel.html b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/EditTalkPanel.html similarity index 100% rename from sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/EditTalkPanel.html rename to sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/EditTalkPanel.html diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/EditTalkPanel.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/EditTalkPanel.java similarity index 98% rename from sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/EditTalkPanel.java rename to sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/EditTalkPanel.java index 03ae154..129a362 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/EditTalkPanel.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/EditTalkPanel.java @@ -1,4 +1,4 @@ -package de.bitnoise.sonferenz.web.pages.talks; +package de.bitnoise.sonferenz.web.pages.paper; import org.apache.wicket.injection.web.InjectorHolder; import org.apache.wicket.markup.html.form.Button; diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/ListTalksPanel.html b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/ListTalksPanel.html similarity index 100% rename from sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/ListTalksPanel.html rename to sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/ListTalksPanel.html diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/ListTalksPanel.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/ListTalksPanel.java similarity index 90% rename from sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/ListTalksPanel.java rename to sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/ListTalksPanel.java index e75a230..0cee083 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/ListTalksPanel.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/ListTalksPanel.java @@ -1,4 +1,4 @@ -package de.bitnoise.sonferenz.web.pages.talks; +package de.bitnoise.sonferenz.web.pages.paper; import java.util.HashSet; import java.util.Set; @@ -12,6 +12,9 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.data.domain.Sort.Direction; +import org.springframework.data.domain.Sort.Order; import de.bitnoise.sonferenz.facade.UiFacade; @@ -20,8 +23,8 @@ import de.bitnoise.sonferenz.web.component.SortableServiceDataProvider; import de.bitnoise.sonferenz.web.component.TableBuilder; import de.bitnoise.sonferenz.web.component.link.AjaxLink; -import de.bitnoise.sonferenz.web.pages.talks.action.CreateTalk; -import de.bitnoise.sonferenz.web.pages.talks.action.EditOrViewTalk; +import de.bitnoise.sonferenz.web.pages.paper.action.CreateTalk; +import de.bitnoise.sonferenz.web.pages.paper.action.EditOrViewTalk; import de.bitnoise.sonferenz.web.pages.users.UserOverviewPage; import de.bitnoise.sonferenz.web.pages.users.action.CreateNewUser; import de.bitnoise.sonferenz.web.toolbar.AddToolbarWithButton; @@ -59,6 +62,7 @@ protected void onInitialize() sortable(); action(new EditOrViewTalk()); } + }); // addColumn(new Column() // { @@ -112,6 +116,12 @@ public int size() return facade.getAllTalksCount(); } + @Override + protected Sort createDefaultSorting() + { + return new Sort(new Order(Direction.ASC, "title")); + } + }; String text=content2.text("page.talkHeader",""); add(new Label("headerText",text).setEscapeModelStrings(false)); diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/ModelTalkList.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/ModelTalkList.java similarity index 88% rename from sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/ModelTalkList.java rename to sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/ModelTalkList.java index 7b5c377..8d1a9c0 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/ModelTalkList.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/ModelTalkList.java @@ -1,4 +1,4 @@ -package de.bitnoise.sonferenz.web.pages.talks; +package de.bitnoise.sonferenz.web.pages.paper; import java.io.Serializable; diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/RefToTalk.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/RefToTalk.java similarity index 68% rename from sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/RefToTalk.java rename to sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/RefToTalk.java index ae57e7e..b3e5406 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/RefToTalk.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/RefToTalk.java @@ -1,4 +1,4 @@ -package de.bitnoise.sonferenz.web.pages.talks; +package de.bitnoise.sonferenz.web.pages.paper; import de.bitnoise.sonferenz.model.TalkModel; diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/TalksOverviewPage.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/TalksOverviewPage.java similarity index 94% rename from sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/TalksOverviewPage.java rename to sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/TalksOverviewPage.java index 8212f75..1c37b03 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/TalksOverviewPage.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/TalksOverviewPage.java @@ -1,4 +1,4 @@ -package de.bitnoise.sonferenz.web.pages.talks; +package de.bitnoise.sonferenz.web.pages.paper; import java.util.ArrayList; @@ -15,7 +15,7 @@ import de.bitnoise.sonferenz.web.component.navigation.NavCallbackInterface; import de.bitnoise.sonferenz.web.pages.KonferenzPage; import de.bitnoise.sonferenz.web.pages.UnauthorizedPanel; -import de.bitnoise.sonferenz.web.pages.talks.action.CreateTalk; +import de.bitnoise.sonferenz.web.pages.paper.action.CreateTalk; @At(url = "/talks") public class TalksOverviewPage extends KonferenzPage diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/ViewTalkPage.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/ViewTalkPage.java similarity index 84% rename from sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/ViewTalkPage.java rename to sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/ViewTalkPage.java index 0048091..c20b9db 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/ViewTalkPage.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/ViewTalkPage.java @@ -1,4 +1,4 @@ -package de.bitnoise.sonferenz.web.pages.talks; +package de.bitnoise.sonferenz.web.pages.paper; import org.apache.wicket.PageParameters; import org.apache.wicket.model.Model; @@ -9,9 +9,9 @@ import de.bitnoise.sonferenz.facade.UiFacade; import de.bitnoise.sonferenz.model.TalkModel; import de.bitnoise.sonferenz.web.pages.KonferenzPage; -import de.bitnoise.sonferenz.web.pages.talks.action.EditOrViewTalk; +import de.bitnoise.sonferenz.web.pages.paper.action.EditOrViewTalk; -@At(url = "/talk") +@At(url = "/paper") public class ViewTalkPage extends KonferenzPage { public static final String PARAM_ID = "id"; diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/ViewTalkPanel.html b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/ViewTalkPanel.html similarity index 100% rename from sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/ViewTalkPanel.html rename to sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/ViewTalkPanel.html diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/ViewTalkPanel.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/ViewTalkPanel.java similarity index 94% rename from sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/ViewTalkPanel.java rename to sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/ViewTalkPanel.java index 4e3f63a..8927942 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/ViewTalkPanel.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/ViewTalkPanel.java @@ -1,4 +1,4 @@ -package de.bitnoise.sonferenz.web.pages.talks; +package de.bitnoise.sonferenz.web.pages.paper; import org.apache.wicket.injection.web.InjectorHolder; import org.apache.wicket.markup.html.basic.Label; diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/action/CreateTalk.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/action/CreateTalk.java similarity index 82% rename from sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/action/CreateTalk.java rename to sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/action/CreateTalk.java index f8078f3..64f729f 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/action/CreateTalk.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/action/CreateTalk.java @@ -1,10 +1,10 @@ -package de.bitnoise.sonferenz.web.pages.talks.action; +package de.bitnoise.sonferenz.web.pages.paper.action; import org.apache.wicket.Page; import org.apache.wicket.model.IModel; import de.bitnoise.sonferenz.web.action.WebMenuAction; -import de.bitnoise.sonferenz.web.pages.talks.TalksOverviewPage; +import de.bitnoise.sonferenz.web.pages.paper.TalksOverviewPage; public class CreateTalk extends WebMenuAction> { diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/action/EditOrViewTalk.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/action/EditOrViewTalk.java similarity index 89% rename from sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/action/EditOrViewTalk.java rename to sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/action/EditOrViewTalk.java index 1f4c08a..8ea12bb 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/talks/action/EditOrViewTalk.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/paper/action/EditOrViewTalk.java @@ -1,4 +1,4 @@ -package de.bitnoise.sonferenz.web.pages.talks.action; +package de.bitnoise.sonferenz.web.pages.paper.action; import org.apache.wicket.Page; import org.apache.wicket.PageParameters; @@ -13,10 +13,10 @@ import de.bitnoise.sonferenz.web.action.IWebAction; import de.bitnoise.sonferenz.web.action.WebAction; import de.bitnoise.sonferenz.web.pages.auth.LoginPage; -import de.bitnoise.sonferenz.web.pages.talks.ModelTalkList; -import de.bitnoise.sonferenz.web.pages.talks.RefToTalk; -import de.bitnoise.sonferenz.web.pages.talks.TalksOverviewPage; -import de.bitnoise.sonferenz.web.pages.talks.ViewTalkPage; +import de.bitnoise.sonferenz.web.pages.paper.ModelTalkList; +import de.bitnoise.sonferenz.web.pages.paper.RefToTalk; +import de.bitnoise.sonferenz.web.pages.paper.TalksOverviewPage; +import de.bitnoise.sonferenz.web.pages.paper.ViewTalkPage; import de.bitnoise.sonferenz.web.pages.voting.UserVoteItem; public class EditOrViewTalk extends WebAction> diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/profile/MyOverviewPanel.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/profile/MyOverviewPanel.java index d14f714..01dcadb 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/profile/MyOverviewPanel.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/profile/MyOverviewPanel.java @@ -18,10 +18,10 @@ import de.bitnoise.sonferenz.web.component.TableBuilder; import de.bitnoise.sonferenz.web.component.TableBuilder.Column; import de.bitnoise.sonferenz.web.pages.base.AbstractListPanel; +import de.bitnoise.sonferenz.web.pages.paper.EditTalkPanel; +import de.bitnoise.sonferenz.web.pages.paper.RefToTalk; +import de.bitnoise.sonferenz.web.pages.paper.action.EditOrViewTalk; import de.bitnoise.sonferenz.web.pages.profile.MyOverviewPanel.TalkListItem; -import de.bitnoise.sonferenz.web.pages.talks.EditTalkPanel; -import de.bitnoise.sonferenz.web.pages.talks.RefToTalk; -import de.bitnoise.sonferenz.web.pages.talks.action.EditOrViewTalk; import de.bitnoise.sonferenz.web.pages.whish.ReftoWhish; import de.bitnoise.sonferenz.web.pages.whish.action.EditOrViewWhish; diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/users/ListUserPanel.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/users/ListUserPanel.java index 745fd4f..c8b39cb 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/users/ListUserPanel.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/users/ListUserPanel.java @@ -11,6 +11,8 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.data.domain.Sort.Direction; import de.bitnoise.sonferenz.facade.UiFacade; @@ -146,6 +148,12 @@ public int size() { return facade.getUserCount(); } + + @Override + protected Sort createDefaultSorting() + { + return new Sort(Direction.ASC,"login"); + } }; return provider; } diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/voting/ListVotesPanel.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/voting/ListVotesPanel.java index cb39e2a..8e3ec62 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/voting/ListVotesPanel.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/voting/ListVotesPanel.java @@ -13,6 +13,8 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.data.domain.Sort.Direction; import de.bitnoise.sonferenz.KonferenzSession; @@ -26,7 +28,7 @@ import de.bitnoise.sonferenz.web.component.table.ListPanel; import de.bitnoise.sonferenz.web.component.table.VoteColumn; import de.bitnoise.sonferenz.web.component.table.VoteMultiStateColumn; -import de.bitnoise.sonferenz.web.pages.talks.action.EditOrViewTalk; +import de.bitnoise.sonferenz.web.pages.paper.action.EditOrViewTalk; public class ListVotesPanel extends ListPanel { @@ -187,6 +189,12 @@ protected UserVoteItem transferType(TalkModel dbObject) // voteService.vote(dbObject, dbObject.getOwner(), 2); return item; } + + @Override + protected Sort createDefaultSorting() + { + return new Sort(Direction.ASC,"title"); + } }; // SortableServiceDataProvider2 provider = new SortableServiceDataProvider2( // talks) { diff --git a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/whish/ListWhishesPanel.java b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/whish/ListWhishesPanel.java index e7987e7..4a4c203 100644 --- a/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/whish/ListWhishesPanel.java +++ b/sonferenz-web/src/main/java/de/bitnoise/sonferenz/web/pages/whish/ListWhishesPanel.java @@ -9,6 +9,8 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.data.domain.Sort.Direction; import de.bitnoise.sonferenz.KonferenzSession; import de.bitnoise.sonferenz.facade.UiFacade; @@ -18,8 +20,8 @@ import de.bitnoise.sonferenz.web.component.SortableServiceDataProvider; import de.bitnoise.sonferenz.web.component.TableBuilder; import de.bitnoise.sonferenz.web.component.link.AjaxLink; -import de.bitnoise.sonferenz.web.pages.talks.ListTalksPanel; -import de.bitnoise.sonferenz.web.pages.talks.TalksOverviewPage; +import de.bitnoise.sonferenz.web.pages.paper.ListTalksPanel; +import de.bitnoise.sonferenz.web.pages.paper.TalksOverviewPage; import de.bitnoise.sonferenz.web.pages.whish.action.CreateWhish; import de.bitnoise.sonferenz.web.pages.whish.action.EditOrViewWhish; import de.bitnoise.sonferenz.web.toolbar.AddToolbarWithButton; @@ -109,6 +111,12 @@ public int size() { return facade.getWhishesCount(); } + + @Override + protected Sort createDefaultSorting() + { + return new Sort(Direction.ASC,"title"); + } }; String text=content2.text("page.whishHeader","");