diff --git a/.gitignore b/.gitignore index 7b8fe6935..2f8d1484e 100644 --- a/.gitignore +++ b/.gitignore @@ -126,3 +126,4 @@ $RECYCLE.BIN/ # Windows shortcuts *.lnk +.vscode/ \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 2421e386c..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "files.exclude": { - "**/.classpath": true, - "**/.project": true, - "**/.settings": true, - "**/.factorypath": true - } -} \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 000000000..2442a6a74 --- /dev/null +++ b/README.md @@ -0,0 +1,17 @@ +# About this Repository + +This repo contains starter code for the in-book examples for LaunchCode's +[Java Web Development](https://education.launchcode.org/java-web-development/index.html) +course. + +## Requirements + +The classes in this repo require Java13. Please refer to the book referenced +above for instructions on how to download and use the examples. + +## Updating + +Occasionally, the LaunchCode team will make changes to this repository +that will affect your coursework. When you start your prep-work for each +lesson of the course, be sure to fetch to stay up to date with the +latest changes. \ No newline at end of file diff --git a/src/org/launchcode/java/demos/datatypes/HelloMethods.java b/src/org/launchcode/java/demos/lsn1datatypes/HelloMethods.java similarity index 77% rename from src/org/launchcode/java/demos/datatypes/HelloMethods.java rename to src/org/launchcode/java/demos/lsn1datatypes/HelloMethods.java index 9457fe200..a375d208a 100644 --- a/src/org/launchcode/java/demos/datatypes/HelloMethods.java +++ b/src/org/launchcode/java/demos/lsn1datatypes/HelloMethods.java @@ -1,4 +1,4 @@ -package org.launchcode.java.demos.datatypes; +package org.launchcode.java.demos.lsn1datatypes; public class HelloMethods { diff --git a/src/org/launchcode/java/demos/datatypes/Message.java b/src/org/launchcode/java/demos/lsn1datatypes/Message.java similarity index 85% rename from src/org/launchcode/java/demos/datatypes/Message.java rename to src/org/launchcode/java/demos/lsn1datatypes/Message.java index 978ec3b5b..9d42bfa1b 100644 --- a/src/org/launchcode/java/demos/datatypes/Message.java +++ b/src/org/launchcode/java/demos/lsn1datatypes/Message.java @@ -1,4 +1,4 @@ -package org.launchcode.java.demos.datatypes; +package org.launchcode.java.demos.lsn1datatypes; public class Message { diff --git a/src/org/launchcode/java/demos/datatypes/TempConverter.java b/src/org/launchcode/java/demos/lsn1datatypes/TempConverter.java similarity index 90% rename from src/org/launchcode/java/demos/datatypes/TempConverter.java rename to src/org/launchcode/java/demos/lsn1datatypes/TempConverter.java index cc5b4cf6e..89d9fbc01 100644 --- a/src/org/launchcode/java/demos/datatypes/TempConverter.java +++ b/src/org/launchcode/java/demos/lsn1datatypes/TempConverter.java @@ -1,4 +1,4 @@ -package org.launchcode.java.demos.datatypes; +package org.launchcode.java.demos.lsn1datatypes; import java.util.Scanner; diff --git a/src/org/launchcode/java/demos/collections/ArrayGradebook.java b/src/org/launchcode/java/demos/lsn2controlflowandcollections/ArrayGradebook.java similarity index 95% rename from src/org/launchcode/java/demos/collections/ArrayGradebook.java rename to src/org/launchcode/java/demos/lsn2controlflowandcollections/ArrayGradebook.java index 943d4a525..d60ac79bb 100644 --- a/src/org/launchcode/java/demos/collections/ArrayGradebook.java +++ b/src/org/launchcode/java/demos/lsn2controlflowandcollections/ArrayGradebook.java @@ -1,4 +1,4 @@ -package org.launchcode.java.demos.collections; +package org.launchcode.java.demos.lsn2controlflowandcollections; import java.util.Scanner; diff --git a/src/org/launchcode/java/demos/collections/ArrayListGradebook.java b/src/org/launchcode/java/demos/lsn2controlflowandcollections/ArrayListGradebook.java similarity index 94% rename from src/org/launchcode/java/demos/collections/ArrayListGradebook.java rename to src/org/launchcode/java/demos/lsn2controlflowandcollections/ArrayListGradebook.java index 9b49afae4..f4512f288 100644 --- a/src/org/launchcode/java/demos/collections/ArrayListGradebook.java +++ b/src/org/launchcode/java/demos/lsn2controlflowandcollections/ArrayListGradebook.java @@ -1,4 +1,4 @@ -package org.launchcode.java.demos.collections; +package org.launchcode.java.demos.lsn2controlflowandcollections; import java.util.ArrayList; import java.util.Scanner; diff --git a/src/org/launchcode/java/demos/collections/HashMapGradebook.java b/src/org/launchcode/java/demos/lsn2controlflowandcollections/HashMapGradebook.java similarity index 95% rename from src/org/launchcode/java/demos/collections/HashMapGradebook.java rename to src/org/launchcode/java/demos/lsn2controlflowandcollections/HashMapGradebook.java index 717d4da9f..3be5726b8 100644 --- a/src/org/launchcode/java/demos/collections/HashMapGradebook.java +++ b/src/org/launchcode/java/demos/lsn2controlflowandcollections/HashMapGradebook.java @@ -1,4 +1,4 @@ -package org.launchcode.java.demos.collections; +package org.launchcode.java.demos.lsn2controlflowandcollections; import java.util.HashMap; import java.util.Map; diff --git a/src/org/launchcode/java/demos/school/SchoolPractice.java b/src/org/launchcode/java/demos/lsn3classes1/SchoolPractice.java similarity index 74% rename from src/org/launchcode/java/demos/school/SchoolPractice.java rename to src/org/launchcode/java/demos/lsn3classes1/SchoolPractice.java index e0fdf954e..7ea3d53ee 100644 --- a/src/org/launchcode/java/demos/school/SchoolPractice.java +++ b/src/org/launchcode/java/demos/lsn3classes1/SchoolPractice.java @@ -1,4 +1,4 @@ -package org.launchcode.java.demos.school; +package org.launchcode.java.demos.lsn3classes1; public class SchoolPractice { public static void main(String[] args) { diff --git a/src/org/launchcode/java/demos/school/Student.java b/src/org/launchcode/java/demos/lsn3classes1/Student.java similarity index 85% rename from src/org/launchcode/java/demos/school/Student.java rename to src/org/launchcode/java/demos/lsn3classes1/Student.java index 6fe5fcdcd..73f21c5fc 100644 --- a/src/org/launchcode/java/demos/school/Student.java +++ b/src/org/launchcode/java/demos/lsn3classes1/Student.java @@ -1,4 +1,4 @@ -package org.launchcode.java.demos.school; +package org.launchcode.java.demos.lsn3classes1; // Start working here with your Student class. // To instantiate the Student class, add your code to the main in the file, SchoolPractice. diff --git a/src/org/launchcode/java/demos/lsn4school/Course.java b/src/org/launchcode/java/demos/lsn4classes2/Course.java similarity index 90% rename from src/org/launchcode/java/demos/lsn4school/Course.java rename to src/org/launchcode/java/demos/lsn4classes2/Course.java index 9285997f6..cb04bc96a 100644 --- a/src/org/launchcode/java/demos/lsn4school/Course.java +++ b/src/org/launchcode/java/demos/lsn4classes2/Course.java @@ -1,4 +1,4 @@ -package org.launchcode.java.demos.lsn4school; +package org.launchcode.java.demos.lsn4classes2; import java.util.ArrayList; diff --git a/src/org/launchcode/java/demos/lsn4school/Student.java b/src/org/launchcode/java/demos/lsn4classes2/Student.java similarity index 95% rename from src/org/launchcode/java/demos/lsn4school/Student.java rename to src/org/launchcode/java/demos/lsn4classes2/Student.java index 1ede3c397..b51eb666a 100644 --- a/src/org/launchcode/java/demos/lsn4school/Student.java +++ b/src/org/launchcode/java/demos/lsn4classes2/Student.java @@ -1,4 +1,4 @@ -package org.launchcode.java.demos.lsn4school; +package org.launchcode.java.demos.lsn4classes2; public class Student { @@ -28,7 +28,8 @@ public String studentInfo() { return (this.name + " has a GPA of: " + this.gpa); } - // TODO: Uncomment and complete the getGradeLevel method here: + + //TODO: Uncomment and complete the getGradeLevel method here: // public String getGradeLevel() { // // Determine the grade level of the student based on numberOfCredits // } diff --git a/src/org/launchcode/java/demos/lsn4school/Teacher.java b/src/org/launchcode/java/demos/lsn4classes2/Teacher.java similarity index 95% rename from src/org/launchcode/java/demos/lsn4school/Teacher.java rename to src/org/launchcode/java/demos/lsn4classes2/Teacher.java index 974e52119..dfac8dea4 100644 --- a/src/org/launchcode/java/demos/lsn4school/Teacher.java +++ b/src/org/launchcode/java/demos/lsn4classes2/Teacher.java @@ -1,4 +1,4 @@ -package org.launchcode.java.demos.lsn4school; +package org.launchcode.java.demos.lsn4classes2; public class Teacher { private String firstName; diff --git a/src/org/launchcode/java/demos/testing/main/Car.java b/src/org/launchcode/java/demos/lsn5unittesting/main/Car.java similarity index 97% rename from src/org/launchcode/java/demos/testing/main/Car.java rename to src/org/launchcode/java/demos/lsn5unittesting/main/Car.java index 81229839a..1fc03a6d6 100644 --- a/src/org/launchcode/java/demos/testing/main/Car.java +++ b/src/org/launchcode/java/demos/lsn5unittesting/main/Car.java @@ -1,4 +1,4 @@ -package org.launchcode.java.demos.testing.main; +package org.launchcode.java.demos.lsn5unittesting.main; public class Car { diff --git a/src/org/launchcode/java/demos/testing/main/Main.java b/src/org/launchcode/java/demos/lsn5unittesting/main/Main.java similarity index 77% rename from src/org/launchcode/java/demos/testing/main/Main.java rename to src/org/launchcode/java/demos/lsn5unittesting/main/Main.java index 523d40cfb..2d40a7423 100644 --- a/src/org/launchcode/java/demos/testing/main/Main.java +++ b/src/org/launchcode/java/demos/lsn5unittesting/main/Main.java @@ -1,4 +1,4 @@ -package org.launchcode.java.demos.testing.main; +package org.launchcode.java.demos.lsn5unittesting.main; public class Main { diff --git a/src/org/launchcode/java/demos/testing/test/CarTest.java b/src/org/launchcode/java/demos/lsn5unittesting/test/CarTest.java similarity index 88% rename from src/org/launchcode/java/demos/testing/test/CarTest.java rename to src/org/launchcode/java/demos/lsn5unittesting/test/CarTest.java index a3f5bcb96..7cde639dc 100644 --- a/src/org/launchcode/java/demos/testing/test/CarTest.java +++ b/src/org/launchcode/java/demos/lsn5unittesting/test/CarTest.java @@ -1,4 +1,4 @@ -package org.launchcode.java.demos.testing.test; +package org.launchcode.java.demos.lsn5unittesting.test; public class CarTest { diff --git a/src/org/launchcode/java/demos/lsn6inheritance/Cat.java b/src/org/launchcode/java/demos/lsn6inheritance/Cat.java new file mode 100644 index 000000000..48ff2ae96 --- /dev/null +++ b/src/org/launchcode/java/demos/lsn6inheritance/Cat.java @@ -0,0 +1,68 @@ +package org.launchcode.java.demos.lsn6inheritance; + +public class Cat { + + private boolean tired = false; + private boolean hungry = false; + private double weight; + + // The biological family for all cat species + private String family = "Felidae"; + + public Cat (double aWeight) { + weight = aWeight; + } + + /**** Getters and Setters ****/ + + public boolean isTired() { + return tired; + } + + public void setTired(boolean aTired) { + tired = aTired; + } + + public boolean isHungry() { + return hungry; + } + + public void setHungry(boolean aHungry) { + hungry = aHungry; + } + + public double getWeight() { + return weight; + } + + public void setWeight(double aWeight) { + weight = aWeight; + } + + public String getFamily() { + return family; + } + + /**** Instance Methods ****/ + + // A cat is rested and hungry after it sleeps + public void sleep() { + tired = false; + hungry = true; + } + + // Eating makes a cat not hungry + public void eat() { + + // eating when not hungry makes a cat sleepy + if (!hungry) { + tired = true; + } + + hungry = false; + } + + public String noise () { + return "Meeeeeeooooowww!"; + } +} diff --git a/src/org/launchcode/java/demos/lsn6inheritance/HouseCat.java b/src/org/launchcode/java/demos/lsn6inheritance/HouseCat.java new file mode 100644 index 000000000..aca82ffca --- /dev/null +++ b/src/org/launchcode/java/demos/lsn6inheritance/HouseCat.java @@ -0,0 +1,24 @@ +package org.launchcode.java.demos.lsn6inheritance; + +public class HouseCat extends Cat { + private String name; + private String species = "Felis catus"; + + public HouseCat(String aName, double aWeight) { + super(aWeight); + name = aName; + } + + public boolean isSatisfied() { + return !isHungry() && !isTired(); + } + + @Override + public String noise() { + return "Hello, my name is " + name + "!"; + } + + public String purr() { + return "I'm a HouseCat"; + } +}