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

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

Revision: 479
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=479&view=rev
Author:   trevorolio
Date:     2007-10-04 19:59:40 -0700 (Thu, 04 Oct 2007)

Log Message:
-----------
Added a chooser for the body editor.  You'll need to add this to your maven settings.xml:

<ogoglio.bodyDataDisplayNames>Mike,Andrea</ogoglio.bodyDataDisplayNames>
<ogoglio.bodyDataFileNames>ogoglio-body-mike.jar,ogoglio-body-andrea.jar</ogoglio.bodyDataFileNames>

Modified Paths:
--------------
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/BodyConfiguration.java
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DUserRenderable.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-10-04 21:24:13 UTC (rev 478)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java	2007-10-05 02:59:40 UTC (rev 479)
@@ -471,6 +471,17 @@
         return new BodyDataDocument(result);
     }
 
+    public BodyDataDocument[] getBodyDataDocuments() throws IOException {
+        
+        XMLElement result = wire.fetchAuthenticatedXML(descriptor.getBodiesURI(), authenticator.getAuthCookie());
+        Vector docs = new Vector();
+        Vector children = result.getChildren();
+        for (int i = 0; i < children.size(); i++) {
+            docs.add(new BodyDataDocument((XMLElement)children.get(i)));
+        }
+        return (BodyDataDocument[])docs.toArray(new BodyDataDocument[0]);
+    }
+
     public BodyDataDocument getBodyDataDocument(long bodyDataID) throws IOException {
         return new BodyDataDocument(wire.fetchAuthenticatedXML(descriptor.getBodyDataDocumentURI(bodyDataID), authenticator.getAuthCookie()));
     }

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/BodyConfiguration.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/BodyConfiguration.java	2007-10-04 21:24:13 UTC (rev 478)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/BodyConfiguration.java	2007-10-05 02:59:40 UTC (rev 479)
@@ -9,24 +9,24 @@
 public class BodyConfiguration {
 
     private User user = null;
-    
+
     private long bodyConfigurationID = -1;
-    
+
     private String displayName = null;
-    
+
     private long bodyDataID = -1;
-    
+
     private HashMap settings = new HashMap();
-    
-    public BodyConfiguration(BodyConfigurationDocument configDoc){
+
+    public BodyConfiguration(BodyConfigurationDocument configDoc) {
         this(configDoc.getBodyConfigurationID(), configDoc.getDisplayName(), configDoc.getBodyDataID());
         BodySettingDocument[] settingDocs = configDoc.getBodySettingDocuments();
         for (int i = 0; i < settingDocs.length; i++) {
             addSetting(settingDocs[i].getSettingName(), settingDocs[i].getSetting());
         }
     }
-    
-    public BodyConfiguration(long bodyConfigurationID, String displayName, long bodyDataID){
+
+    public BodyConfiguration(long bodyConfigurationID, String displayName, long bodyDataID) {
         ArgumentUtils.assertNotNegative(bodyConfigurationID);
         this.bodyConfigurationID = bodyConfigurationID;
         ArgumentUtils.assertNotEmpty(displayName);
@@ -35,34 +35,34 @@
         this.bodyDataID = bodyDataID;
     }
 
-    public void setUser(User user){
+    public void setUser(User user) {
         ArgumentUtils.assertNotNull(user);
         this.user = user;
     }
-    
-    public void addSetting(String settingName, float setting){
+
+    public void addSetting(String settingName, float setting) {
         ArgumentUtils.assertNotEmpty(settingName);
-        if(setting < 0){
+        if (setting < 0) {
             setting = 0;
         }
-        if(setting > 1){
+        if (setting > 1) {
             setting = 1;
         }
         settings.put(settingName, new Float(setting));
     }
-    
-    public void removeSetting(String settingName){
+
+    public void removeSetting(String settingName) {
         settings.remove(settingName);
     }
-    
-    public float getSetting(String settingName){
-        Float setting = (Float)settings.get(settingName);
-        if(setting == null){
+
+    public float getSetting(String settingName) {
+        Float setting = (Float) settings.get(settingName);
+        if (setting == null) {
             return 0;
         }
         return setting.floatValue();
     }
-    
+
     public User getUser() {
         return user;
     }
@@ -79,8 +79,11 @@
         return bodyDataID;
     }
 
+    public void setBodyDataID(long bodyDataID) {
+        this.bodyDataID = bodyDataID;
+    }
+
     public String[] getSettingNames() {
-        return (String[])settings.keySet().toArray(new String[0]);
+        return (String[]) settings.keySet().toArray(new String[0]);
     }
-    
 }

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DUserRenderable.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DUserRenderable.java	2007-10-04 21:24:13 UTC (rev 478)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DUserRenderable.java	2007-10-05 02:59:40 UTC (rev 479)
@@ -86,12 +86,12 @@
         setCapabilities(bodyGroup);
         transformGroup.addChild(bodyGroup);
 
-        initBody();
+        initBody(bodyData);
     }
 
-    private void initBody() {
+    public void initBody(J3DBodyData bodyData) {
         bodyGroup.removeAllChildren();
-
+        this.bodyData = bodyData;
         skin = new SkinLoader(bodyData, user.getBodyConfiguration()).generateSkin();
         userHeight = skin.getHeight();
         skinMap = bodyData.getSkinMap();
@@ -267,7 +267,4 @@
         animator.animate(loop);
     }
 
-    public void setHeight(float newHeight) {
-        initBody();
-    }
 }


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