This is an automated email from the git hooks/post-receive script. New commit to branch feature/7459 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 2b893ccf555cbd52cbe08b42db6fc933ad83c787 Author: Kevin Morin <morin@codelutin.com> Date: Tue Apr 19 17:37:33 2016 +0200 renommage des classes de l'ichtyometre en vue de l'ajout de module du pied à coulisse, pour eviter les confusions (refs #7459) --- ...{FeedReader.java => IchtyometerFeedReader.java} | 46 +++++++++++----------- ...rEvent.java => IchtyometerFeedReaderEvent.java} | 16 ++++---- ...ner.java => IchtyometerFeedReaderListener.java} | 4 +- ...ava => IchtyometerFeedReaderMeasureRecord.java} | 4 +- ...ava => IchtyometerFeedReaderRecordFactory.java} | 26 ++++++------ ...ava => IchtyometerFeedReaderRecordSupport.java} | 4 +- ...> IchtyometerFeedReaderStylusMotionRecord.java} | 4 +- .../tutti/ichtyometer/tool/FeedReaderTool.java | 8 ++-- ...derTest.java => IchtyometerFeedReaderTest.java} | 10 ++--- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 8 ++-- .../tutti/ui/swing/content/MainUIHandler.java | 4 +- .../content/actions/ConnectIchtyometerAction.java | 6 +-- .../actions/DisconnectIchtyometerAction.java | 4 +- .../frequency/SpeciesFrequencyUIHandler.java | 16 ++++---- 14 files changed, 80 insertions(+), 80 deletions(-) diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/IchtyometerFeedReader.java similarity index 73% rename from tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java rename to tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/IchtyometerFeedReader.java index 19ce998..520c550 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/IchtyometerFeedReader.java @@ -25,11 +25,11 @@ package fr.ifremer.tutti.ichtyometer.feed; import com.google.common.base.Preconditions; import com.google.common.io.Closeables; import fr.ifremer.tutti.ichtyometer.IchtyometerClient; -import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderEvent; -import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderListener; -import fr.ifremer.tutti.ichtyometer.feed.record.FeedReaderMeasureRecord; -import fr.ifremer.tutti.ichtyometer.feed.record.FeedReaderRecordFactory; -import fr.ifremer.tutti.ichtyometer.feed.record.FeedReaderRecordSupport; +import fr.ifremer.tutti.ichtyometer.feed.event.IchtyometerFeedReaderEvent; +import fr.ifremer.tutti.ichtyometer.feed.event.IchtyometerFeedReaderListener; +import fr.ifremer.tutti.ichtyometer.feed.record.IchtyometerFeedReaderMeasureRecord; +import fr.ifremer.tutti.ichtyometer.feed.record.IchtyometerFeedReaderRecordFactory; +import fr.ifremer.tutti.ichtyometer.feed.record.IchtyometerFeedReaderRecordSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -47,10 +47,10 @@ import java.io.IOException; * @author Tony Chemit - chemit@codelutin.com * @since 3.1 */ -public class FeedReader implements Closeable { +public class IchtyometerFeedReader implements Closeable { /** Logger. */ - private static final Log log = LogFactory.getLog(FeedReader.class); + private static final Log log = LogFactory.getLog(IchtyometerFeedReader.class); /** * Ichtyometer client given in the {@code start} method. @@ -63,7 +63,7 @@ public class FeedReader implements Closeable { protected ReadingRunnable readingRunnable; /** - * To keep list of {@link FeedReaderListener} listeners. + * To keep list of {@link IchtyometerFeedReaderListener} listeners. */ protected final EventListenerList listenerList; @@ -72,11 +72,11 @@ public class FeedReader implements Closeable { * * @since 3.10 */ - protected final FeedReaderRecordFactory recordFactory; + protected final IchtyometerFeedReaderRecordFactory recordFactory; - public FeedReader() { + public IchtyometerFeedReader() { listenerList = new EventListenerList(); - recordFactory = new FeedReaderRecordFactory(); + recordFactory = new IchtyometerFeedReaderRecordFactory(); } public void start(IchtyometerClient client) throws IOException { @@ -121,17 +121,17 @@ public class FeedReader implements Closeable { return client.getName(); } - public void addFeedModeReaderListener(FeedReaderListener listener) { - listenerList.add(FeedReaderListener.class, listener); + public void addFeedModeReaderListener(IchtyometerFeedReaderListener listener) { + listenerList.add(IchtyometerFeedReaderListener.class, listener); } - public void removeFeedModeReaderListener(FeedReaderListener listener) { - listenerList.remove(FeedReaderListener.class, listener); + public void removeFeedModeReaderListener(IchtyometerFeedReaderListener listener) { + listenerList.remove(IchtyometerFeedReaderListener.class, listener); } public void removeAllFeedModeReaderListeners() { - for (FeedReaderListener listener : listenerList.getListeners(FeedReaderListener.class)) { - listenerList.remove(FeedReaderListener.class, listener); + for (IchtyometerFeedReaderListener listener : listenerList.getListeners(IchtyometerFeedReaderListener.class)) { + listenerList.remove(IchtyometerFeedReaderListener.class, listener); } } @@ -166,13 +166,13 @@ public class FeedReader implements Closeable { try { // get a new record - FeedReaderRecordSupport readerRecord = readRecord(dataInputStream); + IchtyometerFeedReaderRecordSupport readerRecord = readRecord(dataInputStream); - if (!stop && readerRecord != null && readerRecord instanceof FeedReaderMeasureRecord) { + if (!stop && readerRecord != null && readerRecord instanceof IchtyometerFeedReaderMeasureRecord) { // send new record to listeners - FeedReaderEvent e = new FeedReaderEvent(FeedReader.this, (FeedReaderMeasureRecord) readerRecord); - for (FeedReaderListener listener : listenerList.getListeners(FeedReaderListener.class)) { + IchtyometerFeedReaderEvent e = new IchtyometerFeedReaderEvent(IchtyometerFeedReader.this, (IchtyometerFeedReaderMeasureRecord) readerRecord); + for (IchtyometerFeedReaderListener listener : listenerList.getListeners(IchtyometerFeedReaderListener.class)) { listener.recordRead(e); } @@ -189,7 +189,7 @@ public class FeedReader implements Closeable { } } - protected FeedReaderRecordSupport readRecord(DataInputStream dataInputStream) throws IOException { + protected IchtyometerFeedReaderRecordSupport readRecord(DataInputStream dataInputStream) throws IOException { String result = ""; @@ -217,7 +217,7 @@ public class FeedReader implements Closeable { } } - FeedReaderRecordSupport readerRecord = null; + IchtyometerFeedReaderRecordSupport readerRecord = null; if (!stop) { diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/FeedReaderEvent.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/IchtyometerFeedReaderEvent.java similarity index 66% rename from tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/FeedReaderEvent.java rename to tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/IchtyometerFeedReaderEvent.java index bad4167..be067fd 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/FeedReaderEvent.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/IchtyometerFeedReaderEvent.java @@ -22,8 +22,8 @@ package fr.ifremer.tutti.ichtyometer.feed.event; * #L% */ -import fr.ifremer.tutti.ichtyometer.feed.FeedReader; -import fr.ifremer.tutti.ichtyometer.feed.record.FeedReaderMeasureRecord; +import fr.ifremer.tutti.ichtyometer.feed.IchtyometerFeedReader; +import fr.ifremer.tutti.ichtyometer.feed.record.IchtyometerFeedReaderMeasureRecord; import java.util.EventObject; @@ -33,23 +33,23 @@ import java.util.EventObject; * @author Tony Chemit - chemit@codelutin.com * @since 3.1 */ -public class FeedReaderEvent extends EventObject { +public class IchtyometerFeedReaderEvent extends EventObject { private static final long serialVersionUID = 1L; - protected final FeedReaderMeasureRecord record; + protected final IchtyometerFeedReaderMeasureRecord record; - public FeedReaderEvent(FeedReader source, FeedReaderMeasureRecord record) { + public IchtyometerFeedReaderEvent(IchtyometerFeedReader source, IchtyometerFeedReaderMeasureRecord record) { super(source); this.record = record; } @Override - public FeedReader getSource() { - return (FeedReader) super.getSource(); + public IchtyometerFeedReader getSource() { + return (IchtyometerFeedReader) super.getSource(); } - public FeedReaderMeasureRecord getRecord() { + public IchtyometerFeedReaderMeasureRecord getRecord() { return record; } } diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/FeedReaderListener.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/IchtyometerFeedReaderListener.java similarity index 89% rename from tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/FeedReaderListener.java rename to tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/IchtyometerFeedReaderListener.java index b4a728d..e7373f9 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/FeedReaderListener.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/IchtyometerFeedReaderListener.java @@ -32,13 +32,13 @@ import java.util.EventListener; * @author Tony Chemit - chemit@codelutin.com * @since 3.1 */ -public interface FeedReaderListener extends EventListener { +public interface IchtyometerFeedReaderListener extends EventListener { /** * When a new record was read. * * @param event event containing the new read record */ - void recordRead(FeedReaderEvent event); + void recordRead(IchtyometerFeedReaderEvent event); } diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderMeasureRecord.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderMeasureRecord.java similarity index 93% rename from tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderMeasureRecord.java rename to tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderMeasureRecord.java index 362537e..4444e88 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderMeasureRecord.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderMeasureRecord.java @@ -39,7 +39,7 @@ import java.util.regex.Pattern; * @author Tony Chemit - chemit@codelutin.com * @since 3.10 */ -public class FeedReaderMeasureRecord extends FeedReaderRecordSupport { +public class IchtyometerFeedReaderMeasureRecord extends IchtyometerFeedReaderRecordSupport { private static final long serialVersionUID = 1L; @@ -54,7 +54,7 @@ public class FeedReaderMeasureRecord extends FeedReaderRecordSupport { protected final int measure; - FeedReaderMeasureRecord(String record) { + IchtyometerFeedReaderMeasureRecord(String record) { super(record); Matcher matcher = RECORD_PATTERN.matcher(record); matcher.find(); diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordFactory.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderRecordFactory.java similarity index 65% rename from tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordFactory.java rename to tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderRecordFactory.java index 829833a..2c51729 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordFactory.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderRecordFactory.java @@ -33,40 +33,40 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.10 */ -public class FeedReaderRecordFactory { +public class IchtyometerFeedReaderRecordFactory { protected final Set<FeedReaderRecordAceptor> acceptors; - public FeedReaderRecordFactory() { + public IchtyometerFeedReaderRecordFactory() { acceptors = new LinkedHashSet<>(); - acceptors.add(new FeedReaderRecordAceptor<FeedReaderStylusMotionRecord>() { + acceptors.add(new FeedReaderRecordAceptor<IchtyometerFeedReaderStylusMotionRecord>() { @Override public boolean accept(String record) { - return FeedReaderStylusMotionRecord.acceptRecord(record); + return IchtyometerFeedReaderStylusMotionRecord.acceptRecord(record); } @Override - public FeedReaderStylusMotionRecord newRecord(String record) { - return new FeedReaderStylusMotionRecord(record); + public IchtyometerFeedReaderStylusMotionRecord newRecord(String record) { + return new IchtyometerFeedReaderStylusMotionRecord(record); } }); - acceptors.add(new FeedReaderRecordAceptor<FeedReaderMeasureRecord>() { + acceptors.add(new FeedReaderRecordAceptor<IchtyometerFeedReaderMeasureRecord>() { @Override public boolean accept(String record) { - return FeedReaderMeasureRecord.acceptRecord(record); + return IchtyometerFeedReaderMeasureRecord.acceptRecord(record); } @Override - public FeedReaderMeasureRecord newRecord(String record) { - return new FeedReaderMeasureRecord(record); + public IchtyometerFeedReaderMeasureRecord newRecord(String record) { + return new IchtyometerFeedReaderMeasureRecord(record); } }); } - public FeedReaderRecordSupport newRecord(String record) { + public IchtyometerFeedReaderRecordSupport newRecord(String record) { - FeedReaderRecordSupport feedRecord = null; + IchtyometerFeedReaderRecordSupport feedRecord = null; for (FeedReaderRecordAceptor acceptor : acceptors) { @@ -84,7 +84,7 @@ public class FeedReaderRecordFactory { } - protected static interface FeedReaderRecordAceptor<F extends FeedReaderRecordSupport> { + protected static interface FeedReaderRecordAceptor<F extends IchtyometerFeedReaderRecordSupport> { boolean accept(String record); diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordSupport.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderRecordSupport.java similarity index 91% rename from tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordSupport.java rename to tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderRecordSupport.java index 175e04f..0dddea7 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordSupport.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderRecordSupport.java @@ -35,7 +35,7 @@ import java.io.Serializable; * @author Tony Chemit - chemit@codelutin.com * @since 3.10 */ -public abstract class FeedReaderRecordSupport implements Serializable{ +public abstract class IchtyometerFeedReaderRecordSupport implements Serializable{ private static final long serialVersionUID = 1L; @@ -44,7 +44,7 @@ public abstract class FeedReaderRecordSupport implements Serializable{ */ protected final String record; - protected FeedReaderRecordSupport(String record) { + protected IchtyometerFeedReaderRecordSupport(String record) { this.record = record; Preconditions.checkState(isValid()); } diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderStylusMotionRecord.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderStylusMotionRecord.java similarity index 92% rename from tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderStylusMotionRecord.java rename to tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderStylusMotionRecord.java index 2df31f1..97d0fbe 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderStylusMotionRecord.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderStylusMotionRecord.java @@ -39,7 +39,7 @@ import java.util.regex.Pattern; * @author Tony Chemit - chemit@codelutin.com * @since 3.10 */ -public class FeedReaderStylusMotionRecord extends FeedReaderRecordSupport { +public class IchtyometerFeedReaderStylusMotionRecord extends IchtyometerFeedReaderRecordSupport { private static final long serialVersionUID = 1L; @@ -54,7 +54,7 @@ public class FeedReaderStylusMotionRecord extends FeedReaderRecordSupport { protected final int motion; - FeedReaderStylusMotionRecord(String record) { + IchtyometerFeedReaderStylusMotionRecord(String record) { super(record); Matcher matcher = RECORD_PATTERN.matcher(record); matcher.find(); diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java index 164a6e8..bc34f76 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java @@ -25,8 +25,8 @@ package fr.ifremer.tutti.ichtyometer.tool; import com.google.common.collect.Lists; import fr.ifremer.tutti.ichtyometer.IchtyometerClient; import fr.ifremer.tutti.ichtyometer.RemoteDeviceChooser; -import fr.ifremer.tutti.ichtyometer.feed.FeedReader; -import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderListener; +import fr.ifremer.tutti.ichtyometer.feed.IchtyometerFeedReader; +import fr.ifremer.tutti.ichtyometer.feed.event.IchtyometerFeedReaderListener; import java.io.Console; import java.io.IOException; @@ -70,11 +70,11 @@ public class FeedReaderTool { client.open(remoteDeviceChooser, true); - FeedReader reader = new FeedReader(); + IchtyometerFeedReader reader = new IchtyometerFeedReader(); writer.println("client " + client + " is open and listen the board"); - FeedReaderListener listener = event -> writer.println("New record: " + event.getRecord()); + IchtyometerFeedReaderListener listener = event -> writer.println("New record: " + event.getRecord()); reader.addFeedModeReaderListener(listener); reader.start(client); diff --git a/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java b/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/IchtyometerFeedReaderTest.java similarity index 81% rename from tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java rename to tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/IchtyometerFeedReaderTest.java index fa81b8a..7af78e1 100644 --- a/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java +++ b/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/IchtyometerFeedReaderTest.java @@ -24,7 +24,7 @@ package fr.ifremer.tutti.ichtyometer.feed; import fr.ifremer.tutti.ichtyometer.BigFins; import fr.ifremer.tutti.ichtyometer.IchtyometerClient; -import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderListener; +import fr.ifremer.tutti.ichtyometer.feed.event.IchtyometerFeedReaderListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.After; @@ -41,10 +41,10 @@ import java.io.IOException; * @since 3.1 */ @Ignore -public class FeedReaderTest { +public class IchtyometerFeedReaderTest { /** Logger. */ - private static final Log log = LogFactory.getLog(FeedReaderTest.class); + private static final Log log = LogFactory.getLog(IchtyometerFeedReaderTest.class); protected IchtyometerClient client; @@ -67,9 +67,9 @@ public class FeedReaderTest { @Test public void testFeedMode() throws IOException, InterruptedException { - FeedReader reader = new FeedReader(); + IchtyometerFeedReader reader = new IchtyometerFeedReader(); - FeedReaderListener listener = event -> log.info("Reader " + event.getSource() + " read : " + event.getRecord()); + IchtyometerFeedReaderListener listener = event -> log.info("Reader " + event.getSource() + " read : " + event.getRecord()); reader.addFeedModeReaderListener(listener); reader.start(client); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java index f7e5919..748691b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java @@ -26,7 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ifremer.tutti.TuttiConfiguration; -import fr.ifremer.tutti.ichtyometer.feed.FeedReader; +import fr.ifremer.tutti.ichtyometer.feed.IchtyometerFeedReader; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.service.ClosedPersistenceService; import fr.ifremer.tutti.service.DecoratorService; @@ -285,7 +285,7 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage * * @since 3.1 */ - private FeedReader ichtyometerReader; + private IchtyometerFeedReader ichtyometerReader; /** * A file lock to prevent multiple instance. the lock is create in the {@link #init()} method and remove in the @@ -1115,11 +1115,11 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage //-- Ichtyometer methods --// //------------------------------------------------------------------------// - public FeedReader getIchtyometerReader() { + public IchtyometerFeedReader getIchtyometerReader() { return ichtyometerReader; } - public void setIchtyometerReader(FeedReader ichtyometerReader) { + public void setIchtyometerReader(IchtyometerFeedReader ichtyometerReader) { this.ichtyometerReader = ichtyometerReader; firePropertyChange(PROPERTY_ICHTYOMETER_CONNECTED, null, isIchtyometerConnected()); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java index c544966..08c7ce2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java @@ -23,7 +23,7 @@ package fr.ifremer.tutti.ui.swing.content; */ import com.google.common.base.Preconditions; -import fr.ifremer.tutti.ichtyometer.feed.FeedReader; +import fr.ifremer.tutti.ichtyometer.feed.IchtyometerFeedReader; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; @@ -96,7 +96,7 @@ public class MainUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, MainUI public String getIchtyometerStatusTip(boolean connected) { String result; if (connected) { - FeedReader ichtyometerReader = getModel().getIchtyometerReader(); + IchtyometerFeedReader ichtyometerReader = getModel().getIchtyometerReader(); result = t("tutti.ichtyometer.status.connected.tip", ichtyometerReader.getClientName()); } else { result = t("tutti.ichtyometer.status.not.connected.tip"); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectIchtyometerAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectIchtyometerAction.java index 9729a67..97a646c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectIchtyometerAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectIchtyometerAction.java @@ -27,7 +27,7 @@ import fr.ifremer.tutti.ichtyometer.LocalDeviceNotFoundException; import fr.ifremer.tutti.ichtyometer.RemoteDeviceChooser; import fr.ifremer.tutti.ichtyometer.RemoteDeviceNotFoundException; import fr.ifremer.tutti.ichtyometer.RemoteDeviceServiceNotFoundException; -import fr.ifremer.tutti.ichtyometer.feed.FeedReader; +import fr.ifremer.tutti.ichtyometer.feed.IchtyometerFeedReader; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import org.nuiton.jaxx.application.ApplicationBusinessException; @@ -80,7 +80,7 @@ public class ConnectIchtyometerAction extends AbstractMainUITuttiAction { } catch (RemoteDeviceServiceNotFoundException e) { throw new ApplicationBusinessException(t("tutti.ichtyometer.error.no.remote.device.service")); } - FeedReader ichtyometerReader = new FeedReader(); + IchtyometerFeedReader ichtyometerReader = new IchtyometerFeedReader(); ichtyometerReader.start(client); getContext().setIchtyometerReader(ichtyometerReader); @@ -90,7 +90,7 @@ public class ConnectIchtyometerAction extends AbstractMainUITuttiAction { public void postSuccessAction() { super.postSuccessAction(); - FeedReader ichtyometerReader = getContext().getIchtyometerReader(); + IchtyometerFeedReader ichtyometerReader = getContext().getIchtyometerReader(); String clientName = ichtyometerReader.getClientName(); sendMessage(t("tutti.ichtyometer.connection.establish", clientName)); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/DisconnectIchtyometerAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/DisconnectIchtyometerAction.java index c372d8a..ea526ed 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/DisconnectIchtyometerAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/DisconnectIchtyometerAction.java @@ -22,7 +22,7 @@ package fr.ifremer.tutti.ui.swing.content.actions; * #L% */ -import fr.ifremer.tutti.ichtyometer.feed.FeedReader; +import fr.ifremer.tutti.ichtyometer.feed.IchtyometerFeedReader; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import org.apache.commons.io.IOUtils; @@ -45,7 +45,7 @@ public class DisconnectIchtyometerAction extends AbstractMainUITuttiAction { @Override public void doAction() throws Exception { - FeedReader ichtyometerReader = getContext().getIchtyometerReader(); + IchtyometerFeedReader ichtyometerReader = getContext().getIchtyometerReader(); // there is a feed reader, stop it now IOUtils.closeQuietly(ichtyometerReader); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index 51f46cf..f05ea82 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -22,9 +22,9 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency; * #L% */ -import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderEvent; -import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderListener; -import fr.ifremer.tutti.ichtyometer.feed.record.FeedReaderMeasureRecord; +import fr.ifremer.tutti.ichtyometer.feed.event.IchtyometerFeedReaderEvent; +import fr.ifremer.tutti.ichtyometer.feed.event.IchtyometerFeedReaderListener; +import fr.ifremer.tutti.ichtyometer.feed.record.IchtyometerFeedReaderMeasureRecord; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.CopyIndividualObservationMode; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; @@ -128,7 +128,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci /** * To consume measures when they arrive from the ichtyometer. */ - protected final FeedReaderListener feedReaderListener; + protected final IchtyometerFeedReaderListener feedReaderListener; protected ApplySpeciesFrequencyRafaleAction applySpeciesFrequencyRafaleAction; @@ -149,11 +149,11 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci SpeciesFrequencyRowModel.PROPERTY_NUMBER, SpeciesFrequencyRowModel.PROPERTY_WEIGHT); - this.feedReaderListener = new FeedReaderListener() { + this.feedReaderListener = new IchtyometerFeedReaderListener() { @Override - public void recordRead(FeedReaderEvent event) { - final FeedReaderMeasureRecord record = event.getRecord(); + public void recordRead(IchtyometerFeedReaderEvent event) { + final IchtyometerFeedReaderMeasureRecord record = event.getRecord(); SwingUtilities.invokeLater( () -> { @@ -914,7 +914,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci return col; } - protected void consumeFeedRecord(FeedReaderMeasureRecord record) { + protected void consumeFeedRecord(IchtyometerFeedReaderMeasureRecord record) { if (record.isValid()) { String unit = getModel().getLengthStepCaracteristicUnit(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.