Apply design pattern to some classes

src/harenet/BitPacker.java

@@ -530,61 +530,18 @@ public BitPacker pad() {
 
         return this;
     }
-    
+
 
     public static void dumpBytes(byte[] value) {
-        System.out.println("+--------------- ------------- ------- ------ --- -- -- - -- -- --");
-        System.out.println("| Dumping bytes, length: " + (value.length * 8) + " (" + value.length + " byte(s))");
-        System.out.println("+--------------- ------------- ------- ------ --- -- -- - -- -- --");
-
-        int count = 0;
-        for (int j = 0; j < value.length; j++) {
-
-            byte v = value[j];
-
-            for (int i = 0; i < Byte.SIZE; i++) {
-                if (((v >> i) & 1) == 1) {
-                    System.out.print("1");
-                }
-                else {
-                    System.out.print("0");
-                }
-            }
-
-            System.out.print(" ");
-            count++;
-            if (count == 12) {
-                System.out.println();
-                count = 0;
-            }
-
-        }
-        System.out.println();
-        System.out.println("+--------------- ------------- ------- ------ --- -- -- - -- -- --");
+        StatementFactory statementFactory = new StatementFactory();
+        Statement statement = statementFactory.getInstance(value);
+        statement.print();
     }
 
     public void dump() {
-        System.out.println("+--------------- ------------- ------- ------ --- -- -- - -- -- --");
-        System.out.println("| Dumping bitset, length: " + numBits);
-        System.out.println("+--------------- ------------- ------- ------ --- -- -- - -- -- --");
-
-        int count = 0;
-
-        for (int i = 0; i < numBits; i++) {
-            System.out.print(data.getBit(i) ? "1" : "0");
-            if ((i != 0) && (i % 8 == 7)) {
-                System.out.print(" ");
-                count++;
-                if (count == 12) {
-                    System.out.println();
-                    count = 0;
-                }
-
-            }
-
-        }
-        System.out.println();
-        System.out.println("+--------------- ------------- ------- ------ --- -- -- - -- -- --");
+        StatementFactory statementFactory = new StatementFactory();
+        Statement statement = statementFactory.getInstance(numBits,data);
+        statement.print();
     }
 
 }

src/harenet/BitStatement.java

@@ -0,0 +1,27 @@
+package harenet;
+
+public class BitStatement extends Statement {
+    private int numBits;
+    private BitArray data;
+
+    public BitStatement(int number,BitArray bitData) {
+        numBits = number;
+        data = bitData;
+    }
+
+    protected void printHeaderContents() {
+        System.out.println("| Dumping bitset, length: " + numBits);
+    }
+
+    public void printBody() {
+        int count = 0;
+
+        for (int i = 0; i < numBits; i++) {
+            printBit(data.getBit(i));
+            if ((i != 0) && (i % 8 == 7)) {
+                count = countProcess(count);
+            }
+
+        }
+    }
+}

src/harenet/ByteStatement.java

@@ -0,0 +1,28 @@
+package harenet;
+
+public class ByteStatement extends Statement {
+    private byte[] value;
+
+    public ByteStatement(byte[] byteValue) {
+        value = byteValue;
+    }
+
+    protected void printHeaderContents() {
+        System.out.println("| Dumping bytes, length: " + (value.length * 8) + " (" + value.length + " byte(s))");
+    }
+
+    public void printBody() {
+        int count = 0;
+        for (int j = 0; j < value.length; j++) {
+
+            byte v = value[j];
+
+            for (int i = 0; i < Byte.SIZE; i++) {
+                printBit(((v >> i) & 1) == 1);
+            }
+
+            count = countProcess(count);
+
+        }
+    }
+}

src/harenet/Statement.java

@@ -0,0 +1,48 @@
+package harenet;
+
+public abstract class Statement {
+    public void print() {
+        printHeader();
+        printBody();
+        printFooter();
+    }
+
+    public void printHeader() {
+        printLine();
+        printHeaderContents();
+        printLine();
+    }
+
+    public abstract void printBody();
+
+    public void printFooter() {
+        System.out.println();
+        printLine();
+    }
+
+    private void printLine() {
+        System.out.println("+--------------- ------------- ------- ------ --- -- -- - -- -- --");
+    }
+
+    protected abstract void printHeaderContents();
+
+    protected void printBit(boolean isOne) {
+        if (isOne) {
+            System.out.print("1");
+        }
+        else {
+            System.out.print("0");
+        }
+    }
+
+    protected int countProcess(int count) {
+        int tempCount = count;
+        System.out.print(" ");
+        tempCount++;
+        if (tempCount == 12) {
+            System.out.println();
+            tempCount = 0;
+        }
+        return tempCount;
+    }
+}

src/harenet/StatementFactory.java

@@ -0,0 +1,10 @@
+package harenet;
+
+public class StatementFactory {
+    public Statement getInstance(byte[] value) {
+        return new ByteStatement(value);
+    }
+    public Statement getInstance(int numBits, BitArray data) {
+        return new BitStatement(numBits,data);
+    }
+}

src/seventh/ai/basic/DefaultAISystem.java

@@ -19,9 +19,11 @@
 import seventh.ai.basic.commands.AICommands;
 import seventh.ai.basic.teamstrategy.CaptureTheFlagTeamStrategy;
 import seventh.ai.basic.teamstrategy.CommanderTeamStrategy;
+import seventh.ai.basic.teamstrategy.DefaultAISystemTeamStrategyFactory;
 import seventh.ai.basic.teamstrategy.ObjectiveTeamStrategy;
 import seventh.ai.basic.teamstrategy.TDMTeamStrategy;
 import seventh.ai.basic.teamstrategy.TeamStrategy;
+import seventh.ai.basic.teamstrategy.TeamStrategyFactory;
 import seventh.game.GameInfo;
 import seventh.game.PlayerInfo;
 import seventh.game.PlayerInfos;
@@ -169,27 +171,9 @@ public void init(final GameInfo game) {
 
         GameType gameType = game.getGameType();
 
-        switch(gameType.getType()) {
-            case CTF:
-                this.alliedAIStrategy = new CaptureTheFlagTeamStrategy(this, gameType.getAlliedTeam());
-                this.axisAIStrategy = new CaptureTheFlagTeamStrategy(this, gameType.getAxisTeam());
-                break;
-            case OBJ:
-                this.alliedAIStrategy = new ObjectiveTeamStrategy(this, gameType.getAlliedTeam());
-                this.axisAIStrategy = new ObjectiveTeamStrategy(this, gameType.getAxisTeam());
-                break;
-            case CMD: 
-                this.alliedAIStrategy = new CommanderTeamStrategy((CommanderGameType)gameType, this, gameType.getAlliedTeam());
-                this.axisAIStrategy = new CommanderTeamStrategy((CommanderGameType)gameType, this, gameType.getAxisTeam());
-                break;
-            case TDM:
-            default:
-                this.alliedAIStrategy = new TDMTeamStrategy(this, gameType.getAlliedTeam());
-                this.axisAIStrategy = new TDMTeamStrategy(this, gameType.getAxisTeam());
-                break;
-
-        }
-
+        TeamStrategyFactory teamStrategyFactory = new DefaultAISystemTeamStrategyFactory();
+        this.alliedAIStrategy = teamStrategyFactory.createAlliedAIStrategy(this, gameType);
+        this.axisAIStrategy = teamStrategyFactory.createAxisAIStrategy(this, gameType);
 
         PlayerInfos players = game.getPlayerInfos();
         players.forEachPlayerInfo(new PlayerInfoIterator() {

src/seventh/ai/basic/FeelSensor.java

@@ -21,7 +21,7 @@ public class FeelSensor implements Sensor, OnDamageListener {
     private FeelMemory memory;
     private TimeStep timeStep;
     private Brain brain;
-
+     
     /**
      * @param brain
      */

src/seventh/ai/basic/SensorFactory.java

@@ -0,0 +1,42 @@
+package seventh.ai.basic;
+
+import seventh.shared.TimeStep;
+
+public class SensorFactory {
+
+    protected SightSensor sightSensor;
+    protected SoundSensor soundSensor;
+    protected FeelSensor feelSensor;
+
+    public SensorFactory(Brain brain){
+        this.sightSensor = new SightSensor(brain);
+        this.soundSensor = new SoundSensor(brain);
+        this.feelSensor = new FeelSensor(brain);
+    }
+
+    public FeelSensor getFeelSensor() {
+        return feelSensor;
+    }
+
+    public SightSensor getSightSensor() {
+        return sightSensor;
+    }
+
+    public SoundSensor getSoundSensor() {
+        return soundSensor;
+    }
+
+    public void reset(Brain brain) {
+        this.sightSensor.reset(brain);
+        this.soundSensor.reset(brain);
+        this.feelSensor.reset(brain);
+    }
+
+    public void update(TimeStep timeStep) {
+        this.sightSensor.update(timeStep);
+        this.soundSensor.update(timeStep);
+        this.feelSensor.update(timeStep);
+    }
+
+
+}

src/seventh/ai/basic/Sensors.java

@@ -13,16 +13,12 @@
  */
 public class Sensors {
 
-    private SightSensor sightSensor;
-    private SoundSensor soundSensor;
-    private FeelSensor feelSensor;
+    private SensorFactory sensorfactory;
 
 
 
     public Sensors(Brain brain) {
-        this.sightSensor = new SightSensor(brain);
-        this.soundSensor = new SoundSensor(brain);
-        this.feelSensor = new FeelSensor(brain);
+        this.sensorfactory = new SensorFactory(brain);
     }
 
 
@@ -32,40 +28,36 @@ public Sensors(Brain brain) {
      * @param brain
      */
     public void reset(Brain brain) {
-        this.sightSensor.reset(brain);
-        this.soundSensor.reset(brain);
-        this.feelSensor.reset(brain);
+        this.sensorfactory.reset(brain);
     }
 
     /**
      * @return the feelSensor
      */
     public FeelSensor getFeelSensor() {
-        return feelSensor;
+        return this.sensorfactory.getFeelSensor();
     }
 
     /**
      * @return the sightSensor
      */
     public SightSensor getSightSensor() {
-        return sightSensor;
+        return this.sensorfactory.getSightSensor();
     }
 
     /**
      * @return the soundSensor
      */
     public SoundSensor getSoundSensor() {
-        return soundSensor;
+        return this.sensorfactory.getSoundSensor();
     }
 
     /**
      * Poll each sensor
      * @param timeStep
      */
     public void update(TimeStep timeStep) {
-        this.sightSensor.update(timeStep);
-        this.soundSensor.update(timeStep);
-        this.feelSensor.update(timeStep);        
+        this.sensorfactory.update(timeStep);       
     }
 
 }

src/seventh/ai/basic/SightSensor.java

@@ -30,7 +30,7 @@ public class SightSensor implements Sensor {
     private Timer updateSight;
 
     private List<PlayerEntity> entitiesInView;
-
+     
     /**
      * @param width
      * @param height

src/seventh/ai/basic/SoundSensor.java

@@ -24,8 +24,7 @@
  * @author Tony
  *
  */
-public class SoundSensor implements Sensor {
-
+public class SoundSensor implements Sensor{
     /**
      * Less important sounds
      */