ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Small refactoring of internal class

Browse source
This commit is contained in:
Ziver Koc 2017-01-27 17:37:19 +01:00
parent 5814b2537f
commit 115bf6efac
3 changed files with 30 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/se/hal/page/EventConfigHttpPage.java
View file

@ -6,39 +6,29 @@ import se.hal.intf.HalHttpPage;
import se.hal.page.HalAlertManager.AlertLevel; import se.hal.page.HalAlertManager.AlertLevel;
import se.hal.page.HalAlertManager.AlertTTL; import se.hal.page.HalAlertManager.AlertTTL;
import se.hal.page.HalAlertManager.HalAlert; import se.hal.page.HalAlertManager.HalAlert;
import se.hal.struct.ClassConfigurationData;
import se.hal.struct.Event; import se.hal.struct.Event;
import se.hal.struct.User; import se.hal.struct.User;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.io.file.FileUtil; import zutil.io.file.FileUtil;
import zutil.parser.Templator; import zutil.parser.Templator;
import zutil.ui.Configurator;
import zutil.ui.Configurator.ConfigurationParam;
import java.util.ArrayList;
import java.util.Map; import java.util.Map;
public class EventConfigHttpPage extends HalHttpPage { public class EventConfigHttpPage extends HalHttpPage {
private static final String TEMPLATE = "resource/web/event_config.tmpl"; private static final String TEMPLATE = "resource/web/event_config.tmpl";
private class EventDataParams{ private ArrayList<ClassConfigurationData> eventConfigurations;
public Class clazz;
public ConfigurationParam[] params;
}
private EventDataParams[] eventConfigurations;
public EventConfigHttpPage() { public EventConfigHttpPage() {
super("event_config"); super("event_config");
super.getRootNav().createSubNav("Events").createSubNav(this.getId(), "Configuration").setWeight(100); super.getRootNav().createSubNav("Events").createSubNav(this.getId(), "Configuration").setWeight(100);
eventConfigurations = new EventDataParams[ eventConfigurations = new ArrayList<>();
ControllerManager.getInstance().getAvailableEvents().size()]; for(Class c : ControllerManager.getInstance().getAvailableEvents())
int i=0; eventConfigurations.add(new ClassConfigurationData(c));
for(Class c : ControllerManager.getInstance().getAvailableEvents()){
eventConfigurations[i] = new EventDataParams();
eventConfigurations[i].clazz = c;
eventConfigurations[i].params = Configurator.getConfiguration(c);
++i;
}
} }
@Override @Override

22
src/se/hal/page/SensorConfigHttpPage.java
View file

@ -6,39 +6,29 @@ import se.hal.intf.HalHttpPage;
import se.hal.page.HalAlertManager.AlertLevel; import se.hal.page.HalAlertManager.AlertLevel;
import se.hal.page.HalAlertManager.AlertTTL; import se.hal.page.HalAlertManager.AlertTTL;
import se.hal.page.HalAlertManager.HalAlert; import se.hal.page.HalAlertManager.HalAlert;
import se.hal.struct.ClassConfigurationData;
import se.hal.struct.Sensor; import se.hal.struct.Sensor;
import se.hal.struct.User; import se.hal.struct.User;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.io.file.FileUtil; import zutil.io.file.FileUtil;
import zutil.parser.Templator; import zutil.parser.Templator;
import zutil.ui.Configurator;
import zutil.ui.Configurator.ConfigurationParam;
import java.util.ArrayList;
import java.util.Map; import java.util.Map;
public class SensorConfigHttpPage extends HalHttpPage { public class SensorConfigHttpPage extends HalHttpPage {
private static final String TEMPLATE = "resource/web/sensor_config.tmpl"; private static final String TEMPLATE = "resource/web/sensor_config.tmpl";
private class SensorDataParams{ private ArrayList<ClassConfigurationData> sensorConfigurations;
public Class clazz;
public ConfigurationParam[] params;
}
private SensorDataParams[] sensorConfigurations;
public SensorConfigHttpPage() { public SensorConfigHttpPage() {
super("sensor_config"); super("sensor_config");
super.getRootNav().createSubNav("Sensors").createSubNav(this.getId(), "Configuration").setWeight(100); super.getRootNav().createSubNav("Sensors").createSubNav(this.getId(), "Configuration").setWeight(100);
sensorConfigurations = new SensorDataParams[ sensorConfigurations = new ArrayList<>();
ControllerManager.getInstance().getAvailableSensors().size()]; for(Class c : ControllerManager.getInstance().getAvailableSensors())
int i=0; sensorConfigurations.add(new ClassConfigurationData(c));
for(Class c : ControllerManager.getInstance().getAvailableSensors()){
sensorConfigurations[i] = new SensorDataParams();
sensorConfigurations[i].clazz = c;
sensorConfigurations[i].params = Configurator.getConfiguration(c);
++i;
}
} }
@Override @Override

18
src/se/hal/struct/ClassConfigurationData.java Executable file
View file

@ -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);
}
}