You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by rm...@apache.org on 2012/12/20 00:07:33 UTC
[1/5] git commit: Fixing failing tests in code that I pulled down
Updated Branches:
refs/heads/master df9ec83f6 -> 13bed72b5
Fixing failing tests in code that I pulled down
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/13bed72b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/13bed72b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/13bed72b
Branch: refs/heads/master
Commit: 13bed72b5f052714a4df221820f7f6a1e0f76f60
Parents: d780df2
Author: rmatthews <rm...@nakedobjects.org>
Authored: Wed Dec 19 22:05:17 2012 +0000
Committer: rmatthews <rm...@nakedobjects.org>
Committed: Wed Dec 19 22:05:17 2012 +0000
----------------------------------------------------------------------
.../isis/viewer/junit/sample/domain/Customer.java | 2 +-
.../application/claims/dom/claim/Claim.java | 6 +++---
.../dom/src/main/java/dom/todo/ToDoItem.java | 8 ++++----
.../dom/src/main/java/dom/todo/ToDoItem.java | 9 ++++-----
4 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/13bed72b/component/viewer/junit/impl/src/test/java/org/apache/isis/viewer/junit/sample/domain/Customer.java
----------------------------------------------------------------------
diff --git a/component/viewer/junit/impl/src/test/java/org/apache/isis/viewer/junit/sample/domain/Customer.java b/component/viewer/junit/impl/src/test/java/org/apache/isis/viewer/junit/sample/domain/Customer.java
index f2beefb..e5e477e 100644
--- a/component/viewer/junit/impl/src/test/java/org/apache/isis/viewer/junit/sample/domain/Customer.java
+++ b/component/viewer/junit/impl/src/test/java/org/apache/isis/viewer/junit/sample/domain/Customer.java
@@ -675,7 +675,7 @@ public class Customer extends AbstractDomainObject {
public String disablePlaceOrder;
- public String disablePlaceOrder() {
+ public String disablePlaceOrder(final Product p, final Integer quantity) {
return disablePlaceOrder;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/13bed72b/example/application/claims/dom/src/main/java/org/apache/isis/example/application/claims/dom/claim/Claim.java
----------------------------------------------------------------------
diff --git a/example/application/claims/dom/src/main/java/org/apache/isis/example/application/claims/dom/claim/Claim.java b/example/application/claims/dom/src/main/java/org/apache/isis/example/application/claims/dom/claim/Claim.java
index 2750bbb..c4f9df4 100644
--- a/example/application/claims/dom/src/main/java/org/apache/isis/example/application/claims/dom/claim/Claim.java
+++ b/example/application/claims/dom/src/main/java/org/apache/isis/example/application/claims/dom/claim/Claim.java
@@ -235,7 +235,7 @@ public class Claim extends AbstractDomainObject /* implements Calendarable */{
setApprover(approver);
}
- public String disableSubmit() {
+ public String disableSubmit(final Approver approver) {
return !ClaimStatus.SUBMITTED.equals(getStatus()) ? null : "Claim has already been submitted";
}
@@ -258,7 +258,7 @@ public class Claim extends AbstractDomainObject /* implements Calendarable */{
addToItems(claimItem);
}
- public String disableAddItem() {
+ public String disableAddItem(final int days, final double amount, final String description) {
return Reasons.coalesce(ifAlreadySubmitted());
}
@@ -270,7 +270,7 @@ public class Claim extends AbstractDomainObject /* implements Calendarable */{
removeFromItems(claimItem);
}
- public String disableRemoveItem() {
+ public String disableRemoveItem(final ClaimItem claimItem) {
return Reasons.coalesce(ifAlreadySubmitted());
}
http://git-wip-us.apache.org/repos/asf/isis/blob/13bed72b/example/application/quickstart/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/quickstart/dom/src/main/java/dom/todo/ToDoItem.java
index ff84a97..e8af026 100644
--- a/example/application/quickstart/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/application/quickstart/dom/src/main/java/dom/todo/ToDoItem.java
@@ -39,7 +39,7 @@ import org.joda.time.LocalDate;
@ObjectType("TODO")
@MemberGroups({"General", "Detail"})
public class ToDoItem {
-
+
public static enum Category {
Professional, Domestic, Other;
}
@@ -151,7 +151,7 @@ public class ToDoItem {
return !done ? "Not yet done" : null;
}
// }}
-
+
// {{ dependencies (Collection)
private List<ToDoItem> dependencies = new ArrayList<ToDoItem>();
@@ -190,7 +190,7 @@ public class ToDoItem {
getDependencies().remove(toDoItem);
return this;
}
- public String disableRemove() {
+ public String disableRemove(final ToDoItem toDoItem) {
return getDependencies().isEmpty()? "No dependencies to remove": null;
}
public String validateRemove(final ToDoItem toDoItem) {
@@ -221,5 +221,5 @@ public class ToDoItem {
this.toDoItems = toDoItems;
}
// }}
-
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/13bed72b/example/application/quickstart_dnd_junit_bdd/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_dnd_junit_bdd/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/quickstart_dnd_junit_bdd/dom/src/main/java/dom/todo/ToDoItem.java
index bf71448..0327a19 100644
--- a/example/application/quickstart_dnd_junit_bdd/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/application/quickstart_dnd_junit_bdd/dom/src/main/java/dom/todo/ToDoItem.java
@@ -29,7 +29,6 @@ import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.MemberGroups;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.MultiLine;
-import org.apache.isis.applib.annotation.Named;
import org.apache.isis.applib.annotation.ObjectType;
import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.applib.annotation.Resolve;
@@ -42,7 +41,7 @@ import org.joda.time.LocalDate;
@AutoComplete(repository=ToDoItems.class, action="autoComplete")
@MemberGroups({"General", "Detail"})
public class ToDoItem {
-
+
public static enum Category {
Professional, Domestic, Other;
}
@@ -154,7 +153,7 @@ public class ToDoItem {
return !done ? "Not yet done" : null;
}
// }}
-
+
// {{ dependencies (Collection)
private List<ToDoItem> dependencies = new ArrayList<ToDoItem>();
@@ -193,7 +192,7 @@ public class ToDoItem {
getDependencies().remove(toDoItem);
return this;
}
- public String disableRemove() {
+ public String disableRemove(final ToDoItem toDoItem) {
return getDependencies().isEmpty()? "No dependencies to remove": null;
}
public String validateRemove(final ToDoItem toDoItem) {
@@ -224,5 +223,5 @@ public class ToDoItem {
this.toDoItems = toDoItems;
}
// }}
-
+
}