Modifed start page to view delivery history

Added style sheet (plain html css, not using SpringMVC theme)
Modified getters and setters to use getXXX and setXXX instead of xXX

dddsample/src/main/java/se/citerus/dddsample/domain/Cargo.java

@@ -1,5 +1,8 @@
 package se.citerus.dddsample.domain;
 
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
 
 /**
  * A Cargo an entity identifed by TrackingId and is capable of getting its DeliveryHistory plus a number
@@ -19,7 +22,7 @@ public class Cargo {
     this.history = new DeliveryHistory();
   }
 
-  public DeliveryHistory deliveryHistory() {
+  public DeliveryHistory getDeliveryHistory() {
     return history;
   }
 
@@ -28,20 +31,24 @@ public class Cargo {
   }
 
   public boolean atFinalDestiation() {
-    return currentLocation().equals(finalDestination);
+    return getCurrentLocation().equals(finalDestination);
   }
 
-  public Location currentLocation() {
+  public Location getCurrentLocation() {
     HandlingEvent lastEvent = history.last();
     if (lastEvent == null) {
       return origin;
     }
-    CarrierMovement cm = lastEvent.getCarrierMovement();
-
-    return (lastEvent.type() == HandlingEvent.Type.LOAD) ? cm.from() : cm.to();
+    
+    return lastEvent.getLocation();
   }
 
   public TrackingId trackingId() {
     return trackingId;
   }
+
+  @Override
+  public String toString() {
+    return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+  }
 }

dddsample/src/main/java/se/citerus/dddsample/domain/DeliveryHistory.java

@@ -3,19 +3,27 @@ package se.citerus.dddsample.domain;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
 public class DeliveryHistory {
-	
-	private final SortedSet<HandlingEvent> events = new TreeSet<HandlingEvent>();
 
-	public SortedSet<HandlingEvent> events() {
-		return events; 
-	}
+  private final SortedSet<HandlingEvent> events = new TreeSet<HandlingEvent>();
+
+  public SortedSet<HandlingEvent> getEvents() {
+    return events;
+  }
+
+  public void addEvent(HandlingEvent event) {
+    events.add(event);
+  }
 
-	public void addEvent(HandlingEvent event) {
-		events.add(event);
-	}
+  public HandlingEvent last() {
+    return events.isEmpty() ? null : events.last();
+  }
 
-	public HandlingEvent last() {
-		return events.isEmpty() ? null : events.last();
-	}
+  @Override
+  public String toString() {
+    return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+  }
 }

dddsample/src/main/java/se/citerus/dddsample/domain/HandlingEvent.java

@@ -29,7 +29,7 @@ public class HandlingEvent implements Comparable<HandlingEvent> {
     this.carrierMovement = carrierMovement;
   }
 
-  public Type type() {
+  public Type getType() {
     return type;
   }
 
@@ -37,10 +37,15 @@ public class HandlingEvent implements Comparable<HandlingEvent> {
     return carrierMovement;
   }
 
-  public Date time() {
+  public Date getTime() {
     return time;
   }
-
+  
+  public Location getLocation() {
+    return (type == HandlingEvent.Type.LOAD) ? carrierMovement.from() : carrierMovement.to();
+  }
+  
+  
   @Override
   public boolean equals(Object obj) {
     return EqualsBuilder.reflectionEquals(this, obj);
@@ -52,6 +57,6 @@ public class HandlingEvent implements Comparable<HandlingEvent> {
   }
 
   public int compareTo(HandlingEvent o) {
-    return time.compareTo(o.time());
+    return time.compareTo(o.getTime());
   }
 }

dddsample/src/main/java/se/citerus/dddsample/web/CargoTrackingController.java

@@ -1,22 +1,20 @@
 package se.citerus.dddsample.web;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.validation.BindException;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.SimpleFormController;
-import org.springframework.web.servlet.view.RedirectView;
 
 import se.citerus.dddsample.domain.Cargo;
 import se.citerus.dddsample.domain.Location;
 import se.citerus.dddsample.service.CargoService;
 import se.citerus.dddsample.web.command.TrackCommand;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Controller for tracking cargo.
  */
@@ -43,9 +41,7 @@ public class CargoTrackingController extends SimpleFormController {
     final Cargo cargo = cargoService.find(trackCommand.getTrackingId());
 
     if (cargo != null) {
-      final Location location = cargo.currentLocation();
-      logger.debug("Location of [" + trackCommand.getTrackingId() + "] is [" + location + "]");
-      model.put("location", location);
+      model.put("cargo", cargo);
       
       // Can't just return a new MaV instance when successView and FormView is the same. Binding will fail.
       // showForm will append our command and model to the request so that the form will bind successfully.

dddsample/src/main/webapp/WEB-INF/jsp/dataAccessFailure.jsp

@@ -1,6 +1,13 @@
 <%@ include file="/WEB-INF/jspf/include.jspf" %>
 
 <html>
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<script type="text/javascript"></script>
+	<style type="text/css" title="style" media="screen">
+		@import "/dddsample/style.css";
+	</style>
+</head>
 <body>
 <div>
 An DataAccessExcepton occured.

dddsample/src/main/webapp/WEB-INF/jsp/start.jsp

@@ -1,11 +1,17 @@
 <%@ include file="/WEB-INF/jspf/include.jspf" %>
 
 <html>
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<script type="text/javascript"></script>
+	<style type="text/css" title="style" media="screen">
+		@import "/dddsample/style.css";
+	</style>
+</head>
 <body>
-
-<div>
+<div id="form">
   <form:form method="post" commandName="trackCommand">
-    <table border="1" cellspacing="0" cellpadding="4">
+    <table cellspacing="0" cellpadding="4">
       <tr>
         <td align="right">
           Enter tracking id:
@@ -16,17 +22,27 @@
         <td>
           <form:errors path="trackingId" cssClass="error"/>
         </td>
+        <td>
+          <input type="submit" value="Track!">
+        </td>
       </tr>
     </table>
-    <br>
-    <input type="submit" value="Track!">
-    <c:choose>
-      <c:when test="${location ne null}">
-        <p>Your cargo is currently at: <b>${location}</b></p>
-      </c:when>
-    </c:choose>
   </form:form>
 </div>
-
+<div id="result">
+<c:choose>
+  <c:when test="${cargo ne null}">
+  	
+    <p>Your cargo is currently at: <span id="currentLocation">${cargo.currentLocation}</span></p>
+    
+    <table>
+      <c:forEach var="event" items="${cargo.deliveryHistory.events}">
+        <tr><td><c:out value="${event.type}"/> &nbsp; on &nbsp;</td><td><c:out value="${event.location}"/>&nbsp; at &nbsp;</td><td><c:out value="${event.time}"/></td></tr>
+      </c:forEach>
+    </table>
+    
+  </c:when>
+</c:choose>
+</div>
 </body>
 </html>

dddsample/src/main/webapp/WEB-INF/jsp/unknownCargo.jsp

@@ -1,6 +1,13 @@
 <%@ include file="/WEB-INF/jspf/include.jspf" %>
 
 <html>
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<script type="text/javascript"></script>
+	<style type="text/css" title="style" media="screen">
+		@import "/dddsample/style.css";
+	</style>
+</head>
 <body>
 
 <p>Unknown tracking id ${trackingId}</p>

dddsample/src/main/webapp/style.css

@@ -0,0 +1,218 @@
+/* css Zen Garden default style v1.02 */
+/* css released under Creative Commons License - http://creativecommons.org/licenses/by-nc-sa/1.0/  */
+
+/* This file based on 'Tranquille' by Dave Shea */
+/* You may use this file as a foundation for any new work, but you may find it easier to start from scratch. */
+/* Not all elements are defined in this file, so you'll most likely want to refer to the xhtml as well. */
+
+/* Your images should be linked as if the CSS file sits in the same folder as the images. ie. no paths. */
+
+
+/* basic elements */
+html {
+	margin: 0;
+	padding: 0;
+	}
+body { 
+	font: 75% georgia, sans-serif;
+	line-height: 1.88889;
+	color: #555753; 
+	background: #fff url(blossoms.jpg) no-repeat bottom right; 
+	margin: 0; 
+	padding: 0;
+	}
+p { 
+	margin-top: 0; 
+	text-align: justify;
+	}
+h3 { 
+	font: italic normal 1.4em georgia, sans-serif;
+	letter-spacing: 1px; 
+	margin-bottom: 0; 
+	color: #7D775C;
+	}
+a:link { 
+	font-weight: bold; 
+	text-decoration: none; 
+	color: #B7A5DF;
+	}
+a:visited { 
+	font-weight: bold; 
+	text-decoration: none; 
+	color: #D4CDDC;
+	}
+a:hover, a:active { 
+	text-decoration: underline; 
+	color: #9685BA;
+	}
+acronym {
+	border-bottom: none;
+	}
+
+
+/* specific divs */
+#container { 
+	background: url(zen-bg.jpg) no-repeat top left; 
+	padding: 0 175px 0 110px;  
+	margin: 0; 
+	position: relative;
+	}
+	
+#form {
+	padding: 0 175px 0 110px; 
+	font: 10pt/22pt georgia;
+	}	
+
+#intro { 
+	min-width: 470px;
+	}
+	
+#result {
+	padding: 0 175px 0 110px; 
+	font: italic 10pt/22pt georgia; 
+	text-align:right;
+	}
+#currentLocation{
+	font: bold 10pt/22pt georgia;
+	position: relative;
+	}
+#result table{
+	text-align:left;
+	font: 10pt/22pt georgia;
+	}
+
+/* using an image to replace text in an h1. This trick courtesy Douglas Bowman, http://www.stopdesign.com/articles/css/replace-text/ */
+#pageHeader h1 { 
+	background: transparent url(h1.gif) no-repeat top left; 
+	margin-top: 10px; 
+	width: 219px; 
+	height: 87px; 
+	float: left;
+	}
+#pageHeader h1 span {
+	display:none
+	}
+#pageHeader h2 { 
+	background: transparent url(h2.gif) no-repeat top left; 
+	margin-top: 58px; 
+	margin-bottom: 40px; 
+	width: 200px; 
+	height: 18px; 
+	float: right;
+	}
+#pageHeader h2 span {
+	display:none
+	}
+#pageHeader {
+	padding-top: 20px;
+}
+
+#quickSummary {
+	clear:both; 
+	margin: 20px 20px 20px 10px; 
+	width: 160px; 
+	float: left;
+	}
+#quickSummary p {
+	font: italic 10pt/22pt georgia; 
+	text-align:center;
+	}
+
+#preamble {
+	clear: right; 
+	padding: 0px 10px 0 10px;
+	}
+#supportingText {	
+	padding-left: 10px; 
+	margin-bottom: 40px;
+	}
+
+#footer { 
+	text-align: center; 
+	}
+#footer a:link, #footer a:visited { 
+	margin-right: 20px; 
+	}
+
+#linkList {
+	margin-left: 600px; 
+	position: absolute; 
+	top: 0; 
+	right: 0;
+	}
+#linkList2 { 
+	font: 10px verdana, sans-serif; 
+	background: transparent url(paper-bg.jpg) top left repeat-y; 
+	padding: 10px; 
+	margin-top: 150px; 
+	width: 130px; 
+	}
+#linkList h3.select { 
+	background: transparent url(h3.gif) no-repeat top left; 
+	margin: 10px 0 5px 0; 
+	width: 97px; 
+	height: 16px; 
+	}
+#linkList h3.select span {
+	display:none
+	}
+#linkList h3.favorites { 
+	background: transparent url(h4.gif) no-repeat top left; 
+	margin: 25px 0 5px 0; 
+	width: 60px; 
+	height: 18px; 
+	}
+#linkList h3.favorites span {
+	display:none
+	}
+#linkList h3.archives { 
+	background: transparent url(h5.gif) no-repeat top left; 
+	margin: 25px 0 5px 0; 
+	width:57px; 
+	height: 14px; 
+	}
+#linkList h3.archives span {
+	display:none
+	}
+#linkList h3.resources { 
+	background: transparent url(h6.gif) no-repeat top left; 
+	margin: 25px 0 5px 0; 
+	width:63px; 
+	height: 10px; 
+	}
+#linkList h3.resources span {
+	display:none
+	}
+
+
+#linkList ul {
+	margin: 0;
+	padding: 0;
+	}
+#linkList li {
+	line-height: 2.5ex; 
+	background: transparent url(cr1.gif) no-repeat top center; 
+	display: block; 
+	padding-top: 5px; 
+	margin-bottom: 5px;
+	list-style-type: none;
+	}
+#linkList li a:link {
+	color: #988F5E;
+	}
+#linkList li a:visited {
+	color: #B3AE94;
+	}
+
+
+#extraDiv1 {
+	background: transparent url(cr2.gif) top left no-repeat; 
+	position: absolute; 
+	top: 40px; 
+	right: 0; 
+	width: 148px; 
+	height: 110px;
+	}
+.accesskey {
+	text-decoration: underline;
+	}

dddsample/src/test/java/se/citerus/dddsample/domain/CargoTest.java

@@ -15,20 +15,20 @@ public class CargoTest extends TestCase{
     Location origin = new Location("SESTO");
     Cargo cargo = new Cargo(new TrackingId("XYZ"), origin, destination);
 
-		assertEquals(origin, cargo.currentLocation());
+		assertEquals(origin, cargo.getCurrentLocation());
 	}
 
 
   public void testCurrentLocationUnloaded() throws Exception {
 		Cargo cargo = populateCargoOffHongKong();
 		
-		assertEquals(new Location("CNHGK"), cargo.currentLocation());
+		assertEquals(new Location("CNHGK"), cargo.getCurrentLocation());
 	}
 	
 	public void testCurrentLocationloaded() throws Exception {
 		Cargo cargo = populateCargoOnHamburg();
 		
-		assertEquals(new Location("DEHAM"), cargo.currentLocation());
+		assertEquals(new Location("DEHAM"), cargo.getCurrentLocation());
 	}
 	
 	public void testAtFinalLocation() throws Exception {

dddsample/src/test/java/se/citerus/dddsample/domain/TrackingScenarioTest.java

@@ -14,15 +14,15 @@ public class TrackingScenarioTest extends TestCase {
 
     Cargo cargo = populateCargo();
 
-    DeliveryHistory deliveryHistory = cargo.deliveryHistory();
+    DeliveryHistory deliveryHistory = cargo.getDeliveryHistory();
 
-    SortedSet<HandlingEvent> handlingEvents = deliveryHistory.events();
+    SortedSet<HandlingEvent> handlingEvents = deliveryHistory.getEvents();
 
     assertEquals(4, handlingEvents.size());
     final HandlingEvent event = handlingEvents.last();
-    assertSame(HandlingEvent.Type.UNLOAD, event.type());
+    assertSame(HandlingEvent.Type.UNLOAD, event.getType());
     assertFalse(cargo.atFinalDestiation());
-    assertEquals("CNHKG", cargo.currentLocation().unlocode());
+    assertEquals("CNHKG", cargo.getCurrentLocation().unlocode());
 
   }
 

dddsample/src/test/java/se/citerus/dddsample/web/CargoTrackingControllerTest.java

@@ -73,8 +73,8 @@ public class CargoTrackingControllerTest extends TestCase {
 
     assertEquals("test-success", mav.getViewName());
     assertEquals(3, mav.getModel().size());
-    Location location = (Location) mav.getModel().get("location");
-    assertEquals("AAA", location.unlocode());
+    Cargo cargo = (Cargo) mav.getModel().get("cargo");
+    assertEquals("AAA", cargo.getCurrentLocation().unlocode());
   }
 
   public void testUnknownCargo() throws Exception {