Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
07ab458
UML approved
r-m-hufford Mar 25, 2021
121b0d3
Began interfaces
liamkbecker Mar 25, 2021
c02091d
made a crop class and a field class
Jbanksalpha Mar 26, 2021
347b923
CropDuster, FarmVehicle, Tractor
r-m-hufford Mar 26, 2021
3ad7082
Merge branch 'master' of github.com:r-m-hufford/Maven.FarmerFroilan
r-m-hufford Mar 26, 2021
415daba
added animal abstract class and person abstract class
Jbanksalpha Mar 26, 2021
9cccedc
Merge remote-tracking branch 'origin/master'
Jbanksalpha Mar 26, 2021
40ee8c3
implementations
r-m-hufford Mar 26, 2021
740d9b0
Added classes under Edible
theresa-christina Mar 26, 2021
298e8cd
Merge remote-tracking branch 'refs/remotes/origin/master'
theresa-christina Mar 26, 2021
7926e66
shelters
r-m-hufford Mar 26, 2021
0d46c4f
Merge remote-tracking branch 'origin/master'
theresa-christina Mar 26, 2021
36a92c8
moved files out of edible folder, created Farm class
Jbanksalpha Mar 26, 2021
de26e09
Created CropRow class
theresa-christina Mar 26, 2021
986b505
added Farmer class that extneds Person and implements pilot, rider, b…
Jbanksalpha Mar 26, 2021
0e371cc
tomato plant
r-m-hufford Mar 26, 2021
f43f006
Added CornStalk
theresa-christina Mar 26, 2021
42b1cf9
refactored to packages
r-m-hufford Mar 26, 2021
8bd83b9
Merge branch 'master' of github.com:r-m-hufford/Maven.FarmerFroilan
r-m-hufford Mar 26, 2021
379d3f9
added chickens to the chickencoop, added name to farmer
Jbanksalpha Mar 26, 2021
2610e1f
Merge remote-tracking branch 'origin/master'
Jbanksalpha Mar 26, 2021
4ea2109
Added CropRow tests
theresa-christina Mar 26, 2021
0573137
stable test
r-m-hufford Mar 26, 2021
da0a990
commit
r-m-hufford Mar 26, 2021
795a707
Created tests
theresa-christina Mar 26, 2021
4702659
Merge pull request #1 from r-m-hufford/theresa
theresa-christina Mar 26, 2021
8afe557
:(
theresa-christina Mar 26, 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
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>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>


</project>
Binary file added src/FarmUML.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
100 changes: 100 additions & 0 deletions src/FarmUML.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
@startuml
'https://plantuml.com/sequence-diagram

Botanist <|-- Farmer
Rider <|-- Farmer

Pilot <|-- Farmer
Person <|--- Farmer
NoiseMaker <|-- Person
NoiseMaker <|-- Animal
Eater <|-- Person
Eater <|-- Animal

Crop <|--- TomatoPlant
Crop <|--- CornStalk

Animal <|-- Horse
Animal <|-- Chicken


Produce <|-- Chicken
Produce <|-- Crop

Edible <|--- Vegetable
Vegetable <|--- EarCorn
Vegetable <|--- Tomato
Edible <|--- Egg

Rideable <|-- Horse
Rideable <|-- Vehicle

Vehicle <|-- Aircraft
Vehicle <|-- FarmVehicle

Aircraft <|-- CropDuster
FarmVehicle <|-- CropDuster
FarmVehicle <|-- Tractor

NoiseMaker <|-- Vehicle

class Farm

'INTERFACES
interface Edible
interface Produce{
yield(Edible edible)
hasBeenHarvested
hasBeenFertilized
}
interface NoiseMaker{
makeNoise()
}
interface Botanist {
plantCrop()
}
interface Rider {
mount()
dismount()
}
interface Eater <TypeOfFood extends Edible> {
eat()
}
interface Pilot
interface Aircraft {
fly()
}
interface Vehicle

'ABSTRACT CLASSES
abstract class Animal
abstract class Person
abstract class Crop
abstract class Vegetable

'CLASSES
abstract class FarmVehicle {
operate()
}
class Farmer
class Horse
class Chicken
class Field{}
class Tomato
class EarCorn
class Egg
class Stable
class ChickenCoop
class FarmHouse
class CropRow {
HashMap Rows
}
class Tractor{
harvest(Crop crop)
}
class CropDuster{
fertilize()
}
interface Rideable

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

import com.zipcodewilmington.froilansfarm.animals.Chicken;

import java.util.ArrayList;
import java.util.List;

public class ChickenCoop {
List<Chicken> chickens = new ArrayList<Chicken>();



public ChickenCoop(Chicken ...chickens){
for(Chicken chicken : chickens){
this.chickens.add(chicken);
}
}

public List<Chicken> getChickens() {
return chickens;
}

public void setChickens(List<Chicken> chickens) {
this.chickens = chickens;
}
}
13 changes: 13 additions & 0 deletions src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.zipcodewilmington.froilansfarm;

import com.zipcodewilmington.froilansfarm.fieldsAndCrops.Crop;
import com.zipcodewilmington.froilansfarm.edible.Edible;
import com.zipcodewilmington.froilansfarm.fieldsAndCrops.Crop;

public class CornStalk extends Crop {

public void yield(Edible edible) {

}

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

import com.zipcodewilmington.froilansfarm.fieldsAndCrops.Crop;
import com.zipcodewilmington.froilansfarm.vehicles.Aircraft;
import com.zipcodewilmington.froilansfarm.vehicles.FarmVehicle;

public class CropDuster extends FarmVehicle implements Aircraft {

public void fertilize(Crop crop) {}

public void fly() {

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

import com.zipcodewilmington.froilansfarm.edible.Edible;

public interface Eater<typeOfFood extends Edible> {

public void eat(typeOfFood food);

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

public class Farm {
}
11 changes: 11 additions & 0 deletions src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.zipcodewilmington.froilansfarm;

import com.zipcodewilmington.froilansfarm.humans.Person;

import java.util.ArrayList;
import java.util.List;

public class FarmHouse {

List<Person> occupants = new ArrayList<Person>();
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,22 @@
*/
public class MainApplication {

/* interface Eater <TypeOfFood extends Edible>


abstract class animal implements Eater<Vegetable>

class person implements Eater<Edible>



class chicken

public void eat(Vegetable veg)



class farmer

public void eat(Edible edible)*/
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.zipcodewilmington.froilansfarm;

public interface NoiseMaker {

public String makeNoise();

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

import com.zipcodewilmington.froilansfarm.edible.Edible;

public interface Produce {

public boolean hasBeenHarvested = false;
public boolean hasBeenFertilized = false;

//should this be void??
public void yield(Edible edible);

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

public interface Rideable {
}
9 changes: 9 additions & 0 deletions src/main/java/com/zipcodewilmington/froilansfarm/Rider.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.zipcodewilmington.froilansfarm;

public interface Rider<typeOfRideable extends Rideable> {

//should these be void??
public void mount(typeOfRideable rideable);
public void dismount(typeOfRideable rideable);

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

import com.zipcodewilmington.froilansfarm.animals.Horse;

import java.util.ArrayList;
import java.util.List;

public class Stable {

List<Horse> horses = new ArrayList<Horse>();

public Stable(Horse ...horses) {
for (Horse horse : horses) {
this.horses.add(horse);
}
}

public Integer getHorses() {
return horses.size();
}

public void addHorse(Horse horse) {
this.horses.add(horse);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.zipcodewilmington.froilansfarm.animals;

import com.zipcodewilmington.froilansfarm.Eater;
import com.zipcodewilmington.froilansfarm.NoiseMaker;

public abstract class Animal implements NoiseMaker, Eater {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.zipcodewilmington.froilansfarm.animals;

import com.zipcodewilmington.froilansfarm.Produce;
import com.zipcodewilmington.froilansfarm.animals.Animal;
import com.zipcodewilmington.froilansfarm.edible.Edible;

public class Chicken extends Animal implements Produce {
public void eat(Edible edible) {

}

public String makeNoise() {
return null;
}

public void yield(Edible edible) {

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

import com.zipcodewilmington.froilansfarm.Rideable;
import com.zipcodewilmington.froilansfarm.animals.Animal;
import com.zipcodewilmington.froilansfarm.edible.Edible;

public class Horse extends Animal implements Rideable {

public Horse(){

}

public void eat(Edible edible) {

}

public String makeNoise() {
return null;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.zipcodewilmington.froilansfarm.edible;

public class EarCorn extends Vegetable {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.zipcodewilmington.froilansfarm.edible;

public interface Edible {

//this and the foods can be in a package of their own,
//since they're the only set of arrows not touching anything else.

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

public class Egg implements Edible {

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

public class Tomato extends Vegetable {

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

public abstract class Vegetable implements Edible {

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

import com.zipcodewilmington.froilansfarm.Produce;

public abstract class Crop extends Field implements Produce {
}
Loading