From 9e59b535465933fa5d6db9760fda5fc2527b367e Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Tue, 29 Nov 2016 20:14:45 +0100 Subject: [PATCH] fixed package name misspelling --- .../PCDataSynchronizationClient.java | 10 +++++----- .../PCDataSynchronizationDaemon.java | 6 +++--- .../{deamon => daemon}/SensorDataAggregatorDaemon.java | 2 +- .../{deamon => daemon}/SensorDataCleanupDaemon.java | 4 ++-- src/se/hal/page/PCOverviewHttpPage.java | 8 -------- src/se/hal/page/SensorJsonPage.java | 2 +- src/se/hal/page/SensorOverviewHttpPage.java | 4 ---- src/se/hal/util/AggregateDataListSqlResult.java | 2 +- src/se/hal/util/UTCTimePeriod.java | 2 +- src/se/hal/util/UTCTimeUtility.java | 2 +- .../SensorDataAggregationDeamonTest.java | 2 +- test/se/hal/util/TimePeriodTest.java | 2 +- test/se/hal/util/TimeUtilityTest.java | 2 +- 13 files changed, 18 insertions(+), 30 deletions(-) rename src/se/hal/{deamon => daemon}/PCDataSynchronizationClient.java (95%) mode change 100755 => 100644 rename src/se/hal/{deamon => daemon}/PCDataSynchronizationDaemon.java (98%) mode change 100755 => 100644 rename src/se/hal/{deamon => daemon}/SensorDataAggregatorDaemon.java (99%) mode change 100755 => 100644 rename src/se/hal/{deamon => daemon}/SensorDataCleanupDaemon.java (98%) mode change 100755 => 100644 rename test/se/hal/{deamon => daemon}/SensorDataAggregationDeamonTest.java (99%) mode change 100755 => 100644 diff --git a/src/se/hal/deamon/PCDataSynchronizationClient.java b/src/se/hal/daemon/PCDataSynchronizationClient.java old mode 100755 new mode 100644 similarity index 95% rename from src/se/hal/deamon/PCDataSynchronizationClient.java rename to src/se/hal/daemon/PCDataSynchronizationClient.java index 37ae2326..6a828301 --- a/src/se/hal/deamon/PCDataSynchronizationClient.java +++ b/src/se/hal/daemon/PCDataSynchronizationClient.java @@ -1,10 +1,10 @@ -package se.hal.deamon; +package se.hal.daemon; import se.hal.HalContext; -import se.hal.deamon.PCDataSynchronizationDaemon.PeerDataRspDTO; -import se.hal.deamon.PCDataSynchronizationDaemon.SensorDTO; -import se.hal.deamon.PCDataSynchronizationDaemon.SensorDataDTO; -import se.hal.deamon.PCDataSynchronizationDaemon.SensorDataListDTO; +import se.hal.daemon.PCDataSynchronizationDaemon.PeerDataRspDTO; +import se.hal.daemon.PCDataSynchronizationDaemon.SensorDTO; +import se.hal.daemon.PCDataSynchronizationDaemon.SensorDataDTO; +import se.hal.daemon.PCDataSynchronizationDaemon.SensorDataListDTO; import se.hal.intf.HalDaemon; import se.hal.struct.Sensor; import se.hal.struct.User; diff --git a/src/se/hal/deamon/PCDataSynchronizationDaemon.java b/src/se/hal/daemon/PCDataSynchronizationDaemon.java old mode 100755 new mode 100644 similarity index 98% rename from src/se/hal/deamon/PCDataSynchronizationDaemon.java rename to src/se/hal/daemon/PCDataSynchronizationDaemon.java index 9cc0bd50..725e8d11 --- a/src/se/hal/deamon/PCDataSynchronizationDaemon.java +++ b/src/se/hal/daemon/PCDataSynchronizationDaemon.java @@ -1,8 +1,8 @@ -package se.hal.deamon; +package se.hal.daemon; import se.hal.HalContext; -import se.hal.deamon.PCDataSynchronizationClient.PeerDataReqDTO; -import se.hal.deamon.PCDataSynchronizationClient.SensorDataReqDTO; +import se.hal.daemon.PCDataSynchronizationClient.PeerDataReqDTO; +import se.hal.daemon.PCDataSynchronizationClient.SensorDataReqDTO; import se.hal.intf.HalDaemon; import se.hal.struct.Sensor; import se.hal.struct.User; diff --git a/src/se/hal/deamon/SensorDataAggregatorDaemon.java b/src/se/hal/daemon/SensorDataAggregatorDaemon.java old mode 100755 new mode 100644 similarity index 99% rename from src/se/hal/deamon/SensorDataAggregatorDaemon.java rename to src/se/hal/daemon/SensorDataAggregatorDaemon.java index 6143b933..64715bc5 --- a/src/se/hal/deamon/SensorDataAggregatorDaemon.java +++ b/src/se/hal/daemon/SensorDataAggregatorDaemon.java @@ -1,4 +1,4 @@ -package se.hal.deamon; +package se.hal.daemon; import se.hal.HalContext; import se.hal.intf.HalDaemon; diff --git a/src/se/hal/deamon/SensorDataCleanupDaemon.java b/src/se/hal/daemon/SensorDataCleanupDaemon.java old mode 100755 new mode 100644 similarity index 98% rename from src/se/hal/deamon/SensorDataCleanupDaemon.java rename to src/se/hal/daemon/SensorDataCleanupDaemon.java index c76accae..56967f72 --- a/src/se/hal/deamon/SensorDataCleanupDaemon.java +++ b/src/se/hal/daemon/SensorDataCleanupDaemon.java @@ -1,7 +1,7 @@ -package se.hal.deamon; +package se.hal.daemon; import se.hal.HalContext; -import se.hal.deamon.SensorDataAggregatorDaemon.AggregationPeriodLength; +import se.hal.daemon.SensorDataAggregatorDaemon.AggregationPeriodLength; import se.hal.intf.HalDaemon; import se.hal.struct.Sensor; import se.hal.util.UTCTimeUtility; diff --git a/src/se/hal/page/PCOverviewHttpPage.java b/src/se/hal/page/PCOverviewHttpPage.java index d9a2f0c3..86a2a094 100755 --- a/src/se/hal/page/PCOverviewHttpPage.java +++ b/src/se/hal/page/PCOverviewHttpPage.java @@ -1,21 +1,13 @@ package se.hal.page; import se.hal.HalContext; -import se.hal.deamon.SensorDataAggregatorDaemon.AggregationPeriodLength; import se.hal.intf.HalHttpPage; -import se.hal.struct.devicedata.PowerConsumptionSensorData; import se.hal.struct.Sensor; import se.hal.struct.User; -import se.hal.util.AggregateDataListSqlResult; -import se.hal.util.AggregateDataListSqlResult.AggregateData; -import se.hal.util.UTCTimeUtility; import zutil.db.DBConnection; import zutil.io.file.FileUtil; -import zutil.parser.DataNode; import zutil.parser.Templator; -import java.sql.SQLException; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/src/se/hal/page/SensorJsonPage.java b/src/se/hal/page/SensorJsonPage.java index 4897d718..43978220 100755 --- a/src/se/hal/page/SensorJsonPage.java +++ b/src/se/hal/page/SensorJsonPage.java @@ -1,7 +1,7 @@ package se.hal.page; import se.hal.HalContext; -import se.hal.deamon.SensorDataAggregatorDaemon; +import se.hal.daemon.SensorDataAggregatorDaemon; import se.hal.intf.HalJsonPage; import se.hal.struct.Sensor; import se.hal.util.AggregateDataListSqlResult; diff --git a/src/se/hal/page/SensorOverviewHttpPage.java b/src/se/hal/page/SensorOverviewHttpPage.java index 2178842c..82e76431 100755 --- a/src/se/hal/page/SensorOverviewHttpPage.java +++ b/src/se/hal/page/SensorOverviewHttpPage.java @@ -1,16 +1,12 @@ package se.hal.page; import se.hal.HalContext; -import se.hal.deamon.SensorDataAggregatorDaemon.AggregationPeriodLength; import se.hal.intf.HalHttpPage; import se.hal.struct.Sensor; -import se.hal.util.AggregateDataListSqlResult; import se.hal.util.HistoryDataListSqlResult; import se.hal.util.HistoryDataListSqlResult.HistoryData; -import se.hal.util.UTCTimeUtility; import zutil.db.DBConnection; import zutil.io.file.FileUtil; -import zutil.net.http.HttpHeader; import zutil.parser.Templator; import java.sql.PreparedStatement; diff --git a/src/se/hal/util/AggregateDataListSqlResult.java b/src/se/hal/util/AggregateDataListSqlResult.java index 69a7c1b0..63789ab1 100755 --- a/src/se/hal/util/AggregateDataListSqlResult.java +++ b/src/se/hal/util/AggregateDataListSqlResult.java @@ -1,6 +1,6 @@ package se.hal.util; -import se.hal.deamon.SensorDataAggregatorDaemon.AggregationPeriodLength; +import se.hal.daemon.SensorDataAggregatorDaemon.AggregationPeriodLength; import se.hal.struct.Sensor; import se.hal.struct.devicedata.PowerConsumptionSensorData; import zutil.db.DBConnection; diff --git a/src/se/hal/util/UTCTimePeriod.java b/src/se/hal/util/UTCTimePeriod.java index 51a89889..a527eba6 100755 --- a/src/se/hal/util/UTCTimePeriod.java +++ b/src/se/hal/util/UTCTimePeriod.java @@ -1,6 +1,6 @@ package se.hal.util; -import se.hal.deamon.SensorDataAggregatorDaemon.AggregationPeriodLength; +import se.hal.daemon.SensorDataAggregatorDaemon.AggregationPeriodLength; public class UTCTimePeriod{ private final long start; diff --git a/src/se/hal/util/UTCTimeUtility.java b/src/se/hal/util/UTCTimeUtility.java index 38d81c5c..4c549d27 100755 --- a/src/se/hal/util/UTCTimeUtility.java +++ b/src/se/hal/util/UTCTimeUtility.java @@ -1,6 +1,6 @@ package se.hal.util; -import se.hal.deamon.SensorDataAggregatorDaemon.AggregationPeriodLength; +import se.hal.daemon.SensorDataAggregatorDaemon.AggregationPeriodLength; import java.text.SimpleDateFormat; import java.util.Calendar; diff --git a/test/se/hal/deamon/SensorDataAggregationDeamonTest.java b/test/se/hal/daemon/SensorDataAggregationDeamonTest.java old mode 100755 new mode 100644 similarity index 99% rename from test/se/hal/deamon/SensorDataAggregationDeamonTest.java rename to test/se/hal/daemon/SensorDataAggregationDeamonTest.java index 27c48a51..7dc5eb06 --- a/test/se/hal/deamon/SensorDataAggregationDeamonTest.java +++ b/test/se/hal/daemon/SensorDataAggregationDeamonTest.java @@ -1,4 +1,4 @@ -package se.hal.deamon; +package se.hal.daemon; import java.sql.PreparedStatement; diff --git a/test/se/hal/util/TimePeriodTest.java b/test/se/hal/util/TimePeriodTest.java index 04df32cb..156a2f0f 100755 --- a/test/se/hal/util/TimePeriodTest.java +++ b/test/se/hal/util/TimePeriodTest.java @@ -5,7 +5,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import se.hal.deamon.SensorDataAggregatorDaemon.AggregationPeriodLength; +import se.hal.daemon.SensorDataAggregatorDaemon.AggregationPeriodLength; import java.util.Arrays; import java.util.Collection; diff --git a/test/se/hal/util/TimeUtilityTest.java b/test/se/hal/util/TimeUtilityTest.java index d3760704..d98bba27 100755 --- a/test/se/hal/util/TimeUtilityTest.java +++ b/test/se/hal/util/TimeUtilityTest.java @@ -5,7 +5,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import se.hal.deamon.SensorDataAggregatorDaemon.AggregationPeriodLength; +import se.hal.daemon.SensorDataAggregatorDaemon.AggregationPeriodLength; import java.util.Arrays; import java.util.Calendar;