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

Dev #57

Open
wants to merge 97 commits into
base: master
Choose a base branch
from
Open

Dev #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
69f8bab
Nicks working branch
Jul 21, 2021
97dc5f7
StorageInterface
Jul 21, 2021
4252c32
Merge pull request #1 from FroilansFunkyFarm/feature/nick
NicholasWolak Jul 21, 2021
23d69fd
(feat:creating-interfaces
Jul 21, 2021
2a524ae
Merge pull request #2 from FroilansFunkyFarm/feature/nick
NicholasWolak Jul 21, 2021
a0074e8
all interface besides botanist
Jul 21, 2021
bc9880c
Merge pull request #3 from FroilansFunkyFarm/feature/nick
NicholasWolak Jul 21, 2021
40408de
Crop packages added
Jul 21, 2021
0911063
Merge pull request #4 from FroilansFunkyFarm/feat/dee
dmckoy0776 Jul 21, 2021
7fca134
possible getters
Jul 21, 2021
95609db
BareBones Classes and Tests
charnaexw Jul 21, 2021
5495e60
Merge pull request #5 from FroilansFunkyFarm/newfeat/dee
dmckoy0776 Jul 21, 2021
d5e43c8
Pom xml
charnaexw Jul 21, 2021
978eefd
Merge pull request #6 from FroilansFunkyFarm/feature/char
charnaexw Jul 21, 2021
0561b2b
(feat:storage) Stable and ChickenCoop created with skeleton chicken a…
Jul 21, 2021
64fb6c3
Merge pull request #7 from FroilansFunkyFarm/feature/nick
NicholasWolak Jul 21, 2021
5ccec55
done something need interface
sitarameez Jul 21, 2021
aa60bac
Merge branch 'dev' into feature/sitara
sitarameez Jul 21, 2021
57748ac
Merge pull request #8 from FroilansFunkyFarm/feature/sitara
NicholasWolak Jul 21, 2021
f7b9def
(feat:chickenCoopTest)
Jul 21, 2021
f2ddee8
Merge branch 'dev' into feature/nick
NicholasWolak Jul 21, 2021
3ea45f7
Merge pull request #9 from FroilansFunkyFarm/feature/nick
NicholasWolak Jul 21, 2021
22c1ad7
bad
sitarameez Jul 21, 2021
0264eb8
Merge branch 'dev' into feature/farm
NicholasWolak Jul 21, 2021
3647d6a
Merge pull request #10 from FroilansFunkyFarm/feature/farm
NicholasWolak Jul 21, 2021
94747c0
wrote all classes and some test cases not sure if its right
sitarameez Jul 21, 2021
f94e2ad
Merge pull request #11 from FroilansFunkyFarm/feature/farm
sitarameez Jul 21, 2021
dbca238
more Crop tests and Plot thickens explained
Jul 21, 2021
381d521
(feat:storage-test) wrote tests for applicable storage
Jul 21, 2021
15134c3
Merge pull request #12 from FroilansFunkyFarm/testBranch
NicholasWolak Jul 21, 2021
2998e4f
Merge branch 'dev' into feat/Dee
dmckoy0776 Jul 22, 2021
759e4fb
Merge pull request #13 from FroilansFunkyFarm/feat/Dee
dmckoy0776 Jul 22, 2021
d1a6673
comments
charnaexw Jul 22, 2021
9a5acb7
merge conflict
charnaexw Jul 22, 2021
152b6d8
FarmVehicle Test complete
charnaexw Jul 22, 2021
786297c
farm
sitarameez Jul 22, 2021
564344f
Merge pull request #14 from FroilansFunkyFarm/feature/sitara1
sitarameez Jul 22, 2021
69048f3
Finished Cropduster
charnaexw Jul 22, 2021
882cb44
Merge pull request #15 from FroilansFunkyFarm/feature/char
charnaexw Jul 22, 2021
9bbc48d
Test Making Tractor
charnaexw Jul 22, 2021
b826e14
some more crop tests
Jul 22, 2021
5724330
Merge pull request #16 from FroilansFunkyFarm/feature/char
charnaexw Jul 22, 2021
ca4bbab
Merge pull request #17 from FroilansFunkyFarm/feat/deecrops
dmckoy0776 Jul 22, 2021
1145aa2
Fixed duplicate class
Jul 22, 2021
503adac
Merge pull request #18 from FroilansFunkyFarm/feature/nick
NicholasWolak Jul 22, 2021
3590ef4
hgkg
sitarameez Jul 22, 2021
fddef65
Merge confl
NicholasWolak Jul 22, 2021
4fda911
Merge pull request #20 from FroilansFunkyFarm/feature/nick
NicholasWolak Jul 22, 2021
55693ed
Woop
charnaexw Jul 22, 2021
dccf11a
Tests Done
charnaexw Jul 22, 2021
50a7b4d
Done
charnaexw Jul 22, 2021
4ff1f28
Pilot
charnaexw Jul 22, 2021
29787be
Merge pull request #21 from FroilansFunkyFarm/feature/char
charnaexw Jul 22, 2021
5fde741
Done
charnaexw Jul 22, 2021
2f7c697
Tests done for real.
charnaexw Jul 22, 2021
9ed2e90
more tests
Jul 22, 2021
7f9b842
Added instance test
NicholasWolak Jul 22, 2021
9d71a6f
Merge pull request #22 from FroilansFunkyFarm/feat/croptests
dmckoy0776 Jul 22, 2021
5b0139d
Merge pull request #23 from FroilansFunkyFarm/feature/char
charnaexw Jul 22, 2021
507e2e5
Merge pull request #24 from FroilansFunkyFarm/feature/nick
NicholasWolak Jul 22, 2021
e9eabee
StoragePackage tests created
NicholasWolak Jul 22, 2021
f51c83d
Merge pull request #25 from FroilansFunkyFarm/feature/nick
NicholasWolak Jul 22, 2021
ac5c803
(feat:feature/nick) fixed class signature of Pilot
NicholasWolak Jul 22, 2021
5797682
Dusty tests
Jul 22, 2021
f8af2a2
Merge pull request #26 from FroilansFunkyFarm/feat/cropfert
dmckoy0776 Jul 22, 2021
e907740
prepull
NicholasWolak Jul 22, 2021
2ceabcf
Merge pull request #27 from FroilansFunkyFarm/feature/nick
NicholasWolak Jul 22, 2021
6de4e74
Woopw
charnaexw Jul 22, 2021
7bd6e59
Merge COnflict
charnaexw Jul 22, 2021
77be401
more test
NicholasWolak Jul 23, 2021
155f652
farmer
sitarameez Jul 23, 2021
6f83939
Merge pull request #28 from FroilansFunkyFarm/feature/sitara1
sitarameez Jul 23, 2021
535775f
crop tests with exceptions
Jul 23, 2021
34cc6c2
Merge pull request #29 from FroilansFunkyFarm/feat/crops
dmckoy0776 Jul 23, 2021
c5c1099
wanna pull
charnaexw Jul 23, 2021
538fbff
wanna pull
charnaexw Jul 23, 2021
ce8dbd8
One more tire
charnaexw Jul 23, 2021
b3f831e
yea
charnaexw Jul 23, 2021
dc0281b
Merge pull request #30 from FroilansFunkyFarm/feature/char
charnaexw Jul 23, 2021
d6352d1
prepull
NicholasWolak Jul 23, 2021
144647a
(feat:nick) implemented more tests on Vehicle package
NicholasWolak Jul 23, 2021
2c0aabe
Merge pull request #31 from FroilansFunkyFarm/feature/nick
NicholasWolak Jul 23, 2021
926450f
(feat:vahicle-package-test) implemented tests inside of the vehicle p…
NicholasWolak Jul 23, 2021
2002230
harvest method tested in CropTest
Jul 23, 2021
a0a5419
Merge pull request #32 from FroilansFunkyFarm/feat/cropfarm
dmckoy0776 Jul 23, 2021
9aefe37
Merge pull request #33 from FroilansFunkyFarm/feature/nick
NicholasWolak Jul 23, 2021
b4be124
fixed food available test
Jul 23, 2021
708b179
Merge pull request #34 from FroilansFunkyFarm/feat/cropfood
dmckoy0776 Jul 23, 2021
6071c16
nick made a boo boo
sitarameez Jul 23, 2021
3b21f3e
Merge pull request #35 from FroilansFunkyFarm/feature/sitara1
sitarameez Jul 23, 2021
1502439
crop tests
Jul 23, 2021
fe636d9
Merge branch 'dev' of https://github.com/FroilansFunkyFarm/Maven.Farm…
Jul 25, 2021
45e2d4f
refactoring begins
Jul 25, 2021
ffc164d
Merge pull request #36 from FroilansFunkyFarm/feat/dee
dmckoy0776 Jul 25, 2021
780469b
refactor farmer
Jul 25, 2021
f470406
refactored CropRow
Jul 25, 2021
dc4d4b1
Merge pull request #37 from FroilansFunkyFarm/feat/refactor
dmckoy0776 Jul 25, 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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
* Consider a system in which
* `Eater` can `eat` an `Edible` object.
* `NoiseMaker` can `makeNoise`
* `Animal` is a `NoiseMaker` and `Eater`
* `Horse` is an `Animal` and `Rideable`
* `Chicken` is an `Animal` and a `Produce` which `yield` an `EdibleEgg` if `hasBeenFertilized` flag is `false`.
* `com.zipcodewilmington.froilansfarm.Animal` is a `NoiseMaker` and `Eater`
* `Horse` is an `com.zipcodewilmington.froilansfarm.Animal` and `Rideable`
* `Chicken` is an `com.zipcodewilmington.froilansfarm.Animal` and a `Produce` which `yield` an `EdibleEgg` if `hasBeenFertilized` flag is `false`.

* `Rider` can `mount` and `dismount` a `Rideable` object.
* `Botanist` can `plant` a `Crop` in a `CropRow`.
Expand Down
23 changes: 23 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,28 @@
<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.12</version>
<scope>test</scope>
</dependency>
</dependencies>



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

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

public class Animal implements NoiseMaker, Eater {
String name;
Integer age;
Integer amountOfFoodEaten;

public Animal(String name, Integer age, Integer amountOfFoodEaten) {
this.name = name;
this.age = age;
this.amountOfFoodEaten = amountOfFoodEaten;
}

public Animal() {
this.name = "";
this.age = 0;
this.amountOfFoodEaten = 0;
}

public String getName() {
return name;
}

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

public Integer getAge() {
return age;
}

public void setAge(Integer age) {
this.age = age;
}

public void eat(Edible object) {

}

public boolean hasEaten() {
return false;
}

public String noiseMaker() {
return null;
}
}
37 changes: 37 additions & 0 deletions src/main/java/com/zipcodewilmington/froilansfarm/Animal/Barn.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package com.zipcodewilmington.froilansfarm.Animal;

import com.zipcodewilmington.froilansfarm.storage.StorageInterface;

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

public abstract class Barn<T extends Animal> implements StorageInterface <T> {
List<T> animals;

public Barn() {
animals = new ArrayList<>();
}
//
// public Integer numberOfAnimals(){
// return animals.size();
// }
//
//
// public void add(T animal) {
// animals.add(animal);
// }
//
// public void remove(T animal) {
// animals.remove(animal);
// }

public List<T> getList() {
return animals;
}

public void setAnimals(List<T> animals) {
this.animals = new ArrayList<>(animals);
}


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

import com.zipcodewilmington.froilansfarm.Edible;
import com.zipcodewilmington.froilansfarm.Produce;

public class Chicken extends Animal implements Produce {
Boolean isFertilized = false;
Integer eggs;

public Chicken() {
}

public void yield(Edible object) {
if (this.isFertilized == true) {
this.eggs += 1;
}
}

public boolean hasBeenFertilized() {
return false;
}

public boolean hasBeenHarvested() {
return false;
}

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

public void eat(Edible Object) {

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

import com.zipcodewilmington.froilansfarm.Eater;
import com.zipcodewilmington.froilansfarm.Edible;
import com.zipcodewilmington.froilansfarm.Rideable;
import com.zipcodewilmington.froilansfarm.Rider;
import com.zipcodewilmington.froilansfarm.Vehicle.Botanist;
import com.zipcodewilmington.froilansfarm.crops.Crop;
import com.zipcodewilmington.froilansfarm.crops.CropRow;

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

public class Farmer extends Person implements Rider, Eater, Botanist {
int numberOfRidesTaken;
int numberOfCropsPlanted;
int numberOfEdiblesEaten;
// List<Edible> thingsEaten;
String name = "Froilan";
Rideable vehicle;


public Farmer(Integer numberOfRidesTaken, Integer numberOfCropsPlanted, Integer numberOfEdiblesEaten
, String name, ArrayList<Edible> thingsEaten) {
this.numberOfRidesTaken = numberOfRidesTaken;
this.numberOfCropsPlanted = numberOfCropsPlanted;
this.numberOfEdiblesEaten = numberOfEdiblesEaten;
this.name = name;
//this.thingsEaten = thingsEaten;

}

public Farmer() {
}

public String getName() {
return name;
}

public void mount(Rideable object) {
this.vehicle = object;
if (object.hasBeenRiden()) {
incrementRidesTaken();
}
}

public Integer getNumberOfRidesTaken() {
return numberOfRidesTaken;
}

public void dismount(Rideable object) {
this.vehicle = null;
}

public void eat(Edible object) {
if (object.isEaten()) {
incrementFoodEaten();
} else {
throw new UnsupportedOperationException("No new produce to eat:(");
}
}

public boolean hasEaten() {
return false;
}

public void plant(CropRow cropRow, Crop crop) {
cropRow.add(crop);
incrementNumberOfPlants();

}

public Integer getNumberOfCropsPlanted() {
return numberOfCropsPlanted;
}

public void setNumberOfPlants(Integer num) {
this.numberOfCropsPlanted = num;
}

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

public void incrementNumberOfPlants(){
setNumberOfPlants(getNumberOfCropsPlanted()+1);
}

public void incrementFoodEaten(){
setAmountOfFoodEaten(getAmountOfFoodEaten()+1);
}
public void incrementRidesTaken(){
numberOfRidesTaken++;

}
}
30 changes: 30 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,30 @@
package com.zipcodewilmington.froilansfarm.Animal;

import com.zipcodewilmington.froilansfarm.Rideable;

public class Horse extends Animal implements Rideable {

String name;
Integer age;
Integer amountOfFoodEaten;

public Horse(String name, Integer age, Integer amountOfFoodEaten) {
super(name, age, amountOfFoodEaten);
}


public Horse() {
this.name = "";
this.age = 0;
this.amountOfFoodEaten = 0;
}


public boolean hasBeenRiden() {
return false;
}

public String makeNoise() {
return "Neigh!";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.zipcodewilmington.froilansfarm.Animal;

public class Person {
String name;
int amountOfFoodEaten;

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

public Person() {
this.name = "";
this.amountOfFoodEaten = 0;
}

public String getName() {
return name;
}

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

public int getAmountOfFoodEaten() {
return amountOfFoodEaten;
}

public void setAmountOfFoodEaten(int amountOfFoodEaten) {
this.amountOfFoodEaten = amountOfFoodEaten;
}
}
8 changes: 8 additions & 0 deletions src/main/java/com/zipcodewilmington/froilansfarm/Eater.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.zipcodewilmington.froilansfarm;

public interface Eater {

void eat(Edible object);

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

public interface Edible {

boolean isEaten();

}
Loading