Displaying differences for changeset
 
display as  

src/java/m/wqm/soilpestlosspot/Input.java

@@ -4,19 +4,18 @@
  *
  * @author RUMPAL SIDHU
  */
-
 public class Input {
 
-    int AoAId;
-    int operation_id;
-    String op_pesticide_id;
-    String ai_plp;
-    String ai_psrp;
-    String ai_parp;
-    String aoa_pslp;
-    String aoa_ssrp;
-    String aoa_sarp;
-    String aoa_rain_prob;
+    private int AoAId;
+    private int operation_id;
+    private String op_pesticide_id;
+    private String ai_plp;
+    private String ai_psrp;
+    private String ai_parp;
+    private String aoa_pslp;
+    private String aoa_ssrp;
+    private String aoa_sarp;
+    private String aoa_rain_prob;
 
     public Input(int AoAId, int operation_id, String op_pesticide_id, String ai_plp, String ai_psrp, String ai_parp, String aoa_pslp, String aoa_ssrp, String aoa_sarp, String aoa_rain_prob) {
         this.AoAId = AoAId;
@@ -30,4 +29,45 @@
         this.aoa_sarp = aoa_sarp;
         this.aoa_rain_prob = aoa_rain_prob;
     }
+
+    //Getter Methods
+    public int getAoaId() {
+        return this.AoAId;
+    }
+
+    public int getOperationId() {
+        return this.operation_id;
+    }
+
+    public String getPesticideId() {
+        return this.op_pesticide_id;
+    }
+
+    public String getAi_plp() {
+        return this.ai_plp;
+    }
+
+    public String getAi_psrp() {
+        return this.ai_psrp;
+    }
+
+    public String getAi_parp() {
+        return this.ai_parp;
+    }
+
+    public String getAoa_pslp() {
+        return this.aoa_pslp;
+    }
+
+    public String getAoa_ssrp() {
+        return this.aoa_ssrp;
+    }
+
+    public String getAoa_sarp() {
+        return this.aoa_sarp;
+    }
+
+    public String getAoa_rain_prob() {
+        return this.aoa_rain_prob;
+    }
 }

src/java/m/wqm/soilpestlosspot/Result.java

@@ -4,15 +4,14 @@
  *
  * @author RUMPAL SIDHU
  */
-
 public class Result {
 
-    int AoAId;
-    int operation_id;
-    String op_pesticide_id;
-    String op_pest_ilp;
-    String op_pest_isrp;
-    String op_pest_iarp;
+    private int AoAId;
+    private int operation_id;
+    private String op_pesticide_id;
+    private String op_pest_ilp;
+    private String op_pest_isrp;
+    private String op_pest_iarp;
 
     public Result(int AoAId, int operation_id, String op_pesticide_id, String op_pest_ilp, String op_pest_isrp, String op_pest_iarp) {
         this.AoAId = AoAId;
@@ -22,4 +21,28 @@
         this.op_pest_isrp = op_pest_isrp;
         this.op_pest_iarp = op_pest_iarp;
     }
-}
\ No newline at end of file
+
+    public int getAoaId() {
+        return this.AoAId;
+    }
+
+    public int getOperationId() {
+        return this.operation_id;
+    }
+
+    public String getOpPesticideId() {
+        return this.op_pesticide_id;
+    }
+
+    public String getOpPestIlp() {
+        return this.op_pest_ilp;
+    }
+
+    public String getOpPestIsrp() {
+        return this.op_pest_isrp;
+    }
+
+    public String getOpPestIarp() {
+        return this.op_pest_iarp;
+    }
+}

src/java/m/wqm/soilpestlosspot/V1_0.java

@@ -78,16 +78,13 @@
 
             for (Input ip : components) {
 
-                query = "SELECT wqm_ilp FROM wqm_soil_pest_interaction_leaching WHERE wqm_plp='" + ip.ai_plp + "' AND wqm_slp='" + ip.aoa_pslp + "';";
+                query = "SELECT wqm_ilp FROM wqm_soil_pest_interaction_leaching WHERE wqm_plp='" + ip.getAi_plp() + "' AND wqm_slp='" + ip.getAoa_pslp() + "';";
                 resultSet = statement.executeQuery(query);
                 String op_pest_ilp = "err";
                 while (resultSet.next()) {
                     op_pest_ilp = resultSet.getString("wqm_ilp");
                 }
-                System.out.println("ip.ai_plp = " + ip.ai_plp);
-                System.out.println("ip.aoa_pslp = " + ip.aoa_pslp);
-                System.out.println("op_pest_ilp = " + op_pest_ilp);
-                if (ip.aoa_rain_prob.equals("LOW")) {
+                if (ip.getAoa_rain_prob().equals("LOW")) {
                     switch (op_pest_ilp) {
                         case "HIGH":
                             op_pest_ilp = "INTERMEDIATE";
@@ -101,16 +98,13 @@
                     }
                 }
 
-                query = "SELECT wqm_isrp FROM wqm_soil_pest_interaction_solution_runoff WHERE wqm_psrp='" + ip.ai_psrp + "' AND wqm_ssrp ='" + ip.aoa_ssrp + "';";
+                query = "SELECT wqm_isrp FROM wqm_soil_pest_interaction_solution_runoff WHERE wqm_psrp='" + ip.getAi_psrp() + "' AND wqm_ssrp ='" + ip.getAoa_ssrp() + "';";
                 resultSet = statement.executeQuery(query);
                 String op_pest_isrp = "err";
                 while (resultSet.next()) {
                     op_pest_isrp = resultSet.getString("wqm_isrp");
                 }
-                System.out.println("ip.ai_psrp = " + ip.ai_psrp);
-                System.out.println("ip.aoa_ssrp = " + ip.aoa_ssrp);
-                System.out.println("op_pest_isrp = " + op_pest_isrp);
-                if (ip.aoa_rain_prob.equals("LOW")) {
+                if (ip.getAoa_rain_prob().equals("LOW")) {
                     switch (op_pest_isrp) {
                         case "HIGH":
                             op_pest_isrp = "INTERMEDIATE";
@@ -121,16 +115,13 @@
                     }
                 }
 
-                query = "SELECT wqm_iarp FROM wqm_soil_pest_interaction_adsorbed_runoff WHERE wqm_parp='" + ip.ai_parp + "' AND wqm_sarp='" + ip.aoa_sarp + "';";
+                query = "SELECT wqm_iarp FROM wqm_soil_pest_interaction_adsorbed_runoff WHERE wqm_parp='" + ip.getAi_parp() + "' AND wqm_sarp='" + ip.getAoa_sarp() + "';";
                 resultSet = statement.executeQuery(query);
                 String op_pest_iarp = "err";
                 while (resultSet.next()) {
                     op_pest_iarp = resultSet.getString("wqm_iarp");
                 }
-                 System.out.println("ip.ai_parp = " + ip.ai_parp);
-                System.out.println("ip.aoa_sarp = " + ip.aoa_sarp);
-                System.out.println("op_pest_iarp = " + op_pest_iarp);
-                if (ip.aoa_rain_prob.equals("LOW")) {
+                if (ip.getAoa_rain_prob().equals("LOW")) {
                     switch (op_pest_iarp) {
                         case "HIGH":
                             op_pest_iarp = "INTERMEDIATE";
@@ -141,7 +132,7 @@
                     }
                 }
 
-                Result result1 = new Result(ip.AoAId, ip.operation_id, ip.op_pesticide_id, op_pest_ilp, op_pest_isrp, op_pest_iarp);
+                Result result1 = new Result(ip.getAoaId(), ip.getOperationId(), ip.getPesticideId(), op_pest_ilp, op_pest_isrp, op_pest_iarp);
                 result.add(result1);
             }
         } catch (SQLException se) {
@@ -164,12 +155,12 @@
         JSONArray resultArr = new JSONArray();
         for (Result rs1 : result) {
             JSONArray tmpArr = new JSONArray();
-            tmpArr.put(JSONUtils.dataDesc("AoAId", rs1.AoAId, "Area of Analysis Identifier"));
-            tmpArr.put(JSONUtils.dataDesc("operation_id", rs1.operation_id, "Pesticide Application Operation Identifier"));
-            tmpArr.put(JSONUtils.dataDesc("op_pesticide_id", rs1.op_pesticide_id, "Pesticide identifier, EPA Pesticide Chemical Code (PC_CODE)"));
-            tmpArr.put(JSONUtils.dataDesc("op_pest_ilp", rs1.op_pest_ilp, "Operation Soil Pesticide Interaction Leaching Potential"));
-            tmpArr.put(JSONUtils.dataDesc("op_pest_isrp", rs1.op_pest_isrp, "Operation Soil Pesticide Interaction Solution Runoff Potential"));
-            tmpArr.put(JSONUtils.dataDesc("op_pest_iarp", rs1.op_pest_iarp, "Operation Soil Pesticide Interaction Adsorbed Runoff Potential"));
+            tmpArr.put(JSONUtils.dataDesc("AoAId", rs1.getAoaId(), "Area of Analysis Identifier"));
+            tmpArr.put(JSONUtils.dataDesc("operation_id", rs1.getOperationId(), "Pesticide Application Operation Identifier"));
+            tmpArr.put(JSONUtils.dataDesc("op_pesticide_id", rs1.getOpPesticideId(), "Pesticide identifier, EPA Pesticide Chemical Code (PC_CODE)"));
+            tmpArr.put(JSONUtils.dataDesc("op_pest_ilp", rs1.getOpPestIlp(), "Operation Soil Pesticide Interaction Leaching Potential"));
+            tmpArr.put(JSONUtils.dataDesc("op_pest_isrp", rs1.getOpPestIsrp(), "Operation Soil Pesticide Interaction Solution Runoff Potential"));
+            tmpArr.put(JSONUtils.dataDesc("op_pest_iarp", rs1.getOpPestIarp(), "Operation Soil Pesticide Interaction Adsorbed Runoff Potential"));
             resultArr.put(JSONUtils.dataDesc("pesticide summary", tmpArr, "Pest"));
         }
         putResult("operation", resultArr);