From bc316bd71077af49e717e0637c6500bb78615fef Mon Sep 17 00:00:00 2001 From: Simon Ebner Date: Tue, 18 Mar 2014 12:46:36 +0100 Subject: [PATCH] renamed FdaqService to Fdaq --- .../java/ch/psi/fda/fdaq/{FdaqService.java => Fdaq.java} | 6 +++--- ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqMain.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/{FdaqService.java => Fdaq.java} (96%) diff --git a/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqService.java b/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/Fdaq.java similarity index 96% rename from ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqService.java rename to ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/Fdaq.java index 141697a..202f42b 100644 --- a/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqService.java +++ b/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/Fdaq.java @@ -39,9 +39,9 @@ import ch.psi.fda.messages.Metadata; * Fdaq service * */ -public class FdaqService { +public class Fdaq { - private static final Logger logger = Logger.getLogger(FdaqService.class.getName()); + private static final Logger logger = Logger.getLogger(Fdaq.class.getName()); private volatile boolean stopAcquisition = false; private volatile boolean running = false; @@ -51,7 +51,7 @@ public class FdaqService { private FdaqConfiguration configuration; private final int numberOfElements = Integer.MAX_VALUE/2; - public FdaqService(EventBus bus, FdaqConfiguration configuration){ + public Fdaq(EventBus bus, FdaqConfiguration configuration){ this.bus = bus; this.configuration = configuration; } diff --git a/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqMain.java b/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqMain.java index 9695b58..f0baead 100644 --- a/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqMain.java +++ b/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqMain.java @@ -56,7 +56,7 @@ public class FdaqMain { EventBus bus = new AsyncEventBus(Executors.newSingleThreadExecutor()); - final FdaqService fdaq = new FdaqService(bus, configuration); + final Fdaq fdaq = new Fdaq(bus, configuration); Signal.handle(new Signal("INT"), new SignalHandler() { int count = 0;