Merge branch ''format' to 'master'

.gitignore

@@ -0,0 +1,4 @@
+*.class
+.vscode/
+.code-workspace
+eclipse-formatter.xml

src/main/java/edu/kis/vh/nursery/FIFORhymer.java

@@ -1,21 +1,26 @@
 package edu.kis.vh.nursery;
 
+/*
+
+This is a sample comment, so I can check if Git pushing is
+working properly. TODO Remove this comment */
+
 public class FIFORhymer extends defaultCountingOutRhymer {
 
 	public defaultCountingOutRhymer temp = new defaultCountingOutRhymer();
-	
+
 	@Override
 	public int countOut() {
 		while (!callCheck())
-			
-		temp.countIn(super.countOut());
-		
+
+			temp.countIn(super.countOut());
+
 		int ret = temp.countOut();
-		
+
 		while (!temp.callCheck())
-			
-		countIn(temp.countOut());
-		
+
+			countIn(temp.countOut());
+
 		return ret;
 	}
 }

src/main/java/edu/kis/vh/nursery/HanoiRhymer.java

@@ -2,16 +2,16 @@
 
 public class HanoiRhymer extends defaultCountingOutRhymer {
 
-int totalRejected = 0;
+	int totalRejected = 0;
 
 	public int reportRejected() {
 		return totalRejected;
 	}
 
 	public void countIn(int in) {
-	if (!callCheck() && in > peekaboo())
+		if (!callCheck() && in > peekaboo())
 			totalRejected++;
-			else
-				super.countIn(in);
+		else
+			super.countIn(in);
 	}
 }

src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java

@@ -11,24 +11,24 @@ public void countIn(int in) {
 			NUMBERS[++total] = in;
 	}
 
-		public boolean callCheck() {
-			return total == -1;
-		}
-		
-			public boolean isFull() {
-				return total == 11;
-			}
-		
-				protected int peekaboo() {
-					if (callCheck())
-						return -1;
-					return NUMBERS[total];
-				}
-			
-					public int countOut() {
-						if (callCheck())
-							return -1;
-						return NUMBERS[total--];
-					}
+	public boolean callCheck() {
+		return total == -1;
+	}
+
+	public boolean isFull() {
+		return total == 11;
+	}
+
+	protected int peekaboo() {
+		if (callCheck())
+			return -1;
+		return NUMBERS[total];
+	}
+
+	public int countOut() {
+		if (callCheck())
+			return -1;
+		return NUMBERS[total--];
+	}
 
 }

src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java

@@ -3,9 +3,8 @@
 import edu.kis.vh.nursery.defaultCountingOutRhymer;
 import edu.kis.vh.nursery.FIFORhymer;
 import edu.kis.vh.nursery.HanoiRhymer;
-import edu.kis.vh.nursery.factory.Rhymersfactory;
 
-public class DefaultRhymersFactory implements Rhymersfactory {
+public class DefaultRhymersFactory implements RhymersFactory {
 
 	@Override
 	public defaultCountingOutRhymer GetStandardRhymer() {

src/main/java/edu/kis/vh/nursery/factory/RhymersFactory.java

@@ -0,0 +1,15 @@
+package edu.kis.vh.nursery.factory;
+
+import edu.kis.vh.nursery.defaultCountingOutRhymer;
+
+public interface RhymersFactory {
+
+	public defaultCountingOutRhymer GetStandardRhymer();
+
+	public defaultCountingOutRhymer GetFalseRhymer();
+
+	public defaultCountingOutRhymer GetFIFORhymer();
+
+	public defaultCountingOutRhymer GetHanoiRhymer();
+
+}

src/main/java/edu/kis/vh/nursery/list/Node.java

@@ -8,5 +8,5 @@ public class Node {
 	public Node(int i) {
 		value = i;
 	}
-	
+
 }

src/test/java/edu/kis/vh/nursery/RhymersDemo.java

@@ -1,35 +1,33 @@
 package edu.kis.vh.nursery;
 
-import edu.kis.vh.nursery.defaultCountingOutRhymer;
-import edu.kis.vh.nursery.HanoiRhymer;
 import edu.kis.vh.nursery.factory.DefaultRhymersFactory;
-import edu.kis.vh.nursery.factory.Rhymersfactory;
+import edu.kis.vh.nursery.factory.RhymersFactory;
 
 class RhymersDemo {
 
 	public static void main(String[] args) {
-		Rhymersfactory factory = new DefaultRhymersFactory();
-		
+		RhymersFactory factory = new DefaultRhymersFactory();
+
 		defaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(),
-				factory.GetFIFORhymer(), factory.GetHanoiRhymer()};
-		
+				factory.GetFIFORhymer(), factory.GetHanoiRhymer() };
+
 		for (int i = 1; i < 15; i++)
 			for (int j = 0; j < 3; j++)
 				rhymers[j].countIn(i);
-		
+
 		java.util.Random rn = new java.util.Random();
 		for (int i = 1; i < 15; i++)
 			rhymers[3].countIn(rn.nextInt(20));
-		
+
 		for (int i = 0; i < rhymers.length; i++) {
 			while (!rhymers[i].callCheck())
 				System.out.print(rhymers[i].countOut() + "  ");
 			System.out.println();
 		}
-		
+
 		System.out.println("total rejected is "
 				+ ((HanoiRhymer) rhymers[3]).reportRejected());
-		
+
 	}
-	
+
 }