Merge pull request #3 from georgevangelou/idea1

Minor updates

.gitignore

@@ -17,6 +17,7 @@
 *.zip
 *.tar.gz
 *.rar
+/out
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*

src/main/java/circuitry/elements/API.java

@@ -6,11 +6,13 @@
 public abstract class API {
     public static final int VERSION = 1;
 
+
     protected API() {
 //        System.err.println("Initializing version " + VERSION);
         init(API.VERSION);
 //        System.err.println("Properly initialized: " + this);
     }
 
+
     protected abstract void init(int version) throws IllegalStateException;
 }

src/main/java/circuitry/elements/And.java

@@ -8,8 +8,8 @@
 public class And extends Calculatable {
     private final Calculatable a;
     private final Calculatable b;
-    
-    
+
+
     protected And(final Calculatable a, final Calculatable b) {
         Preconditions.checkNotNull(a, "Gate input should not be null");
         Preconditions.checkNotNull(b, "Gate input should not be null");
@@ -18,6 +18,8 @@ protected And(final Calculatable a, final Calculatable b) {
         this.b = b;
     }
 
+
+    @Override
     protected boolean calculateInner() {
         return a.calculate() && b.calculate();
     }

src/main/java/circuitry/elements/Calculatable.java

@@ -14,6 +14,6 @@ public final boolean calculate() {
         }
     }
 
-    protected abstract boolean calculateInner();
 
+    protected abstract boolean calculateInner();
 }

src/main/java/circuitry/elements/Circuit.java

@@ -1,6 +1,5 @@
 package circuitry.elements;
 
-import circuitry.elements.Calculatable;
 import com.google.common.base.Preconditions;
 
 /**
@@ -9,16 +8,19 @@
 public final class Circuit {
     private final Calculatable calculatable;
 
+
     protected Circuit(final Calculatable calculatable) {
         Preconditions.checkNotNull(calculatable, "Circuit input should not be null");
-        
+
         this.calculatable = calculatable;
     }
 
+
     public void hello() {
         System.out.println("Hello world");
     }
 
+
     public boolean calculate() {
         return this.calculatable.calculate();
     }

src/main/java/circuitry/elements/ElementFactory.java

@@ -10,36 +10,42 @@ public ElementFactory(int version) {
         init(version);
     }
 
+
     @Override
     protected void init(int version) throws IllegalStateException {
         if (version != API.VERSION)
             throw new IllegalStateException("API version error!");
     }
 
+
     public final Circuit createCircuit(final Calculatable a) {
         Preconditions.checkNotNull(a, "Circuit input should not be null");
 
         return new Circuit(a);
     }
 
+
     public final InputBoolean createInputBoolean(final boolean value) {
         return new InputBoolean(value);
     }
 
+
     public final Calculatable createAndGateWithInputs(final Calculatable a, final Calculatable b) {
         Preconditions.checkNotNull(a, "Gate input should not be null");
         Preconditions.checkNotNull(b, "Gate input should not be null");
 
         return new And(a, b);
     }
 
+
     public final Calculatable createOrGateWithInputs(final Calculatable a, final Calculatable b) {
         Preconditions.checkNotNull(a, "Gate input should not be null");
         Preconditions.checkNotNull(b, "Gate input should not be null");
 
         return new Or(a, b);
     }
 
+
     public final Calculatable createNotGateWithInput(final Calculatable a) {
         Preconditions.checkNotNull(a, "Gate input should not be null");
 

src/main/java/circuitry/elements/InputBoolean.java

@@ -3,17 +3,21 @@
 /**
  *
  */
-public class InputBoolean extends Calculatable{
+public class InputBoolean extends Calculatable {
     private boolean value;
-
+
+
     protected InputBoolean(final boolean value) {
         this.value = value;
     }
 
+
+    @Override
     protected boolean calculateInner() {
         return this.value;
     }
-
+
+
     public void set(final boolean value) {
         this.value = value;
     }

src/main/java/circuitry/elements/Not.java

@@ -7,14 +7,16 @@
  */
 public class Not extends Calculatable {
     private final Calculatable a;
-
+
+
     protected Not(final Calculatable a) {
         Preconditions.checkNotNull(a, "Gate input should not be null");
 
         this.a = a;
     }
 
 
+    @Override
     protected boolean calculateInner() {
         return !a.calculate();
     }

src/main/java/circuitry/elements/Or.java

@@ -5,10 +5,11 @@
 /**
  *
  */
-public class Or extends Calculatable{
+public class Or extends Calculatable {
     private final Calculatable a;
     private final Calculatable b;
-
+
+
     protected Or(final Calculatable a, final Calculatable b) {
         Preconditions.checkNotNull(a, "Gate input should not be null");
         Preconditions.checkNotNull(b, "Gate input should not be null");
@@ -17,6 +18,8 @@ protected Or(final Calculatable a, final Calculatable b) {
         this.b = b;
     }
 
+
+    @Override
     protected boolean calculateInner() {
         return a.calculate() || b.calculate();
     }

src/test/java/Testing.java

@@ -8,15 +8,17 @@
  *
  */
 public class Testing {
-    private ElementFactory factory = new ElementFactory(API.VERSION);
+    private final ElementFactory factory = new ElementFactory(API.VERSION);
+
 
     @Test
-    public void testCreation() {
+    public void testCircuitCreation() {
         Circuit circuit = factory.createCircuit(factory.createInputBoolean(false));
         circuit.hello();
         System.out.println("Success (testCreation)!");
     }
 
+
     @Test
     public void testAndGate() {
         final InputBoolean input1 = factory.createInputBoolean(false);
@@ -39,6 +41,7 @@ public void testAndGate() {
         System.out.println("Success (testAndGate)!");
     }
 
+
     @Test
     public void testOrGate() {
         final InputBoolean input1 = factory.createInputBoolean(false);
@@ -110,6 +113,7 @@ public void testIfCircuitIsFailSafe1() {
         }
     }
 
+
     @Test
     public void testIfCircuitIsFailSafe2() {
         try {
@@ -125,6 +129,7 @@ public void testIfCircuitIsFailSafe2() {
         }
     }
 
+
     @Test
     public void testIfCircuitIsFailSafe3() {
         try {