[virtualcommons-svn] commit/irrigation: alllee: updating chat handles to specify (you) for messages sent by the given participant

[Bitbucket <com...@bi...>]

1 new commit in irrigation:


https://bitbucket.org/virtualcommons/irrigation/changeset/97848317c455/
changeset:   97848317c455
user:        alllee
date:        2012-03-27 06:23:34
summary:     updating chat handles to specify (you) for messages sent by the given participant
affected #:  2 files

diff -r ea63fc72a481f3db108fd5be318c79fb3a96b02a -r 97848317c45589cef63637848d843bd4172bd5e4 src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java
--- a/src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java
+++ b/src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java
@@ -64,8 +64,7 @@
             public void handle(final ChatEvent chatEvent) {
                 SwingUtilities.invokeLater(new Runnable() {
                     public void run() {
-                        displayMessage(getChatHandle(chatEvent.getSource()),
-                                chatEvent.toString());
+                        displayMessage(getChatHandle(chatEvent.getSource()), chatEvent.toString());
                     }
                 });
             }
@@ -88,12 +87,6 @@
                     }
                 }
             });
-//            final JButton sendButton = new JButton("Send");
-//            sendButton.addActionListener(new ActionListener() {
-//                public void actionPerformed(ActionEvent event) {
-//                    sendMessage();
-//                }
-//            });
             JPanel timeLeftPanel = new JPanel();
             int chatDuration = irrigationClient.getServerConfiguration().getChatDuration();
             timeLeftProgressBar = new JProgressBar(0, chatDuration);
@@ -109,7 +102,7 @@
         private void sendMessage() {
             String message = chatField.getText();
             if (message != null && ! message.isEmpty() && targetIdentifier != null) {
-                displayMessage(getChatHandle(getClientId()), message);
+                displayMessage(getChatHandle(getClientId()) + " (you):", message);
             	chatField.setText("");
             	irrigationClient.transmit(new ChatRequest(getClientId(), message, targetIdentifier));
              }


diff -r ea63fc72a481f3db108fd5be318c79fb3a96b02a -r 97848317c45589cef63637848d843bd4172bd5e4 src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java
--- a/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java
+++ b/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java
@@ -249,7 +249,7 @@
                     ChatEvent chatEvent = new ChatEvent(target, request.getMessage(), source);                  
                     transmit(chatEvent);
                 }
-                sendFacilitatorMessage(String.format("%s->%s: %s", source, allTargets, request.toString()));
+                sendFacilitatorMessage(String.format("%s->%s: %s", sendingClient, allTargets, request.toString()));
                 persister.store(request);
             }
         });

Repository URL: https://bitbucket.org/virtualcommons/irrigation/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.