diff --git a/extension-objects/etc/extension_obj.png b/extension-objects/etc/extension_obj.png new file mode 100644 index 000000000..a2b750e9d Binary files /dev/null and b/extension-objects/etc/extension_obj.png differ diff --git a/extension-objects/etc/extension_obj.ucls b/extension-objects/etc/extension_obj.ucls new file mode 100644 index 000000000..9471caa83 --- /dev/null +++ b/extension-objects/etc/extension_obj.ucls @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extension-objects/etc/extension_obj1.png b/extension-objects/etc/extension_obj1.png new file mode 100644 index 000000000..e3115661f Binary files /dev/null and b/extension-objects/etc/extension_obj1.png differ diff --git a/extension-objects/src/main/java/units/CommanderUnit.java b/extension-objects/src/main/java/units/CommanderUnit.java index 67a0f9a06..836d29487 100644 --- a/extension-objects/src/main/java/units/CommanderUnit.java +++ b/extension-objects/src/main/java/units/CommanderUnit.java @@ -9,8 +9,6 @@ import concreteextensions.Commander; */ public class CommanderUnit extends Unit { - private CommanderExtension commanderExtension; - public CommanderUnit(String name) { super(name); } @@ -19,10 +17,10 @@ public class CommanderUnit extends Unit { public UnitExtension getUnitExtension(String extensionName) { if (extensionName.equals("CommanderExtension")) { - if (commanderExtension == null) { - commanderExtension = new Commander(this); + if (unitExtension == null) { + unitExtension = new Commander(this); } - return commanderExtension; + return unitExtension; } return super.getUnitExtension(extensionName); diff --git a/extension-objects/src/main/java/units/SergeantUnit.java b/extension-objects/src/main/java/units/SergeantUnit.java index 3188f7e4e..d1a477ee8 100644 --- a/extension-objects/src/main/java/units/SergeantUnit.java +++ b/extension-objects/src/main/java/units/SergeantUnit.java @@ -9,8 +9,6 @@ import concreteextensions.Sergeant; */ public class SergeantUnit extends Unit { - private SergeantExtension sergeantExtension; - public SergeantUnit(String name) { super(name); } @@ -19,10 +17,10 @@ public class SergeantUnit extends Unit { public UnitExtension getUnitExtension(String extensionName) { if (extensionName.equals("SergeantExtension")) { - if (sergeantExtension == null) { - sergeantExtension = new Sergeant(this); + if (unitExtension == null) { + unitExtension = new Sergeant(this); } - return sergeantExtension; + return unitExtension; } return super.getUnitExtension(extensionName); diff --git a/extension-objects/src/main/java/units/SoldierUnit.java b/extension-objects/src/main/java/units/SoldierUnit.java index f96842465..749e3aa8d 100644 --- a/extension-objects/src/main/java/units/SoldierUnit.java +++ b/extension-objects/src/main/java/units/SoldierUnit.java @@ -9,8 +9,6 @@ import concreteextensions.Soldier; */ public class SoldierUnit extends Unit { - private SoldierExtension soldierExtension; - public SoldierUnit(String name) { super(name); } @@ -19,11 +17,11 @@ public class SoldierUnit extends Unit { public UnitExtension getUnitExtension(String extensionName) { if (extensionName.equals("SoldierExtension")) { - if (soldierExtension == null) { - soldierExtension = new Soldier(this); + if (unitExtension == null) { + unitExtension = new Soldier(this); } - return soldierExtension; + return unitExtension; } return super.getUnitExtension(extensionName); } diff --git a/extension-objects/src/main/java/units/Unit.java b/extension-objects/src/main/java/units/Unit.java index 670c60aa8..d6901ec75 100644 --- a/extension-objects/src/main/java/units/Unit.java +++ b/extension-objects/src/main/java/units/Unit.java @@ -8,6 +8,7 @@ import abstractextensions.UnitExtension; public class Unit { private String name; + protected UnitExtension unitExtension = null; public Unit(String name) { this.name = name; diff --git a/extension-objects/src/test/java/units/UnitTest.java b/extension-objects/src/test/java/units/UnitTest.java index 08fd10d8e..42cb1037f 100644 --- a/extension-objects/src/test/java/units/UnitTest.java +++ b/extension-objects/src/test/java/units/UnitTest.java @@ -11,8 +11,6 @@ import static org.junit.Assert.*; */ public class UnitTest { - private Unit unit; - @Test public void testConstGetSet() throws Exception { final String name = "testName";