Merge pull request #5 from LaunchCodeEducation/lsn6-demo

CarlyLanglois · web-flow · commit cc736ba5ac27 · 2019-11-01T15:49:24.000-05:00
Lsn6 demo
diff --git a/.gitignore b/.gitignore
@@ -126,3 +126,4 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
+.vscode/
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/README.md 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. 
diff --git a/src/org/launchcode/java/demos/lsn1datatypes/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/lsn1datatypes/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/lsn1datatypes/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/lsn2controlflowandcollections/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/lsn2controlflowandcollections/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/lsn2controlflowandcollections/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/lsn3classes1/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/lsn3classes1/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/lsn4classes2/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/lsn4classes2/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/lsn4classes2/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/lsn5unittesting/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/lsn5unittesting/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/lsn5unittesting/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
@@ -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
@@ -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";
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -126,3 +126,4 @@ $RECYCLE.BIN/`
`126`	`126`	`# Windows shortcuts`
`127`	`127`	`*.lnk`
`128`	`128`
	`129`	`+.vscode/`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.launchcode.java.demos.datatypes;`
	`1`	`+package org.launchcode.java.demos.lsn1datatypes;`
`2`	`2`
`3`	`3`	`public class HelloMethods {`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.launchcode.java.demos.collections;`
	`1`	`+package org.launchcode.java.demos.lsn2controlflowandcollections;`
`2`	`2`
`3`	`3`	`import java.util.Scanner;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.launchcode.java.demos.school;`
	`1`	`+package org.launchcode.java.demos.lsn3classes1;`
`2`	`2`
`3`	`3`	`public class SchoolPractice {`
`4`	`4`	`public static void main(String[] args) {`