Merge pull request #46 from jazzjaikla/jazz-release-v1.0.1.0

Jazz release v1.0.1.0

Author: fabiooliveira72

src/DSSATModel/CropModel.java

@@ -16,4 +16,14 @@ public class CropModel extends BaseModel {
     public String toString(){
         return Description;
     }
+    
+    public int compare(CropModel c2){
+        int compare = this.ModelCode.compareTo(c2.ModelCode);
+        
+        if(compare == 0){
+            compare = this.Code.compareTo(c2.Code);
+        }
+        
+        return compare;
+    }
 }

src/DSSATModel/CropModelList.java

@@ -7,19 +7,18 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 
 /**
  *
  * @author Jazzy
  */
 public class CropModelList {
-    protected static HashMap cropModels = new HashMap();
+    protected static List<CropModel> cropModels = new ArrayList<>();
 
     public static void AddNew(CropModel cropModel)
     {
-        cropModels.put(cropModel.ModelCode, cropModel);
+        cropModels.add(cropModel);
     }
 
     public static void Clear(){
@@ -28,55 +27,39 @@ public static void Clear(){
 
     public static CropModel GetAt(String ModelCode)
     {
-        CropModel cropModel = null;
-        try{
-            cropModel = (CropModel) cropModels.get(ModelCode);
+        for(int i = 0;i < cropModels.size();i++)
+        {
+            if(cropModels.get(i).ModelCode.equals(ModelCode))
+                return cropModels.get(i);
         }
-        catch(Exception ex) {}
-
-        return cropModel;
+        return null;
     }
 
     public static CropModel GetByCrop(String CropCode)
     {
-        CropModel cropModel = null;
-        try {
-            Object[] objects = cropModels.values().toArray();
-            for (Object object : objects) {
-                if(((CropModel) object).Code.endsWith(CropCode)) {
-                    cropModel = (CropModel) object;
-                    break;
-                }                    
-            }
-        } catch (Exception ex) {
+        for(int i = 0;i < cropModels.size();i++)
+        {
+            if(cropModels.get(i).Code.equals(CropCode))
+                return cropModels.get(i);
         }
-
-        return cropModel;
+        return null;
     }
 
     public static CropModel GetAt(int n)
     {
-        CropModel cropModel = null;
         try{
-            Object[] object = cropModels.values().toArray();
-            cropModel = (CropModel) object[n];
+            return cropModels.get(n);
         }
         catch(Exception ex) {}
 
-        return cropModel;
+        return null;
     }
 
     public static List<CropModel> GetAll()
     {
-        List<CropModel> cropModelList = new ArrayList<>();
-        Object[] objects = cropModels.values().toArray();
-        for (Object object : objects) {
-            cropModelList.add((CropModel) object);
-        }
-
-        Collections.sort(cropModelList, (BaseModel c1, BaseModel c2) -> c1.Code.compareTo(c2.Description));
+        Collections.sort(cropModels, (CropModel c1, CropModel c2) -> c1.compare(c2));
 
-        return cropModelList;
+        return cropModels;
     }
 
     public static int size()

src/DSSATServices/CropService.java

@@ -60,7 +60,6 @@ public void Parse() throws Exception {
                 if (culFile != null && !"".equals(culFile)) {
                     CultivarList.AddNew(crop, culFile);
                 } else {
-                    crop.Enabled = false;
                     CultivarList.AddNew(crop, "");
                 }
             }

src/Extensions/Variables.java

@@ -83,6 +83,6 @@ public static BufferedImage getIconImage(Class<?> objectClass){
     }
 
     public static String getVersion(){
-        return "v1.0.0.0";
+        return "v1.0.1.0";
     }
 }

src/FileXModel/GeneralInformation.java

@@ -12,7 +12,7 @@
  *
  * @author Jazzy
  */
-public class GeneralInformation {
+public class GeneralInformation extends ModelXBase {
     public GeneralInformation (){
         FileType = ExperimentType.Experimental;
     }
@@ -40,4 +40,14 @@ public GeneralInformation (){
     public Integer HRNO;        /* Harvest row number */
     public Float HLEN;      /* Harvest row length, m */
     public String HARM;     /* Harvest method */
+
+    @Override
+    public String GetName() {
+        return "";
+    }
+
+    @Override
+    public void SetName(String name) {
+
+    }
 }