[Ogoglio-commits] SF.net SVN: ogoglio: [608] maven/trunk/ogoglio-viewer-applet/src

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

Revision: 608
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=608&view=rev
Author:   trevorolio
Date:     2007-11-27 05:00:21 -0800 (Tue, 27 Nov 2007)

Log Message:
-----------
Added a help message to the viewer applet.  It is displayed at start and can be shown again with /help.
Third party apps can set their own help messages via javascript.

Modified Paths:
--------------
    maven/trunk/ogoglio-viewer-applet/src/main/java/com/ogoglio/viewer/applet/ViewerApplet.java
    maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/test/AppletTestWindow.java

Modified: maven/trunk/ogoglio-viewer-applet/src/main/java/com/ogoglio/viewer/applet/ViewerApplet.java
===================================================================
--- maven/trunk/ogoglio-viewer-applet/src/main/java/com/ogoglio/viewer/applet/ViewerApplet.java	2007-11-27 13:00:14 UTC (rev 607)
+++ maven/trunk/ogoglio-viewer-applet/src/main/java/com/ogoglio/viewer/applet/ViewerApplet.java	2007-11-27 13:00:21 UTC (rev 608)
@@ -28,6 +28,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Vector;
+import java.util.regex.Pattern;
 
 import javax.media.j3d.Transform3D;
 import javax.swing.JLabel;
@@ -71,8 +72,10 @@
 
     private boolean playIncomingChatAudio = true;
 
-    AudioClip incomingChatAudioClip = null;
+    private AudioClip incomingChatAudioClip = null;
 
+    private String helpMessage = null;
+
     public ViewerApplet() {
         setBackground(Color.WHITE);
         setLayout(new BorderLayout());
@@ -106,6 +109,11 @@
         boolean movable = !"false".equals(getParameter("movable"));
         showChat = !"false".equals(getParameter("showChat"));
 
+        helpMessage = getParameter("helpMessage");
+        if (helpMessage != null) {
+            helpMessage = helpMessage.replaceAll(Pattern.quote("<br/>"), "\r\n");
+        }
+
         try {
             serviceURI = new URI(getParameter("serviceURI"));
             long spaceID = Long.parseLong(getParameter("spaceID"));
@@ -131,6 +139,9 @@
                 renderer.getCanvas().setSize(getWidth(), getHeight() - chatPanel.getPreferredSize().height);
                 renderer.getCanvas().setPreferredSize(new Dimension(getWidth(), getHeight() - chatPanel.getPreferredSize().height));
                 add(chatPanel, BorderLayout.SOUTH);
+                if (helpMessage != null) {
+                    chatPanel.displayMessage(null, helpMessage);
+                }
                 add(renderer.getCanvas(), BorderLayout.CENTER);
             } else {
                 renderer.getCanvas().setSize(getWidth(), getHeight());
@@ -230,6 +241,8 @@
                 playIncomingChatAudio = false;
             } else if ("/loud".equals(message)) {
                 playIncomingChatAudio = true;
+            } else if ("/help".equals(message) && helpMessage != null) {
+                chatPanel.displayMessage(null, helpMessage);
             } else {
                 spaceClient.userIssuedCommand(message);
             }

Modified: maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/test/AppletTestWindow.java
===================================================================
--- maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/test/AppletTestWindow.java	2007-11-27 13:00:14 UTC (rev 607)
+++ maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/test/AppletTestWindow.java	2007-11-27 13:00:21 UTC (rev 608)
@@ -55,22 +55,19 @@
         if (fullScreen) {
             this.setUndecorated(true);
         }
-        PropStorage ps=new PropStorage();
+        PropStorage ps = new PropStorage();
         if (!ps.loadPropertySet(PropStorage.BOOTSTRAP_PROPS)) {
-        	Log.error("Can't find bootstrap properties!");
-        	System.exit(1);
+            Log.error("Can't find bootstrap properties!");
+            System.exit(1);
         }
         if (!ps.loadPropertySet(PropStorage.BASIC_PROPS)) {
-        	Log.error("Can't find basic properties!");
-        	System.exit(1);
+            Log.error("Can't find basic properties!");
+            System.exit(1);
         }
-        String serviceURI=ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.baseURL");
+        String serviceURI = ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.baseURL");
         HashMap parameters1 = new HashMap();
         try {
-            WebAPIAuthenticator authenticator = new WebAPIAuthenticator(new WebAPIClientWire(), 
-            		new WebAPIDescriptor(new URI(serviceURI)), 
-            		ps.getKeyFromSet(PropStorage.BOOTSTRAP_PROPS, "bootstrapUser"), 
-            		ps.getKeyFromSet(PropStorage.BOOTSTRAP_PROPS, "bootstrapUserPW"));
+            WebAPIAuthenticator authenticator = new WebAPIAuthenticator(new WebAPIClientWire(), new WebAPIDescriptor(new URI(serviceURI)), ps.getKeyFromSet(PropStorage.BOOTSTRAP_PROPS, "bootstrapUser"), ps.getKeyFromSet(PropStorage.BOOTSTRAP_PROPS, "bootstrapUserPW"));
             parameters1.put(WebConstants.AUTH_COOKIE, authenticator.getAuthCookie());
         } catch (Exception e) {
             e.printStackTrace();
@@ -91,7 +88,6 @@
 
         clientStub1 = new EnvironmentStub(parameters1);
         applet = new ViewerApplet();
-        //applet = new BodyEditorApplet();
         applet.setStub(clientStub1);
         add(applet, BorderLayout.CENTER);
     }
@@ -112,12 +108,12 @@
         }
 
         public URL getCodeBase() {
-        	PropStorage ps=new PropStorage();
+            PropStorage ps = new PropStorage();
             if (!ps.loadPropertySet(PropStorage.BASIC_PROPS)) {
-            	Log.error("Can't find basic properties!");
-            	System.exit(1);
+                Log.error("Can't find basic properties!");
+                System.exit(1);
             }
-            String serviceURI=ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.baseURL");
+            String serviceURI = ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.baseURL");
             return getURL(serviceURI);
         }
 


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