Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
0440a02
Created Shelter abstract class and its subclasses
Mar 26, 2021
09727c5
Created Edible interface and classes that implement it. Also refactored
Mar 26, 2021
9cd2967
Created FoodInventory tests
Mar 26, 2021
b524d91
Updated tests
Mar 26, 2021
c934495
Minor change
Mar 26, 2021
674eec6
Added a second constructor option for Shelter and FoodInventory
Mar 26, 2021
5b22e06
my attempt at vehicle stuff
Mar 26, 2021
1dbdf05
Added field class
Mar 26, 2021
b0e4ac1
Merge pull request #1 from MNinh/abby
Abielf Mar 26, 2021
55af094
Merge pull request #2 from MNinh/ChrisBranch
MNinh Mar 26, 2021
44730cf
okay done now
Mar 26, 2021
681fa64
Merge pull request #3 from MNinh/abby
Abielf Mar 26, 2021
1489295
Made a bunch of updates
Mar 26, 2021
89e7443
More stuff
Mar 26, 2021
2cefaa9
More stuff
Mar 26, 2021
958ade4
Merge pull request #4 from MNinh/ChrisBranch
Christopher-Allen-21 Mar 26, 2021
bd2a9ab
Made some changes
Mar 26, 2021
0775109
Made logic changes
Mar 26, 2021
cf62c46
Merge pull request #5 from MNinh/ChrisBranch
Abielf Mar 26, 2021
6cb6435
thoroughly commented project
Mar 27, 2021
3d03682
Merge pull request #6 from MNinh/abby
Abielf Mar 27, 2021
b9f5bca
Made modifications we talked about
Mar 27, 2021
428a048
Merge pull request #7 from MNinh/ChrisBranch
MNinh Mar 28, 2021
56799db
Worked on test
MNinh Mar 28, 2021
f83258c
Merge pull request #8 from MNinh/MikesBranch
MNinh Mar 28, 2021
37c2a81
added noise to return strings
MNinh Mar 28, 2021
2460490
Merge pull request #9 from MNinh/MikesBranch
MNinh Mar 28, 2021
e6a9d31
half the main done
Mar 28, 2021
002141a
Merge pull request #10 from MNinh/abby
Abielf Mar 28, 2021
2c07ec4
Shelter tests & Edible tests done
smartist17 Mar 28, 2021
0d2dbd9
WE FEEDING ANIMAL NOW YALL
Mar 28, 2021
0c69c46
updated some test
MNinh Mar 29, 2021
f1da2de
Half the week done
Mar 29, 2021
d0f2e4c
only harvest day left baybee
Mar 29, 2021
5fa81d1
DONE AND DONE
Mar 29, 2021
8c52017
Merge remote-tracking branch 'origin/abby' into Ashley
smartist17 Mar 29, 2021
cbfd060
Merge remote-tracking branch 'origin/MikesBranch' into Ashley
smartist17 Mar 29, 2021
b8a1034
Updates
smartist17 Mar 29, 2021
cf7b918
More tests added in crops
smartist17 Mar 29, 2021
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
171 changes: 171 additions & 0 deletions FarmerFroilan.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
@startuml
'https://plantuml.com/class-diagram

Abstract Class Animal{
eat(Corn)
makeNoise()
}

Abstract Class Shelter<T>{
add()
remove()
get()
}

interface Edible{

}
interface Noisemaker{
makeNoise()
}
interface Rideable
Class Botanist{
Plant(Crop crop, CropRow)
}
Abstract Class Person{
eat(Edible)
MakeNoise()
getName()
}
Class Farmer{
mount()
dismount()
operate(tractor)
feed(Animal)
}


Class CropRow<Crop>{
get(Crops)
add(Crop)
TomatoPlant
CornStalk
}
Class Crop{
isFertilized()
isHarvested()

}
Class TomatoPlant{
yield(tomato)

}
Class CornStalk{
yield(corn)

}
interface Produce<food extends Edible>{
yield(food)
isFertilized()
}

interface Rider<Riding Extends Rideable>{

Mount(riding)
Dismount(riding)
}

Class Field{
CropRow
}

Abstract Class Vehicle{
drive()
park()
makeNoise()
}
Abstract Class AirCraft{
Fly()
Land()
}

interface FarmVehicle{
Operate()
}

Class Farm{
FarmHouse Instance
ArrayList ChickenCoop & Stables
getHouse()
getVehicles()
}

Class ChickenCoop<Chicken>{
ArrayList<Chicken>
add(chicken)
remove(chicken)
get(chicken)
}

Class Stables<Horse>{
add(Horse)
remove(Horse)
get(Horse)
}
interface Eater<typeOfFood extends Edible>{
eat(Edible)
}
Class FoodInventory<Produce>{
Corns
Tomatos
Eggs
}
Class FarmHouse<Person>{
ArrayList<person>

}
Class Tractor{
Harvest(Crop crop)
makeNoise()
operate()
}

Class CropDuster{
operate()
fertilized(CropRow)
}

Class Chicken{
yield(egg)
isFertilized()
}
Class Pilot{
fly(AirCraft)
operate(CropDuster)
mount()
dismount()
}
Shelter <-- FarmHouse
Shelter <-- ChickenCoop
Shelter <-- FoodInventory
Shelter <-- Stables
Eater <-- Person
Person <|-- Botanist
Botanist <|-- Farmer
Animal <|--- Horse
Rideable <-- Horse
Animal <|-- Chicken
Produce <-- Chicken

Vehicle <-- AirCraft
AirCraft <-- CropDuster
FarmVehicle <-- CropDuster

Crop <|-- TomatoPlant
Crop <|-- CornStalk
Produce <-- Crop
Edible <-- Corn
Edible <-- Tomato
Edible <-- Egg
Noisemaker <-- Animal
Noisemaker <-- Person
Farmer <|-- Pilot
Shelter <|-- Field

Noisemaker <-- Vehicle
Rideable <- Vehicle
FarmVehicle <-- Tractor
Eater <-- Animal
Person -> Rider
Shelter <-- CropRow
@enduml
8 changes: 8 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
<groupId>com.zipcodewilmington</groupId>
<artifactId>froilans-farm</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>


</project>
Loading