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/09/06 19:28:42 UTC
git commit: ISIS-518: updating the ToDoItem example app
Updated Branches:
refs/heads/master 52912061f -> 663c1f7ca
ISIS-518: updating the ToDoItem example app
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/663c1f7c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/663c1f7c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/663c1f7c
Branch: refs/heads/master
Commit: 663c1f7ca2960e600bd04d6321b378a7821a3a60
Parents: 5291206
Author: Dan Haywood <da...@apache.org>
Authored: Fri Sep 6 18:28:30 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Fri Sep 6 18:28:30 2013 +0100
----------------------------------------------------------------------
.../java/dom/todo/ToDoItemContributions.java | 6 ++--
.../dom/src/main/java/dom/todo/ToDoItems.java | 29 +++++---------------
2 files changed, 9 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/663c1f7c/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemContributions.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemContributions.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemContributions.java
index ae8ae17..6bc670d 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemContributions.java
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemContributions.java
@@ -37,13 +37,11 @@ import org.apache.isis.applib.annotation.ActionSemantics;
import org.apache.isis.applib.annotation.ActionSemantics.Of;
import org.apache.isis.applib.annotation.DescribedAs;
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.NotContributed;
import org.apache.isis.applib.annotation.NotContributed.As;
import org.apache.isis.applib.annotation.NotInServiceMenu;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.query.QueryDefault;
public class ToDoItemContributions extends AbstractFactoryAndRepository {
@@ -139,9 +137,9 @@ public class ToDoItemContributions extends AbstractFactoryAndRepository {
public List<ToDoItem> similarTo(final ToDoItem toDoItem) {
if(false) {
// the naive implementation ...
- return allMatches(ToDoItem.class, new Filter<ToDoItem>() {
+ return allMatches(ToDoItem.class, new Predicate<ToDoItem>() {
@Override
- public boolean accept(ToDoItem t) {
+ public boolean apply(final ToDoItem t) {
return t != toDoItem && Objects.equal(toDoItem.getCategory(), t.getCategory()) && Objects.equal(toDoItem.getOwnedBy(), t.getOwnedBy());
}
});
http://git-wip-us.apache.org/repos/asf/isis/blob/663c1f7c/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItems.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItems.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItems.java
index 0411239..dac7dcf 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItems.java
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItems.java
@@ -19,19 +19,11 @@
package dom.todo;
import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
-import java.util.Comparator;
import java.util.List;
-import com.google.common.base.Function;
import com.google.common.base.Objects;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Ordering;
+import com.google.common.base.Predicate;
import dom.todo.ToDoItem.Category;
import dom.todo.ToDoItem.Subcategory;
@@ -41,19 +33,12 @@ import org.joda.time.LocalDate;
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.DescribedAs;
-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.NotContributed;
-import org.apache.isis.applib.annotation.NotContributed.As;
-import org.apache.isis.applib.annotation.NotInServiceMenu;
import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.RegEx;
-import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.clock.Clock;
-import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.query.QueryDefault;
@Named("ToDos")
@@ -82,9 +67,9 @@ public class ToDoItems extends AbstractFactoryAndRepository {
final List<ToDoItem> items;
if(false) {
// the naive implementation ...
- items = allMatches(ToDoItem.class, new Filter<ToDoItem>() {
+ items = allMatches(ToDoItem.class, new Predicate<ToDoItem>() {
@Override
- public boolean accept(final ToDoItem t) {
+ public boolean apply(final ToDoItem t) {
return ownedByCurrentUser(t) && !t.isComplete();
}
});
@@ -111,9 +96,9 @@ public class ToDoItems extends AbstractFactoryAndRepository {
final List<ToDoItem> items;
if(false) {
// the naive implementation ...
- items = allMatches(ToDoItem.class, new Filter<ToDoItem>() {
+ items = allMatches(ToDoItem.class, new Predicate<ToDoItem>() {
@Override
- public boolean accept(final ToDoItem t) {
+ public boolean apply(final ToDoItem t) {
return ownedByCurrentUser(t) && t.isComplete();
}
});
@@ -184,9 +169,9 @@ public class ToDoItems extends AbstractFactoryAndRepository {
public List<ToDoItem> autoComplete(final String description) {
if(false) {
// the naive implementation ...
- return allMatches(ToDoItem.class, new Filter<ToDoItem>() {
+ return allMatches(ToDoItem.class, new Predicate<ToDoItem>() {
@Override
- public boolean accept(final ToDoItem t) {
+ public boolean apply(final ToDoItem t) {
return ownedByCurrentUser(t) && t.getDescription().contains(description);
}