From 63ece288e7213f29ceaee8f5d9762b58a2f3dec1 Mon Sep 17 00:00:00 2001 From: Theodore_Lopez Date: Wed, 6 Jan 2016 23:50:56 +0100 Subject: [PATCH] replace all println by logging --- src/artificial_intelligence/AIEntities/AbstractEntity.java | 2 +- src/core/abilities/effects/EffectPackageInitialiser.java | 2 +- src/core/gamestate/GameContent.java | 4 ++-- src/core/gamestate/SpeciesArray.java | 1 - src/core/zone/Circle.java | 2 +- src/gameloop/ServerLoop.java | 1 - .../graphical_utility/GraphicalBridgeConfiguration.java | 3 ++- src/graphics/guiSkeleton/Igniter_Main.java | 3 ++- .../guiSkeleton/guiPanel/menuPanel/MainMenuPanel.java | 3 ++- src/ingame_programming/FollowerBehaviour.java | 7 ++++--- src/ingame_programming/TestIGP.java | 3 ++- src/ingame_programming/Testig.java | 3 ++- src/map_generation/tests/MapGenerationTestMain.java | 1 - src/network/helpers/TestEvent.java | 1 - src/network/junit_tests/ServerConnectionTest.java | 2 +- 15 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/artificial_intelligence/AIEntities/AbstractEntity.java b/src/artificial_intelligence/AIEntities/AbstractEntity.java index 00414f4..1632a6b 100644 --- a/src/artificial_intelligence/AIEntities/AbstractEntity.java +++ b/src/artificial_intelligence/AIEntities/AbstractEntity.java @@ -304,7 +304,7 @@ public abstract class AbstractEntity extends Thread { try{ Thread.sleep(ServerLoop.frame - (ctime - ltime)); }catch(InterruptedException e){ - //System.out.println("got interrupted!"); + //Logging.getInstance().getLogger().info("got interrupted!"); } } } diff --git a/src/core/abilities/effects/EffectPackageInitialiser.java b/src/core/abilities/effects/EffectPackageInitialiser.java index 337e7fb..1dd05e8 100644 --- a/src/core/abilities/effects/EffectPackageInitialiser.java +++ b/src/core/abilities/effects/EffectPackageInitialiser.java @@ -20,7 +20,7 @@ public class EffectPackageInitialiser { Logging.getInstance().getLogger().info("Initialising package effects..."); EffectFactory.getInstance(); for (EffectKey unregisteredEffectKey : EffectFactory.getInstance().checkEffectKeyRegisteringExhaustivity()) { - System.out.println("* Warning: EffectKey not registered in EffectFactory: \"" + unregisteredEffectKey.name() + "\""); + Logging.getInstance().getLogger().info("* Warning: EffectKey not registered in EffectFactory: \"" + unregisteredEffectKey.name() + "\""); } Logging.getInstance().getLogger().info("...package effects initialised"); } diff --git a/src/core/gamestate/GameContent.java b/src/core/gamestate/GameContent.java index fe94eb0..5831c40 100644 --- a/src/core/gamestate/GameContent.java +++ b/src/core/gamestate/GameContent.java @@ -72,7 +72,7 @@ public class GameContent implements Serializable{ Relayer followerRelayer = Relayers.addNewRelayer(follower); AIControler.add(this, followerRelayer, EnumBehaviourType.Follower); } - System.out.println("GameContent class: One gameContent created by"+Thread.currentThread().getId()); + Logging.getInstance().getLogger().info("GameContent class: One gameContent created by"+Thread.currentThread().getId()); Logging.getInstance().getLogger().info("GameContent class: One gameContent created by"+Thread.currentThread().getId()); } @@ -192,7 +192,7 @@ public class GameContent implements Serializable{ for(Character player: players){ player.setXY(posX, posY); } - System.out.println("GameContent class: One gameContent created by"+Thread.currentThread().getId()); + Logging.getInstance().getLogger().info("GameContent class: One gameContent created by"+Thread.currentThread().getId()); Logging.getInstance().getLogger().info("GameContent class: One gameContent created by"+Thread.currentThread().getId()); } diff --git a/src/core/gamestate/SpeciesArray.java b/src/core/gamestate/SpeciesArray.java index 7c5aa40..cde37ed 100644 --- a/src/core/gamestate/SpeciesArray.java +++ b/src/core/gamestate/SpeciesArray.java @@ -120,7 +120,6 @@ public class SpeciesArray { public static void main(String[] args) { System.out.println(array); } - /** * Beware, throw an exception with the given message ! * @param message diff --git a/src/core/zone/Circle.java b/src/core/zone/Circle.java index 8d4cf53..b3ceca1 100644 --- a/src/core/zone/Circle.java +++ b/src/core/zone/Circle.java @@ -215,7 +215,7 @@ public class Circle implements Zone { return "Circle : "+ center.toString() + " Radius:" + radius ; } - + public static void main(String[] args) { Circle c=new Circle(Point.construct(3,3),3); System.out.println(c.getBorderPoint(Direction.LEFT)); diff --git a/src/gameloop/ServerLoop.java b/src/gameloop/ServerLoop.java index 42d1e67..27ce2a7 100644 --- a/src/gameloop/ServerLoop.java +++ b/src/gameloop/ServerLoop.java @@ -124,7 +124,6 @@ public class ServerLoop extends Thread { * */ void executeFrame(GameContent gameContent) throws InterruptedException { while (!(queue.isEmpty()) && queue.peek().getTime() == cframe) { - //System.out.println("Coucou, local execution"); Event event = queue.poll().getEvent(); Event toBeSentToClientsEvent = event.apply(gameContent); networkConnection.sendEvent(toBeSentToClientsEvent); diff --git a/src/graphics/graphical_utility/GraphicalBridgeConfiguration.java b/src/graphics/graphical_utility/GraphicalBridgeConfiguration.java index 5210674..11ec340 100644 --- a/src/graphics/graphical_utility/GraphicalBridgeConfiguration.java +++ b/src/graphics/graphical_utility/GraphicalBridgeConfiguration.java @@ -2,6 +2,7 @@ package graphics.graphical_utility; import core.zone.Point; import graphics.guiSkeleton.mapManagement.GraphicsMapPoint; +import logging.Logging; /** * Created by etouss on 20/12/2015. @@ -26,7 +27,7 @@ public final class GraphicalBridgeConfiguration { //For checking the core2Graphics method public static void main(String[] args){ - System.out.println("DistanceConverterCheck: Input="+50+", Output="+ core2Graphics(50)); + Logging.getInstance().getLogger().info("DistanceConverterCheck: Input="+50+", Output="+ core2Graphics(50)); } /** diff --git a/src/graphics/guiSkeleton/Igniter_Main.java b/src/graphics/guiSkeleton/Igniter_Main.java index 861f261..f20fe2e 100644 --- a/src/graphics/guiSkeleton/Igniter_Main.java +++ b/src/graphics/guiSkeleton/Igniter_Main.java @@ -4,6 +4,7 @@ import core.abilities.AbilityPackageInitialiser; import core.abilities.effects.EffectPackageInitialiser; import gameloop.LocalGameLoop; import graphics.graphical_abstraction.GraphicsMasterAbstraction; +import logging.Logging; /** * Created by dupriez on 10/11/15. @@ -27,7 +28,7 @@ public class Igniter_Main { /** Launch the GUI (and thus the game) **/ GraphicsMaster.build(); GraphicsMasterAbstraction gm = GraphicsMasterAbstraction.getInstance(); - System.out.println("Starting GUI..."); + Logging.getInstance().getLogger().info("Starting GUI..."); gm.launchGUI(); } } diff --git a/src/graphics/guiSkeleton/guiPanel/menuPanel/MainMenuPanel.java b/src/graphics/guiSkeleton/guiPanel/menuPanel/MainMenuPanel.java index 2537d12..7bd9cc2 100644 --- a/src/graphics/guiSkeleton/guiPanel/menuPanel/MainMenuPanel.java +++ b/src/graphics/guiSkeleton/guiPanel/menuPanel/MainMenuPanel.java @@ -7,6 +7,7 @@ import graphics.guiSkeleton.GraphicsMaster; import graphics.guiSkeleton.guiPanel.menuPanel.facilities.ButtonMaker; import graphics.guiSkeleton.guiPanel.menuPanel.facilities.MenuPanel; import graphics.ingame_input_listener.Input; +import logging.Logging; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -86,7 +87,7 @@ public class MainMenuPanel extends MenuPanel implements MainMenuPanelAbstraction @Override public void initialise() { // underlyingMainMenuPanel.setPreferredSize(new Dimension(getSize().width, getSize().height)); -// System.out.println("Dimensions= "+getSize().width+", "+getSize().height); +// Logging.getInstance().getLogger().info"Dimensions= "+getSize().width+", "+getSize().height); // setSize(new Dimension(getSize().width, getSize().height)); } diff --git a/src/ingame_programming/FollowerBehaviour.java b/src/ingame_programming/FollowerBehaviour.java index c974507..f3b2e69 100644 --- a/src/ingame_programming/FollowerBehaviour.java +++ b/src/ingame_programming/FollowerBehaviour.java @@ -3,6 +3,7 @@ package ingame_programming; import java.io.InputStream; import java.util.*; import core.gamestate.GameState; +import logging.Logging; import core.gamestate.Character; /** * This class is used to register data from IGPpanel. @@ -278,13 +279,13 @@ public class FollowerBehaviour { /** A debug fonction that allows to Print the Instructions according to the FollowerBehaviour */ public void PrintElements() { for(int i = 0; i< numberOfRules; i++) { - System.out.println("Instruction number" + i); - System.out.println(" Action :" + actions[i]); + Logging.getInstance().getLogger().info("Instruction number" + i); + Logging.getInstance().getLogger().info(" Action :" + actions[i]); String s = " Target :"; for (String t : targets.get(i)) { s = s + " " + t; } - System.out.println(s); + Logging.getInstance().getLogger().info(s); } } } diff --git a/src/ingame_programming/TestIGP.java b/src/ingame_programming/TestIGP.java index 4498108..7803fc2 100644 --- a/src/ingame_programming/TestIGP.java +++ b/src/ingame_programming/TestIGP.java @@ -1,6 +1,7 @@ package ingame_programming; import graphics.ingame_input_listener.Input; +import logging.Logging; import graphics.guiSkeleton.GUIColorsAndFonts; import graphics.guiSkeleton.GraphicsMaster; import javax.swing.*; @@ -25,7 +26,7 @@ import core.abilities.AbilityKey; public class TestIGP { public static void main(String argv[]) throws ParseException { - System.out.println("Bonjour"); + Logging.getInstance().getLogger().info("Bonjour"); FollowerBehaviour fb = new FollowerBehaviour(4); Script parser = new Script(stringToStream("attaque ennemi (avec PV < 50% et (avec DEF < 50 ou non avec MEN < 50)) ou avec DEF = 50")); ArrayList targett = parser.checkInput(); diff --git a/src/ingame_programming/Testig.java b/src/ingame_programming/Testig.java index 8ff46d8..8d5208d 100644 --- a/src/ingame_programming/Testig.java +++ b/src/ingame_programming/Testig.java @@ -1,6 +1,7 @@ package ingame_programming; import graphics.ingame_input_listener.Input; +import logging.Logging; import graphics.guiSkeleton.GUIColorsAndFonts; import graphics.guiSkeleton.GraphicsMaster; import javax.swing.*; @@ -25,7 +26,7 @@ import core.abilities.AbilityKey; public class Testig { public static void main(String argv[]) throws ParseException { - System.out.println("Bonjour"); + Logging.getInstance().getLogger().info("Bonjour"); Script parser = new Script(stringToStream("attaque ennemi (avec PV < 50% et (avec DEF < 50 ou non possedant potion)) ou avec DEF = 50")); parser.Instruction(); Zone zone = EmptyZone.getEmptyZone(); diff --git a/src/map_generation/tests/MapGenerationTestMain.java b/src/map_generation/tests/MapGenerationTestMain.java index e1c3a18..4ef7bd5 100644 --- a/src/map_generation/tests/MapGenerationTestMain.java +++ b/src/map_generation/tests/MapGenerationTestMain.java @@ -38,7 +38,6 @@ public class MapGenerationTestMain { } System.out.print(s); } - System.out.println(); } } diff --git a/src/network/helpers/TestEvent.java b/src/network/helpers/TestEvent.java index edbcb4d..beaccdd 100644 --- a/src/network/helpers/TestEvent.java +++ b/src/network/helpers/TestEvent.java @@ -17,7 +17,6 @@ public class TestEvent implements Event{ } @Override public boolean execute(GameContent gameContent) { - //System.out.println("TestEvent: Executing vital stuff..."); return true; } diff --git a/src/network/junit_tests/ServerConnectionTest.java b/src/network/junit_tests/ServerConnectionTest.java index ccbf2b8..d875668 100644 --- a/src/network/junit_tests/ServerConnectionTest.java +++ b/src/network/junit_tests/ServerConnectionTest.java @@ -123,7 +123,7 @@ public class ServerConnectionTest{ @Test public void testSendEvents(){ try{ - System.out.println(server); + //System.out.println(server); server.sendEvent(e); ObjectForTest event1 = (ObjectForTest)client1.getInputStream().readObject(); ObjectForTest event2 = (ObjectForTest)client2.getInputStream().readObject(); -- 2.24.1