From f2da80a87a95c9ddf6f799926a23348e2eb091ad Mon Sep 17 00:00:00 2001
From: josh <josh@45c1a28c-8058-47b2-ae61-ca45b979098e>
Date: Sat, 29 Nov 2008 17:55:45 +0000
Subject: [PATCH] updated to fix many compile errors

git-svn-id: svn://anubis/gvsu@283 45c1a28c-8058-47b2-ae61-ca45b979098e
---
 cs656/lab4/PresenceServiceImpl.java | 20 +++++++++++---------
 cs656/lab4/User.java                |  2 +-
 cs656/lab4/UserResource.java        |  4 ++++
 cs656/lab4/UsersResource.java       |  4 ++++
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/cs656/lab4/PresenceServiceImpl.java b/cs656/lab4/PresenceServiceImpl.java
index ab3d22a..9b24bca 100644
--- a/cs656/lab4/PresenceServiceImpl.java
+++ b/cs656/lab4/PresenceServiceImpl.java
@@ -8,6 +8,7 @@ import org.restlet.data.Method;
 import org.restlet.data.Protocol;
 import org.restlet.data.Request;
 import org.restlet.data.Response;
+import org.w3c.dom.*;
 
 import edu.gvsu.cis.cs656.lab4.server.PresenceService;
 import edu.gvsu.cis.cs656.lab4.server.RegistrationInfo;
@@ -34,7 +35,7 @@ public class PresenceServiceImpl implements PresenceService
         Form form = new Form();
         form.add("user[name]", reg.getUserName());
         form.add("user[host]", reg.getHost());
-        form.add("user[port]", reg.getPort());
+        form.add("user[port]", new String(reg.getPort()));
         form.add("user[status]", reg.getStatus() ? "available" : "away");
 
         // construct request to create a new user resource
@@ -76,8 +77,8 @@ public class PresenceServiceImpl implements PresenceService
     	try
     	{
 	        String userResourceUri = myAppURI + "/users/" + name;
-	    	request = new Request(Method.GET, userResourceUri);
-	    	resp = new Client(Protocol.HTTP).handle(request);
+	    	Request request = new Request(Method.GET, userResourceUri);
+	    	Response resp = new Client(Protocol.HTTP).handle(request);
 	    	if ( ! resp.getStatus().isSuccess() )
                 System.out.println(resp.getStatus());
             DomRepresentation d = resp.getEntityAsDom();
@@ -158,25 +159,26 @@ public class PresenceServiceImpl implements PresenceService
             ioex.printStackTrace();
         }
 
-        return users.toArray();
+        RegistrationInfo[] dum = null;
+        return users.toArray(dum);
     }
 
     private RegistrationInfo nodeToRegInfo(Node n)
     {
-        Registration ri = new RegistrationInfo();
+        RegistrationInfo ri = new RegistrationInfo();
         NodeList nl = n.getChildNodes();
         for (int i = 0; i < nl.getLength(); i++)
         {
             Node n = nl.item(i);
             String name = n.getNodeName();
             if (name.equals("name"))
-                ri.setUserName(name.getTextContent());
+                ri.setUserName(n.getTextContent());
             else if (name.equals("host"))
-                ri.setHost(name.getTextContent());
+                ri.setHost(n.getTextContent());
             else if (name.equals("port"))
-                ri.setPort(Integer.parseInt(name.getTextContent()));
+                ri.setPort(Integer.parseInt(n.getTextContent()));
             else if (name.equals("status"))
-                ri.setStatus(name.getTextContent().equals("available"));
+                ri.setStatus(n.getTextContent().equals("available"));
         }
         return ri;
     }
diff --git a/cs656/lab4/User.java b/cs656/lab4/User.java
index 85fcf29..bb2d6c7 100644
--- a/cs656/lab4/User.java
+++ b/cs656/lab4/User.java
@@ -38,7 +38,7 @@ public class User extends RegistrationInfo
         eltRoot.appendChild(eltHost);
     
         Element eltPort = d.createElement("port");
-        eltPort.appendChild(d.createTextNode(getPort()));
+        eltPort.appendChild(d.createTextNode(new String(getPort())));
         eltRoot.appendChild(eltPort);
         
         Element eltStatus = d.createElement("status");
diff --git a/cs656/lab4/UserResource.java b/cs656/lab4/UserResource.java
index c939711..b42e2a5 100644
--- a/cs656/lab4/UserResource.java
+++ b/cs656/lab4/UserResource.java
@@ -8,6 +8,7 @@
 //----------------------------------------------------------------------
 
 import java.io.IOException;
+import java.util.*;
 
 import org.restlet.Context;
 import org.restlet.data.Form;
@@ -19,7 +20,10 @@ import org.restlet.data.Status;
 import org.restlet.resource.DomRepresentation;
 import org.restlet.resource.Representation;
 import org.restlet.resource.Variant;
+import org.w3c.dom.*;
 
+import com.db4o.ObjectContainer;
+import com.db4o.query.Predicate;
 
 public class UserResource extends Resource
 {
diff --git a/cs656/lab4/UsersResource.java b/cs656/lab4/UsersResource.java
index 7705282..da2b69b 100644
--- a/cs656/lab4/UsersResource.java
+++ b/cs656/lab4/UsersResource.java
@@ -8,6 +8,7 @@
 //----------------------------------------------------------------------
 
 import java.io.IOException;
+import java.util.*;
 
 import org.restlet.Context;
 import org.restlet.data.Form;
@@ -19,7 +20,10 @@ import org.restlet.data.Status;
 import org.restlet.resource.DomRepresentation;
 import org.restlet.resource.Representation;
 import org.restlet.resource.Variant;
+import org.w3c.dom.*;
 
+import com.db4o.ObjectContainer;
+import com.db4o.query.Predicate;
 
 public class UsersResource extends Resource
 {