Menu
▾
▴
rails-commits
|
From: Stefan F. <ste...@us...> - 2012-09-02 06:47:37
|
junit/rails/game/state/ArrayListMultimapStateTest.java | 4
junit/rails/game/state/ArrayListStateTest.java | 3
junit/rails/game/state/BlockingChangeSetTest.java | 71 -
junit/rails/game/state/ChangeStackTest.java | 142 +-
junit/rails/game/state/GameChangeSetTest.java | 68 -
junit/rails/game/state/HashMultimapStateTest.java | 4
junit/rails/game/state/HashSetStateTest.java | 4
junit/rails/game/state/ModelTest.java | 6
junit/rails/game/state/ObservableTest.java | 2
junit/rails/game/state/ObserverTest.java | 6
junit/rails/game/state/PortfolioHolderImpl.java | 17
junit/rails/game/state/PortfolioHolderTest.java | 51
junit/rails/game/state/PortfolioManagerTest.java | 4
junit/rails/game/state/PortfolioMapTest.java | 6
junit/rails/game/state/PortfolioSetTest.java | 2
junit/rails/game/state/StateImpl.java | 2
junit/rails/game/state/StateTest.java | 4
junit/rails/game/state/StateTestUtils.java | 28
junit/rails/game/state/StringStateTest.java | 9
src/rails/algorithms/NetworkCompanyGraph.java | 2
src/rails/algorithms/NetworkEdge.java | 2
src/rails/algorithms/NetworkGraphBuilder.java | 2
src/rails/algorithms/NetworkIterator.java | 2
src/rails/algorithms/NetworkTrain.java | 2
src/rails/algorithms/NetworkVertex.java | 2
src/rails/algorithms/RevenueAdapter.java | 2
src/rails/algorithms/RevenueBonus.java | 2
src/rails/algorithms/RevenueBonusTemplate.java | 4
src/rails/algorithms/RevenueCalculator.java | 2
src/rails/algorithms/RevenueManager.java | 13
src/rails/algorithms/RevenueTrainRun.java | 2
src/rails/common/DisplayBuffer.java | 2
src/rails/common/GuiHints.java | 10
src/rails/common/LocalText.java | 2
src/rails/common/ResourceLoader.java | 564 -----------
src/rails/common/parser/ComponentManager.java | 35
src/rails/common/parser/Config.java | 277 ++---
src/rails/common/parser/ConfigItem.java | 2
src/rails/common/parser/Configurable.java | 37
src/rails/common/parser/Configure.java | 63 +
src/rails/common/parser/GameFileParser.java | 6
src/rails/common/parser/GameInfoParser.java | 15
src/rails/common/parser/Tag.java | 6
src/rails/common/parser/XMLParser.java | 17
src/rails/game/ActionChangeSet.java | 31
src/rails/game/Bank.java | 86 -
src/rails/game/BankPortfolio.java | 8
src/rails/game/BaseToken.java | 12
src/rails/game/BonusToken.java | 10
src/rails/game/Certificate.java | 4
src/rails/game/Company.java | 244 +---
src/rails/game/CompanyManager.java | 12
src/rails/game/CompanyType.java | 10
src/rails/game/Currency.java | 95 +
src/rails/game/GameManager.java | 82 -
src/rails/game/MapHex.java | 12
src/rails/game/MapManager.java | 11
src/rails/game/Money.java | 54 +
src/rails/game/MoneyOwner.java | 12
src/rails/game/OperatingRound.java | 265 ++---
src/rails/game/Phase.java | 4
src/rails/game/PhaseManager.java | 10
src/rails/game/Player.java | 26
src/rails/game/PlayerManager.java | 17
src/rails/game/PrivateCompany.java | 103 +-
src/rails/game/PublicCertificate.java | 41
src/rails/game/PublicCompany.java | 207 ++--
src/rails/game/RailsAbstractItem.java | 24
src/rails/game/RailsItem.java | 38
src/rails/game/RailsManager.java | 18
src/rails/game/RailsRoot.java | 27
src/rails/game/ReportBuffer.java | 9
src/rails/game/Round.java | 52 -
src/rails/game/ShareSellingRound.java | 10
src/rails/game/StartItem.java | 41
src/rails/game/StartPacket.java | 12
src/rails/game/StartRound.java | 14
src/rails/game/StartRound_1830.java | 15
src/rails/game/StartRound_1835.java | 5
src/rails/game/Station.java | 2
src/rails/game/StockMarket.java | 134 --
src/rails/game/StockRound.java | 128 +-
src/rails/game/StockSpace.java | 53 -
src/rails/game/StockSpaceType.java | 12
src/rails/game/Stop.java | 5
src/rails/game/TileManager.java | 21
src/rails/game/Token.java | 17
src/rails/game/Train.java | 61 -
src/rails/game/TrainCertificateType.java | 112 --
src/rails/game/TrainManager.java | 35
src/rails/game/TrainType.java | 5
src/rails/game/TreasuryShareRound.java | 43
src/rails/game/action/BuyCertificate.java | 3
src/rails/game/action/BuyTrain.java | 21
src/rails/game/action/PossibleAction.java | 5
src/rails/game/action/PossibleActions.java | 2
src/rails/game/action/SellShares.java | 2
src/rails/game/action/SetDividend.java | 8
src/rails/game/action/StartCompany.java | 4
src/rails/game/correct/CashCorrectionAction.java | 5
src/rails/game/correct/CashCorrectionManager.java | 27
src/rails/game/correct/CorrectionManager.java | 8
src/rails/game/correct/CorrectionManagerI.java | 19
src/rails/game/correct/CorrectionType.java | 6
src/rails/game/correct/MapCorrectionManager.java | 2
src/rails/game/model/BaseTokensModel.java | 2
src/rails/game/model/BonusModel.java | 17
src/rails/game/model/CalculatedMoneyModel.java | 8
src/rails/game/model/CashMoneyModel.java | 62 -
src/rails/game/model/CashOwner.java | 11
src/rails/game/model/CertificateCountModel.java | 2
src/rails/game/model/CertificatesModel.java | 106 --
src/rails/game/model/CountingMoneyModel.java | 58 +
src/rails/game/model/MoneyModel.java | 49
src/rails/game/model/PortfolioModel.java | 156 +--
src/rails/game/model/PortfolioOwner.java | 4
src/rails/game/model/PresidentModel.java | 2
src/rails/game/model/PriceModel.java | 11
src/rails/game/model/PrivatesModel.java | 15
src/rails/game/model/ShareModel.java | 6
src/rails/game/model/TrainsModel.java | 32
src/rails/game/model/WalletMoneyModel.java | 48
src/rails/game/special/ExchangeForShare.java | 16
src/rails/game/special/LocatedBonus.java | 27
src/rails/game/special/SellBonusToken.java | 20
src/rails/game/special/SpecialProperty.java | 72 +
src/rails/game/special/SpecialRight.java | 40
src/rails/game/special/SpecialTileLay.java | 31
src/rails/game/special/SpecialTokenLay.java | 21
src/rails/game/special/SpecialTrainBuy.java | 13
src/rails/game/specific/_1825/PublicCompany_1825.java | 4
src/rails/game/specific/_1825/StartRound_1825.java | 3
src/rails/game/specific/_1835/FoldIntoPrussian.java | 4
src/rails/game/specific/_1835/GameManager_1835.java | 32
src/rails/game/specific/_1835/OperatingRound_1835.java | 19
src/rails/game/specific/_1835/PrussianFormationRound.java | 22
src/rails/game/specific/_1835/StockRound_1835.java | 4
src/rails/game/specific/_1851/BirminghamTileModifier.java | 2
src/rails/game/specific/_1851/StartRound_1851.java | 3
src/rails/game/specific/_1856/CGRFormationRound.java | 57 -
src/rails/game/specific/_1856/GameManager_1856.java | 4
src/rails/game/specific/_1856/OperatingRound_1856.java | 30
src/rails/game/specific/_1856/PublicCompany_1856.java | 3
src/rails/game/specific/_1856/PublicCompany_CGR.java | 6
src/rails/game/specific/_1856/StockRound_1856.java | 18
src/rails/game/specific/_1880/Investor_1880.java | 4
src/rails/game/specific/_1880/StartRound_1880.java | 14
src/rails/game/specific/_1889/OperatingRound_1889.java | 5
src/rails/game/specific/_18AL/NameTrains.java | 23
src/rails/game/specific/_18AL/NameableTrain.java | 6
src/rails/game/specific/_18AL/NamedTrainRevenueModifier.java | 2
src/rails/game/specific/_18AL/NamedTrainToken.java | 39
src/rails/game/specific/_18AL/OperatingRound_18AL.java | 7
src/rails/game/specific/_18EU/FinalMinorExchangeRound.java | 11
src/rails/game/specific/_18EU/GameManager_18EU.java | 8
src/rails/game/specific/_18EU/OffBoardRevenueModifier.java | 2
src/rails/game/specific/_18EU/OperatingRound_18EU.java | 4
src/rails/game/specific/_18EU/StartRound_18EU.java | 17
src/rails/game/specific/_18EU/StockRound_18EU.java | 97 -
src/rails/game/specific/_18Kaas/RuhrRevenueModifier.java | 4
src/rails/game/specific/_18TN/PublicCompany_18TN.java | 4
src/rails/game/state/AbstractItem.java | 6
src/rails/game/state/ArrayListMultimapState.java | 2
src/rails/game/state/ArrayListState.java | 2
src/rails/game/state/BooleanState.java | 2
src/rails/game/state/Change.java | 2
src/rails/game/state/ChangeAction.java | 9
src/rails/game/state/ChangeSet.java | 35
src/rails/game/state/ChangeStack.java | 189 +--
src/rails/game/state/Configurable.java | 38
src/rails/game/state/Configure.java | 62 -
src/rails/game/state/Countable.java | 20
src/rails/game/state/CountableItem.java | 47
src/rails/game/state/GenericState.java | 2
src/rails/game/state/HashMapState.java | 2
src/rails/game/state/HashMultimapState.java | 2
src/rails/game/state/HashSetState.java | 2
src/rails/game/state/IntegerState.java | 2
src/rails/game/state/Item.java | 5
src/rails/game/state/Manager.java | 4
src/rails/game/state/Model.java | 2
src/rails/game/state/Observable.java | 13
src/rails/game/state/Ownable.java | 8
src/rails/game/state/OwnableItem.java | 31
src/rails/game/state/Owner.java | 4
src/rails/game/state/Portfolio.java | 34
src/rails/game/state/PortfolioChange.java | 39
src/rails/game/state/PortfolioHolder.java | 16
src/rails/game/state/PortfolioManager.java | 7
src/rails/game/state/PortfolioMap.java | 47
src/rails/game/state/PortfolioSet.java | 29
src/rails/game/state/Root.java | 17
src/rails/game/state/StateManager.java | 12
src/rails/game/state/StringState.java | 6
src/rails/game/state/TileMove.java | 2
src/rails/game/state/UnknownOwner.java | 2
src/rails/game/state/Wallet.java | 103 --
src/rails/game/state/WalletBag.java | 46
src/rails/game/state/WalletChange.java | 39
src/rails/game/state/WalletManager.java | 87 +
src/rails/game/state/WalletSet.java | 61 +
src/rails/ui/swing/AutoLoadPoller.java | 2
src/rails/ui/swing/AutoSaveLoadDialog.java | 2
src/rails/ui/swing/GameSetupWindow.java | 2
src/rails/ui/swing/GameStatus.java | 25
src/rails/ui/swing/GameUIManager.java | 8
src/rails/ui/swing/GridPanel.java | 52 -
src/rails/ui/swing/ImageLoader.java | 11
src/rails/ui/swing/MapPanel.java | 2
src/rails/ui/swing/ORPanel.java | 7
src/rails/ui/swing/ORUIManager.java | 37
src/rails/ui/swing/ORWindow.java | 2
src/rails/ui/swing/RemainingTilesWindow.java | 2
src/rails/ui/swing/ReportWindow.java | 2
src/rails/ui/swing/ReportWindowDynamic.java | 5
src/rails/ui/swing/StartRoundWindow.java | 37
src/rails/ui/swing/StatusWindow.java | 6
src/rails/ui/swing/UpgradesPanel.java | 2
src/rails/ui/swing/WindowSettings.java | 2
src/rails/ui/swing/elements/CheckBoxDialog.java | 2
src/rails/ui/swing/elements/ConfirmationDialog.java | 2
src/rails/ui/swing/elements/Field.java | 19
src/rails/ui/swing/elements/GUIStockSpace.java | 2
src/rails/ui/swing/elements/MessageDialog.java | 2
src/rails/ui/swing/elements/RadioButtonDialog.java | 2
src/rails/ui/swing/gamespecific/_1856/StatusWindow_1856.java | 4
src/rails/ui/swing/gamespecific/_18AL/NameTrainsDialog.java | 4
src/rails/ui/swing/hexmap/GUIHex.java | 7
src/rails/ui/swing/hexmap/GUITile.java | 2
src/rails/ui/swing/hexmap/HexMap.java | 2
src/rails/ui/swing/hexmap/HexMapImage.java | 2
src/rails/util/GameFileIO.java | 2
src/rails/util/SequenceUtil.java | 21
src/rails/util/Util.java | 16
src/test/GameTestServlet.java | 12
src/test/TestGame.java | 2
src/tools/ListAndFixSavedFiles.java | 2
src/tools/MakeGameTileSets.java | 12
238 files changed, 2935 insertions(+), 3580 deletions(-)
New commits:
commit 19882bd18f40d7eed10889df287b9cefdc7e7bb2
Author: Stefan Frey <ste...@we...>
Date: Sun Sep 2 08:46:23 2012 +0200
fixed presidency swap problem
diff --git a/src/rails/game/model/PortfolioModel.java b/src/rails/game/model/PortfolioModel.java
index f7a1dcf..5789893 100644
--- a/src/rails/game/model/PortfolioModel.java
+++ b/src/rails/game/model/PortfolioModel.java
@@ -252,38 +252,38 @@ public class PortfolioModel extends Model {
* @param company The company whose Presidency is handed over.
* @param other The new President's portfolio.
* @return The common certificates returned.
+ *
+ * TODO: Rewrite the method replacing PortfolioModel with Owner
*/
public List<PublicCertificate> swapPresidentCertificate(
PublicCompany company, PortfolioModel other) {
// FIXME: Rewrite this parrt
-// List<PublicCertificate> swapped = new ArrayList<PublicCertificate>();
-// PublicCertificate swapCert;
-//
-// // Find the President's certificate
-// PublicCertificate cert = this.findCertificate(company, true);
-// if (cert == null) return null;
-// int shares = cert.getShares();
-//
-// // Check if counterparty has enough single certificates
-// if (other.ownsCertificates(company, 1, false) >= shares) {
-// for (int i = 0; i < shares; i++) {
-// swapCert = other.findCertificate(company, 1, false);
-// certificates.getPortfolio().moveInto(swapCert);
-// swapped.add(swapCert);
-//
-// }
-// } else if (other.ownsCertificates(company, shares, false) >= 1) {
-// swapCert = other.findCertificate(company, 2, false);
-// certificates.getPortfolio().moveInto(swapCert);
-// swapped.add(swapCert);
-// } else {
-// return null;
-// }
-// certificates.getPortfolio().moveInto(cert);
-//
-// return swapped;
- return null;
+ List<PublicCertificate> swapped = new ArrayList<PublicCertificate>();
+ PublicCertificate swapCert;
+
+ // Find the President's certificate
+ PublicCertificate cert = this.findCertificate(company, true);
+ if (cert == null) return null;
+ int shares = cert.getShares();
+
+ // Check if counterparty has enough single certificates
+ if (other.ownsCertificates(company, 1, false) >= shares) {
+ for (int i = 0; i < shares; i++) {
+ swapCert = other.findCertificate(company, 1, false);
+ swapCert.moveTo(getParent());
+ swapped.add(swapCert);
+ }
+ } else if (other.ownsCertificates(company, shares, false) >= 1) {
+ swapCert = other.findCertificate(company, 2, false);
+ swapCert.moveTo(getParent());
+ swapped.add(swapCert);
+ } else {
+ return null;
+ }
+ cert.moveTo(other.getParent());
+
+ return swapped;
}
public void discardTrain(Train train) {
diff --git a/src/rails/ui/swing/elements/Field.java b/src/rails/ui/swing/elements/Field.java
index 38a85a4..eac6099 100644
--- a/src/rails/ui/swing/elements/Field.java
+++ b/src/rails/ui/swing/elements/Field.java
@@ -98,7 +98,7 @@ public class Field extends JLabel implements Observer {
setBackground((Color)vu.getValue(key));
normalBgColour = getBackground();
setForeground (Util.isDark(normalBgColour) ? Color.WHITE : Color.BLACK);
- }
+ }
}
}
*/
commit 993af5ea4a44a80d5df8858c0f947941040a5c78
Author: Stefan Frey <ste...@we...>
Date: Sun Sep 2 07:23:36 2012 +0200
fixed logger method call in many classes
diff --git a/src/rails/algorithms/NetworkCompanyGraph.java b/src/rails/algorithms/NetworkCompanyGraph.java
index f8361ba..26c0c93 100644
--- a/src/rails/algorithms/NetworkCompanyGraph.java
+++ b/src/rails/algorithms/NetworkCompanyGraph.java
@@ -27,7 +27,7 @@ import rails.game.PublicCompany;
*/
public class NetworkCompanyGraph {
protected static Logger log =
- LoggerFactory.getLogger(NetworkCompanyGraph.class.getPackage().getName());
+ LoggerFactory.getLogger(NetworkCompanyGraph.class);
private final NetworkGraphBuilder graphBuilder;
private final PublicCompany company;
diff --git a/src/rails/algorithms/NetworkEdge.java b/src/rails/algorithms/NetworkEdge.java
index 3e88613..2716b7d 100644
--- a/src/rails/algorithms/NetworkEdge.java
+++ b/src/rails/algorithms/NetworkEdge.java
@@ -17,7 +17,7 @@ import rails.ui.swing.hexmap.HexMap;
public final class NetworkEdge implements Comparable<NetworkEdge> {
protected static Logger log =
- LoggerFactory.getLogger(NetworkEdge.class.getPackage().getName());
+ LoggerFactory.getLogger(NetworkEdge.class);
private final NetworkVertex source;
diff --git a/src/rails/algorithms/NetworkGraphBuilder.java b/src/rails/algorithms/NetworkGraphBuilder.java
index 9a98563..6b5af76 100644
--- a/src/rails/algorithms/NetworkGraphBuilder.java
+++ b/src/rails/algorithms/NetworkGraphBuilder.java
@@ -40,7 +40,7 @@ import rails.game.state.Owner;
public final class NetworkGraphBuilder implements Iterable<NetworkVertex> {
protected static Logger log =
- LoggerFactory.getLogger(NetworkGraphBuilder.class.getPackage().getName());
+ LoggerFactory.getLogger(NetworkGraphBuilder.class);
private final SimpleGraph<NetworkVertex, NetworkEdge> mapGraph;
diff --git a/src/rails/algorithms/NetworkIterator.java b/src/rails/algorithms/NetworkIterator.java
index 80f8dfb..7512338 100644
--- a/src/rails/algorithms/NetworkIterator.java
+++ b/src/rails/algorithms/NetworkIterator.java
@@ -37,7 +37,7 @@ public class NetworkIterator extends
private final Graph<NetworkVertex, NetworkEdge> graph;
protected static Logger log =
- LoggerFactory.getLogger(NetworkIterator.class.getPackage().getName());
+ LoggerFactory.getLogger(NetworkIterator.class);
public NetworkIterator(Graph<NetworkVertex, NetworkEdge> graph,
diff --git a/src/rails/algorithms/NetworkTrain.java b/src/rails/algorithms/NetworkTrain.java
index 1858122..a243e0e 100644
--- a/src/rails/algorithms/NetworkTrain.java
+++ b/src/rails/algorithms/NetworkTrain.java
@@ -10,7 +10,7 @@ import rails.game.TrainType;
public final class NetworkTrain implements Comparable<NetworkTrain>{
protected static Logger log =
- LoggerFactory.getLogger(NetworkTrain.class.getPackage().getName());
+ LoggerFactory.getLogger(NetworkTrain.class);
private int majors;
private int minors;
diff --git a/src/rails/algorithms/NetworkVertex.java b/src/rails/algorithms/NetworkVertex.java
index 7c81b76..b2d9aca 100644
--- a/src/rails/algorithms/NetworkVertex.java
+++ b/src/rails/algorithms/NetworkVertex.java
@@ -15,7 +15,7 @@ import rails.ui.swing.hexmap.*;
public final class NetworkVertex implements Comparable<NetworkVertex> {
protected static Logger log =
- LoggerFactory.getLogger(NetworkVertex.class.getPackage().getName());
+ LoggerFactory.getLogger(NetworkVertex.class);
public static enum VertexType {
STATION,
diff --git a/src/rails/algorithms/RevenueAdapter.java b/src/rails/algorithms/RevenueAdapter.java
index bf39b5c..2702796 100644
--- a/src/rails/algorithms/RevenueAdapter.java
+++ b/src/rails/algorithms/RevenueAdapter.java
@@ -37,7 +37,7 @@ import rails.ui.swing.hexmap.HexMap;
public final class RevenueAdapter implements Runnable {
protected static Logger log =
- LoggerFactory.getLogger(RevenueAdapter.class.getPackage().getName());
+ LoggerFactory.getLogger(RevenueAdapter.class);
// define VertexVisitSet
public class VertexVisit {
diff --git a/src/rails/algorithms/RevenueBonus.java b/src/rails/algorithms/RevenueBonus.java
index dbe5738..de0f8b7 100644
--- a/src/rails/algorithms/RevenueBonus.java
+++ b/src/rails/algorithms/RevenueBonus.java
@@ -16,7 +16,7 @@ import rails.game.TrainType;
public final class RevenueBonus {
protected static Logger log =
- LoggerFactory.getLogger(RevenueBonus.class.getPackage().getName());
+ LoggerFactory.getLogger(RevenueBonus.class);
// bonus values
private final int value;
diff --git a/src/rails/algorithms/RevenueBonusTemplate.java b/src/rails/algorithms/RevenueBonusTemplate.java
index 7f67552..b021e8d 100644
--- a/src/rails/algorithms/RevenueBonusTemplate.java
+++ b/src/rails/algorithms/RevenueBonusTemplate.java
@@ -24,7 +24,7 @@ import rails.game.TrainType;
public final class RevenueBonusTemplate implements Configurable {
protected static Logger log =
- LoggerFactory.getLogger(RevenueBonusTemplate.class.getPackage().getName());
+ LoggerFactory.getLogger(RevenueBonusTemplate.class);
// bonus value
private int value;
diff --git a/src/rails/algorithms/RevenueCalculator.java b/src/rails/algorithms/RevenueCalculator.java
index 274ea33..649c577 100644
--- a/src/rails/algorithms/RevenueCalculator.java
+++ b/src/rails/algorithms/RevenueCalculator.java
@@ -99,7 +99,7 @@ abstract class RevenueCalculator {
}
protected static Logger log =
- LoggerFactory.getLogger(RevenueCalculator.class.getPackage().getName());
+ LoggerFactory.getLogger(RevenueCalculator.class);
public RevenueCalculator (RevenueAdapter revenueAdapter, int nbVertexes, int nbEdges,
diff --git a/src/rails/algorithms/RevenueManager.java b/src/rails/algorithms/RevenueManager.java
index c01f29f..886c40c 100644
--- a/src/rails/algorithms/RevenueManager.java
+++ b/src/rails/algorithms/RevenueManager.java
@@ -25,7 +25,7 @@ import rails.game.state.ArrayListState;
public final class RevenueManager extends RailsManager implements Configurable {
protected static Logger log =
- LoggerFactory.getLogger(RevenueManager.class.getPackage().getName());
+ LoggerFactory.getLogger(RevenueManager.class);
private final HashSet<Configurable> configurableModifiers = new HashSet<Configurable>();
diff --git a/src/rails/algorithms/RevenueTrainRun.java b/src/rails/algorithms/RevenueTrainRun.java
index 37c03c7..b87522e 100644
--- a/src/rails/algorithms/RevenueTrainRun.java
+++ b/src/rails/algorithms/RevenueTrainRun.java
@@ -27,7 +27,7 @@ public class RevenueTrainRun implements Comparable<RevenueTrainRun> {
private static final int PRETTY_PRINT_INDENT = 10;
protected static Logger log =
- LoggerFactory.getLogger(RevenueTrainRun.class.getPackage().getName());
+ LoggerFactory.getLogger(RevenueTrainRun.class);
// definitions
private RevenueAdapter revenueAdapter;
diff --git a/src/rails/common/DisplayBuffer.java b/src/rails/common/DisplayBuffer.java
index d68bef3..5eb90c7 100644
--- a/src/rails/common/DisplayBuffer.java
+++ b/src/rails/common/DisplayBuffer.java
@@ -22,7 +22,7 @@ public final class DisplayBuffer {
protected static List<String> initialQueue = new ArrayList<String>();
protected static Logger log =
- LoggerFactory.getLogger(DisplayBuffer.class.getPackage().getName());
+ LoggerFactory.getLogger(DisplayBuffer.class);
public DisplayBuffer() {
if (!initialQueue.isEmpty()) {
diff --git a/src/rails/common/LocalText.java b/src/rails/common/LocalText.java
index 89e183a..551d906 100644
--- a/src/rails/common/LocalText.java
+++ b/src/rails/common/LocalText.java
@@ -28,7 +28,7 @@ public class LocalText extends ResourceBundle {
protected static ResourceBundle localisedText;
protected static Logger log =
- LoggerFactory.getLogger(LocalText.class.getPackage().getName());
+ LoggerFactory.getLogger(LocalText.class);
public static String getText(String key) {
return getText(key, (Object[]) null);
diff --git a/src/rails/common/parser/Config.java b/src/rails/common/parser/Config.java
index 9c5fe78..a713414 100644
--- a/src/rails/common/parser/Config.java
+++ b/src/rails/common/parser/Config.java
@@ -364,7 +364,7 @@ public final class Config {
System.out.println("log4j.configuration = " + log4jSelection);
// delayed setting of logger
- log = LoggerFactory.getLogger(Config.class.getPackage().getName());
+ log = LoggerFactory.getLogger(Config.class);
// define settings for testing
legacyConfigFile = false;
@@ -390,7 +390,7 @@ public final class Config {
System.out.println("log4j.configuration = " + log4jSelection);
// delayed setting of logger
- log = LoggerFactory.getLogger(Config.class.getPackage().getName());
+ log = LoggerFactory.getLogger(Config.class);
/*
* Check if the profile has been set from the command line to do this is
diff --git a/src/rails/common/parser/ConfigItem.java b/src/rails/common/parser/ConfigItem.java
index 11c43e0..2ac323a 100644
--- a/src/rails/common/parser/ConfigItem.java
+++ b/src/rails/common/parser/ConfigItem.java
@@ -16,7 +16,7 @@ import rails.util.Util;
public final class ConfigItem {
protected static Logger log =
- LoggerFactory.getLogger(ConfigItem.class.getPackage().getName());
+ LoggerFactory.getLogger(ConfigItem.class);
/**
* Defines possible types (Java classes used as types in ConfigItem below
diff --git a/src/rails/common/parser/Tag.java b/src/rails/common/parser/Tag.java
index dc0be88..bf096e3 1...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X