Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
49f5c2e
Added file structure
LloydJr Jul 21, 2022
58c3e13
Merge pull request #1 from LloydJr/lloydBranch
LloydJr Jul 21, 2022
7d55d23
Merge pull request #1 from LloydJr/master
LloydJr Jul 21, 2022
c8186d2
Merge pull request #1 from Drover-Runs/master
CodeDEJ Jul 21, 2022
d591f2a
Added UML generics to class and interfaces
LloydJr Jul 21, 2022
fac5fa1
Merge pull request #2 from LloydJr/lloydBranch
LloydJr Jul 21, 2022
46c633a
Merge pull request #2 from LloydJr/master
LloydJr Jul 21, 2022
59eb845
added vehicles
Jul 21, 2022
0c3790d
Merge pull request #2 from Drover-Runs/master
CodeDEJ Jul 21, 2022
e735c4e
Updated Bot, Per, Far, Pil
Jul 21, 2022
1d3fa15
Added Constructor to Animal
LloydJr Jul 21, 2022
54c86af
Fixed Typo
LloydJr Jul 21, 2022
5899f52
Merge pull request #1 from Drover-Runs/master
tebarker Jul 21, 2022
9ffca50
Merge pull request #3 from tebarker/master
LloydJr Jul 21, 2022
6a14958
Update Code
LloydJr Jul 21, 2022
e4ed83d
Merge pull request #3 from Drover-Runs/master
LloydJr Jul 21, 2022
97eec78
Commit
LloydJr Jul 21, 2022
4e54e63
I am certain that I have completed Animal and GenericUtils
LloydJr Jul 21, 2022
663b9a8
Merge pull request #4 from LloydJr/lloydBranch
LloydJr Jul 21, 2022
90af814
Merge pull request #4 from LloydJr/master
LloydJr Jul 21, 2022
e1796cb
Merge pull request #2 from Drover-Runs/master
tebarker Jul 21, 2022
bfd75dd
vehicles
Jul 21, 2022
78cb89c
Merge pull request #1 from troyle51/dev
troyle51 Jul 21, 2022
1604d68
Merge pull request #6 from troyle51/master
LloydJr Jul 21, 2022
ed58ca9
Initial changes
ChrisKent-Github Jul 21, 2022
701857e
added generics
Jul 22, 2022
b54def1
Merge pull request #3 from CodeDEJ/DEJ-2
CodeDEJ Jul 22, 2022
72f9181
Merge pull request #8 from CodeDEJ/master
LloydJr Jul 22, 2022
23aed88
Added some variables and method heads
ChrisKent-Github Jul 22, 2022
bbbcd43
Added to CropRow
ChrisKent-Github Jul 22, 2022
1b1bb9a
Merge pull request #10 from ChrisKent-Github/master
LloydJr Jul 22, 2022
b41f00c
adjusted classes and interfaces
Jul 22, 2022
27ff04d
Merge branch 'Drover-Runs:master' into master
troyle51 Jul 22, 2022
a64bb8f
Merge pull request #11 from troyle51/master
LloydJr Jul 22, 2022
7a9d736
Merge pull request #5 from Drover-Runs/master
LloydJr Jul 22, 2022
1ece527
commit before pulling
Jul 22, 2022
6b94a9b
Merge pull request #3 from Drover-Runs/master
tebarker Jul 22, 2022
9abe31c
Refactored Classes
LloydJr Jul 22, 2022
c5a3cc7
Merge pull request #6 from LloydJr/lloydBranch
LloydJr Jul 22, 2022
fc04ec8
Merge pull request #14 from LloydJr/master
LloydJr Jul 22, 2022
0bc5d83
Merge branch 'master' into master
LloydJr Jul 22, 2022
77c197a
Merge pull request #15 from tebarker/master
LloydJr Jul 22, 2022
761f3ac
Merge pull request #7 from Drover-Runs/master
LloydJr Jul 22, 2022
bacb5e4
Merge pull request #4 from Drover-Runs/master
tebarker Jul 22, 2022
81505e0
Person to abstract
Jul 22, 2022
a7c89a3
Merge pull request #16 from tebarker/master
LloydJr Jul 22, 2022
f3cdb6f
changes cropduster and farmvehicle
Jul 22, 2022
a01decb
Merge pull request #8 from Drover-Runs/master
LloydJr Jul 22, 2022
53cba98
changes to vehicles
Jul 22, 2022
d0c3ac9
Merge pull request #17 from troyle51/master
LloydJr Jul 22, 2022
f333595
Produce changes
ChrisKent-Github Jul 22, 2022
9b59e70
Merge pull request #9 from Drover-Runs/master
LloydJr Jul 22, 2022
faae9fe
Merge pull request #18 from ChrisKent-Github/master
LloydJr Jul 22, 2022
a1ab6cb
Merge pull request #10 from Drover-Runs/master
LloydJr Jul 22, 2022
5a82a55
filled in person
Jul 22, 2022
a63c8bd
Merge pull request #19 from tebarker/master
LloydJr Jul 22, 2022
64f704b
Added Boolean to Eater
LloydJr Jul 22, 2022
cd702b8
Merge pull request #11 from LloydJr/lloydBranch
LloydJr Jul 22, 2022
1069c97
Merge pull request #20 from LloydJr/master
LloydJr Jul 22, 2022
cae88b8
Merge pull request #12 from Drover-Runs/master
LloydJr Jul 22, 2022
15938d3
Merge pull request #5 from Drover-Runs/master
tebarker Jul 22, 2022
d63160a
Added Carrot updated Crop and CropRow
ChrisKent-Github Jul 22, 2022
7bb170a
Made changes to rider and rideable
LloydJr Jul 22, 2022
c1f592e
Merge pull request #13 from LloydJr/lloydBranch
LloydJr Jul 22, 2022
05eae86
Merge pull request #21 from LloydJr/master
LloydJr Jul 22, 2022
726d733
Merge pull request #14 from Drover-Runs/master
LloydJr Jul 22, 2022
c7a0f66
test files
Jul 22, 2022
b60a24b
Merge pull request #6 from Drover-Runs/master
tebarker Jul 22, 2022
4657a95
Merge pull request #23 from troyle51/master
LloydJr Jul 22, 2022
432c6f2
Added boolean in CropRow, Carrot class and more
ChrisKent-Github Jul 22, 2022
ad012a3
fixed CropRow boolean
ChrisKent-Github Jul 22, 2022
f58511c
Merge pull request #25 from ChrisKent-Github/master
LloydJr Jul 22, 2022
0fd488a
Merge pull request #15 from Drover-Runs/master
LloydJr Jul 22, 2022
8ec2f6c
mount methods to boolean type
Jul 22, 2022
af82b28
Merge pull request #26 from troyle51/master
LloydJr Jul 22, 2022
3f9d742
Merge pull request #27 from tebarker/master
LloydJr Jul 22, 2022
970195d
Merge pull request #16 from Drover-Runs/master
LloydJr Jul 22, 2022
622627b
made some spaces
Jul 22, 2022
50be559
Merge pull request #28 from tebarker/master
LloydJr Jul 22, 2022
8fb0c13
Merge pull request #17 from Drover-Runs/master
LloydJr Jul 22, 2022
afaae80
Merge pull request #8 from Drover-Runs/master
tebarker Jul 22, 2022
6d4bad0
Refactored Animal Files
LloydJr Jul 22, 2022
60d9bca
Merge pull request #18 from LloydJr/lloydBranch
LloydJr Jul 22, 2022
37799a7
Merge pull request #29 from LloydJr/master
LloydJr Jul 22, 2022
c7eca85
Made noiseMaker a String <- void
LloydJr Jul 22, 2022
e165284
Merge pull request #19 from LloydJr/lloydBranch
LloydJr Jul 22, 2022
90498ec
Merge pull request #30 from LloydJr/master
LloydJr Jul 22, 2022
2c917c6
Made noise testing for Animal
LloydJr Jul 22, 2022
10c77cd
string
Jul 22, 2022
2960ffa
Merge pull request #20 from LloydJr/lloydBranch
LloydJr Jul 22, 2022
4184514
Merge pull request #32 from LloydJr/master
LloydJr Jul 22, 2022
56d2973
Merge pull request #31 from troyle51/master
LloydJr Jul 22, 2022
d3e59f1
Merge pull request #21 from Drover-Runs/master
LloydJr Jul 22, 2022
e696586
Merge pull request #9 from Drover-Runs/master
tebarker Jul 22, 2022
8292077
Fixed Rider
LloydJr Jul 22, 2022
c61414d
Merge pull request #22 from LloydJr/lloydBranch
LloydJr Jul 22, 2022
2a581ec
Merge pull request #35 from LloydJr/master
LloydJr Jul 22, 2022
2355f18
Removed some overrides
LloydJr Jul 22, 2022
2d9fd75
Merge pull request #23 from LloydJr/lloydBranch
LloydJr Jul 22, 2022
764512b
fixed makeNoise in all vehicle classes
Jul 22, 2022
f86056d
updating tests
Jul 23, 2022
a8c0b2f
test updates
Jul 23, 2022
7aa6bce
Merge pull request #10 from Drover-Runs/master
tebarker Jul 23, 2022
c59bf59
changed type to boolean
Jul 23, 2022
3580162
Merge pull request #36 from tebarker/master
LloydJr Jul 23, 2022
26fa9a8
Merge pull request #37 from troyle51/master
LloydJr Jul 23, 2022
b36abe5
Merge pull request #24 from Drover-Runs/master
LloydJr Jul 23, 2022
db8dc2c
Field Test and Egg changed to abstract
ChrisKent-Github Jul 23, 2022
9c26ae7
Pilot implements Rider
Jul 23, 2022
3a331fe
Merge pull request #38 from ChrisKent-Github/master
LloydJr Jul 23, 2022
8618626
Merge pull request #39 from tebarker/master
LloydJr Jul 23, 2022
9202393
Merge pull request #25 from Drover-Runs/master
LloydJr Jul 23, 2022
b2c04c2
Act
LloydJr Jul 23, 2022
31f7942
Add
LloydJr Jul 23, 2022
e16675f
Commented out FieldTest
ChrisKent-Github Jul 23, 2022
268637d
Fixed Test Cases
LloydJr Jul 23, 2022
6eebc9d
Merge pull request #26 from LloydJr/lloydBranch
LloydJr Jul 23, 2022
fa253a6
Merge pull request #40 from ChrisKent-Github/master
LloydJr Jul 23, 2022
ed7a18e
Merge pull request #41 from LloydJr/master
LloydJr Jul 23, 2022
2beffbd
Merge pull request #27 from Drover-Runs/master
LloydJr Jul 23, 2022
10a2df3
more test coverage
Jul 23, 2022
0423588
Merge pull request #11 from Drover-Runs/master
tebarker Jul 23, 2022
2171abf
void -> Boolean eat
LloydJr Jul 23, 2022
4077a5e
Merge pull request #28 from LloydJr/lloydBranch
LloydJr Jul 23, 2022
347d62d
Merge pull request #42 from LloydJr/master
LloydJr Jul 23, 2022
c0c7766
tests
Jul 23, 2022
ba84f46
Merge pull request #12 from Drover-Runs/master
tebarker Jul 23, 2022
f406a34
Merge branch 'master' into master
LloydJr Jul 24, 2022
d7dcf2e
Merge pull request #46 from troyle51/master
LloydJr Jul 24, 2022
0b923dd
Go
LloydJr Jul 24, 2022
007996a
Merge pull request #29 from LloydJr/lloydBranch
LloydJr Jul 24, 2022
edca653
Merge pull request #47 from LloydJr/master
LloydJr Jul 24, 2022
d8d2d5f
CropRow added plantCrop method
ChrisKent-Github Jul 24, 2022
020eda2
Created Test for most methods, changes to Crop and Field, changed Egg…
ChrisKent-Github Jul 24, 2022
22792c6
Merge pull request #48 from ChrisKent-Github/master
LloydJr Jul 24, 2022
8d5476a
submitting tests again
Jul 24, 2022
be3e136
trying to update
Jul 24, 2022
4d415b9
Merge branch 'master' into master
LloydJr Jul 24, 2022
4e5f2f3
Merge pull request #49 from tebarker/master
LloydJr Jul 24, 2022
a96479d
Merge pull request #13 from Drover-Runs/master
tebarker Jul 24, 2022
20434be
botanist nothings crop
Jul 24, 2022
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
20 changes: 20 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,26 @@
<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>6</source>
<target>6</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>


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

import com.zipcodewilmington.froilansfarm.GenericUtils.Eater;
import com.zipcodewilmington.froilansfarm.GenericUtils.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.Animal;

import com.zipcodewilmington.froilansfarm.GenericUtils.Eater;
import com.zipcodewilmington.froilansfarm.GenericUtils.Edible;
import com.zipcodewilmington.froilansfarm.GenericUtils.NoiseMaker;
import com.zipcodewilmington.froilansfarm.Produce.Crop;
import com.zipcodewilmington.froilansfarm.Produce.Produce;

public class Chicken extends Animal {


public Boolean eat() {
return true;
}

public Boolean hasBeenFed() {
return null;
}

public String makeNoise() {
return "Peep!";
}
}
14 changes: 14 additions & 0 deletions src/main/java/com/zipcodewilmington/froilansfarm/Animal/Egg.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.zipcodewilmington.froilansfarm.Animal;

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

public abstract class Egg extends Chicken implements Produce {
Edible edible;


public Boolean isFertilized() {
return edible.getHasBeenFertilized();
}
}
28 changes: 28 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,28 @@
package com.zipcodewilmington.froilansfarm.Animal;

import com.zipcodewilmington.froilansfarm.GenericUtils.NoiseMaker;
import com.zipcodewilmington.froilansfarm.GenericUtils.Rideable;
import com.zipcodewilmington.froilansfarm.GenericUtils.Rider;

public class Horse extends Animal implements Rideable {

public Boolean eat() {
return true;
}

public Boolean hasBeenFed() {
return null;
}

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

public Boolean mounted(Rider object) {
return null;
}

public Boolean dismounted(Rider object) {
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
/**
* Created by leon on 2/26/18.
*/
public class MainApplication {
public class Farm {

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

public interface Eater {
Boolean eat();
Boolean hasBeenFed();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.zipcodewilmington.froilansfarm.GenericUtils;

import com.zipcodewilmington.froilansfarm.Produce.Produce;

public abstract class Edible <EdibleType> implements Produce {
Boolean hasBeenFertilized = false;

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


public Boolean getHasBeenFertilized(){
return this.hasBeenFertilized;
}


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

public interface NoiseMaker {
String makeNoise();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.zipcodewilmington.froilansfarm.GenericUtils;

public interface Rideable <RideableType extends Rider> {
Boolean mounted(RideableType object);
Boolean dismounted(RideableType object);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.zipcodewilmington.froilansfarm.GenericUtils;

import com.zipcodewilmington.froilansfarm.Animal.Horse;
import com.zipcodewilmington.froilansfarm.Person.Person;

public interface Rider <RiderType extends Horse, Vehicle> {
Boolean mount(RiderType object);
Boolean dismount(RiderType object);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.zipcodewilmington.froilansfarm.Person;

import com.zipcodewilmington.froilansfarm.Produce.Crop;
import com.zipcodewilmington.froilansfarm.Produce.CropRow;

public class Botanist <PersonType> {

public void plant(Crop crop, CropRow cropRow) {
}

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

import com.zipcodewilmington.froilansfarm.Animal.Horse;
import com.zipcodewilmington.froilansfarm.GenericUtils.Eater;
import com.zipcodewilmington.froilansfarm.GenericUtils.NoiseMaker;
import com.zipcodewilmington.froilansfarm.GenericUtils.Rideable;
import com.zipcodewilmington.froilansfarm.GenericUtils.Rider;
import com.zipcodewilmington.froilansfarm.Produce.Crop;
import com.zipcodewilmington.froilansfarm.Produce.CropRow;

public class Farmer <PersonType, Botanist> implements Rider {


public boolean plant(Crop crop, CropRow cropRow) {
return true;
}

public Boolean mount(Horse object) {
return null;
}

public Boolean dismount(Horse object) {
return null;
}


//Got a warning from the IDE about using raw types and awareness of type erasure when I did
// public class Farmer <Farmer extends Person> {}.


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

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

public class Person<PersonType> implements NoiseMaker, Eater {
public Person (String name, int age, boolean hasBeenFed){
this. name = name;
this.age = age;
this.hasBeenFed = hasBeenFed;
}
String name;
int age;
boolean hasBeenFed;


public String getName() {
return name;
}

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

}

public int getAge() {
return age;
}

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

public boolean isHasBeenFed() {
return hasBeenFed;
}

public void setHasBeenFed(boolean hasBeenFed) {
this.hasBeenFed = hasBeenFed;
}


public Boolean eat() {
return true;
}

public Boolean hasBeenFed() {
return true;
}


public String makeNoise() {
return "grunt!";
}
}
25 changes: 25 additions & 0 deletions src/main/java/com/zipcodewilmington/froilansfarm/Person/Pilot.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.zipcodewilmington.froilansfarm.Person;

import com.zipcodewilmington.froilansfarm.Animal.Horse;
import com.zipcodewilmington.froilansfarm.GenericUtils.Rider;
import com.zipcodewilmington.froilansfarm.Vehicle.AirCraft;

public class Pilot <PilotType, PersonType> extends AirCraft implements Rider {


public Boolean mounted(Rider object) {
return null;
}

public Boolean dismounted(Rider object) {
return null;
}

public Boolean mount(Horse object) {
return null;
}

public Boolean dismount(Horse object) {
return null;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.zipcodewilmington.froilansfarm.Produce;

public class Carrot<E> {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.zipcodewilmington.froilansfarm.Produce;

public class Corn<E> {
}
26 changes: 26 additions & 0 deletions src/main/java/com/zipcodewilmington/froilansfarm/Produce/Crop.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.zipcodewilmington.froilansfarm.Produce;

import com.zipcodewilmington.froilansfarm.GenericUtils.Edible;

public class Crop<E> {
private Boolean hasBeenHarvested;


public Crop(){
setHasBeenHarvested(false);

}

public void setHasBeenHarvested(Boolean hasBeenHarvested) {
this.hasBeenHarvested = hasBeenHarvested;
}

public Boolean getHasBeenHarvested() {
return hasBeenHarvested;
}





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

import java.util.ArrayList;

public class CropRow<Crop> {
ArrayList<Crop> croprow;

public CropRow() {
croprow = new ArrayList<Crop>(0);
}

public Crop plantCrop(Crop crop){
croprow.add(crop);
return null;
}

public Integer size(){
return croprow.size();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.zipcodewilmington.froilansfarm.Produce;

import java.lang.reflect.Array;
import java.util.ArrayList;

public class Field<CropRow> {
ArrayList<CropRow> field;
Integer numOfRows;

public Field() {
field = new ArrayList<CropRow>(0);
}

CropRow add(CropRow cropRow) {
field.add(cropRow);
return cropRow;
}

Integer size() {
return field.size();
}

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

public class Onion<E> {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.zipcodewilmington.froilansfarm.Produce;

public interface Produce<Edible> {


Boolean fertilize();



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

public class Radish<E> {
}
git
Loading