Author: tchemit Date: 2014-01-29 06:32:54 +0100 (Wed, 29 Jan 2014) New Revision: 1532 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1532 Log: remove i18n from ichyometer module + improve some api (refs #3875: Import des mensurations en continue depuis un ictyom?\195?\168tre) Removed: trunk/tutti-ichtyometer/src/main/resources/i18n/ Modified: trunk/tutti-ichtyometer/pom.xml trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-01-29 03:26:12 UTC (rev 1531) +++ trunk/tutti-ichtyometer/pom.xml 2014-01-29 05:32:54 UTC (rev 1532) @@ -52,12 +52,6 @@ <artifactId>bluecove-gpl</artifactId> </dependency> - <!-- Nuiton --> - <!--dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency--> - <!-- Guava --> <dependency> <groupId>com.google.guava</groupId> @@ -98,20 +92,6 @@ <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <executions> - <execution> - <id>scan-sources</id> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> </build> Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java 2014-01-29 03:26:12 UTC (rev 1531) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java 2014-01-29 05:32:54 UTC (rev 1532) @@ -32,6 +32,7 @@ import javax.microedition.io.StreamConnection; import javax.swing.event.EventListenerList; +import java.io.Closeable; import java.io.DataInputStream; import java.io.IOException; @@ -43,7 +44,7 @@ * @author Tony Chemit <chemit@codelutin.com> * @since 3.1 */ -public class FeedReader { +public class FeedReader implements Closeable { /** Logger. */ private static final Log log = LogFactory.getLog(FeedReader.class); @@ -93,7 +94,8 @@ fireReaderStart(e); } - public void stop() throws IOException { + @Override + public void close() throws IOException { try { if (readingRunnable != null) { @@ -110,9 +112,7 @@ } finally { - if (client != null) { - Closeables.close(client, true); - } + Closeables.close(client, true); FeedReaderEvent e = new FeedReaderEvent(this); fireReaderStop(e);