svn commit: r157605 - in incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src: org/apache/beehive/sample/AddressBookImpl.java web/Service.jws

[mmerz]

Author: mmerz
Date: Tue Mar 15 14:58:27 2005
New Revision: 157605

URL: http://svn.apache.org/viewcvs?view=rev&rev=157605
Log:
Adding an initial value to addressbook for better usability of the sample.


Modified:
    
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/org/apache/beehive/sample/AddressBookImpl.java
    incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/web/Service.jws

Modified: 
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/org/apache/beehive/sample/AddressBookImpl.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/org/apache/beehive/sample/AddressBookImpl.java?view=diff&r1=157604&r2=157605
==============================================================================
--- 
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/org/apache/beehive/sample/AddressBookImpl.java
 (original)
+++ 
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/org/apache/beehive/sample/AddressBookImpl.java
 Tue Mar 15 14:58:27 2005
@@ -36,7 +36,7 @@
     
     public Address getAddressFromName(String name) {
         System.out.println("getAddressFromName() is called for: " + name);
-        if (null != name) {
+        if (null == name) {
             return null;
         }
         Address res = (Address) this.addresses.get(name);

Modified: 
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/web/Service.jws
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/web/Service.jws?view=diff&r1=157604&r2=157605
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/web/Service.jws 
(original)
+++ incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/web/Service.jws 
Tue Mar 15 14:58:27 2005
@@ -27,6 +27,8 @@
 import org.apache.beehive.sample.Address;
 import org.apache.beehive.sample.AddressBook;
 import org.apache.beehive.sample.AddressBookImpl;
+import org.apache.beehive.sample.Phone;
+import org.apache.beehive.sample.StateType;
 
 
 @WebService(
@@ -34,8 +36,27 @@
   serviceName="SimpleAddressBook")
 public class Service implements AddressBook {
 
-    private AddressBook addressBook = new AddressBookImpl();
+    private static String DEFAULT_NAME = "default";
 
+    private AddressBook addressBook;
+
+    /**
+     * Constructor.
+     */
+    public Service() {
+        addressBook = new AddressBookImpl();
+        addressBook.addEntry(
+            DEFAULT_NAME,
+            new Address(
+                10230,
+                "NE Points Drive",
+                "Kirkland",
+                new StateType("WA"),
+                98033,
+                new Phone(425, "555", "1234")
+            )
+        );
+    }
     
     /**
      * Web method that adds an entry to the AddressBook.
@@ -55,7 +76,11 @@
      */
     @WebMethod
     public Address getAddressFromName(String name) {
-        return addressBook.getAddressFromName(name);
+        Address address = addressBook.getAddressFromName(name);
+        if (null == address) {
+            address = addressBook.getAddressFromName(DEFAULT_NAME);
+        }
+        return address;
     }
 
  
@@ -67,4 +92,4 @@
     public String notWebService() {
         return "Not available through Web service";
     }
-}
\ No newline at end of file
+}