diff --git a/extension-objects/etc/extension_obj1.png b/extension-objects/etc/extension_obj1.png deleted file mode 100644 index e3115661f..000000000 Binary files a/extension-objects/etc/extension_obj1.png and /dev/null differ diff --git a/extension-objects/src/main/java/App.java b/extension-objects/src/main/java/App.java index af76682b8..6163f0ca2 100644 --- a/extension-objects/src/main/java/App.java +++ b/extension-objects/src/main/java/App.java @@ -5,6 +5,8 @@ import units.CommanderUnit; import units.SergeantUnit; import units.SoldierUnit; import units.Unit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Created by Srdjan on 26-Apr-17. @@ -19,20 +21,19 @@ public class App { public static void main(String[] args) { //Create 3 different units - Unit unit = new SoldierUnit("SoldierUnit1"); - Unit unit1 = new SergeantUnit("SergeantUnit1"); - Unit unit2 = new CommanderUnit("CommanderUnit1"); + Unit soldierUnit = new SoldierUnit("SoldierUnit1"); + Unit sergeantUnit = new SergeantUnit("SergeantUnit1"); + Unit commanderUnit = new CommanderUnit("CommanderUnit1"); //check for each unit to have an extension - checkExtensionsForUnit(unit); - checkExtensionsForUnit(unit1); - checkExtensionsForUnit(unit2); + checkExtensionsForUnit(soldierUnit); + checkExtensionsForUnit(sergeantUnit); + checkExtensionsForUnit(commanderUnit); } private static void checkExtensionsForUnit(Unit unit) { - //separate for better view - System.out.println(); + final Logger logger = LoggerFactory.getLogger(App.class); SoldierExtension soldierExtension = (SoldierExtension) unit.getUnitExtension("SoldierExtension"); SergeantExtension sergeantExtension = (SergeantExtension) unit.getUnitExtension("SergeantExtension"); @@ -42,19 +43,19 @@ public class App { if (soldierExtension != null) { soldierExtension.soldierReady(); } else { - System.out.println(unit.getName() + " without SoldierExtension"); + logger.info(unit.getName() + " without SoldierExtension"); } if (sergeantExtension != null) { sergeantExtension.sergeantReady(); } else { - System.out.println(unit.getName() + " without SergeantExtension"); + logger.info(unit.getName() + " without SergeantExtension"); } if (commanderExtension != null) { commanderExtension.commanderReady(); } else { - System.out.println(unit.getName() + " without CommanderExtension"); + logger.info(unit.getName() + " without CommanderExtension"); } } } diff --git a/extension-objects/src/main/java/concreteextensions/Commander.java b/extension-objects/src/main/java/concreteextensions/Commander.java index 3ce183afb..89720000a 100644 --- a/extension-objects/src/main/java/concreteextensions/Commander.java +++ b/extension-objects/src/main/java/concreteextensions/Commander.java @@ -1,6 +1,8 @@ package concreteextensions; import abstractextensions.CommanderExtension; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import units.CommanderUnit; /** @@ -14,8 +16,10 @@ public class Commander implements CommanderExtension { this.unit = commanderUnit; } + final Logger logger = LoggerFactory.getLogger(Commander.class); + @Override public void commanderReady() { - System.out.println("[Commander] " + unit.getName() + " is ready!"); + logger.info("[Commander] " + unit.getName() + " is ready!"); } } diff --git a/extension-objects/src/main/java/concreteextensions/Sergeant.java b/extension-objects/src/main/java/concreteextensions/Sergeant.java index 499ea4f63..13b641089 100644 --- a/extension-objects/src/main/java/concreteextensions/Sergeant.java +++ b/extension-objects/src/main/java/concreteextensions/Sergeant.java @@ -1,6 +1,8 @@ package concreteextensions; import abstractextensions.SergeantExtension; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import units.SergeantUnit; /** @@ -14,8 +16,10 @@ public class Sergeant implements SergeantExtension { this.unit = sergeantUnit; } + final Logger logger = LoggerFactory.getLogger(Sergeant.class); + @Override public void sergeantReady() { - System.out.println("[Sergeant] " + unit.getName() + " is ready! "); + logger.info("[Sergeant] " + unit.getName() + " is ready! "); } } diff --git a/extension-objects/src/main/java/concreteextensions/Soldier.java b/extension-objects/src/main/java/concreteextensions/Soldier.java index 844abd57a..630fa1a97 100644 --- a/extension-objects/src/main/java/concreteextensions/Soldier.java +++ b/extension-objects/src/main/java/concreteextensions/Soldier.java @@ -1,6 +1,8 @@ package concreteextensions; import abstractextensions.SoldierExtension; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import units.SoldierUnit; /** @@ -14,8 +16,10 @@ public class Soldier implements SoldierExtension { this.unit = soldierUnit; } + final Logger logger = LoggerFactory.getLogger(Soldier.class); + @Override public void soldierReady() { - System.out.println("[Solider] " + unit.getName() + " is ready!"); + logger.info("[Solider] " + unit.getName() + " is ready!"); } }