You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2013/10/07 10:01:58 UTC
git commit: ISIS-543: reinstating 'Analysis' menu item
Updated Branches:
refs/heads/master fd9d35ab5 -> c1e5ab7da
ISIS-543: reinstating 'Analysis' menu item
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c1e5ab7d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c1e5ab7d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c1e5ab7d
Branch: refs/heads/master
Commit: c1e5ab7daddd30450cc8dbab6df2c5a5ffe5215f
Parents: fd9d35a
Author: Dan Haywood <da...@apache.org>
Authored: Mon Oct 7 09:01:40 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Mon Oct 7 09:01:40 2013 +0100
----------------------------------------------------------------------
.../dom/src/main/java/app/ToDoAppDashboard.java | 2 ++
.../dom/src/main/java/app/ToDoItemAnalysis.java | 23 +++++++++-----------
.../src/main/webapp/WEB-INF/isis.properties | 2 +-
3 files changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c1e5ab7d/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoAppDashboard.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoAppDashboard.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoAppDashboard.java
index 2329e0a..afdb2ed 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoAppDashboard.java
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoAppDashboard.java
@@ -48,6 +48,7 @@ public class ToDoAppDashboard extends AbstractFactoryAndRepository {
// getAnalysisByCategory
// //////////////////////////////////////
+ @Named("By Category")
@Render(Type.EAGERLY)
@Disabled
public List<ToDoItemsByCategoryViewModel> getAnalysisByCategory() {
@@ -58,6 +59,7 @@ public class ToDoAppDashboard extends AbstractFactoryAndRepository {
// getAnalysisByDateRange
// //////////////////////////////////////
+ @Named("By Date Range")
@Render(Type.EAGERLY)
@Disabled
public List<ToDoItemsByDateRangeViewModel> getAnalysisByDateRange() {
http://git-wip-us.apache.org/repos/asf/isis/blob/c1e5ab7d/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoItemAnalysis.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoItemAnalysis.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoItemAnalysis.java
index 78678bb..44475b4 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoItemAnalysis.java
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoItemAnalysis.java
@@ -24,27 +24,18 @@ import java.util.List;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
-import com.google.common.collect.Ordering;
-import com.google.common.collect.Sets;
-import org.joda.time.LocalDate;
-
-import dom.todo.ToDoItem;
import dom.todo.ToDoItem.Category;
-import dom.todo.ToDoItems;
import org.apache.isis.applib.AbstractFactoryAndRepository;
import org.apache.isis.applib.annotation.ActionSemantics;
import org.apache.isis.applib.annotation.ActionSemantics.Of;
import org.apache.isis.applib.annotation.Bookmarkable;
-import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Named;
import org.apache.isis.applib.annotation.Programmatic;
-import services.ClockService;
-
-@Hidden
+@Named("Analysis")
public class ToDoItemAnalysis extends AbstractFactoryAndRepository {
// //////////////////////////////////////
@@ -63,8 +54,11 @@ public class ToDoItemAnalysis extends AbstractFactoryAndRepository {
// //////////////////////////////////////
// ByCategory (action)
// //////////////////////////////////////
-
- @Programmatic
+
+ @Named("By Category")
+ @Bookmarkable
+ @ActionSemantics(Of.SAFE)
+ @MemberOrder(sequence = "1")
public List<ToDoItemsByCategoryViewModel> toDoItemsByCategory() {
final List<Category> categories = Arrays.asList(Category.values());
return Lists.newArrayList(Iterables.transform(categories, byCategory()));
@@ -95,7 +89,10 @@ public class ToDoItemAnalysis extends AbstractFactoryAndRepository {
Unknown,
}
- @Programmatic
+ @Named("By Date Range")
+ @Bookmarkable
+ @ActionSemantics(Of.SAFE)
+ @MemberOrder(sequence = "1")
public List<ToDoItemsByDateRangeViewModel> toDoItemsByDateRange() {
final List<DateRange> dateRanges = Arrays.asList(DateRange.values());
return Lists.newArrayList(Iterables.transform(dateRanges, byDateRange()));
http://git-wip-us.apache.org/repos/asf/isis/blob/c1e5ab7d/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
index 1b6d708..66fb4b0 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -187,7 +187,7 @@ isis.reflector.facet-decorators=org.apache.isis.core.progmodel.facetdecorators.i
#isis.services.prefix =
isis.services = \
10:dom.todo.ToDoItems,\
- app.ToDoItemAnalysis,\
+ 20:app.ToDoItemAnalysis,\
dom.todo.ToDoItemContributions,\
app.ToDoItemAnalysisContributions,\
app.ToDoAppDashboard,\