[Ogoglio-commits] SF.net SVN: ogoglio: [678] maven/trunk/ogoglio-server/src/main

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

Revision: 678
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=678&view=rev
Author:   trevorolio
Date:     2008-01-11 13:21:10 -0800 (Fri, 11 Jan 2008)

Log Message:
-----------
Added private tells among space cohabitants.

Modified Paths:
--------------
    maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java
    maven/trunk/ogoglio-server/src/main/resources/siteTemplates/spaceui.js

Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java	2008-01-11 21:20:46 UTC (rev 677)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java	2008-01-11 21:21:10 UTC (rev 678)
@@ -417,6 +417,28 @@
 
                         listener.generatedSpaceEvent(markedUpEvent, SpaceSimulator.this);
 
+                    } else if (SpaceEvent.TEXT_TELL_EVENT.equals(event.getName())) {
+                        String username = event.getStringProperty(SpaceEvent.USERNAME);
+                        User user = space.getUser(username);
+                        if (user == null) {
+                            log("Got tell message from non-existent person: " + username);
+                            continue;
+                        }
+                        String recipientName = event.getStringProperty(SpaceEvent.TTE_RECIPIENT);
+                        User recipient = space.getUser(recipientName);
+                        if(recipient == null){
+                            log("Got tell message for non-existent person: " + recipientName);
+                            continue;
+                        }
+                        String chatMessage = markdownChatMessage(event.getStringProperty(SpaceEvent.TTE_MESSAGE));
+
+                        SpaceEvent markedUpEvent = new SpaceEvent(SpaceEvent.TEXT_TELL_EVENT);
+                        markedUpEvent.setProperty(SpaceEvent.USERNAME, username);
+                        markedUpEvent.setProperty(SpaceEvent.TTE_RECIPIENT, recipientName);
+                        markedUpEvent.setProperty(SpaceEvent.TTE_MESSAGE, chatMessage);
+
+                        listener.generatedSpaceEventForUser(recipientName, event, SpaceSimulator.this);
+
                     } else if (((SpaceEvent.THING_CLICKED_EVENT.equals(event.getName()))) || ((SpaceEvent.THING_CONTEXT_CLICKED_EVENT.equals(event.getName()))) || ((SpaceEvent.THING_CONTEXT_SELECTION_MADE_EVENT.equals(event.getName())))) {
                         String username = event.getStringProperty(SpaceEvent.USERNAME);
                         User user = space.getUser(username);

Modified: maven/trunk/ogoglio-server/src/main/resources/siteTemplates/spaceui.js
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/siteTemplates/spaceui.js	2008-01-11 21:20:46 UTC (rev 677)
+++ maven/trunk/ogoglio-server/src/main/resources/siteTemplates/spaceui.js	2008-01-11 21:21:10 UTC (rev 678)
@@ -16,6 +16,7 @@
 viewerHelpMessage += "Chat: Click in the text field below, type a chat message, then press \"return\".<br/>";
 viewerHelpMessage += "Camera: Drag your mouse to pan the camera left, right, up and down. ESC to reset.<br/>"
 viewerHelpMessage += "Zoom: Use your scroll wheel to zoom the camera in and out.<br/>";
+viewerHelpMessage += "Private Message: /t username message<br/>";
 viewerHelpMessage += "<br/>Type \"/help\" to see this message again.";
 
 function handleSpaceDoc(xml){


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