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

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

Revision: 336
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=336&view=rev
Author:   trevorolio
Date:     2007-09-02 13:04:41 -0700 (Sun, 02 Sep 2007)

Log Message:
-----------
Added a basic sanity check with the viewer applet during the integration tests.
It doesn't do much more than load a space with a test cube for the moment.
This test does not check that the applet will load properly from the server, but simply that the java code will actually open a space client, load a thing via the web api, and render it once.

Modified Paths:
--------------
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/render/Renderer.java
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceEvent.java

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java	2007-09-02 18:12:42 UTC (rev 335)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java	2007-09-02 20:04:41 UTC (rev 336)
@@ -107,7 +107,9 @@
 
     private J3DWater water = null;
 
-    private boolean rendererStopped = false;;
+    private boolean rendererStopped = false;
+    
+    private boolean completedInitialLoad = false;
 
     public J3DRenderer(SpaceClient spaceClient, boolean offScreen) {
         this(spaceClient.getSpace(), spaceClient.getUsername(), spaceClient, spaceClient.getErrorGeometryProvider(), offScreen);
@@ -229,6 +231,7 @@
         new Thread() {
             public void run() {
                 getSpace().addListener(new SpaceListener(), true);
+                completedInitialLoad = true;
             }
         }.start();
     }
@@ -844,4 +847,8 @@
     public boolean isOffScreen() {
         return offScreen;
     }
+
+    public boolean completedInitialLoad() {
+        return completedInitialLoad;
+    }
 }

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/render/Renderer.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/render/Renderer.java	2007-09-02 18:12:42 UTC (rev 335)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/render/Renderer.java	2007-09-02 20:04:41 UTC (rev 336)
@@ -30,6 +30,8 @@
 
     public abstract void startRenderer();
 
+    public abstract boolean completedInitialLoad();
+    
     public abstract void stopRenderer();
 
     public abstract Canvas getCanvas();

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceEvent.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceEvent.java	2007-09-02 18:12:42 UTC (rev 335)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceEvent.java	2007-09-02 20:04:41 UTC (rev 336)
@@ -354,6 +354,9 @@
         String[] keys = getKeys();
         for (int i = 0; i < keys.length; i++) {
             Object value = properties.get(keys[i]);
+            if(value == null){
+                continue;
+            }
             XMLElement property = new XMLElement(PROPERTY);
             property.setAttribute(PROPERTY_NAME, keys[i]);
             if (value instanceof String) {


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