Menu
▾
▴
[Rails-commits] Branch 'rails2.0' - 9 commits - junit/rails src/rails src/test src/tools
|
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 100644
--- a/src/rails/common/parser/Tag.java
+++ b/src/rails/common/parser/Tag.java
@@ -35,7 +35,7 @@ public class Tag {
private Map<String, String> gameOptions = null;
protected static Logger log =
- LoggerFactory.getLogger(Tag.class.getPackage().getName());
+ LoggerFactory.getLogger(Tag.class);
public Tag(Element element) {
this.element = element;
diff --git a/src/rails/game/Bank.java b/src/rails/game/Bank.java
index 3e9e511..2bb285a 100644
--- a/src/rails/game/Bank.java
+++ b/src/rails/game/Bank.java
@@ -46,7 +46,7 @@ public class Bank extends RailsManager implements MoneyOwner, Configurable {
private final BooleanState broken = BooleanState.create(this, "broken");
protected static Logger log =
- LoggerFactory.getLogger(Bank.class.getPackage().getName());
+ LoggerFactory.getLogger(Bank.class);
/**
* Used by Configure (via reflection) only
diff --git a/src/rails/game/CompanyManager.java b/src/rails/game/CompanyManager.java
index 2d78059..04cf829 100644
--- a/src/rails/game/CompanyManager.java
+++ b/src/rails/game/CompanyManager.java
@@ -57,7 +57,7 @@ public class CompanyManager extends RailsManager implements Configurable {
private int numberOfPublicCompanies = 0;
protected static Logger log =
- LoggerFactory.getLogger(CompanyManager.class.getPackage().getName());
+ LoggerFactory.getLogger(CompanyManager.class);
protected GameManager gameManager;
diff --git a/src/rails/game/GameManager.java b/src/rails/game/GameManager.java
index d1ffe1b..eea5f55 100644
--- a/src/rails/game/GameManager.java
+++ b/src/rails/game/GameManager.java
@@ -215,7 +215,7 @@ public class GameManager extends RailsManager implements Configurable, Owner {
protected Map<String, Integer> storageIds = new HashMap<String, Integer>();
protected static Logger log =
- LoggerFactory.getLogger(GameManager.class.getPackage().getName());
+ LoggerFactory.getLogger(GameManager.class);
public GameManager(RailsRoot parent, String id) {
super(parent, id);
diff --git a/src/rails/game/MapHex.java b/src/rails/game/MapHex.java
index 4e6dd37..b1e2908 100644
--- a/src/rails/game/MapHex.java
+++ b/src/rails/game/MapHex.java
@@ -177,7 +177,7 @@ StationHolder {
protected Score scoreType = null;
protected static Logger log =
- LoggerFactory.getLogger(MapHex.class.getPackage().getName());
+ LoggerFactory.getLogger(MapHex.class);
private MapHex(MapManager parent, String id) {
super(parent, id);
diff --git a/src/rails/game/MapManager.java b/src/rails/game/MapManager.java
index 4a48da4..19a312b 100644
--- a/src/rails/game/MapManager.java
+++ b/src/rails/game/MapManager.java
@@ -61,7 +61,7 @@ public class MapManager extends RailsManager implements Configurable {
protected Map<Type,Score> scoreTypeDefaults = new HashMap<Type, Score>();
protected static Logger log =
- LoggerFactory.getLogger(MapManager.class.getPackage().getName());
+ LoggerFactory.getLogger(MapManager.class);
/**
* Used by Configure (via reflection) only
diff --git a/src/rails/game/Phase.java b/src/rails/game/Phase.java
index a05ceb6..e45bf0c 100644
--- a/src/rails/game/Phase.java
+++ b/src/rails/game/Phase.java
@@ -85,7 +85,7 @@ public class Phase implements Configurable {
protected Map<String, String> parameters = null;
protected static Logger log =
- LoggerFactory.getLogger(Phase.class.getPackage().getName());
+ LoggerFactory.getLogger(Phase.class);
public Phase(int index, String name, Phase previousPhase) {
this.index = index;
diff --git a/src/rails/game/PhaseManager.java b/src/rails/game/PhaseManager.java
index 8d31399..8a5d242 100644
--- a/src/rails/game/PhaseManager.java
+++ b/src/rails/game/PhaseManager.java
@@ -24,7 +24,7 @@ public class PhaseManager extends RailsManager implements Configurable {
protected GameManager gameManager;
protected static Logger log =
- LoggerFactory.getLogger(PhaseManager.class.getPackage().getName());
+ LoggerFactory.getLogger(PhaseManager.class);
/**
diff --git a/src/rails/game/PublicCertificate.java b/src/rails/game/PublicCertificate.java
index efe0af4..c359797 100644
--- a/src/rails/game/PublicCertificate.java
+++ b/src/rails/game/PublicCertificate.java
@@ -47,7 +47,7 @@ public class PublicCertificate extends OwnableItem<PublicCertificate> implements
protected static Logger log =
- LoggerFactory.getLogger(PublicCertificate.class.getPackage().getName());
+ LoggerFactory.getLogger(PublicCertificate.class);
// TODO: Rewrite constructors
// TODO: Should every certificate have its own id and be registered with the parent?
diff --git a/src/rails/game/RailsRoot.java b/src/rails/game/RailsRoot.java
index a66abd8..1fe9e0d 100644
--- a/src/rails/game/RailsRoot.java
+++ b/src/rails/game/RailsRoot.java
@@ -39,7 +39,7 @@ public class RailsRoot extends Root implements RailsItem {
protected Map<String, String> gameOptions;
protected static Logger log =
- LoggerFactory.getLogger(RailsRoot.class.getPackage().getName());
+ LoggerFactory.getLogger(RailsRoot.class);
public RailsRoot(String name, List<String> players, Map<String, String> options) {
super();
diff --git a/src/rails/game/ReportBuffer.java b/src/rails/game/ReportBuffer.java
index 0533cd3..dc63292 100644
--- a/src/rails/game/ReportBuffer.java
+++ b/src/rails/game/ReportBuffer.java
@@ -151,7 +151,7 @@ public final class ReportBuffer {
}
private static Logger log =
- LoggerFactory.getLogger(ReportBuffer.class.getPackage().getName());
+ LoggerFactory.getLogger(ReportBuffer.class);
public ReportBuffer() {
diff --git a/src/rails/game/Round.java b/src/rails/game/Round.java
index 4225b34..0de6aa9 100644
--- a/src/rails/game/Round.java
+++ b/src/rails/game/Round.java
@@ -24,7 +24,7 @@ public abstract class Round extends RailsAbstractItem implements Creatable {
protected GuiHints guiHints = null;
protected static Logger log =
- LoggerFactory.getLogger(Round.class.getPackage().getName());
+ LoggerFactory.getLogger(Round.class);
protected GameManager gameManager = null;
protected CompanyManager companyManager = null;
diff --git a/src/rails/game/StartItem.java b/src/rails/game/StartItem.java
index f2242e4..1f4f38c 100644
--- a/src/rails/game/StartItem.java
+++ b/src/rails/game/StartItem.java
@@ -74,7 +74,7 @@ public class StartItem extends RailsAbstractItem {
protected static Map<String, StartItem> startItemMap;
protected static Logger log =
- LoggerFactory.getLogger(StartItem.class.getPackage().getName());
+ LoggerFactory.getLogger(StartItem.class);
/**
* The constructor, taking the properties of the "primary" (often teh only)
diff --git a/src/rails/game/StartPacket.java b/src/rails/game/StartPacket.java
index 6328096..4f24187 100644
--- a/src/rails/game/StartPacket.java
+++ b/src/rails/game/StartPacket.java
@@ -44,7 +44,7 @@ public class StartPacket extends RailsAbstractItem {
public static final String DEFAULT_ID = "Initial";
protected static Logger log =
- LoggerFactory.getLogger(StartPacket.class.getPackage().getName());
+ LoggerFactory.getLogger(StartPacket.class);
private StartPacket(RailsItem parent, String id, String roundClassName) {
super(parent, Util.hasValue(id) ? id : DEFAULT_ID);
diff --git a/src/rails/game/Station.java b/src/rails/game/Station.java
index 58e220e..8c18504 100644
--- a/src/rails/game/Station.java
+++ b/src/rails/game/Station.java
@@ -48,7 +48,7 @@ public class Station {
private static final List<String> validTypes = Arrays.asList(types);
protected static Logger log =
- LoggerFactory.getLogger(Station.class.getPackage().getName());
+ LoggerFactory.getLogger(Station.class);
/** Check validity of a Station type */
public static boolean isTypeValid(String type) {
diff --git a/src/rails/game/Stop.java b/src/rails/game/Stop.java
index efc1f87..4d3d985 100644
--- a/src/rails/game/Stop.java
+++ b/src/rails/game/Stop.java
@@ -41,7 +41,7 @@ public class Stop extends RailsAbstractItem implements Owner {
private Score scoreType = null;
protected static Logger log =
- LoggerFactory.getLogger(Stop.class.getPackage().getName());
+ LoggerFactory.getLogger(Stop.class);
public enum RunTo {
YES,
diff --git a/src/rails/game/Token.java b/src/rails/game/Token.java
index bac3fa9..6a64ad4 100644
--- a/src/rails/game/Token.java
+++ b/src/rails/game/Token.java
@@ -18,7 +18,7 @@ public abstract class Token<T extends Token<T>> extends OwnableItem<T> implement
protected static String STORAGE_NAME = "Token";
protected static Logger log =
- LoggerFactory.getLogger(Token.class.getPackage().getName());
+ LoggerFactory.getLogger(Token.class);
protected Token(RailsItem parent, String id, Class<T> clazz) {
super(parent, id, clazz);
diff --git a/src/rails/game/TrainCertificateType.java b/src/rails/game/TrainCertificateType.java
index 8875efa..a0ab660 100644
--- a/src/rails/game/TrainCertificateType.java
+++ b/src/rails/game/TrainCertificateType.java
@@ -50,7 +50,7 @@ public class TrainCertificateType extends RailsAbstractItem implements Configura
private final BooleanState rusted = BooleanState.create(this, "rusted");
protected static Logger log =
- LoggerFactory.getLogger(TrainCertificateType.class.getPackage().getName());
+ LoggerFactory.getLogger(TrainCertificateType.class);
private TrainCertificateType (TrainManager parent, String id, int index) {
super(parent, id);
diff --git a/src/rails/game/TrainManager.java b/src/rails/game/TrainManager.java
index 709fbfc..764d96c 100644
--- a/src/rails/game/TrainManager.java
+++ b/src/rails/game/TrainManager.java
@@ -75,7 +75,7 @@ public class TrainManager extends RailsManager implements Configurable {
boolean trainPriceAtFaceValueIfDifferentPresidents = false;
protected static Logger log =
- LoggerFactory.getLogger(TrainManager.class.getPackage().getName());
+ LoggerFactory.getLogger(TrainManager.class);
/**
* Used by Configure (via reflection) only
diff --git a/src/rails/game/TrainType.java b/src/rails/game/TrainType.java
index 183400d..c1a38cc 100644
--- a/src/rails/game/TrainType.java
+++ b/src/rails/game/TrainType.java
@@ -43,7 +43,7 @@ public class TrainType implements Cloneable {
protected String initialPortfolio = "IPO";
protected static Logger log =
- LoggerFactory.getLogger(TrainType.class.getPackage().getName());
+ LoggerFactory.getLogger(TrainType.class);
/**
* @param real False for the default type, else real. The default type does
diff --git a/src/rails/game/action/PossibleAction.java b/src/rails/game/action/PossibleAction.java
index d4a8a69..86aea6c 100644
--- a/src/rails/game/action/PossibleAction.java
+++ b/src/rails/game/action/PossibleAction.java
@@ -32,7 +32,7 @@ public abstract class PossibleAction implements ChangeAction, Serializable {
public static final long serialVersionUID = 3L;
protected static Logger log =
- LoggerFactory.getLogger(PossibleAction.class.getPackage().getName());
+ LoggerFactory.getLogger(PossibleAction.class);
/**
*
diff --git a/src/rails/game/action/PossibleActions.java b/src/rails/game/action/PossibleActions.java
index 040b5b6..3196954 100644
--- a/src/rails/game/action/PossibleActions.java
+++ b/src/rails/game/action/PossibleActions.java
@@ -28,7 +28,7 @@ public class PossibleActions {
private List<PossibleAction> possibleActions;
protected static Logger log =
- LoggerFactory.getLogger(PossibleActions.class.getPackage().getName());
+ LoggerFactory.getLogger(PossibleActions.class);
/**
* This class can only be instantiated locally.
diff --git a/src/rails/game/correct/CorrectionManager.java b/src/rails/game/correct/CorrectionManager.java
index 28a8ffb..a213c74 100644
--- a/src/rails/game/correct/CorrectionManager.java
+++ b/src/rails/game/correct/CorrectionManager.java
@@ -19,7 +19,7 @@ public abstract class CorrectionManager extends RailsAbstractItem {
private final BooleanState active = BooleanState.create(this, "active");
protected static Logger log =
- LoggerFactory.getLogger(CorrectionManager.class.getPackage().getName());
+ LoggerFactory.getLogger(CorrectionManager.class);
protected CorrectionManager(GameManager parent, CorrectionType ct) {
super(parent, ct.name());
diff --git a/src/rails/game/special/SpecialProperty.java b/src/rails/game/special/SpecialProperty.java
index 28ba961..fc33981 100644
--- a/src/rails/game/special/SpecialProperty.java
+++ b/src/rails/game/special/SpecialProperty.java
@@ -69,7 +69,7 @@ public abstract class SpecialProperty extends OwnableItem<SpecialProperty> imple
protected GameManager gameManager;
protected static Logger log =
- LoggerFactory.getLogger(SpecialProperty.class.getPackage().getName());
+ LoggerFactory.getLogger(SpecialProperty.class);
protected SpecialProperty(RailsItem parent, String id) {
super(parent, convertId(id) , SpecialProperty.class);
diff --git a/src/rails/game/specific/_1851/BirminghamTileModifier.java b/src/rails/game/specific/_1851/BirminghamTileModifier.java
index 3b6a973..f0ee812 100644
--- a/src/rails/game/specific/_1851/BirminghamTileModifier.java
+++ b/src/rails/game/specific/_1851/BirminghamTileModifier.java
@@ -16,7 +16,7 @@ import rails.game.MapHex;
public class BirminghamTileModifier implements NetworkGraphModifier {
protected static Logger log =
- LoggerFactory.getLogger(BirminghamTileModifier.class.getPackage().getName());
+ LoggerFactory.getLogger(BirminghamTileModifier.class);
public void modifyGraph(NetworkGraphBuilder graphBuilder) {
diff --git a/src/rails/game/specific/_18EU/OffBoardRevenueModifier.java b/src/rails/game/specific/_18EU/OffBoardRevenueModifier.java
index d651a94..d297269 100644
--- a/src/rails/game/specific/_18EU/OffBoardRevenueModifier.java
+++ b/src/rails/game/specific/_18EU/OffBoardRevenueModifier.java
@@ -18,7 +18,7 @@ import rails.game.Tile;
public class OffBoardRevenueModifier implements RevenueStaticModifier {
protected static Logger log =
- LoggerFactory.getLogger(OffBoardRevenueModifier.class.getPackage().getName());
+ LoggerFactory.getLogger(OffBoardRevenueModifier.class);
public boolean modifyCalculator(RevenueAdapter revenueAdapter) {
diff --git a/src/rails/game/specific/_18Kaas/RuhrRevenueModifier.java b/src/rails/game/specific/_18Kaas/RuhrRevenueModifier.java
index feafa9d..484fb8e 100644
--- a/src/rails/game/specific/_18Kaas/RuhrRevenueModifier.java
+++ b/src/rails/game/specific/_18Kaas/RuhrRevenueModifier.java
@@ -18,7 +18,7 @@ import rails.game.GameManager;
public class RuhrRevenueModifier implements RevenueStaticModifier, Configurable {
protected static Logger log =
- LoggerFactory.getLogger(RuhrRevenueModifier.class.getPackage().getName());
+ LoggerFactory.getLogger(RuhrRevenueModifier.class);
private boolean doublesOnlyMajors;
diff --git a/src/rails/game/state/ChangeStack.java b/src/rails/game/state/ChangeStack.java
index 294ada0..cc804ef 100644
--- a/src/rails/game/state/ChangeStack.java
+++ b/src/rails/game/state/ChangeStack.java
@@ -9,7 +9,7 @@ import org.slf4j.LoggerFactory;
public class ChangeStack {
protected static Logger log =
- LoggerFactory.getLogger(ChangeStack.class.getPackage().getName());
+ LoggerFactory.getLogger(ChangeStack.class);
// static fields
private final LinkedList<ChangeSet> undoStack = new LinkedList<ChangeSet>();
diff --git a/src/rails/game/state/StateManager.java b/src/rails/game/state/StateManager.java
index 958a018..ec20ebb 100644
--- a/src/rails/game/state/StateManager.java
+++ b/src/rails/game/state/StateManager.java
@@ -18,7 +18,7 @@ import com.google.common.collect.Maps;
public final class StateManager extends Manager implements DelayedItem {
protected static Logger log =
- LoggerFactory.getLogger(StateManager.class.getPackage().getName());
+ LoggerFactory.getLogger(StateManager.class);
private final ChangeStack changeStack = ChangeStack.create(this);
private final HashSetState<State> allStates = HashSetState.create(this, null);
diff --git a/src/rails/game/state/TileMove.java b/src/rails/game/state/TileMove.java
index dfec2e8..4c7fb40 100644
--- a/src/rails/game/state/TileMove.java
+++ b/src/rails/game/state/TileMove.java
@@ -22,7 +22,7 @@ import rails.game.*;
public class TileMove {
protected static Logger log =
- LoggerFactory.getLogger(TileMove.class.getPackage().getName());
+ LoggerFactory.getLogger(TileMove.class);
MapHex hex;
Tile oldTile;
diff --git a/src/rails/ui/swing/AutoLoadPoller.java b/src/rails/ui/swing/AutoLoadPoller.java
index b7331e8..c9719a4 100644
--- a/src/rails/ui/swing/AutoLoadPoller.java
+++ b/src/rails/ui/swing/AutoLoadPoller.java
@@ -29,7 +29,7 @@ public class AutoLoadPoller extends Thread {
public static final int SUSPENDED = 2;
protected static Logger log =
- LoggerFactory.getLogger(AutoLoadPoller.class.getPackage().getName());
+ LoggerFactory.getLogger(AutoLoadPoller.class);
public AutoLoadPoller (GameUIManager guiMgr, String saveDirectory, String savePrefix, String ownPostfix,
int status, int pollingInterval) {
diff --git a/src/rails/ui/swing/AutoSaveLoadDialog.java b/src/rails/ui/swing/AutoSaveLoadDialog.java
index 796c5be..1bcba2a 100644
--- a/src/rails/ui/swing/AutoSaveLoadDialog.java
+++ b/src/rails/ui/swing/AutoSaveLoadDialog.java
@@ -34,7 +34,7 @@ public class AutoSaveLoadDialog extends JDialog implements ActionListener {
private static final int NUM_OPTIONS = 3;
protected static Logger log =
- LoggerFactory.getLogger(AutoSaveLoadDialog.class.getPackage().getName());
+ LoggerFactory.getLogger(AutoSaveLoadDialog.class);
public AutoSaveLoadDialog(DialogOwner owner, int oldStatus, int oldInterval) {
super((Frame) null, "AutoSaveLoad settings", false); // Non-modal
diff --git a/src/rails/ui/swing/GameSetupWindow.java b/src/rails/ui/swing/GameSetupWindow.java
index 5a2642d..af5a406 100644
--- a/src/rails/ui/swing/GameSetupWindow.java
+++ b/src/rails/ui/swing/GameSetupWindow.java
@@ -60,7 +60,7 @@ public class GameSetupWindow extends JDialog implements ActionListener {
static final int AI_PLAYER = 2;
protected static Logger log =
- LoggerFactory.getLogger(GameSetupWindow.class.getPackage().getName());
+ LoggerFactory.getLogger(GameSetupWindow.class);
public GameSetupWindow() {
super();
diff --git a/src/rails/ui/swing/GameStatus.java b/src/rails/ui/swing/GameStatus.java
index 3055092..26964f0 100644
--- a/src/rails/ui/swing/GameStatus.java
+++ b/src/rails/ui/swing/GameStatus.java
@@ -119,7 +119,7 @@ public class GameStatus extends GridPanel implements ActionListener {
protected Map<Player, Integer> playerIndex = new HashMap<Player, Integer>();
protected static Logger log =
- LoggerFactory.getLogger(GameStatus.class.getPackage().getName());
+ LoggerFactory.getLogger(GameStatus.class);
public GameStatus() {
super();
diff --git a/src/rails/ui/swing/GameUIManager.java b/src/rails/ui/swing/GameUIManager.java
index e4b5cb1..7eed9f8 100644
--- a/src/rails/ui/swing/GameUIManager.java
+++ b/src/rails/ui/swing/GameUIManager.java
@@ -96,7 +96,7 @@ public class GameUIManager implements DialogOwner {
protected boolean previousResult;
protected static Logger log =
- LoggerFactory.getLogger(GameUIManager.class.getPackage().getName());
+ LoggerFactory.getLogger(GameUIManager.class);
public GameUIManager() {
diff --git a/src/rails/ui/swing/GridPanel.java b/src/rails/ui/swing/GridPanel.java
index 440d9c5..ef52b00 100644
--- a/src/rails/ui/swing/GridPanel.java
+++ b/src/rails/ui/swing/GridPanel.java
@@ -66,7 +66,7 @@ implements ActionListener, KeyListener {
protected List<JMenuItem> menuItemsToReset = new ArrayList<JMenuItem>();
protected static Logger log =
- LoggerFactory.getLogger(GridPanel.class.getPackage().getName());
+ LoggerFactory.getLogger(GridPanel.class);
public void redisplay() {
diff --git a/src/rails/ui/swing/ImageLoader.java b/src/rails/ui/swing/ImageLoader.java
index 073df92..b1229ee 100644
--- a/src/rails/ui/swing/ImageLoader.java
+++ b/src/rails/ui/swing/ImageLoader.java
@@ -40,7 +40,7 @@ public class ImageLoader {
}
private static Logger log =
- LoggerFactory.getLogger(ImageLoader.class.getPackage().getName());
+ LoggerFactory.getLogger(ImageLoader.class);
static {
if (Util.hasValue(tileRootDir) && !tileRootDir.endsWith("/")) {
diff --git a/src/rails/ui/swing/MapPanel.java b/src/rails/ui/swing/MapPanel.java
index d9601a1..0070906 100644
--- a/src/rails/ui/swing/MapPanel.java
+++ b/src/rails/ui/swing/MapPanel.java
@@ -32,7 +32,7 @@ public class MapPanel extends JPanel {
private Dimension currentMapSize;
protected static Logger log =
- LoggerFactory.getLogger(MapPanel.class.getPackage().getName());
+ LoggerFactory.getLogger(MapPanel.class);
public MapPanel(GameUIManager gameUIManager) {
this.gameUIManager = gameUIManager;
diff --git a/src/rails/ui/swing/ORPanel.java b/src/rails/ui/swing/ORPanel.java
index 706fe01..c898170 100644
--- a/src/rails/ui/swing/ORPanel.java
+++ b/src/rails/ui/swing/ORPanel.java
@@ -119,7 +119,7 @@ implements ActionListener, KeyListener, RevenueListener {
private Thread revenueThread = null;
protected static Logger log =
- LoggerFactory.getLogger(ORPanel.class.getPackage().getName());
+ LoggerFactory.getLogger(ORPanel.class);
public ORPanel(ORWindow parent, ORUIManager orUIManager) {
super();
diff --git a/src/rails/ui/swing/ORUIManager.java b/src/rails/ui/swing/ORUIManager.java
index 700f02f..394e050 100644
--- a/src/rails/ui/swing/ORUIManager.java
+++ b/src/rails/ui/swing/ORUIManager.java
@@ -94,7 +94,7 @@ public class ORUIManager implements DialogOwner {
"CorrectMap" };
protected static Logger log =
- LoggerFactory.getLogger(ORUIManager.class.getPackage().getName());
+ LoggerFactory.getLogger(ORUIManager.class);
public ORUIManager() {
diff --git a/src/rails/ui/swing/ORWindow.java b/src/rails/ui/swing/ORWindow.java
index 11fa331..6d204c4 100644
--- a/src/rails/ui/swing/ORWindow.java
+++ b/src/rails/ui/swing/ORWindow.java
@@ -40,7 +40,7 @@ public class ORWindow extends JFrame implements ActionPerformer {
List<LayToken> allowedTokenLays = new ArrayList<LayToken>();
protected static Logger log =
- LoggerFactory.getLogger(ORWindow.class.getPackage().getName());
+ LoggerFactory.getLogger(ORWindow.class);
public ORWindow(GameUIManager gameUIManager) {
super();
diff --git a/src/rails/ui/swing/RemainingTilesWindow.java b/src/rails/ui/swing/RemainingTilesWindow.java
index 9a1bc2e..d5f1e8a 100644
--- a/src/rails/ui/swing/RemainingTilesWindow.java
+++ b/src/rails/ui/swing/RemainingTilesWindow.java
@@ -35,7 +35,7 @@ public class RemainingTilesWindow extends JFrame implements WindowListener,
private final static int COLUMNS = 10;
protected static Logger log =
- LoggerFactory.getLogger(RemainingTilesWindow.class.getPackage().getName());
+ LoggerFactory.getLogger(RemainingTilesWindow.class);
public RemainingTilesWindow(ORWindow orWindow) {
super();
diff --git a/src/rails/ui/swing/ReportWindow.java b/src/rails/ui/swing/ReportWindow.java
index 67ff94d..23fd604 100644
--- a/src/rails/ui/swing/ReportWindow.java
+++ b/src/rails/ui/swing/ReportWindow.java
@@ -50,7 +50,7 @@ public class ReportWindow extends AbstractReportWindow implements ActionListener
protected static final String FIND_PREV_CMD = "FindPrev";
protected static Logger log =
- LoggerFactory.getLogger(ReportWindow.class.getPackage().getName());
+ LoggerFactory.getLogger(ReportWindow.class);
public ReportWindow(GameUIManager gameUIManager) {
diff --git a/src/rails/ui/swing/ReportWindowDynamic.java b/src/rails/ui/swing/ReportWindowDynamic.java
index c6c7916..fb3cbc6 100644
--- a/src/rails/ui/swing/ReportWindowDynamic.java
+++ b/src/rails/ui/swing/ReportWindowDynamic.java
@@ -44,7 +44,7 @@ public class ReportWindowDynamic extends AbstractReportWindow implements Action
private boolean timeWarpMode;
protected static Logger log =
- LoggerFactory.getLogger(ReportWindowDynamic.class.getPackage().getName());
+ LoggerFactory.getLogger(ReportWindowDynamic.class);
public ReportWindowDynamic(GameUIManager gameUIManager) {
super(gameUIManager);
diff --git a/src/rails/ui/swing/StartRoundWindow.java b/src/rails/ui/swing/StartRoundWindow.java
index 546c164..85d9135 100644
--- a/src/rails/ui/swing/StartRoundWindow.java
+++ b/src/rails/ui/swing/StartRoundWindow.java
@@ -105,7 +105,7 @@ public class StartRoundWindow extends JFrame implements ActionListener,
// private boolean repacked = false;
protected static Logger log =
- LoggerFactory.getLogger(StartRoundWindow.class.getPackage().getName());
+ LoggerFactory.getLogger(StartRoundWindow.class);
public StartRoundWindow(StartRound round, GameUIManager parent) {
super();
diff --git a/src/rails/ui/swing/StatusWindow.java b/src/rails/ui/swing/StatusWindow.java
index 350501e..1ff698b 100644
--- a/src/rails/ui/swing/StatusWindow.java
+++ b/src/rails/ui/swing/StatusWindow.java
@@ -88,7 +88,7 @@ public class StatusWindow extends JFrame implements ActionListener,
private ActionMenuItem undoItem, forcedUndoItem, redoItem, redoItem2;
protected static Logger log =
- LoggerFactory.getLogger(StatusWindow.class.getPackage().getName());
+ LoggerFactory.getLogger(StatusWindow.class);
// GraphicsConfiguration graphicsConfiguration;
diff --git a/src/rails/ui/swing/UpgradesPanel.java b/src/rails/ui/swing/UpgradesPanel.java
index 86086d2..f1bc258 100644
--- a/src/rails/ui/swing/UpgradesPanel.java
+++ b/src/rails/ui/swing/UpgradesPanel.java
@@ -49,7 +49,7 @@ public class UpgradesPanel extends Box implements MouseListener, ActionListener
private HexMap hexMap;
protected static Logger log =
- LoggerFactory.getLogger(UpgradesPanel.class.getPackage().getName());
+ LoggerFactory.getLogger(UpgradesPanel.class);
public UpgradesPanel(ORUIManager orUIManager) {
super(BoxLayout.Y_AXIS);
diff --git a/src/rails/ui/swing/WindowSettings.java b/src/rails/ui/swing/WindowSettings.java
index 821a8f7..40fd0e3 100644
--- a/src/rails/ui/swing/WindowSettings.java
+++ b/src/rails/ui/swing/WindowSettings.java
@@ -21,7 +21,7 @@ public class WindowSettings {
private static final String settingsfilename = "settings_xxxx.rails_ini";
protected static Logger log =
- LoggerFactory.getLogger(WindowSettings.class.getPackage().getName());
+ LoggerFactory.getLogger(WindowSettings.class);
public WindowSettings (String gameName) {
String directory = System.getProperty("settings.directory");
diff --git a/src/rails/ui/swing/elements/CheckBoxDialog.java b/src/rails/ui/swing/elements/CheckBoxDialog.java
index 8a625dd..bf66a43 100644
--- a/src/rails/ui/swing/elements/CheckBoxDialog.java
+++ b/src/rails/ui/swing/elements/CheckBoxDialog.java
@@ -34,7 +34,7 @@ public class CheckBoxDialog extends JDialog implements ActionListener {
boolean hasCancelButton = false;
protected static Logger log =
- LoggerFactory.getLogger(CheckBoxDialog.class.getPackage().getName());
+ LoggerFactory.getLogger(CheckBoxDialog.class);
public CheckBoxDialog(DialogOwner owner, JFrame window, String title, String message,
String[] options) {
diff --git a/src/rails/ui/swing/elements/ConfirmationDialog.java b/src/rails/ui/swing/elements/ConfirmationDialog.java
index ff3ac0f..f68b072 100644
--- a/src/rails/ui/swing/elements/ConfirmationDialog.java
+++ b/src/rails/ui/swing/elements/ConfirmationDialog.java
@@ -27,7 +27,7 @@ public class ConfirmationDialog extends JDialog implements ActionListener {
boolean answer = false;
protected static Logger log =
- LoggerFactory.getLogger(ConfirmationDialog.class.getPackage().getName());
+ LoggerFactory.getLogger(ConfirmationDialog.class);
public ConfirmationDialog(DialogOwner owner, String title, String message,
String okText, String cancelText) {
diff --git a/src/rails/ui/swing/elements/GUIStockSpace.java b/src/rails/ui/swing/elements/GUIStockSpace.java
index d1d0ab5..b26d0d3 100644
--- a/src/rails/ui/swing/elements/GUIStockSpace.java
+++ b/src/rails/ui/swing/elements/GUIStockSpace.java
@@ -41,7 +41,7 @@ public class GUIStockSpace extends JLayeredPane implements Observer {
private static final int TOKEN_DIAMETER = 20;
protected static Logger log =
- LoggerFactory.getLogger(GUIStockSpace.class.getPackage().getName());
+ LoggerFactory.getLogger(GUIStockSpace.class);
public GUIStockSpace(int x, int y, StockSpace model) {
diff --git a/src/rails/ui/swing/elements/MessageDialog.java b/src/rails/ui/swing/elements/MessageDialog.java
index 047f4d0..97d5267 100644
--- a/src/rails/ui/swing/elements/MessageDialog.java
+++ b/src/rails/ui/swing/elements/MessageDialog.java
@@ -27,7 +27,7 @@ public class MessageDialog extends JDialog implements ActionListener {
String message;
protected static Logger log =
- LoggerFactory.getLogger(MessageDialog.class.getPackage().getName());
+ LoggerFactory.ge...
[truncated message content] |
