Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
a0f8e72
Adding Classes
MannyMb Jul 22, 2021
1b50486
test packages
MannyMb Jul 22, 2021
6d33ae0
Made edible food and tests
Jul 23, 2021
8d1c797
Merge pull request #1 from BlueWaterFarm/Feat/EdibleFood
RexCasio Jul 23, 2021
dafb3a7
updates
Bobbi-Z Jul 23, 2021
62093ec
Merge branch 'dev' into person_animal
Bobbi-Z Jul 23, 2021
7f66e74
Merge pull request #2 from BlueWaterFarm/person_animal
Bobbi-Z Jul 23, 2021
fd21967
Added Farm & Shelter classes
ZachKitto Jul 23, 2021
fb2aa98
Merge branch 'dev' into feature/farm
ZachKitto Jul 23, 2021
d0cc6d0
Merge pull request #3 from BlueWaterFarm/feature/farm
ZachKitto Jul 23, 2021
ee74313
Added some stuff
Jul 23, 2021
9ce8655
adding some stuff
MannyMb Jul 23, 2021
5460808
Merge pull request #5 from BlueWaterFarm/feat/cropStuff
MannyMb Jul 23, 2021
c0fdd07
Merge branch 'dev' into feat/nisha
nishapatel0613 Jul 23, 2021
17bed30
Merge pull request #4 from BlueWaterFarm/feat/nisha
nishapatel0613 Jul 23, 2021
8fe133a
getting details hammered out
Bobbi-Z Jul 23, 2021
5e42a08
Merge branch 'dev' into person_animal
Bobbi-Z Jul 23, 2021
0d5904c
adding some stuff to crop abstract
MannyMb Jul 23, 2021
6f05bdb
Merge pull request #6 from BlueWaterFarm/feat/cropStuff
MannyMb Jul 23, 2021
b072255
pushing to dev
MannyMb Jul 23, 2021
ec6ca11
Merge pull request #7 from BlueWaterFarm/feat/cropStuff
MannyMb Jul 23, 2021
19eedc9
getting details hammered out
Bobbi-Z Jul 23, 2021
f7debb8
testing
MannyMb Jul 23, 2021
c835773
testetesetestsetset
Bobbi-Z Jul 23, 2021
b5c5245
added some test
MannyMb Jul 23, 2021
1011fb6
Merge pull request #8 from BlueWaterFarm/feat/cropStuff
MannyMb Jul 23, 2021
8a54b94
Merge branch 'dev' into person_animal
Bobbi-Z Jul 23, 2021
1c51138
crop is commented out intellij would not read the generics.
Bobbi-Z Jul 23, 2021
c0ab31a
Merge pull request #9 from BlueWaterFarm/person_animal
Bobbi-Z Jul 23, 2021
e93ce52
added some tests
Jul 23, 2021
5cb29f7
Merge branch 'dev' into feat/vehicle
nishapatel0613 Jul 23, 2021
e105680
Merge pull request #10 from BlueWaterFarm/feat/vehicle
nishapatel0613 Jul 23, 2021
a0feac0
able to build
ZachKitto Jul 23, 2021
44eda11
Merge pull request #11 from BlueWaterFarm/feature/weekday
ZachKitto Jul 23, 2021
3b60393
some stuff
Jul 23, 2021
4a001a3
Added CropRow, Field, FarmStorage
ZachKitto Jul 23, 2021
72a1e9a
Merge pull request #12 from BlueWaterFarm/feature/zach
ZachKitto Jul 23, 2021
b9f76be
Added some stuff in vehicle
Jul 23, 2021
8bb094d
Merge branch 'dev' into feat/farmVehicle
nishapatel0613 Jul 23, 2021
1963350
Merge pull request #13 from BlueWaterFarm/feat/farmVehicle
nishapatel0613 Jul 23, 2021
19af42e
added FroilansFarm
ZachKitto Jul 24, 2021
b863f89
Merge pull request #14 from BlueWaterFarm/feature/zach
ZachKitto Jul 24, 2021
b0ee64d
Added cropDuster
Jul 24, 2021
1360df5
Merge branch 'dev' into feat/tractor
nishapatel0613 Jul 24, 2021
4c9337c
Merge pull request #15 from BlueWaterFarm/feat/tractor
nishapatel0613 Jul 24, 2021
9dfe4f4
Merge branch 'Zipcoder:master' into dev
MannyMb Jul 26, 2021
adca29e
Added fertilized & harvested
ZachKitto Jul 26, 2021
36e89c0
Merge pull request #16 from BlueWaterFarm/feature/zach
ZachKitto Jul 26, 2021
12f17b8
added features to person classes
ZachKitto Jul 26, 2021
c2a7f51
Merge pull request #17 from BlueWaterFarm/feature/zach
ZachKitto Jul 26, 2021
9243e1b
added a few tests
MannyMb Jul 26, 2021
9146d59
need to work on tests
MannyMb Jul 26, 2021
8668d3f
Merge pull request #18 from BlueWaterFarm/feat/cropStuff
MannyMb Jul 26, 2021
0ac3bd8
removed empty test folders
MannyMb Jul 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
50 changes: 46 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,53 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>


<groupId>com.zipcodewilmington</groupId>
<artifactId>froilans-farm</artifactId>

<version>1.0-SNAPSHOT</version>
<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>



<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.6.1</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

<groupId>com.zipcodewilmington</groupId>
<artifactId>froilans-farm</artifactId>
<version>1.0-SNAPSHOT</version>


</project>
29 changes: 29 additions & 0 deletions src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.zipcodewilmington.froilansfarm;






import com.zipcodewilmington.froilansfarm.animals.Chicken;
import com.zipcodewilmington.froilansfarm.animals.Horse;
import com.zipcodewilmington.froilansfarm.animals.person.Farmer;
import com.zipcodewilmington.froilansfarm.crops.CornStalk;
import com.zipcodewilmington.froilansfarm.crops.Crop;
import com.zipcodewilmington.froilansfarm.crops.PotatoRoot;
import com.zipcodewilmington.froilansfarm.crops.TomatoPlant;
import com.zipcodewilmington.froilansfarm.farm.*;
import com.zipcodewilmington.froilansfarm.vehicle.CropDuster;
//import com.zipcodewilmington.froilansfarm.vehicle.Tractor;

import java.util.ArrayList;
import java.util.Arrays;

public class Froilan extends Farmer {

Farm farm = FroilansFarm.getInstance();

public Farm getFarm() {
return farm;
}
}
15 changes: 15 additions & 0 deletions src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.zipcodewilmington.froilansfarm;

import com.zipcodewilmington.froilansfarm.animals.person.Person;
import com.zipcodewilmington.froilansfarm.animals.person.Pilot;
import com.zipcodewilmington.froilansfarm.crops.Edible;
import com.zipcodewilmington.froilansfarm.farm.Farm;

public class Froilanda extends Person implements Pilot {

Farm farm = FroilansFarm.getInstance();

public Farm getFarm() {
return farm;
}
}
51 changes: 51 additions & 0 deletions src/main/java/com/zipcodewilmington/froilansfarm/FroilansFarm.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package com.zipcodewilmington.froilansfarm;

import com.zipcodewilmington.froilansfarm.animals.Chicken;
import com.zipcodewilmington.froilansfarm.animals.Horse;
import com.zipcodewilmington.froilansfarm.crops.CornStalk;
import com.zipcodewilmington.froilansfarm.crops.PotatoRoot;
import com.zipcodewilmington.froilansfarm.crops.TomatoPlant;
import com.zipcodewilmington.froilansfarm.farm.*;
import com.zipcodewilmington.froilansfarm.vehicle.CropDuster;
import com.zipcodewilmington.froilansfarm.vehicle.Tractor;

public class FroilansFarm {

private static Farm farm;

private FroilansFarm() {
}

public static Farm getInstance() {
if (farm == null) {
farm = buildFarm();
return farm;
}
return farm;
}

private static Farm buildFarm() {
FarmBuilder builder = new FarmBuilder();
Farm farm = builder
.setFarmhouses(
new FarmHouse())
.setFields(
new Field(new CropRow(),
new CropRow(),
new CropRow(),
new CropRow(),
new CropRow()))
.setStables(
new Stable(new Horse(), new Horse(), new Horse()),
new Stable(new Horse(), new Horse(), new Horse(), new Horse()),
new Stable(new Horse(), new Horse(), new Horse()))
.setChickenCoops(
new ChickenCoop(new Chicken(), new Chicken(), new Chicken(), new Chicken()),
new ChickenCoop(new Chicken(), new Chicken(), new Chicken(), new Chicken()),
new ChickenCoop(new Chicken(), new Chicken(), new Chicken(), new Chicken()),
new ChickenCoop(new Chicken(), new Chicken(), new Chicken()))
.setVehicles(new Tractor(5), new CropDuster())
.build();
return farm;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.zipcodewilmington.froilansfarm;

public interface NoiseMaker {
String makeNoise();

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

import com.zipcodewilmington.froilansfarm.animals.person.Rider;

public interface Rideable <T extends Rider>{

boolean getIsBeingRidden();

void setIsBeingRidden(boolean isBeingRidden);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.zipcodewilmington.froilansfarm.animals;

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,23 @@
package com.zipcodewilmington.froilansfarm.animals;


import com.zipcodewilmington.froilansfarm.crops.Edible;
import com.zipcodewilmington.froilansfarm.crops.Egg;
import com.zipcodewilmington.froilansfarm.farm.FarmStorage;
//import com.zipcodewilmington.froilansfarm.farm.Produce;

public class Chicken extends Animal {

public String makeNoise() {
return "cluck!" ;
}

public void yield(Egg... egg) {
FarmStorage storage = FarmStorage.getInstance();
for (Egg eggi : egg) {
if (!eggi.getHasBeenFertilized()) {
storage.add(eggi);
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.zipcodewilmington.froilansfarm.animals;

import com.zipcodewilmington.froilansfarm.crops.Edible;
import com.zipcodewilmington.froilansfarm.farm.FarmStorage;

public interface Eater {

default public <SomeEdible extends Edible> void eat(SomeEdible food) {
FarmStorage storage = FarmStorage.getInstance();
storage.remove(food);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.zipcodewilmington.froilansfarm.animals;


import com.zipcodewilmington.froilansfarm.Rideable;
import com.zipcodewilmington.froilansfarm.crops.Edible;

public class Horse extends Animal implements Rideable {

private boolean isBeingRidden = false;

public String makeNoise() {
return "neigh!";
}

public void move() {

}

@Override
public boolean getIsBeingRidden() {
return isBeingRidden;
}

@Override
public void setIsBeingRidden(boolean isBeingRidden) {
this.isBeingRidden = isBeingRidden;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.zipcodewilmington.froilansfarm.animals.person;

import com.zipcodewilmington.froilansfarm.crops.Crop;
import com.zipcodewilmington.froilansfarm.crops.Edible;
import com.zipcodewilmington.froilansfarm.crops.Egg;
import com.zipcodewilmington.froilansfarm.farm.CropRow;
import com.zipcodewilmington.froilansfarm.farm.FarmStorage;

public interface Botanist {
default void plant(Crop crop, CropRow row) {
row.addCropsToRow(crop);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.zipcodewilmington.froilansfarm.animals.person;

import com.zipcodewilmington.froilansfarm.Rideable;
import com.zipcodewilmington.froilansfarm.crops.Crop;
import com.zipcodewilmington.froilansfarm.crops.Edible;
import com.zipcodewilmington.froilansfarm.farm.CropRow;
import com.zipcodewilmington.froilansfarm.farm.FarmStorage;

public class Farmer extends Person implements Rider, Botanist {
// private String name;
public Farmer(){

}

public Farmer(String name) {
super(name);
}

public <SomeRide extends Rideable> void mount(SomeRide ride) {
ride.setIsBeingRidden(true);
}

@Override
public <SomeRide extends Rideable> void dismount(SomeRide ride) {
ride.setIsBeingRidden(false);
}

public String makeNoise(){
return "YeeHaw!";
}


public <SomeEdible extends Edible> void storeCrop(SomeEdible... someEdibles) {
FarmStorage storage = FarmStorage.getInstance();
for (SomeEdible food : someEdibles) {
storage.add(food);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package com.zipcodewilmington.froilansfarm.animals.person;

import com.zipcodewilmington.froilansfarm.animals.Animal;
import com.zipcodewilmington.froilansfarm.crops.Edible;
import com.zipcodewilmington.froilansfarm.farm.FarmStorage;

public class Person extends Animal {

private String name;

public Person() {
}

public Person (String name){
this.name = name;
}

public String makeNoise() {

return null;
}

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

public String getName() {
return name;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.zipcodewilmington.froilansfarm.animals.person;

public interface Pilot {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.zipcodewilmington.froilansfarm.animals.person;

import com.zipcodewilmington.froilansfarm.Rideable;

public interface Rider {

<SomeRide extends Rideable> void mount(SomeRide ride);

<SomeRide extends Rideable> void dismount(SomeRide ride);

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

public class CornStalk extends Crop<EarCorn>{

public CornStalk(boolean hasBeenHarvested, boolean hasBeenFertilized) {
super(hasBeenHarvested, hasBeenFertilized);
}

@Override
public EarCorn getEdible(EarCorn crop) {
return super.getEdible(crop);
}
}
Loading