[virtualcommons-svn] commit/irrigation: 2 new changesets

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

2 new commits in irrigation:


https://bitbucket.org/virtualcommons/irrigation/changeset/f121d6e8cec5/
changeset:   f121d6e8cec5
user:        alllee
date:        2012-03-27 06:38:14
summary:     adding an extra space for consistency to chat handle
affected #:  1 file

diff -r 089f49b2f359c6ee92405e85778505702f962adf -r f121d6e8cec5053095aaecfeba55bf30ef4bbb8e 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
@@ -102,7 +102,7 @@
         private void sendMessage() {
             String message = chatField.getText();
             if (message != null && ! message.isEmpty() && targetIdentifier != null) {
-                displayMessage(getChatHandle(getClientId()) + " (you):", message);
+                displayMessage(getChatHandle(getClientId()) + " (you): ", message);
             	chatField.setText("");
             	irrigationClient.transmit(new ChatRequest(getClientId(), message, targetIdentifier));
              }



https://bitbucket.org/virtualcommons/irrigation/changeset/7a6ee5861581/
changeset:   7a6ee5861581
user:        alllee
date:        2012-03-27 06:44:07
summary:     getting rid of off-by-one by removing submit button from form data if it exists
affected #:  2 files

diff -r f121d6e8cec5053095aaecfeba55bf30ef4bbb8e -r 7a6ee5861581c767451831f5a813eda80a386fc1 src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java
--- a/src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java
+++ b/src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java
@@ -271,6 +271,8 @@
             public synchronized void actionPerformed(ActionEvent e) {
                 FormActionEvent formEvent = (FormActionEvent) e;
                 Properties actualAnswers = formEvent.getData();
+                // remove the submit button if it exists
+                actualAnswers.remove("submit");
                 System.err.println("actual answers: " + actualAnswers);
                 List<String> incorrectQuestionNumbers = new ArrayList<String>();
                 List<String> correctQuestionNumbers = new ArrayList<String>();


diff -r f121d6e8cec5053095aaecfeba55bf30ef4bbb8e -r 7a6ee5861581c767451831f5a813eda80a386fc1 src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java
--- a/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java
+++ b/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java
@@ -269,7 +269,7 @@
     public String getQuizResults(List<String> incorrectQuestionNumbers, Map<Object, Object> actualAnswers) {
         ST template = createStringTemplate(getProperty("quiz-results"));
         // FIXME: actual answers includes the submit button, so there's an off-by-one that we need to deal with.
-        int totalQuestions = actualAnswers.size() - 1;
+        int totalQuestions = actualAnswers.size();
         int numberCorrect = totalQuestions - incorrectQuestionNumbers.size();
         template.add("allCorrect", incorrectQuestionNumbers.isEmpty());
         template.add("numberCorrect", numberCorrect);

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.