[virtualcommons-svn] SF.net SVN: virtualcommons:[366] irrigation/trunk/src/main/java/edu/asu/ commons/irrigation/client

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

Revision: 366
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=366&view=rev
Author:   alllee
Date:     2009-11-17 01:31:57 +0000 (Tue, 17 Nov 2009)

Log Message:
-----------
fixing NPE in instructions

Modified Paths:
--------------
    irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java
    irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/MainIrrigationGameWindow.java

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 00:42:32 UTC (rev 365)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java	2009-11-17 01:31:57 UTC (rev 366)
@@ -102,14 +102,13 @@
     void initialize() {
         cardLayout = new CardLayout();
         setLayout(cardLayout);
-        setInstructions(getServerConfiguration().getWelcomeInstructions());
         addToCardLayout(getInstructionsPanel());
-//        irrigationGamePanel = new IrrigationGamePanel(client);
         irrigationGamePanel = new MainIrrigationGameWindow(client);
         addToCardLayout(irrigationGamePanel);
         addToCardLayout(getTokenInvestmentPanel());
         addToCardLayout(getChatPanel());
         addToCardLayout(getContributionInformationPanel());
+        setInstructions(getServerConfiguration().getWelcomeInstructions());
     }
     
     private void addToCardLayout(Component component) {
@@ -201,15 +200,13 @@
             nextButton.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
                     previousButton.setEnabled(true);
-                    if (currentQuizPageNumber >= quizzesAnswered){
-                        nextButton.setEnabled(false);
-                    }
+                    currentQuizPageNumber++;
                     if (currentQuizPageNumber < getServerConfiguration().getNumberOfQuestionPages()) {
-                        currentQuizPageNumber++;
                         setInstructions(getQuizPage());
                     }
                     else {
                         setInstructions(instructionsBuilder.toString());
+                        nextButton.setEnabled(false);
                     }
                 }
             });

Modified: irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/MainIrrigationGameWindow.java
===================================================================
--- irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/MainIrrigationGameWindow.java	2009-11-17 00:42:32 UTC (rev 365)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/MainIrrigationGameWindow.java	2009-11-17 01:31:57 UTC (rev 366)
@@ -124,14 +124,12 @@
 
 	private JPanel getMainInterfacePanel() {
 		if(mainInterfacePanel == null){
-			scoreBoardLabel = new JLabel();
+			scoreBoardLabel = new JLabel("EARNINGS GRAPH");
 			scoreBoardLabel.setBounds(new Rectangle(582,225+100+35,530,20));
 			scoreBoardLabel.setHorizontalAlignment(SwingConstants.CENTER);
-			scoreBoardLabel.setText("WATER COLLECTED TO TOKENS EARNED TABLE");
-			gateSwitchLabel = new JLabel();
+			gateSwitchLabel = new JLabel("DASHBOARD");
 			gateSwitchLabel.setBounds(new Rectangle(13,225+100+35,530,20));
 			gateSwitchLabel.setHorizontalAlignment(SwingConstants.CENTER);
-			gateSwitchLabel.setText("DASHBOARD");
 			mainInterfacePanel = new JPanel();
 			mainInterfacePanel.setLayout(null);
 			mainInterfacePanel.setName("Main interface panel");


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