SayApp Final

README.md

@@ -1,3 +1,6 @@
+# partner B change
+This is partner B's change
+
 # grcsay
 An exercise for collaborating with git / GitHub. Please read the directions CAREFULLY! I recommend focusing on the changes to the README before reading the Java code.
 
@@ -32,7 +35,7 @@ We will first practice making changes that do not trigger a merge conflict. In g
         ```
         git pull
         ```
-    1. Make any change to the README and save it.
+    1. Make any change to the README and save it. This is the change.
     1. Check that the change shows up in red (shows as unstaged) when asking for the status.
         ```
         git status
@@ -67,7 +70,8 @@ We will now artificially trigger a merge conflict. When we follow good git pract
 
 1. Have BOTH Partner A and Partner B edit the below line. Each person should make it say something different.
     ```
-    EDIT THIS LINE
+    Efren "Bata" Reyes
+    partner a is awesome
     ```
 1. Have BOTH Partner A and Partner B add, commit, and push the changes. You can refer to the above steps for a refresher on how to add/commit/push. One of the partners will get an error saying that their changes can't be pushed. This is OK and expected. Today we are practicing how to resolve this error.
 1. Have the error partner pull the other partner's changes:

src/Dog.java

@@ -0,0 +1,34 @@
+/**
+ * The Dog class represents a dog and provides its ASCII art.
+ * This class implements the Animal interface and overrides
+ * the getAnimalArt and toString methods.
+ * 
+ * Dog by Maija Haavisto.
+ */
+
+class Dog implements Animal {
+    /**
+     * Returns the ASCII art represnetation of the dog.
+     * 
+     * @return A string containing the ASCII art of the dog. 
+     */
+    @Override
+    public String getAnimalArt() {
+        return
+        "        \\   .\n" +
+        "         \\  ..^____/\n" +
+        "            `-. ___ )\n" +
+        "              ||   ||\n";
+    }
+
+    /**
+     * Returns the name of the animal ("dog").
+     * This method overrides the toString method to return the name of the dog.
+     * 
+     * @return The string "dog" representing the name of the animal.
+     */
+    @Override
+    public String toString() {
+        return "dog";
+    }
+}

src/SayApp.java

@@ -76,7 +76,7 @@ public static Animal getAnimalChoice(Scanner scanner) {
      * @return A list of Animal objects.
      */
     public static List<Animal> animalList() {
-      return Arrays.asList(new Cow(), new Duck());
+      return Arrays.asList(new Cow(), new Duck(), new deer(), new Dog());
     }
 
     /**

src/deer.java

@@ -0,0 +1,37 @@
+/**
+ * The deer class represents a deer and provides its ASCII art representation.
+ * This class implements the Animal interface and overrides the getAnimalArt 
+ * and toString methods.
+ * 
+ * deer by Tony Monroe. See license file for more details.
+ */
+class deer implements Animal {
+
+  /**
+   * Returns the ASCII art representation of the deer.
+   *
+   * @return A string containing the ASCII art of the deer.
+   */
+  @Override
+  public String getAnimalArt() {
+      return
+        "     \\   (             )\n" +
+        "      \\    `--(_   _)--\'\n" +
+        "       \\       Y-Y\n" +
+        "        \\     /@@ \\\n" +
+        "         \\   /     \\\n" +
+        "             `--\'.  \\             ,\n" +
+        "                 |   `.__________/)";
+  }
+
+  /**
+   * Returns the name of the animal ("deer").
+   * This method overrides the toString method to return the name of the deer.
+   *
+   * @return The string "deer" representing the name of the animal.
+   */
+  @Override
+  public String toString() {
+    return "deer";
+  }
+}