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

Removed "koc" from package names

Browse source 
Former-commit-id: 93e426a87e8a82a83783d68cf7a814c88df375aa
This commit is contained in:
Ziver Koc 2016-01-11 17:48:02 +01:00
parent 1ab72ffbc3
commit 5b2dffeb43
56 changed files with 2289 additions and 2313 deletions
Download patch file Download diff file Expand all files Collapse all files

10
build.xml Normal file → Executable file
View file

@ -26,7 +26,7 @@
<target name="run-local-sensor" depends=""> <target name="run-local-sensor" depends="">
<java fork="true" failonerror="true" classname="se.koc.hal.plugin.localsensor.ImpulseTracker"> <java fork="true" failonerror="true" classname="se.hal.plugin.localsensor.ImpulseTracker">
<classpath> <classpath>
<pathelement path="${buildDir}/hal.jar"/> <!--wildcard may not be platform independent, ok?--> <pathelement path="${buildDir}/hal.jar"/> <!--wildcard may not be platform independent, ok?-->
<pathelement path="${libDir}/*"/> <!--wildcard may not be platform independent, ok?--> <pathelement path="${libDir}/*"/> <!--wildcard may not be platform independent, ok?-->
@ -35,7 +35,7 @@
</target> </target>
<target name="run-remote-sensor" depends=""> <target name="run-remote-sensor" depends="">
<java fork="true" failonerror="true" classname="se.koc.hal.plugin.tellstick.TelstickSerialCommTest"> <java fork="true" failonerror="true" classname="se.hal.plugin.tellstick.TelstickSerialCommTest">
<classpath> <classpath>
<pathelement path="${buildDir}/hal.jar"/> <!--wildcard may not be platform independent, ok?--> <pathelement path="${buildDir}/hal.jar"/> <!--wildcard may not be platform independent, ok?-->
<pathelement path="${libDir}/*"/> <!--wildcard may not be platform independent, ok?--> <pathelement path="${libDir}/*"/> <!--wildcard may not be platform independent, ok?-->
@ -44,7 +44,7 @@
</target> </target>
<target name="run-main-server" depends=""> <target name="run-main-server" depends="">
<java fork="true" failonerror="true" classname="se.koc.hal.PowerChallenge"> <java fork="true" failonerror="true" classname="se.hal.PowerChallenge">
<classpath> <classpath>
<pathelement path="${buildDir}/hal.jar"/> <!--wildcard may not be platform independent, ok?--> <pathelement path="${buildDir}/hal.jar"/> <!--wildcard may not be platform independent, ok?-->
<pathelement path="${libDir}/*"/> <!--wildcard may not be platform independent, ok?--> <pathelement path="${libDir}/*"/> <!--wildcard may not be platform independent, ok?-->
@ -70,12 +70,12 @@
<mkdir dir="${buildDir}" /> <mkdir dir="${buildDir}" />
<javac srcdir="${srcDir}" destdir="${buildDir}" fork="yes"> <javac srcdir="${srcDir}" destdir="${buildDir}" fork="yes">
<include name="**/*.java" /> <include name="**/*.java" />
<exclude name="se/koc/hal/tts/GoogleTTSClient.java" /> <exclude name="se/hal/tts/GoogleTTSClient.java" />
<classpath refid="classpath.build" /> <classpath refid="classpath.build" />
</javac> </javac>
<javac srcdir="${testDir}" destdir="${buildDir}" fork="yes"> <javac srcdir="${testDir}" destdir="${buildDir}" fork="yes">
<include name="**/*.java" /> <include name="**/*.java" />
<exclude name="se/koc/hal/test/JarvisSyntersizerTest.java" /> <exclude name="se/hal/test/JarvisSyntersizerTest.java" />
<classpath refid="classpath.build" /> <classpath refid="classpath.build" />
</javac> </javac>
<jar destfile="${buildDir}/hal.jar" basedir="${buildDir}" excludes="hal.jar" /> <jar destfile="${buildDir}/hal.jar" basedir="${buildDir}" excludes="hal.jar" />

2
run.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
#screen -S hal -L -d -m \ #screen -S hal -L -d -m \
# java -cp sqlite-jdbc-3.7.2.jar:jSerialComm-1.3.4.jar:hal.jar:. se.koc.hal.plugin.tellstick.TelstickSerialCommTest # java -cp sqlite-jdbc-3.7.2.jar:jSerialComm-1.3.4.jar:hal.jar:. se.hal.plugin.tellstick.TelstickSerialCommTest
#ant clean #ant clean
ant build ant build

9
src/se/koc/hal/ControllerManager.java → src/se/hal/ControllerManager.java
View file

@ -1,9 +1,8 @@
package se.koc.hal; package se.hal;
import se.koc.hal.intf.*; import se.hal.intf.*;
import se.koc.hal.plugin.tellstick.protocols.Oregon0x1A2D; import se.hal.struct.Event;
import se.koc.hal.struct.Event; import se.hal.struct.Sensor;
import se.koc.hal.struct.Sensor;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.log.LogUtil; import zutil.log.LogUtil;
import zutil.plugin.PluginData; import zutil.plugin.PluginData;

16
src/se/koc/hal/HalClient.java → src/se/hal/HalClient.java
View file

@ -1,12 +1,12 @@
package se.koc.hal; package se.hal;
import se.koc.hal.bot.AliceBot; import se.hal.bot.AliceBot;
import se.koc.hal.intf.HalBot; import se.hal.intf.HalBot;
import se.koc.hal.intf.HalSpeachToText; import se.hal.intf.HalSpeachToText;
import se.koc.hal.intf.HalTextToSpeach; import se.hal.intf.HalTextToSpeach;
import se.koc.hal.struct.SwitchEvent; import se.hal.struct.SwitchEvent;
import se.koc.hal.stt.ManualSTTClient; import se.hal.stt.ManualSTTClient;
import se.koc.hal.tts.MaryRemoteTTSClient; import se.hal.tts.MaryRemoteTTSClient;
import java.util.HashMap; import java.util.HashMap;
import java.util.regex.Matcher; import java.util.regex.Matcher;

2
src/se/koc/hal/HalContext.java → src/se/hal/HalContext.java
View file

@ -1,4 +1,4 @@
package se.koc.hal; package se.hal;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.db.DBUpgradeHandler; import zutil.db.DBUpgradeHandler;

28
src/se/koc/hal/PowerChallenge.java → src/se/hal/PowerChallenge.java
View file

@ -1,17 +1,17 @@
package se.koc.hal; package se.hal;
import se.koc.hal.deamon.DataAggregatorDaemon; import se.hal.deamon.DataAggregatorDaemon;
import se.koc.hal.deamon.DataCleanupDaemon; import se.hal.deamon.DataCleanupDaemon;
import se.koc.hal.deamon.DataSynchronizationClient; import se.hal.deamon.DataSynchronizationClient;
import se.koc.hal.deamon.DataSynchronizationDaemon; import se.hal.deamon.DataSynchronizationDaemon;
import se.koc.hal.intf.HalDaemon; import se.hal.intf.HalDaemon;
import se.koc.hal.intf.HalHttpPage; import se.hal.intf.HalHttpPage;
import se.koc.hal.page.PCConfigureHttpPage; import se.hal.page.PCConfigureHttpPage;
import se.koc.hal.page.PCHeatMapHttpPage; import se.hal.page.PCHeatMapHttpPage;
import se.koc.hal.page.PCOverviewHttpPage; import se.hal.page.PCOverviewHttpPage;
import se.koc.hal.struct.Event; import se.hal.struct.Event;
import se.koc.hal.struct.Sensor; import se.hal.struct.Sensor;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.io.file.FileUtil; import zutil.io.file.FileUtil;
import zutil.log.CompactLogFormatter; import zutil.log.CompactLogFormatter;
@ -35,8 +35,8 @@ public class PowerChallenge {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// init logging // init logging
CompactLogFormatter formatter = new CompactLogFormatter(); CompactLogFormatter formatter = new CompactLogFormatter();
LogUtil.setLevel("se.koc.hal", Level.FINEST); LogUtil.setLevel("se.hal", Level.FINEST);
LogUtil.setFormatter("se.koc.hal", formatter); LogUtil.setFormatter("se.hal", formatter);
LogUtil.setLevel("zutil", Level.FINEST); LogUtil.setLevel("zutil", Level.FINEST);
LogUtil.setFormatter("zutil", formatter); LogUtil.setFormatter("zutil", formatter);
LogUtil.setGlobalFormatter(formatter); LogUtil.setGlobalFormatter(formatter);

4
src/se/koc/hal/bot/AliceBot.java → src/se/hal/bot/AliceBot.java
View file

@ -20,12 +20,12 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.bot; package se.hal.bot;
import org.alicebot.ab.Bot; import org.alicebot.ab.Bot;
import org.alicebot.ab.Chat; import org.alicebot.ab.Chat;
import org.alicebot.ab.MagicBooleans; import org.alicebot.ab.MagicBooleans;
import se.koc.hal.intf.HalBot; import se.hal.intf.HalBot;
import zutil.io.file.FileUtil; import zutil.io.file.FileUtil;
import java.io.File; import java.io.File;

14
src/se/koc/hal/deamon/DataAggregatorDaemon.java → src/se/hal/deamon/DataAggregatorDaemon.java
View file

@ -1,11 +1,11 @@
package se.koc.hal.deamon; package se.hal.deamon;
import se.koc.hal.HalContext; import se.hal.HalContext;
import se.koc.hal.intf.HalDaemon; import se.hal.intf.HalDaemon;
import se.koc.hal.struct.Sensor; import se.hal.struct.Sensor;
import se.koc.hal.intf.HalSensor.AggregationMethod; import se.hal.intf.HalSensor.AggregationMethod;
import se.koc.hal.struct.PowerConsumptionSensor; import se.hal.struct.PowerConsumptionSensor;
import se.koc.hal.util.TimeUtility; import se.hal.util.TimeUtility;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.db.SQLResultHandler; import zutil.db.SQLResultHandler;
import zutil.db.handler.SimpleSQLResult; import zutil.db.handler.SimpleSQLResult;

12
src/se/koc/hal/deamon/DataCleanupDaemon.java → src/se/hal/deamon/DataCleanupDaemon.java
View file

@ -1,10 +1,10 @@
package se.koc.hal.deamon; package se.hal.deamon;
import se.koc.hal.HalContext; import se.hal.HalContext;
import se.koc.hal.intf.HalDaemon; import se.hal.intf.HalDaemon;
import se.koc.hal.struct.Sensor; import se.hal.struct.Sensor;
import se.koc.hal.struct.PowerConsumptionSensor; import se.hal.struct.PowerConsumptionSensor;
import se.koc.hal.util.TimeUtility; import se.hal.util.TimeUtility;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.db.SQLResultHandler; import zutil.db.SQLResultHandler;
import zutil.db.handler.SimpleSQLResult; import zutil.db.handler.SimpleSQLResult;

12
src/se/koc/hal/deamon/DataSynchronizationClient.java → src/se/hal/deamon/DataSynchronizationClient.java
View file

@ -1,10 +1,10 @@
package se.koc.hal.deamon; package se.hal.deamon;
import se.koc.hal.HalContext; import se.hal.HalContext;
import se.koc.hal.deamon.DataSynchronizationDaemon.*; import se.hal.deamon.DataSynchronizationDaemon.*;
import se.koc.hal.intf.HalDaemon; import se.hal.intf.HalDaemon;
import se.koc.hal.struct.Sensor; import se.hal.struct.Sensor;
import se.koc.hal.struct.User; import se.hal.struct.User;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.log.LogUtil; import zutil.log.LogUtil;

13
src/se/koc/hal/deamon/DataSynchronizationDaemon.java → src/se/hal/deamon/DataSynchronizationDaemon.java
View file

@ -1,10 +1,10 @@
package se.koc.hal.deamon; package se.hal.deamon;
import se.koc.hal.HalContext; import se.hal.HalContext;
import se.koc.hal.deamon.DataSynchronizationClient.*; import se.hal.deamon.DataSynchronizationClient.*;
import se.koc.hal.intf.HalDaemon; import se.hal.intf.HalDaemon;
import se.koc.hal.struct.Sensor; import se.hal.struct.Sensor;
import se.koc.hal.struct.User; import se.hal.struct.User;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.db.SQLResultHandler; import zutil.db.SQLResultHandler;
import zutil.log.LogUtil; import zutil.log.LogUtil;
@ -21,7 +21,6 @@ import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;

2
src/se/koc/hal/intf/HalBot.java → src/se/hal/intf/HalBot.java
View file

@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.intf; package se.hal.intf;
/** /**
* Created by Ziver on 2015-05-07. * Created by Ziver on 2015-05-07.

2
src/se/koc/hal/intf/HalDaemon.java → src/se/hal/intf/HalDaemon.java
View file

@ -1,4 +1,4 @@
package se.koc.hal.intf; package se.hal.intf;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;

4
src/se/koc/hal/intf/HalEvent.java → src/se/hal/intf/HalEvent.java
View file

@ -1,6 +1,4 @@
package se.koc.hal.intf; package se.hal.intf;
import zutil.parser.DataNode;
/** /**
* Created by Ziver on 2015-12-23. * Created by Ziver on 2015-12-23.

2
src/se/koc/hal/intf/HalEventController.java → src/se/hal/intf/HalEventController.java
View file

@ -1,4 +1,4 @@
package se.koc.hal.intf; package se.hal.intf;
/** /**
* Created by Ziver on 2015-12-15. * Created by Ziver on 2015-12-15.

2
src/se/koc/hal/intf/HalEventReportListener.java → src/se/hal/intf/HalEventReportListener.java
View file

@ -1,4 +1,4 @@
package se.koc.hal.intf; package se.hal.intf;
public interface HalEventReportListener { public interface HalEventReportListener {

6
src/se/koc/hal/intf/HalHttpPage.java → src/se/hal/intf/HalHttpPage.java
View file

@ -1,7 +1,7 @@
package se.koc.hal.intf; package se.hal.intf;
import se.koc.hal.HalContext; import se.hal.HalContext;
import se.koc.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.net.http.HttpHeaderParser; import zutil.net.http.HttpHeaderParser;

4
src/se/koc/hal/intf/HalSensor.java → src/se/hal/intf/HalSensor.java
View file

@ -1,6 +1,4 @@
package se.koc.hal.intf; package se.hal.intf;
import zutil.parser.DataNode;
/** /**
* Created by Ziver on 2015-12-23. * Created by Ziver on 2015-12-23.

2
src/se/koc/hal/intf/HalSensorController.java → src/se/hal/intf/HalSensorController.java
View file

@ -1,4 +1,4 @@
package se.koc.hal.intf; package se.hal.intf;
/** /**
* Created by Ziver on 2015-12-15. * Created by Ziver on 2015-12-15.

2
src/se/koc/hal/intf/HalSensorReportListener.java → src/se/hal/intf/HalSensorReportListener.java
View file

@ -1,4 +1,4 @@
package se.koc.hal.intf; package se.hal.intf;
public interface HalSensorReportListener { public interface HalSensorReportListener {

2
src/se/koc/hal/intf/HalSpeachToText.java → src/se/hal/intf/HalSpeachToText.java
View file

@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.intf; package se.hal.intf;
/** /**
* Created with IntelliJ IDEA. * Created with IntelliJ IDEA.

2
src/se/koc/hal/intf/HalTextToSpeach.java → src/se/hal/intf/HalTextToSpeach.java
View file

@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.intf; package se.hal.intf;
/** /**
* Created with IntelliJ IDEA. * Created with IntelliJ IDEA.

12
src/se/koc/hal/page/PCConfigureHttpPage.java → src/se/hal/page/PCConfigureHttpPage.java
View file

@ -1,10 +1,10 @@
package se.koc.hal.page; package se.hal.page;
import se.koc.hal.ControllerManager; import se.hal.ControllerManager;
import se.koc.hal.HalContext; import se.hal.HalContext;
import se.koc.hal.intf.HalHttpPage; import se.hal.intf.HalHttpPage;
import se.koc.hal.struct.Sensor; import se.hal.struct.Sensor;
import se.koc.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;

4
src/se/koc/hal/page/PCHeatMapHttpPage.java → src/se/hal/page/PCHeatMapHttpPage.java
View file

@ -1,6 +1,6 @@
package se.koc.hal.page; package se.hal.page;
import se.koc.hal.intf.HalHttpPage; import se.hal.intf.HalHttpPage;
import zutil.io.file.FileUtil; import zutil.io.file.FileUtil;
import zutil.parser.Templator; import zutil.parser.Templator;

8
src/se/koc/hal/page/PCOverviewHttpPage.java → src/se/hal/page/PCOverviewHttpPage.java
View file

@ -1,8 +1,8 @@
package se.koc.hal.page; package se.hal.page;
import se.koc.hal.HalContext; import se.hal.HalContext;
import se.koc.hal.intf.HalHttpPage; import se.hal.intf.HalHttpPage;
import se.koc.hal.util.TimeUtility; import se.hal.util.TimeUtility;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.db.SQLResultHandler; import zutil.db.SQLResultHandler;
import zutil.io.file.FileUtil; import zutil.io.file.FileUtil;

2
src/se/koc/hal/plugin/localsensor/RPiImpulseCountSensor.java → src/se/hal/plugin/localsensor/RPiImpulseCountSensor.java
View file

@ -1,4 +1,4 @@
package se.koc.hal.plugin.localsensor; package se.hal.plugin.localsensor;
import com.pi4j.io.gpio.*; import com.pi4j.io.gpio.*;
import com.pi4j.io.gpio.event.GpioPinDigitalStateChangeEvent; import com.pi4j.io.gpio.event.GpioPinDigitalStateChangeEvent;

6
src/se/koc/hal/plugin/tellstick/TellstickParser.java → src/se/hal/plugin/tellstick/TellstickParser.java
View file

@ -20,10 +20,10 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.plugin.tellstick; package se.hal.plugin.tellstick;
import se.koc.hal.plugin.tellstick.protocols.NexaSelfLearning; import se.hal.plugin.tellstick.protocols.NexaSelfLearning;
import se.koc.hal.plugin.tellstick.protocols.Oregon0x1A2D; import se.hal.plugin.tellstick.protocols.Oregon0x1A2D;
import zutil.converters.Converter; import zutil.converters.Converter;
import zutil.log.LogUtil; import zutil.log.LogUtil;

6
src/se/koc/hal/plugin/tellstick/TellstickProtocol.java → src/se/hal/plugin/tellstick/TellstickProtocol.java
View file

@ -20,10 +20,10 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.plugin.tellstick; package se.hal.plugin.tellstick;
import se.koc.hal.intf.HalEventController; import se.hal.intf.HalEventController;
import se.koc.hal.intf.HalSensorController; import se.hal.intf.HalSensorController;
/** /**
* Created by Ziver on 2015-02-18. * Created by Ziver on 2015-02-18.

8
src/se/koc/hal/plugin/tellstick/TellstickSerialComm.java → src/se/hal/plugin/tellstick/TellstickSerialComm.java
View file

@ -20,19 +20,17 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.plugin.tellstick; package se.hal.plugin.tellstick;
import com.fazecast.jSerialComm.SerialPort; import com.fazecast.jSerialComm.SerialPort;
import se.koc.hal.HalContext; import se.hal.HalContext;
import se.koc.hal.intf.*; import se.hal.intf.*;
import zutil.io.file.FileUtil;
import zutil.log.InputStreamLogger; import zutil.log.InputStreamLogger;
import zutil.log.LogUtil; import zutil.log.LogUtil;
import zutil.log.OutputStreamLogger; import zutil.log.OutputStreamLogger;
import zutil.struct.TimedHashSet; import zutil.struct.TimedHashSet;
import java.io.*; import java.io.*;
import java.util.Properties;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;

0
src/se/koc/hal/plugin/tellstick/plugin.json → src/se/hal/plugin/tellstick/plugin.json
View file

8
src/se/koc/hal/plugin/tellstick/protocols/NexaSelfLearning.java → src/se/hal/plugin/tellstick/protocols/NexaSelfLearning.java
View file

@ -20,12 +20,10 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.plugin.tellstick.protocols; package se.hal.plugin.tellstick.protocols;
import se.koc.hal.intf.HalEventController; import se.hal.plugin.tellstick.TellstickProtocol;
import se.koc.hal.plugin.tellstick.TellstickProtocol; import se.hal.struct.SwitchEvent;
import se.koc.hal.struct.DimmerEvent;
import se.koc.hal.struct.SwitchEvent;
import zutil.ui.Configurator; import zutil.ui.Configurator;
/** /**

10
src/se/koc/hal/plugin/tellstick/protocols/Oregon0x1A2D.java → src/se/hal/plugin/tellstick/protocols/Oregon0x1A2D.java
View file

@ -1,11 +1,7 @@
package se.koc.hal.plugin.tellstick.protocols; package se.hal.plugin.tellstick.protocols;
import se.koc.hal.intf.HalSensor; import se.hal.plugin.tellstick.TellstickProtocol;
import se.koc.hal.intf.HalSensorController; import se.hal.struct.PowerConsumptionSensor;
import se.koc.hal.plugin.tellstick.TellstickProtocol;
import se.koc.hal.plugin.tellstick.TellstickSerialComm;
import se.koc.hal.struct.PowerConsumptionSensor;
import zutil.parser.DataNode;
import zutil.ui.Configurator; import zutil.ui.Configurator;
/** /**

4
src/se/koc/hal/struct/DimmerEvent.java → src/se/hal/struct/DimmerEvent.java
View file

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.struct; package se.hal.struct;
import se.koc.hal.intf.HalEvent; import se.hal.intf.HalEvent;
/** /**
* Created by Ziver on 2015-05-07. * Created by Ziver on 2015-05-07.

8
src/se/koc/hal/struct/Event.java → src/se/hal/struct/Event.java
View file

@ -1,7 +1,7 @@
package se.koc.hal.struct; package se.hal.struct;
import se.koc.hal.intf.HalEvent; import se.hal.intf.HalEvent;
import se.koc.hal.intf.HalEventController; import se.hal.intf.HalEventController;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.db.bean.DBBean; import zutil.db.bean.DBBean;
import zutil.db.bean.DBBeanSQLResultHandler; import zutil.db.bean.DBBeanSQLResultHandler;
@ -10,8 +10,6 @@ import zutil.io.StringOutputStream;
import zutil.log.LogUtil; import zutil.log.LogUtil;
import zutil.parser.json.JSONObjectInputStream; import zutil.parser.json.JSONObjectInputStream;
import zutil.parser.json.JSONObjectOutputStream; import zutil.parser.json.JSONObjectOutputStream;
import zutil.parser.json.JSONParser;
import zutil.parser.json.JSONWriter;
import java.io.IOException; import java.io.IOException;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;

4
src/se/koc/hal/struct/PowerConsumptionSensor.java → src/se/hal/struct/PowerConsumptionSensor.java
View file

@ -1,6 +1,6 @@
package se.koc.hal.struct; package se.hal.struct;
import se.koc.hal.intf.HalSensor; import se.hal.intf.HalSensor;
/** /**
* Created by Ziver on 2015-12-03. * Created by Ziver on 2015-12-03.

13
src/se/koc/hal/struct/Sensor.java → src/se/hal/struct/Sensor.java
View file

@ -1,8 +1,8 @@
package se.koc.hal.struct; package se.hal.struct;
import se.koc.hal.HalContext; import se.hal.HalContext;
import se.koc.hal.intf.HalSensor; import se.hal.intf.HalSensor;
import se.koc.hal.intf.HalSensorController; import se.hal.intf.HalSensorController;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.db.bean.DBBean; import zutil.db.bean.DBBean;
import zutil.db.bean.DBBeanSQLResultHandler; import zutil.db.bean.DBBeanSQLResultHandler;
@ -10,13 +10,8 @@ import zutil.db.handler.SimpleSQLResult;
import zutil.io.StringInputStream; import zutil.io.StringInputStream;
import zutil.io.StringOutputStream; import zutil.io.StringOutputStream;
import zutil.log.LogUtil; import zutil.log.LogUtil;
import zutil.parser.DataNode;
import zutil.parser.json.JSONObjectInputStream; import zutil.parser.json.JSONObjectInputStream;
import zutil.parser.json.JSONObjectOutputStream; import zutil.parser.json.JSONObjectOutputStream;
import zutil.parser.json.JSONParser;
import zutil.parser.json.JSONWriter;
import zutil.ui.Configurator;
import zutil.ui.Configurator.ConfigurationParam;
import java.io.IOException; import java.io.IOException;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;

6
src/se/koc/hal/struct/SwitchEvent.java → src/se/hal/struct/SwitchEvent.java
View file

@ -20,11 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.struct; package se.hal.struct;
import se.koc.hal.intf.HalEvent; import se.hal.intf.HalEvent;
import se.koc.hal.plugin.tellstick.TellstickSerialComm;
import se.koc.hal.plugin.tellstick.protocols.NexaSelfLearning;
/** /**
* Created by Ziver on 2015-05-07. * Created by Ziver on 2015-05-07.

4
src/se/koc/hal/struct/TemperatureSensor.java → src/se/hal/struct/TemperatureSensor.java
View file

@ -1,6 +1,6 @@
package se.koc.hal.struct; package se.hal.struct;
import se.koc.hal.intf.HalSensor; import se.hal.intf.HalSensor;
/** /**
* Created by Ziver on 2015-12-03. * Created by Ziver on 2015-12-03.

2
src/se/koc/hal/struct/User.java → src/se/hal/struct/User.java
View file

@ -1,4 +1,4 @@
package se.koc.hal.struct; package se.hal.struct;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.db.bean.DBBean; import zutil.db.bean.DBBean;

4
src/se/koc/hal/stt/GoogleSTTClient.java → src/se/hal/stt/GoogleSTTClient.java
View file

@ -1,11 +1,11 @@
package se.koc.hal.stt; package se.hal.stt;
import com.darkprograms.speech.microphone.MicrophoneAnalyzer; import com.darkprograms.speech.microphone.MicrophoneAnalyzer;
import com.darkprograms.speech.recognizer.FlacEncoder; import com.darkprograms.speech.recognizer.FlacEncoder;
import com.darkprograms.speech.recognizer.GSpeechDuplex; import com.darkprograms.speech.recognizer.GSpeechDuplex;
import com.darkprograms.speech.recognizer.GSpeechResponseListener; import com.darkprograms.speech.recognizer.GSpeechResponseListener;
import com.darkprograms.speech.recognizer.GoogleResponse; import com.darkprograms.speech.recognizer.GoogleResponse;
import se.koc.hal.intf.HalSpeachToText; import se.hal.intf.HalSpeachToText;
import zutil.io.file.FileUtil; import zutil.io.file.FileUtil;
import javax.sound.sampled.AudioFileFormat; import javax.sound.sampled.AudioFileFormat;

4
src/se/koc/hal/stt/ManualSTTClient.java → src/se/hal/stt/ManualSTTClient.java
View file

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.stt; package se.hal.stt;
import se.koc.hal.intf.HalSpeachToText; import se.hal.intf.HalSpeachToText;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;

4
src/se/koc/hal/stt/Sphinx4STTClient.java → src/se/hal/stt/Sphinx4STTClient.java
View file

@ -20,12 +20,12 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.stt; package se.hal.stt;
import edu.cmu.sphinx.api.Configuration; import edu.cmu.sphinx.api.Configuration;
import edu.cmu.sphinx.api.LiveSpeechRecognizer; import edu.cmu.sphinx.api.LiveSpeechRecognizer;
import edu.cmu.sphinx.api.SpeechResult; import edu.cmu.sphinx.api.SpeechResult;
import se.koc.hal.intf.HalSpeachToText; import se.hal.intf.HalSpeachToText;
import java.io.IOException; import java.io.IOException;

4
src/se/koc/hal/tts/GoogleTTSClient.java → src/se/hal/tts/GoogleTTSClient.java
View file

@ -20,13 +20,13 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.tts; package se.hal.tts;
import com.darkprograms.speech.synthesiser.SynthesiserV2; import com.darkprograms.speech.synthesiser.SynthesiserV2;
import javafx.embed.swing.JFXPanel; import javafx.embed.swing.JFXPanel;
import javafx.scene.media.Media; import javafx.scene.media.Media;
import javafx.scene.media.MediaPlayer; import javafx.scene.media.MediaPlayer;
import se.koc.hal.intf.HalTextToSpeach; import se.hal.intf.HalTextToSpeach;
import java.io.*; import java.io.*;
import java.net.URISyntaxException; import java.net.URISyntaxException;

4
src/se/koc/hal/tts/MaryLocalTTSClient.java → src/se/hal/tts/MaryLocalTTSClient.java
View file

@ -20,14 +20,14 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.tts; package se.hal.tts;
import marytts.LocalMaryInterface; import marytts.LocalMaryInterface;
import marytts.MaryInterface; import marytts.MaryInterface;
import marytts.exceptions.MaryConfigurationException; import marytts.exceptions.MaryConfigurationException;
import marytts.exceptions.SynthesisException; import marytts.exceptions.SynthesisException;
import marytts.util.data.audio.AudioPlayer; import marytts.util.data.audio.AudioPlayer;
import se.koc.hal.intf.HalTextToSpeach; import se.hal.intf.HalTextToSpeach;
import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioInputStream;
import java.util.Set; import java.util.Set;

4
src/se/koc/hal/tts/MaryRemoteTTSClient.java → src/se/hal/tts/MaryRemoteTTSClient.java
View file

@ -20,13 +20,13 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.tts; package se.hal.tts;
import marytts.MaryInterface; import marytts.MaryInterface;
import marytts.client.RemoteMaryInterface; import marytts.client.RemoteMaryInterface;
import marytts.exceptions.SynthesisException; import marytts.exceptions.SynthesisException;
import marytts.util.data.audio.AudioPlayer; import marytts.util.data.audio.AudioPlayer;
import se.koc.hal.intf.HalTextToSpeach; import se.hal.intf.HalTextToSpeach;
import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioInputStream;
import java.io.IOException; import java.io.IOException;

2
src/se/koc/hal/util/TimeUtility.java → src/se/hal/util/TimeUtility.java
View file

@ -1,4 +1,4 @@
package se.koc.hal.util; package se.hal.util;
import java.util.Calendar; import java.util.Calendar;

4
test/se/koc/hal/plugin/tellstick/TelstickSerialCommNexaOnOffTest.java → test/se/hal/plugin/tellstick/TelstickSerialCommNexaOnOffTest.java
View file

@ -1,6 +1,6 @@
package se.koc.hal.plugin.tellstick; package se.hal.plugin.tellstick;
import se.koc.hal.plugin.tellstick.protocols.NexaSelfLearning; import se.hal.plugin.tellstick.protocols.NexaSelfLearning;
/** /**
* Created by Ziver on 2015-11-19. * Created by Ziver on 2015-11-19.

11
test/se/koc/hal/plugin/tellstick/TelstickSerialCommTest.java → test/se/hal/plugin/tellstick/TelstickSerialCommTest.java
View file

@ -1,10 +1,9 @@
package se.koc.hal.plugin.tellstick; package se.hal.plugin.tellstick;
import se.koc.hal.HalContext; import se.hal.HalContext;
import se.koc.hal.intf.HalSensor; import se.hal.intf.HalSensor;
import se.koc.hal.intf.HalSensorController; import se.hal.intf.HalSensorReportListener;
import se.koc.hal.intf.HalSensorReportListener; import se.hal.plugin.tellstick.protocols.Oregon0x1A2D;
import se.koc.hal.plugin.tellstick.protocols.Oregon0x1A2D;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.log.CompactLogFormatter; import zutil.log.CompactLogFormatter;
import zutil.log.LogUtil; import zutil.log.LogUtil;

2
test/se/koc/hal/plugin/tellstick/protocols/NexaSelfLearningTest.java → test/se/hal/plugin/tellstick/protocols/NexaSelfLearningTest.java
View file

@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.plugin.tellstick.protocols; package se.hal.plugin.tellstick.protocols;
import zutil.converters.Converter; import zutil.converters.Converter;

2
test/se/koc/hal/test/GoogleTTSTest.java → test/se/hal/test/GoogleTTSTest.java
View file

@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.test; package se.hal.test;
import zutil.io.DynamicByteArrayStream; import zutil.io.DynamicByteArrayStream;

2
test/se/koc/hal/test/JarvisRecognizerTest.java → test/se/hal/test/JarvisRecognizerTest.java
View file

@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.test; package se.hal.test;
import com.darkprograms.speech.microphone.MicrophoneAnalyzer; import com.darkprograms.speech.microphone.MicrophoneAnalyzer;
import com.darkprograms.speech.recognizer.FlacEncoder; import com.darkprograms.speech.recognizer.FlacEncoder;

2
test/se/koc/hal/test/JarvisSyntersizerTest.java → test/se/hal/test/JarvisSyntersizerTest.java
View file

@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.test; package se.hal.test;
import com.darkprograms.speech.synthesiser.Synthesiser; import com.darkprograms.speech.synthesiser.Synthesiser;
import javafx.application.Application; import javafx.application.Application;

2
test/se/koc/hal/test/LiveSpeechRecognizerTest.java → test/se/hal/test/LiveSpeechRecognizerTest.java
View file

@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.test; package se.hal.test;
import edu.cmu.sphinx.api.Configuration; import edu.cmu.sphinx.api.Configuration;
import edu.cmu.sphinx.api.LiveSpeechRecognizer; import edu.cmu.sphinx.api.LiveSpeechRecognizer;

2
test/se/koc/hal/test/MaryTTS.java → test/se/hal/test/MaryTTS.java
View file

@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.test; package se.hal.test;
import marytts.MaryInterface; import marytts.MaryInterface;
import marytts.client.RemoteMaryInterface; import marytts.client.RemoteMaryInterface;

2
test/se/koc/hal/test/TranscriberDemo.java → test/se/hal/test/TranscriberDemo.java
View file

@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package se.koc.hal.test; package se.hal.test;
import com.darkprograms.speech.microphone.MicrophoneAnalyzer; import com.darkprograms.speech.microphone.MicrophoneAnalyzer;
import edu.cmu.sphinx.api.Configuration; import edu.cmu.sphinx.api.Configuration;

2
test/se/koc/hal/util/TimeUtilityTest.java → test/se/hal/util/TimeUtilityTest.java
View file

@ -1,4 +1,4 @@
package se.koc.hal.util; package se.hal.util;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;