[Ogoglio-commits] SF.net SVN: ogoglio: [330] maven/trunk/ogoglio-common/src

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

Revision: 330
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=330&view=rev
Author:   trevorolio
Date:     2007-09-02 10:22:42 -0700 (Sun, 02 Sep 2007)

Log Message:
-----------
Changed the name of ContextMenuInfo to ContextMenuItemInfo (for some reason) which required changes in: Java classes which are used in the script contexts,  all of the javascripts that create said objects, and the ContextMenu[Item]Info classes themselves.

Modified Paths:
--------------
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceEvent.java
    maven/trunk/ogoglio-common/src/test/resources/sample-art3d/TestCube.js

Added Paths:
-----------
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/ContextMenuItemInfo.java

Removed Paths:
-------------
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/ContextMenuInfo.java

Deleted: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/ContextMenuInfo.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/ContextMenuInfo.java	2007-09-02 15:13:20 UTC (rev 329)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/ContextMenuInfo.java	2007-09-02 17:22:42 UTC (rev 330)
@@ -1,23 +0,0 @@
-package com.ogoglio.util;
-
-public class ContextMenuInfo {
-    private String userVisibleString;
-    private String id;
-    private boolean enabled;
-
-    public String getUserVisibleString() {
-        return userVisibleString;
-    }
-    public String getId() {
-        return id;
-    }
-    public boolean getEnabled() {
-        return enabled;
-    }
-    public void setValues(String textToShow, boolean notGrayedOut, String forCallback) {
-        userVisibleString=textToShow;
-        enabled=notGrayedOut;
-        id=forCallback;
-    }
-
-}

Copied: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/ContextMenuItemInfo.java (from rev 312, maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/ContextMenuInfo.java)
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/ContextMenuItemInfo.java	                        (rev 0)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/ContextMenuItemInfo.java	2007-09-02 17:22:42 UTC (rev 330)
@@ -0,0 +1,23 @@
+package com.ogoglio.util;
+
+public class ContextMenuItemInfo {
+    private String userVisibleString;
+    private String id;
+    private boolean enabled;
+
+    public String getUserVisibleString() {
+        return userVisibleString;
+    }
+    public String getId() {
+        return id;
+    }
+    public boolean getEnabled() {
+        return enabled;
+    }
+    public void setValues(String textToShow, boolean notGrayedOut, String forCallback) {
+        userVisibleString=textToShow;
+        enabled=notGrayedOut;
+        id=forCallback;
+    }
+
+}

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 15:13:20 UTC (rev 329)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceEvent.java	2007-09-02 17:22:42 UTC (rev 330)
@@ -26,7 +26,7 @@
 import nanoxml.XMLElement;
 
 import com.ogoglio.client.model.SplinePath;
-import com.ogoglio.util.ContextMenuInfo;
+import com.ogoglio.util.ContextMenuItemInfo;
 import com.ogoglio.viewer.j3d.J3DSplinePath;
 
 public class SpaceEvent {
@@ -280,7 +280,7 @@
                 String id = item.getStringAttribute(CONTEXT_MENU_DATA_ITEM_ID);
 
                 //go through front door!
-                ContextMenuInfo info = new ContextMenuInfo();
+                ContextMenuItemInfo info = new ContextMenuItemInfo();
                 info.setValues(text, enabled, id);
                 result.add(info);
             }
@@ -386,7 +386,7 @@
         }
         if (contextMenu!=null) {
             for (int i=0; i<contextMenu.size();++i) {
-                ContextMenuInfo info=(ContextMenuInfo)contextMenu.get(i);
+                ContextMenuItemInfo info=(ContextMenuItemInfo)contextMenu.get(i);
                 XMLElement item = new XMLElement();
                 item.setName(CONTEXT_MENU_DATA_ITEM);
                 item.setAttribute(CONTEXT_MENU_DATA_ITEM_TEXT, info.getUserVisibleString());

Modified: maven/trunk/ogoglio-common/src/test/resources/sample-art3d/TestCube.js
===================================================================
--- maven/trunk/ogoglio-common/src/test/resources/sample-art3d/TestCube.js	2007-09-02 15:13:20 UTC (rev 329)
+++ maven/trunk/ogoglio-common/src/test/resources/sample-art3d/TestCube.js	2007-09-02 17:22:42 UTC (rev 330)
@@ -20,10 +20,10 @@
 function onContextClick(person, shapeName){
  space.log(person + " context clicked " + thingID + " on its " + shapeName);
 
- i1 = new ContextMenuInfo("Google",true,"google");
- i2 = new ContextMenuInfo("Yahoo",true,"yahoo");
- i3 = new ContextMenuInfo("Altavista",false,"NOTUSED");
- i4 = new ContextMenuInfo("Transmutable",true,"transmutable");
+ i1 = new ContextMenuItemInfo("Google",true,"google");
+ i2 = new ContextMenuItemInfo("Yahoo",true,"yahoo");
+ i3 = new ContextMenuItemInfo("Altavista",false,"NOTUSED");
+ i4 = new ContextMenuItemInfo("Transmutable",true,"transmutable");
  
  return new Array(i1,i2,i3,i4);
 }


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