Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
75165ff
Add files via upload
rpk2301 Jul 26, 2023
a8e27b4
Add files via upload
rpk2301 Jul 27, 2023
3a7e663
Delete Farm UML-2.png
rpk2301 Jul 27, 2023
ae50090
Delete Farm UML-3.png
rpk2301 Jul 28, 2023
bc859ef
Add files via upload
rpk2301 Jul 28, 2023
5350d97
added some tests and classes
rpk2301 Jul 29, 2023
043da68
Storage Tests
DestanyM Jul 29, 2023
5bed8f0
added some animal stuff
rpk2301 Jul 30, 2023
a98ed62
update 1
NigelBynum Jul 30, 2023
a91ee83
update 1
NigelBynum Aug 6, 2023
dc5c2ca
Merge remote-tracking branch 'origin/Nigel' into Destany
DestanyM Aug 7, 2023
ace1627
Merge remote-tracking branch 'origin/Ricky' into Destany
DestanyM Aug 7, 2023
5314ef8
Merge pull request #1 from rpk2301/Destany
DestanyM Aug 7, 2023
ade7cf7
Added lots of class
rpk2301 Aug 7, 2023
d3f5eef
Merge pull request #2 from rpk2301/Ricky
DestanyM Aug 7, 2023
6803fd7
Merge remote-tracking branch 'origin/Ricky' into Destany
DestanyM Aug 7, 2023
c192083
added some more classes
rpk2301 Aug 7, 2023
b398899
In Progress
rpk2301 Aug 7, 2023
2a2b1a4
In Progress
rpk2301 Aug 7, 2023
9ba06e4
2
NigelBynum Aug 7, 2023
3ba41bf
In Progress
rpk2301 Aug 7, 2023
5971c7a
Merge pull request #3 from rpk2301/Ricky
rpk2301 Aug 7, 2023
0d79789
2
NigelBynum Aug 7, 2023
6908061
Storage items code
DestanyM Aug 7, 2023
6071607
Merge remote-tracking branch 'origin/Ricky' into Destany
DestanyM Aug 7, 2023
27e68b0
Field completed
DestanyM Aug 7, 2023
22d0483
Merge remote-tracking branch 'origin/Nigel' into Destany
DestanyM Aug 7, 2023
ddcce33
updates'
DestanyM Aug 7, 2023
da44691
Merge pull request #4 from rpk2301/Destany
rpk2301 Aug 8, 2023
664f25c
Program currently compiling
rpk2301 Aug 8, 2023
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
Binary file added Farm UML-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,25 @@
<groupId>com.zipcodewilmington</groupId>
<artifactId>froilans-farm</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11
</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>


</project>
6 changes: 6 additions & 0 deletions src/main/java/Aircraft.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
public interface Aircraft {

public boolean fly();


}
7 changes: 7 additions & 0 deletions src/main/java/Animal.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
public abstract class Animal {





}
20 changes: 20 additions & 0 deletions src/main/java/Botanist.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
public class Botanist extends Person{


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

public void plant(Crop c, CropRow r)
{

}

public boolean Mount() {
return false;
}

public boolean Dismount() {
return false;
}
}
37 changes: 37 additions & 0 deletions src/main/java/Chicken.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@


public class Chicken {

public String getName() {
return name;
}

private String name;
public Chicken(String littleChick)
{
this.name = littleChick;
}

public boolean isFertilized() {
return isFertilized;
}

public void setFertilized(boolean fertilized) {
isFertilized = fertilized;
}

private boolean isFertilized;



public Food yield(boolean y)
{
if(isFertilized ==true)
{
return null;
}
else return new EdibleEgg();
}


}
25 changes: 25 additions & 0 deletions src/main/java/ChickenCoop.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import java.util.ArrayList;
import java.util.List;


public class ChickenCoop extends Storage<Chicken>{

ArrayList<Chicken> chickens = new ArrayList<Chicken>();

public void addChicken(Chicken chicken){
chickens.add(chicken);

}

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

public Chicken getChicken(int index){
if (index >= 0 && index < chickens.size()) {
return chickens.get(index);
}
return null;

}
}
2 changes: 2 additions & 0 deletions src/main/java/CornStalk.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
public class CornStalk {
}
21 changes: 21 additions & 0 deletions src/main/java/Crop.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
public class Crop extends Food{
boolean hasBeenHarvested;
boolean hasBeenFertilized;





Crop yield(boolean hasBeenFertilized, boolean hasBeenHarvested) {
if (hasBeenHarvested == true && hasBeenHarvested == true) {
return this;
}
return null;
}
void getHarvested(boolean hasBeenHarvested){ this.hasBeenHarvested = hasBeenHarvested;}
boolean setHarvested(boolean hasBeenHarvested){ return hasBeenHarvested;}
void getFertilized(boolean hasBeenFertilized){this.hasBeenFertilized = hasBeenFertilized;}
boolean setFertilized(boolean hasBeenFertilized){return hasBeenFertilized; }


}
22 changes: 22 additions & 0 deletions src/main/java/CropDuster.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
public class CropDuster extends FarmVehicle<Pilot> implements Aircraft {



public boolean fertilize(CropRow p)
{
return false;
}

public boolean fertilize(CropRow... c)
{
return true;
}
public boolean fly(Field p) {
return false;
}

@Override
public boolean fly() {
return false;
}
}
29 changes: 29 additions & 0 deletions src/main/java/CropRow.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import java.util.ArrayList;

public class CropRow <c extends Crop>{


private boolean isFertilized;



ArrayList<c> croprow = new ArrayList<>();


public ArrayList<c> getCroprow() {
return croprow;
}

public boolean isFertilized() {
return isFertilized;
}

public boolean plant(c plant)
{
croprow.add(plant);
return true;
}



}
5 changes: 5 additions & 0 deletions src/main/java/Eater.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
public interface Eater <T extends Food>{



}
7 changes: 7 additions & 0 deletions src/main/java/Edible.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
public class Edible extends Food {
private boolean hasBeenFertilized;

public boolean getisFertilized(boolean hasBeenFertilized) {
return hasBeenFertilized;
}
}
8 changes: 8 additions & 0 deletions src/main/java/EdibleEarCorn.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

public class EdibleEarCorn extends Edible {
boolean getisFertilized() {
return true;
}

}

6 changes: 6 additions & 0 deletions src/main/java/EdibleEgg.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
public class EdibleEgg extends Edible
{
boolean getisFertilized() {
return true;
}
}
10 changes: 10 additions & 0 deletions src/main/java/EdibleTomato.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
public class EdibleTomato extends Edible {




boolean getisFertilized()
{
return true;
}
}
Loading