[Ogoglio-commits] SF.net SVN: ogoglio: [376] maven/trunk/ogoglio-common/src/main/java/com/ ogoglio

[<tre...@us...>]

Revision: 376
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=376&view=rev
Author:   trevorolio
Date:     2007-09-06 06:16:32 -0700 (Thu, 06 Sep 2007)

Log Message:
-----------
Improved the account checks when accepting or denying space modifications via web api.
Avoided a null pointer exception in populate mojo when the populate dir was not configured.

Modified Paths:
--------------
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/MotionInputHandler.java
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceMemberDocument.java

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java	2007-09-06 13:16:29 UTC (rev 375)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java	2007-09-06 13:16:32 UTC (rev 376)
@@ -67,10 +67,13 @@
         }
     }
 
-    public SpaceDocument createSpace(String spaceName) throws IOException {
+    public SpaceDocument createSpace(String spaceName) {
         SpaceDocument spaceDoc = new SpaceDocument(-1, spaceName, authenticator.getUsername(), false, 0, false, 0, -1);
-        XMLElement result = wire.sendAuthenticatedXML(descriptor.getSpacesURI(), spaceDoc.toString(), "POST", authenticator.getAuthCookie());
-        return new SpaceDocument(result);
+        try {
+            return new SpaceDocument(wire.sendAuthenticatedXML(descriptor.getSpacesURI(), spaceDoc.toString(), "POST", authenticator.getAuthCookie()));
+        } catch (IOException e) {
+            return null;
+        }
     }
 
     public boolean deleteSpace(long spaceID) throws IOException {
@@ -210,6 +213,14 @@
         wire.postAuthenticatedXML(descriptor.getSpaceURI(spaceID), spaceDoc.toString(), authenticator.getAuthCookie());
     }
 
+    public SpaceMemberDocument updateSpaceMember(long spaceID, SpaceMemberDocument spaceMemberDocument) {
+        try {
+            return new SpaceMemberDocument(wire.sendAuthenticatedXML(descriptor.getSpaceMemberURI(spaceID, spaceMemberDocument.getMemberUsername()), spaceMemberDocument.toString(), "POST", authenticator.getAuthCookie()));
+        } catch (IOException e) {
+            return null;
+        }
+    }
+
     public SpaceMemberDocument addSpaceMember(long spaceID, String memberUsername, String role) throws IOException {
         SpaceDocument spaceDoc = new SpaceDocument(wire.fetchAuthenticatedXML(descriptor.getSpaceURI(spaceID), authenticator.getAuthCookie()));
         SpaceMemberDocument memberDoc = new SpaceMemberDocument(spaceDoc.getSpaceID(), memberUsername, false, role);
@@ -259,8 +270,12 @@
         return new SpaceDocument(wire.fetchAuthenticatedXML(descriptor.getSpaceURI(spaceID, includeChildren), authenticator.getAuthCookie()));
     }
 
-    public ThingDocument updateThing(long spaceID, ThingDocument thingDoc) throws IOException {
-        return new ThingDocument(wire.postAuthenticatedXML(descriptor.getThingURI(spaceID, thingDoc.getThingID()), thingDoc.toString(), authenticator.getAuthCookie()));
+    public ThingDocument updateThing(long spaceID, ThingDocument thingDoc) {
+        try {
+            return new ThingDocument(wire.postAuthenticatedXML(descriptor.getThingURI(spaceID, thingDoc.getThingID()), thingDoc.toString(), authenticator.getAuthCookie()));
+        } catch (Exception e) {
+            return null;
+        }
     }
 
     public TemplateDocument updateTemplate(TemplateDocument templateDoc) throws IOException {
@@ -373,7 +388,7 @@
 
     public String getThingService(long spaceID, long thingID) throws IOException {
         InputStream stream = wire.fetchAuthenticatedStream(descriptor.getThingServiceURI(spaceID, thingID), authenticator.getAuthCookie());
-        if(stream == null){
+        if (stream == null) {
             return null;
         }
         return StreamUtils.readInput(stream);
@@ -520,5 +535,5 @@
     public WebAPIClientWire getWire() {
         return wire;
     }
+
 }
-

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/MotionInputHandler.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/MotionInputHandler.java	2007-09-06 13:16:29 UTC (rev 375)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/MotionInputHandler.java	2007-09-06 13:16:32 UTC (rev 376)
@@ -26,7 +26,6 @@
 import com.ogoglio.client.model.SplinePath;
 import com.ogoglio.client.model.Thing;
 import com.ogoglio.util.ArgumentUtils;
-import com.ogoglio.util.Log;
 import com.ogoglio.viewer.render.ClickTarget;
 import com.ogoglio.viewer.render.DoorRenderable;
 import com.ogoglio.viewer.render.PageRenderable;
@@ -37,8 +36,7 @@
 import com.ogoglio.viewer.render.UserRenderable;
 
 public class MotionInputHandler implements MouseMotionListener, MouseListener {
-    // right now we only support arrow key based walking and turning
-    // TODO add a full motion set: walk, fun, strafe, jump
+    //TODO right now we only support arrow key based walking, strafing and turning
 
     public double maxRadiansPerSecond = Math.PI / 60;
 
@@ -111,7 +109,6 @@
 
     // called from within PhysicsBehavior
     public void keyPressed(KeyEvent e) {
-        Log.info("Key down "+e.toString());
         if (e.getKeyCode() == KeyEvent.VK_UP || e.getKeyCode() == KeyEvent.VK_W) {
             if (moveForward == false || run == true) {
                 dirty = true;
@@ -156,7 +153,6 @@
 
     // called from within PhysicsBehavior
     public void keyReleased(KeyEvent e) {
-        Log.info("Key up:"+e.toString());
         if (e.getKeyCode() == KeyEvent.VK_UP || e.getKeyCode() == KeyEvent.VK_W) {
             if (moveForward == true) {
                 dirty = true;

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceMemberDocument.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceMemberDocument.java	2007-09-06 13:16:29 UTC (rev 375)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceMemberDocument.java	2007-09-06 13:16:32 UTC (rev 376)
@@ -109,4 +109,11 @@
     public int getRoleAsInt() {
         return parseRole(getRole());
     }
+
+    public void setRole(String role) {
+        if(parseRole(role) == -1){
+            throw new IllegalArgumentException("Bad space member role: " + role);
+        }
+        data.setAttribute(ROLE, role);
+    }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.