cleanup turtle, wheel

Author: jamesrcounts

src/main/java/org/teachingextensions/logo/Turtle.java

@@ -18,7 +18,7 @@
 import org.teachingextensions.approvals.lite.util.persistence.SavingException;
 
 /**
- * <img src="https://lh5.googleusercontent.com/-B3Q59gpYW8o/T4tA2k_TYUI/AAAAAAAAAjo/WiqdoXjbkb0/s65/Tortoise.png" align="left" alt="A turtle drawing a line" >
+ * <img src="https://lh5.googleusercontent.com/-B3Q59gpYW8o/T4tA2k_TYUI/AAAAAAAAAjo/WiqdoXjbkb0/s65/Tortoise.png" style="text-align: left" alt="A turtle drawing a line" >
  * The Turtle allows you to draw lines and shapes by moving it around on the window, and you can put more than one turtle on the same window...
  */
 public class Turtle

src/main/java/org/teachingextensions/logo/Wheel.java

@@ -1,73 +1,67 @@
 package org.teachingextensions.logo;
 
+import org.teachingextensions.approvals.lite.util.NumberUtils;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.teachingextensions.approvals.lite.util.NumberUtils;
-
 /**
- * A Wheel is a List with no ending on beginning <br>
- * 
- * <b>Example:</b> {@code  
- *    Wheel<String> names = new Wheel<String>();  
- *    names.add("Chocolate"); 
- *    names.add("Peanut Butter"); 
- *    for(int i = 0; i < 6; i++)  > {
- * String name = names.next();
- * System.out.print(name + " ");
- * }
- * }
- * Would result in : <br>
+ * A Wheel is a List with no ending on beginning <p>
+ * <b>Example:</b><pre>{@code
+ *    Wheel<String> names = new Wheel<String>();
+ *    names.add("Chocolate");
+ *    names.add("Peanut Butter");
+ *    for(int i = 0; i < 6; i++){
+ *      String name = names.next();
+ *      System.out.print(name + " ");
+ *    }
+ * }</pre>
+ * Would result in:<p>
  * Chocolate Peanut Butter Chocolate Peanut Butter Chocolate Peanut Butter
- * 
- * @param <T>
+ *
+ * @param <T> The kind of things that are in the wheel
  */
-public class Wheel<T>
-{
-  private List<T> list  = new ArrayList<T>();
-  private int     index = 0;
-  @SafeVarargs
-public Wheel(T... loadWith)
-  {
-    for (T t : loadWith)
-    {
-      add(t);
+public class Wheel<T> {
+    private List<T> list = new ArrayList<>();
+    private int index = 0;
+
+    @SafeVarargs
+    public Wheel(T... loadWith) {
+        for (T t : loadWith) {
+            add(t);
+        }
+    }
+
+    public Wheel() {
     }
-  }
-  public Wheel()
-  {
-  }
-  public void add(T i)
-  {
-    list.add(i);
-  }
-  public T next()
-  {
-    assertNonEmpty();
-    if (index >= list.size())
-    {
-      index = 0;
+
+    public void add(T i) {
+        list.add(i);
     }
-    T t = list.get(index++);
-    return t;
-  }
-  private void assertNonEmpty()
-  {
-    if (list.isEmpty())
-    {
-      String message = "I call shenanigans!!!\nThis Wheel is empty\nYou can NOT get something from the Wheel before you've added anything to it.";
-      throw new RuntimeException(message);
+
+    public T next() {
+        assertNonEmpty();
+        if (index >= list.size()) {
+            index = 0;
+        }
+        return list.get(index++);
+    }
+
+    private void assertNonEmpty() {
+        if (list.isEmpty()) {
+            String message = "I call shenanigans!!!\nThis Wheel is empty\nYou can NOT get something from the Wheel before you've added anything to it.";
+            throw new RuntimeException(message);
+        }
+    }
+
+    public T getRandomFrom() {
+        assertNonEmpty();
+        int index = NumberUtils.getRandomInt(0, list.size());
+        return list.get(index);
+    }
+
+    public void empty() {
+        list.clear();
+        index = 0;
     }
-  }
-  public T getRandomFrom()
-  {
-    assertNonEmpty();
-    int index = NumberUtils.getRandomInt(0, list.size());
-    return list.get(index);
-  }
-  public void empty()
-  {
-    list.clear();
-    index = 0;
-  }
 }