From 54fb16a0e9d606caca43f8fa5ba4deab7d36b3b7 Mon Sep 17 00:00:00 2001 From: Simon Ebner Date: Tue, 17 Dec 2013 15:18:09 +0100 Subject: [PATCH] Renamed package from core.messages to messages --- ch.psi.fda/src/main/java/ch/psi/fda/aq/Collector.java | 10 +++++----- .../src/main/java/ch/psi/fda/aq/Manipulator.java | 6 +++--- .../src/main/java/ch/psi/fda/core/Manipulation.java | 4 ++-- .../java/ch/psi/fda/core/loops/ActorSensorLoop.java | 6 +++--- .../java/ch/psi/fda/core/loops/cr/CrlogicLoop.java | 6 +++--- .../java/ch/psi/fda/core/loops/cr/ParallelCrlogic.java | 2 +- .../fda/core/loops/cr/ParallelCrlogicStreamMerge.java | 8 ++++---- .../java/ch/psi/fda/core/loops/cr/ScrlogicLoop.java | 6 +++--- .../main/java/ch/psi/fda/core/loops/otf/OTFLoop.java | 6 +++--- .../psi/fda/core/manipulator/JythonManipulation.java | 4 ++-- .../ch/psi/fda/deserializer/DataDeserializerMDA.java | 10 +++++----- .../ch/psi/fda/deserializer/DataDeserializerTXT.java | 8 ++++---- .../src/main/java/ch/psi/fda/rest/ZMQDataService.java | 2 +- .../java/ch/psi/fda/serializer/DataSerializerMAT.java | 8 ++++---- .../ch/psi/fda/serializer/DataSerializerMAT2D.java | 10 +++++----- .../psi/fda/serializer/DataSerializerMAT2DZigZag.java | 10 +++++----- .../java/ch/psi/fda/serializer/DataSerializerMDA.java | 10 +++++----- .../java/ch/psi/fda/serializer/DataSerializerTXT.java | 10 +++++----- .../ch/psi/fda/serializer/DataSerializerTXT2D.java | 10 +++++----- .../ch/psi/fda/serializer/DataSerializerTXTSplit.java | 8 ++++---- .../main/java/ch/psi/fda/visualizer/Visualizer.java | 6 +++--- .../src/test/java/ch/psi/fda/aq/CollectorTest.java | 10 +++++----- .../src/test/java/ch/psi/fda/aq/ManipulatorTest.java | 8 ++++---- .../ch/psi/fda/core/loops/ActorSensorLoopTest.java | 2 +- .../test/java/ch/psi/fda/core/loops/OTFLoopTest.java | 6 +++--- .../core/loops/cr/ParallelCrlogicStreamMergeTest.java | 8 ++++---- .../ch/psi/fda/core/loops/cr/ParallelCrlogicTest.java | 2 +- .../ch/psi/fda/core/loops/cr/ScrlogicLoopTest.java | 2 +- .../psi/fda/deserializer/DataDeserializerMDATest.java | 8 ++++---- .../ch/psi/fda/deserializer/DataDeserializerTest.java | 6 +++--- .../java/ch/psi/fda/serializer/SerializerTest.java | 8 ++++---- .../java/ch/psi/fda/visualizer/DataVisualizerTest.java | 8 ++++---- 32 files changed, 109 insertions(+), 109 deletions(-) diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/aq/Collector.java b/ch.psi.fda/src/main/java/ch/psi/fda/aq/Collector.java index 1af95d5..664f4cf 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/aq/Collector.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/aq/Collector.java @@ -25,11 +25,11 @@ import java.util.List; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.Metadata; -import ch.psi.fda.core.messages.StreamDelimiterMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; -import ch.psi.fda.core.messages.Message; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Message; +import ch.psi.fda.messages.Metadata; +import ch.psi.fda.messages.StreamDelimiterMessage; /** * Collector class that is collecting and merging data from different Queues. diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/aq/Manipulator.java b/ch.psi.fda/src/main/java/ch/psi/fda/aq/Manipulator.java index 5085753..b1f9a80 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/aq/Manipulator.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/aq/Manipulator.java @@ -26,9 +26,9 @@ import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; import ch.psi.fda.core.Manipulation; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.Message; -import ch.psi.fda.core.messages.Metadata; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.Message; +import ch.psi.fda.messages.Metadata; /** * Applies manipulations to the data stream diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/Manipulation.java b/ch.psi.fda/src/main/java/ch/psi/fda/core/Manipulation.java index 100d67f..b73b52f 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/core/Manipulation.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/core/Manipulation.java @@ -21,8 +21,8 @@ package ch.psi.fda.core; import java.util.List; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.Metadata; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.Metadata; public interface Manipulation { diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/ActorSensorLoop.java b/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/ActorSensorLoop.java index 3b25ca8..8b71b38 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/ActorSensorLoop.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/ActorSensorLoop.java @@ -35,9 +35,9 @@ import ch.psi.fda.core.Actor; import ch.psi.fda.core.ActorSetCallable; import ch.psi.fda.core.Guard; import ch.psi.fda.core.Sensor; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; -import ch.psi.fda.core.messages.Metadata; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Metadata; /** * Loop of actions to accomplish a task or test. diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/CrlogicLoop.java b/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/CrlogicLoop.java index 25a2e5f..46d4481 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/CrlogicLoop.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/CrlogicLoop.java @@ -39,9 +39,9 @@ import com.google.common.eventbus.EventBus; import jcifs.smb.SmbFile; import ch.psi.fda.core.Action; import ch.psi.fda.core.ActionLoop; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; -import ch.psi.fda.core.messages.Metadata; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Metadata; import ch.psi.jcae.ChannelException; import ch.psi.jcae.ChannelService; diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/ParallelCrlogic.java b/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/ParallelCrlogic.java index ae5aaca..5ab2d5f 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/ParallelCrlogic.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/ParallelCrlogic.java @@ -38,7 +38,7 @@ import com.google.common.eventbus.Subscribe; import ch.psi.fda.core.Action; import ch.psi.fda.core.ActionLoop; -import ch.psi.fda.core.messages.Message; +import ch.psi.fda.messages.Message; public class ParallelCrlogic implements ActionLoop { diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/ParallelCrlogicStreamMerge.java b/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/ParallelCrlogicStreamMerge.java index 84c5156..c8facaa 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/ParallelCrlogicStreamMerge.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/ParallelCrlogicStreamMerge.java @@ -25,10 +25,10 @@ import java.util.concurrent.BlockingQueue; import com.google.common.eventbus.EventBus; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; -import ch.psi.fda.core.messages.Message; -import ch.psi.fda.core.messages.Metadata; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Message; +import ch.psi.fda.messages.Metadata; /** * Class to merge two data streams into one. The secondary queues data is added to the primary queues data. diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/ScrlogicLoop.java b/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/ScrlogicLoop.java index 0c1a615..c686475 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/ScrlogicLoop.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/ScrlogicLoop.java @@ -32,9 +32,9 @@ import com.google.common.eventbus.EventBus; import ch.psi.fda.core.Action; import ch.psi.fda.core.ActionLoop; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; -import ch.psi.fda.core.messages.Metadata; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Metadata; import ch.psi.jcae.Channel; import ch.psi.jcae.impl.type.DoubleTimestamp; diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/otf/OTFLoop.java b/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/otf/OTFLoop.java index 957f252..9c62c58 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/otf/OTFLoop.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/otf/OTFLoop.java @@ -32,10 +32,10 @@ import com.google.common.eventbus.EventBus; import ch.psi.fda.core.Action; import ch.psi.fda.core.ActionLoop; import ch.psi.fda.core.Sensor; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; -import ch.psi.fda.core.messages.Metadata; import ch.psi.fda.core.sensors.TimestampSensor; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Metadata; /** * ActionLoop that is implementing the OTF Scan logic. diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/manipulator/JythonManipulation.java b/ch.psi.fda/src/main/java/ch/psi/fda/core/manipulator/JythonManipulation.java index 30308a3..db84bd9 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/core/manipulator/JythonManipulation.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/core/manipulator/JythonManipulation.java @@ -33,12 +33,12 @@ import javax.script.ScriptEngineManager; import javax.script.ScriptException; import ch.psi.fda.core.Manipulation; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.Metadata; import ch.psi.fda.core.scripting.JythonParameterMapping; import ch.psi.fda.core.scripting.JythonParameterMappingChannel; import ch.psi.fda.core.scripting.JythonParameterMappingGlobalVariable; import ch.psi.fda.core.scripting.JythonParameterMappingID; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.Metadata; public class JythonManipulation implements Manipulation{ diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerMDA.java b/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerMDA.java index ad9e001..870f9d1 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerMDA.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerMDA.java @@ -13,11 +13,11 @@ import java.util.logging.Logger; import com.google.common.eventbus.EventBus; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; -import ch.psi.fda.core.messages.Message; -import ch.psi.fda.core.messages.Metadata; -import ch.psi.fda.core.messages.StreamDelimiterMessage; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Message; +import ch.psi.fda.messages.Metadata; +import ch.psi.fda.messages.StreamDelimiterMessage; /** * Deserializer MDA file diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerTXT.java b/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerTXT.java index 4676b8e..62aa3c5 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerTXT.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerTXT.java @@ -29,10 +29,10 @@ import java.util.logging.Logger; import com.google.common.eventbus.EventBus; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.Metadata; -import ch.psi.fda.core.messages.StreamDelimiterMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Metadata; +import ch.psi.fda.messages.StreamDelimiterMessage; /** * Deserializer for text files diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/ZMQDataService.java b/ch.psi.fda/src/main/java/ch/psi/fda/rest/ZMQDataService.java index 7c935e5..facd02b 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/rest/ZMQDataService.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/rest/ZMQDataService.java @@ -26,7 +26,7 @@ import java.util.logging.Logger; import org.jeromq.ZMQ; -import ch.psi.fda.core.messages.Message; +import ch.psi.fda.messages.Message; import com.google.common.eventbus.Subscribe; diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerMAT.java b/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerMAT.java index 92b0a4b..a26835c 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerMAT.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerMAT.java @@ -29,10 +29,10 @@ import com.jmatio.io.MatFileWriter; import com.jmatio.types.MLArray; import com.jmatio.types.MLDouble; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; -import ch.psi.fda.core.messages.Message; -import ch.psi.fda.core.messages.Metadata; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Message; +import ch.psi.fda.messages.Metadata; /** * Serialize data received by a DataQueue into a Matlab file diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerMAT2D.java b/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerMAT2D.java index 17908cc..fba47b5 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerMAT2D.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerMAT2D.java @@ -30,11 +30,11 @@ import com.jmatio.io.MatFileWriter; import com.jmatio.types.MLArray; import com.jmatio.types.MLDouble; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.Metadata; -import ch.psi.fda.core.messages.StreamDelimiterMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; -import ch.psi.fda.core.messages.Message; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Message; +import ch.psi.fda.messages.Metadata; +import ch.psi.fda.messages.StreamDelimiterMessage; /** * Serialize data received by a DataQueue into a Matlab file diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerMAT2DZigZag.java b/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerMAT2DZigZag.java index d05d1a3..99bf738 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerMAT2DZigZag.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerMAT2DZigZag.java @@ -31,11 +31,11 @@ import com.jmatio.io.MatFileWriter; import com.jmatio.types.MLArray; import com.jmatio.types.MLDouble; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.Metadata; -import ch.psi.fda.core.messages.StreamDelimiterMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; -import ch.psi.fda.core.messages.Message; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Message; +import ch.psi.fda.messages.Metadata; +import ch.psi.fda.messages.StreamDelimiterMessage; /** * Serialize data received by a DataQueue into a Matlab file diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerMDA.java b/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerMDA.java index e00c354..a048120 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerMDA.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerMDA.java @@ -32,11 +32,11 @@ import java.util.logging.Logger; import com.google.common.eventbus.Subscribe; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; -import ch.psi.fda.core.messages.Message; -import ch.psi.fda.core.messages.Metadata; -import ch.psi.fda.core.messages.StreamDelimiterMessage; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Message; +import ch.psi.fda.messages.Metadata; +import ch.psi.fda.messages.StreamDelimiterMessage; /** * Serialize data received by a DataQueue diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerTXT.java b/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerTXT.java index 050d737..c7c26f0 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerTXT.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerTXT.java @@ -27,11 +27,11 @@ import java.util.logging.Logger; import com.google.common.eventbus.Subscribe; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; -import ch.psi.fda.core.messages.Message; -import ch.psi.fda.core.messages.Metadata; -import ch.psi.fda.core.messages.StreamDelimiterMessage; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Message; +import ch.psi.fda.messages.Metadata; +import ch.psi.fda.messages.StreamDelimiterMessage; /** * Serialize data received by a DataQueue diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerTXT2D.java b/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerTXT2D.java index 115e15e..de1136a 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerTXT2D.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerTXT2D.java @@ -28,11 +28,11 @@ import java.util.List; import com.google.common.eventbus.Subscribe; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.Metadata; -import ch.psi.fda.core.messages.StreamDelimiterMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; -import ch.psi.fda.core.messages.Message; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Message; +import ch.psi.fda.messages.Metadata; +import ch.psi.fda.messages.StreamDelimiterMessage; /** * Serialize data received by a DataQueue into a Matlab file diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerTXTSplit.java b/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerTXTSplit.java index a62d59d..14dface 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerTXTSplit.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/serializer/DataSerializerTXTSplit.java @@ -28,10 +28,10 @@ import java.util.List; import com.google.common.eventbus.Subscribe; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.Metadata; -import ch.psi.fda.core.messages.StreamDelimiterMessage; -import ch.psi.fda.core.messages.Message; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.Message; +import ch.psi.fda.messages.Metadata; +import ch.psi.fda.messages.StreamDelimiterMessage; /** * Serialize data received by a DataQueue diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/Visualizer.java b/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/Visualizer.java index 9d84580..840dd43 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/Visualizer.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/Visualizer.java @@ -29,9 +29,9 @@ import javax.swing.SwingUtilities; import com.google.common.eventbus.Subscribe; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.StreamDelimiterMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.StreamDelimiterMessage; import ch.psi.plot.Plot; import ch.psi.plot.xy.LinePlot; import ch.psi.plot.xy.XYSeriesCollectionP; diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/aq/CollectorTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/aq/CollectorTest.java index b19ea50..47fca08 100644 --- a/ch.psi.fda/src/test/java/ch/psi/fda/aq/CollectorTest.java +++ b/ch.psi.fda/src/test/java/ch/psi/fda/aq/CollectorTest.java @@ -33,11 +33,11 @@ import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; import ch.psi.fda.aq.Collector; -import ch.psi.fda.core.messages.ControlMessage; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; -import ch.psi.fda.core.messages.Message; -import ch.psi.fda.core.messages.Metadata; +import ch.psi.fda.messages.ControlMessage; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Message; +import ch.psi.fda.messages.Metadata; public class CollectorTest { diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/aq/ManipulatorTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/aq/ManipulatorTest.java index 3c1bb95..ed37272 100644 --- a/ch.psi.fda/src/test/java/ch/psi/fda/aq/ManipulatorTest.java +++ b/ch.psi.fda/src/test/java/ch/psi/fda/aq/ManipulatorTest.java @@ -40,13 +40,13 @@ import ch.psi.fda.TestChannels; import ch.psi.fda.aq.Manipulator; import ch.psi.fda.core.Manipulation; import ch.psi.fda.core.manipulator.JythonManipulation; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; -import ch.psi.fda.core.messages.Message; -import ch.psi.fda.core.messages.Metadata; import ch.psi.fda.core.scripting.JythonParameterMapping; import ch.psi.fda.core.scripting.JythonParameterMappingChannel; import ch.psi.fda.core.scripting.JythonParameterMappingID; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Message; +import ch.psi.fda.messages.Metadata; import ch.psi.jcae.Channel; import ch.psi.jcae.ChannelDescriptor; import ch.psi.jcae.ChannelException; diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/ActorSensorLoopTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/ActorSensorLoopTest.java index 381d285..b7d7c88 100644 --- a/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/ActorSensorLoopTest.java +++ b/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/ActorSensorLoopTest.java @@ -44,8 +44,8 @@ import ch.psi.fda.core.actors.ChannelAccessLinearActuator; import ch.psi.fda.core.guard.ChannelAccessGuard; import ch.psi.fda.core.guard.ChannelAccessGuardCondition; import ch.psi.fda.core.loops.ActorSensorLoop; -import ch.psi.fda.core.messages.Message; import ch.psi.fda.core.sensors.ChannelAccessSensor; +import ch.psi.fda.messages.Message; import ch.psi.jcae.Channel; import ch.psi.jcae.ChannelDescriptor; import ch.psi.jcae.ChannelException; diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/OTFLoopTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/OTFLoopTest.java index f954a50..cdb4cf6 100644 --- a/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/OTFLoopTest.java +++ b/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/OTFLoopTest.java @@ -39,10 +39,10 @@ import ch.psi.fda.core.loops.otf.OTFLoop; import ch.psi.fda.core.loops.otf.OTFNamedChannelSensor; import ch.psi.fda.core.loops.otf.OTFScalerChannelSensor; import ch.psi.fda.core.loops.otf.TemplateOTF; -import ch.psi.fda.core.messages.ControlMessage; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.Message; import ch.psi.fda.core.sensors.TimestampSensor; +import ch.psi.fda.messages.ControlMessage; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.Message; import ch.psi.jcae.Channel; import ch.psi.jcae.ChannelDescriptor; import ch.psi.jcae.ChannelException; diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ParallelCrlogicStreamMergeTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ParallelCrlogicStreamMergeTest.java index c55daa8..13a5785 100644 --- a/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ParallelCrlogicStreamMergeTest.java +++ b/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ParallelCrlogicStreamMergeTest.java @@ -32,10 +32,10 @@ import org.junit.Test; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; -import ch.psi.fda.core.messages.Message; -import ch.psi.fda.core.messages.Metadata; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Message; +import ch.psi.fda.messages.Metadata; public class ParallelCrlogicStreamMergeTest { diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ParallelCrlogicTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ParallelCrlogicTest.java index 9486f60..a0ea855 100644 --- a/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ParallelCrlogicTest.java +++ b/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ParallelCrlogicTest.java @@ -34,7 +34,7 @@ import org.junit.Test; import com.google.common.eventbus.Subscribe; import ch.psi.fda.TestConfiguration; -import ch.psi.fda.core.messages.Message; +import ch.psi.fda.messages.Message; import ch.psi.jcae.Channel; import ch.psi.jcae.ChannelDescriptor; import ch.psi.jcae.ChannelException; diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ScrlogicLoopTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ScrlogicLoopTest.java index 7313f32..29f9ae5 100644 --- a/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ScrlogicLoopTest.java +++ b/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ScrlogicLoopTest.java @@ -32,7 +32,7 @@ import org.junit.Test; import com.google.common.eventbus.Subscribe; -import ch.psi.fda.core.messages.Message; +import ch.psi.fda.messages.Message; import ch.psi.jcae.Channel; import ch.psi.jcae.ChannelDescriptor; import ch.psi.jcae.ChannelException; diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/deserializer/DataDeserializerMDATest.java b/ch.psi.fda/src/test/java/ch/psi/fda/deserializer/DataDeserializerMDATest.java index b6a6bc5..4a184fb 100644 --- a/ch.psi.fda/src/test/java/ch/psi/fda/deserializer/DataDeserializerMDATest.java +++ b/ch.psi.fda/src/test/java/ch/psi/fda/deserializer/DataDeserializerMDATest.java @@ -31,10 +31,10 @@ import org.junit.Test; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; -import ch.psi.fda.core.messages.ControlMessage; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.Message; -import ch.psi.fda.core.messages.Metadata; +import ch.psi.fda.messages.ControlMessage; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.Message; +import ch.psi.fda.messages.Metadata; /** * @author ebner diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/deserializer/DataDeserializerTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/deserializer/DataDeserializerTest.java index 80ebd85..c120922 100644 --- a/ch.psi.fda/src/test/java/ch/psi/fda/deserializer/DataDeserializerTest.java +++ b/ch.psi.fda/src/test/java/ch/psi/fda/deserializer/DataDeserializerTest.java @@ -31,11 +31,11 @@ import org.junit.Test; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; -import ch.psi.fda.core.messages.ControlMessage; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.Message; import ch.psi.fda.deserializer.DataDeserializer; import ch.psi.fda.deserializer.DataDeserializerTXT; +import ch.psi.fda.messages.ControlMessage; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.Message; public class DataDeserializerTest { diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/serializer/SerializerTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/serializer/SerializerTest.java index f3ca804..2a2a1cb 100644 --- a/ch.psi.fda/src/test/java/ch/psi/fda/serializer/SerializerTest.java +++ b/ch.psi.fda/src/test/java/ch/psi/fda/serializer/SerializerTest.java @@ -29,10 +29,10 @@ import org.junit.Test; import com.google.common.eventbus.EventBus; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.Metadata; -import ch.psi.fda.core.messages.StreamDelimiterMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Metadata; +import ch.psi.fda.messages.StreamDelimiterMessage; import ch.psi.fda.serializer.DataSerializerMAT; import ch.psi.fda.serializer.DataSerializerMAT2D; import ch.psi.fda.serializer.DataSerializerTXT; diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/visualizer/DataVisualizerTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/visualizer/DataVisualizerTest.java index a95892b..7594966 100644 --- a/ch.psi.fda/src/test/java/ch/psi/fda/visualizer/DataVisualizerTest.java +++ b/ch.psi.fda/src/test/java/ch/psi/fda/visualizer/DataVisualizerTest.java @@ -33,10 +33,10 @@ import org.junit.Test; import com.google.common.eventbus.EventBus; -import ch.psi.fda.core.messages.DataMessage; -import ch.psi.fda.core.messages.Metadata; -import ch.psi.fda.core.messages.StreamDelimiterMessage; -import ch.psi.fda.core.messages.EndOfStreamMessage; +import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.messages.EndOfStreamMessage; +import ch.psi.fda.messages.Metadata; +import ch.psi.fda.messages.StreamDelimiterMessage; import ch.psi.plot.xy.LinePlot; import ch.psi.plot.xyz.MatrixPlotData;