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 2012/01/22 15:43:55 UTC
svn commit: r1234519 [1/3] - in /incubator/isis/trunk/examples:
claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/
claims/dom/src/main/java/org/apache/isis/example/claims/dom/employee/
claims/fixture/src/main/java/org/apache/isis/exampl...
Author: danhaywood
Date: Sun Jan 22 14:43:52 2012
New Revision: 1234519
URL: http://svn.apache.org/viewvc?rev=1234519&view=rev
Log:
ISIS-101: fixing line endings and svn properties
Modified:
incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/Approver.java
incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/Claim.java
incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/ClaimItem.java
incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/Claimant.java
incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/employee/Employee.java
incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/employee/EmployeeTakeOn.java
incubator/isis/trunk/examples/claims/fixture/src/main/java/org/apache/isis/example/claims/fixture/ClaimsFixture.java
incubator/isis/trunk/examples/claims/fixture/src/main/java/org/apache/isis/example/claims/fixture/ClaimsLogonFixture.java
incubator/isis/trunk/examples/claims/objstore-default/src/main/java/org/apache/isis/example/claims/objstore/dflt/claim/ClaimRepositoryDefault.java
incubator/isis/trunk/examples/claims/objstore-default/src/main/java/org/apache/isis/example/claims/objstore/dflt/employee/EmployeeRepositoryDefault.java
incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/AbstractApplicationStory.java
incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/common/BootstrapInExplorationMode.java
incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/common/BootstrapInPrototypeMode.java
incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/common/Employees.java
incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/AllStories.java
incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/Fixture.java
incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/Index.java
incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/ScenarioDefaultsOk.java
incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/ScenarioOnceCreatedShowsUpForClaimant.java
incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/AbstractTest.java
incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/ClaimSubmitTest.java
incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/NewClaimTest.java
incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/controller/HomeController.java
incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/controller/PersonController.java
incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/dao/PersonDao.java
incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/isis/CglibClassSubstitutor.java
incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/model/Person.java
incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/DataInitializer.java
incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/HomeControllerTest.java
incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/PersonControllerTest.java
incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/dao/PersonDaoTest.java
incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/webserver/WebServerBootstrapper.java
incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java
incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java
incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileParser.java
incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileProgModelFacets.java
incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/DomainObjectWithNameFileEntry.java
incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/DomainObjectWithoutNameFileEntry.java
incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFacetHolderTest.java
incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryFeatureTypesTest.java
incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryInstantiationTest.java
incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java
incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetInstantiationTest.java
incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetValueTest.java
incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileParserInstantiationTest.java
incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileParserParsingTest.java
incubator/isis/trunk/examples/onlinedemo/dom/src/main/java/org/apache/isis/examples/onlinedemo/dom/demo/DemoFixtures.java
incubator/isis/trunk/examples/onlinedemo/dom/src/main/java/org/apache/isis/examples/onlinedemo/dom/items/Categories.java
incubator/isis/trunk/examples/onlinedemo/dom/src/main/java/org/apache/isis/examples/onlinedemo/dom/items/Category.java
incubator/isis/trunk/examples/onlinedemo/dom/src/main/java/org/apache/isis/examples/onlinedemo/dom/items/ToDoItem.java
incubator/isis/trunk/examples/onlinedemo/dom/src/main/java/org/apache/isis/examples/onlinedemo/dom/items/ToDoItems.java
incubator/isis/trunk/examples/onlinedemo/fixture/src/main/java/org/apache/isis/examples/onlinedemo/fixture/items/DemoFixturesDefault.java
incubator/isis/trunk/examples/onlinedemo/fixture/src/main/java/org/apache/isis/examples/onlinedemo/fixture/items/ToDoItemsFixture.java
incubator/isis/trunk/examples/onlinedemo/objstore-default/src/main/java/org/apache/isis/examples/onlinedemo/objstore/dflt/items/CategoriesDefault.java
incubator/isis/trunk/examples/onlinedemo/objstore-default/src/main/java/org/apache/isis/examples/onlinedemo/objstore/dflt/items/ToDoItemsDefault.java
incubator/isis/trunk/examples/onlinedemo/webapp/src/main/java/org/apache/isis/examples/onlinedemo/auth/AuthenticationManagerSupportingInMemoryRegistrationInstaller.java
incubator/isis/trunk/examples/onlinedemo/webapp/src/main/java/org/apache/isis/examples/onlinedemo/auth/AuthenticatorInMemory.java
incubator/isis/trunk/examples/onlinedemo/webapp/src/main/java/org/apache/isis/examples/onlinedemo/filters/RedirectToDocsFilter.java
incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/mobile/app.css
incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/mobile/index.html
incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java
incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItems.java
incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/LogonAsSvenFixture.java
incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
incubator/isis/trunk/examples/quickstart/objstore-default/src/main/java/objstore/dflt/todo/ToDoItemsDefault.java
incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/AbstractApplicationStory.java
incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/BootstrapInExplorationMode.java
incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/ToDoItems.java
incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/AllStories.java
incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/Fixture.java
incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/Index.java
incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsComplete.java
incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java
incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java
incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemTest.java
Modified: incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/Approver.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/Approver.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/Approver.java (original)
+++ incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/Approver.java Sun Jan 22 14:43:52 2012
@@ -17,9 +17,8 @@
* under the License.
*/
-
package org.apache.isis.example.claims.dom.claim;
public interface Approver {
-
+
}
Modified: incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/Claim.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/Claim.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/Claim.java (original)
+++ incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/Claim.java Sun Jan 22 14:43:52 2012
@@ -37,7 +37,7 @@ import org.apache.isis.applib.value.Date
import org.apache.isis.applib.value.Money;
/**
- * @author danhaywood
+ * @author danhaywood
*/
public class Claim extends AbstractDomainObject /* implements Calendarable */{
@@ -45,6 +45,7 @@ public class Claim extends AbstractDomai
public String title() {
return getStatus() + " - " + getDate();
}
+
// }}
// {{ Lifecycle
@@ -60,12 +61,12 @@ public class Claim extends AbstractDomai
@MemberOrder(sequence = "1.2")
public boolean getRush() {
- return rush;
- }
+ return rush;
+ }
public void setRush(final boolean flag) {
- this.rush = flag;
- }
+ this.rush = flag;
+ }
// }}
@@ -74,20 +75,21 @@ public class Claim extends AbstractDomai
@MemberOrder(sequence = "1")
public String getDescription() {
- return description;
- }
+ return description;
+ }
- public void setDescription(String description) {
- this.description = description;
- }
+ public void setDescription(final String description) {
+ this.description = description;
+ }
public String defaultDescription() {
return "enter a description here";
}
public String validateDescription(final String description) {
- if (description == null)
+ if (description == null) {
return null;
+ }
if (description.contains("foobar")) {
return "can't contain foobar!";
}
@@ -101,47 +103,45 @@ public class Claim extends AbstractDomai
@MemberOrder(sequence = "2")
public Date getDate() {
- return date;
- }
+ return date;
+ }
- public void setDate(Date date) {
- this.date = date;
- }
+ public void setDate(final Date date) {
+ this.date = date;
+ }
// }}
// {{ Status
/**
- * @uml.property name="status"
+ * @uml.property name="status"
*/
private String status;
/**
* @return
- * @uml.property name="status"
+ * @uml.property name="status"
*/
@Disabled
@MemberOrder(sequence = "3")
@MaxLength(5)
public String getStatus() {
- return status;
- }
+ return status;
+ }
/**
* @param status
- * @uml.property name="status"
+ * @uml.property name="status"
*/
- public void setStatus(String status) {
- this.status = status;
- }
+ public void setStatus(final String status) {
+ this.status = status;
+ }
// }}
// {{ changeStatus
@MemberOrder(sequence = "1")
- public void changeStatus(
- @MustSatisfy(ClaimStatus.ChoicesSpecification.class)
- final String status) {
+ public void changeStatus(@MustSatisfy(ClaimStatus.ChoicesSpecification.class) final String status) {
setStatus(status);
}
@@ -157,28 +157,28 @@ public class Claim extends AbstractDomai
// {{ Claimant
/**
- * @uml.property name="claimant"
- * @uml.associationEnd
+ * @uml.property name="claimant"
+ * @uml.associationEnd
*/
private Claimant claimant;
/**
* @return
- * @uml.property name="claimant"
+ * @uml.property name="claimant"
*/
@Disabled
@MemberOrder(sequence = "4")
public Claimant getClaimant() {
- return claimant;
- }
+ return claimant;
+ }
/**
* @param claimant
- * @uml.property name="claimant"
+ * @uml.property name="claimant"
*/
- public void setClaimant(Claimant claimant) {
- this.claimant = claimant;
- }
+ public void setClaimant(final Claimant claimant) {
+ this.claimant = claimant;
+ }
// }}
@@ -189,20 +189,21 @@ public class Claim extends AbstractDomai
@MemberOrder(sequence = "5")
@Optional
public Approver getApprover() {
- return approver;
- }
+ return approver;
+ }
- public void setApprover(Approver approver) {
- this.approver = approver;
- }
+ public void setApprover(final Approver approver) {
+ this.approver = approver;
+ }
public String disableApprover() {
return getDescription().contains("baz") ? "desc contains baz" : null;
}
public String validateApprover(final Approver approver) {
- if (approver == null)
+ if (approver == null) {
return null;
+ }
return approver == getClaimant() ? "Can't approve own claims" : null;
}
@@ -213,21 +214,21 @@ public class Claim extends AbstractDomai
@MemberOrder(sequence = "6")
public List<ClaimItem> getItems() {
- return items;
- }
+ return items;
+ }
- public void addToItems(ClaimItem item) {
+ public void addToItems(final ClaimItem item) {
items.add(item);
}
- public void removeFromItems(ClaimItem item) {
+ public void removeFromItems(final ClaimItem item) {
items.remove(item);
}
// }}
// {{ action: Submit
- public void submit(Approver approver) {
+ public void submit(final Approver approver) {
setStatus(ClaimStatus.SUBMITTED);
setApprover(approver);
}
@@ -244,9 +245,8 @@ public class Claim extends AbstractDomai
// {{ action: addItem
@MemberOrder(sequence = "1")
- public void addItem(@Named("Days since") int days, @Named("Amount") double amount,
- @Named("Description") String description) {
- ClaimItem claimItem = newTransientInstance(ClaimItem.class);
+ public void addItem(@Named("Days since") final int days, @Named("Amount") final double amount, @Named("Description") final String description) {
+ final ClaimItem claimItem = newTransientInstance(ClaimItem.class);
Date date = new Date();
date = date.add(0, 0, days);
claimItem.setDateIncurred(date);
@@ -301,15 +301,14 @@ public class Claim extends AbstractDomai
private static final String NEW = "New";
private static final String INCOMPLETE = "Incomplete";
private static final String SUBMITTED = "Submitted";
-
- public static final List<String> ALL =
- Collections.unmodifiableList(Arrays.asList(NEW, INCOMPLETE, SUBMITTED));
+
+ public static final List<String> ALL = Collections.unmodifiableList(Arrays.asList(NEW, INCOMPLETE, SUBMITTED));
public static class ChoicesSpecification implements Specification {
@Override
- public String satisfies(Object obj) {
- for (String str : ALL) {
+ public String satisfies(final Object obj) {
+ for (final String str : ALL) {
if (str.equals(obj)) {
return null;
}
@@ -319,5 +318,4 @@ public class Claim extends AbstractDomai
}
}
-
}
Modified: incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/ClaimItem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/ClaimItem.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/ClaimItem.java (original)
+++ incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/ClaimItem.java Sun Jan 22 14:43:52 2012
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.example.claims.dom.claim;
import org.apache.isis.applib.AbstractDomainObject;
@@ -39,12 +38,13 @@ public class ClaimItem extends AbstractD
@MemberOrder(sequence = "1")
public Date getDateIncurred() {
- return dateIncurred;
- }
+ return dateIncurred;
+ }
+
+ public void setDateIncurred(final Date dateIncurred) {
+ this.dateIncurred = dateIncurred;
+ }
- public void setDateIncurred(Date dateIncurred) {
- this.dateIncurred = dateIncurred;
- }
// }}
// {{ Description
@@ -52,12 +52,13 @@ public class ClaimItem extends AbstractD
@MemberOrder(sequence = "2")
public String getDescription() {
- return description;
- }
+ return description;
+ }
+
+ public void setDescription(final String description) {
+ this.description = description;
+ }
- public void setDescription(String description) {
- this.description = description;
- }
// }}
// {{ Amount
@@ -65,13 +66,12 @@ public class ClaimItem extends AbstractD
@MemberOrder(sequence = "3")
public Money getAmount() {
- return amount;
- }
+ return amount;
+ }
- public void setAmount(Money price) {
- this.amount = price;
- }
+ public void setAmount(final Money price) {
+ this.amount = price;
+ }
// }}
-
}
Modified: incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/Claimant.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/Claimant.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/Claimant.java (original)
+++ incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/Claimant.java Sun Jan 22 14:43:52 2012
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.example.claims.dom.claim;
public interface Claimant {
Modified: incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/employee/Employee.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/employee/Employee.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/employee/Employee.java (original)
+++ incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/employee/Employee.java Sun Jan 22 14:43:52 2012
@@ -47,12 +47,12 @@ public class Employee extends AbstractDo
@MemberOrder(sequence = "1")
public String getName() {
- return name;
- }
+ return name;
+ }
- public void setName(String lastName) {
- this.name = lastName;
- }
+ public void setName(final String lastName) {
+ this.name = lastName;
+ }
// }}
@@ -62,16 +62,17 @@ public class Employee extends AbstractDo
@Override
@MemberOrder(sequence = "2")
public Approver getDefaultApprover() {
- return defaultApprover;
- }
+ return defaultApprover;
+ }
- public void setDefaultApprover(Approver approver) {
- this.defaultApprover = approver;
- }
+ public void setDefaultApprover(final Approver approver) {
+ this.defaultApprover = approver;
+ }
public String validateDefaultApprover(final Approver approver) {
- if (approver == null)
+ if (approver == null) {
return null;
+ }
if (approver == this) {
return "Cannot act as own approver";
}
@@ -86,12 +87,12 @@ public class Employee extends AbstractDo
@Optional
@MemberOrder(sequence = "1")
public Integer getLimit() {
- return limit;
- }
+ return limit;
+ }
+
public void setLimit(final Integer limit) {
- this.limit = limit;
- }
+ this.limit = limit;
+ }
// }}
-
}
Modified: incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/employee/EmployeeTakeOn.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/employee/EmployeeTakeOn.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/employee/EmployeeTakeOn.java (original)
+++ incubator/isis/trunk/examples/claims/dom/src/main/java/org/apache/isis/example/claims/dom/employee/EmployeeTakeOn.java Sun Jan 22 14:43:52 2012
@@ -16,135 +16,135 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.example.claims.dom.employee;
-
-import org.apache.isis.applib.AbstractDomainObject;
-import org.apache.isis.applib.annotation.Hidden;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Optional;
-import org.apache.isis.example.claims.dom.claim.Approver;
-
-public class EmployeeTakeOn extends AbstractDomainObject {
-
- // {{ Lifecycle methods
- public void created() {
- state = "page1";
- }
-
- // }}
-
- // {{ Name
- private String name;
-
- @MemberOrder(sequence = "1")
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public boolean hideName() {
- return !state.equals("page1") && isNotLast();
- }
-
- public String disableName() {
- return disableToConfirmIfLast();
- }
-
- // }}
-
- // {{ Approver
- private Approver approver;
-
- @MemberOrder(sequence = "2")
- @Optional
- public Approver getApprover() {
- return approver;
- }
-
- public void setApprover(final Approver approver) {
- this.approver = approver;
- }
-
- public boolean hideApprover() {
- return !state.equals("page2") && isNotLast();
- }
-
- public String disableApprover() {
- return disableToConfirmIfLast();
- }
-
- // }}
-
- // {{ next
- @MemberOrder(sequence = "1")
- public EmployeeTakeOn next() {
- if (state.equals("page1")) {
- state = "page2";
- } else if (state.equals("page2")) {
- state = "page3";
- }
- return this;
- }
-
- public boolean hideNext() {
- return isLast();
- }
-
- // }}
-
- // {{ finish
- @MemberOrder(sequence = "2")
- public Employee finish() {
- Employee employee = newTransientInstance(Employee.class);
- employee.setName(getName());
- employee.setDefaultApprover(approver);
- persist(employee);
- return employee;
- }
-
- public boolean hideFinish() {
- return isNotLast();
- }
-
- // }}
-
- // {{ State
- private String state;
-
- @MemberOrder(sequence = "1")
- @Hidden
- public String getState() {
- return state;
- }
-
- public void setState(final String state) {
- this.state = state;
- }
-
- // }}
-
- // {{ NotLast
- @MemberOrder(sequence = "1")
- @Hidden
- public boolean isNotLast() {
- return !isLast();
- }
-
- // }}
-
- // {{ Last
- @MemberOrder(sequence = "1")
- @Hidden
- public boolean isLast() {
- return state.equals("page3");
- }
-
- private String disableToConfirmIfLast() {
- return isLast() ? "confirm" : null;
- }
- // }}
-
-}
+package org.apache.isis.example.claims.dom.employee;
+
+import org.apache.isis.applib.AbstractDomainObject;
+import org.apache.isis.applib.annotation.Hidden;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.Optional;
+import org.apache.isis.example.claims.dom.claim.Approver;
+
+public class EmployeeTakeOn extends AbstractDomainObject {
+
+ // {{ Lifecycle methods
+ public void created() {
+ state = "page1";
+ }
+
+ // }}
+
+ // {{ Name
+ private String name;
+
+ @MemberOrder(sequence = "1")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ public boolean hideName() {
+ return !state.equals("page1") && isNotLast();
+ }
+
+ public String disableName() {
+ return disableToConfirmIfLast();
+ }
+
+ // }}
+
+ // {{ Approver
+ private Approver approver;
+
+ @MemberOrder(sequence = "2")
+ @Optional
+ public Approver getApprover() {
+ return approver;
+ }
+
+ public void setApprover(final Approver approver) {
+ this.approver = approver;
+ }
+
+ public boolean hideApprover() {
+ return !state.equals("page2") && isNotLast();
+ }
+
+ public String disableApprover() {
+ return disableToConfirmIfLast();
+ }
+
+ // }}
+
+ // {{ next
+ @MemberOrder(sequence = "1")
+ public EmployeeTakeOn next() {
+ if (state.equals("page1")) {
+ state = "page2";
+ } else if (state.equals("page2")) {
+ state = "page3";
+ }
+ return this;
+ }
+
+ public boolean hideNext() {
+ return isLast();
+ }
+
+ // }}
+
+ // {{ finish
+ @MemberOrder(sequence = "2")
+ public Employee finish() {
+ final Employee employee = newTransientInstance(Employee.class);
+ employee.setName(getName());
+ employee.setDefaultApprover(approver);
+ persist(employee);
+ return employee;
+ }
+
+ public boolean hideFinish() {
+ return isNotLast();
+ }
+
+ // }}
+
+ // {{ State
+ private String state;
+
+ @MemberOrder(sequence = "1")
+ @Hidden
+ public String getState() {
+ return state;
+ }
+
+ public void setState(final String state) {
+ this.state = state;
+ }
+
+ // }}
+
+ // {{ NotLast
+ @MemberOrder(sequence = "1")
+ @Hidden
+ public boolean isNotLast() {
+ return !isLast();
+ }
+
+ // }}
+
+ // {{ Last
+ @MemberOrder(sequence = "1")
+ @Hidden
+ public boolean isLast() {
+ return state.equals("page3");
+ }
+
+ private String disableToConfirmIfLast() {
+ return isLast() ? "confirm" : null;
+ }
+ // }}
+
+}
Modified: incubator/isis/trunk/examples/claims/fixture/src/main/java/org/apache/isis/example/claims/fixture/ClaimsFixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/fixture/src/main/java/org/apache/isis/example/claims/fixture/ClaimsFixture.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/fixture/src/main/java/org/apache/isis/example/claims/fixture/ClaimsFixture.java (original)
+++ incubator/isis/trunk/examples/claims/fixture/src/main/java/org/apache/isis/example/claims/fixture/ClaimsFixture.java Sun Jan 22 14:43:52 2012
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.example.claims.fixture;
import org.apache.isis.applib.fixtures.AbstractFixture;
@@ -27,19 +26,18 @@ import org.apache.isis.example.claims.do
import org.apache.isis.example.claims.dom.claim.ClaimItem;
import org.apache.isis.example.claims.dom.employee.Employee;
-
public class ClaimsFixture extends AbstractFixture {
@Override
public void install() {
- Employee fred = createEmployee("Fred Smith", null);
- Employee tom = createEmployee("Tom Brown", fred);
+ final Employee fred = createEmployee("Fred Smith", null);
+ final Employee tom = createEmployee("Tom Brown", fred);
createEmployee("Sam Jones", fred);
Claim claim = createClaim(tom, -16, "Meeting with client");
addItem(claim, -16, 38.50, "Lunch with client");
addItem(claim, -16, 16.50, "Euston - Mayfair (return)");
-
+
claim = createClaim(tom, -18, "Meeting in city office");
addItem(claim, -16, 18.00, "Car parking");
addItem(claim, -16, 26.50, "Reading - London (return)");
@@ -49,8 +47,8 @@ public class ClaimsFixture extends Abstr
addItem(claim, -14, 26.50, "Reading - London (return)");
}
-
- private Employee createEmployee(String name, Employee approver) {
+
+ private Employee createEmployee(final String name, final Employee approver) {
Employee claimant;
claimant = newTransientInstance(Employee.class);
claimant.setName(name);
@@ -59,21 +57,21 @@ public class ClaimsFixture extends Abstr
return claimant;
}
- private Claim createClaim(Employee claimant, int days, String description) {
- Claim claim = newTransientInstance(Claim.class);
+ private Claim createClaim(final Employee claimant, final int days, final String description) {
+ final Claim claim = newTransientInstance(Claim.class);
claim.setClaimant(claimant);
claim.setDescription(description);
Date date = new Date();
- date = date.add(0,0, days);
+ date = date.add(0, 0, days);
claim.setDate(date);
persist(claim);
return claim;
}
- private void addItem(Claim claim, int days, double amount, String description) {
- ClaimItem claimItem = newTransientInstance(ClaimItem.class);
+ private void addItem(final Claim claim, final int days, final double amount, final String description) {
+ final ClaimItem claimItem = newTransientInstance(ClaimItem.class);
Date date = new Date();
- date = date.add(0,0, days);
+ date = date.add(0, 0, days);
claimItem.setDateIncurred(date);
claimItem.setDescription(description);
claimItem.setAmount(new Money(amount, "USD"));
Modified: incubator/isis/trunk/examples/claims/fixture/src/main/java/org/apache/isis/example/claims/fixture/ClaimsLogonFixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/fixture/src/main/java/org/apache/isis/example/claims/fixture/ClaimsLogonFixture.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/fixture/src/main/java/org/apache/isis/example/claims/fixture/ClaimsLogonFixture.java (original)
+++ incubator/isis/trunk/examples/claims/fixture/src/main/java/org/apache/isis/example/claims/fixture/ClaimsLogonFixture.java Sun Jan 22 14:43:52 2012
@@ -17,15 +17,14 @@
* under the License.
*/
-
package org.apache.isis.example.claims.fixture;
import org.apache.isis.applib.fixtures.LogonFixture;
public class ClaimsLogonFixture extends LogonFixture {
- public ClaimsLogonFixture() {
- super("bill");
- }
+ public ClaimsLogonFixture() {
+ super("bill");
+ }
}
Modified: incubator/isis/trunk/examples/claims/objstore-default/src/main/java/org/apache/isis/example/claims/objstore/dflt/claim/ClaimRepositoryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/objstore-default/src/main/java/org/apache/isis/example/claims/objstore/dflt/claim/ClaimRepositoryDefault.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/objstore-default/src/main/java/org/apache/isis/example/claims/objstore/dflt/claim/ClaimRepositoryDefault.java (original)
+++ incubator/isis/trunk/examples/claims/objstore-default/src/main/java/org/apache/isis/example/claims/objstore/dflt/claim/ClaimRepositoryDefault.java Sun Jan 22 14:43:52 2012
@@ -54,7 +54,7 @@ public class ClaimRepositoryDefault exte
// {{ action: findClaims
@Override
- public List<Claim> findClaims(String description) {
+ public List<Claim> findClaims(final String description) {
return allMatches(Claim.class, description);
}
@@ -62,8 +62,8 @@ public class ClaimRepositoryDefault exte
// {{ action: claimsFor
@Override
- public List<Claim> claimsFor(Claimant claimant) {
- Claim pattern = newTransientInstance(Claim.class);
+ public List<Claim> claimsFor(final Claimant claimant) {
+ final Claim pattern = newTransientInstance(Claim.class);
pattern.setDescription(null);
pattern.setApprover(null);
pattern.setStatus(null);
@@ -76,8 +76,8 @@ public class ClaimRepositoryDefault exte
// {{ action: newClaim
@Override
- public Claim newClaim(Claimant claimant) {
- Claim claim = newTransientInstance(Claim.class);
+ public Claim newClaim(final Claimant claimant) {
+ final Claim claim = newTransientInstance(Claim.class);
if (claimant != null) {
claim.setClaimant(claimant);
claim.setApprover(claimant.getDefaultApprover());
@@ -89,8 +89,8 @@ public class ClaimRepositoryDefault exte
// {{ action: newClaimWithDescription
@Override
- public Claim newClaimWithDescription(Claimant claimant, String description) {
- Claim claim = newClaim(claimant);
+ public Claim newClaimWithDescription(final Claimant claimant, final String description) {
+ final Claim claim = newClaim(claimant);
claim.setDescription(description);
return claim;
}
@@ -103,30 +103,30 @@ public class ClaimRepositoryDefault exte
return allMatches(Claim.class, new Filter<Claim>() {
@Override
- public boolean accept(Claim pojo) {
+ public boolean accept(final Claim pojo) {
return pojo.getClaimant() == claimant && pojo.getDate() != null && pojo.getDate().isGreaterThan(since);
}
});
}
public String validateClaimsSince(final Claimant claimant, final Date since) {
- Date today = new Date();
+ final Date today = new Date();
return since.isGreaterThan(today) ? "cannot be after today" : null;
}
// }}
@Override
- public int countClaimsFor(Claimant claimant) {
+ public int countClaimsFor(final Claimant claimant) {
return claimsFor(claimant).size();
}
@Override
- public Claim mostRecentClaim(Claimant claimant) {
- List<Claim> claims = claimsFor(claimant);
+ public Claim mostRecentClaim(final Claimant claimant) {
+ final List<Claim> claims = claimsFor(claimant);
Collections.sort(claims, new Comparator<Claim>() {
@Override
- public int compare(Claim o1, Claim o2) {
+ public int compare(final Claim o1, final Claim o2) {
return o1.getDate().isLessThan(o2.getDate()) ? +1 : -1;
}
});
Modified: incubator/isis/trunk/examples/claims/objstore-default/src/main/java/org/apache/isis/example/claims/objstore/dflt/employee/EmployeeRepositoryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/objstore-default/src/main/java/org/apache/isis/example/claims/objstore/dflt/employee/EmployeeRepositoryDefault.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/objstore-default/src/main/java/org/apache/isis/example/claims/objstore/dflt/employee/EmployeeRepositoryDefault.java (original)
+++ incubator/isis/trunk/examples/claims/objstore-default/src/main/java/org/apache/isis/example/claims/objstore/dflt/employee/EmployeeRepositoryDefault.java Sun Jan 22 14:43:52 2012
@@ -50,7 +50,7 @@ public class EmployeeRepositoryDefault e
// {{ action: findEmployees
@Override
- public List<Employee> findEmployees(String name) {
+ public List<Employee> findEmployees(final String name) {
return allMatches(Employee.class, name);
}
Modified: incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/AbstractApplicationStory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/AbstractApplicationStory.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/AbstractApplicationStory.java (original)
+++ incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/AbstractApplicationStory.java Sun Jan 22 14:43:52 2012
@@ -16,19 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.example.claims;
-
-import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionScenario;
-
-public abstract class AbstractApplicationStory extends AbstractIsisConcordionScenario {
-
- /**
- * This superclass also acts as the marker for the location of the
- * custom CSS.
- */
- @Override
- protected Class<?> customCssPackage() {
- return AbstractApplicationStory.class;
- }
-
-}
+package org.apache.isis.example.claims;
+
+import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionScenario;
+
+public abstract class AbstractApplicationStory extends AbstractIsisConcordionScenario {
+
+ /**
+ * This superclass also acts as the marker for the location of the custom
+ * CSS.
+ */
+ @Override
+ protected Class<?> customCssPackage() {
+ return AbstractApplicationStory.class;
+ }
+
+}
Modified: incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/common/BootstrapInExplorationMode.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/common/BootstrapInExplorationMode.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/common/BootstrapInExplorationMode.java (original)
+++ incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/common/BootstrapInExplorationMode.java Sun Jan 22 14:43:52 2012
@@ -16,12 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.example.claims.common;
-
-import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionScenario;
-
-
-public class BootstrapInExplorationMode extends AbstractIsisConcordionScenario {
-
-
-}
+package org.apache.isis.example.claims.common;
+
+import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionScenario;
+
+public class BootstrapInExplorationMode extends AbstractIsisConcordionScenario {
+
+}
Modified: incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/common/BootstrapInPrototypeMode.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/common/BootstrapInPrototypeMode.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/common/BootstrapInPrototypeMode.java (original)
+++ incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/common/BootstrapInPrototypeMode.java Sun Jan 22 14:43:52 2012
@@ -16,12 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.example.claims.common;
-
-import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionScenario;
-
-
-public class BootstrapInPrototypeMode extends AbstractIsisConcordionScenario {
-
-
-}
+package org.apache.isis.example.claims.common;
+
+import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionScenario;
+
+public class BootstrapInPrototypeMode extends AbstractIsisConcordionScenario {
+
+}
Modified: incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/common/Employees.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/common/Employees.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/common/Employees.java (original)
+++ incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/common/Employees.java Sun Jan 22 14:43:52 2012
@@ -16,12 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.example.claims.common;
-
-import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionScenario;
-
-
-public class Employees extends AbstractIsisConcordionScenario {
-
-
-}
+package org.apache.isis.example.claims.common;
+
+import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionScenario;
+
+public class Employees extends AbstractIsisConcordionScenario {
+
+}
Modified: incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/AllStories.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/AllStories.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/AllStories.java (original)
+++ incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/AllStories.java Sun Jan 22 14:43:52 2012
@@ -16,12 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.example.claims.stories;
-
-import org.apache.isis.example.claims.AbstractApplicationStory;
-
-
-public class AllStories extends AbstractApplicationStory {
-
-
-}
+package org.apache.isis.example.claims.stories;
+
+import org.apache.isis.example.claims.AbstractApplicationStory;
+
+public class AllStories extends AbstractApplicationStory {
+
+}
Modified: incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/Fixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/Fixture.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/Fixture.java (original)
+++ incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/Fixture.java Sun Jan 22 14:43:52 2012
@@ -16,12 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.example.claims.stories.newClaim;
-
-import org.apache.isis.example.claims.AbstractApplicationStory;
-
-
-public class Fixture extends AbstractApplicationStory {
-
-
-}
+package org.apache.isis.example.claims.stories.newClaim;
+
+import org.apache.isis.example.claims.AbstractApplicationStory;
+
+public class Fixture extends AbstractApplicationStory {
+
+}
Modified: incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/Index.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/Index.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/Index.java (original)
+++ incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/Index.java Sun Jan 22 14:43:52 2012
@@ -16,12 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.example.claims.stories.newClaim;
-
-import org.apache.isis.example.claims.AbstractApplicationStory;
-
-
-public class Index extends AbstractApplicationStory {
-
-
-}
+package org.apache.isis.example.claims.stories.newClaim;
+
+import org.apache.isis.example.claims.AbstractApplicationStory;
+
+public class Index extends AbstractApplicationStory {
+
+}
Modified: incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/ScenarioDefaultsOk.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/ScenarioDefaultsOk.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/ScenarioDefaultsOk.java (original)
+++ incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/ScenarioDefaultsOk.java Sun Jan 22 14:43:52 2012
@@ -16,12 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.example.claims.stories.newClaim;
-
-import org.apache.isis.example.claims.AbstractApplicationStory;
-
-
-public class ScenarioDefaultsOk extends AbstractApplicationStory {
-
-
-}
+package org.apache.isis.example.claims.stories.newClaim;
+
+import org.apache.isis.example.claims.AbstractApplicationStory;
+
+public class ScenarioDefaultsOk extends AbstractApplicationStory {
+
+}
Modified: incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/ScenarioOnceCreatedShowsUpForClaimant.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/ScenarioOnceCreatedShowsUpForClaimant.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/ScenarioOnceCreatedShowsUpForClaimant.java (original)
+++ incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/example/claims/stories/newClaim/ScenarioOnceCreatedShowsUpForClaimant.java Sun Jan 22 14:43:52 2012
@@ -16,12 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.example.claims.stories.newClaim;
-
-import org.apache.isis.example.claims.AbstractApplicationStory;
-
-
-public class ScenarioOnceCreatedShowsUpForClaimant extends AbstractApplicationStory {
-
-
-}
+package org.apache.isis.example.claims.stories.newClaim;
+
+import org.apache.isis.example.claims.AbstractApplicationStory;
+
+public class ScenarioOnceCreatedShowsUpForClaimant extends AbstractApplicationStory {
+
+}
Modified: incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/AbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/AbstractTest.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/AbstractTest.java (original)
+++ incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/AbstractTest.java Sun Jan 22 14:43:52 2012
@@ -19,10 +19,6 @@
package org.apache.isis.example.claims.junit;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.runner.RunWith;
-
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.example.claims.dom.claim.ClaimRepository;
import org.apache.isis.example.claims.dom.employee.Employee;
@@ -34,6 +30,9 @@ import org.apache.isis.progmodel.wrapper
import org.apache.isis.viewer.junit.IsisTestRunner;
import org.apache.isis.viewer.junit.Service;
import org.apache.isis.viewer.junit.Services;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.runner.RunWith;
@RunWith(IsisTestRunner.class)
@Services({ @Service(ClaimRepositoryDefault.class), @Service(EmployeeRepositoryDefault.class) })
@@ -43,13 +42,15 @@ public abstract class AbstractTest {
private WrapperFactory wrapperFactory;
/**
- * The {@link WrapperFactory#wrap(Object) wrapped} equivalent of the {@link #setClaimRepository(ClaimRepository)
- * injected} {@link ClaimRepository}.
+ * The {@link WrapperFactory#wrap(Object) wrapped} equivalent of the
+ * {@link #setClaimRepository(ClaimRepository) injected}
+ * {@link ClaimRepository}.
*/
protected ClaimRepository claimRepository;
/**
* The {@link WrapperFactory#wrap(Object) wrapped} equivalent of the
- * {@link #setEmployeeRepository(EmployeeRepository) injected} {@link EmployeeRepository}.
+ * {@link #setEmployeeRepository(EmployeeRepository) injected}
+ * {@link EmployeeRepository}.
*/
protected EmployeeRepository employeeRepository;
@@ -66,14 +67,14 @@ public abstract class AbstractTest {
tomEmployee = wrapped(employeeRepository.findEmployees("Tom").get(0));
}
- protected <T> T wrapped(T obj) {
+ protected <T> T wrapped(final T obj) {
return wrapperFactory.wrap(obj);
}
@SuppressWarnings("unchecked")
- protected <T> T unwrapped(T obj) {
+ protected <T> T unwrapped(final T obj) {
if (obj instanceof WrapperObject) {
- WrapperObject wrapperObject = (WrapperObject) obj;
+ final WrapperObject wrapperObject = (WrapperObject) obj;
return (T) wrapperObject.wrapped();
}
return obj;
@@ -91,7 +92,7 @@ public abstract class AbstractTest {
return wrapperFactory;
}
- public void setWrapperFactory(WrapperFactory wrapperFactory) {
+ public void setWrapperFactory(final WrapperFactory wrapperFactory) {
this.wrapperFactory = wrapperFactory;
}
Modified: incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/ClaimSubmitTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/ClaimSubmitTest.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/ClaimSubmitTest.java (original)
+++ incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/ClaimSubmitTest.java Sun Jan 22 14:43:52 2012
@@ -38,19 +38,19 @@ public class ClaimSubmitTest extends Abs
@Test
public void cannotSubmitTwice() throws Exception {
- Claim tomsSubmittedClaim = tomsSubmittedClaim();
+ final Claim tomsSubmittedClaim = tomsSubmittedClaim();
try {
- Approver approver = tomEmployee.getDefaultApprover();
+ final Approver approver = tomEmployee.getDefaultApprover();
tomsSubmittedClaim.submit(approver);
fail("Should not be able to submit again");
- } catch (DisabledException e) {
+ } catch (final DisabledException e) {
assertThat(e.getMessage(), is("Claim has already been submitted"));
}
}
private Claim tomsSubmittedClaim() {
- List<Claim> tomsClaims = claimRepository.claimsFor(tomEmployee);
- Claim tomsClaim1 = tomsClaims.get(0);
+ final List<Claim> tomsClaims = claimRepository.claimsFor(tomEmployee);
+ final Claim tomsClaim1 = tomsClaims.get(0);
tomsClaim1.submit(tomEmployee.getDefaultApprover());
assertThat(tomsClaim1.getStatus(), is("Submitted"));
return wrapped(tomsClaim1);
Modified: incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/NewClaimTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/NewClaimTest.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/NewClaimTest.java (original)
+++ incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/NewClaimTest.java Sun Jan 22 14:43:52 2012
@@ -33,7 +33,7 @@ public class NewClaimTest extends Abstra
@Test
public void whenCreateNewClaimDefaultsOk() throws Exception {
- Claim newClaim = claimRepository.newClaim(tomEmployee);
+ final Claim newClaim = claimRepository.newClaim(tomEmployee);
assertThat(newClaim.getDescription(), is("enter a description here"));
assertThat(newClaim.getStatus(), is("New"));
assertThat(newClaim.getApprover(), is(tomEmployee.getDefaultApprover()));
Modified: incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/controller/HomeController.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/controller/HomeController.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/controller/HomeController.java (original)
+++ incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/controller/HomeController.java Sun Jan 22 14:43:52 2012
@@ -13,19 +13,16 @@ import org.springframework.web.bind.anno
@Controller
public class HomeController {
- private static final Logger logger = LoggerFactory
- .getLogger(HomeController.class);
+ private static final Logger logger = LoggerFactory.getLogger(HomeController.class);
- /**
- * Selects the home page and populates the model with a message
- */
- @RequestMapping(value = "/", method = RequestMethod.GET)
- public String home(Model model) {
- logger.info("Welcome home!");
- model.addAttribute("controllerMessage",
- "This is the message from the controller!");
- return "home";
- }
-
+ /**
+ * Selects the home page and populates the model with a message
+ */
+ @RequestMapping(value = "/", method = RequestMethod.GET)
+ public String home(final Model model) {
+ logger.info("Welcome home!");
+ model.addAttribute("controllerMessage", "This is the message from the controller!");
+ return "home";
+ }
}
Modified: incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/controller/PersonController.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/controller/PersonController.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/controller/PersonController.java (original)
+++ incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/controller/PersonController.java Sun Jan 22 14:43:52 2012
@@ -8,7 +8,6 @@ import org.apache.isis.runtimes.embedded
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,52 +18,51 @@ import org.springframework.web.servlet.M
@Controller
@RequestMapping("/person/")
public class PersonController {
-
- private static final Logger logger = LoggerFactory.getLogger(PersonController.class);
- @Autowired
- private PersonDao personDao;
+ private static final Logger logger = LoggerFactory.getLogger(PersonController.class);
- @Autowired
- private IsisMetaModel isisMetaModel;
+ @Autowired
+ private PersonDao personDao;
- @RequestMapping(method=RequestMethod.GET,value="edit")
- public ModelAndView editPerson(@RequestParam(value="id",required=false) Long id) {
-
- logger.debug("Received request to edit person id : "+id);
- ModelAndView mav = new ModelAndView();
- mav.setViewName("edit");
- Person person = null;
- if (id == null) {
- person = new Person();
- } else {
- person = personDao.find(id);
- }
-
- mav.addObject("person", person);
- return mav;
-
- }
-
- @RequestMapping(method=RequestMethod.POST,value="edit")
- public String savePerson(@ModelAttribute Person person) {
- logger.debug("Received postback on person "+person);
- personDao.save(person);
- return "redirect:list";
-
- }
-
- @RequestMapping(method=RequestMethod.GET,value="list")
- public ModelAndView listPeople() {
- logger.debug("Received request to list persons");
- ModelAndView mav = new ModelAndView();
- List<Person> people = personDao.listPeople();
- logger.debug("Person Listing count = "+people.size());
- mav.addObject("people",people);
- mav.setViewName("list");
- return mav;
-
- }
+ @Autowired
+ private IsisMetaModel isisMetaModel;
+
+ @RequestMapping(method = RequestMethod.GET, value = "edit")
+ public ModelAndView editPerson(@RequestParam(value = "id", required = false) final Long id) {
+
+ logger.debug("Received request to edit person id : " + id);
+ final ModelAndView mav = new ModelAndView();
+ mav.setViewName("edit");
+ Person person = null;
+ if (id == null) {
+ person = new Person();
+ } else {
+ person = personDao.find(id);
+ }
+
+ mav.addObject("person", person);
+ return mav;
+
+ }
+
+ @RequestMapping(method = RequestMethod.POST, value = "edit")
+ public String savePerson(@ModelAttribute final Person person) {
+ logger.debug("Received postback on person " + person);
+ personDao.save(person);
+ return "redirect:list";
+
+ }
+
+ @RequestMapping(method = RequestMethod.GET, value = "list")
+ public ModelAndView listPeople() {
+ logger.debug("Received request to list persons");
+ final ModelAndView mav = new ModelAndView();
+ final List<Person> people = personDao.listPeople();
+ logger.debug("Person Listing count = " + people.size());
+ mav.addObject("people", people);
+ mav.setViewName("list");
+ return mav;
+
+ }
-
}
Modified: incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/dao/PersonDao.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/dao/PersonDao.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/dao/PersonDao.java (original)
+++ incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/dao/PersonDao.java Sun Jan 22 14:43:52 2012
@@ -12,26 +12,26 @@ import org.springframework.transaction.a
@Repository("personRepo")
public class PersonDao {
- @PersistenceContext
- private EntityManager entityManager;
-
- public Person find(Long id) {
- return entityManager.find(Person.class, id);
- }
-
- @SuppressWarnings("unchecked")
- public List<Person> listPeople() {
- return entityManager.createQuery("select p from Person p").getResultList();
- }
-
- @Transactional
- public Person save(Person person) {
- if (person.getId() == null) {
- entityManager.persist(person);
- return person;
- } else {
- return entityManager.merge(person);
- }
- }
-
+ @PersistenceContext
+ private EntityManager entityManager;
+
+ public Person find(final Long id) {
+ return entityManager.find(Person.class, id);
+ }
+
+ @SuppressWarnings("unchecked")
+ public List<Person> listPeople() {
+ return entityManager.createQuery("select p from Person p").getResultList();
+ }
+
+ @Transactional
+ public Person save(final Person person) {
+ if (person.getId() == null) {
+ entityManager.persist(person);
+ return person;
+ } else {
+ return entityManager.merge(person);
+ }
+ }
+
}
Modified: incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/isis/CglibClassSubstitutor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/isis/CglibClassSubstitutor.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/isis/CglibClassSubstitutor.java (original)
+++ incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/isis/CglibClassSubstitutor.java Sun Jan 22 14:43:52 2012
@@ -29,13 +29,13 @@ public class CglibClassSubstitutor exten
}
@Override
- public Class<?> getClass(Class<?> cls) {
- //Class<?> superclass = cls.getSuperclass();
- //Class<?>[] interfaces = cls.getInterfaces();
- if(cls.getName().contains("EnhancerByCGLIB")) {
- return getClass(cls.getSuperclass());
- }
- return super.getClass(cls);
+ public Class<?> getClass(final Class<?> cls) {
+ // Class<?> superclass = cls.getSuperclass();
+ // Class<?>[] interfaces = cls.getInterfaces();
+ if (cls.getName().contains("EnhancerByCGLIB")) {
+ return getClass(cls.getSuperclass());
+ }
+ return super.getClass(cls);
}
}
Modified: incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/model/Person.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/model/Person.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/model/Person.java (original)
+++ incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/model/Person.java Sun Jan 22 14:43:52 2012
@@ -11,105 +11,115 @@ import javax.persistence.Id;
@Entity
public class Person implements Serializable {
- private static final long serialVersionUID = -1308795024262635690L;
+ private static final long serialVersionUID = -1308795024262635690L;
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- private Long id;
-
- @Column
- private String firstName;
-
- @Column
- private String lastName;
-
- public Person() {
- }
-
- public Person(String firstName, String lastName) {
- super();
- this.firstName = firstName;
- this.lastName = lastName;
- }
-
- // {{ Id (property)
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
- // }}
-
- // {{ FirstName (property)
- public String getFirstName() {
- return firstName;
- }
-
- public void setFirstName(String firstName) {
- this.firstName = firstName;
- }
- // }}
-
- // {{ LastName (property)
- public String getLastName() {
- return lastName;
- }
-
- public void setLastName(String lastName) {
- this.lastName = lastName;
- }
- // }}
-
- // {{ toString
- @Override
- public String toString() {
-
- return super.toString() + " name = " + firstName + " " + lastName
- + " id = " + id;
- }
- // }}
-
- // {{ equals, hashCode
- // }}
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result
- + ((firstName == null) ? 0 : firstName.hashCode());
- result = prime * result + ((id == null) ? 0 : id.hashCode());
- result = prime * result
- + ((lastName == null) ? 0 : lastName.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Person other = (Person) obj;
- if (firstName == null) {
- if (other.firstName != null)
- return false;
- } else if (!firstName.equals(other.firstName))
- return false;
- if (id == null) {
- if (other.id != null)
- return false;
- } else if (!id.equals(other.id))
- return false;
- if (lastName == null) {
- if (other.lastName != null)
- return false;
- } else if (!lastName.equals(other.lastName))
- return false;
- return true;
- }
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ private Long id;
+
+ @Column
+ private String firstName;
+
+ @Column
+ private String lastName;
+
+ public Person() {
+ }
+
+ public Person(final String firstName, final String lastName) {
+ super();
+ this.firstName = firstName;
+ this.lastName = lastName;
+ }
+
+ // {{ Id (property)
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(final Long id) {
+ this.id = id;
+ }
+
+ // }}
+
+ // {{ FirstName (property)
+ public String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(final String firstName) {
+ this.firstName = firstName;
+ }
+
+ // }}
+
+ // {{ LastName (property)
+ public String getLastName() {
+ return lastName;
+ }
+
+ public void setLastName(final String lastName) {
+ this.lastName = lastName;
+ }
+
+ // }}
+
+ // {{ toString
+ @Override
+ public String toString() {
+
+ return super.toString() + " name = " + firstName + " " + lastName + " id = " + id;
+ }
+
+ // }}
+
+ // {{ equals, hashCode
+ // }}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((firstName == null) ? 0 : firstName.hashCode());
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((lastName == null) ? 0 : lastName.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final Person other = (Person) obj;
+ if (firstName == null) {
+ if (other.firstName != null) {
+ return false;
+ }
+ } else if (!firstName.equals(other.firstName)) {
+ return false;
+ }
+ if (id == null) {
+ if (other.id != null) {
+ return false;
+ }
+ } else if (!id.equals(other.id)) {
+ return false;
+ }
+ if (lastName == null) {
+ if (other.lastName != null) {
+ return false;
+ }
+ } else if (!lastName.equals(other.lastName)) {
+ return false;
+ }
+ return true;
+ }
}
Modified: incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/DataInitializer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/DataInitializer.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/DataInitializer.java (original)
+++ incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/DataInitializer.java Sun Jan 22 14:43:52 2012
@@ -14,31 +14,31 @@ import org.springframework.stereotype.Co
@Scope("prototype")
public class DataInitializer {
- public static final int PERSON_COUNT = 3;
+ public static final int PERSON_COUNT = 3;
- @PersistenceContext
- private EntityManager entityManager;
+ @PersistenceContext
+ private EntityManager entityManager;
- public List<Long> people = new ArrayList<Long>();
+ public List<Long> people = new ArrayList<Long>();
- public void initData() {
- people.clear();// clear out the previous list of people
- addPerson("Jim", "Smith");
- addPerson("Tina", "Marsh");
- addPerson("Steve", "Blair");
- entityManager.flush();
- entityManager.clear();
- }
-
- public void addPerson(String firstName, String lastName) {
- Person p = new Person();
- p.setFirstName(firstName);
- p.setLastName(lastName);
- entityManager.persist(p);
- people.add(p.getId());
- }
-
- public EntityManager getEntityManager() {
- return entityManager;
- }
+ public void initData() {
+ people.clear();// clear out the previous list of people
+ addPerson("Jim", "Smith");
+ addPerson("Tina", "Marsh");
+ addPerson("Steve", "Blair");
+ entityManager.flush();
+ entityManager.clear();
+ }
+
+ public void addPerson(final String firstName, final String lastName) {
+ final Person p = new Person();
+ p.setFirstName(firstName);
+ p.setLastName(lastName);
+ entityManager.persist(p);
+ people.add(p.getId());
+ }
+
+ public EntityManager getEntityManager() {
+ return entityManager;
+ }
}
Modified: incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/HomeControllerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/HomeControllerTest.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/HomeControllerTest.java (original)
+++ incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/HomeControllerTest.java Sun Jan 22 14:43:52 2012
@@ -8,13 +8,13 @@ import org.springframework.ui.Model;
public class HomeControllerTest {
- @Test
- public void testController() {
- HomeController controller = new HomeController();
- Model model = new ExtendedModelMap();
- Assert.assertEquals("home",controller.home(model));
-
- Object message = model.asMap().get("controllerMessage");
- Assert.assertEquals("This is the message from the controller!",message);
- }
+ @Test
+ public void testController() {
+ final HomeController controller = new HomeController();
+ final Model model = new ExtendedModelMap();
+ Assert.assertEquals("home", controller.home(model));
+
+ final Object message = model.asMap().get("controllerMessage");
+ Assert.assertEquals("This is the message from the controller!", message);
+ }
}
Modified: incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/PersonControllerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/PersonControllerTest.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/PersonControllerTest.java (original)
+++ incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/PersonControllerTest.java Sun Jan 22 14:43:52 2012
@@ -17,57 +17,55 @@ import org.springframework.test.context.
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.servlet.ModelAndView;
-@ContextConfiguration({"/test-context.xml", "/test-isis.xml"})
+@ContextConfiguration({ "/test-context.xml", "/test-isis.xml" })
@RunWith(SpringJUnit4ClassRunner.class)
@Transactional
public class PersonControllerTest {
-
- @Autowired
- private DataInitializer dataInitializer;
-
- @Autowired
- private PersonController personController;
-
- @Before
- public void before() {
- dataInitializer.initData();
- }
-
- @Test
- public void shouldReturnPersonListView() {
- ModelAndView mav = personController.listPeople();
- assertEquals("list",mav.getViewName());
-
- @SuppressWarnings("unchecked")
- List<Person> people = (List<Person>) mav.getModelMap().get("people");
- assertNotNull(people);
- assertEquals(DataInitializer.PERSON_COUNT,people.size());
- }
-
-
-
- public void shouldReturnNewPersonWithEditMav() {
- ModelAndView mav = personController.editPerson(null);
- assertNotNull(mav);
- assertEquals("edit", mav.getViewName());
- Object object = mav.getModel().get("person");
- assertTrue(Person.class.isAssignableFrom(object.getClass()));
- Person person = (Person) object;
- assertNull(person.getId());
- assertNull(person.getFirstName());
- assertNull(person.getLastName());
- }
-
- @Test
- public void shouldReturnSecondPersonWithEditMav() {
- Long template = dataInitializer.people.get(1);
- ModelAndView mav = personController.editPerson(template);
- assertNotNull(mav);
- assertEquals("edit", mav.getViewName());
- Object object = mav.getModel().get("person");
- assertTrue(Person.class.isAssignableFrom(object.getClass()));
- Person person = (Person) object;
- assertEquals(template,person.getId());
- }
-
+
+ @Autowired
+ private DataInitializer dataInitializer;
+
+ @Autowired
+ private PersonController personController;
+
+ @Before
+ public void before() {
+ dataInitializer.initData();
+ }
+
+ @Test
+ public void shouldReturnPersonListView() {
+ final ModelAndView mav = personController.listPeople();
+ assertEquals("list", mav.getViewName());
+
+ @SuppressWarnings("unchecked")
+ final List<Person> people = (List<Person>) mav.getModelMap().get("people");
+ assertNotNull(people);
+ assertEquals(DataInitializer.PERSON_COUNT, people.size());
+ }
+
+ public void shouldReturnNewPersonWithEditMav() {
+ final ModelAndView mav = personController.editPerson(null);
+ assertNotNull(mav);
+ assertEquals("edit", mav.getViewName());
+ final Object object = mav.getModel().get("person");
+ assertTrue(Person.class.isAssignableFrom(object.getClass()));
+ final Person person = (Person) object;
+ assertNull(person.getId());
+ assertNull(person.getFirstName());
+ assertNull(person.getLastName());
+ }
+
+ @Test
+ public void shouldReturnSecondPersonWithEditMav() {
+ final Long template = dataInitializer.people.get(1);
+ final ModelAndView mav = personController.editPerson(template);
+ assertNotNull(mav);
+ assertEquals("edit", mav.getViewName());
+ final Object object = mav.getModel().get("person");
+ assertTrue(Person.class.isAssignableFrom(object.getClass()));
+ final Person person = (Person) object;
+ assertEquals(template, person.getId());
+ }
+
}
Modified: incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/dao/PersonDaoTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/dao/PersonDaoTest.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/dao/PersonDaoTest.java (original)
+++ incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/dao/PersonDaoTest.java Sun Jan 22 14:43:52 2012
@@ -13,45 +13,45 @@ import org.springframework.test.context.
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
-@ContextConfiguration({"/test-context.xml", "/test-isis.xml"})
+@ContextConfiguration({ "/test-context.xml", "/test-isis.xml" })
@RunWith(SpringJUnit4ClassRunner.class)
@Transactional
public class PersonDaoTest {
- @Autowired
- private PersonDao personDao;
+ @Autowired
+ private PersonDao personDao;
- @Autowired
- private DataInitializer dataInitializer;
+ @Autowired
+ private DataInitializer dataInitializer;
- @Before
- public void prepareData() {
- dataInitializer.initData();
- }
-
- @Test
- public void shouldSaveAPerson() {
- Person p = new Person();
- p.setFirstName("Andy");
- p.setLastName("Gibson");
- personDao.save(p);
- Long id = p.getId();
- Assert.assertNotNull(id);
- }
-
- @Test
- public void shouldLoadAPerson() {
- Long template = dataInitializer.people.get(0);
- Person p = personDao.find(template);
-
- Assert.assertNotNull("Person not found!", p);
- Assert.assertEquals(template, p.getId());
- }
-
- public void shouldListPeople() {
- List<Person> people = personDao.listPeople();
- Assert.assertEquals(DataInitializer.PERSON_COUNT, people.size());
+ @Before
+ public void prepareData() {
+ dataInitializer.initData();
+ }
+
+ @Test
+ public void shouldSaveAPerson() {
+ final Person p = new Person();
+ p.setFirstName("Andy");
+ p.setLastName("Gibson");
+ personDao.save(p);
+ final Long id = p.getId();
+ Assert.assertNotNull(id);
+ }
+
+ @Test
+ public void shouldLoadAPerson() {
+ final Long template = dataInitializer.people.get(0);
+ final Person p = personDao.find(template);
+
+ Assert.assertNotNull("Person not found!", p);
+ Assert.assertEquals(template, p.getId());
+ }
+
+ public void shouldListPeople() {
+ final List<Person> people = personDao.listPeople();
+ Assert.assertEquals(DataInitializer.PERSON_COUNT, people.size());
- }
+ }
}
Modified: incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/webserver/WebServerBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/webserver/WebServerBootstrapper.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/webserver/WebServerBootstrapper.java (original)
+++ incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/webserver/WebServerBootstrapper.java Sun Jan 22 14:43:52 2012
@@ -27,25 +27,25 @@ import org.mortbay.jetty.webapp.WebAppCo
* For bootstrapping the app from the command line.
*/
public class WebServerBootstrapper {
-
+
private static final String SRC_MAIN_WEBAPP = "src/main/webapp";
-
+
private static final String CONTEXT_PATH = "/";
private static final int PORT = 8080;
-
+
private Server jettyServer;
- public static void main(String[] args) {
+ public static void main(final String[] args) {
new WebServerBootstrapper().run();
}
-
+
public void run() {
jettyServer = new Server(PORT);
final WebAppContext context = new WebAppContext(SRC_MAIN_WEBAPP, CONTEXT_PATH);
jettyServer.setHandler(context);
-
+
try {
jettyServer.start();
jettyServer.join();
Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java?rev=1234519&r1=1234518&r2=1234519&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java Sun Jan 22 14:43:52 2012
@@ -17,31 +17,29 @@
* under the License.
*/
+package org.apache.isis.metamodel.examples.facets.namefile;
-package org.apache.isis.metamodel.examples.facets.namefile;
-
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.named.NamedFacet;
-
-
-public class NameFileFacet extends FacetAbstract implements NamedFacet {
-
- public static Class<? extends Facet> type() {
- return NamedFacet.class;
- }
-
- private final String name;
-
- public NameFileFacet(final FacetHolder holder, String name) {
- super(type(), holder, false);
- this.name = name;
- }
-
- public String value() {
- return name;
- }
-
-
-}
+
+public class NameFileFacet extends FacetAbstract implements NamedFacet {
+
+ public static Class<? extends Facet> type() {
+ return NamedFacet.class;
+ }
+
+ private final String name;
+
+ public NameFileFacet(final FacetHolder holder, final String name) {
+ super(type(), holder, false);
+ this.name = name;
+ }
+
+ @Override
+ public String value() {
+ return name;
+ }
+
+}