Refactored we pages

Former-commit-id: a64def61acdcbf63bf4792b9084a48dded9eb41a

src/se/koc/hal/PowerChallenge.java

@@ -5,6 +5,7 @@ import se.koc.hal.deamon.DataAggregatorDaemon;
 import se.koc.hal.deamon.DataSynchronizationClient;
 import se.koc.hal.deamon.DataSynchronizationDaemon;
 import se.koc.hal.deamon.HalDaemon;
+import se.koc.hal.page.HalHttpPage;
 import se.koc.hal.page.PCConfigureHttpPage;
 import se.koc.hal.page.PCHeatMapHttpPage;
 import se.koc.hal.page.PCOverviewHttpPage;
@@ -24,6 +25,7 @@ public class PowerChallenge {
 
 	
     private static HalDaemon[] daemons;
+    private static HalHttpPage[] pages;
 
     public static void main(String[] args) throws Exception {
         // init logging
@@ -47,12 +49,18 @@ public class PowerChallenge {
         for(HalDaemon daemon : daemons){
             daemon.initiate(daemonTimer);
         }
-        
+
+        pages = new HalHttpPage[]{
+                new PCOverviewHttpPage(),
+                new PCHeatMapHttpPage(),
+                new PCConfigureHttpPage()
+        };
         HttpServer http = new HttpServer(HalContext.getIntegerProperty("http_port"));
         http.setDefaultPage(new HttpFilePage(FileUtil.find("web-resource/")));
-        http.setPage("/", new PCOverviewHttpPage());
-        http.setPage("/configure", new PCConfigureHttpPage());
-        http.setPage("/heatmap", new PCHeatMapHttpPage());
+        http.setPage("/", pages[0]);
+        for(HalHttpPage page : pages){
+            http.setPage(page.getURL(), page);
+        }
         http.start();
     }
 }

src/se/koc/hal/page/HalHttpPage.java

@@ -0,0 +1,70 @@
+package se.koc.hal.page;
+
+import se.koc.hal.HalContext;
+import se.koc.hal.struct.Sensor;
+import se.koc.hal.struct.User;
+import zutil.db.DBConnection;
+import zutil.io.file.FileUtil;
+import zutil.net.http.HttpHeaderParser;
+import zutil.net.http.HttpPage;
+import zutil.net.http.HttpPrintStream;
+import zutil.parser.Templator;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Map;
+
+/**
+ * Created by Ziver on 2015-12-10.
+ */
+public abstract class HalHttpPage implements HttpPage{
+
+    private static ArrayList<HalHttpPage> pages = new ArrayList<>();
+
+    private final String name;
+    private final String id;
+
+    public HalHttpPage(String name, String id){
+        this.name = name;
+        this.id = id;
+        pages.add(this);
+    }
+
+    public String getName(){
+        return name;
+    }
+    public String getId(){
+        return id;
+    }
+    public String getURL(){
+        return "/" + this.id;
+    }
+
+
+    @Override
+    public void respond(HttpPrintStream out, HttpHeaderParser client_info,
+                        Map<String, Object> session, Map<String, String> cookie,
+                        Map<String, String> request) throws IOException {
+
+        try {
+            DBConnection db = HalContext.getDB();
+
+            Templator tmpl = new Templator(FileUtil.find("web-resource/index.tmpl"));
+            tmpl.set("user", User.getLocalUser(db));
+            tmpl.set("navigation", pages);
+            tmpl.set("content", httpRespond(session, cookie, request));
+            out.print(tmpl.compile());
+
+        } catch (Exception e) {
+            throw new IOException(e);
+        }
+    }
+
+
+    public abstract Templator httpRespond(
+            Map<String, Object> session,
+            Map<String, String> cookie,
+            Map<String, String> request)
+                throws Exception;
+}

src/se/koc/hal/page/PCConfigureHttpPage.java

@@ -14,26 +14,30 @@ import zutil.net.http.HttpPage;
 import zutil.net.http.HttpPrintStream;
 import zutil.parser.Templator;
 
-public class PCConfigureHttpPage implements HttpPage {
+public class PCConfigureHttpPage extends HalHttpPage {
+
+    public PCConfigureHttpPage() {
+        super("Configuration", "config");
+    }
+
+    @Override
+	public Templator httpRespond(
+                Map<String, Object> session,
+                Map<String, String> cookie,
+                Map<String, String> request)
+                throws Exception{
 
-	@Override
-	public void respond(HttpPrintStream out, HttpHeaderParser client_info,
-			Map<String, Object> session, Map<String, String> cookie,
-			Map<String, String> request) throws IOException {
 
-		try {
 			DBConnection db = HalContext.getDB();
 			
-			Templator tmpl = new Templator(FileUtil.find("web-resource/configure.html"));
+			Templator tmpl = new Templator(FileUtil.find("web-resource/configure.tmpl"));
 			tmpl.set("user", User.getLocalUser(db));
 			tmpl.set("localSensor", Sensor.getLocalSensors(db));
 			tmpl.set("extUsers", User.getExternalUsers(db));
 			tmpl.set("extSensor", Sensor.getExternalSensors(db));
-			out.print(tmpl.compile());
 
-		} catch (SQLException e) {
-			throw new IOException(e);
-		}
+			return tmpl;
+
 	}
 
 }

src/se/koc/hal/page/PCHeatMapHttpPage.java

@@ -9,15 +9,21 @@ import zutil.net.http.HttpPage;
 import zutil.net.http.HttpPrintStream;
 import zutil.parser.Templator;
 
-public class PCHeatMapHttpPage implements HttpPage {
+public class PCHeatMapHttpPage extends HalHttpPage {
+
+	public PCHeatMapHttpPage() {
+		super("Heatmap", "map");
+	}
 
 	@Override
-	public void respond(HttpPrintStream out, HttpHeaderParser client_info,
-			Map<String, Object> session, Map<String, String> cookie,
-			Map<String, String> request) throws IOException {
+	public Templator httpRespond(
+			Map<String, Object> session,
+			Map<String, String> cookie,
+			Map<String, String> request)
+			throws Exception{
 
-		Templator tmpl = new Templator(FileUtil.find("web-resource/heatmap.html"));
-		out.print(tmpl.compile());
+		Templator tmpl = new Templator(FileUtil.find("web-resource/heatmap.tmpl"));
+		return tmpl;
 	}
 
 }

src/se/koc/hal/page/PCOverviewHttpPage.java

@@ -18,75 +18,80 @@ import zutil.net.http.HttpPage;
 import zutil.net.http.HttpPrintStream;
 import zutil.parser.Templator;
 
-public class PCOverviewHttpPage implements HttpPage {
+public class PCOverviewHttpPage extends HalHttpPage {
+
+    public PCOverviewHttpPage() {
+        super("Overview", "overview");
+    }
+
+    @Override
+	public Templator httpRespond(
+			Map<String, Object> session,
+			Map<String, String> cookie,
+			Map<String, String> request)
+			throws Exception{
+
+
+		DBConnection db = HalContext.getDB();
+
+		PreparedStatement stmt = db.getPreparedStatement(
+			"SELECT user.username as username,"
+				+ " sensor_data_aggr.timestamp_start as timestamp_start,"
+				+ " sensor_data_aggr.timestamp_end as timestamp_end,"
+				+ " sensor_data_aggr.data as data,"
+				+ " sensor_data_aggr.confidence as confidence,"
+				+ DataAggregatorDaemon.FIVE_MINUTES_IN_MS + " as period_length"
+			+ " FROM sensor_data_aggr, user, sensor"
+			+ " WHERE sensor.id = sensor_data_aggr.sensor_id"
+				+ " AND user.id = sensor.user_id"
+				+ " AND timestamp_end-timestamp_start == ?"
+				+ " AND timestamp_start > ?"
+			+ " ORDER BY timestamp_start ASC");
+		stmt.setLong(1, DataAggregatorDaemon.FIVE_MINUTES_IN_MS-1);
+		stmt.setLong(2, (System.currentTimeMillis() - DataAggregatorDaemon.DAY_IN_MS) );
+		ArrayList<PowerData> minDataList = DBConnection.exec(stmt , new SQLPowerDataBuilder());
+
+		stmt = db.getPreparedStatement(
+			"SELECT user.username as username,"
+				+ " sensor_data_aggr.timestamp_start as timestamp_start,"
+				+ " sensor_data_aggr.timestamp_end as timestamp_end,"
+				+ " sensor_data_aggr.data as data,"
+				+ " sensor_data_aggr.confidence as confidence,"
+				+ DataAggregatorDaemon.HOUR_IN_MS + " as period_length"
+			+ " FROM sensor_data_aggr, user, sensor"
+			+ " WHERE sensor.id = sensor_data_aggr.sensor_id"
+				+ " AND user.id = sensor.user_id"
+				+ " AND timestamp_end-timestamp_start == ?"
+				+ " AND timestamp_start > ?"
+			+ " ORDER BY timestamp_start ASC");
+		stmt.setLong(1, DataAggregatorDaemon.HOUR_IN_MS-1);
+		stmt.setLong(2, (System.currentTimeMillis() - 3*DataAggregatorDaemon.DAY_IN_MS) );
+		ArrayList<PowerData> hourDataList = DBConnection.exec(stmt, new SQLPowerDataBuilder());
+
+		stmt = db.getPreparedStatement(
+			"SELECT user.username as username,"
+				+ " sensor_data_aggr.timestamp_start as timestamp_start,"
+				+ " sensor_data_aggr.timestamp_end as timestamp_end,"
+				+ " sensor_data_aggr.data as data,"
+				+ " sensor_data_aggr.confidence as confidence,"
+				+ DataAggregatorDaemon.DAY_IN_MS + " as period_length"
+			+ " FROM sensor_data_aggr, user, sensor"
+			+ " WHERE sensor.id = sensor_data_aggr.sensor_id"
+				+ " AND user.id = sensor.user_id"
+				+ " AND timestamp_end-timestamp_start == ?"
+			+ " ORDER BY timestamp_start ASC");
+		stmt.setLong(1, DataAggregatorDaemon.DAY_IN_MS-1);
+		ArrayList<PowerData> dayDataList = DBConnection.exec(stmt, new SQLPowerDataBuilder());
+
+
+		Templator tmpl = new Templator(FileUtil.find("web-resource/overview.tmpl"));
+		tmpl.set("minData", minDataList);
+		tmpl.set("hourData", hourDataList);
+		tmpl.set("dayData", dayDataList);
+		tmpl.set("username", new String[]{"Ziver", "Daniel"});
+
+		return tmpl;
 
-	@Override
-	public void respond(HttpPrintStream out, HttpHeaderParser client_info, Map<String, Object> session, Map<String, String> cookie, Map<String, String> request) throws IOException {
-		
-		try {
-			DBConnection db = HalContext.getDB();
-			
-			PreparedStatement stmt = db.getPreparedStatement(
-				"SELECT user.username as username,"
-					+ " sensor_data_aggr.timestamp_start as timestamp_start,"
-					+ " sensor_data_aggr.timestamp_end as timestamp_end,"
-					+ " sensor_data_aggr.data as data,"
-					+ " sensor_data_aggr.confidence as confidence,"
-					+ DataAggregatorDaemon.FIVE_MINUTES_IN_MS + " as period_length"
-				+ " FROM sensor_data_aggr, user, sensor"
-				+ " WHERE sensor.id = sensor_data_aggr.sensor_id"
-					+ " AND user.id = sensor.user_id"
-					+ " AND timestamp_end-timestamp_start == ?"
-					+ " AND timestamp_start > ?"
-				+ " ORDER BY timestamp_start ASC");
-			stmt.setLong(1, DataAggregatorDaemon.FIVE_MINUTES_IN_MS-1);
-			stmt.setLong(2, (System.currentTimeMillis() - DataAggregatorDaemon.DAY_IN_MS) );
-			ArrayList<PowerData> minDataList = DBConnection.exec(stmt , new SQLPowerDataBuilder());
-			
-			stmt = db.getPreparedStatement(
-				"SELECT user.username as username,"
-					+ " sensor_data_aggr.timestamp_start as timestamp_start,"
-					+ " sensor_data_aggr.timestamp_end as timestamp_end,"
-					+ " sensor_data_aggr.data as data,"
-					+ " sensor_data_aggr.confidence as confidence,"
-					+ DataAggregatorDaemon.HOUR_IN_MS + " as period_length"
-				+ " FROM sensor_data_aggr, user, sensor"
-				+ " WHERE sensor.id = sensor_data_aggr.sensor_id"
-					+ " AND user.id = sensor.user_id"
-					+ " AND timestamp_end-timestamp_start == ?"
-					+ " AND timestamp_start > ?"
-				+ " ORDER BY timestamp_start ASC");
-			stmt.setLong(1, DataAggregatorDaemon.HOUR_IN_MS-1);
-			stmt.setLong(2, (System.currentTimeMillis() - 3*DataAggregatorDaemon.DAY_IN_MS) );
-			ArrayList<PowerData> hourDataList = DBConnection.exec(stmt, new SQLPowerDataBuilder());
-			
-			stmt = db.getPreparedStatement(
-				"SELECT user.username as username,"
-					+ " sensor_data_aggr.timestamp_start as timestamp_start,"
-					+ " sensor_data_aggr.timestamp_end as timestamp_end,"
-					+ " sensor_data_aggr.data as data,"
-					+ " sensor_data_aggr.confidence as confidence,"
-					+ DataAggregatorDaemon.DAY_IN_MS + " as period_length"
-				+ " FROM sensor_data_aggr, user, sensor"
-				+ " WHERE sensor.id = sensor_data_aggr.sensor_id"
-					+ " AND user.id = sensor.user_id"
-					+ " AND timestamp_end-timestamp_start == ?"
-				+ " ORDER BY timestamp_start ASC");
-			stmt.setLong(1, DataAggregatorDaemon.DAY_IN_MS-1);
-			ArrayList<PowerData> dayDataList = DBConnection.exec(stmt, new SQLPowerDataBuilder());
-		
-		
-			Templator tmpl = new Templator(FileUtil.find("web-resource/index.html"));
-			tmpl.set("minData", minDataList);
-			tmpl.set("hourData", hourDataList);
-			tmpl.set("dayData", dayDataList);
-			tmpl.set("username", new String[]{"Ziver", "Daniel"});
-			
-			out.print(tmpl.compile());
-		
-		} catch (SQLException e) {
-			throw new IOException(e);
-		}
 	}
 	
 	public static class PowerData{