Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chanelle #4

Open
wants to merge 156 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
156 commits
Select commit Hold shift + click to select a range
f697cb9
Added UML
Minsoo5 Jul 28, 2023
f6a76be
Storageinterface. UML 3.1
BrentCubbage1 Jul 28, 2023
0f01c30
updated person. UML 3.2
BrentCubbage1 Jul 28, 2023
19c4e2d
3.5 UML
BrentCubbage1 Jul 28, 2023
6f5a7ff
UML 3.75
BrentCubbage1 Jul 28, 2023
d67e77c
UML 3.9
BrentCubbage1 Jul 28, 2023
b249d67
Update .DS_Store
BrentCubbage1 Jul 28, 2023
72c6ef9
animal test
BrentCubbage1 Jul 28, 2023
dffa0c2
Merge pull request #1 from Jubilee91/Brent
BrentCubbage1 Jul 28, 2023
0390fc8
person test added
Jhuntenburg Jul 28, 2023
3320a4f
person test added2
Jhuntenburg Jul 28, 2023
a8885ca
person test added2
Jhuntenburg Jul 28, 2023
f6f160b
Pomm update
Minsoo5 Jul 28, 2023
3e94cd3
Merge remote-tracking branch 'origin/master'
Minsoo5 Jul 28, 2023
21a6006
froilanda tests started
Jhuntenburg Jul 28, 2023
285c278
Starting chickencoop test
BrentCubbage1 Jul 28, 2023
8947aaa
froilanda tests done
Jhuntenburg Jul 28, 2023
fefed46
StableTest & ChickenCoopTests
BrentCubbage1 Jul 28, 2023
9705121
froilan tests started
Jhuntenburg Jul 28, 2023
fb16cbc
FarmHouseTests
BrentCubbage1 Jul 28, 2023
902fe14
Tractor Tests
Minsoo5 Jul 28, 2023
f288eaf
froilan tests continue
Jhuntenburg Jul 28, 2023
1ea04b2
FarmHouseTest complete
BrentCubbage1 Jul 28, 2023
1f1d1db
froilan tests
Jhuntenburg Jul 28, 2023
5d13a15
CropDuster Test
Minsoo5 Jul 28, 2023
3df54c1
FarmField tests written
BrentCubbage1 Jul 28, 2023
3675795
froilan tests finished
Jhuntenburg Jul 28, 2023
4a2fcbe
Pantry test
BrentCubbage1 Jul 28, 2023
632523d
collected master merge. will pull request
BrentCubbage1 Jul 28, 2023
f61039c
Merge pull request #2 from Jubilee91/Brent
BrentCubbage1 Jul 28, 2023
5d333a8
creating tests for edible
surabhidas47 Jul 28, 2023
69b09d0
person tests complete for now
Jhuntenburg Jul 28, 2023
208d5a6
Crop Duster Class Done
Minsoo5 Jul 28, 2023
13d3152
Merge remote-tracking branch 'origin/master'
Minsoo5 Jul 28, 2023
235956b
Merge pull request #3 from Jubilee91/joeBranch
Jhuntenburg Jul 28, 2023
568f96d
Merge remote-tracking branch 'origin/master'
Minsoo5 Jul 28, 2023
26f9fd8
pom update
Jhuntenburg Jul 28, 2023
68f4b49
earCorn Tests
surabhidas47 Jul 28, 2023
0f1fdee
kale tests
surabhidas47 Jul 28, 2023
97cb406
Started Tractor
Minsoo5 Jul 28, 2023
d585b6a
Storage Unit Classes written
BrentCubbage1 Jul 29, 2023
b612fd2
update merge to master
BrentCubbage1 Jul 29, 2023
42d5185
Merge pull request #4 from Jubilee91/Brent
BrentCubbage1 Jul 29, 2023
71c74c7
crop tests
surabhidas47 Jul 29, 2023
7558ffa
Merge branch 'surabhiBranch25' into master
surabhidas47 Jul 29, 2023
a6af72f
Merge pull request #5 from Jubilee91/master
surabhidas47 Jul 29, 2023
2525a3f
Vehicle Interface Test Done
Minsoo5 Jul 29, 2023
f2e2fe7
Vehicle Test Check Point
Minsoo5 Jul 29, 2023
b7c9a8d
Vehicle Test Done
Minsoo5 Jul 29, 2023
1fdce27
Vehicle Interface Test Done
Minsoo5 Jul 29, 2023
565e40a
Merge remote-tracking branch 'origin/master'
Minsoo5 Jul 29, 2023
afdf278
pom file merge conflict resolution
Jhuntenburg Jul 29, 2023
189768a
Eater and animal added
Jhuntenburg Jul 29, 2023
5f724cc
feeder interface
Jhuntenburg Jul 29, 2023
7b873e9
Person update
Jhuntenburg Jul 29, 2023
589ad6b
fertilizing anf harvesting tests
surabhidas47 Jul 29, 2023
625fbcf
pilot interface
Jhuntenburg Jul 29, 2023
b684ff9
Farmer and rider
Jhuntenburg Jul 29, 2023
3056db0
edible tests
surabhidas47 Jul 29, 2023
d3e5d00
Vehicle Tests Checkpoint
Minsoo5 Jul 29, 2023
91fcbaa
Merge branch 'master' into min
Minsoo5 Jul 29, 2023
5399de5
Froilan added
Jhuntenburg Jul 29, 2023
40d1924
Added Noise Maker
Minsoo5 Jul 29, 2023
e3c63c8
NoiseMaker Test
Minsoo5 Jul 29, 2023
704e0a2
Merge pull request #6 from Jubilee91/master
surabhidas47 Jul 29, 2023
34c3820
Merge pull request #7 from Jubilee91/surabhiBranch25
surabhidas47 Jul 29, 2023
b79cf2c
Froilan getting going
Jhuntenburg Jul 29, 2023
af50b23
Merge branch 'master' into joeBranch
Jhuntenburg Jul 29, 2023
994855e
AirCraft test
Minsoo5 Jul 29, 2023
8b9522c
AirCraft Interface Class
Minsoo5 Jul 29, 2023
d1fe5bc
Fixed vehicle interfaces
Minsoo5 Jul 29, 2023
a59ea07
Merge remote-tracking branch 'origin/master'
Minsoo5 Jul 29, 2023
21faa7f
classes for pull request
Jhuntenburg Jul 29, 2023
1f7be8c
Merge branch 'master' into joeBranch
Jhuntenburg Jul 29, 2023
eab8814
Merge pull request #8 from Jubilee91/joeBranch
Jhuntenburg Jul 29, 2023
840554f
local changes
Minsoo5 Jul 29, 2023
ea82705
Froilan wrapping up
Jhuntenburg Jul 29, 2023
52c087d
Merge remote-tracking branch 'origin/joeBranch' into joeBranch
Jhuntenburg Jul 29, 2023
6cc589a
Renamed Vehicle Getter
Minsoo5 Jul 29, 2023
e8ae454
Fixed Person Conflicts in Tractor Test
Minsoo5 Jul 29, 2023
bb71670
person classes added
Jhuntenburg Jul 29, 2023
675c092
Merge pull request #9 from Jubilee91/joeBranch
Jhuntenburg Jul 29, 2023
de02933
fixed tests and wrapping up the day
Jhuntenburg Jul 29, 2023
ff17740
edible classes
surabhidas47 Jul 29, 2023
c02c5d7
Animal tests added
Jul 30, 2023
e5ae3b9
Merge branch 'master' into joeBranch
Jhuntenburg Jul 30, 2023
5f44e33
formating
Jhuntenburg Jul 30, 2023
cf762ce
Re-imported Person Classes
Minsoo5 Jul 30, 2023
3885b69
"Merge remote-tracking branch 'origin' into joeBranch"
Jhuntenburg Jul 30, 2023
17b9866
importing classes
Jhuntenburg Jul 30, 2023
4b5eee3
Horse test cases added
Jul 30, 2023
8914017
added edible package
surabhidas47 Jul 30, 2023
4eac7b3
retry
surabhidas47 Jul 30, 2023
92d9ccf
Merge remote-tracking branch 'origin/master'
surabhidas47 Jul 30, 2023
8563b9d
'Merge branch 'joeBranch''
Jhuntenburg Jul 30, 2023
4039c34
Interface Fix
Minsoo5 Jul 30, 2023
8dd2df9
Merging for Edible interface
Minsoo5 Jul 30, 2023
7b74d9f
workin on the master
Jhuntenburg Jul 30, 2023
b92ea30
Merge remote-tracking branch 'origin/master'
Jhuntenburg Jul 30, 2023
672850d
crop classes
surabhidas47 Jul 30, 2023
75d347b
added crop classes
surabhidas47 Jul 30, 2023
4fef9b4
"Merge branch 'surabhiBranch25'"
surabhidas47 Jul 30, 2023
f38ea47
update
BrentCubbage1 Jul 30, 2023
d28d6dc
latest merge
Jhuntenburg Jul 30, 2023
f6bd023
Update pantry
BrentCubbage1 Jul 30, 2023
ac25b46
pushing pantry constructor
BrentCubbage1 Jul 30, 2023
f7ac3f7
"Merge remote-tracking branch 'origin' into joeBranch"
Jhuntenburg Jul 31, 2023
468b10f
fixing red
Jhuntenburg Jul 31, 2023
5506f96
Merge pull request #10 from Jubilee91/joeBranch
Jhuntenburg Jul 31, 2023
e8addc7
Pulling master
Minsoo5 Jul 31, 2023
80d93e7
"Min and master merge
Minsoo5 Jul 31, 2023
018ec1a
Rideable Interface Added
Minsoo5 Jul 31, 2023
a65b6fb
Rideable in Vehicle Class
Minsoo5 Jul 31, 2023
baca590
Rider Interface Fized
Minsoo5 Jul 31, 2023
dd3169b
Rider Done
Minsoo5 Jul 31, 2023
ba60ce4
jul31
surabhidas47 Jul 31, 2023
a7ef0db
some changes in tests
surabhidas47 Jul 31, 2023
060dc53
fixing things
Jhuntenburg Jul 31, 2023
68d328c
"Merge branch 'master', remote-tracking branch 'origin' into surabhiB…
surabhidas47 Jul 31, 2023
75bdcee
Merge pull request #11 from Jubilee91/joeBranch
Jhuntenburg Jul 31, 2023
16e8b95
Merge remote-tracking branch 'origin/master'
surabhidas47 Jul 31, 2023
1cb19d9
"Merge branch 'surabhiBranch25'"
surabhidas47 Jul 31, 2023
7a32919
Tractor ReFactor
Minsoo5 Jul 31, 2023
704e656
Chicken and Horse classes made
Jul 31, 2023
f5afb2a
Merge remote-tracking branch 'origin/master'
Aug 1, 2023
519d405
Chicken and Horse progress
Aug 1, 2023
e047c66
Merge pull request #12 from Jubilee91/Chanelle
ChanelleSpotswood Aug 1, 2023
b11290e
Test branch
BrentCubbage1 Aug 2, 2023
7d70cb7
compile testing
BrentCubbage1 Aug 2, 2023
32a176a
test compiling
BrentCubbage1 Aug 2, 2023
1695540
fix storageunit to extend arraylist
BrentCubbage1 Aug 3, 2023
7ee0f72
Tractor
Minsoo5 Aug 4, 2023
ca30429
Merge pull request #13 from Jubilee91/funsies
BrentCubbage1 Aug 7, 2023
fefa54d
it plants
BrentCubbage1 Aug 7, 2023
7bc5b0a
For The Merge
Minsoo5 Aug 7, 2023
49086e8
he eats
BrentCubbage1 Aug 7, 2023
d5d9c2b
something
BrentCubbage1 Aug 7, 2023
8003337
StorageUnit children basic tests passing. Get, add, remove, isEmpty
BrentCubbage1 Aug 7, 2023
2d578a9
cropduster
Minsoo5 Aug 7, 2023
3ec06a8
crop
Minsoo5 Aug 7, 2023
bd8280a
Merge remote-tracking branch 'origin/master'
Minsoo5 Aug 7, 2023
78a3a1d
crops
Minsoo5 Aug 7, 2023
61ec1a7
Fixed Operate on Farm from Farm Veh
Minsoo5 Aug 7, 2023
f55e3bc
Vehicle Tests
Minsoo5 Aug 7, 2023
e49525b
check point
Minsoo5 Aug 7, 2023
bc9d01b
fixed tractor
Minsoo5 Aug 7, 2023
cc57e3d
"MErging branches
Minsoo5 Aug 7, 2023
557ca99
We testing
BrentCubbage1 Aug 7, 2023
279dd8c
conflict resolved
Minsoo5 Aug 7, 2023
9800316
Merge remote-tracking branch 'origin/master'
Minsoo5 Aug 7, 2023
98463a7
Froilanda eats
BrentCubbage1 Aug 7, 2023
f5dd752
Merge branch 'master' of https://github.com/Jubilee91/Maven.FarmerFro…
BrentCubbage1 Aug 7, 2023
9256c31
She flyin
BrentCubbage1 Aug 7, 2023
e7c60e8
She feedin the chickens
BrentCubbage1 Aug 7, 2023
287c7e4
All animal test passing
Aug 7, 2023
0544d39
All animal test passing
Aug 7, 2023
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
Binary file added .DS_Store
Binary file not shown.
Binary file added Frolian UML V3.9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 44 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,50 @@
<groupId>com.zipcodewilmington</groupId>
<artifactId>froilans-farm</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>

<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>

</properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>


</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package com.zipcodewilmington.froilansfarm.Animal;

import com.zipcodewilmington.froilansfarm.Edible.Edible;
import com.zipcodewilmington.froilansfarm.Edible.Egg;
import com.zipcodewilmington.froilansfarm.Edible.Vegetable;
import com.zipcodewilmington.froilansfarm.Crop.Produce;
import com.zipcodewilmington.froilansfarm.Persons.Animal;

public class Chicken extends Animal<Vegetable> implements Produce<Egg> {

boolean hasBeenFertilized = false;

public boolean isHasBeenFertilized() {
return hasBeenFertilized;
}

public void setHasBeenFertilized(boolean b) {
this.hasBeenFertilized = b;
}

public String makeNoise() {
return "Cluck";
}

public <EdibleEgg> Egg yield() {

Egg egg = new Egg();
if (this.hasBeenFertilized == true) {
return egg;
}
return null;
}

@Override
public void yeild() {

}

@Override
public void hasBeenHarvested() {

}

@Override
public void eat(Edible edible) {
this.isFed = true;

}
}
43 changes: 43 additions & 0 deletions src/main/java/com/zipcodewilmington/froilansfarm/Animal/Horse.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package com.zipcodewilmington.froilansfarm.Animal;

import com.zipcodewilmington.froilansfarm.Edible.EarCorn;
import com.zipcodewilmington.froilansfarm.Edible.Edible;
import com.zipcodewilmington.froilansfarm.Persons.Animal;
import com.zipcodewilmington.froilansfarm.Persons.Person;
import com.zipcodewilmington.froilansfarm.Rideable;

public class Horse extends Animal<EarCorn> implements Rideable<Person> {

private boolean isRidden = false;
private Person rider ;
public void setRider(Person rider) {
this.rider = rider;

}

public Object getRider() {
return rider;
}

public boolean getIsRidden() {
return isRidden;
}

public void setRidden(boolean b) {
this.isRidden = b;
}
public String makeNoise() {
return "Whinny";
}

@Override
public void eat(Edible edible) {

}

@Override
public void getMounted(Person rider) {

}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.zipcodewilmington.froilansfarm.Crop;

import com.zipcodewilmington.froilansfarm.Edible.EarCorn;


public class CornStalk extends Crop{
EarCorn ec;

public CornStalk() {
super();

}

public void yeild() {
if(harvested && fertilized){
ec = new EarCorn();

}

}


}
31 changes: 31 additions & 0 deletions src/main/java/com/zipcodewilmington/froilansfarm/Crop/Crop.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.zipcodewilmington.froilansfarm.Crop;

public abstract class Crop implements Produce {

boolean harvested = false;
boolean fertilized = false;

public Crop() {
}

public void setHarvested(boolean harvested) {
this.harvested = harvested;
}

public void setFertilized(boolean fertilized) {
this.fertilized = fertilized;
}

public boolean hasBeenFertilized() {return fertilized;}

public void hasBeenHarvested() {
harvested = true;
}

public boolean getHarvested() {return harvested;}





}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.zipcodewilmington.froilansfarm.Crop;

import com.zipcodewilmington.froilansfarm.Edible.Kale;

public class KaleStalk extends Crop{

Kale kale;

public KaleStalk(boolean harvested) {
super();
}

public void yeild() {
if(harvested && fertilized){
kale = new Kale();

}

}


}
12 changes: 12 additions & 0 deletions src/main/java/com/zipcodewilmington/froilansfarm/Crop/Produce.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.zipcodewilmington.froilansfarm.Crop;

import com.zipcodewilmington.froilansfarm.Edible.Edible;

public interface Produce <AnyType extends Edible> {
public void yeild();

public void hasBeenHarvested();



}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.zipcodewilmington.froilansfarm.Crop;

import com.zipcodewilmington.froilansfarm.Edible.Tomato;

public class TomatoPlant extends Crop {

Tomato tomato;

public TomatoPlant(boolean harvested) {
super();
}

public void yeild() {
if(harvested && fertilized){
tomato = new Tomato();

}

}




}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.zipcodewilmington.froilansfarm.Edible;

public class EarCorn extends Vegetable{



@Override
public boolean isEdible() {
if(gotEaten){
return false;
}
return true;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.zipcodewilmington.froilansfarm.Edible;

public interface Edible {

public boolean isEdible();
}
20 changes: 20 additions & 0 deletions src/main/java/com/zipcodewilmington/froilansfarm/Edible/Egg.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.zipcodewilmington.froilansfarm.Edible;

public class Egg implements Edible{
boolean gotEaten = false;


public void setEatenStatus() {

gotEaten=true;

}
@Override
public boolean isEdible() {
if(gotEaten){
return false;
}
return true;
}

}
15 changes: 15 additions & 0 deletions src/main/java/com/zipcodewilmington/froilansfarm/Edible/Kale.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.zipcodewilmington.froilansfarm.Edible;

public class Kale extends Vegetable {


@Override
public boolean isEdible() {
if(gotEaten){
return false;
}
return true;
}


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.zipcodewilmington.froilansfarm.Edible;

public class Tomato extends Vegetable{
@Override
public boolean isEdible() {
if(gotEaten){
return false;
}
return true;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.zipcodewilmington.froilansfarm.Edible;

public abstract class Vegetable implements Edible{

public boolean gotEaten = false;


public void setEatenStatus() {

gotEaten=true;

}


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.zipcodewilmington.froilansfarm;

public interface NoiseMaker {


public String makeNoise();

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.zipcodewilmington.froilansfarm.Persons;

import com.zipcodewilmington.froilansfarm.Edible.Edible;
import com.zipcodewilmington.froilansfarm.NoiseMaker;

public abstract class Animal<FoodType extends Edible> implements Eater<Edible>, NoiseMaker {
public Boolean isFed = false;
private String name;

public Animal(String name) {
this.name = name;

}

public Animal() {

}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public Boolean getIsFed() {
return isFed;
}

public void setIsFed(Boolean isFed) {
this.isFed = isFed;
}





}
Loading