added district status

Author: hyperdefined

src/main/java/lol/hyper/customlauncher/districts/District.java

@@ -22,6 +22,8 @@ public class District implements Comparable<District> {
     private final String districtName;
     private int population;
 
+    private String currentStatus;
+
     /**
      * Create a district.
      *
@@ -68,6 +70,14 @@ public int compareTo(District district) {
         return (this.districtName.compareTo(district.getDistrictName()));
     }
 
+    public String getCurrentStatus() {
+        return currentStatus;
+    }
+
+    public void setCurrentStatus(String status) {
+        currentStatus = status.substring(0,1).toUpperCase() + status.substring(1).toLowerCase();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (o == this) {

src/main/java/lol/hyper/customlauncher/districts/DistrictTask.java

@@ -24,7 +24,7 @@
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.Iterator;
+import java.util.Iterator;import java.util.Locale;
 
 public class DistrictTask implements ActionListener {
 
@@ -56,15 +56,15 @@ public void actionPerformed(ActionEvent e) {
 
         logger.info("Reading " + DISTRICT_URL + " for current districts...");
 
-        JSONObject districts = districtsJSON.getJSONObject("populationByDistrict");
+        JSONObject populationByDistrict = districtsJSON.getJSONObject("populationByDistrict");
         // iterate through each district
-        Iterator<String> keys = districts.keys();
-        while (keys.hasNext()) {
-            String districtFromJSON = keys.next();
+        Iterator<String> populationKeys = populationByDistrict.keys();
+        while (populationKeys.hasNext()) {
+            String districtFromJSON = populationKeys.next();
             // if we do not have that district stored, create a new district object
             // and add it to the list
             if (!districtTracker.districts.containsKey(districtFromJSON)) {
-                int population = districts.getInt(districtFromJSON);
+                int population = populationByDistrict.getInt(districtFromJSON);
                 District district = new District(districtFromJSON);
                 district.setPopulation(population);
                 districtTracker.districts.put(districtFromJSON, district);
@@ -74,10 +74,23 @@ public void actionPerformed(ActionEvent e) {
                 }
                 // if we already have it saved, update the population
                 District tempDistrict = districtTracker.districts.get(districtFromJSON);
-                int population = districts.getInt(districtFromJSON);
+                int population = populationByDistrict.getInt(districtFromJSON);
                 tempDistrict.setPopulation(population);
             }
         }
+
+        JSONObject statusByDistrict = districtsJSON.getJSONObject("statusByDistrict");
+        // iterate through each district
+        Iterator<String> statusKeys = statusByDistrict.keys();
+        while (statusKeys.hasNext()) {
+            String districtFromJSON = statusKeys.next();
+            // only update the status of districts we track
+            if (districtTracker.districts.containsKey(districtFromJSON)) {
+                String status = statusByDistrict.getString(districtFromJSON);
+                District tempDistrict = districtTracker.districts.get(districtFromJSON);
+                tempDistrict.setCurrentStatus(status);
+            }
+        }
         districtTracker.lastFetched = System.currentTimeMillis();
     }
 }

src/main/java/lol/hyper/customlauncher/districts/DistrictTracker.java

@@ -71,7 +71,7 @@ public void showWindow() {
         panel.add(districtsLabel);
 
         districtTable = new JTable();
-        String[] columns = new String[] {"Name", "Population"};
+        String[] columns = new String[] {"Name", "Population", "Status"};
 
         districtsTableModel = (DefaultTableModel) districtTable.getModel();
         districtsTableModel.setColumnIdentifiers(columns);
@@ -130,9 +130,10 @@ private void updateDistricts() {
         for (District district : sortedDistricts) {
             String name = district.getDistrictName();
             int population = district.getPopulation();
+            String status = district.getCurrentStatus();
             data =
                     new String[] {
-                        name, String.valueOf(population),
+                        name, String.valueOf(population), status
                     };
             districtsTableModel.addRow(data);
             districtTable.setModel(districtsTableModel);