Menu
▾
▴
[Simulacion-commits] SF.net SVN: simulacion: [144] examples
|
From: <pg...@us...> - 2007-05-21 09:09:44
|
Revision: 144
http://simulacion.svn.sourceforge.net/simulacion/?rev=144&view=rev
Author: pguyot
Date: 2007-05-21 02:09:42 -0700 (Mon, 21 May 2007)
Log Message:
-----------
Update to new APIs.
Modified Paths:
--------------
examples/simbar/src/fr/lip6/sma/simulacion/simbar/SantaFeBarApplication.java
examples/simbar/src/fr/lip6/sma/simulacion/simbar/SimBarMainWindow.java
examples/simbar3/etc/simbar3.xml
examples/simbar3/src/fr/lip6/sma/simulacion/simbar3/BotRegularApplication.java
examples/simbar3/src/fr/lip6/sma/simulacion/simbar3/SimBarMainWindow.java
examples/simcafe/src/fr/lip6/sma/simulacion/simcafe/BuyerWindow.java
examples/simcafe/src/fr/lip6/sma/simulacion/simcafe/SimCafeMainWindow.java
examples/simcommod/.classpath
examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/ButtonPanel.java
examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/EndResultWindow.java
examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/EnvironmentalistMainWindow.java
examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/GovernmentMIPanel.java
examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/GovernmentMainWindow.java
examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/HarvesterMainWindow.java
examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/InstructionPanel.java
examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/MapInteractionPanel.java
examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/PhasePanel.java
examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/PlayersInfoPanel.java
examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/SimCommodApplicationWindow.java
examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/SimCommodRPPanel.java
examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/SimCommodView.java
examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/WaitWindow.java
Modified: examples/simbar/src/fr/lip6/sma/simulacion/simbar/SantaFeBarApplication.java
===================================================================
--- examples/simbar/src/fr/lip6/sma/simulacion/simbar/SantaFeBarApplication.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simbar/src/fr/lip6/sma/simulacion/simbar/SantaFeBarApplication.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -170,9 +170,9 @@
}
/**
- * Method called at the beginning of the application.
+ * {@inheritDoc}
*/
- protected void init() {
+ protected void init() throws ServerException {
super.init();
// Advertise ourselves on the network.
Modified: examples/simbar/src/fr/lip6/sma/simulacion/simbar/SimBarMainWindow.java
===================================================================
--- examples/simbar/src/fr/lip6/sma/simulacion/simbar/SimBarMainWindow.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simbar/src/fr/lip6/sma/simulacion/simbar/SimBarMainWindow.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -56,6 +56,7 @@
import fr.lip6.sma.simulacion.app.Bundle;
import fr.lip6.sma.simulacion.app.Configuration;
+import fr.lip6.sma.simulacion.app.LocalizationEngine;
import fr.lip6.sma.simulacion.app.map.MapPanel;
import fr.lip6.sma.simulacion.app.map.MapPanelListener;
import fr.lip6.sma.simulacion.avatar.Avatar;
@@ -256,11 +257,12 @@
// R\xE9cup\xE9ration de l'avatar.
mAvatar = inApplication.getAvatar();
- localizeContainer(mVotePanel);
- localizeContainer(mParticipationPanel);
- localizeContainer(mBarStatsPanel);
- localizeContainer(mScorePanel);
- localizeContainer(mSessionWeekPanel);
+ final LocalizationEngine theEngine = getLocalizationEngine();
+ theEngine.localizeContainer(mVotePanel);
+ theEngine.localizeContainer(mParticipationPanel);
+ theEngine.localizeContainer(mBarStatsPanel);
+ theEngine.localizeContainer(mScorePanel);
+ theEngine.localizeContainer(mSessionWeekPanel);
mWeekClip = Bundle.getAudioClip("artwork/sounds/doorbell.au");
@@ -755,27 +757,15 @@
}
/**
- * Ouverture du bar.
+ * Open the bar.
*
- * @param inBarAgent l'agent du bar.
+ * @param inBarAgent the agent for the bar.
*/
public final void openBar(NetworkAgent inBarAgent) {
final NetworkAgent theBarAgentFinal = inBarAgent;
final Runnable openTask = new Runnable() {
public void run() {
- mVoteLayout.add(mVotePanel, BorderLayout.CENTER);
- mBarStatsLayout.add(mBarStatsPanel, BorderLayout.CENTER);
- mParticipationLayout.add(
- mParticipationPanel, BorderLayout.CENTER);
- mScoreLayout.add(mScorePanel, BorderLayout.CENTER);
- mWeekLayout.add(mSessionWeekPanel, BorderLayout.CENTER);
-
- localizeContainer(SimBarMainWindow.this);
-
- mAvatarInterfacePanel.openBar(theBarAgentFinal);
-
- validate();
- repaint();
+ doOpenBar(theBarAgentFinal);
}
};
@@ -788,7 +778,28 @@
// On r\xE9initialise les statistiques.
mGameModel.resetStats();
}
+
+ /**
+ * Actually open the bar.
+ *
+ * @param inBarAgent the agent for the bar.
+ */
+ private void doOpenBar(NetworkAgent inBarAgent) {
+ mVoteLayout.add(mVotePanel, BorderLayout.CENTER);
+ mBarStatsLayout.add(mBarStatsPanel, BorderLayout.CENTER);
+ mParticipationLayout.add(
+ mParticipationPanel, BorderLayout.CENTER);
+ mScoreLayout.add(mScorePanel, BorderLayout.CENTER);
+ mWeekLayout.add(mSessionWeekPanel, BorderLayout.CENTER);
+ getLocalizationEngine().localizeWindow(this);
+
+ mAvatarInterfacePanel.openBar(inBarAgent);
+
+ validate();
+ repaint();
+ }
+
/**
* Fermeture du bar.
*/
Modified: examples/simbar3/etc/simbar3.xml
===================================================================
--- examples/simbar3/etc/simbar3.xml 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simbar3/etc/simbar3.xml 2007-05-21 09:09:42 UTC (rev 144)
@@ -4722,7 +4722,7 @@
<property name="fr.lip6.sma.simulacion.server.http.file" value="/simbar3/"/>
<!-- <property name="fr.lip6.sma.simulacion.server.http.host" value="simulacion.game-host.org"/> -->
<!-- <property name="fr.lip6.sma.simulacion.server.http.host" value="10.0.2.1"/> -->
- <property name="fr.lip6.sma.simulacion.server.http.host" value="localhost"/>
+ <property name="fr.lip6.sma.simulacion.server.http.host" value="10.0.2.1"/>
<property name="fr.lip6.sma.simulacion.server.http.port" value="10001"/>
<!-- <property name="fr.lip6.sma.simulacion.server.http.zeroconf.publish" value="true"/> -->
<property name="fr.lip6.sma.simulacion.server" value="fr.lip6.sma.simulacion.server.http.HTTPClient"/>
Modified: examples/simbar3/src/fr/lip6/sma/simulacion/simbar3/BotRegularApplication.java
===================================================================
--- examples/simbar3/src/fr/lip6/sma/simulacion/simbar3/BotRegularApplication.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simbar3/src/fr/lip6/sma/simulacion/simbar3/BotRegularApplication.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -143,9 +143,9 @@
}
/**
- * Method called to init the application.
+ * {@inheritDoc}
*/
- public void init() {
+ public void init() throws ServerException {
super.init();
// Get the local agent.
Modified: examples/simbar3/src/fr/lip6/sma/simulacion/simbar3/SimBarMainWindow.java
===================================================================
--- examples/simbar3/src/fr/lip6/sma/simulacion/simbar3/SimBarMainWindow.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simbar3/src/fr/lip6/sma/simulacion/simbar3/SimBarMainWindow.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -57,6 +57,7 @@
import fr.lip6.sma.simulacion.app.Bundle;
import fr.lip6.sma.simulacion.app.Configuration;
+import fr.lip6.sma.simulacion.app.LocalizationEngine;
import fr.lip6.sma.simulacion.app.map.MapPanelListener;
import fr.lip6.sma.simulacion.avatar.Avatar;
import fr.lip6.sma.simulacion.avatar.AvatarDialog2D;
@@ -371,10 +372,11 @@
//Get the player avatar.
mAvatar = inApplication.getAvatar();
- localizeContainer(mScorePanel);
- localizeContainer(mTimer);
- localizeContainer(mMapPanel);
- localizeContainer(mVotePanel);
+ final LocalizationEngine theEngine = getLocalizationEngine();
+ theEngine.localizeContainer(mScorePanel);
+ theEngine.localizeContainer(mTimer);
+ theEngine.localizeContainer(mMapPanel);
+ theEngine.localizeContainer(mVotePanel);
mWeekClip = Bundle.getAudioClip(mConfiguration
.getProperty(WEEK_SOUND_PATH));
@@ -760,7 +762,7 @@
mChatInteractionLayout.add(mChatCommandPanel,
BorderLayout.CENTER);
- localizeContainer(SimBarMainWindow.this);
+ getLocalizationEngine().localizeWindow(SimBarMainWindow.this);
validate();
repaint();
@@ -817,7 +819,7 @@
mScoreLayout.add(mScorePanel, BorderLayout.CENTER);
mTimeLayout.add(mTimer, BorderLayout.CENTER);
- localizeContainer(SimBarMainWindow.this);
+ getLocalizationEngine().localizeWindow(SimBarMainWindow.this);
validate();
repaint();
@@ -1003,7 +1005,7 @@
mChatInteractionLayout.remove(mChatCommandPanel);
}
mVotePanel.setupToVote();
- localizeContainer(mVotePanel);
+ getLocalizationEngine().localizeContainer(mVotePanel);
mMapLayout.add(mVotePanel);
validate();
@@ -1089,7 +1091,7 @@
public void run() {
// Composants.
mVotePanel.setupToWait();
- localizeContainer(mVotePanel);
+ getLocalizationEngine().localizeContainer(mVotePanel);
}
};
if (SwingUtilities.isEventDispatchThread()) {
@@ -1105,10 +1107,12 @@
private void showSuggestion() {
if (mSuggestion == SUGGESTED_TO_GO) {
mBubblePanel.showMessage(
- localizeString("I suggest we go to the bar._Key"));
+ getLocalizationEngine()
+ .localizeString("I suggest we go to the bar._Key"));
} else if (mSuggestion == SUGGESTED_TO_STAY_HOME) {
mBubblePanel.showMessage(
- localizeString("I suggest we stay home._Key"));
+ getLocalizationEngine()
+ .localizeString("I suggest we stay home._Key"));
}
}
@@ -1133,7 +1137,8 @@
}
}
- final String finalQuestion = localizeString(theQuestion);
+ final String finalQuestion =
+ getLocalizationEngine().localizeString(theQuestion);
final Map<String, Object> theParams = new Hashtable<String, Object>();
if (inWent) {
theParams.put("vote", "went");
@@ -1167,9 +1172,10 @@
* Introduce ourselves to the player.
*/
private void introduction() {
- final String theIntroductionStr = localizeString(
- "Introduction%%agentname%%_Key")
- .replaceAll("%%agentname%%", mLocalAgent.getAgentName());
+ final String theIntroductionStr =
+ getLocalizationEngine().localizeString(
+ "Introduction%%agentname%%_Key")
+ .replaceAll("%%agentname%%", mLocalAgent.getAgentName());
final Map<String, Object> theParams = new Hashtable<String, Object>();
final Runnable introductionTask = new Runnable() {
@@ -1204,26 +1210,31 @@
String barStateString;
String theReportTemplate;
String incrementString;
+ final LocalizationEngine theEngine = getLocalizationEngine();
if (inScoreIncrement >= 0) {
incrementString = "" + inScoreIncrement;
} else {
- incrementString = localizeString("Report-minus-sign_Key")
+ incrementString = theEngine.localizeString("Report-minus-sign_Key")
+ (0 - inScoreIncrement);
}
if (inBarWasFull) {
- barStateString = localizeString("The bar was full._Key");
+ barStateString = theEngine.localizeString("The bar was full._Key");
if (inTeamBonus != 0) {
- theReportTemplate = localizeString("Report-bonus-full_Key");
+ theReportTemplate =
+ theEngine.localizeString("Report-bonus-full_Key");
} else {
- theReportTemplate = localizeString("Report-nobonus-full_Key");
+ theReportTemplate =
+ theEngine.localizeString("Report-nobonus-full_Key");
}
} else {
- barStateString = localizeString("The bar was not full._Key");
+ barStateString =
+ theEngine.localizeString("The bar was not full._Key");
if (inTeamBonus != 0) {
- theReportTemplate = localizeString("Report-bonus-notfull_Key");
+ theReportTemplate =
+ theEngine.localizeString("Report-bonus-notfull_Key");
} else {
theReportTemplate =
- localizeString("Report-nobonus-notfull_Key");
+ theEngine.localizeString("Report-nobonus-notfull_Key");
}
}
Modified: examples/simcafe/src/fr/lip6/sma/simulacion/simcafe/BuyerWindow.java
===================================================================
--- examples/simcafe/src/fr/lip6/sma/simulacion/simcafe/BuyerWindow.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simcafe/src/fr/lip6/sma/simulacion/simcafe/BuyerWindow.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -489,7 +489,7 @@
mListManager.addListener(this);
// Traduction.
- localizeComponent(this);
+ getLocalizationEngine().localizeWindow(this);
// Redimensionnement de la fen\xEAtre.
pack();
@@ -810,14 +810,14 @@
getApplication().getAvatar(
((Player) mSelectedAgent).getAvatarName()),
(Player) mSelectedAgent);
- localizeComponent(mMoreInfoPanel);
+ getLocalizationEngine().localizeComponent(mMoreInfoPanel);
mMoreInfoLayout.add(mMoreInfoPanel);
mMoreInfoLayout.repaint();
mMoreInfoLayout.invalidate();
mAgentInfoPanel =
new NetworkPlayerInfoPanel((Player) mSelectedAgent);
- localizeComponent(mAgentInfoPanel);
+ getLocalizationEngine().localizeComponent(mAgentInfoPanel);
mPlayerInfoLayout.add(mAgentInfoPanel);
mPlayerInfoLayout.repaint();
mPlayerInfoLayout.invalidate();
Modified: examples/simcafe/src/fr/lip6/sma/simulacion/simcafe/SimCafeMainWindow.java
===================================================================
--- examples/simcafe/src/fr/lip6/sma/simulacion/simcafe/SimCafeMainWindow.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simcafe/src/fr/lip6/sma/simulacion/simcafe/SimCafeMainWindow.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -372,7 +372,7 @@
mListManager.addListener(this);
// Traduction.
- localizeComponent(this);
+ getLocalizationEngine().localizeWindow(this);
// Redimensionnement de la fen\xEAtre.
pack();
@@ -646,7 +646,7 @@
((NetworkPlayer) mSelectedAgent).
getAvatarName()),
(NetworkPlayer) mSelectedAgent);
- localizeComponent(mMoreInfoPanel);
+ getLocalizationEngine().localizeComponent(mMoreInfoPanel);
mMoreInfoLayout.add(mMoreInfoPanel);
mMoreInfoLayout.repaint();
mMoreInfoLayout.invalidate();
Modified: examples/simcommod/.classpath
===================================================================
--- examples/simcommod/.classpath 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simcommod/.classpath 2007-05-21 09:09:42 UTC (rev 144)
@@ -24,7 +24,7 @@
<classpathentry kind="lib" path="simulacion/lib/xml-apis.jar"/>
<classpathentry kind="lib" path="simulacion/lib/xmlParserAPIs.jar"/>
<classpathentry kind="lib" path="simulacion/lib/xmlrpc-2.0.jar"/>
- <classpathentry kind="lib" path="simulacion/simulacion-20070224.jar"/>
+ <classpathentry kind="lib" path="simulacion/simulacion-20070224.jar" sourcepath="/simulacion/src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/ButtonPanel.java
===================================================================
--- examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/ButtonPanel.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/ButtonPanel.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -48,7 +48,7 @@
import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
-import fr.lip6.sma.simulacion.app.LocalizedWindow;
+import fr.lip6.sma.simulacion.app.LocalizationEngine;
import fr.lip6.sma.simulacion.server.Agent;
import fr.lip6.sma.simulacion.server.AgentException;
@@ -78,9 +78,9 @@
private final Set<Agent> mAgentSet;
/**
- * R\xE9f\xE9rence sur la fen\x90tre localis\xE9e
+ * Reference on the engine for the translation.
*/
- private final LocalizedWindow mTranslation;
+ private final LocalizationEngine mLocalizationEngine;
/**
* scrolling sur le commentaire.
@@ -100,16 +100,17 @@
/**
* Constructeur \xE0 partir d'un mod\xE8le.
*
- * @param inModel mod\xE8le pour construire cette vue.
- * @param inWin r\xE9f\xE9rence sur la fen\xEAtre.
- * @param inGrid grille de la carte.
- * @param inAgentSet ensemble des agents.
+ * @param inModel mod\xE8le pour construire cette vue.
+ * @param inLocalizationEngine engine for the translation.
+ * @param inGrid grille de la carte.
+ * @param inAgentSet ensemble des agents.
*/
- public ButtonPanel(SimCommodModel inModel, LocalizedWindow inWin,
+ public ButtonPanel(SimCommodModel inModel,
+ LocalizationEngine inLocalizationEngine,
SimCommodSpatialGrid inGrid, Set<Agent> inAgentSet) {
mModel = inModel;
mAgentSet = inAgentSet;
- mTranslation = inWin;
+ mLocalizationEngine = inLocalizationEngine;
setSize(450, 110);
setLayout(null);
@@ -132,7 +133,8 @@
mTextLabel.setForeground(Color.black);
mTextLabel.setLocation(25, 0);
mTextLabel.setOpaque(false);
- mTextLabel.setText(mTranslation.localizeString("ManagementText_Key"));
+ mTextLabel.setText(
+ mLocalizationEngine.localizeString("ManagementText_Key"));
mTextLabel.setVisible(false);
add(mTextLabel);
@@ -184,7 +186,7 @@
theForegroundColor = Color.black;
}
- mValidate.setText(mTranslation.localizeString(theKey));
+ mValidate.setText(mLocalizationEngine.localizeString(theKey));
mValidate.setForeground(theForegroundColor);
mValidate.repaint();
}
@@ -200,7 +202,7 @@
} else {
if (!mText.getText().equals("")) {
final String theMessage =
- mTranslation.localizeString("ManagementText_Key")
+ mLocalizationEngine.localizeString("ManagementText_Key")
+ mText.getText();
mText.setText("");
// Envoi du message.
Modified: examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/EndResultWindow.java
===================================================================
--- examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/EndResultWindow.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/EndResultWindow.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -49,6 +49,7 @@
import fr.lip6.sma.simulacion.app.Configuration;
import fr.lip6.sma.simulacion.app.GameApplication;
import fr.lip6.sma.simulacion.app.ImagePanel;
+import fr.lip6.sma.simulacion.app.LocalizationEngine;
/**
* Classe pour la fen\xCDtre donnant les scores finaux.
@@ -132,12 +133,14 @@
getContentPane().add(mMainPane, "Center");
setSize(new Dimension(300, 300));
+
+ final LocalizationEngine theEngine = getLocalizationEngine();
// Le nom \xE0 cot\xE9
final JLabel theAvatarLabel = new JLabel();
theAvatarLabel.setSize(80, 18);
theAvatarLabel.setLocation(90, 35);
- theAvatarLabel.setText(localizeString("PlayerName_Key"));
+ theAvatarLabel.setText(theEngine.localizeString("PlayerName_Key"));
theAvatarLabel.setVisible(true);
theAvatarLabel.setFont(new Font("Serif", Font.BOLD, 12));
theAvatarLabel.setHorizontalAlignment(SwingConstants.CENTER);
@@ -148,7 +151,7 @@
final JLabel theMoneyLabel = new JLabel();
theMoneyLabel.setSize(100, 18);
theMoneyLabel.setLocation(160, 35);
- theMoneyLabel.setText(localizeString("Money_Key"));
+ theMoneyLabel.setText(theEngine.localizeString("Money_Key"));
theMoneyLabel.setVisible(true);
theMoneyLabel.setFont(new Font("Serif", Font.BOLD, 12));
theMoneyLabel.setHorizontalAlignment(SwingConstants.CENTER);
Modified: examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/EnvironmentalistMainWindow.java
===================================================================
--- examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/EnvironmentalistMainWindow.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/EnvironmentalistMainWindow.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -54,6 +54,7 @@
import javax.swing.SwingUtilities;
import fr.lip6.sma.simulacion.app.GameController;
+import fr.lip6.sma.simulacion.app.LocalizationEngine;
import fr.lip6.sma.simulacion.avatar.Avatar;
import fr.lip6.sma.simulacion.avatar.AvatarDialog2D;
import fr.lip6.sma.simulacion.avatar.BubblePanel;
@@ -342,22 +343,24 @@
// Vu sur les int\xE9ractions avec la carte.
mIPLayout = new MapInteractionPanel(theModel, getSpatialGridView(),
- getApplication(), this);
+ getApplication(), getLocalizationEngine());
mMapLayout.add(mIPLayout);
mIPLayout.setLocation(250, 75);
final InstructionPanel theInstructionLayout = new InstructionPanel(
- theModel, this);
+ theModel, getLocalizationEngine());
mMapLayout.add(theInstructionLayout);
theInstructionLayout.setLocation(20, 10);
- final ButtonPanel theButtonLayout = new ButtonPanel(theModel, this,
+ final ButtonPanel theButtonLayout =
+ new ButtonPanel(theModel, getLocalizationEngine(),
getSpatialGrid(), getAgentListManager().getAgentSet());
mMapLayout.add(theButtonLayout);
theButtonLayout.setLocation(20, 300);
// Phase de jeu.
- final PhasePanel thePhaseLayout = new PhasePanel(theModel, this);
+ final PhasePanel thePhaseLayout =
+ new PhasePanel(theModel, getLocalizationEngine());
mPhaseLayout.add(thePhaseLayout);
// Temps restant.
@@ -376,7 +379,7 @@
getAgentListManager(),
getNetworkAgents(),
getApplication().getConfiguration(),
- this);
+ getLocalizationEngine());
mPlayersInfoLayout.add(mPlayersInfoPanel);
// Attitude par d\xE9faut de l'avatar.
@@ -560,8 +563,8 @@
SimCommodModel.PHASE_VALIDATION);
theModel.resetTime();
}
- mRPPanel = new SimCommodRPPanel(theModel, this, getSpatialGrid(),
- mLocalAgent);
+ mRPPanel = new SimCommodRPPanel(theModel, getLocalizationEngine(),
+ getSpatialGrid(), mLocalAgent);
mRPPanel.setLocation(0, 0);
mMapLayout2.add(mRPPanel);
mMapLayout2.repaint();
@@ -785,6 +788,8 @@
private void doUpdatePhase() {
final SimCommodModel theModel = getModel();
final int thePhase = theModel.getGamePhase();
+ final LocalizationEngine theEngine = getLocalizationEngine();
+
switch (thePhase) {
case SimCommodModel.PHASE_HARVESTING:
theModel.setGamePhase(SimCommodModel.PHASE_WAIT);
@@ -827,25 +832,26 @@
break;
case SimCommodModel.PHASE_HARVESTINGRESULTS:
- mWaitLabel.setText(localizeString(
+ mWaitLabel.setText(theEngine.localizeString(
"WaitPlayerHarvestingResults_Key"));
endHarvestingResults();
break;
case SimCommodModel.PHASE_PROPELABORATION:
- mWaitLabel.setText(localizeString(
+ mWaitLabel.setText(theEngine.localizeString(
"WaitPlayerPropElaboration_Key"));
validatePropElaboration();
break;
case SimCommodModel.PHASE_VALIDATION:
- mWaitLabel.setText(localizeString(
+ mWaitLabel.setText(theEngine.localizeString(
"WaitPlayerValidation_Key"));
endValidation();
break;
case SimCommodModel.PHASE_RESULT:
- mWaitLabel.setText(localizeString("WaitPlayerResult_Key"));
+ mWaitLabel.setText(theEngine.localizeString(
+ "WaitPlayerResult_Key"));
endResult();
break;
@@ -886,7 +892,9 @@
*/
public void showVoteProposition(List<String> inProposition) {
final StringWriter theWriter = new StringWriter();
- theWriter.write(localizeString("SuggestionTokenDistribution:_Key"));
+ final LocalizationEngine theEngine = getLocalizationEngine();
+ theWriter.write(theEngine.localizeString(
+ "SuggestionTokenDistribution:_Key"));
int theCellID = 1;
boolean first = true;
for (String theVote : inProposition) {
@@ -899,7 +907,8 @@
theWriter.write(" ");
first = false;
}
- final String theXonCellYStr = localizeString("XonCellY_Key");
+ final String theXonCellYStr =
+ theEngine.localizeString("XonCellY_Key");
final String theXonCellYInstance =
MessageFormat.format(
theXonCellYStr, new Object[]
@@ -928,7 +937,7 @@
String inAgentCallbackMethod,
Map<String, Object> inParams) {
mBubblePanel.askQuestion(
- localizeString("WhyProposition?_Key"),
+ getLocalizationEngine().localizeString("WhyProposition?_Key"),
inAgentCallbackMethod,
inParams);
}
Modified: examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/GovernmentMIPanel.java
===================================================================
--- examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/GovernmentMIPanel.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/GovernmentMIPanel.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -51,7 +51,7 @@
import fr.lip6.sma.simulacion.app.Bundle;
import fr.lip6.sma.simulacion.app.Configuration;
import fr.lip6.sma.simulacion.app.ImagePanel;
-import fr.lip6.sma.simulacion.app.LocalizedWindow;
+import fr.lip6.sma.simulacion.app.LocalizationEngine;
import fr.lip6.sma.simulacion.server.Agent;
import fr.lip6.sma.simulacion.server.AgentException;
@@ -124,7 +124,7 @@
/**
* R\xE9f\xE9rence sur la fen\xEAtre localis\xE9e
*/
- private final LocalizedWindow mTranslation;
+ private final LocalizationEngine mLocalizationEngine;
/**
* Permet de savoir si on est dans le premier tour
@@ -148,19 +148,19 @@
* @param inModel mod\xE8le pour construire cette vue.
* @param inMap carte pour qui va \xEAtre mise \xE0 jour.
* @param inConfig configuration du jeu.
- * @param inWin fen\xEAtre pour la traduction.
+ * @param inLocalizationEngine localization engine.
* @param inAgentSet ensemble des agents.
*/
public GovernmentMIPanel(
GovernmentModel inModel,
GovernmentVisuGrid inMap,
Configuration inConfig,
- LocalizedWindow inWin,
+ LocalizationEngine inLocalizationEngine,
Set<Agent> inAgentSet) {
mModel = inModel;
mFirstTurn = true;
mAgentSet = inAgentSet;
- mTranslation = inWin;
+ mLocalizationEngine = inLocalizationEngine;
mConfig = inConfig;
setSize(230, 500);
setLayout(null);
@@ -175,7 +175,7 @@
mInstructionLabel.setWrapStyleWord(true);
mInstructionLabel.setOpaque(false);
mInstructionLabel.setEditable(false);
- mInstructionLabel.setText(mTranslation
+ mInstructionLabel.setText(mLocalizationEngine
.localizeString("GameMasterInstruction_Key"));
add(mInstructionLabel);
@@ -188,7 +188,7 @@
mValidate.setFont(new Font("Serif", Font.BOLD, 12));
mValidate.setForeground(Color.black);
mValidate.addActionListener(this);
- mValidate.setText(mTranslation.localizeString("NextPhase_Key"));
+ mValidate.setText(mLocalizationEngine.localizeString("NextPhase_Key"));
mButton.add(mValidate, BorderLayout.CENTER);
add(mButton);
@@ -210,7 +210,8 @@
mTextLabel.setForeground(Color.black);
mTextLabel.setLocation(0, 150);
mTextLabel.setOpaque(false);
- mTextLabel.setText(mTranslation.localizeString("ManagementText_Key"));
+ mTextLabel.setText(
+ mLocalizationEngine.localizeString("ManagementText_Key"));
mTextLabel.setVisible(false);
add(mTextLabel);
@@ -406,7 +407,8 @@
mInfoPanel.removeAll();
}
if (!mText.getText().equals("")) {
- mModel.setText(mTranslation.localizeString("MessageFrom_Key")
+ mModel.setText(
+ mLocalizationEngine.localizeString("MessageFrom_Key")
+ mText.getText());
}
mText.setText("");
@@ -458,7 +460,7 @@
if (mModel.getGamePhase() == SimCommodModel.PHASE_NEGOTIATION) {
mAgentNbLabel.setText("");
} else {
- mAgentNbLabel.setText(mTranslation
+ mAgentNbLabel.setText(mLocalizationEngine
.localizeString("ReadyPlayersNb:_Key")
+ mModel.countPlayersReady() + "/" + mPlayersNb);
}
@@ -486,18 +488,19 @@
private void doUpdatePhase() {
mValidate.setEnabled(true);
if (mModel.getGamePhase() == SimCommodModel.PHASE_MANAGEMENT) {
- mInstructionLabel.setText(mTranslation
+ mInstructionLabel.setText(mLocalizationEngine
.localizeString("ManagementInstruction_Key"));
mValidate
- .setText(mTranslation.localizeString("Government_Key"));
+ .setText(mLocalizationEngine.localizeString("Government_Key"));
mTextLabel.setVisible(true);
mScrollPane.setVisible(true);
mFirstTurn = false;
} else if (mModel.getGamePhase()
== SimCommodModel.PHASE_HARVESTING) {
- mInstructionLabel.setText(mTranslation
+ mInstructionLabel.setText(mLocalizationEngine
.localizeString("GameMasterInstruction_Key"));
- mValidate.setText(mTranslation.localizeString("NextPhase_Key"));
+ mValidate.setText(
+ mLocalizationEngine.localizeString("NextPhase_Key"));
if (!mFirstTurn) {
mTextLabel.setVisible(false);
mScrollPane.setVisible(false);
@@ -526,7 +529,7 @@
if (mModel.getGamePhase() == SimCommodModel.PHASE_NEGOTIATION) {
mAgentNbLabel.setText("");
} else {
- mAgentNbLabel.setText(mTranslation
+ mAgentNbLabel.setText(mLocalizationEngine
.localizeString("ReadyPlayersNb:_Key")
+ mModel.countPlayersReady() + "/" + mPlayersNb);
}
Modified: examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/GovernmentMainWindow.java
===================================================================
--- examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/GovernmentMainWindow.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/GovernmentMainWindow.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -325,7 +325,8 @@
mWaitLayout.add(mWaitLabel);
// Phase de jeu.
- final PhasePanel thePhaseLayout = new PhasePanel(theModel, this);
+ final PhasePanel thePhaseLayout =
+ new PhasePanel(theModel, getLocalizationEngine());
mMapLayout.add(thePhaseLayout);
// Tour de jeu.
@@ -349,7 +350,7 @@
getAgentListManager(),
mNetworkAgents,
theConfig,
- this);
+ getLocalizationEngine());
mPlayersInfoLayout.add(mPlayersInfoPanel);
mPlayersInfoPanel.updatesPlayers();
@@ -404,7 +405,7 @@
(GovernmentModel) getModel(),
(GovernmentVisuGrid) getSpatialGridView(),
getApplication().getConfiguration(),
- this,
+ getLocalizationEngine(),
getAgentListManager().getAgentSet());
mMapLayout.add(mIPLayout);
mIPLayout.setLocation(124, 62);
@@ -600,7 +601,7 @@
case SimCommodModel.PHASE_WAIT:
if (getModel().getOldPhase()
== SimCommodModel.PHASE_MANAGEMENT) {
- mWaitLabel.setText(localizeString(
+ mWaitLabel.setText(getLocalizationEngine().localizeString(
"WaitPlayerManagement_Key"));
endManagement();
}
Modified: examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/HarvesterMainWindow.java
===================================================================
--- examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/HarvesterMainWindow.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/HarvesterMainWindow.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -53,6 +53,7 @@
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
+import fr.lip6.sma.simulacion.app.LocalizationEngine;
import fr.lip6.sma.simulacion.app.WaitShowing;
import fr.lip6.sma.simulacion.avatar.Avatar;
import fr.lip6.sma.simulacion.avatar.AvatarDialog2D;
@@ -354,24 +355,27 @@
mWaitLabel.setFont(new Font("Serif", Font.BOLD, 20));
mWaitLayout.add(mWaitLabel);
+ final LocalizationEngine theEngine = getLocalizationEngine();
+
// Vue sur les int\xE9ractions avec la carte.
mIPLayout = new MapInteractionPanel(theModel, getSpatialGridView(),
- getApplication(), this);
+ getApplication(), theEngine);
mMapLayout.add(mIPLayout);
mIPLayout.setLocation(250, 75);
final InstructionPanel theInstructionLayout = new InstructionPanel(
- theModel, this);
+ theModel, theEngine);
mMapLayout.add(theInstructionLayout);
theInstructionLayout.setLocation(20, 10);
- final ButtonPanel theButtonLayout = new ButtonPanel(theModel, this,
+ final ButtonPanel theButtonLayout =
+ new ButtonPanel(theModel, theEngine,
getSpatialGrid(), getAgentListManager().getAgentSet());
mMapLayout.add(theButtonLayout);
theButtonLayout.setLocation(20, 300);
// Phase de jeu.
- final PhasePanel thePhaseLayout = new PhasePanel(theModel, this);
+ final PhasePanel thePhaseLayout = new PhasePanel(theModel, theEngine);
mPhaseLayout.add(thePhaseLayout);
// Temps restant.
@@ -394,7 +398,7 @@
getAgentListManager(),
getNetworkAgents(),
getApplication().getConfiguration(),
- this);
+ getLocalizationEngine());
mPlayersInfoLayout.add(mPlayersInfoPanel);
// Attitude par d\xE9faut de l'avatar.
@@ -631,8 +635,8 @@
SimCommodModel.PHASE_VALIDATION);
theModel.resetTime();
}
- mRPPanel = new SimCommodRPPanel(theModel, this, getSpatialGrid(),
- mLocalAgent);
+ mRPPanel = new SimCommodRPPanel(theModel, getLocalizationEngine(),
+ getSpatialGrid(), mLocalAgent);
mRPPanel.setLocation(0, 0);
mMapLayout2.add(mRPPanel);
mMapLayout2.repaint();
@@ -850,6 +854,7 @@
private void updatePhase() {
final SimCommodModel theModel = getModel();
final int thePhase = theModel.getGamePhase();
+ final LocalizationEngine theEngine = getLocalizationEngine();
switch(thePhase) {
case SimCommodModel.PHASE_HARVESTING:
beginHarvesting();
@@ -892,31 +897,32 @@
switch (theModel.getOldPhase()) {
case SimCommodModel.PHASE_HARVESTING:
- mWaitLabel.setText(localizeString(
+ mWaitLabel.setText(theEngine.localizeString(
"WaitPlayerHarvesting_Key"));
validateHarvesting();
break;
case SimCommodModel.PHASE_HARVESTINGRESULTS:
- mWaitLabel.setText(localizeString(
+ mWaitLabel.setText(theEngine.localizeString(
"WaitPlayerHarvestingResults_Key"));
endHarvestingResults();
break;
case SimCommodModel.PHASE_PROPELABORATION:
- mWaitLabel.setText(localizeString(
+ mWaitLabel.setText(theEngine.localizeString(
"WaitPlayerPropElaboration_Key"));
endPropElaboration();
break;
case SimCommodModel.PHASE_VALIDATION:
- mWaitLabel.setText(localizeString(
+ mWaitLabel.setText(theEngine.localizeString(
"WaitPlayerValidation_Key"));
endValidation();
break;
case SimCommodModel.PHASE_RESULT:
- mWaitLabel.setText(localizeString("WaitPlayerResult_Key"));
+ mWaitLabel.setText(theEngine.localizeString(
+ "WaitPlayerResult_Key"));
endResult();
break;
@@ -961,7 +967,9 @@
*/
public void showHarvestingProposition(List<String> inProposition) {
final StringWriter theWriter = new StringWriter();
- theWriter.write(localizeString("SuggestionHarvestingPlan:_Key"));
+ final LocalizationEngine theEngine = getLocalizationEngine();
+ theWriter.write(theEngine.localizeString(
+ "SuggestionHarvestingPlan:_Key"));
theWriter.write(" ");
final Iterator<String> theListIter = inProposition.iterator();
while (theListIter.hasNext()) {
@@ -992,7 +1000,7 @@
String inAgentCallbackMethod,
Map<String, Object> inParams) {
mBubblePanel.askQuestion(
- localizeString("WhyProposition?_Key"),
+ getLocalizationEngine().localizeString("WhyProposition?_Key"),
inAgentCallbackMethod,
inParams);
}
@@ -1001,12 +1009,13 @@
* {@inheritDoc}
*/
public void updateIncome(int inTotalIncome) {
+ final LocalizationEngine theEngine = getLocalizationEngine();
final HarvesterModel theModel = (HarvesterModel) getModel();
mPlayerInfoPanel.updateBudgetText(theModel.getMoney() + "");
theModel.appendToLog(
- "[" + localizeString("Turn_Key")
+ "[" + theEngine.localizeString("Turn_Key")
+ theModel.getTurn() + "] "
- + localizeString("ChangeMoney_Key")
+ + theEngine.localizeString("ChangeMoney_Key")
+ inTotalIncome);
}
}
Modified: examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/InstructionPanel.java
===================================================================
--- examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/InstructionPanel.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/InstructionPanel.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -38,7 +38,7 @@
import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
-import fr.lip6.sma.simulacion.app.LocalizedWindow;
+import fr.lip6.sma.simulacion.app.LocalizationEngine;
/**
* Classe pour la vue sur la phase en cours.
@@ -60,20 +60,21 @@
private JTextArea mInstructionLabel;
/**
- * R\xE9f\xE9rence sur la fen\xEAtre localis\xE9e
+ * Engine for the translation.
*/
- private final LocalizedWindow mTranslation;
+ private final LocalizationEngine mLocalizationEngine;
/**
* Constructeur \xE0 partir d'un mod\xE8le.
*
* @param inModel mod\xE8le pour construire cette vue.
- * @param inWin fen\xEAtre pour les traductions.
+ * @param inLocalizationEngine engine for the translation.
*/
- public InstructionPanel(SimCommodModel inModel, LocalizedWindow inWin) {
+ public InstructionPanel(SimCommodModel inModel,
+ LocalizationEngine inLocalizationEngine) {
mModel = inModel;
- mTranslation = inWin;
+ mLocalizationEngine = inLocalizationEngine;
setSize(450, 60);
setLayout(null);
@@ -130,7 +131,7 @@
theKey = "";
}
- mInstructionLabel.setText(mTranslation.localizeString(theKey));
+ mInstructionLabel.setText(mLocalizationEngine.localizeString(theKey));
}
/**
Modified: examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/MapInteractionPanel.java
===================================================================
--- examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/MapInteractionPanel.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/MapInteractionPanel.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -44,7 +44,7 @@
import fr.lip6.sma.simulacion.app.Application;
import fr.lip6.sma.simulacion.app.Bundle;
import fr.lip6.sma.simulacion.app.ImagePanel;
-import fr.lip6.sma.simulacion.app.LocalizedWindow;
+import fr.lip6.sma.simulacion.app.LocalizationEngine;
/**
* Classe pour la vue permettant les interactions avec la carte.
@@ -89,9 +89,9 @@
private JPanel mInfoPanel;
/**
- * R\xE9f\xE9rence sur la fen\xEAtre localis\xE9e
+ * Engine for the translation.
*/
- private final LocalizedWindow mTranslation;
+ private final LocalizationEngine mLocalizationEngine;
/**
* Constructeur \xE0 partir d'un mod\xE8le.
@@ -99,17 +99,17 @@
* @param inModel mod\xE8le pour construire cette vue.
* @param inMap carte pour qui va \xEAtre mise \xE0 jour.
* @param inApplication application du jeu.
- * @param inWin fen\xEAtre pour la traduction.
+ * @param inLocalizationEngine engine for the translation.
*/
public MapInteractionPanel(
SimCommodModel inModel,
SpatialGridView inMap,
Application inApplication,
- LocalizedWindow inWin) {
+ LocalizationEngine inLocalizationEngine) {
mModel = inModel;
mSpatialGridView = inMap;
- mTranslation = inWin;
+ mLocalizationEngine = inLocalizationEngine;
mApplication = inApplication;
setSize(245, 201);
setLayout(null);
@@ -387,7 +387,7 @@
* Mise \xE0 jour du nombre de jetons utilis\xE9s.
*/
private void doUpdateUsedTokens() {
- mRemainingPoint.setText(mTranslation
+ mRemainingPoint.setText(mLocalizationEngine
.localizeString("RemainingPoint_Key")
+ (mModel.getTotalPoint() - mModel.getUsedPoint()));
}
@@ -424,7 +424,7 @@
mScrollInfo = null;
}
if (thePhase == SimCommodModel.PHASE_PROPELABORATION) {
- mRemainingPoint.setText(mTranslation
+ mRemainingPoint.setText(mLocalizationEngine
.localizeString("RemainingPoint_Key")
+ (mModel.getTotalPoint() - mModel.getUsedPoint()));
add(mRemainingPoint);
Modified: examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/PhasePanel.java
===================================================================
--- examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/PhasePanel.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/PhasePanel.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -38,7 +38,7 @@
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
-import fr.lip6.sma.simulacion.app.LocalizedWindow;
+import fr.lip6.sma.simulacion.app.LocalizationEngine;
import fr.lip6.sma.simulacion.simcommod.agents.Government;
/**
@@ -66,20 +66,21 @@
private final JLabel mSubPhaseLabel;
/**
- * R\xE9f\xE9rence sur la fen\xEAtre localis\xE9e
+ * Engine for the translation.
*/
- private final LocalizedWindow mTranslation;
+ private final LocalizationEngine mLocalizationEngine;
/**
* Constructeur \xE0 partir d'un mod\xE8le.
*
* @param inModel mod\xE8le pour construire cette vue.
- * @param inWin fen\xEAtre pour la traduction.
+ * @param inLocalizationEngine engine for the localization.
*/
- public PhasePanel(SimCommodModel inModel, LocalizedWindow inWin) {
+ public PhasePanel(SimCommodModel inModel,
+ LocalizationEngine inLocalizationEngine) {
mModel = inModel;
- mTranslation = inWin;
+ mLocalizationEngine = inLocalizationEngine;
if (!mModel.getAgentClass().equals(Government.CLASS)) {
setSize(740, 40);
} else {
@@ -126,47 +127,48 @@
final int thePhase = mModel.getGamePhase();
switch (thePhase) {
case SimCommodModel.PHASE_HARVESTING:
- mPhaseLabel.setText(mTranslation
+ mPhaseLabel.setText(mLocalizationEngine
.localizeString("IndividualPhase_Key"));
- mSubPhaseLabel.setText(mTranslation
+ mSubPhaseLabel.setText(mLocalizationEngine
.localizeString("HarvestingPhase_Key"));
break;
case SimCommodModel.PHASE_HARVESTINGRESULTS:
- mPhaseLabel.setText(mTranslation
+ mPhaseLabel.setText(mLocalizationEngine
.localizeString("IndividualPhase_Key"));
- mSubPhaseLabel.setText(mTranslation
+ mSubPhaseLabel.setText(mLocalizationEngine
.localizeString("HarvestingResultsPhase_Key"));
break;
case SimCommodModel.PHASE_PROPELABORATION:
- mPhaseLabel.setText(mTranslation
+ mPhaseLabel.setText(mLocalizationEngine
.localizeString("IndividualPhase_Key"));
- mSubPhaseLabel.setText(mTranslation
+ mSubPhaseLabel.setText(mLocalizationEngine
.localizeString("PropElabPhase_Key"));
break;
case SimCommodModel.PHASE_NEGOTIATION:
- mPhaseLabel.setText(mTranslation
+ mPhaseLabel.setText(mLocalizationEngine
.localizeString("CollectivePhase_Key"));
- mSubPhaseLabel.setText(mTranslation
+ mSubPhaseLabel.setText(mLocalizationEngine
.localizeString("NegotiationPhase_Key"));
break;
case SimCommodModel.PHASE_VALIDATION:
- mPhaseLabel.setText(mTranslation
+ mPhaseLabel.setText(mLocalizationEngine
.localizeString("CollectivePhase_Key"));
- mSubPhaseLabel.setText(mTranslation
+ mSubPhaseLabel.setText(mLocalizationEngine
.localizeString("ValidationPhase_Key"));
break;
case SimCommodModel.PHASE_RESULT:
- mPhaseLabel.setText(mTranslation.localizeString("ResultPhase_Key"));
+ mPhaseLabel.setText(mLocalizationEngine.localizeString(
+ "ResultPhase_Key"));
mSubPhaseLabel.setText("");
break;
case SimCommodModel.PHASE_MANAGEMENT:
- mPhaseLabel.setText(mTranslation
+ mPhaseLabel.setText(mLocalizationEngine
.localizeString("ManagementPhase_Key"));
mSubPhaseLabel.setText("");
break;
Modified: examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/PlayersInfoPanel.java
===================================================================
--- examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/PlayersInfoPanel.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/PlayersInfoPanel.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -54,7 +54,7 @@
import fr.lip6.sma.simulacion.app.Bundle;
import fr.lip6.sma.simulacion.app.Configuration;
import fr.lip6.sma.simulacion.app.ImagePanel;
-import fr.lip6.sma.simulacion.app.LocalizedWindow;
+import fr.lip6.sma.simulacion.app.LocalizationEngine;
import fr.lip6.sma.simulacion.app.MoreSwingUtilities;
import fr.lip6.sma.simulacion.server.Agent;
import fr.lip6.sma.simulacion.server.AgentListManager;
@@ -113,7 +113,7 @@
/**
* Fen\xEAtre pour la traduction.
*/
- private final LocalizedWindow mTranslation;
+ private final LocalizationEngine mLocalizationEngine;
/**
* Si c'est un nouveau joueur.
@@ -142,13 +142,13 @@
* @param inListManager gestionnaire de la liste des agents.
* @param inNetworkAgents agents sur le r\xE9seau.
* @param inConfig configuration du jeu.
- * @param inWin fen\xEAtre pour la traduction.
+ * @param inLocalizationEngine engine for the translation.
*/
public PlayersInfoPanel(SimCommodModel inModel,
AgentListManager inListManager, Map<String, Agent> inNetworkAgents,
- Configuration inConfig, LocalizedWindow inWin) {
+ Configuration inConfig, LocalizationEngine inLocalizationEngine) {
mModel = inModel;
- mTranslation = inWin;
+ mLocalizationEngine = inLocalizationEngine;
mListManager = inListManager;
mNetworkAgents = inNetworkAgents;
mConfig = inConfig;
@@ -320,10 +320,10 @@
theAvatarClass.setSize(100, 18);
theAvatarClass.setLocation(82, indexAgents * 42 + 10);
if (theAgentClass.equals("Harvester")) {
- theAvatarClass.setText(mTranslation
+ theAvatarClass.setText(mLocalizationEngine
.localizeString("Harvester_Key"));
} else {
- theAvatarClass.setText(mTranslation
+ theAvatarClass.setText(mLocalizationEngine
.localizeString("Environmentalist_Key"));
}
theAvatarClass.setVisible(true);
@@ -508,7 +508,7 @@
*/
public void actionPerformed(ActionEvent inEvent) {
if (inEvent.getActionCommand().equals(
- mTranslation.localizeString("SelectAll_Key"))) {
+ mLocalizationEngine.localizeString("SelectAll_Key"))) {
mModel.initSelectedAgent(mListManager.getAgentSet());
} else {
mModel.resetSelectedAgent();
Modified: examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/SimCommodApplicationWindow.java
===================================================================
--- examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/SimCommodApplicationWindow.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/SimCommodApplicationWindow.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -311,6 +311,13 @@
closeMainWindow();
theResultWindow.setVisible(true);
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public String localizeString(String inString) {
+ return getLocalizationEngine().localizeString(inString);
+ }
}
// ========================================================================= //
Modified: examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/SimCommodRPPanel.java
===================================================================
--- examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/SimCommodRPPanel.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/SimCommodRPPanel.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -47,7 +47,7 @@
import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
-import fr.lip6.sma.simulacion.app.LocalizedWindow;
+import fr.lip6.sma.simulacion.app.LocalizationEngine;
import fr.lip6.sma.simulacion.simcommod.agents.SimCommodAgent;
/**
@@ -96,25 +96,25 @@
private final SimCommodAgent mLocalAgent;
/**
- * R\xE9f\xE9rence sur la fen\xEAtre localis\xE9e
+ * Engine for the localization.
*/
- private final LocalizedWindow mTranslation;
+ private final LocalizationEngine mLocalizationEngine;
/**
* Constructeur \xE0 partir d'un mod\xE8le.
*
* @param inModel mod\xE8le pour construire cette vue.
- * @param inWin fen\xEAtre pour la traduction.
+ * @param inLocalizationEngine engine for the localization.
* @param inGrid grille du jeu.
* @param inLocalAgent agent local.
*/
public SimCommodRPPanel(
SimCommodModel inModel,
- LocalizedWindow inWin,
+ LocalizationEngine inLocalizationEngine,
SimCommodSpatialGrid inGrid,
SimCommodAgent inLocalAgent) {
mModel = inModel;
- mTranslation = inWin;
+ mLocalizationEngine = inLocalizationEngine;
setSize(250, 424);
setLayout(null);
mLocalAgent = inLocalAgent;
@@ -129,7 +129,7 @@
mInstructionLabel.setWrapStyleWord(true);
mInstructionLabel.setOpaque(false);
mInstructionLabel.setEditable(false);
- mInstructionLabel.setText(mTranslation
+ mInstructionLabel.setText(mLocalizationEngine
.localizeString("SubMapInstruction_Key"));
add(mInstructionLabel);
@@ -143,7 +143,8 @@
mValidate.setForeground(Color.black);
mValidate.addActionListener(this);
mButton.add(mValidate, BorderLayout.CENTER);
- mValidate.setText(mTranslation.localizeString("UpdateProposition_Key"));
+ mValidate.setText(mLocalizationEngine.localizeString(
+ "UpdateProposition_Key"));
add(mButton);
// Dessin de la carte secondaire.
@@ -158,7 +159,7 @@
mRemainingPoint.setForeground(Color.black);
mRemainingPoint.setOpaque(false);
mRemainingPoint.setLocation(20, 285);
- mRemainingPoint.setText(mTranslation
+ mRemainingPoint.setText(mLocalizationEngine
.localizeString("RemainingPoint_Key")
+ (mModel.getTotalPoint() - mModel.getUsedPoint()));
add(mRemainingPoint);
@@ -174,9 +175,9 @@
* @param inEvent \xE9v\xE9nement du changement.
*/
public void actionPerformed(ActionEvent inEvent) {
- mModel.appendToLog("[" + mTranslation.localizeString("Turn_Key")
+ mModel.appendToLog("[" + mLocalizationEngine.localizeString("Turn_Key")
+ mModel.getTurn() + "] "
- + mTranslation.localizeString("UpdateMap_Key"));
+ + mLocalizationEngine.localizeString("UpdateMap_Key"));
final Map<String, Object> theParams = new Hashtable<String, Object>();
theParams.put("from", mModel.getAgentName());
final List<String> theCellsValues = new Vector<String>();
@@ -202,7 +203,7 @@
SimCommodModel.USEDPOINT_PROPERTY_NAME)) {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
- mRemainingPoint.setText(mTranslation
+ mRemainingPoint.setText(mLocalizationEngine
.localizeString("RemainingPoint_Key")
+ (mModel.getTotalPoint() - mModel.getUsedPoint()));
}
Modified: examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/SimCommodView.java
===================================================================
--- examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/SimCommodView.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/SimCommodView.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -52,14 +52,6 @@
void repaintMap();
/**
- * Localize a string.
- *
- * @param inString string to translate/localize.
- * @return the localized string or inString if no translation is available.
- */
- String localizeString(String inString);
-
- /**
* Close the main window (typically this).
*/
void closeMainWindow();
@@ -68,6 +60,14 @@
* Show the end results.
*/
void showEndResult();
+
+ /**
+ * Localize a string.
+ *
+ * @param inString string to localize.
+ * @return the localized string.
+ */
+ String localizeString(String inString);
}
// ================================================================== //
Modified: examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/WaitWindow.java
===================================================================
--- examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/WaitWindow.java 2007-05-21 09:08:28 UTC (rev 143)
+++ examples/simcommod/src/fr/lip6/sma/simulacion/simcommod/WaitWindow.java 2007-05-21 09:09:42 UTC (rev 144)
@@ -325,15 +325,17 @@
+ "/" + mEnvironmentalistNb);
mHarvesterCountLabel.setText(mModel.getHarvestersCount() + "/"
+ mHarvesterNb);
- mCormasStartedZoneLabel.setText(this
- .localizeString("CormasStarted_Key"));
+ mCormasStartedZoneLabel.setText(
+ getLocalizationEngine().localizeString(
+ "CormasStarted_Key"));
} else {
mEnvironmentalistCountLabel.setText(
mModel.getEnvironmentalistsCount() + "/?");
mHarvesterCountLabel.setText(
mModel.getHarvestersCount() + "/?");
- mCormasStartedZoneLabel.setText(this
- .localizeString("CormasNotStarted_Key"));
+ mCormasStartedZoneLabel.setText(
+ getLocalizationEngine().localizeString(
+ "CormasNotStarted_Key"));
}
repaint();
}
@@ -446,14 +448,15 @@
+ "/" + mEnvironmentalistNb);
mHarvesterCountLabel.setText(mModel.getHarvestersCount() + "/"
+ mHarvesterNb);
- mCormasStartedZoneLabel.setText(this
+ mCormasStartedZoneLabel.setText(
+ getLocalizationEngine()
.localizeString("CormasStarted_Key"));
} else {
mEnvironmentalistCountLabel.setText(
mModel.getEnvironmentalistsCount() + "/?");
mHarvesterCountLabel.setText(
mModel.getHarvestersCount() + "/?");
- mCormasStartedZoneLabel.setText(this
+ mCormasStartedZoneLabel.setText(getLocalizationEngine()
.localizeString("CormasNotStarted_Key"));
}
repaint();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|