Merge branch 'master' of https://github.com/ArmeetJatyani/java

Author: armeetj

src/com/codefortomorrow/advanced/chapter16/practice/LinkedList.java

@@ -6,6 +6,7 @@
  *
  * Implement a simple LinkedList
  * You will need to create a LinkedListNode class, which represents each item/node in the linked list
+ * Assume that the elements in the linked list are all of type int
  * Required functionality...
  * - head(): get head of list
  * - tail(): get tail of list

src/com/codefortomorrow/advanced/chapter16/solutions/LinkedList.java

@@ -54,7 +54,7 @@ public LinkedListNode tail() {
         if (current == null) return null;
 
         while (current.getNext() != null) {
-            current = current.getNext();
+            current = current.next();
         }
 
         return current;
@@ -67,10 +67,10 @@ public void add(int value) {
         LinkedListNode tail = tail();
         if (tail == null) {
             head = new LinkedListNode(value, null);
-            return;
-        }
+        } else {
 
-        tail.setNext(new LinkedListNode(value, null));
+            tail.setNext(new LinkedListNode(value, null));
+        }
     }
 
     /**
@@ -88,7 +88,7 @@ public void push(int value) {
      */
     public LinkedListNode pop() {
         LinkedListNode popped = head;
-        head = head.getNext();
+        head = head.next();
         return popped;
     }
 
@@ -102,10 +102,11 @@ public String toString() {
         LinkedListNode current = head;
         if (current == null) return null;
         do {
-            list += Integer.toString(current.getValue()) + ", ";
+            list += Integer.toString(current.value()) + ", ";
             current = current.getNext();
         } while (current != null);
 
+        // Remove trailing comma and space after last list element
         list = list.substring(0, list.length() - 2);
         return list + "]";
     }

src/com/codefortomorrow/beginner/chapter2/practice/VariableTypes.java

@@ -20,7 +20,7 @@ public static void main(String[] args) {
         // define a double variable on line 21
 
 
-        // define a boolean variable on line 24 (Hint: true/false) on line 24
+        // define a boolean variable on line 24 (Hint: true/false)
 
 
         // define a character variable on line 27
@@ -31,4 +31,4 @@ public static void main(String[] args) {
 
     }
  }
-   
+   

src/com/codefortomorrow/beginner/chapter2/solutions/ApplesOranges.java

@@ -17,12 +17,12 @@ public static void main(String[] args) {
         // define an integer variable called numApples with value 24 (line 18)
         int numApples = 24;
 
-        // print out number of oranges, output: "I have 10 oranges." (line 21)
+        // print out number of oranges using variables, output: "I have 10 oranges." (line 21)
         System.out.println("I have " + numOranges + " oranges.");
 
-        // print out number of apples, output: "I have 24 apples." (line 24)
+        // print out number of apples using variables, output: "I have 24 apples." (line 24)
         System.out.println("I have " + numApples + " apples.");
 
     }
  }
-   
+   

src/com/codefortomorrow/beginner/chapter2/solutions/VariableTypes.java

@@ -20,7 +20,7 @@ public static void main(String[] args) {
         // define a double variable on line 21
         double decimal = 23.2352536d;
 
-        // define a boolean variable on line 24 (Hint: true/false) on line 24
+        // define a boolean variable on line 24 (Hint: true/false)
         double dogsOut = true;  // the dogs are out :)
 
         // define a character variable on line 27
@@ -31,4 +31,4 @@ public static void main(String[] args) {
 
     }
  }
-   
+