From 4e2c92c211b50d1a8a09ffa3386f60c06f148d72 Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Wed, 12 Jun 2024 10:55:33 -0500 Subject: [PATCH] summer-2024: update schedule --- .../java/com/zfp106/lab1/Apatosaurus.java | 10 +++++++++ .../java/com/zfp106/lab1/Brachiosaurus.java | 11 +++++++++- .../src/main/java/com/zfp106/lab1/Park.java | 8 ++++--- .../main/java/com/zfp106/lab1/Sauropod.java | 4 +--- .../main/java/com/zfp106/lab1/Stegosaur.java | 8 +++---- .../java/com/zfp106/lab1/Stegosaurus.java | 11 +++++++++- .../main/java/com/zfp106/lab1/Theropod.java | 8 +++---- .../java/com/zfp106/lab1/Tyrannosaurus.java | 11 +++++++++- .../java/com/zfp106/lab1/Velociraptor.java | 11 +++++++++- Summer-2024/Schedule.org | 22 ++++++++++--------- 10 files changed, 74 insertions(+), 30 deletions(-) diff --git a/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Apatosaurus.java b/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Apatosaurus.java index e913f28..6f0e947 100644 --- a/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Apatosaurus.java +++ b/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Apatosaurus.java @@ -23,4 +23,14 @@ public class Apatosaurus extends Sauropod { public String getType() { return super.getType(); } + + + /** + * Returns the subtype: "Apatosaurus" + * + * @return the string "Apatosaurus" + */ + public String getSubType() { + return "Apatosaurus"; + } } diff --git a/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Brachiosaurus.java b/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Brachiosaurus.java index 46b0844..7ed6a0a 100644 --- a/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Brachiosaurus.java +++ b/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Brachiosaurus.java @@ -8,7 +8,7 @@ public class Brachiosaurus extends Sauropod { /** * Create a new Brachiosaurus * - * @param name the name of Brachiosaurus + * @param name the name of Brachiosaurus * @param isVegetarian whether or not the Brachiosaurus is vegetarian */ public Brachiosaurus(String name, Boolean isVegetarian) { @@ -23,4 +23,13 @@ public class Brachiosaurus extends Sauropod { public String getType() { return super.getType(); } + + /** + * Returns the subtype: "Brachiosaurus" + * + * @return the string "Brachiosaurus" + */ + public String getSubType() { + return "Brachiosaurus"; + } } diff --git a/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Park.java b/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Park.java index 64618e1..d1d3a24 100644 --- a/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Park.java +++ b/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Park.java @@ -3,7 +3,8 @@ package com.zfp106.lab1; /** * A "Jurassic" Park. Like a zoo, but for dinosaurs. * - * Allows holding collections of dinosaurs up to a set capacity and can have a name for the park. + * Allows holding collections of dinosaurs up to a set capacity and can have a + * name for the park. * */ public class Park { @@ -14,7 +15,7 @@ public class Park { /** * * - * @param name name of the park + * @param name name of the park * @param capacity how many dinosaurs the park can hold */ public Park(String name, Integer capacity) { @@ -24,7 +25,8 @@ public class Park { } /** - * Get the string representation of the park, showing the name of the park and all dinosaurs + * Get the string representation of the park, showing the name of the park and + * all dinosaurs * within the park * * @return string representation of the park diff --git a/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Sauropod.java b/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Sauropod.java index ea2b8ec..b26c336 100644 --- a/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Sauropod.java +++ b/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Sauropod.java @@ -82,9 +82,7 @@ public abstract class Sauropod implements Dinosaur { * * @return the subtype of the Sauropod */ - public String getSubType() { - return this.subType; - } + public abstract String getSubType(); /** * Set the subtype of the Sauropod diff --git a/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Stegosaur.java b/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Stegosaur.java index 46e1cca..de98e61 100644 --- a/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Stegosaur.java +++ b/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Stegosaur.java @@ -12,9 +12,9 @@ public abstract class Stegosaur implements Dinosaur { /** * Construct a new Stegosaur * - * @param name the name of the Stegosaur + * @param name the name of the Stegosaur * @param isVegetarian whether the Stegosaur is vegetarian - * @param subtype the subType of the Stegosaur, a specific dinosaur + * @param subtype the subType of the Stegosaur, a specific dinosaur */ public Stegosaur(String name, boolean isVegetarian, String subtype) { this.setName(name); @@ -82,9 +82,7 @@ public abstract class Stegosaur implements Dinosaur { * * @return the subtype of the Stegosaur */ - public String getSubType() { - return this.subType; - } + public abstract String getSubType(); /** * Set the subtype of the Stegosaur diff --git a/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Stegosaurus.java b/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Stegosaurus.java index 3dc62e9..5e61d6c 100644 --- a/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Stegosaurus.java +++ b/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Stegosaurus.java @@ -8,7 +8,7 @@ public class Stegosaurus extends Stegosaur { /** * Create a new Stegosaurus * - * @param name the name of the Stegosaurus + * @param name the name of the Stegosaurus * @param isVegetarian whether or not the Stegosaurus is vegetarian */ public Stegosaurus(String name, Boolean isVegetarian) { @@ -23,4 +23,13 @@ public class Stegosaurus extends Stegosaur { public String getType() { return super.getType(); } + + /** + * Returns the subtype: "Stegosaurus" + * + * @return the string "Stegosaurus" + */ + public String getSubType() { + return "Stegosaurus"; + } } diff --git a/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Theropod.java b/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Theropod.java index f4b647d..0a46bad 100644 --- a/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Theropod.java +++ b/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Theropod.java @@ -12,9 +12,9 @@ public abstract class Theropod implements Dinosaur { /** * Construct a new Theropod * - * @param name the name of the Theropod + * @param name the name of the Theropod * @param isVegetarian whether the Theropod is vegetarian - * @param subtype the subType of the Theropod, a specific dinosaur + * @param subtype the subType of the Theropod, a specific dinosaur */ public Theropod(String name, boolean isVegetarian, String subtype) { this.setName(name); @@ -82,9 +82,7 @@ public abstract class Theropod implements Dinosaur { * * @return the subtype of the Theropod */ - public String getSubType() { - return this.subType; - } + public abstract String getSubType(); /** * Set the subtype of the Theropod diff --git a/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Tyrannosaurus.java b/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Tyrannosaurus.java index c12e324..69abdec 100644 --- a/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Tyrannosaurus.java +++ b/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Tyrannosaurus.java @@ -8,7 +8,7 @@ public class Tyrannosaurus extends Theropod { /** * Create a new Tyrannosaurus * - * @param name the name of the Tyrannosaurus + * @param name the name of the Tyrannosaurus * @param isVegetarian whether or not the Tyrannosaurus is vegetarian */ public Tyrannosaurus(String name, Boolean isVegetarian) { @@ -23,4 +23,13 @@ public class Tyrannosaurus extends Theropod { public String getType() { return super.getType(); } + + /** + * Returns the subtype: "Tyrannosaurus" + * + * @return the string "Tyrannosaurus" + */ + public String getSubType() { + return "Tyrannosaurus"; + } } diff --git a/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Velociraptor.java b/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Velociraptor.java index 34751e2..964484f 100644 --- a/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Velociraptor.java +++ b/Summer-2024/CS-3443/Labs/Lab1/src/main/java/com/zfp106/lab1/Velociraptor.java @@ -8,7 +8,7 @@ public class Velociraptor extends Theropod { /** * Create a new Velociraptor * - * @param name the name of the Velociraptor + * @param name the name of the Velociraptor * @param isVegetarian whether or not the Velociraptor is vegetarian */ public Velociraptor(String name, Boolean isVegetarian) { @@ -23,4 +23,13 @@ public class Velociraptor extends Theropod { public String getType() { return super.getType(); } + + /** + * Returns the subtype: "Velociraptor" + * + * @return the string "Velociraptor" + */ + public String getSubType() { + return "Velociraptor"; + } } diff --git a/Summer-2024/Schedule.org b/Summer-2024/Schedule.org index a4b0716..050852e 100644 --- a/Summer-2024/Schedule.org +++ b/Summer-2024/Schedule.org @@ -27,24 +27,26 @@ * Courses :college: -** Applications Programming :cs3443: -SCHEDULED: <2024-06-03 Mon 10:00-12:00 ++1w> <2024-05-29 Wed 10:00-12:00 ++1w> - +** Applications Programming :cs3443: - COURSE: =CS3443= - LOCATION: =Online (zoom)= +*** TODO [#A] Applications Programming Mondays +SCHEDULED: <2024-06-17 Mon 10:00-12:00 ++1w> +*** TODO [#A] Applications Programming Wednesdays +SCHEDULED: <2024-06-12 Wed 10:00-12:00 ++1w> -** Systems Programming :cs3424: +** Systems Programming :cs3424: - COURSE: =CS3424= - LOCATION: =Online (zoom)= *** Systems Programming Lecture -SCHEDULED: <2024-06-03 Mon 16:00-18:00 ++1w> <2024-05-29 Wed 16:00-18:00 ++1w> -- LOCATION: =Online (zoom)= +**** TODO [#A] Systems Programming Lecture Mondays +SCHEDULED: <2024-06-17 Mon 16:00-18:00 ++1w> +**** TODO [#A] Systems Programming Lecture Wednesdays +SCHEDULED: <2024-06-12 Wed 16:00-18:00 ++1w> -*** Systems Programming Lab -SCHEDULED: <2024-06-03 Mon 18:00-19:15 ++1w> - -- LOCATION: =Online (zoom)= +*** TODO [#A] Systems Programming Lab +SCHEDULED: <2024-06-12 Wed 18:00-19:15 ++1w>