From: Erik V. <ev...@us...> - 2010-02-16 20:17:26
|
Update of /cvsroot/rails/18xx/rails/game/correct In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29158/rails/game/correct Modified Files: OperatingCost.java CorrectCash.java Log Message: @Override annotations (added automatically) Index: OperatingCost.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/correct/OperatingCost.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OperatingCost.java 14 Feb 2010 20:48:15 -0000 1.1 --- OperatingCost.java 16 Feb 2010 20:17:09 -0000 1.2 *************** *** 59,63 **** - @Override public boolean isInCorrectionMenu(){ return inCorrectionMenu; --- 59,62 ---- *************** *** 67,81 **** } - @Override public CashHolder getCashHolder() { return operatingCompany; } ! @Override public String getCashHolderName() { return operatingCompanyName; } ! @Override ! public int getAmount() { if (acted) return -operatingCost; --- 66,78 ---- } public CashHolder getCashHolder() { return operatingCompany; } ! public String getCashHolderName() { return operatingCompanyName; } ! public int getAmount() { if (acted) return -operatingCost; *************** *** 83,87 **** return suggestedCost; } ! @Override public void setAmount(int amount) { acted=true; --- 80,84 ---- return suggestedCost; } ! public void setAmount(int amount) { acted=true; Index: CorrectCash.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/correct/CorrectCash.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CorrectCash.java 14 Feb 2010 20:48:15 -0000 1.1 --- CorrectCash.java 16 Feb 2010 20:17:14 -0000 1.2 *************** *** 63,67 **** - @Override public boolean isInCorrectionMenu(){ return inCorrectionMenu; --- 63,66 ---- *************** *** 71,88 **** } - @Override public CashHolder getCashHolder() { return correctCashHolder; } ! @Override public String getCashHolderName() { return cashHolderName; } ! @Override public int getAmount() { return correctAmount; } ! @Override public void setAmount(int amount) { correctAmount = amount; --- 70,86 ---- } public CashHolder getCashHolder() { return correctCashHolder; } ! public String getCashHolderName() { return cashHolderName; } ! public int getAmount() { return correctAmount; } ! public void setAmount(int amount) { correctAmount = amount; |