made fields etc

src/main/java/com/zipcodewilmington/froilansfarm/Animals/Freelan.java

@@ -0,0 +1,19 @@
+package com.zipcodewilmington.froilansfarm.Animals;
+
+import com.zipcodewilmington.froilansfarm.Holders.CropRow;
+import com.zipcodewilmington.froilansfarm.Holders.Field;
+import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Botanist;
+import com.zipcodewilmington.froilansfarm.PlantsAndCrops.CornStalk;
+import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Crop;
+import com.zipcodewilmington.froilansfarm.PlantsAndCrops.TomatoPlant;
+
+public class Freelan extends Person implements Farmer, Botanist {
+
+    Field field = new Field;
+
+    public void plant(Crop type, int numToPlant){
+        CropRow row = new CropRow(type, numToPlant);
+        field.addToField(row);
+
+    }
+}

src/main/java/com/zipcodewilmington/froilansfarm/Animals/Froilan.java

@@ -0,0 +1,10 @@
+package com.zipcodewilmington.froilansfarm.Animals;
+
+import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Botanist;
+
+public class Froilan extends Person implements Farmer {
+
+    public plant(){
+
+    }
+}

src/main/java/com/zipcodewilmington/froilansfarm/Animals/Pilot.java → src/main/java/com/zipcodewilmington/froilansfarm/Animals/Froilanda.java

@@ -1,7 +1,6 @@
 package com.zipcodewilmington.froilansfarm.Animals;
 
-import com.zipcodewilmington.froilansfarm.Animals.Person;
 import com.zipcodewilmington.froilansfarm.Vehicle.Flyer;
 
-public class Pilot extends Person implements Flyer {
+public class Froilanda extends Person implements Flyer {
 }

src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java

@@ -15,13 +15,13 @@ public class Horse extends Amimal implements Ridable {
         return "NEIGH!";
     }
 
-    public boolean isRideable(){
-        return true;
+    public boolean getIsRideable(){
+        return rider.getIsMounted();
     }
 
     public String ride() {
         String result = "No riding today";
-        if (getIsRideable() && rider.getIsMounted()) {
+        if (getIsRideable()) {
             result = "";
             for (int i = 0; i < stable.getHorses(); i++) {
                 result += "Horse number " + i + " has been ridden today. \n";

src/main/java/com/zipcodewilmington/froilansfarm/Holders/CropRow.java

@@ -1,7 +1,23 @@
 package com.zipcodewilmington.froilansfarm.Holders;
 
-public class CropRow extends Field {
+import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Crop;
 
+public class CropRow {
 
+    private int numberPlanted;
+    private Crop cropType;
+    private boolean isFertilized = false;
 
+    public CropRow(Crop cropType, int numberPlanted) {
+        this.cropType=cropType;
+        this.numberPlanted=numberPlanted;
+    }
+
+    public boolean getIsFertilized() {
+        return isFertilized;
+    }
+
+    public void setFertilized(boolean fertilized) {
+        isFertilized = fertilized;
+    }
 }

src/main/java/com/zipcodewilmington/froilansfarm/Holders/Farm.java

@@ -1,4 +1,4 @@
 package com.zipcodewilmington.froilansfarm.Holders;
 
-public class Farm extends Storer {
+public class Farm  {
 }

src/main/java/com/zipcodewilmington/froilansfarm/Holders/Field.java

@@ -1,4 +1,26 @@
 package com.zipcodewilmington.froilansfarm.Holders;
 
-public class Field extends Farm {
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class Field {
+
+    private Map<Integer, CropRow> fieldMap;
+    private int rowNumber=1;
+
+
+    public Field() {
+
+        fieldMap = new LinkedHashMap<Integer, CropRow>();
+
+    }
+
+    public void addToField(CropRow cropRow){
+        fieldMap.put(getRowNumber(), cropRow);
+    }
+
+    public int getRowNumber() {
+        return rowNumber++;
+    }
 }

src/main/java/com/zipcodewilmington/froilansfarm/PlantsAndCrops/Botanist.java

@@ -1,4 +1,7 @@
 package com.zipcodewilmington.froilansfarm.PlantsAndCrops;
 
 public interface Botanist {
+
+    void plant();
+
 }

src/main/java/com/zipcodewilmington/froilansfarm/PlantsAndCrops/CornStalk.java

@@ -1,4 +1,12 @@
 package com.zipcodewilmington.froilansfarm.PlantsAndCrops;
 
-public class CornStalk extends Crop {
+import com.zipcodewilmington.froilansfarm.Holders.CropRow;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+public class CornStalk extends Crop{
+
+    public CornStalk() {
+    }
 }

src/main/java/com/zipcodewilmington/froilansfarm/PlantsAndCrops/TomatoPlant.java

@@ -1,6 +1,10 @@
 package com.zipcodewilmington.froilansfarm.PlantsAndCrops;
 
+import com.zipcodewilmington.froilansfarm.Holders.CropRow;
 import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Crop;
 
-public class TomatoPlant extends Crop {
+public class TomatoPlant extends Crop{
+
+    public TomatoPlant() {
+    }
 }

src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Aircraft.java

@@ -3,4 +3,14 @@ package com.zipcodewilmington.froilansfarm.Vehicle;
 import com.zipcodewilmington.froilansfarm.Vehicle.Vehicle;
 
 public class Aircraft extends Vehicle {
+
+    @Override
+    public String ride(){
+        String result = "No transportation today";
+        if(getIsRideable()){
+            result = "We're flying!";
+        }
+
+        return result;
+    }
 }

src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java

@@ -14,4 +14,13 @@ public class Tractor extends Vehicle implements Harvests, FarmVehicle {
         addToStore(numToStore);
 
     }
+
+    public String ride(){
+        String result = "No transportation today";
+        if(getIsRideable()){
+            result = "Driving in the field today";
+        }
+
+        return result;
+    }
 }

src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Vehicle.java

@@ -1,21 +1,31 @@
 package com.zipcodewilmington.froilansfarm.Vehicle;
 
+import com.zipcodewilmington.froilansfarm.Animals.Person;
 import com.zipcodewilmington.froilansfarm.NoiseMaker;
 import com.zipcodewilmington.froilansfarm.Ridable;
 
 public class Vehicle implements Ridable, NoiseMaker {
 
+    Person person = new Person();
+
     public String makeNoise(){
         return "VROOM VROOM!";
     }
 
+
     public boolean getIsRideable(){
-        return true;
+        return person.getIsMounted();
     }
 
+
     public String ride(){
-     return "Moving around on a vehicle";
-    };
+     String result = "No transportation today";
+     if(getIsRideable()){
+         result = "Moving around on a vehicle";
+     }
+
+        return result;
+    }
 
 
 }