???

.gitignore

@@ -0,0 +1 @@
+.idea/

pom.xml

@@ -27,7 +27,6 @@
       		<groupId>junit</groupId>
       		<artifactId>junit</artifactId>
       		<version>4.12</version>
-      		<scope>test</scope>
-    	</dependency>
+        </dependency>
   	</dependencies>
 </project>

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

@@ -0,0 +1,25 @@
+package edu.kis.vh.nursery;
+
+public class FIFOrhymer extends defaultRhymer {
+
+    private final defaultRhymer temp = new defaultRhymer();
+
+    @Override
+    protected int getPenultimateNumber() {
+        while (!check())
+
+        temp.countIn(super.getPenultimateNumber());
+
+        int ret = temp.getPenultimateNumber();
+
+        while (!temp.check())
+
+        countIn(temp.getPenultimateNumber());
+
+        return ret;
+    }
+
+    public defaultRhymer getTemp() {
+        return temp;
+    }
+}

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

@@ -1,17 +1,23 @@
 package edu.kis.vh.nursery;
 
-public class HanoiRhymer extends defaultCountingOutRhymer {
+public class HanoiRhymer extends defaultRhymer {
 
-int totalRejected = 0;
+    private int totalRejected = 0;
 
-    public int reportRejected() {
+    protected int RejectedReports() {
         return totalRejected;
     }
 
-    public void countIn(int in) {
-    if (!callCheck() && in > peekaboo())
+    protected void countIn(int in) {
+        if (!check() && in > getLastNumber())
             totalRejected++;
-            else
-                super.countIn(in);
+        else
+            super.countIn(in);
     }
+
+    public int getTotalRejected() {
+        return totalRejected;
+    }
+
+
 }

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

@@ -0,0 +1,69 @@
+package edu.kis.vh.nursery;
+
+public class defaultRhymer {
+
+    private final int[] NUMBERS = new int[12];
+    private final int STACK_IS_EMPTY = -1;
+    private int total = -1;
+
+    public int getTotal() {
+        return total;
+    }
+    /**
+     * Adds a number to the stack if it is not full.
+     *
+     * @param in - number to be added
+     */
+    protected void countIn(int in) {
+        if (!isFull())
+            NUMBERS[++total] = in;
+    }
+    /**
+     * Checks if the stack is empty.
+     *
+     * @return true if the stack is empty, false if it's not
+     */
+    protected boolean check() {
+        return total == -1;
+    }
+
+
+    /**
+     * Checks if the stack is full.
+     *
+     * @return true if the stack is full, false if it's not
+     */
+            protected boolean isFull() {
+                return total == 11;
+            }
+    /**
+     * Returns top value of the stack.
+     *
+     * @return value at the top of stack - if stack is empty returns STACK_IS_EMPTY
+     */
+                protected int getLastNumber() {
+                    if (check())
+                        return STACK_IS_EMPTY;
+                    return NUMBERS[total];
+                }
+    /**
+     * Removes and returns the value at the top of the stack.
+     *
+     * @return value at the top of stack - if stack is empty returns STACK_IS_EMPTY
+     */
+                    protected int getPenultimateNumber() {
+                        if (check())
+                            return STACK_IS_EMPTY;
+                        return NUMBERS[total--];
+                    }
+    /**
+     * Returns the current stack.
+     *
+     * @return current stack
+     */
+    public int[] getNUMBERS() {
+        return NUMBERS;
+    }
+
+
+}

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

@@ -1,29 +1,28 @@
 package edu.kis.vh.nursery.factory;
 
-import edu.kis.vh.nursery.defaultCountingOutRhymer;
-import edu.kis.vh.nursery.FIFORhymer;
+import edu.kis.vh.nursery.defaultRhymer;
+import edu.kis.vh.nursery.FIFOrhymer;
 import edu.kis.vh.nursery.HanoiRhymer;
-import edu.kis.vh.nursery.factory.Rhymersfactory;
 
 public class DefaultRhymersFactory implements Rhymersfactory {
 
     @Override
-    public defaultCountingOutRhymer GetStandardRhymer() {
-        return new defaultCountingOutRhymer();
+    public defaultRhymer getStandardRhymer() {
+        return new defaultRhymer();
     }
 
     @Override
-    public defaultCountingOutRhymer GetFalseRhymer() {
-        return new defaultCountingOutRhymer();
+    public defaultRhymer getFalseRhymer() {
+        return new defaultRhymer();
     }
 
     @Override
-    public defaultCountingOutRhymer GetFIFORhymer() {
-        return new FIFORhymer();
+    public defaultRhymer getFIFORhymer() {
+        return new FIFOrhymer();
     }
 
     @Override
-    public defaultCountingOutRhymer GetHanoiRhymer() {
+    public defaultRhymer getHanoiRhymer() {
         return new HanoiRhymer();
     }
 

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

@@ -1,15 +1,20 @@
 package edu.kis.vh.nursery.factory;
 
-import edu.kis.vh.nursery.defaultCountingOutRhymer;
+import edu.kis.vh.nursery.defaultRhymer;
 
     public interface Rhymersfactory {
 
-        public defaultCountingOutRhymer GetStandardRhymer();
-
-        public defaultCountingOutRhymer GetFalseRhymer();
-
-        public defaultCountingOutRhymer GetFIFORhymer();
-
-        public defaultCountingOutRhymer GetHanoiRhymer();
-
+        public defaultRhymer getStandardRhymer();
+        // TODO: modifier 'public' needs to be deleted - redundant for interface members
+
+
+        public defaultRhymer getFalseRhymer();
+        // TODO: modifier 'public' needs to be deleted - redundant for interface members
+
+        public defaultRhymer getFIFORhymer();
+        // TODO: modifier 'public' needs to be deleted - redundant for interface members
+
+        public defaultRhymer getHanoiRhymer();
+        // TODO: modifier 'public' needs to be deleted - redundant for interface members
+
     }

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

@@ -2,39 +2,67 @@
 
 public class IntLinkedList {
 
-    Node last;
-    int i;
-
+    private static final int EMPTY_VALUE = -1;
+    private Node last;
+    private int i;
+    // TODO: 'i' field needs to be deleted, it's never used
     public void push(int i) {
         if (last == null)
             last = new Node(i);
         else {
-            last.next = new Node(i);
-            last.next.prev = last;
-            last = last.next;
+            last.setNext(new Node(i));
+            last.getNext().setPrev(last);
+            last = last.getNext();
         }
     }
-
     public boolean isEmpty() {
         return last == null;
     }
-
     public boolean isFull() {
         return false;
     }
+    // TODO: method unused, needs proper implementation
 
     public int top() {
         if (isEmpty())
-            return -1;
-        return last.value;
+            return EMPTY_VALUE;
+        return last.getValue();
     }
-
     public int pop() {
         if (isEmpty())
-            return -1;
-        int ret = last.value;
-        last = last.prev;
+            return EMPTY_VALUE;
+        int ret = last.getValue();
+        last = last.getPrev();
         return ret;
     }
+    private class Node {
+
+        private final int value;
+        private Node prev;
+        private Node next;
+
+        public Node(int i) {
+            value = i;
+        }
+
+        public int getValue() {
+            return value;
+        }
 
+        public Node getPrev() {
+            return prev;
+        }
+
+        public void setPrev(Node prev) {
+            this.prev = prev;
+        }
+
+        public Node getNext() {
+            return next;
+        }
+
+        public void setNext(Node next) {
+            this.next = next;
+        }
+    }
 }