[virtualcommons-svn] SF.net SVN: virtualcommons:[367] irrigation/trunk/src/main

[<al...@us...>]

Revision: 367
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=367&view=rev
Author:   alllee
Date:     2009-11-18 07:15:06 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
adding updated screenshot and trying to fix lag in displaying first chat
message by "warming up" the interface with an initial message at the start of
each round (also serves as a chat round demarcation)

Modified Paths:
--------------
    irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java
    irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java
    irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/IrrigationClient.java
    irrigation/trunk/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java

Added Paths:
-----------
    irrigation/trunk/src/main/resources/images/irrigation-game-interface-screenshot.png

Modified: irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java
===================================================================
--- irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java	2009-11-17 01:31:57 UTC (rev 366)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java	2009-11-18 07:15:06 UTC (rev 367)
@@ -101,8 +101,7 @@
                         message);
             	chatField.setText("");
             	irrigationClient.transmit(new ChatRequest(getClientId(), message, targetIdentifier));
- 
-            }
+             }
             chatField.requestFocusInWindow();
         }
 
@@ -164,7 +163,7 @@
         add(textEntryPanel, BorderLayout.PAGE_END);
     }
 
-    private void displayMessage(String chatHandle, String message) {
+    public void displayMessage(String chatHandle, String message) {
         //		String chatHandle = getChatHandle(source);
         final StyledDocument document = messageWindow.getStyledDocument();
         try {
@@ -188,6 +187,7 @@
             HANDLES[i] = " " + HANDLE_STRING.charAt(i) + " ";
             chatHandles.put(participants.get(i), HANDLES[i]);
         }
+        displayMessage("", " ---- chat round starting ---- ");
     }
     
     public Identifier getClientId() {

Modified: irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java
===================================================================
--- irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java	2009-11-17 01:31:57 UTC (rev 366)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java	2009-11-18 07:15:06 UTC (rev 367)
@@ -97,9 +97,10 @@
     public ExperimentGameWindow(IrrigationClient client) {
         this.client = client;
         this.clientDataModel = client.getClientDataModel();
+        initialize();
     }
     
-    void initialize() {
+    private void initialize() {
         cardLayout = new CardLayout();
         setLayout(cardLayout);
         addToCardLayout(getInstructionsPanel());
@@ -121,7 +122,6 @@
             tokenInvestmentPanel.setName("Token investment panel");
             tokenInvestmentPanel.setLayout(new BorderLayout());
             tokenInstructionsEditorPane = createInstructionsEditorPane();
-            tokenInstructionsEditorPane.setCaretPosition(0);
             JScrollPane tokenInstructionsScrollPane = new JScrollPane(tokenInstructionsEditorPane);
             tokenInvestmentPanel.add(tokenInstructionsScrollPane, BorderLayout.CENTER);
             tokenInvestmentPanel.add(getSubmitTokenPanel(), BorderLayout.SOUTH);
@@ -201,7 +201,7 @@
                 public void actionPerformed(ActionEvent e) {
                     previousButton.setEnabled(true);
                     currentQuizPageNumber++;
-                    if (currentQuizPageNumber < getServerConfiguration().getNumberOfQuestionPages()) {
+                    if (currentQuizPageNumber <= getServerConfiguration().getNumberOfQuizPages()) {
                         setInstructions(getQuizPage());
                     }
                     else {
@@ -286,7 +286,6 @@
             instructionsEditorPane.setName("Instructions editor pane");
             // create a quiz listener and then initialize the instructions.
             instructionsEditorPane.setActionListener(createQuizListener(getServerConfiguration()));
-            instructionsEditorPane.setCaretPosition(0);
         }
         return instructionsEditorPane;
     }
@@ -456,7 +455,7 @@
                 quizPageResponses.put(currentQuizPageNumber, builder.toString());
                 // no matter what we move on to the next question page
                 // tell them what was right and what was wrong.
-                if (currentQuizPageNumber <= getServerConfiguration().getNumberOfQuestionPages()) {
+                if (currentQuizPageNumber <= getServerConfiguration().getNumberOfQuizPages()) {
                     nextButton.setEnabled(true);
                 }
                 quizzesAnswered++;
@@ -595,7 +594,7 @@
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
                 startTimer(getServerConfiguration().getChatDuration() * 1000L);
-                ChatPanel chatPanel = getChatPanel();
+//                ChatPanel chatPanel = getChatPanel();
                 chatPanel.initialize(clientDataModel.getAllClientIdentifiers());
                 addCenterComponent( chatPanel );
                 chatPanel.setFocusInChatField();
@@ -613,6 +612,7 @@
                     if (timeRemaining < 0) {
                     	showTokenInvestmentScreen();
                         getInvestedTokensTextField().requestFocusInWindow();
+//                        chatPanel.displayMessage("", "---- chat round ending ----");
                         timer.stop();
                         timer = null;
                     }

Modified: irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/IrrigationClient.java
===================================================================
--- irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/IrrigationClient.java	2009-11-17 01:31:57 UTC (rev 366)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/IrrigationClient.java	2009-11-18 07:15:06 UTC (rev 367)
@@ -71,9 +71,8 @@
     }
     
     private void initialize() {
-        clientDataModel = new ClientDataModel(channel, this);
+    	clientDataModel = new ClientDataModel(channel, this);
         experimentGameWindow = new ExperimentGameWindow(this);
-        experimentGameWindow.initialize();
         connect();
     }
 

Modified: irrigation/trunk/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java
===================================================================
--- irrigation/trunk/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java	2009-11-17 01:31:57 UTC (rev 366)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java	2009-11-18 07:15:06 UTC (rev 367)
@@ -130,7 +130,7 @@
         return assistant.getProperty("investment-instructions");
     }
     
-    public int getNumberOfQuestionPages() {
+    public int getNumberOfQuizPages() {
         return assistant.getIntProperty("question-pages", 2);
     }
     

Added: irrigation/trunk/src/main/resources/images/irrigation-game-interface-screenshot.png
===================================================================
(Binary files differ)


Property changes on: irrigation/trunk/src/main/resources/images/irrigation-game-interface-screenshot.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


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