From: Erik V. <ev...@us...> - 2009-01-15 20:53:36
|
Update of /cvsroot/rails/18xx/rails/game/special In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14080/rails/game/special Modified Files: ExchangeForShare.java Log Message: Fixed code to remove compiler warnings Index: ExchangeForShare.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/special/ExchangeForShare.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ExchangeForShare.java 20 Nov 2008 21:49:38 -0000 1.8 --- ExchangeForShare.java 15 Jan 2009 20:53:28 -0000 1.9 *************** *** 4,10 **** import rails.game.*; import rails.game.move.MoveSet; ! import rails.util.LocalText; ! import rails.util.Tag; ! import rails.util.Util; public class ExchangeForShare extends SpecialProperty { --- 4,8 ---- import rails.game.*; import rails.game.move.MoveSet; ! import rails.util.*; public class ExchangeForShare extends SpecialProperty { *************** *** 16,19 **** --- 14,18 ---- int share; + @Override public void configureFromXML(Tag tag) throws ConfigurationException { *************** *** 77,83 **** if (errMsg != null) { DisplayBuffer.add(LocalText.getText( ! "CannotSwapPrivateForCertificate", new String[] { ! player.getName(), privateCompany.getName(), ! String.valueOf(share), publicCompanyName, errMsg })); return false; } --- 76,85 ---- if (errMsg != null) { DisplayBuffer.add(LocalText.getText( ! "CannotSwapPrivateForCertificate", ! player.getName(), ! privateCompany.getName(), ! share, ! publicCompanyName, ! errMsg )); return false; } *************** *** 92,97 **** cert.moveTo(player.getPortfolio()); ReportBuffer.add(LocalText.getText("SwapsPrivateForCertificate", ! new String[] { player.getName(), privateCompany.getName(), ! String.valueOf(share), publicCompanyName })); setExercised(); privateCompany.setClosed(); --- 94,101 ---- cert.moveTo(player.getPortfolio()); ReportBuffer.add(LocalText.getText("SwapsPrivateForCertificate", ! player.getName(), ! privateCompany.getName(), ! share, ! publicCompanyName )); setExercised(); privateCompany.setClosed(); *************** *** 125,128 **** --- 129,133 ---- } + @Override public String toString() { return "Swap " + privateCompany.getName() + " for " + share *************** *** 130,137 **** } public String toMenu() { ! return LocalText.getText("SwapPrivateForCertificate", new String[] { ! privateCompany.getName(), String.valueOf(share), ! publicCompanyName }); } } --- 135,144 ---- } + @Override public String toMenu() { ! return LocalText.getText("SwapPrivateForCertificate", ! privateCompany.getName(), ! share, ! publicCompanyName ); } } |