From 48eaba40a655c88995ed2623c8443fae5391957e Mon Sep 17 00:00:00 2001 From: dbradley771 Date: Thu, 14 Jan 2016 13:06:15 -0600 Subject: [PATCH 01/59] Changed runner to main. Mostly testing reasons. --- src/{runner.java => main.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/{runner.java => main.java} (63%) diff --git a/src/runner.java b/src/main.java similarity index 63% rename from src/runner.java rename to src/main.java index ead8df0..fbb4c87 100644 --- a/src/runner.java +++ b/src/main.java @@ -1,5 +1,5 @@ -public class runner { +public class main { public static void main(String[] args) { From 55f2fd28ad6f11347366f1f352aa7b71978d7582 Mon Sep 17 00:00:00 2001 From: MWHS Computer Science Department Date: Thu, 14 Jan 2016 15:38:37 -0600 Subject: [PATCH 02/59] Delete test.txt --- test.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test.txt diff --git a/test.txt b/test.txt deleted file mode 100644 index e66448f..0000000 --- a/test.txt +++ /dev/null @@ -1 +0,0 @@ -Nice! From 9a0940e621801f97ec26363e20015f41ed1289cf Mon Sep 17 00:00:00 2001 From: David Bradley Date: Thu, 14 Jan 2016 15:51:12 -0600 Subject: [PATCH 03/59] Fixed title caps --- src/{main.java => Main.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/{main.java => Main.java} (100%) diff --git a/src/main.java b/src/Main.java similarity index 100% rename from src/main.java rename to src/Main.java From 0667bd10ac4d7ead23e9e425164c39c5c4138fcc Mon Sep 17 00:00:00 2001 From: Schuyler Rhodes Date: Fri, 15 Jan 2016 09:28:56 -0600 Subject: [PATCH 04/59] my name made ____ class change somthing --- schuyler | 1 + 1 file changed, 1 insertion(+) create mode 100644 schuyler diff --git a/schuyler b/schuyler new file mode 100644 index 0000000..31838aa --- /dev/null +++ b/schuyler @@ -0,0 +1 @@ +schuyler \ No newline at end of file From 03398e7df415f056ed21172563106992d232604d Mon Sep 17 00:00:00 2001 From: Stephen Osborn Date: Fri, 15 Jan 2016 09:28:56 -0600 Subject: [PATCH 05/59] Class Presentation just a text file with my name on it. --- StephenOsborn.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 StephenOsborn.txt diff --git a/StephenOsborn.txt b/StephenOsborn.txt new file mode 100644 index 0000000..4f6fff7 --- /dev/null +++ b/StephenOsborn.txt @@ -0,0 +1 @@ +Stephen Osborn \ No newline at end of file From 1f09f5a24691f3235960e52b2dc2b5e268cd5dfc Mon Sep 17 00:00:00 2001 From: csnodgrass233 Date: Fri, 15 Jan 2016 09:28:57 -0600 Subject: [PATCH 06/59] Type my name --- ChaseSnodgrass.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 ChaseSnodgrass.txt diff --git a/ChaseSnodgrass.txt b/ChaseSnodgrass.txt new file mode 100644 index 0000000..caf27ce --- /dev/null +++ b/ChaseSnodgrass.txt @@ -0,0 +1 @@ +ChaseSnodgrass \ No newline at end of file From 99c08d94eab87fb7c689bc8e6381ca95dc248a54 Mon Sep 17 00:00:00 2001 From: Zack Muehlich Date: Fri, 15 Jan 2016 09:29:02 -0600 Subject: [PATCH 07/59] Woweeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee --- muehlich.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 muehlich.txt diff --git a/muehlich.txt b/muehlich.txt new file mode 100644 index 0000000..56a1dcf --- /dev/null +++ b/muehlich.txt @@ -0,0 +1 @@ +aye bby \ No newline at end of file From 63713322317b9da4447ad21a908a01254bb59c98 Mon Sep 17 00:00:00 2001 From: Nick Jones Date: Fri, 15 Jan 2016 09:29:05 -0600 Subject: [PATCH 08/59] This is my message for this note. I am Nick Jones. --- NickJones.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 NickJones.txt diff --git a/NickJones.txt b/NickJones.txt new file mode 100644 index 0000000..6d5a1ff --- /dev/null +++ b/NickJones.txt @@ -0,0 +1 @@ +Nick Jones \ No newline at end of file From e4fcea821d956ae47dc5fe3ee704a57be2b245c9 Mon Sep 17 00:00:00 2001 From: Dawson Beutler Date: Fri, 15 Jan 2016 09:29:43 -0600 Subject: [PATCH 09/59] Made name file. --- src/dawsonBeutler.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/dawsonBeutler.txt diff --git a/src/dawsonBeutler.txt b/src/dawsonBeutler.txt new file mode 100644 index 0000000..96c974c --- /dev/null +++ b/src/dawsonBeutler.txt @@ -0,0 +1 @@ +Je m'appelle Dawson. \ No newline at end of file From ed9d8a8db1d37dde31ecbb32747f8ec28ed7afdc Mon Sep 17 00:00:00 2001 From: Shane Flott Date: Fri, 15 Jan 2016 09:29:50 -0600 Subject: [PATCH 10/59] I don't like this kid. --- ShaneFlott.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 ShaneFlott.txt diff --git a/ShaneFlott.txt b/ShaneFlott.txt new file mode 100644 index 0000000..4987fc4 --- /dev/null +++ b/ShaneFlott.txt @@ -0,0 +1 @@ +Shane Flott \ No newline at end of file From 8a82872433813506a931f734ed1a43dd6ea2d865 Mon Sep 17 00:00:00 2001 From: Author Date: Fri, 15 Jan 2016 09:31:08 -0600 Subject: [PATCH 11/59] Message --- Untitled 1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 Untitled 1 diff --git a/Untitled 1 b/Untitled 1 new file mode 100644 index 0000000..017eb17 --- /dev/null +++ b/Untitled 1 @@ -0,0 +1 @@ +Josh Hoogner \ No newline at end of file From cf619c8058179c3e740833314268fa60b916bc89 Mon Sep 17 00:00:00 2001 From: ckauth97 Date: Mon, 18 Jan 2016 23:27:25 -0600 Subject: [PATCH 12/59] Removed return values and changed to void for SET methods --- src/MerchandiseInterface.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MerchandiseInterface.java b/src/MerchandiseInterface.java index 358b3a8..1a6d73b 100644 --- a/src/MerchandiseInterface.java +++ b/src/MerchandiseInterface.java @@ -2,7 +2,7 @@ public interface MerchandiseInterface { /** * Set the cost of the item to the customer */ - int setCost(double cost); + void setCost(double cost); /** * Get the cost of the item to the customer @@ -19,7 +19,7 @@ public interface MerchandiseInterface { /** * Set the cost of the item to the store */ - int setStoreCost(double cost); + void setStoreCost(double cost); /** * Get the cost of the item to the store From 0f04a77f6766a3f266b939e767f2133a8336c99e Mon Sep 17 00:00:00 2001 From: Corbin Babcock Date: Tue, 19 Jan 2016 08:26:49 -0600 Subject: [PATCH 13/59] created my name file, and added my name --- Corbin_Babcock.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Corbin_Babcock.txt diff --git a/Corbin_Babcock.txt b/Corbin_Babcock.txt new file mode 100644 index 0000000..efa2991 --- /dev/null +++ b/Corbin_Babcock.txt @@ -0,0 +1 @@ +Corbin Babcock \ No newline at end of file From 624fc7e88e6d2fd469b16157ab272573b86ce5f4 Mon Sep 17 00:00:00 2001 From: Alec Gilroy Date: Tue, 19 Jan 2016 08:43:32 -0600 Subject: [PATCH 14/59] Created file with my name --- AlecGilroy | 1 + 1 file changed, 1 insertion(+) create mode 100644 AlecGilroy diff --git a/AlecGilroy b/AlecGilroy new file mode 100644 index 0000000..b765df7 --- /dev/null +++ b/AlecGilroy @@ -0,0 +1 @@ +Alec Gilroy \ No newline at end of file From 7aca5264540b1d18d02d12ec0e31b3fe68b607b0 Mon Sep 17 00:00:00 2001 From: Andrew Kusleika Date: Tue, 19 Jan 2016 08:47:19 -0600 Subject: [PATCH 15/59] Created name text file Created Butter.ava, FruitSnacks.java, and Spaghetti.java --- AndrewKusleika.txt | 1 + src/Butter.java | 11 +++++++++++ src/FruitSnacks.java | 11 +++++++++++ src/Spaghetti.java | 12 ++++++++++++ 4 files changed, 35 insertions(+) create mode 100644 AndrewKusleika.txt create mode 100644 src/Butter.java create mode 100644 src/FruitSnacks.java create mode 100644 src/Spaghetti.java diff --git a/AndrewKusleika.txt b/AndrewKusleika.txt new file mode 100644 index 0000000..bdba1cb --- /dev/null +++ b/AndrewKusleika.txt @@ -0,0 +1 @@ +Andrew Kusleika \ No newline at end of file diff --git a/src/Butter.java b/src/Butter.java new file mode 100644 index 0000000..eac826b --- /dev/null +++ b/src/Butter.java @@ -0,0 +1,11 @@ + +public abstract class Butter extends Food { + public Butter(){ + desirability = 3; + expiration = 7; + name = "Butter"; + cost = 2; + storeCost = 3; + quantity = 30; + } +} diff --git a/src/FruitSnacks.java b/src/FruitSnacks.java new file mode 100644 index 0000000..a1f03fe --- /dev/null +++ b/src/FruitSnacks.java @@ -0,0 +1,11 @@ + +public abstract class FruitSnacks extends Food{ + public FruitSnacks() { + desirability = 2; + expiration = 31; + name = "Fruit Snacks"; + cost = 3; + storeCost = 1; + quantity = 10; + } +} diff --git a/src/Spaghetti.java b/src/Spaghetti.java new file mode 100644 index 0000000..8bc6145 --- /dev/null +++ b/src/Spaghetti.java @@ -0,0 +1,12 @@ + +public abstract class Spaghetti extends Food { + public Spaghetti() { + desirability = 3; + expiration = 30; + name = "Spaghetti"; + cost = 3; + storeCost = 1; + quantity = 20; + + } +} From 6904cc0ce4aa6851abffdbbbb8a6b95dcf4d9272 Mon Sep 17 00:00:00 2001 From: Schuyler Rhodes Date: Tue, 19 Jan 2016 08:49:19 -0600 Subject: [PATCH 16/59] did dun this sturff --- .classpath | 2 +- .gitignore | 1 + src/CannedAppleSauce.java | 18 ++++++++++++++++++ src/CannedApples.java | 18 ++++++++++++++++++ src/Food.java | 1 + src/TherapeuticToiletPaper.java | 19 +++++++++++++++++++ 6 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 src/CannedAppleSauce.java create mode 100644 src/CannedApples.java create mode 100644 src/TherapeuticToiletPaper.java diff --git a/.classpath b/.classpath index 2cb9784..e9bcd51 100644 --- a/.classpath +++ b/.classpath @@ -1,5 +1,5 @@ - + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ae3c172 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/src/CannedAppleSauce.java b/src/CannedAppleSauce.java new file mode 100644 index 0000000..dd8de1c --- /dev/null +++ b/src/CannedAppleSauce.java @@ -0,0 +1,18 @@ + +public class CannedAppleSauce extends Food{ + public CannedAppleSauce { + setCost(.7); + getCost(); + changeCost(.5, 7); + setStoreCost(.2); + getStoreCost(); + setExpiration(365); + getExpiration(); + setDesirability(0); + getDesirability(); + setName("Canned Apple Sauce"); + String getName(); + setQuantity(100); + getQuantity(); + } +} diff --git a/src/CannedApples.java b/src/CannedApples.java new file mode 100644 index 0000000..150f6bf --- /dev/null +++ b/src/CannedApples.java @@ -0,0 +1,18 @@ + +public class CannedApples extends Food{ + public CannedApples { + setCost(.5); + getCost(); + changeCost(.25, 7); + setStoreCost(.1); + getStoreCost(); + setExpiration(365); + getExpiration(); + setDesirability(0); + getDesirability(); + setName("Canned Apples"); + String getName(); + setQuantity(100); + getQuantity(); + } +} diff --git a/src/Food.java b/src/Food.java index 6254f89..bfcb3fe 100644 --- a/src/Food.java +++ b/src/Food.java @@ -67,4 +67,5 @@ public void setQuantity(int q) { public int getQuantity() { return quantity; } + } diff --git a/src/TherapeuticToiletPaper.java b/src/TherapeuticToiletPaper.java new file mode 100644 index 0000000..ebf7739 --- /dev/null +++ b/src/TherapeuticToiletPaper.java @@ -0,0 +1,19 @@ + +public class TherapeuticToiletPaper extends Food{ + + public TherapeuticToiletPaper { + setCost(1.0); + getCost(); + changeCost(.75, 1); + setStoreCost(.5); + getStoreCost(); + setExpiration(3); + getExpiration(); + setDesirability(3); + getDesirability(); + setName("Therapeutic Toilet Paper"); + String getName(); + setQuantity(100); + getQuantity(); + } +} From e3267147ecee7ae2f250a8931a7995da4bca5243 Mon Sep 17 00:00:00 2001 From: Grant Date: Tue, 19 Jan 2016 08:50:51 -0600 Subject: [PATCH 17/59] gg bro --- Untitled.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Untitled.txt diff --git a/Untitled.txt b/Untitled.txt new file mode 100644 index 0000000..f06b8cd --- /dev/null +++ b/Untitled.txt @@ -0,0 +1 @@ +Grant Ray From 2c8fa6e5749caf44792c5c4423480a2f670d99fe Mon Sep 17 00:00:00 2001 From: Alex Wissing Date: Tue, 19 Jan 2016 08:59:13 -0600 Subject: [PATCH 18/59] This is my name and I made it for commiting --- Alex Wissing.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Alex Wissing.txt diff --git a/Alex Wissing.txt b/Alex Wissing.txt new file mode 100644 index 0000000..e51694f --- /dev/null +++ b/Alex Wissing.txt @@ -0,0 +1 @@ +Alex Wissing \ No newline at end of file From ec713d53a610fc133de683ec0b3966d29e5d3c83 Mon Sep 17 00:00:00 2001 From: zmuehlich615 Date: Tue, 19 Jan 2016 09:12:55 -0600 Subject: [PATCH 19/59] Update muehlich.txt --- muehlich.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/muehlich.txt b/muehlich.txt index 56a1dcf..7c979e0 100644 --- a/muehlich.txt +++ b/muehlich.txt @@ -1 +1,2 @@ -aye bby \ No newline at end of file +this is a test +aye bby From 1140145ef404a8d023005cb3ffdecaf4bcbab648 Mon Sep 17 00:00:00 2001 From: Collin Kauth-Fisher Date: Tue, 19 Jan 2016 09:25:59 -0600 Subject: [PATCH 20/59] Create readme.txt --- NameFiles/readme.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 NameFiles/readme.txt diff --git a/NameFiles/readme.txt b/NameFiles/readme.txt new file mode 100644 index 0000000..f126788 --- /dev/null +++ b/NameFiles/readme.txt @@ -0,0 +1 @@ +Text files, testing for merging. From 07b2dc2dd8f652eab4d78c716e60039a93689fbb Mon Sep 17 00:00:00 2001 From: Collin Kauth-Fisher Date: Tue, 19 Jan 2016 09:53:26 -0600 Subject: [PATCH 21/59] Rename AlecGilroy to NameFiles/AlecGilroy --- AlecGilroy | 1 - NameFiles/AlecGilroy | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 AlecGilroy create mode 100644 NameFiles/AlecGilroy diff --git a/AlecGilroy b/AlecGilroy deleted file mode 100644 index b765df7..0000000 --- a/AlecGilroy +++ /dev/null @@ -1 +0,0 @@ -Alec Gilroy \ No newline at end of file diff --git a/NameFiles/AlecGilroy b/NameFiles/AlecGilroy new file mode 100644 index 0000000..dda0713 --- /dev/null +++ b/NameFiles/AlecGilroy @@ -0,0 +1 @@ +Alec Gilroy From eb002ebcb03946585119eb12bb71dd790813df3d Mon Sep 17 00:00:00 2001 From: Collin Kauth-Fisher Date: Tue, 19 Jan 2016 09:53:53 -0600 Subject: [PATCH 22/59] Rename Alex Wissing.txt to NameFiles/Alex Wissing.txt --- Alex Wissing.txt | 1 - NameFiles/Alex Wissing.txt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 Alex Wissing.txt create mode 100644 NameFiles/Alex Wissing.txt diff --git a/Alex Wissing.txt b/Alex Wissing.txt deleted file mode 100644 index e51694f..0000000 --- a/Alex Wissing.txt +++ /dev/null @@ -1 +0,0 @@ -Alex Wissing \ No newline at end of file diff --git a/NameFiles/Alex Wissing.txt b/NameFiles/Alex Wissing.txt new file mode 100644 index 0000000..2ce6243 --- /dev/null +++ b/NameFiles/Alex Wissing.txt @@ -0,0 +1 @@ +Alex Wissing From 24ba53c1cbe50810f7a791c25896a6584d9fc057 Mon Sep 17 00:00:00 2001 From: Collin Kauth-Fisher Date: Tue, 19 Jan 2016 09:54:04 -0600 Subject: [PATCH 23/59] Rename Corbin_Babcock.txt to NameFiles/Corbin_Babcock.txt --- Corbin_Babcock.txt | 1 - NameFiles/Corbin_Babcock.txt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 Corbin_Babcock.txt create mode 100644 NameFiles/Corbin_Babcock.txt diff --git a/Corbin_Babcock.txt b/Corbin_Babcock.txt deleted file mode 100644 index efa2991..0000000 --- a/Corbin_Babcock.txt +++ /dev/null @@ -1 +0,0 @@ -Corbin Babcock \ No newline at end of file diff --git a/NameFiles/Corbin_Babcock.txt b/NameFiles/Corbin_Babcock.txt new file mode 100644 index 0000000..a53e662 --- /dev/null +++ b/NameFiles/Corbin_Babcock.txt @@ -0,0 +1 @@ +Corbin Babcock From 777d29bf4a21f52767b72f0da9585ebc55a3af56 Mon Sep 17 00:00:00 2001 From: Collin Kauth-Fisher Date: Tue, 19 Jan 2016 09:54:16 -0600 Subject: [PATCH 24/59] Rename NickJones.txt to NameFiles/NickJones.txt --- NameFiles/NickJones.txt | 1 + NickJones.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 NameFiles/NickJones.txt delete mode 100644 NickJones.txt diff --git a/NameFiles/NickJones.txt b/NameFiles/NickJones.txt new file mode 100644 index 0000000..e9fb049 --- /dev/null +++ b/NameFiles/NickJones.txt @@ -0,0 +1 @@ +Nick Jones diff --git a/NickJones.txt b/NickJones.txt deleted file mode 100644 index 6d5a1ff..0000000 --- a/NickJones.txt +++ /dev/null @@ -1 +0,0 @@ -Nick Jones \ No newline at end of file From e488fc182700c46320d6c4df1e491bc0c9623afe Mon Sep 17 00:00:00 2001 From: Collin Kauth-Fisher Date: Tue, 19 Jan 2016 09:54:29 -0600 Subject: [PATCH 25/59] Rename ShaneFlott.txt to NameFiles/ShaneFlott.txt --- NameFiles/ShaneFlott.txt | 1 + ShaneFlott.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 NameFiles/ShaneFlott.txt delete mode 100644 ShaneFlott.txt diff --git a/NameFiles/ShaneFlott.txt b/NameFiles/ShaneFlott.txt new file mode 100644 index 0000000..c22ea00 --- /dev/null +++ b/NameFiles/ShaneFlott.txt @@ -0,0 +1 @@ +Shane Flott diff --git a/ShaneFlott.txt b/ShaneFlott.txt deleted file mode 100644 index 4987fc4..0000000 --- a/ShaneFlott.txt +++ /dev/null @@ -1 +0,0 @@ -Shane Flott \ No newline at end of file From 3e5365e3da154b27ba1681e095d2a77fa0316168 Mon Sep 17 00:00:00 2001 From: Collin Kauth-Fisher Date: Tue, 19 Jan 2016 09:54:43 -0600 Subject: [PATCH 26/59] Rename StephenOsborn.txt to NameFiles/StephenOsborn.txt --- NameFiles/StephenOsborn.txt | 1 + StephenOsborn.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 NameFiles/StephenOsborn.txt delete mode 100644 StephenOsborn.txt diff --git a/NameFiles/StephenOsborn.txt b/NameFiles/StephenOsborn.txt new file mode 100644 index 0000000..b17985a --- /dev/null +++ b/NameFiles/StephenOsborn.txt @@ -0,0 +1 @@ +Stephen Osborn diff --git a/StephenOsborn.txt b/StephenOsborn.txt deleted file mode 100644 index 4f6fff7..0000000 --- a/StephenOsborn.txt +++ /dev/null @@ -1 +0,0 @@ -Stephen Osborn \ No newline at end of file From 8475450957600c4052e2a056af9f866d6b22fcc9 Mon Sep 17 00:00:00 2001 From: Collin Kauth-Fisher Date: Tue, 19 Jan 2016 09:55:00 -0600 Subject: [PATCH 27/59] Rename Untitled 1 to NameFiles/Josh Hoogner --- NameFiles/Josh Hoogner | 1 + Untitled 1 | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 NameFiles/Josh Hoogner delete mode 100644 Untitled 1 diff --git a/NameFiles/Josh Hoogner b/NameFiles/Josh Hoogner new file mode 100644 index 0000000..56615ee --- /dev/null +++ b/NameFiles/Josh Hoogner @@ -0,0 +1 @@ +Josh Hoogner diff --git a/Untitled 1 b/Untitled 1 deleted file mode 100644 index 017eb17..0000000 --- a/Untitled 1 +++ /dev/null @@ -1 +0,0 @@ -Josh Hoogner \ No newline at end of file From 6350598f80397578e51468b0c2edfb6342d1b781 Mon Sep 17 00:00:00 2001 From: Collin Kauth-Fisher Date: Tue, 19 Jan 2016 09:55:13 -0600 Subject: [PATCH 28/59] Rename muehlich.txt to NameFiles/muehlich.txt --- muehlich.txt => NameFiles/muehlich.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename muehlich.txt => NameFiles/muehlich.txt (100%) diff --git a/muehlich.txt b/NameFiles/muehlich.txt similarity index 100% rename from muehlich.txt rename to NameFiles/muehlich.txt From 0a6193c2bfcf07289e65f97e4071190088a6c859 Mon Sep 17 00:00:00 2001 From: Collin Kauth-Fisher Date: Tue, 19 Jan 2016 09:55:23 -0600 Subject: [PATCH 29/59] Rename schuyler to NameFiles/schuyler --- NameFiles/schuyler | 1 + schuyler | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 NameFiles/schuyler delete mode 100644 schuyler diff --git a/NameFiles/schuyler b/NameFiles/schuyler new file mode 100644 index 0000000..2040532 --- /dev/null +++ b/NameFiles/schuyler @@ -0,0 +1 @@ +schuyler diff --git a/schuyler b/schuyler deleted file mode 100644 index 31838aa..0000000 --- a/schuyler +++ /dev/null @@ -1 +0,0 @@ -schuyler \ No newline at end of file From 318074050eef38f07c2f9cedb3117ee9dbf0143e Mon Sep 17 00:00:00 2001 From: ckauth97 Date: Tue, 19 Jan 2016 09:27:05 -0600 Subject: [PATCH 30/59] Moved Name Files Over To Folder --- NameFiles/Corbin_Babcock.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NameFiles/Corbin_Babcock.txt b/NameFiles/Corbin_Babcock.txt index a53e662..d10e73c 100644 --- a/NameFiles/Corbin_Babcock.txt +++ b/NameFiles/Corbin_Babcock.txt @@ -1 +1,5 @@ +<<<<<<< Upstream, based on origin/master Corbin Babcock +======= +Corbin Babcock +>>>>>>> db7e8bb Moved Name Files Over To Folder From 44a1d0e830eafe278fc46b10741e410486fee303 Mon Sep 17 00:00:00 2001 From: ckauth97 Date: Tue, 19 Jan 2016 09:29:48 -0600 Subject: [PATCH 31/59] Still Moving Text Files --- NameFiles/Alex Wissing.txt | 4 ++++ NameFiles/StephenOsborn.txt | 4 ++++ NameFiles/Untitled 1 | 1 + NameFiles/schuyler | 4 ++++ 4 files changed, 13 insertions(+) create mode 100644 NameFiles/Untitled 1 diff --git a/NameFiles/Alex Wissing.txt b/NameFiles/Alex Wissing.txt index 2ce6243..e140b3d 100644 --- a/NameFiles/Alex Wissing.txt +++ b/NameFiles/Alex Wissing.txt @@ -1 +1,5 @@ +<<<<<<< Upstream, based on origin/master Alex Wissing +======= +Alex Wissing +>>>>>>> f31a182 Still Moving Text Files diff --git a/NameFiles/StephenOsborn.txt b/NameFiles/StephenOsborn.txt index b17985a..3c1dcb5 100644 --- a/NameFiles/StephenOsborn.txt +++ b/NameFiles/StephenOsborn.txt @@ -1 +1,5 @@ +<<<<<<< Upstream, based on origin/master Stephen Osborn +======= +Stephen Osborn +>>>>>>> f31a182 Still Moving Text Files diff --git a/NameFiles/Untitled 1 b/NameFiles/Untitled 1 new file mode 100644 index 0000000..017eb17 --- /dev/null +++ b/NameFiles/Untitled 1 @@ -0,0 +1 @@ +Josh Hoogner \ No newline at end of file diff --git a/NameFiles/schuyler b/NameFiles/schuyler index 2040532..b07ee69 100644 --- a/NameFiles/schuyler +++ b/NameFiles/schuyler @@ -1 +1,5 @@ +<<<<<<< Upstream, based on origin/master schuyler +======= +schuyler +>>>>>>> f31a182 Still Moving Text Files From 2d6ae7e9b56e0de529a329b1813f10496304eb52 Mon Sep 17 00:00:00 2001 From: ckauth97 Date: Tue, 19 Jan 2016 12:13:26 -0600 Subject: [PATCH 32/59] Removed Unessesary --- NameFiles/Untitled 1 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 NameFiles/Untitled 1 diff --git a/NameFiles/Untitled 1 b/NameFiles/Untitled 1 deleted file mode 100644 index 017eb17..0000000 --- a/NameFiles/Untitled 1 +++ /dev/null @@ -1 +0,0 @@ -Josh Hoogner \ No newline at end of file From 16b880b2bc86d17b96ca300bd7048916a04aee08 Mon Sep 17 00:00:00 2001 From: ckauth97 Date: Tue, 19 Jan 2016 12:15:39 -0600 Subject: [PATCH 33/59] Moving Name Files --- {src => NameFiles}/Owen | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {src => NameFiles}/Owen (100%) diff --git a/src/Owen b/NameFiles/Owen similarity index 100% rename from src/Owen rename to NameFiles/Owen From bd008a9241559b33663dfb729812ab7ea288ac72 Mon Sep 17 00:00:00 2001 From: dbradley771 Date: Tue, 19 Jan 2016 19:18:45 -0600 Subject: [PATCH 34/59] Renamed name files and cleaned up contents Changed files to person's name Deleted unused lines in files --- NameFiles/Alec Gilroy | 1 + NameFiles/AlecGilroy | 1 - NameFiles/Alex Wissing | 1 + NameFiles/Alex Wissing.txt | 5 ----- NameFiles/Corbin Babcock | 1 + NameFiles/Corbin_Babcock.txt | 5 ----- NameFiles/Josh Hoogner | 2 +- NameFiles/Nick Jones | 1 + NameFiles/NickJones.txt | 1 - NameFiles/Schuyler | 1 + NameFiles/Shane Flott | 1 + NameFiles/ShaneFlott.txt | 1 - NameFiles/Stephen Osborn | 1 + NameFiles/StephenOsborn.txt | 5 ----- NameFiles/readme.txt | 1 - NameFiles/schuyler | 5 ----- 16 files changed, 8 insertions(+), 25 deletions(-) create mode 100644 NameFiles/Alec Gilroy delete mode 100644 NameFiles/AlecGilroy create mode 100644 NameFiles/Alex Wissing delete mode 100644 NameFiles/Alex Wissing.txt create mode 100644 NameFiles/Corbin Babcock delete mode 100644 NameFiles/Corbin_Babcock.txt create mode 100644 NameFiles/Nick Jones delete mode 100644 NameFiles/NickJones.txt create mode 100644 NameFiles/Schuyler create mode 100644 NameFiles/Shane Flott delete mode 100644 NameFiles/ShaneFlott.txt create mode 100644 NameFiles/Stephen Osborn delete mode 100644 NameFiles/StephenOsborn.txt delete mode 100644 NameFiles/readme.txt delete mode 100644 NameFiles/schuyler diff --git a/NameFiles/Alec Gilroy b/NameFiles/Alec Gilroy new file mode 100644 index 0000000..b765df7 --- /dev/null +++ b/NameFiles/Alec Gilroy @@ -0,0 +1 @@ +Alec Gilroy \ No newline at end of file diff --git a/NameFiles/AlecGilroy b/NameFiles/AlecGilroy deleted file mode 100644 index dda0713..0000000 --- a/NameFiles/AlecGilroy +++ /dev/null @@ -1 +0,0 @@ -Alec Gilroy diff --git a/NameFiles/Alex Wissing b/NameFiles/Alex Wissing new file mode 100644 index 0000000..e51694f --- /dev/null +++ b/NameFiles/Alex Wissing @@ -0,0 +1 @@ +Alex Wissing \ No newline at end of file diff --git a/NameFiles/Alex Wissing.txt b/NameFiles/Alex Wissing.txt deleted file mode 100644 index e140b3d..0000000 --- a/NameFiles/Alex Wissing.txt +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< Upstream, based on origin/master -Alex Wissing -======= -Alex Wissing ->>>>>>> f31a182 Still Moving Text Files diff --git a/NameFiles/Corbin Babcock b/NameFiles/Corbin Babcock new file mode 100644 index 0000000..efa2991 --- /dev/null +++ b/NameFiles/Corbin Babcock @@ -0,0 +1 @@ +Corbin Babcock \ No newline at end of file diff --git a/NameFiles/Corbin_Babcock.txt b/NameFiles/Corbin_Babcock.txt deleted file mode 100644 index d10e73c..0000000 --- a/NameFiles/Corbin_Babcock.txt +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< Upstream, based on origin/master -Corbin Babcock -======= -Corbin Babcock ->>>>>>> db7e8bb Moved Name Files Over To Folder diff --git a/NameFiles/Josh Hoogner b/NameFiles/Josh Hoogner index 56615ee..017eb17 100644 --- a/NameFiles/Josh Hoogner +++ b/NameFiles/Josh Hoogner @@ -1 +1 @@ -Josh Hoogner +Josh Hoogner \ No newline at end of file diff --git a/NameFiles/Nick Jones b/NameFiles/Nick Jones new file mode 100644 index 0000000..6d5a1ff --- /dev/null +++ b/NameFiles/Nick Jones @@ -0,0 +1 @@ +Nick Jones \ No newline at end of file diff --git a/NameFiles/NickJones.txt b/NameFiles/NickJones.txt deleted file mode 100644 index e9fb049..0000000 --- a/NameFiles/NickJones.txt +++ /dev/null @@ -1 +0,0 @@ -Nick Jones diff --git a/NameFiles/Schuyler b/NameFiles/Schuyler new file mode 100644 index 0000000..daad5ba --- /dev/null +++ b/NameFiles/Schuyler @@ -0,0 +1 @@ +Schuyler \ No newline at end of file diff --git a/NameFiles/Shane Flott b/NameFiles/Shane Flott new file mode 100644 index 0000000..4987fc4 --- /dev/null +++ b/NameFiles/Shane Flott @@ -0,0 +1 @@ +Shane Flott \ No newline at end of file diff --git a/NameFiles/ShaneFlott.txt b/NameFiles/ShaneFlott.txt deleted file mode 100644 index c22ea00..0000000 --- a/NameFiles/ShaneFlott.txt +++ /dev/null @@ -1 +0,0 @@ -Shane Flott diff --git a/NameFiles/Stephen Osborn b/NameFiles/Stephen Osborn new file mode 100644 index 0000000..4f6fff7 --- /dev/null +++ b/NameFiles/Stephen Osborn @@ -0,0 +1 @@ +Stephen Osborn \ No newline at end of file diff --git a/NameFiles/StephenOsborn.txt b/NameFiles/StephenOsborn.txt deleted file mode 100644 index 3c1dcb5..0000000 --- a/NameFiles/StephenOsborn.txt +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< Upstream, based on origin/master -Stephen Osborn -======= -Stephen Osborn ->>>>>>> f31a182 Still Moving Text Files diff --git a/NameFiles/readme.txt b/NameFiles/readme.txt deleted file mode 100644 index f126788..0000000 --- a/NameFiles/readme.txt +++ /dev/null @@ -1 +0,0 @@ -Text files, testing for merging. diff --git a/NameFiles/schuyler b/NameFiles/schuyler deleted file mode 100644 index b07ee69..0000000 --- a/NameFiles/schuyler +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< Upstream, based on origin/master -schuyler -======= -schuyler ->>>>>>> f31a182 Still Moving Text Files From f13572a7390954450567413cd3516378f449bc1b Mon Sep 17 00:00:00 2001 From: dbradley771 Date: Tue, 19 Jan 2016 19:22:00 -0600 Subject: [PATCH 35/59] Changed readme.md Ha! You don't get permission to this. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fa80cfd..dbd7640 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # StoreSim - AP Computer Science 2016 Repository for 2016 AP Computer Science class project. -Request access to the repo from the project managers. +Fork repo, edit, and pull request back to this repo. \ No newline at end of file From 40b641cf286a027e7acef12863bbd0232e5b6ce1 Mon Sep 17 00:00:00 2001 From: dbradley771 Date: Tue, 19 Jan 2016 19:26:16 -0600 Subject: [PATCH 36/59] Moved Dawson's name file and renamed it. --- src/dawsonBeutler.txt => NameFiles/Dawson Beutler | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/dawsonBeutler.txt => NameFiles/Dawson Beutler (100%) diff --git a/src/dawsonBeutler.txt b/NameFiles/Dawson Beutler similarity index 100% rename from src/dawsonBeutler.txt rename to NameFiles/Dawson Beutler From 1e5d311e35cad21f4b4a785acbc2754a2d6b02fe Mon Sep 17 00:00:00 2001 From: Alex Wissing Date: Fri, 22 Jan 2016 08:13:36 -0600 Subject: [PATCH 37/59] This is my food and it's rather dank in my opinion but ya know I think that this will lead to a revolution in the food code producer market place and finally correct the lack of production as a result of the winter olypmics. Zeus be upon you. good day. --- src/Carrots.java | 9 +++++++++ src/Pork.java | 9 +++++++++ src/WhippedCream.java | 9 +++++++++ 3 files changed, 27 insertions(+) create mode 100644 src/Carrots.java create mode 100644 src/Pork.java create mode 100644 src/WhippedCream.java diff --git a/src/Carrots.java b/src/Carrots.java new file mode 100644 index 0000000..2157e2c --- /dev/null +++ b/src/Carrots.java @@ -0,0 +1,9 @@ + +public class Carrots extends Food { + name = "Carrots"; + cost = 0.30; + storeCost = 1.50; + quantity = 30; + expiration = 14; + desirability = 1; +} diff --git a/src/Pork.java b/src/Pork.java new file mode 100644 index 0000000..737cfa2 --- /dev/null +++ b/src/Pork.java @@ -0,0 +1,9 @@ + +public class Pork extends Food { + name = "Pork"; + cost = 2.00; + storeCost = 5.00; + quantity = 20; + expiration = 21; + desirability = 2; +} diff --git a/src/WhippedCream.java b/src/WhippedCream.java new file mode 100644 index 0000000..2cc807a --- /dev/null +++ b/src/WhippedCream.java @@ -0,0 +1,9 @@ + +public class WhippedCream extends Food { + name = "Whipped Cream"; + cost = 0.40; + storeCost = 1.00; + quantity = 20; + expiration = 7; + desirability = 1; +} From 6808f382abd7bf880340430f263b1248c51e5eca Mon Sep 17 00:00:00 2001 From: ckauth97 Date: Tue, 26 Jan 2016 08:44:29 -0600 Subject: [PATCH 38/59] Removed the get functions from these classes, are not needed for the constructiors --- src/CannedAppleSauce.java | 7 +------ src/CannedApples.java | 6 ------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/CannedAppleSauce.java b/src/CannedAppleSauce.java index dd8de1c..b8b9017 100644 --- a/src/CannedAppleSauce.java +++ b/src/CannedAppleSauce.java @@ -2,17 +2,12 @@ public class CannedAppleSauce extends Food{ public CannedAppleSauce { setCost(.7); - getCost(); changeCost(.5, 7); setStoreCost(.2); - getStoreCost(); setExpiration(365); - getExpiration(); setDesirability(0); - getDesirability(); setName("Canned Apple Sauce"); - String getName(); setQuantity(100); - getQuantity(); + } } diff --git a/src/CannedApples.java b/src/CannedApples.java index 150f6bf..3a2e7ad 100644 --- a/src/CannedApples.java +++ b/src/CannedApples.java @@ -2,17 +2,11 @@ public class CannedApples extends Food{ public CannedApples { setCost(.5); - getCost(); changeCost(.25, 7); setStoreCost(.1); - getStoreCost(); setExpiration(365); - getExpiration(); setDesirability(0); - getDesirability(); setName("Canned Apples"); - String getName(); setQuantity(100); - getQuantity(); } } From d9e58fd8309d69809fd259670e67754dcec6a12b Mon Sep 17 00:00:00 2001 From: ckauth97 Date: Tue, 26 Jan 2016 08:45:35 -0600 Subject: [PATCH 39/59] Minor Update of Formatting --- src/CannedAppleSauce.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/CannedAppleSauce.java b/src/CannedAppleSauce.java index b8b9017..7bb2fd0 100644 --- a/src/CannedAppleSauce.java +++ b/src/CannedAppleSauce.java @@ -8,6 +8,5 @@ public class CannedAppleSauce extends Food{ setDesirability(0); setName("Canned Apple Sauce"); setQuantity(100); - } } From d9534caf5bb0eb3c0f06e2839c1675478e240c4f Mon Sep 17 00:00:00 2001 From: David Bradley Date: Tue, 26 Jan 2016 09:08:37 -0600 Subject: [PATCH 40/59] Update .classpath Added correct source file for java project. --- .classpath | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.classpath b/.classpath index e9bcd51..63b7e89 100644 --- a/.classpath +++ b/.classpath @@ -1,5 +1,6 @@ - + + From 779c1ab842cdb07bed526d4db972d773608a310b Mon Sep 17 00:00:00 2001 From: dbradley771 Date: Tue, 26 Jan 2016 09:29:41 -0600 Subject: [PATCH 41/59] We gooffed. We fixed it but we gooffed. Changed methods to correct name. Changed variables to correct type. Removed error from setDesirability() for now till we can correctly throw errors. --- src/Food.java | 8 ++++---- src/MerchandiseInterface.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Food.java b/src/Food.java index bfcb3fe..978dca9 100644 --- a/src/Food.java +++ b/src/Food.java @@ -2,8 +2,8 @@ public abstract class Food implements MerchandiseInterface { protected String name; protected double cost; protected double oldCost; + protected double storeCost; protected int tempCostTime; - protected int storeCost; protected int expiration; protected int desirability; protected int quantity; @@ -13,7 +13,7 @@ public void setCost(double c) { cost = c; } - public int getCost() { + public double getCost() { return cost; } @@ -27,7 +27,7 @@ public void setStoreCost(double c) { storeCost = c; } - public int getStoreCost() { + public double getStoreCost() { return storeCost; } @@ -44,7 +44,7 @@ public void setDesirability(int d) { if(d >= 0 || d <= 2) { desirability = d; } else { - throw new Exception("Invalid desirability level"); + System.out.println("Invalid Desirability on " + name); } } diff --git a/src/MerchandiseInterface.java b/src/MerchandiseInterface.java index 1a6d73b..9539deb 100644 --- a/src/MerchandiseInterface.java +++ b/src/MerchandiseInterface.java @@ -9,7 +9,7 @@ public interface MerchandiseInterface { * * @return int value cost */ - int getCost(); + double getCost(); /** * Temporarily change the cost of the item to the customer @@ -26,7 +26,7 @@ public interface MerchandiseInterface { * * @return int value storeCost */ - int getCost(); + double getStoreCost(); /** * Change the cost of the item to the store From 40cfb9bc4cab0813a36b71e093fe1c8ff410f1fd Mon Sep 17 00:00:00 2001 From: ckauth97 Date: Tue, 26 Jan 2016 09:52:43 -0600 Subject: [PATCH 42/59] Removed Skylar's uploads... Not Useful as of Now --- src/CannedAppleSauce.java | 12 ------------ src/CannedApples.java | 12 ------------ src/TherapeuticToiletPaper.java | 19 ------------------- src/runner.java | 9 +++++++++ 4 files changed, 9 insertions(+), 43 deletions(-) delete mode 100644 src/CannedAppleSauce.java delete mode 100644 src/CannedApples.java delete mode 100644 src/TherapeuticToiletPaper.java create mode 100644 src/runner.java diff --git a/src/CannedAppleSauce.java b/src/CannedAppleSauce.java deleted file mode 100644 index 7bb2fd0..0000000 --- a/src/CannedAppleSauce.java +++ /dev/null @@ -1,12 +0,0 @@ - -public class CannedAppleSauce extends Food{ - public CannedAppleSauce { - setCost(.7); - changeCost(.5, 7); - setStoreCost(.2); - setExpiration(365); - setDesirability(0); - setName("Canned Apple Sauce"); - setQuantity(100); - } -} diff --git a/src/CannedApples.java b/src/CannedApples.java deleted file mode 100644 index 3a2e7ad..0000000 --- a/src/CannedApples.java +++ /dev/null @@ -1,12 +0,0 @@ - -public class CannedApples extends Food{ - public CannedApples { - setCost(.5); - changeCost(.25, 7); - setStoreCost(.1); - setExpiration(365); - setDesirability(0); - setName("Canned Apples"); - setQuantity(100); - } -} diff --git a/src/TherapeuticToiletPaper.java b/src/TherapeuticToiletPaper.java deleted file mode 100644 index ebf7739..0000000 --- a/src/TherapeuticToiletPaper.java +++ /dev/null @@ -1,19 +0,0 @@ - -public class TherapeuticToiletPaper extends Food{ - - public TherapeuticToiletPaper { - setCost(1.0); - getCost(); - changeCost(.75, 1); - setStoreCost(.5); - getStoreCost(); - setExpiration(3); - getExpiration(); - setDesirability(3); - getDesirability(); - setName("Therapeutic Toilet Paper"); - String getName(); - setQuantity(100); - getQuantity(); - } -} diff --git a/src/runner.java b/src/runner.java new file mode 100644 index 0000000..8264c53 --- /dev/null +++ b/src/runner.java @@ -0,0 +1,9 @@ + +public class runner{ + + public static void main(String[] args) { + + + } + +} From e23bb8c642d21e123ed436bb3df28c7b889712b8 Mon Sep 17 00:00:00 2001 From: ckauth97 Date: Tue, 26 Jan 2016 09:53:44 -0600 Subject: [PATCH 43/59] Removed Main and Changed to Runner --- src/Main.java | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 src/Main.java diff --git a/src/Main.java b/src/Main.java deleted file mode 100644 index fbb4c87..0000000 --- a/src/Main.java +++ /dev/null @@ -1,9 +0,0 @@ - -public class main { - - public static void main(String[] args) { - - - } - -} \ No newline at end of file From 35a97111ed2a68525c75a980d5a2b00109451ad1 Mon Sep 17 00:00:00 2001 From: dbradley771 Date: Tue, 26 Jan 2016 10:06:20 -0600 Subject: [PATCH 44/59] More interface and restructured food. Added time parameter to changeStoreCost. Made name for variables more descriptive. Reordered food set things. --- src/CannedAppleSauce.java | 5 ++--- src/CannedApples.java | 5 ++--- src/Food.java | 38 ++++++++++++++++++++------------- src/Main.java | 4 +--- src/MerchandiseInterface.java | 2 +- src/TherapeuticToiletPaper.java | 14 +++--------- 6 files changed, 32 insertions(+), 36 deletions(-) diff --git a/src/CannedAppleSauce.java b/src/CannedAppleSauce.java index 7bb2fd0..8760167 100644 --- a/src/CannedAppleSauce.java +++ b/src/CannedAppleSauce.java @@ -1,12 +1,11 @@ public class CannedAppleSauce extends Food{ - public CannedAppleSauce { + public CannedAppleSauce() { + setName("Canned Apple Sauce"); setCost(.7); - changeCost(.5, 7); setStoreCost(.2); setExpiration(365); setDesirability(0); - setName("Canned Apple Sauce"); setQuantity(100); } } diff --git a/src/CannedApples.java b/src/CannedApples.java index 3a2e7ad..59ac496 100644 --- a/src/CannedApples.java +++ b/src/CannedApples.java @@ -1,12 +1,11 @@ public class CannedApples extends Food{ - public CannedApples { + public CannedApples() { + setName("Canned Apples"); setCost(.5); - changeCost(.25, 7); setStoreCost(.1); setExpiration(365); setDesirability(0); - setName("Canned Apples"); setQuantity(100); } } diff --git a/src/Food.java b/src/Food.java index 978dca9..9d543cb 100644 --- a/src/Food.java +++ b/src/Food.java @@ -3,33 +3,41 @@ public abstract class Food implements MerchandiseInterface { protected double cost; protected double oldCost; protected double storeCost; + protected double oldStoreCost; protected int tempCostTime; + protected int tempStoreCostTime; protected int expiration; protected int desirability; protected int quantity; protected boolean expired = false; - public void setCost(double c) { - cost = c; + public void setCost(double cost) { + this.cost = cost; } public double getCost() { return cost; } - public void changeCost(double c, int t) { - oldCost = cost; - cost = c; - tempCostTime = t; + public void changeCost(double cost, int time) { + oldCost = this.cost; + this.cost = cost; + tempCostTime = time; } - public void setStoreCost(double c) { - storeCost = c; + public void setStoreCost(double cost) { + storeCost = cost; } public double getStoreCost() { return storeCost; } + + public void changeStoreCost(double cost, int time) { + oldStoreCost = storeCost; + storeCost = cost; + tempStoreCostTime = time; + } public void setExpiration(int days) { //TODO Create a time system first @@ -40,9 +48,9 @@ public int getExpiration() { return expiration; } - public void setDesirability(int d) { - if(d >= 0 || d <= 2) { - desirability = d; + public void setDesirability(int desirability) { + if(desirability >= 0 || desirability <= 2) { + this.desirability = desirability; } else { System.out.println("Invalid Desirability on " + name); } @@ -52,16 +60,16 @@ public int getDesirability() { return desirability; } - public void setName(String n) { - name = n; + public void setName(String name) { + this.name = name; } public String getName() { return name; } - public void setQuantity(int q) { - quantity = q; + public void setQuantity(int quantity) { + this.quantity = quantity; } public int getQuantity() { diff --git a/src/Main.java b/src/Main.java index fbb4c87..a6711f6 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,9 +1,7 @@ -public class main { - +public class Main { public static void main(String[] args) { } - } \ No newline at end of file diff --git a/src/MerchandiseInterface.java b/src/MerchandiseInterface.java index 9539deb..7758ed7 100644 --- a/src/MerchandiseInterface.java +++ b/src/MerchandiseInterface.java @@ -31,7 +31,7 @@ public interface MerchandiseInterface { /** * Change the cost of the item to the store */ - void changeStoreCost(double cost); + void changeStoreCost(double cost, int time); /** * Set the date the item will expire based on day from now. diff --git a/src/TherapeuticToiletPaper.java b/src/TherapeuticToiletPaper.java index ebf7739..ae7ded8 100644 --- a/src/TherapeuticToiletPaper.java +++ b/src/TherapeuticToiletPaper.java @@ -1,19 +1,11 @@ public class TherapeuticToiletPaper extends Food{ - - public TherapeuticToiletPaper { + public TherapeuticToiletPaper() { + setName("Therapeutic Toilet Paper"); setCost(1.0); - getCost(); - changeCost(.75, 1); setStoreCost(.5); - getStoreCost(); setExpiration(3); - getExpiration(); setDesirability(3); - getDesirability(); - setName("Therapeutic Toilet Paper"); - String getName(); setQuantity(100); - getQuantity(); } -} +} \ No newline at end of file From 93102c1f7e2907daa105d8d49dbcc32bc4b2d101 Mon Sep 17 00:00:00 2001 From: dbradley771 Date: Tue, 26 Jan 2016 10:26:55 -0600 Subject: [PATCH 45/59] Renamed runner and removed extra spacing. --- src/{runner.java => Runner.java} | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename src/{runner.java => Runner.java} (68%) diff --git a/src/runner.java b/src/Runner.java similarity index 68% rename from src/runner.java rename to src/Runner.java index 8264c53..9a99747 100644 --- a/src/runner.java +++ b/src/Runner.java @@ -1,9 +1,7 @@ -public class runner{ - +public class Runner{ public static void main(String[] args) { } - } From 56d122d283f81496dd0f3a213a41a11400ace63f Mon Sep 17 00:00:00 2001 From: ckauth97 Date: Tue, 26 Jan 2016 12:54:25 -0600 Subject: [PATCH 46/59] Restructuring of Packages Re-arranged class files into respective packages and set up hierarchy for interfact implementation. --- src/Runner.java | 20 +++++++++++++++++-- .../MerchandiseInterface.java | 1 + .../food}/CannedAppleSauce.java | 1 + src/{ => interfaces/food}/CannedApples.java | 1 + src/{ => interfaces/food}/Food.java | 3 +++ .../TherapeuticToiletPaper.java | 4 ++++ 6 files changed, 28 insertions(+), 2 deletions(-) rename src/{ => interfaces}/MerchandiseInterface.java (93%) rename src/{ => interfaces/food}/CannedAppleSauce.java (85%) rename src/{ => interfaces/food}/CannedApples.java (84%) rename src/{ => interfaces/food}/Food.java (91%) rename src/{ => interfaces/otherProducts}/TherapeuticToiletPaper.java (68%) diff --git a/src/Runner.java b/src/Runner.java index 9a99747..b3ffc3d 100644 --- a/src/Runner.java +++ b/src/Runner.java @@ -1,7 +1,23 @@ +import interfaces.food.CannedAppleSauce; +import interfaces.food.CannedApples; +import interfaces.food.Food; + +public class Runner { + + static CannedApples ca = new CannedApples(); + static CannedAppleSauce cas = new CannedAppleSauce(); + + static Food list[] = { ca, cas }; -public class Runner{ public static void main(String[] args) { - + + for (Food f : list) { + System.out.println("Name: " + f.getName()); + System.out.println("Cost: " + f.getCost()); + System.out.println("Quantity: " + f.getQuantity()); + System.out.println("Expiration: " + f.getExpiration()); + System.out.println("\n\n"); + } } } diff --git a/src/MerchandiseInterface.java b/src/interfaces/MerchandiseInterface.java similarity index 93% rename from src/MerchandiseInterface.java rename to src/interfaces/MerchandiseInterface.java index 7758ed7..71061d1 100644 --- a/src/MerchandiseInterface.java +++ b/src/interfaces/MerchandiseInterface.java @@ -1,3 +1,4 @@ +package interfaces; public interface MerchandiseInterface { /** * Set the cost of the item to the customer diff --git a/src/CannedAppleSauce.java b/src/interfaces/food/CannedAppleSauce.java similarity index 85% rename from src/CannedAppleSauce.java rename to src/interfaces/food/CannedAppleSauce.java index 8760167..3390b51 100644 --- a/src/CannedAppleSauce.java +++ b/src/interfaces/food/CannedAppleSauce.java @@ -1,3 +1,4 @@ +package interfaces.food; public class CannedAppleSauce extends Food{ public CannedAppleSauce() { diff --git a/src/CannedApples.java b/src/interfaces/food/CannedApples.java similarity index 84% rename from src/CannedApples.java rename to src/interfaces/food/CannedApples.java index 59ac496..46e7d5c 100644 --- a/src/CannedApples.java +++ b/src/interfaces/food/CannedApples.java @@ -1,3 +1,4 @@ +package interfaces.food; public class CannedApples extends Food{ public CannedApples() { diff --git a/src/Food.java b/src/interfaces/food/Food.java similarity index 91% rename from src/Food.java rename to src/interfaces/food/Food.java index 9d543cb..8b60a2a 100644 --- a/src/Food.java +++ b/src/interfaces/food/Food.java @@ -1,3 +1,6 @@ +package interfaces.food; +import interfaces.MerchandiseInterface; + public abstract class Food implements MerchandiseInterface { protected String name; protected double cost; diff --git a/src/TherapeuticToiletPaper.java b/src/interfaces/otherProducts/TherapeuticToiletPaper.java similarity index 68% rename from src/TherapeuticToiletPaper.java rename to src/interfaces/otherProducts/TherapeuticToiletPaper.java index ae7ded8..77a48bc 100644 --- a/src/TherapeuticToiletPaper.java +++ b/src/interfaces/otherProducts/TherapeuticToiletPaper.java @@ -1,3 +1,7 @@ +package interfaces.otherProducts; +import interfaces.food.Food; + +//////TALK TO SKYLAR\\\\\\ public class TherapeuticToiletPaper extends Food{ public TherapeuticToiletPaper() { From 8ad3538cfc96d8473ae55637cebba844470120bd Mon Sep 17 00:00:00 2001 From: Alex Wissing Date: Wed, 27 Jan 2016 08:50:39 -0600 Subject: [PATCH 47/59] I believe I have fixed these food classes. --- src/Carrots.java | 13 +++++++------ src/Pork.java | 13 +++++++------ src/WhippedCream.java | 13 +++++++------ 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/Carrots.java b/src/Carrots.java index 2157e2c..06571cf 100644 --- a/src/Carrots.java +++ b/src/Carrots.java @@ -1,9 +1,10 @@ +package interfaces.food; public class Carrots extends Food { - name = "Carrots"; - cost = 0.30; - storeCost = 1.50; - quantity = 30; - expiration = 14; - desirability = 1; + setName = "Carrots"; + setCost = 0.30; + setStoreCost = 1.50; + setQuantity = 30; + setExpiration = 14; + setDesirability = 1; } diff --git a/src/Pork.java b/src/Pork.java index 737cfa2..cc7bccd 100644 --- a/src/Pork.java +++ b/src/Pork.java @@ -1,9 +1,10 @@ +package interfaces.food; public class Pork extends Food { - name = "Pork"; - cost = 2.00; - storeCost = 5.00; - quantity = 20; - expiration = 21; - desirability = 2; + setName = "Pork"; + setCost = 2.00; + setStoreCost = 5.00; + setQuantity = 20; + setExpiration = 21; + setDesirability = 2; } diff --git a/src/WhippedCream.java b/src/WhippedCream.java index 2cc807a..68abeac 100644 --- a/src/WhippedCream.java +++ b/src/WhippedCream.java @@ -1,9 +1,10 @@ +package interfaces.food; public class WhippedCream extends Food { - name = "Whipped Cream"; - cost = 0.40; - storeCost = 1.00; - quantity = 20; - expiration = 7; - desirability = 1; + setName = "Whipped Cream"; + setCost = 0.40; + setStoreCost = 1.00; + setQuantity = 20; + setExpiration = 7; + setDesirability = 1; } From c60e97416c24f3e8cd2e4a8f0178706d93f62ccc Mon Sep 17 00:00:00 2001 From: awissing290 Date: Thu, 28 Jan 2016 09:19:15 -0600 Subject: [PATCH 48/59] Ok now I matched my code to the one you put on the board and I'm sure that I got it :) --- src/Carrots.java | 14 ++++++++------ src/Pork.java | 14 ++++++++------ src/WhippedCream.java | 14 ++++++++------ 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/Carrots.java b/src/Carrots.java index 06571cf..316a28d 100644 --- a/src/Carrots.java +++ b/src/Carrots.java @@ -1,10 +1,12 @@ package interfaces.food; public class Carrots extends Food { - setName = "Carrots"; - setCost = 0.30; - setStoreCost = 1.50; - setQuantity = 30; - setExpiration = 14; - setDesirability = 1; + public Carrots(){ + setName = ("Carrots"); + setCost = 0.30; + setStoreCost = 1.50; + setQuantity = 30; + setExpiration = 14; + setDesirability = 1; + } } diff --git a/src/Pork.java b/src/Pork.java index cc7bccd..1be9ea4 100644 --- a/src/Pork.java +++ b/src/Pork.java @@ -1,10 +1,12 @@ package interfaces.food; public class Pork extends Food { - setName = "Pork"; - setCost = 2.00; - setStoreCost = 5.00; - setQuantity = 20; - setExpiration = 21; - setDesirability = 2; + public Pork(){ + setName = ("Pork"); + setCost = 2.00; + setStoreCost = 5.00; + setQuantity = 20; + setExpiration = 21; + setDesirability = 2; + } } diff --git a/src/WhippedCream.java b/src/WhippedCream.java index 68abeac..e2231c9 100644 --- a/src/WhippedCream.java +++ b/src/WhippedCream.java @@ -1,10 +1,12 @@ package interfaces.food; public class WhippedCream extends Food { - setName = "Whipped Cream"; - setCost = 0.40; - setStoreCost = 1.00; - setQuantity = 20; - setExpiration = 7; - setDesirability = 1; + public WhippedCream(){ + setName = ("Whipped Cream"); + setCost = 0.40; + setStoreCost = 1.00; + setQuantity = 20; + setExpiration = 7; + setDesirability = 1; + } } From db5cbeeb1a2203384bc871e707fa50091e3d42bd Mon Sep 17 00:00:00 2001 From: zmuehlich615 Date: Fri, 29 Jan 2016 08:23:45 -0600 Subject: [PATCH 49/59] 3 Foods - Apples, Bananas, Popcorn --- src/Apples.java | 12 ++++++++++++ src/Bananas.java | 13 +++++++++++++ src/Popcorn.java | 12 ++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 src/Apples.java create mode 100644 src/Bananas.java create mode 100644 src/Popcorn.java diff --git a/src/Apples.java b/src/Apples.java new file mode 100644 index 0000000..8fe5205 --- /dev/null +++ b/src/Apples.java @@ -0,0 +1,12 @@ +package interfaces.food; + +public class Apples extends Food{ + public Apples() { + setName("Apples"); + setCost(1.5); + setStoreCost(2.99); + setQuantity(30); + setExpiration(7); + setDesirability(2); + } +} \ No newline at end of file diff --git a/src/Bananas.java b/src/Bananas.java new file mode 100644 index 0000000..e46a772 --- /dev/null +++ b/src/Bananas.java @@ -0,0 +1,13 @@ +package interfaces.food; + +public class Bananas extends Food { + public Bananas() { + setName("Bananas"); + setCost(1.99); + setStoreCost(3.99); + setQuantity(30); + setExpiration(7); + setDesirability(2); + } +} + diff --git a/src/Popcorn.java b/src/Popcorn.java new file mode 100644 index 0000000..215ca19 --- /dev/null +++ b/src/Popcorn.java @@ -0,0 +1,12 @@ +package interfaces.food; + +public class Popcorn extends Food { + public Popcorn() { + setName("Popcorn"); + setCost(2.99); + setStoreCost(4.99); + setQuantity(15); + setExpiration(120); + setDesirability(1); + } +} From 7720c73e8055f58106faede99e77509302068e3c Mon Sep 17 00:00:00 2001 From: njones958 Date: Fri, 29 Jan 2016 08:24:48 -0600 Subject: [PATCH 50/59] Adding Two Foods to the game -- Nick Jones Frozen Pizza & Pancake Mix --- src/FrozenPizza.java | 17 +++++++++++++++++ src/PancakeMix.java | 11 +++++++++++ 2 files changed, 28 insertions(+) create mode 100644 src/FrozenPizza.java create mode 100644 src/PancakeMix.java diff --git a/src/FrozenPizza.java b/src/FrozenPizza.java new file mode 100644 index 0000000..ae3ea3b --- /dev/null +++ b/src/FrozenPizza.java @@ -0,0 +1,17 @@ + +public class FrozenPizza { + +public class FrozenPizza extends food{ + public Frozen Pizza{ + setName("Frozen Pizza"); + setCost(4.00); + setStoreCost(2.00); + setQuantity(15); + setExpiration(30); + setDesirability(3); + } + + +} + +} diff --git a/src/PancakeMix.java b/src/PancakeMix.java new file mode 100644 index 0000000..67c298f --- /dev/null +++ b/src/PancakeMix.java @@ -0,0 +1,11 @@ + +public class PancakeMix extends food{ + public PancakeMix{ + setName("Pancake Mix"); + setCost(3.99); + setStoreCost(1.72); + setQuantity(11); + setExpiration(30); + setDesirability(2); + } +} From 0c6b0875ced814edf04a1922f2e0f3778f3191fc Mon Sep 17 00:00:00 2001 From: csnodgrass Date: Fri, 29 Jan 2016 08:26:35 -0600 Subject: [PATCH 51/59] Added Pie Class and Pie Mix Class Might want to check this --- Pie.java | 12 ++++++++++++ PieMix.java | 11 +++++++++++ 2 files changed, 23 insertions(+) create mode 100644 Pie.java create mode 100644 PieMix.java diff --git a/Pie.java b/Pie.java new file mode 100644 index 0000000..d8be4e7 --- /dev/null +++ b/Pie.java @@ -0,0 +1,12 @@ +package interfaces.food; +public class Pie extends Food { +public Pie(){ + setDesirability(1); + setCost(5.00); + setStoreCost(7.29); + setQuantity(21); + setExpiration(7); + setName("Pie"); + +} +} diff --git a/PieMix.java b/PieMix.java new file mode 100644 index 0000000..d6f4b11 --- /dev/null +++ b/PieMix.java @@ -0,0 +1,11 @@ +package interfaces.food; +public class PieMix { +public PieMix(){ + setDesirability(1); + setCost(2.00); + setStoreCost(4.00); + setQuantity(15); + setExpiration(186); + setName("Pie Mix"); +} +} From de6c4c8d71047a131f1f571043b3cf27c42c649d Mon Sep 17 00:00:00 2001 From: sosborn002 Date: Fri, 29 Jan 2016 08:32:36 -0600 Subject: [PATCH 52/59] Added both food classes Hot Pockets and Pizza Rolls all values set, comments put in per the need, was told to ignore any errors. --- src/HotPockets.java | 12 ++++++++++++ src/PizzaRolls.java | 13 +++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 src/HotPockets.java create mode 100644 src/PizzaRolls.java diff --git a/src/HotPockets.java b/src/HotPockets.java new file mode 100644 index 0000000..9339966 --- /dev/null +++ b/src/HotPockets.java @@ -0,0 +1,12 @@ +package interfaces.food; + +public class HotPockets extends Food{ + public void HotPockets(){ + setName("Hot Pockets"); + setCost(2); + setStoreCost(1); + setQuantity(25); + setExpiration(3); //days + setDesirability(1); + } +} diff --git a/src/PizzaRolls.java b/src/PizzaRolls.java new file mode 100644 index 0000000..f62b0ea --- /dev/null +++ b/src/PizzaRolls.java @@ -0,0 +1,13 @@ +package interfaces.food; + +public class PizzaRolls extends Food { + + public void PizzaRolls(){ + setName("Pizza Rolls"); + setCost(5); + setStoreCost(2); + setQuantity(20); + setExpiration(5); // days + setDesirability(2); + } +} From 7a28ffbfc4574759b1bbbc8c767d160214c481c5 Mon Sep 17 00:00:00 2001 From: SilverCorked Date: Fri, 29 Jan 2016 08:34:35 -0600 Subject: [PATCH 53/59] Ok now im sure its good. I was sure last time but now im more sure. --- src/Carrots.java | 13 +++++++------ src/Pork.java | 12 ++++++------ src/WhippedCream.java | 12 ++++++------ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/Carrots.java b/src/Carrots.java index 316a28d..f050c33 100644 --- a/src/Carrots.java +++ b/src/Carrots.java @@ -2,11 +2,12 @@ public class Carrots extends Food { public Carrots(){ - setName = ("Carrots"); - setCost = 0.30; - setStoreCost = 1.50; - setQuantity = 30; - setExpiration = 14; - setDesirability = 1; + setName("Carrots"); + setCost(0.30); + setStoreCost(1.50); + setQuantity(30); + setExpiration(14); + setDesirability(1); + } } diff --git a/src/Pork.java b/src/Pork.java index 1be9ea4..09b5c3f 100644 --- a/src/Pork.java +++ b/src/Pork.java @@ -2,11 +2,11 @@ public class Pork extends Food { public Pork(){ - setName = ("Pork"); - setCost = 2.00; - setStoreCost = 5.00; - setQuantity = 20; - setExpiration = 21; - setDesirability = 2; + setName("Pork"); + setCost(2.00); + setStoreCost(5.00); + setQuantity(20); + setExpiration(21); + setDesirability(2); } } diff --git a/src/WhippedCream.java b/src/WhippedCream.java index e2231c9..7722e5f 100644 --- a/src/WhippedCream.java +++ b/src/WhippedCream.java @@ -2,11 +2,11 @@ public class WhippedCream extends Food { public WhippedCream(){ - setName = ("Whipped Cream"); - setCost = 0.40; - setStoreCost = 1.00; - setQuantity = 20; - setExpiration = 7; - setDesirability = 1; + setName("Whipped Cream"); + setCost(0.40); + setStoreCost(1.00); + setQuantity(20); + setExpiration(7); + setDesirability(1); } } From 98c847eabf487d869a9d2918c4e28945584b80bb Mon Sep 17 00:00:00 2001 From: akusleika Date: Fri, 29 Jan 2016 08:35:03 -0600 Subject: [PATCH 54/59] Andrew Kusleika food classes created Butter, Spaghetti, and Fruit Snacks --- src/Butter.java | 19 +++++++++++-------- src/FruitSnacks.java | 20 +++++++++++--------- src/Spaghetti.java | 18 ++++++++++-------- 3 files changed, 32 insertions(+), 25 deletions(-) diff --git a/src/Butter.java b/src/Butter.java index eac826b..1f7c1e2 100644 --- a/src/Butter.java +++ b/src/Butter.java @@ -1,11 +1,14 @@ +package interfaces.food; -public abstract class Butter extends Food { - public Butter(){ - desirability = 3; - expiration = 7; - name = "Butter"; - cost = 2; - storeCost = 3; - quantity = 30; +public class Butter extends Food { + public void Butter() { + setName("Butter"); + setDesirability(3); + setExpiration(7); + setCost(2); + setStoreCost(3); + setQuantity(30); + } } +// \ No newline at end of file diff --git a/src/FruitSnacks.java b/src/FruitSnacks.java index a1f03fe..d7cbd75 100644 --- a/src/FruitSnacks.java +++ b/src/FruitSnacks.java @@ -1,11 +1,13 @@ +package interfaces.food; -public abstract class FruitSnacks extends Food{ - public FruitSnacks() { - desirability = 2; - expiration = 31; - name = "Fruit Snacks"; - cost = 3; - storeCost = 1; - quantity = 10; +public class FruitSnacks extends Food { + public void FruitSnacks() { + setName("Fruit Snacks"); + setDesirability(2); + setExpiration(31); + setCost(3); + setStoreCost(1); + setQuantity(10); + } -} +}// \ No newline at end of file diff --git a/src/Spaghetti.java b/src/Spaghetti.java index 8bc6145..16d793b 100644 --- a/src/Spaghetti.java +++ b/src/Spaghetti.java @@ -1,12 +1,14 @@ +package interfaces.food; -public abstract class Spaghetti extends Food { - public Spaghetti() { - desirability = 3; - expiration = 30; - name = "Spaghetti"; - cost = 3; - storeCost = 1; - quantity = 20; +public class Spaghetti extends Food { + public void Spaghetti() { + setName("Spaghetti"); + setDesirability(3); + setExpiration(30); + setCost(3); + setStoreCost(1); + setQuantity(20); } } +// \ No newline at end of file From 4133156d00a296dbbd22f3dcd47515d12f813fd5 Mon Sep 17 00:00:00 2001 From: csnodgrass Date: Fri, 29 Jan 2016 08:36:39 -0600 Subject: [PATCH 55/59] Added Pie Class and Pie Mix with changes --- Pie.java | 2 +- PieMix.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Pie.java b/Pie.java index d8be4e7..199e6a3 100644 --- a/Pie.java +++ b/Pie.java @@ -1,6 +1,6 @@ package interfaces.food; public class Pie extends Food { -public Pie(){ +public void Pie(){ setDesirability(1); setCost(5.00); setStoreCost(7.29); diff --git a/PieMix.java b/PieMix.java index d6f4b11..fc96404 100644 --- a/PieMix.java +++ b/PieMix.java @@ -1,6 +1,6 @@ package interfaces.food; public class PieMix { -public PieMix(){ +public void PieMix(){ setDesirability(1); setCost(2.00); setStoreCost(4.00); From ffdfeb7d967132c747f58d12a34337cf50b1d4df Mon Sep 17 00:00:00 2001 From: Grant Date: Fri, 29 Jan 2016 08:37:21 -0600 Subject: [PATCH 56/59] Added Food Classes Created Coffee and Almonds --- src/Almonds.java | 12 ++++++++++++ src/Coffee.java | 11 +++++++++++ 2 files changed, 23 insertions(+) create mode 100644 src/Almonds.java create mode 100644 src/Coffee.java diff --git a/src/Almonds.java b/src/Almonds.java new file mode 100644 index 0000000..4f3b64a --- /dev/null +++ b/src/Almonds.java @@ -0,0 +1,12 @@ +package interfaces.food; + +public class Almonds extends Food { + public Almonds(){ + setName("Almonds"); + setCost(3.00); + SetStoreCost(5.00); + setQuantity(10); + setExpiration(60); + setDesirability(1); + } +} diff --git a/src/Coffee.java b/src/Coffee.java new file mode 100644 index 0000000..a848b89 --- /dev/null +++ b/src/Coffee.java @@ -0,0 +1,11 @@ +package interfaces.food; + +public class Coffee extends Food { + public Coffee(){ + setName("Coffee"); + setCost(2.50); + setStoreCost(5.00) + setQuantity(12); + setExpiration(360); + setDesirability(2);} +} From 544440a968f1b5a167b88c9b3bf95fd02e3f03d8 Mon Sep 17 00:00:00 2001 From: jhoogner379 Date: Fri, 29 Jan 2016 08:39:10 -0600 Subject: [PATCH 57/59] food classes uploaded --- src/Bacon.java | 12 ++++++++++++ src/Chicken_Fingers.java | 12 ++++++++++++ src/IceCream.java | 10 ++++++++++ 3 files changed, 34 insertions(+) create mode 100644 src/Bacon.java create mode 100644 src/Chicken_Fingers.java create mode 100644 src/IceCream.java diff --git a/src/Bacon.java b/src/Bacon.java new file mode 100644 index 0000000..138513a --- /dev/null +++ b/src/Bacon.java @@ -0,0 +1,12 @@ +package interfaces.food; + +public class Bacon extends Food { + public void Bacon(){ + setName("Bacon"); + setCost(0.50); + setStoreCost(6.00); + setQuantity(6); + setExpiration(7); + setDesirability(2); + } +} diff --git a/src/Chicken_Fingers.java b/src/Chicken_Fingers.java new file mode 100644 index 0000000..55a0602 --- /dev/null +++ b/src/Chicken_Fingers.java @@ -0,0 +1,12 @@ +package interfaces.food; + +public class Chicken_Fingers extends Food{ + public void Chicken_Fingers(){ + setName("Chicken_Fingers"); + setCost(0.20); + setStoreCost(3.00); + setQuantity(5); + setExpiration(21); + setDesirability(1); + } +} diff --git a/src/IceCream.java b/src/IceCream.java new file mode 100644 index 0000000..9c1bd41 --- /dev/null +++ b/src/IceCream.java @@ -0,0 +1,10 @@ +package interfaces.food; + +public class IceCream { + setName("Chicken_Fingers"); + setCost(0.20); + setStoreCost(3.00); + setQuantity(5); + setExpiration(21); + setDesirability(1); +} From 04715f4d0ed7d6ba0730f851df2c77eacc6cba41 Mon Sep 17 00:00:00 2001 From: dbeut Date: Fri, 29 Jan 2016 08:41:47 -0600 Subject: [PATCH 58/59] Added Food Classes Created beef, blueberries and strawberries. --- src/Beef.java | 17 +++++++++++++++++ src/Blueberries.java | 16 ++++++++++++++++ src/Strawberries.java | 16 ++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 src/Beef.java create mode 100644 src/Blueberries.java create mode 100644 src/Strawberries.java diff --git a/src/Beef.java b/src/Beef.java new file mode 100644 index 0000000..13497b8 --- /dev/null +++ b/src/Beef.java @@ -0,0 +1,17 @@ +package org.millardps.StoreSim; + +import interfaces.food.Food; + + +public class Beef extends Food{ + public Beef(){ + setDesirability(2); + setExpiration(14); + setName("Beef"); + setCost(3.99); + setStoreCost(1.50); + setQuantity(50); + } +} + +// \ No newline at end of file diff --git a/src/Blueberries.java b/src/Blueberries.java new file mode 100644 index 0000000..99d6f17 --- /dev/null +++ b/src/Blueberries.java @@ -0,0 +1,16 @@ +package org.millardps.StoreSim; + +import interfaces.food.Food; + + +public class Blueberries extends Food { + public Blueberries(){ + setDesirability(1); + setExpiration(7); + setName("Blueberries"); + setCost(3.99); + setStoreCost(1.50); + setQuantity(5); + } +} +// \ No newline at end of file diff --git a/src/Strawberries.java b/src/Strawberries.java new file mode 100644 index 0000000..a78547a --- /dev/null +++ b/src/Strawberries.java @@ -0,0 +1,16 @@ +package org.millardps.StoreSim; + +import interfaces.food.Food; + + +public class Strawberries extends Food { + public Strawberries(){ + setDesirability(2); + setExpiration(7); + setName("Strawberries"); + setCost(4.99); + setStoreCost(1.50); + setQuantity(15); + } +} +// \ No newline at end of file From 6d0ea653b9e360f49f267a3fb4e963b49eecf36f Mon Sep 17 00:00:00 2001 From: dbradley771 Date: Fri, 29 Jan 2016 09:04:34 -0600 Subject: [PATCH 59/59] CLEAN CLEAN CLEAN CLEAN CLEAN CLEAN CLEAN CLEAN CLEAN CLEAN CLEAN CLEAN --- AndrewKusleika.txt | 1 - ChaseSnodgrass.txt | 1 - Pie.java | 12 ------------ PieMix.java | 11 ----------- Untitled.txt | 1 - src/Beef.java | 17 ----------------- src/IceCream.java | 10 ---------- src/{ => interfaces/food}/Almonds.java | 4 ++-- src/{ => interfaces/food}/Apples.java | 0 src/{ => interfaces/food}/Bacon.java | 2 +- src/{ => interfaces/food}/Bananas.java | 3 +-- src/interfaces/food/Beef.java | 12 ++++++++++++ src/{ => interfaces/food}/Blueberries.java | 12 ++++-------- src/{ => interfaces/food}/Butter.java | 4 +--- src/interfaces/food/CannedAppleSauce.java | 2 +- src/interfaces/food/CannedApples.java | 2 +- src/{ => interfaces/food}/Carrots.java | 7 +++---- src/{ => interfaces/food}/Cheetos.java | 2 +- src/{ => interfaces/food}/Chicken_Fingers.java | 2 +- src/{ => interfaces/food}/Chocolate.java | 4 ++-- src/{ => interfaces/food}/Coffee.java | 9 +++++---- src/{ => interfaces/food}/FrozenPizza.java | 13 ++++--------- src/{ => interfaces/food}/FruitSnacks.java | 3 +-- src/{ => interfaces/food}/HotPockets.java | 10 +++++----- src/interfaces/food/IceCream.java | 12 ++++++++++++ src/{ => interfaces/food}/PancakeMix.java | 7 ++++--- src/interfaces/food/Pie.java | 12 ++++++++++++ src/interfaces/food/PieMix.java | 12 ++++++++++++ src/{ => interfaces/food}/PizzaRolls.java | 7 +++---- src/{ => interfaces/food}/Popcorn.java | 0 src/{ => interfaces/food}/Pork.java | 2 +- src/{ => interfaces/food}/Ramen.java | 5 ++--- src/{ => interfaces/food}/Spaghetti.java | 4 +--- src/{ => interfaces/food}/Strawberries.java | 12 ++++-------- src/{ => interfaces/food}/WhippedCream.java | 2 +- 35 files changed, 97 insertions(+), 122 deletions(-) delete mode 100644 AndrewKusleika.txt delete mode 100644 ChaseSnodgrass.txt delete mode 100644 Pie.java delete mode 100644 PieMix.java delete mode 100644 Untitled.txt delete mode 100644 src/Beef.java delete mode 100644 src/IceCream.java rename src/{ => interfaces/food}/Almonds.java (83%) rename src/{ => interfaces/food}/Apples.java (100%) rename src/{ => interfaces/food}/Bacon.java (93%) rename src/{ => interfaces/food}/Bananas.java (92%) create mode 100644 src/interfaces/food/Beef.java rename src/{ => interfaces/food}/Blueberries.java (60%) rename src/{ => interfaces/food}/Butter.java (91%) rename src/{ => interfaces/food}/Carrots.java (73%) rename src/{ => interfaces/food}/Cheetos.java (81%) rename src/{ => interfaces/food}/Chicken_Fingers.java (94%) rename src/{ => interfaces/food}/Chocolate.java (81%) rename src/{ => interfaces/food}/Coffee.java (64%) rename src/{ => interfaces/food}/FrozenPizza.java (57%) rename src/{ => interfaces/food}/FruitSnacks.java (92%) rename src/{ => interfaces/food}/HotPockets.java (53%) create mode 100644 src/interfaces/food/IceCream.java rename src/{ => interfaces/food}/PancakeMix.java (60%) create mode 100644 src/interfaces/food/Pie.java create mode 100644 src/interfaces/food/PieMix.java rename src/{ => interfaces/food}/PizzaRolls.java (70%) rename src/{ => interfaces/food}/Popcorn.java (100%) rename src/{ => interfaces/food}/Pork.java (93%) rename src/{ => interfaces/food}/Ramen.java (79%) rename src/{ => interfaces/food}/Spaghetti.java (91%) rename src/{ => interfaces/food}/Strawberries.java (60%) rename src/{ => interfaces/food}/WhippedCream.java (94%) diff --git a/AndrewKusleika.txt b/AndrewKusleika.txt deleted file mode 100644 index bdba1cb..0000000 --- a/AndrewKusleika.txt +++ /dev/null @@ -1 +0,0 @@ -Andrew Kusleika \ No newline at end of file diff --git a/ChaseSnodgrass.txt b/ChaseSnodgrass.txt deleted file mode 100644 index caf27ce..0000000 --- a/ChaseSnodgrass.txt +++ /dev/null @@ -1 +0,0 @@ -ChaseSnodgrass \ No newline at end of file diff --git a/Pie.java b/Pie.java deleted file mode 100644 index 199e6a3..0000000 --- a/Pie.java +++ /dev/null @@ -1,12 +0,0 @@ -package interfaces.food; -public class Pie extends Food { -public void Pie(){ - setDesirability(1); - setCost(5.00); - setStoreCost(7.29); - setQuantity(21); - setExpiration(7); - setName("Pie"); - -} -} diff --git a/PieMix.java b/PieMix.java deleted file mode 100644 index fc96404..0000000 --- a/PieMix.java +++ /dev/null @@ -1,11 +0,0 @@ -package interfaces.food; -public class PieMix { -public void PieMix(){ - setDesirability(1); - setCost(2.00); - setStoreCost(4.00); - setQuantity(15); - setExpiration(186); - setName("Pie Mix"); -} -} diff --git a/Untitled.txt b/Untitled.txt deleted file mode 100644 index f06b8cd..0000000 --- a/Untitled.txt +++ /dev/null @@ -1 +0,0 @@ -Grant Ray diff --git a/src/Beef.java b/src/Beef.java deleted file mode 100644 index 13497b8..0000000 --- a/src/Beef.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.millardps.StoreSim; - -import interfaces.food.Food; - - -public class Beef extends Food{ - public Beef(){ - setDesirability(2); - setExpiration(14); - setName("Beef"); - setCost(3.99); - setStoreCost(1.50); - setQuantity(50); - } -} - -// \ No newline at end of file diff --git a/src/IceCream.java b/src/IceCream.java deleted file mode 100644 index 9c1bd41..0000000 --- a/src/IceCream.java +++ /dev/null @@ -1,10 +0,0 @@ -package interfaces.food; - -public class IceCream { - setName("Chicken_Fingers"); - setCost(0.20); - setStoreCost(3.00); - setQuantity(5); - setExpiration(21); - setDesirability(1); -} diff --git a/src/Almonds.java b/src/interfaces/food/Almonds.java similarity index 83% rename from src/Almonds.java rename to src/interfaces/food/Almonds.java index 4f3b64a..a459d35 100644 --- a/src/Almonds.java +++ b/src/interfaces/food/Almonds.java @@ -4,9 +4,9 @@ public class Almonds extends Food { public Almonds(){ setName("Almonds"); setCost(3.00); - SetStoreCost(5.00); + setStoreCost(5.00); setQuantity(10); setExpiration(60); setDesirability(1); } -} +} \ No newline at end of file diff --git a/src/Apples.java b/src/interfaces/food/Apples.java similarity index 100% rename from src/Apples.java rename to src/interfaces/food/Apples.java diff --git a/src/Bacon.java b/src/interfaces/food/Bacon.java similarity index 93% rename from src/Bacon.java rename to src/interfaces/food/Bacon.java index 138513a..438a586 100644 --- a/src/Bacon.java +++ b/src/interfaces/food/Bacon.java @@ -9,4 +9,4 @@ public void Bacon(){ setExpiration(7); setDesirability(2); } -} +} \ No newline at end of file diff --git a/src/Bananas.java b/src/interfaces/food/Bananas.java similarity index 92% rename from src/Bananas.java rename to src/interfaces/food/Bananas.java index e46a772..6762b37 100644 --- a/src/Bananas.java +++ b/src/interfaces/food/Bananas.java @@ -9,5 +9,4 @@ public Bananas() { setExpiration(7); setDesirability(2); } -} - +} \ No newline at end of file diff --git a/src/interfaces/food/Beef.java b/src/interfaces/food/Beef.java new file mode 100644 index 0000000..1c5b8ae --- /dev/null +++ b/src/interfaces/food/Beef.java @@ -0,0 +1,12 @@ +package interfaces.food; + +public class Beef extends Food { + public Beef() { + setDesirability(2); + setExpiration(14); + setName("Beef"); + setCost(3.99); + setStoreCost(1.50); + setQuantity(50); + } +} \ No newline at end of file diff --git a/src/Blueberries.java b/src/interfaces/food/Blueberries.java similarity index 60% rename from src/Blueberries.java rename to src/interfaces/food/Blueberries.java index 99d6f17..63f2eb8 100644 --- a/src/Blueberries.java +++ b/src/interfaces/food/Blueberries.java @@ -1,16 +1,12 @@ -package org.millardps.StoreSim; - -import interfaces.food.Food; - +package interfaces.food; public class Blueberries extends Food { - public Blueberries(){ + public Blueberries() { setDesirability(1); setExpiration(7); setName("Blueberries"); setCost(3.99); setStoreCost(1.50); setQuantity(5); - } -} -// \ No newline at end of file + } +} \ No newline at end of file diff --git a/src/Butter.java b/src/interfaces/food/Butter.java similarity index 91% rename from src/Butter.java rename to src/interfaces/food/Butter.java index 1f7c1e2..20a793d 100644 --- a/src/Butter.java +++ b/src/interfaces/food/Butter.java @@ -8,7 +8,5 @@ public void Butter() { setCost(2); setStoreCost(3); setQuantity(30); - } -} -// \ No newline at end of file +} \ No newline at end of file diff --git a/src/interfaces/food/CannedAppleSauce.java b/src/interfaces/food/CannedAppleSauce.java index 3390b51..946247d 100644 --- a/src/interfaces/food/CannedAppleSauce.java +++ b/src/interfaces/food/CannedAppleSauce.java @@ -9,4 +9,4 @@ public CannedAppleSauce() { setDesirability(0); setQuantity(100); } -} +} \ No newline at end of file diff --git a/src/interfaces/food/CannedApples.java b/src/interfaces/food/CannedApples.java index 46e7d5c..88fa127 100644 --- a/src/interfaces/food/CannedApples.java +++ b/src/interfaces/food/CannedApples.java @@ -9,4 +9,4 @@ public CannedApples() { setDesirability(0); setQuantity(100); } -} +} \ No newline at end of file diff --git a/src/Carrots.java b/src/interfaces/food/Carrots.java similarity index 73% rename from src/Carrots.java rename to src/interfaces/food/Carrots.java index f050c33..b33b043 100644 --- a/src/Carrots.java +++ b/src/interfaces/food/Carrots.java @@ -1,13 +1,12 @@ package interfaces.food; public class Carrots extends Food { - public Carrots(){ + public Carrots() { setName("Carrots"); setCost(0.30); setStoreCost(1.50); setQuantity(30); setExpiration(14); - setDesirability(1); - + setDesirability(1); } -} +} \ No newline at end of file diff --git a/src/Cheetos.java b/src/interfaces/food/Cheetos.java similarity index 81% rename from src/Cheetos.java rename to src/interfaces/food/Cheetos.java index cd4eaff..8197f73 100644 --- a/src/Cheetos.java +++ b/src/interfaces/food/Cheetos.java @@ -1,4 +1,4 @@ -package org.mpsomaha.StoreSim; +package interfaces.food; public class Cheetos extends Food { public void Cheetos() { diff --git a/src/Chicken_Fingers.java b/src/interfaces/food/Chicken_Fingers.java similarity index 94% rename from src/Chicken_Fingers.java rename to src/interfaces/food/Chicken_Fingers.java index 55a0602..21e61e9 100644 --- a/src/Chicken_Fingers.java +++ b/src/interfaces/food/Chicken_Fingers.java @@ -9,4 +9,4 @@ public void Chicken_Fingers(){ setExpiration(21); setDesirability(1); } -} +} \ No newline at end of file diff --git a/src/Chocolate.java b/src/interfaces/food/Chocolate.java similarity index 81% rename from src/Chocolate.java rename to src/interfaces/food/Chocolate.java index c247309..bcf9cb1 100644 --- a/src/Chocolate.java +++ b/src/interfaces/food/Chocolate.java @@ -1,4 +1,4 @@ -package org.mpsomaha.StoreSim; +package interfaces.food; public class Chocolate extends Food { public void Chocolate() { @@ -9,4 +9,4 @@ public void Chocolate() { setQuantity(50); setStoreCost(0.50); } -} +} \ No newline at end of file diff --git a/src/Coffee.java b/src/interfaces/food/Coffee.java similarity index 64% rename from src/Coffee.java rename to src/interfaces/food/Coffee.java index a848b89..c93c352 100644 --- a/src/Coffee.java +++ b/src/interfaces/food/Coffee.java @@ -1,11 +1,12 @@ package interfaces.food; public class Coffee extends Food { - public Coffee(){ + public Coffee() { setName("Coffee"); setCost(2.50); - setStoreCost(5.00) + setStoreCost(5.00); setQuantity(12); setExpiration(360); - setDesirability(2);} -} + setDesirability(2); + } +} \ No newline at end of file diff --git a/src/FrozenPizza.java b/src/interfaces/food/FrozenPizza.java similarity index 57% rename from src/FrozenPizza.java rename to src/interfaces/food/FrozenPizza.java index ae3ea3b..82481af 100644 --- a/src/FrozenPizza.java +++ b/src/interfaces/food/FrozenPizza.java @@ -1,8 +1,7 @@ +package interfaces.food; -public class FrozenPizza { - -public class FrozenPizza extends food{ - public Frozen Pizza{ +public class FrozenPizza extends Food { + public FrozenPizza() { setName("Frozen Pizza"); setCost(4.00); setStoreCost(2.00); @@ -10,8 +9,4 @@ public class FrozenPizza extends food{ setExpiration(30); setDesirability(3); } - - -} - -} +} \ No newline at end of file diff --git a/src/FruitSnacks.java b/src/interfaces/food/FruitSnacks.java similarity index 92% rename from src/FruitSnacks.java rename to src/interfaces/food/FruitSnacks.java index d7cbd75..a89a30d 100644 --- a/src/FruitSnacks.java +++ b/src/interfaces/food/FruitSnacks.java @@ -8,6 +8,5 @@ public void FruitSnacks() { setCost(3); setStoreCost(1); setQuantity(10); - } -}// \ No newline at end of file +} \ No newline at end of file diff --git a/src/HotPockets.java b/src/interfaces/food/HotPockets.java similarity index 53% rename from src/HotPockets.java rename to src/interfaces/food/HotPockets.java index 9339966..e12f5cb 100644 --- a/src/HotPockets.java +++ b/src/interfaces/food/HotPockets.java @@ -1,12 +1,12 @@ package interfaces.food; -public class HotPockets extends Food{ - public void HotPockets(){ +public class HotPockets extends Food { + public void HotPockets() { setName("Hot Pockets"); setCost(2); setStoreCost(1); setQuantity(25); - setExpiration(3); //days + setExpiration(3); setDesirability(1); - } -} + } +} \ No newline at end of file diff --git a/src/interfaces/food/IceCream.java b/src/interfaces/food/IceCream.java new file mode 100644 index 0000000..cb246e8 --- /dev/null +++ b/src/interfaces/food/IceCream.java @@ -0,0 +1,12 @@ +package interfaces.food; + +public class IceCream extends Food { + public void IceCream() { + setName("Chicken_Fingers"); + setCost(0.20); + setStoreCost(3.00); + setQuantity(5); + setExpiration(21); + setDesirability(1); + } +} \ No newline at end of file diff --git a/src/PancakeMix.java b/src/interfaces/food/PancakeMix.java similarity index 60% rename from src/PancakeMix.java rename to src/interfaces/food/PancakeMix.java index 67c298f..18970a1 100644 --- a/src/PancakeMix.java +++ b/src/interfaces/food/PancakeMix.java @@ -1,6 +1,7 @@ +package interfaces.food; -public class PancakeMix extends food{ - public PancakeMix{ +public class PancakeMix extends Food{ + public PancakeMix() { setName("Pancake Mix"); setCost(3.99); setStoreCost(1.72); @@ -8,4 +9,4 @@ public class PancakeMix extends food{ setExpiration(30); setDesirability(2); } -} +} \ No newline at end of file diff --git a/src/interfaces/food/Pie.java b/src/interfaces/food/Pie.java new file mode 100644 index 0000000..4c1740e --- /dev/null +++ b/src/interfaces/food/Pie.java @@ -0,0 +1,12 @@ +package interfaces.food; + +public class Pie extends Food { + public void Pie() { + setDesirability(1); + setCost(5.00); + setStoreCost(7.29); + setQuantity(21); + setExpiration(7); + setName("Pie"); + } +} \ No newline at end of file diff --git a/src/interfaces/food/PieMix.java b/src/interfaces/food/PieMix.java new file mode 100644 index 0000000..eeaaa16 --- /dev/null +++ b/src/interfaces/food/PieMix.java @@ -0,0 +1,12 @@ +package interfaces.food; + +public class PieMix extends Food { + public void PieMix() { + setDesirability(1); + setCost(2.00); + setStoreCost(4.00); + setQuantity(15); + setExpiration(186); + setName("Pie Mix"); + } +} \ No newline at end of file diff --git a/src/PizzaRolls.java b/src/interfaces/food/PizzaRolls.java similarity index 70% rename from src/PizzaRolls.java rename to src/interfaces/food/PizzaRolls.java index f62b0ea..e093a32 100644 --- a/src/PizzaRolls.java +++ b/src/interfaces/food/PizzaRolls.java @@ -1,13 +1,12 @@ package interfaces.food; public class PizzaRolls extends Food { - - public void PizzaRolls(){ + public void PizzaRolls() { setName("Pizza Rolls"); setCost(5); setStoreCost(2); setQuantity(20); - setExpiration(5); // days + setExpiration(5); setDesirability(2); } -} +} \ No newline at end of file diff --git a/src/Popcorn.java b/src/interfaces/food/Popcorn.java similarity index 100% rename from src/Popcorn.java rename to src/interfaces/food/Popcorn.java diff --git a/src/Pork.java b/src/interfaces/food/Pork.java similarity index 93% rename from src/Pork.java rename to src/interfaces/food/Pork.java index 09b5c3f..52bb3c3 100644 --- a/src/Pork.java +++ b/src/interfaces/food/Pork.java @@ -9,4 +9,4 @@ public Pork(){ setExpiration(21); setDesirability(2); } -} +} \ No newline at end of file diff --git a/src/Ramen.java b/src/interfaces/food/Ramen.java similarity index 79% rename from src/Ramen.java rename to src/interfaces/food/Ramen.java index 8fb5aa0..f67aff9 100644 --- a/src/Ramen.java +++ b/src/interfaces/food/Ramen.java @@ -1,4 +1,4 @@ -package org.mpsomaha.StoreSim; +package interfaces.food; public class Ramen extends Food{ public void Ramen() { @@ -8,6 +8,5 @@ public void Ramen() { setCost(1.00); setQuantity(50); setStoreCost(0.10); - } -} +} \ No newline at end of file diff --git a/src/Spaghetti.java b/src/interfaces/food/Spaghetti.java similarity index 91% rename from src/Spaghetti.java rename to src/interfaces/food/Spaghetti.java index 16d793b..aeafce3 100644 --- a/src/Spaghetti.java +++ b/src/interfaces/food/Spaghetti.java @@ -8,7 +8,5 @@ public void Spaghetti() { setCost(3); setStoreCost(1); setQuantity(20); - } -} -// \ No newline at end of file +} \ No newline at end of file diff --git a/src/Strawberries.java b/src/interfaces/food/Strawberries.java similarity index 60% rename from src/Strawberries.java rename to src/interfaces/food/Strawberries.java index a78547a..88445ae 100644 --- a/src/Strawberries.java +++ b/src/interfaces/food/Strawberries.java @@ -1,16 +1,12 @@ -package org.millardps.StoreSim; - -import interfaces.food.Food; - +package interfaces.food; public class Strawberries extends Food { - public Strawberries(){ + public Strawberries() { setDesirability(2); setExpiration(7); setName("Strawberries"); setCost(4.99); setStoreCost(1.50); setQuantity(15); - } -} -// \ No newline at end of file + } +} \ No newline at end of file diff --git a/src/WhippedCream.java b/src/interfaces/food/WhippedCream.java similarity index 94% rename from src/WhippedCream.java rename to src/interfaces/food/WhippedCream.java index 7722e5f..d3d20de 100644 --- a/src/WhippedCream.java +++ b/src/interfaces/food/WhippedCream.java @@ -9,4 +9,4 @@ public WhippedCream(){ setExpiration(7); setDesirability(1); } -} +} \ No newline at end of file