[virtualcommons-svn] SF.net SVN: virtualcommons:[300] irrigation/trunk/src/main/java/edu/asu/ commo
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
[virtualcommons-svn] SF.net SVN: virtualcommons:[300] irrigation/trunk/src/main/java/edu/asu/ commons/irrigation/client
|
From: <al...@us...> - 2009-10-17 22:23:31
|
Revision: 300
http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=300&view=rev
Author: alllee
Date: 2009-10-17 22:23:23 +0000 (Sat, 17 Oct 2009)
Log Message:
-----------
minor hygiene, referring to client data model instead of client primarily
Modified Paths:
--------------
irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ClientDataModel.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
Modified: irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ClientDataModel.java
===================================================================
--- irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ClientDataModel.java 2009-10-16 23:02:53 UTC (rev 299)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ClientDataModel.java 2009-10-17 22:23:23 UTC (rev 300)
@@ -10,6 +10,7 @@
import edu.asu.commons.event.EventChannel;
import edu.asu.commons.experiment.DataModel;
import edu.asu.commons.irrigation.conf.RoundConfiguration;
+import edu.asu.commons.irrigation.conf.ServerConfiguration;
import edu.asu.commons.irrigation.events.ClientUpdateEvent;
import edu.asu.commons.irrigation.events.RoundStartedEvent;
import edu.asu.commons.irrigation.server.ClientData;
@@ -34,8 +35,6 @@
private RoundConfiguration roundConfiguration;
- private int priority = 0;
-
private int timeLeft = 0;
public ClientDataModel(EventChannel channel, IrrigationClient client) {
@@ -60,15 +59,8 @@
setTimeLeft( (int) (getRoundConfiguration().getRoundDuration().getDelta() / 1000L) );
}
- /**
- * Setting priority for this client.
- */
- public void setPriority(int priority){
- this.priority = priority;
- }
-
public int getPriority(){
- return priority;
+ return getClientData().getPriority();
}
public void update(ClientUpdateEvent clientUpdateEvent) {
@@ -92,6 +84,10 @@
this.roundConfiguration = roundConfiguration;
}
+ public ServerConfiguration getServerConfiguration() {
+ return roundConfiguration.getParentConfiguration();
+ }
+
public void setGroupDataModel(GroupDataModel groupDataModel) {
this.groupDataModel = groupDataModel;
setRoundConfiguration(groupDataModel.getRoundConfiguration());
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-16 23:02:53 UTC (rev 299)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java 2009-10-17 22:23:23 UTC (rev 300)
@@ -140,7 +140,7 @@
instructionsScrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
instructionsScrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
// create a quiz listener and then initialize the instructions.
- instructionsEditorPane.setActionListener(createQuizListener(client.getServerConfiguration()));
+ instructionsEditorPane.setActionListener(createQuizListener(clientDataModel.getServerConfiguration()));
instructionsEditorPane.setCaretPosition(0);
setInstructions(getGeneralInstructions(0));
@@ -181,14 +181,14 @@
}
public void updateInfrastructureEfficiencyLabel() {
- GroupDataModel group = client.getClientDataModel().getGroupDataModel();
- RoundConfiguration roundConfiguration = client.getRoundConfiguration();
+ GroupDataModel group = clientDataModel.getGroupDataModel();
+ RoundConfiguration roundConfiguration = clientDataModel.getRoundConfiguration();
int infrastructureEfficiency = 0;
if (roundConfiguration.isPracticeRound() || roundConfiguration.isFirstRound()) {
infrastructureEfficiency = roundConfiguration.getInitialInfrastructureEfficiency();
}
else {
- System.err.println("group was not null, efficiency is: " + group.getInfrastructureEfficiency() + " degrading by " + client.getRoundConfiguration().getInfrastructureDegradationFactor());
+ System.err.println("group was not null, efficiency is: " + group.getInfrastructureEfficiency() + " degrading by " + clientDataModel.getRoundConfiguration().getInfrastructureDegradationFactor());
infrastructureEfficiency = group.getInfrastructureEfficiency() - roundConfiguration.getInfrastructureDegradationFactor();
}
infrastructureEfficiencyLabel.setText("Current infrastructure efficiency: " + infrastructureEfficiency);
@@ -399,7 +399,7 @@
animationPanel.add(canalAnimationPanel,BorderLayout.CENTER);
animationInstructionsEditorPane = createInstructionsEditorPane();
animationInstructionsScrollPane = new JScrollPane(animationInstructionsEditorPane);
- animationInstructionsEditorPane.setActionListener(createQuizListener(client.getServerConfiguration()));
+ animationInstructionsEditorPane.setActionListener(createQuizListener(clientDataModel.getServerConfiguration()));
animationInstructionsEditorPane.setCaretPosition(0);
animationPanel.add(animationInstructionsScrollPane, BorderLayout.SOUTH);
//setInstructions(getGeneralInstructions(11));
@@ -421,7 +421,8 @@
* @return
*/
private String getGeneralInstructions(int pageNumber, int pagesTraversed) {
- return client.getServerConfiguration().getGeneralInstructions(pageNumber, pagesTraversed, client.getClientDataModel().getPriority());
+
+ return clientDataModel.getServerConfiguration().getGeneralInstructions(pageNumber, pagesTraversed, client.getClientDataModel().getPriority());
}
private String getGeneralInstructions(int pageNumber) {
@@ -623,11 +624,11 @@
allClientData[3].getTotalTokensEarned(),
allClientData[4].getTotalTokensEarned(),
- (float)allClientData[0].getRoundConfiguration().getDollarsPerToken()*allClientData[0].getTotalTokensEarned(),
- (float)allClientData[1].getRoundConfiguration().getDollarsPerToken()*allClientData[1].getTotalTokensEarned(),
- (float)allClientData[2].getRoundConfiguration().getDollarsPerToken()*allClientData[2].getTotalTokensEarned(),
- (float)allClientData[3].getRoundConfiguration().getDollarsPerToken()*allClientData[3].getTotalTokensEarned(),
- (float)allClientData[4].getRoundConfiguration().getDollarsPerToken()*allClientData[4].getTotalTokensEarned()
+ (float)dollarsPerToken*allClientData[0].getTotalTokensEarned(),
+ (float)dollarsPerToken*allClientData[1].getTotalTokensEarned(),
+ (float)dollarsPerToken*allClientData[2].getTotalTokensEarned(),
+ (float)dollarsPerToken*allClientData[3].getTotalTokensEarned(),
+ (float)dollarsPerToken*allClientData[4].getTotalTokensEarned()
/*
event.getClientData().getContributedTokens(),otherClientData.getContributedTokens(),
@@ -647,12 +648,12 @@
(float)dollarsPerToken*clientData.getTotalTokens() + client.getServerConfiguration().getShowUpPayment()
));
//append the added practice round instructions
- if(client.getRoundConfiguration().isPracticeRound()) {
+ if(clientDataModel.getRoundConfiguration().isPracticeRound()) {
instructionsBuilder.append(" However, this is a practice round and the earnings mentioned are only for illustrative purposes " +
"and will not count towards your actual payments");
}
else if (event.isLastRound()) {
- instructionsBuilder.append(client.getServerConfiguration().getFinalInstructions());
+ instructionsBuilder.append(clientDataModel.getServerConfiguration().getFinalInstructions());
}
setInstructions(instructionsBuilder.toString());
}
@@ -669,7 +670,6 @@
});
}
-
private ActionListener createQuizListener(final ServerConfiguration configuration) {
return new ActionListener() {
public void actionPerformed(ActionEvent e){
@@ -816,13 +816,13 @@
+ "\n\nActual total flow capacity: "
+ df.format(clientData.getGroupDataModel().getMaximumAvailableFlowCapacity()) + " cubic feet per second \n\n"
+ "\n\nMaximum tokens that could have been contributed: "
- + client.getRoundConfiguration().getMaximumTotalInvestedTokens()
+ + clientDataModel.getRoundConfiguration().getMaximumTotalInvestedTokens()
+ "\n\nTotal tokens contributed: "
+ totalContributedTokensPerGroup
+ "\n\nYour token contribution: "
+ clientData.getInvestedTokens()
+ "\n\nTotal flow capacity that could have been generated: "
- + client.getRoundConfiguration().getMaximumCanalFlowCapacity()
+ + clientDataModel.getRoundConfiguration().getMaximumCanalFlowCapacity()
+ " cubic feet per second";
@@ -853,7 +853,7 @@
private JPanel getPieChartPanel() {
if (pieChartPanel == null) {
- ClientData clientData = client.getClientDataModel().getClientData();
+ ClientData clientData = clientDataModel.getClientData();
pieChartPanel = new JPanel();
xySeriesDemo = new ChartWindowPanelTokenBandwidth(client);
xySeriesDemo.setVisible(true);
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-16 23:02:53 UTC (rev 299)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/IrrigationClient.java 2009-10-17 22:23:23 UTC (rev 300)
@@ -161,7 +161,7 @@
channel.add(this, new EventTypeProcessor<RegistrationEvent>(RegistrationEvent.class) {
public void handle(RegistrationEvent event) {
RoundConfiguration configuration = event.getRoundConfiguration();
- setRoundConfiguration(configuration);
+ clientDataModel.setRoundConfiguration(configuration);
experimentGameWindow.updateRoundInstructions(configuration);
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
