virtualcommons-svn Mailing List for Virtual Commons Experiment Software (Page 62)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 307
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=307&view=rev
Author:   alllee
Date:     2009-10-20 04:07:18 +0000 (Tue, 20 Oct 2009)

Log Message:
-----------
more refactoring of GUI components, getting rid of unnecessarily nested components and making it so that the GUI components can be initialized and added to the ExperimentGameWindow's CardLayout without generating NPEs.  Getting rid of isPracticeRound() check in RoundConfiguration.isChatEnabled() method.

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/RoundConfiguration.java

Added Paths:
-----------
    irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/InfrastructureEfficiencyChartPanel.java

Removed Paths:
-------------
    irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ChartWindowPanelTokenBandwidth.java

Deleted: irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ChartWindowPanelTokenBandwidth.java
===================================================================

--- irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ChartWindowPanelTokenBandwidth.java	2009-10-20 02:36:40 UTC (rev 306)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ChartWindowPanelTokenBandwidth.java	2009-10-20 04:07:18 UTC (rev 307)
@@ -1,131 +0,0 @@
-package edu.asu.commons.irrigation.client;
-
-import java.awt.CardLayout;
-import java.awt.Dimension;
-import java.awt.GridLayout;
-
-import javax.swing.JPanel;
-
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.ChartPanel;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.plot.PlotOrientation;
-import org.jfree.data.xy.XYSeries;
-import org.jfree.data.xy.XYSeriesCollection;
-
-import edu.asu.commons.irrigation.server.GroupDataModel;
-
-/**
- * $Id$
- * 
- *
- * @author Sanket Joshi
- * @version $Rev$
- */
-public class ChartWindowPanelTokenBandwidth extends JPanel {
-
-    private static final long serialVersionUID = 5555080117985336199L;
-
-    private int numberofFilesDownloaded = 10;
-
-    private Dimension screenSize;
-
-    private JPanel jPanel;
-
-    private IrrigationClient client;
-
-
-
-    /**
-     * A demonstration application showing an XY series containing a null value.
-     *
-     * @param title  the frame title.
-     */
-    public ChartWindowPanelTokenBandwidth(IrrigationClient client) {
-        this.client = client;
-        initialize();
-    }
-
-
-
-    public void initialize() {
-        this.setLayout(new CardLayout());
-        this.setSize(new Dimension(530/2, 326/2));
-        //this.setSize(screenSize.width, screenSize.height);
-        this.add(getJPanel(), getJPanel().getName());
-        repaint();
-
-    }
-
-    /**
-     * This method initializes jPanel
-     *
-     * @return javax.swing.JPanel
-     */
-    private JPanel getJPanel() {
-        if (jPanel == null) {
-            jPanel = new JPanel();
-            GridLayout gridLayout = new GridLayout();
-            gridLayout.setColumns(2);
-            jPanel.setLayout(gridLayout);
-            jPanel.add(getChartPanel());
-            //jPanel.add(getchartPanel1());
-            jPanel.setName("jPanel");
-        }
-        return jPanel;
-    }
-
-    private ChartPanel getChartPanel() {
-        // TODO Auto-generated method stub
-        final XYSeries actualFlowCapacitySeries = new XYSeries("Actual");
-        final XYSeries potentialFlowCapacitySeries = new XYSeries("Potential");
-        //				final XYSeries actualFlowCapacitySeriesY = new XYSeries("Actual");
-        final XYSeries initialInfrastructureEfficiencySeries = new XYSeries("Initial");
-        int x,y;
-        GroupDataModel group = client.getClientDataModel().getGroupDataModel();
-        final int infrastructureEfficiency = group.getInfrastructureEfficiency();
-        final int actualFlowCapacity = group.getFlowCapacity();
-        for(y = 0; y <= actualFlowCapacity; y++) {
-            actualFlowCapacitySeries.add(infrastructureEfficiency, y);
-        }
-        for(x =0; x<=client.getRoundConfiguration().getMaximumInfrastructureEfficiency();x++){
-            y =	group.calculateFlowCapacity(x);
-            potentialFlowCapacitySeries.add(x,y);
-        }
-        final int initialInfrastructureEfficiency = group.getInitialInfrastructureEfficiency();
-        final int initialFlowCapacity = group.calculateFlowCapacity(initialInfrastructureEfficiency);
-        for (y = 0; y <= initialFlowCapacity; y++) {
-            initialInfrastructureEfficiencySeries.add(initialInfrastructureEfficiency, y);
-        }
-
-        //	            for(y = 0; y <= actualFlowCapacity; y++) {
-        //	            	actualFlowCapacitySeriesY.add(infrastructureEfficiency,y);
-        //	            }
-
-        final XYSeriesCollection data = new XYSeriesCollection();
-        data.addSeries(initialInfrastructureEfficiencySeries);
-        data.addSeries(actualFlowCapacitySeries);
-        data.addSeries(potentialFlowCapacitySeries);
-
-        //	            data.addSeries(actualFlowCapacitySeriesY);
-
-        final JFreeChart chart = ChartFactory.createXYLineChart(
-                "Total Flow Capacity",
-                "Infrastructure Efficiency",
-                "Actual Flow Capacity",
-                data,
-                PlotOrientation.VERTICAL,
-                true,
-                true,
-                false
-        );
-        final ChartPanel chartPanel = new ChartPanel(chart);
-        //chartPanel.chartProgress(arg0)
-        chartPanel.setLayout(new CardLayout());
-        chartPanel.setPreferredSize(new Dimension(500, 270));
-        repaint();
-        //setContentPane(chartPanel);
-        return chartPanel;
-        //y=4*x;
-    }
-}
\ No newline at end of file

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-10-20 02:36:40 UTC (rev 306)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java	2009-10-20 04:07:18 UTC (rev 307)
@@ -52,7 +52,6 @@
 
     private IrrigationClient irrigationClient;
 
-
     private Identifier clientId;
 
     private JScrollPane messageScrollPane;
@@ -109,18 +108,13 @@
 
         private void sendMessage() {
             String message = chatField.getText();
-            // System.err.println("message: " + message);
-            if (message == null || "".equals(message)) {
-                return;
+            if (message != null && ! message.isEmpty() && targetIdentifier != null) {
+            	chatField.setText("");
+            	irrigationClient.transmit(new ChatRequest(getClientId(), message, targetIdentifier));
+            	displayMessage(
+            			String.format("%s -> %s", getChatHandle(getClientId()), getChatHandle(targetIdentifier)), 
+            			message);
             }
-            if (targetIdentifier == null) {
-                return;
-            }
-            chatField.setText("");
-            irrigationClient.transmit(new ChatRequest(clientId, message, targetIdentifier));
-            System.err.println("Sending a new chat request");
-            displayMessage(getChatHandle(clientId) + " -> "
-                    + getChatHandle(targetIdentifier), message);
             chatField.requestFocusInWindow();
         }
 
@@ -147,7 +141,7 @@
         JFrame frame = new JFrame();
         ChatPanel chatPanel = new ChatPanel();
         Identifier selfId = new Identifier(){};
-        chatPanel.setClientId(selfId);
+        chatPanel.clientId = selfId;
         chatPanel.initialize(Arrays.asList(new Identifier[] {
                 new Identifier(){}, new Identifier(){}, 
                 new Identifier(){}, selfId }));
@@ -229,13 +223,15 @@
             chatHandles.put(participants.get(i), HANDLES[i]);
         }
     }
-
-    public void setClientId(Identifier clientId) {
-        this.clientId = clientId;
+    
+    public Identifier getClientId() {
+    	if (clientId == null) {
+    		clientId = irrigationClient.getId();
+    	}
+    	return clientId;
     }
 
     public void setIrrigationClient(IrrigationClient client) {
-        setClientId(client.getId());
         this.irrigationClient = client;
         client.getEventChannel().add(this, new EventTypeProcessor<ChatEvent>(ChatEvent.class) {
             public void handle(final ChatEvent chatEvent) {

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-10-20 02:36:40 UTC (rev 306)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java	2009-10-20 04:07:18 UTC (rev 307)
@@ -67,7 +67,7 @@
 
     private JButton submitTokensButton;
 
-    private ChartWindowPanelTokenBandwidth xySeriesDemo = null;
+    private InfrastructureEfficiencyChartPanel xySeriesDemo = null;
 
     private IrrigationClient client;
 
@@ -625,7 +625,7 @@
     private JPanel getPieChartPanel() {
         if (pieChartPanel == null) {
             pieChartPanel = new JPanel();
-            xySeriesDemo = new ChartWindowPanelTokenBandwidth(client);
+            xySeriesDemo = new InfrastructureEfficiencyChartPanel(client);
             xySeriesDemo.setVisible(true);
             pieChart = new PieChart();
             GridLayout gridLayout = new GridLayout();
@@ -654,7 +654,7 @@
         System.err.println("Updating round instructions: " + roundConfiguration.getInstructions());
         // if this is the first round, show the general instructions.
         if (roundConfiguration.isFirstRound()) {
-//            setInstructions(roundConfiguration.getParentConfiguration().getInitialInstructions());
+
         }
         else {
             instructionsBuilder.append(roundConfiguration.getInstructions());

Copied: irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/InfrastructureEfficiencyChartPanel.java (from rev 306, irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ChartWindowPanelTokenBandwidth.java)
===================================================================
--- irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/InfrastructureEfficiencyChartPanel.java	                        (rev 0)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/InfrastructureEfficiencyChartPanel.java	2009-10-20 04:07:18 UTC (rev 307)
@@ -0,0 +1,89 @@
+package edu.asu.commons.irrigation.client;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+
+import javax.swing.JPanel;
+
+import org.jfree.chart.ChartFactory;
+import org.jfree.chart.ChartPanel;
+import org.jfree.chart.JFreeChart;
+import org.jfree.chart.plot.PlotOrientation;
+import org.jfree.data.xy.XYSeries;
+import org.jfree.data.xy.XYSeriesCollection;
+
+import edu.asu.commons.irrigation.server.GroupDataModel;
+
+/**
+ * $Id$
+ * 
+ * Presents a chart view of the infrastructure efficiency function. 
+ * 
+ * @author Allen Lee, Sanket Joshi
+ * @version $Rev$
+ */
+public class InfrastructureEfficiencyChartPanel extends JPanel {
+
+    private static final long serialVersionUID = 5555080117985336199L;
+
+    private IrrigationClient client;
+    /**
+     * 
+     * @param title  the frame title.
+     */
+    public InfrastructureEfficiencyChartPanel(IrrigationClient client) {
+        this.client = client;
+    	setPreferredSize(new Dimension(530/2, 326/2));
+        //this.setSize(screenSize.width, screenSize.height);
+        setName("infrastructure efficiency chart panel");
+        setLayout(new BorderLayout());
+    }
+
+    public void initialize() {
+    	add(createChartPanel(), BorderLayout.CENTER);
+    }
+
+    private ChartPanel createChartPanel() {
+        final XYSeries actualFlowCapacitySeries = new XYSeries("Actual");
+        final XYSeries potentialFlowCapacitySeries = new XYSeries("Potential");
+        //				final XYSeries actualFlowCapacitySeriesY = new XYSeries("Actual");
+        final XYSeries initialInfrastructureEfficiencySeries = new XYSeries("Initial");
+        int x,y;
+        GroupDataModel group = client.getClientDataModel().getGroupDataModel();
+        final int infrastructureEfficiency = group.getInfrastructureEfficiency();
+        final int actualFlowCapacity = group.getFlowCapacity();
+        for (y = 0; y <= actualFlowCapacity; y++) {
+            actualFlowCapacitySeries.add(infrastructureEfficiency, y);
+        }
+        for(x =0; x<=client.getRoundConfiguration().getMaximumInfrastructureEfficiency();x++){
+            y =	group.calculateFlowCapacity(x);
+            potentialFlowCapacitySeries.add(x,y);
+        }
+        final int initialInfrastructureEfficiency = group.getInitialInfrastructureEfficiency();
+        final int initialFlowCapacity = group.calculateFlowCapacity(initialInfrastructureEfficiency);
+        for (y = 0; y <= initialFlowCapacity; y++) {
+            initialInfrastructureEfficiencySeries.add(initialInfrastructureEfficiency, y);
+        }
+
+        final XYSeriesCollection data = new XYSeriesCollection();
+        data.addSeries(initialInfrastructureEfficiencySeries);
+        data.addSeries(actualFlowCapacitySeries);
+        data.addSeries(potentialFlowCapacitySeries);
+
+        //	            data.addSeries(actualFlowCapacitySeriesY);
+
+        final JFreeChart chart = ChartFactory.createXYLineChart(
+                "Total Flow Capacity",
+                "Infrastructure Efficiency",
+                "Actual Flow Capacity",
+                data,
+                PlotOrientation.VERTICAL,
+                true,
+                true,
+                false
+        );
+        final ChartPanel chartPanel = new ChartPanel(chart);
+        chartPanel.setPreferredSize(new Dimension(500, 270));
+        return chartPanel;
+    }
+}
\ No newline at end of file

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-10-20 02:36:40 UTC (rev 306)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/IrrigationClient.java	2009-10-20 04:07:18 UTC (rev 307)
@@ -71,14 +71,14 @@
         this.channel = channel;
         setServerConfiguration(serverConfiguration);
         this.clientDispatcher = DispatcherFactory.getInstance().createClientDispatcher(channel);
+        initEventProcessors();
     }
     
     private void initialize(Dimension screenSize) {
         clientDataModel = new ClientDataModel(channel, this);
         experimentGameWindow = new ExperimentGameWindow(this);
         experimentGameWindow.initialize(screenSize);
-        // clientGameState.setMainIrrigationGameWindow(irrigationGameWindow1);
-        initEventProcessors();
+        connect();
     }
 
     public void connect() {
@@ -86,8 +86,8 @@
                 + " state: " + state);
         if (state != ClientState.UNCONNECTED)
             return;
+        
         id = clientDispatcher.connect(serverConfiguration.getServerAddress());
-        System.err.println("Received id from server: " + id);
         if (id == null) {
             throw new RuntimeException("Null ID from Dispatcher.  Server: <"
                     + serverConfiguration.getServerAddress() + "> is probably down.");
@@ -102,7 +102,6 @@
                 JFrame frame = new JFrame();
                 IrrigationClient client = new IrrigationClient();
                 client.initialize(defaultDimension);
-                client.connect();
                 frame.setTitle("Virtual Commons Experiment Client: " + client.id);
                 frame.setSize(1130, 600);
                 frame.getContentPane().add(client.getExperimentGameWindow());

Modified: irrigation/trunk/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java
===================================================================
--- irrigation/trunk/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java	2009-10-20 02:36:40 UTC (rev 306)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java	2009-10-20 04:07:18 UTC (rev 307)
@@ -130,14 +130,11 @@
 
     /**
      * Returns true if the current round should have a communication session for
-     * getCommunicationDuration() seconds before the round begins.
+     * getChatDuration() seconds before the round begins.
      * 
      * @return
      */
     public boolean isChatEnabledBeforeRound() {
-        if (isPracticeRound()) {
-            return false;
-        }
         return getBooleanProperty("chat-enabled-before-round", true);
     }
 


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




2008	Jan	Feb	Mar	Apr	May	Jun (1)	Jul (21)	Aug (31)	Sep (6)	Oct (15)	Nov (2)	Dec (9)
2009	Jan (4)	Feb (6)	Mar (12)	Apr (52)	May (14)	Jun (19)	Jul (81)	Aug (115)	Sep (36)	Oct (88)	Nov (46)	Dec (58)
2010	Jan (52)	Feb (55)	Mar (48)	Apr (15)	May (5)	Jun (38)	Jul (27)	Aug (24)	Sep (28)	Oct (1)	Nov (2)	Dec (29)
2011	Jan (87)	Feb (39)	Mar (63)	Apr (42)	May (26)	Jun (53)	Jul (23)	Aug (43)	Sep (37)	Oct (25)	Nov (4)	Dec (7)
2012	Jan (73)	Feb (79)	Mar (62)	Apr (28)	May (12)	Jun (2)	Jul (9)	Aug (1)	Sep (8)	Oct	Nov (3)	Dec (3)
2013	Jan (8)	Feb (16)	Mar (38)	Apr (74)	May (62)	Jun (15)	Jul (49)	Aug (19)	Sep (9)	Oct	Nov	Dec
2014	Jan	Feb	Mar	Apr (2)	May (25)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

virtualcommons-svn Mailing List for Virtual Commons Experiment Software (Page 62)

virtualcommons-svn — Virtual Commons source control (SVN/HG) commit traffic