[Ogoglio-commits] SF.net SVN: ogoglio: [223] spaces/trunk/src/com/ogoglio/sim/site/SimServlet .java

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

Revision: 223
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=223&view=rev
Author:   trevorolio
Date:     2007-07-10 11:13:02 -0700 (Tue, 10 Jul 2007)

Log Message:
-----------
Fixed a bug in which clients could no longer load doors if they used the new all-in-one space document.
I hadn't added the door template.
Thanks to Gal for finding this and submitting a patch.

Modified Paths:
--------------
    spaces/trunk/src/com/ogoglio/sim/site/SimServlet.java

Modified: spaces/trunk/src/com/ogoglio/sim/site/SimServlet.java
===================================================================
--- spaces/trunk/src/com/ogoglio/sim/site/SimServlet.java	2007-07-10 17:43:14 UTC (rev 222)
+++ spaces/trunk/src/com/ogoglio/sim/site/SimServlet.java	2007-07-10 18:13:02 UTC (rev 223)
@@ -163,30 +163,33 @@
 
                 if ("true".equals(request.getParameter(SpaceServlet.INCLUDE_CHILDREN_PARAM))) {
                     HashMap templateDocs = new HashMap();
-                    
+
+                    DoorDocument[] doorDocs = simulator.getDoorDocuments();
+                    for (int i = 0; i < doorDocs.length; i++) {
+                        spaceDoc.addDoorDocument(doorDocs[i]);
+                        if (templateDocs.get(new Long(doorDocs[i].getTemplateID())) == null) {
+                            templateDocs.put(new Long(doorDocs[i].getTemplateID()), simulator.getListener().getTemplateDocument(doorDocs[i].getTemplateID()));
+                        }
+                    }
+
                     ThingDocument[] thingDocs = simulator.getThingDocuments();
                     for (int i = 0; i < thingDocs.length; i++) {
                         PageDocument[] pageDocs = simulator.getPageDocuments(thingDocs[i].getThingID());
                         for (int j = 0; j < pageDocs.length; j++) {
                             thingDocs[i].addPageDocument(pageDocs[j]);
                         }
-                        
+
                         spaceDoc.addThingDocument(thingDocs[i]);
-                        if(templateDocs.get(new Long(thingDocs[i].getTemplateID())) == null) {
+                        if (templateDocs.get(new Long(thingDocs[i].getTemplateID())) == null) {
                             templateDocs.put(new Long(thingDocs[i].getTemplateID()), simulator.getListener().getTemplateDocument(thingDocs[i].getTemplateID()));
                         }
                     }
-                    
-                    TemplateDocument[] tempDocs = (TemplateDocument[])templateDocs.values().toArray(new TemplateDocument[0]);
+
+                    TemplateDocument[] tempDocs = (TemplateDocument[]) templateDocs.values().toArray(new TemplateDocument[0]);
                     for (int i = 0; i < tempDocs.length; i++) {
                         spaceDoc.addTemplateDocument(tempDocs[i]);
                     }
-                    
-                    DoorDocument[] doorDocs = simulator.getDoorDocuments();
-                    for (int i = 0; i < doorDocs.length; i++) {
-                        spaceDoc.addDoorDocument(doorDocs[i]);
-                    }
-                    
+
                     UserDocument[] userDocs = simulator.getUserDocuments();
                     for (int i = 0; i < userDocs.length; i++) {
                         spaceDoc.addUserDocument(userDocs[i]);


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