Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
48eaba4
Changed runner to main. Mostly testing reasons.
dbradley771 Jan 14, 2016
55f2fd2
Delete test.txt
MWHSCS Jan 14, 2016
6279802
Merge branch 'master' of https://github.com/MWHSComputerScience-ORG/S…
Jan 14, 2016
9a0940e
Fixed title caps
dbradley771 Jan 14, 2016
0667bd1
my name
shinyPIKACHUx Jan 15, 2016
03398e7
Class Presentation just a text file with my name on it.
sosborn002 Jan 15, 2016
1f09f5a
Type my name
csnodgrass Jan 15, 2016
99c08d9
Woweeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee…
zmuehlich615 Jan 15, 2016
6371332
This is my message for this note. I am Nick Jones.
njones958 Jan 15, 2016
e4fcea8
Made name file.
dbeut Jan 15, 2016
ed9d8a8
I don't like this kid.
sflott393 Jan 15, 2016
8a82872
Message
jhoogner Jan 15, 2016
cf619c8
Removed return values and changed to void for SET methods
Jan 19, 2016
0f04a77
created my name file, and added my name
Temperdox Jan 19, 2016
624fc7e
Created file with my name
agilroy061 Jan 19, 2016
7aca526
Created name text file
akusleika Jan 19, 2016
6904cc0
did dun this sturff
shinyPIKACHUx Jan 19, 2016
e326714
gg bro
Gray584 Jan 19, 2016
2c8fa6e
This is my name and I made it for commiting
silvercorked Jan 19, 2016
ec713d5
Update muehlich.txt
zmuehlich615 Jan 19, 2016
144d17d
Merge pull request #2 from zmuehlich615/master
MWHSCS Jan 19, 2016
49f612e
Merge pull request #1 from MWHSComputerScience-ORG/master
zmuehlich615 Jan 19, 2016
1140145
Create readme.txt
Jan 19, 2016
35e9b3f
Merge pull request #3 from Temperdox/master
MWHSCS Jan 19, 2016
dc59753
Merge pull request #4 from silvercorked/master
MWHSCS Jan 19, 2016
7f3db0b
Merge pull request #5 from jhoogner/master
MWHSCS Jan 19, 2016
0ae08e4
Merge pull request #6 from sosborn002/master
MWHSCS Jan 19, 2016
9a8eddb
Merge pull request #12 from shinyPIKACHUx/master
MWHSCS Jan 19, 2016
b995e40
Merge pull request #7 from njones958/master
MWHSCS Jan 19, 2016
2774533
Merge pull request #8 from sflott393/master
MWHSCS Jan 19, 2016
cbd04c8
Merge pull request #9 from agilroy061/master
MWHSCS Jan 19, 2016
3507718
Merge pull request #10 from dbeut/master
MWHSCS Jan 19, 2016
680a847
Merge pull request #11 from ogong500/master
MWHSCS Jan 19, 2016
07b2dc2
Rename AlecGilroy to NameFiles/AlecGilroy
Jan 19, 2016
eb002eb
Rename Alex Wissing.txt to NameFiles/Alex Wissing.txt
Jan 19, 2016
24ba53c
Rename Corbin_Babcock.txt to NameFiles/Corbin_Babcock.txt
Jan 19, 2016
777d29b
Rename NickJones.txt to NameFiles/NickJones.txt
Jan 19, 2016
e488fc1
Rename ShaneFlott.txt to NameFiles/ShaneFlott.txt
Jan 19, 2016
3e5365e
Rename StephenOsborn.txt to NameFiles/StephenOsborn.txt
Jan 19, 2016
8475450
Rename Untitled 1 to NameFiles/Josh Hoogner
Jan 19, 2016
6350598
Rename muehlich.txt to NameFiles/muehlich.txt
Jan 19, 2016
0a6193c
Rename schuyler to NameFiles/schuyler
Jan 19, 2016
3180740
Moved Name Files Over To Folder
Jan 19, 2016
44a1d0e
Still Moving Text Files
Jan 19, 2016
2d6ae7e
Removed Unessesary
Jan 19, 2016
16b880b
Moving Name Files
Jan 19, 2016
bd008a9
Renamed name files and cleaned up contents
dbradley771 Jan 20, 2016
f13572a
Changed readme.md
dbradley771 Jan 20, 2016
40b641c
Moved Dawson's name file and renamed it.
dbradley771 Jan 20, 2016
1e5d311
This is my food and it's rather dank in my opinion but ya know I think
silvercorked Jan 22, 2016
6808f38
Removed
Jan 26, 2016
d9e58fd
Minor Update of Formatting
Jan 26, 2016
d9534ca
Update .classpath
dbradley771 Jan 26, 2016
779c1ab
We gooffed.
dbradley771 Jan 26, 2016
40cfb9b
Removed Skylar's uploads...
Jan 26, 2016
e23bb8c
Removed Main and Changed to Runner
Jan 26, 2016
35a9711
More interface and restructured food.
dbradley771 Jan 26, 2016
b5025dc
Merge branch 'master' of
dbradley771 Jan 26, 2016
93102c1
Renamed runner and removed extra spacing.
dbradley771 Jan 26, 2016
56d122d
Restructuring of Packages
Jan 26, 2016
8ad3538
I believe I have fixed these food classes.
silvercorked Jan 27, 2016
c60e974
Ok now I matched my code to the one you put on the board and I'm sure
silvercorked Jan 28, 2016
db5cbee
3 Foods - Apples, Bananas, Popcorn
zmuehlich615 Jan 29, 2016
7720c73
Adding Two Foods to the game -- Nick Jones
njones958 Jan 29, 2016
0c6b087
Added Pie Class and Pie Mix Class
csnodgrass Jan 29, 2016
de6c4c8
Added both food classes
sosborn002 Jan 29, 2016
7a28ffb
Ok now im sure its good. I was sure last time but now im more sure.
Jan 29, 2016
98c847e
Andrew Kusleika food classes
akusleika Jan 29, 2016
4133156
Added Pie Class and Pie Mix with changes
csnodgrass Jan 29, 2016
ffdfeb7
Added Food Classes
Gray584 Jan 29, 2016
544440a
food classes uploaded
Jan 29, 2016
04715f4
Added Food Classes
dbeut Jan 29, 2016
2fc821a
Merge pull request #14 from silvercorked/master
dbradley771 Jan 29, 2016
0d9ba88
Merge pull request #16 from csnodgrass/master
dbradley771 Jan 29, 2016
060eb34
Merge pull request #26 from ogong500/master
Jan 29, 2016
47242d0
Merge pull request #17 from zmuehlich615/master
dbradley771 Jan 29, 2016
b1e90a9
Merge pull request #18 from njones958/master
dbradley771 Jan 29, 2016
d8b47bf
Merge pull request #25 from dbeut/master
Jan 29, 2016
78974b3
Merge pull request #24 from jhoogner/master
Jan 29, 2016
b6231bc
Merge pull request #23 from akusleika/master
Jan 29, 2016
87d96e7
Merge pull request #21 from sosborn002/master
dbradley771 Jan 29, 2016
e550415
Merge pull request #22 from Gray584/master
dbradley771 Jan 29, 2016
6d0ea65
CLEAN
dbradley771 Jan 29, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions NameFiles/Alec Gilroy
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Alec Gilroy
1 change: 1 addition & 0 deletions NameFiles/Alex Wissing
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Alex Wissing
1 change: 1 addition & 0 deletions NameFiles/Corbin Babcock
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Corbin Babcock
1 change: 1 addition & 0 deletions NameFiles/Dawson Beutler
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Je m'appelle Dawson.
1 change: 1 addition & 0 deletions NameFiles/Josh Hoogner
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Josh Hoogner
1 change: 1 addition & 0 deletions NameFiles/Nick Jones
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Nick Jones
File renamed without changes.
1 change: 1 addition & 0 deletions NameFiles/Schuyler
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Schuyler
1 change: 1 addition & 0 deletions NameFiles/Shane Flott
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Shane Flott
1 change: 1 addition & 0 deletions NameFiles/Stephen Osborn
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Stephen Osborn
2 changes: 2 additions & 0 deletions NameFiles/muehlich.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
this is a test
aye bby
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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.
70 changes: 0 additions & 70 deletions src/Food.java

This file was deleted.

23 changes: 23 additions & 0 deletions src/Runner.java
Original file line number Diff line number Diff line change
@@ -0,0 +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 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");
}

}
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
package interfaces;
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
*
* @return int value cost
*/
int getCost();
double getCost();

/**
* Temporarily change the cost of the item to the customer
Expand All @@ -19,19 +20,19 @@ 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
*
* @return int value storeCost
*/
int getCost();
double getStoreCost();

/**
* 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.
Expand Down
12 changes: 12 additions & 0 deletions src/interfaces/food/Almonds.java
Original file line number Diff line number Diff line change
@@ -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);
}
}
12 changes: 12 additions & 0 deletions src/interfaces/food/Apples.java
Original file line number Diff line number Diff line change
@@ -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);
}
}
12 changes: 12 additions & 0 deletions src/interfaces/food/Bacon.java
Original file line number Diff line number Diff line change
@@ -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);
}
}
12 changes: 12 additions & 0 deletions src/interfaces/food/Bananas.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package interfaces.food;

public class Bananas extends Food {
public Bananas() {
setName("Bananas");
setCost(1.99);
setStoreCost(3.99);
setQuantity(30);
setExpiration(7);
setDesirability(2);
}
}
12 changes: 12 additions & 0 deletions src/interfaces/food/Beef.java
Original file line number Diff line number Diff line change
@@ -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);
}
}
12 changes: 12 additions & 0 deletions src/interfaces/food/Blueberries.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package interfaces.food;

public class Blueberries extends Food {
public Blueberries() {
setDesirability(1);
setExpiration(7);
setName("Blueberries");
setCost(3.99);
setStoreCost(1.50);
setQuantity(5);
}
}
12 changes: 12 additions & 0 deletions src/interfaces/food/Butter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package interfaces.food;

public class Butter extends Food {
public void Butter() {
setName("Butter");
setDesirability(3);
setExpiration(7);
setCost(2);
setStoreCost(3);
setQuantity(30);
}
}
12 changes: 12 additions & 0 deletions src/interfaces/food/CannedAppleSauce.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package interfaces.food;

public class CannedAppleSauce extends Food{
public CannedAppleSauce() {
setName("Canned Apple Sauce");
setCost(.7);
setStoreCost(.2);
setExpiration(365);
setDesirability(0);
setQuantity(100);
}
}
12 changes: 12 additions & 0 deletions src/interfaces/food/CannedApples.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package interfaces.food;

public class CannedApples extends Food{
public CannedApples() {
setName("Canned Apples");
setCost(.5);
setStoreCost(.1);
setExpiration(365);
setDesirability(0);
setQuantity(100);
}
}
12 changes: 12 additions & 0 deletions src/interfaces/food/Carrots.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package interfaces.food;

public class Carrots extends Food {
public Carrots() {
setName("Carrots");
setCost(0.30);
setStoreCost(1.50);
setQuantity(30);
setExpiration(14);
setDesirability(1);
}
}
2 changes: 1 addition & 1 deletion src/Cheetos.java → src/interfaces/food/Cheetos.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mpsomaha.StoreSim;
package interfaces.food;

public class Cheetos extends Food {
public void Cheetos() {
Expand Down
12 changes: 12 additions & 0 deletions src/interfaces/food/Chicken_Fingers.java
Original file line number Diff line number Diff line change
@@ -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);
}
}
4 changes: 2 additions & 2 deletions src/Chocolate.java → src/interfaces/food/Chocolate.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mpsomaha.StoreSim;
package interfaces.food;

public class Chocolate extends Food {
public void Chocolate() {
Expand All @@ -9,4 +9,4 @@ public void Chocolate() {
setQuantity(50);
setStoreCost(0.50);
}
}
}
12 changes: 12 additions & 0 deletions src/interfaces/food/Coffee.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package interfaces.food;

public class Coffee extends Food {
public Coffee() {
setName("Coffee");
setCost(2.50);
setStoreCost(5.00);
setQuantity(12);
setExpiration(360);
setDesirability(2);
}
}
Loading