From 115bf6efacc04a87803d1892b992469c7aa94cee Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Fri, 27 Jan 2017 17:37:19 +0100
Subject: [PATCH] Small refactoring of internal class

---
 src/se/hal/page/EventConfigHttpPage.java      | 22 +++++--------------
 src/se/hal/page/SensorConfigHttpPage.java     | 22 +++++--------------
 src/se/hal/struct/ClassConfigurationData.java | 18 +++++++++++++++
 3 files changed, 30 insertions(+), 32 deletions(-)
 create mode 100755 src/se/hal/struct/ClassConfigurationData.java

diff --git a/src/se/hal/page/EventConfigHttpPage.java b/src/se/hal/page/EventConfigHttpPage.java
index 847ec507..3fb1658c 100755
--- a/src/se/hal/page/EventConfigHttpPage.java
+++ b/src/se/hal/page/EventConfigHttpPage.java
@@ -6,39 +6,29 @@ import se.hal.intf.HalHttpPage;
 import se.hal.page.HalAlertManager.AlertLevel;
 import se.hal.page.HalAlertManager.AlertTTL;
 import se.hal.page.HalAlertManager.HalAlert;
+import se.hal.struct.ClassConfigurationData;
 import se.hal.struct.Event;
 import se.hal.struct.User;
 import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.parser.Templator;
-import zutil.ui.Configurator;
-import zutil.ui.Configurator.ConfigurationParam;
 
+import java.util.ArrayList;
 import java.util.Map;
 
 public class EventConfigHttpPage extends HalHttpPage {
     private static final String TEMPLATE = "resource/web/event_config.tmpl";
 
-    private class EventDataParams{
-        public Class clazz;
-        public ConfigurationParam[] params;
-    }
-    private EventDataParams[] eventConfigurations;
+    private ArrayList<ClassConfigurationData> eventConfigurations;
 
 
     public EventConfigHttpPage() {
         super("event_config");
         super.getRootNav().createSubNav("Events").createSubNav(this.getId(), "Configuration").setWeight(100);
 
-        eventConfigurations = new EventDataParams[
-                ControllerManager.getInstance().getAvailableEvents().size()];
-        int i=0;
-        for(Class c : ControllerManager.getInstance().getAvailableEvents()){
-            eventConfigurations[i] = new EventDataParams();
-            eventConfigurations[i].clazz = c;
-            eventConfigurations[i].params = Configurator.getConfiguration(c);
-            ++i;
-        }
+        eventConfigurations = new ArrayList<>();
+        for(Class c : ControllerManager.getInstance().getAvailableEvents())
+            eventConfigurations.add(new ClassConfigurationData(c));
     }
 
     @Override
diff --git a/src/se/hal/page/SensorConfigHttpPage.java b/src/se/hal/page/SensorConfigHttpPage.java
index 186695fa..9561496e 100755
--- a/src/se/hal/page/SensorConfigHttpPage.java
+++ b/src/se/hal/page/SensorConfigHttpPage.java
@@ -6,39 +6,29 @@ import se.hal.intf.HalHttpPage;
 import se.hal.page.HalAlertManager.AlertLevel;
 import se.hal.page.HalAlertManager.AlertTTL;
 import se.hal.page.HalAlertManager.HalAlert;
+import se.hal.struct.ClassConfigurationData;
 import se.hal.struct.Sensor;
 import se.hal.struct.User;
 import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.parser.Templator;
-import zutil.ui.Configurator;
-import zutil.ui.Configurator.ConfigurationParam;
 
+import java.util.ArrayList;
 import java.util.Map;
 
 public class SensorConfigHttpPage extends HalHttpPage {
     private static final String TEMPLATE = "resource/web/sensor_config.tmpl";
 
-    private class SensorDataParams{
-        public Class clazz;
-        public ConfigurationParam[] params;
-    }
-    private SensorDataParams[] sensorConfigurations;
+    private ArrayList<ClassConfigurationData> sensorConfigurations;
 
 
     public SensorConfigHttpPage() {
         super("sensor_config");
         super.getRootNav().createSubNav("Sensors").createSubNav(this.getId(), "Configuration").setWeight(100);
 
-        sensorConfigurations = new SensorDataParams[
-                ControllerManager.getInstance().getAvailableSensors().size()];
-        int i=0;
-        for(Class c : ControllerManager.getInstance().getAvailableSensors()){
-            sensorConfigurations[i] = new SensorDataParams();
-            sensorConfigurations[i].clazz = c;
-            sensorConfigurations[i].params = Configurator.getConfiguration(c);
-            ++i;
-        }
+        sensorConfigurations = new ArrayList<>();
+        for(Class c : ControllerManager.getInstance().getAvailableSensors())
+            sensorConfigurations.add(new ClassConfigurationData(c));
     }
 
     @Override
diff --git a/src/se/hal/struct/ClassConfigurationData.java b/src/se/hal/struct/ClassConfigurationData.java
new file mode 100755
index 00000000..17e548d6
--- /dev/null
+++ b/src/se/hal/struct/ClassConfigurationData.java
@@ -0,0 +1,18 @@
+package se.hal.struct;
+
+import zutil.ui.Configurator;
+import zutil.ui.Configurator.ConfigurationParam;
+
+/**
+ * A Data class used by the dynamic class configuration pages
+ */
+public class ClassConfigurationData {
+        public Class clazz;
+        public ConfigurationParam[] params;
+
+
+    public ClassConfigurationData(Class clazz) {
+        this.clazz = clazz;
+        this.params = Configurator.getConfiguration(clazz);
+    }
+}
\ No newline at end of file