Author: dbkr
Date: 2008-01-24 19:17:31 +0000 (Thu, 24 Jan 2008)
New Revision: 17241
Added:
trunk/apps/Freemail/src/freemail/support/
Removed:
trunk/apps/Freemail/src/freenet/support/
Modified:
trunk/apps/Freemail/src/freemail/RTSFetcher.java
trunk/apps/Freemail/src/freemail/fcp/FCPMessage.java
trunk/apps/Freemail/src/freemail/support/io/LineReader.java
trunk/apps/Freemail/src/freemail/support/io/LineReadingInputStream.java
trunk/apps/Freemail/src/freemail/support/io/TooLongException.java
Log:
Move the freenet LineReader classes to freemail.support.io. Keeping copies is
too error-prone so this is our best option in the absence of a
freenet-common.jar.
Modified: trunk/apps/Freemail/src/freemail/RTSFetcher.java
===================================================================
--- trunk/apps/Freemail/src/freemail/RTSFetcher.java 2008-01-24 19:11:59 UTC
(rev 17240)
+++ trunk/apps/Freemail/src/freemail/RTSFetcher.java 2008-01-24 19:17:31 UTC
(rev 17241)
@@ -52,8 +52,8 @@
import org.bouncycastle.crypto.modes.CBCBlockCipher;
import org.bouncycastle.crypto.DataLengthException;
-import freenet.support.io.LineReadingInputStream;
-import freenet.support.io.TooLongException;
+import freemail.support.io.LineReadingInputStream;
+import freemail.support.io.TooLongException;
import org.archive.util.Base32;
Modified: trunk/apps/Freemail/src/freemail/fcp/FCPMessage.java
===================================================================
--- trunk/apps/Freemail/src/freemail/fcp/FCPMessage.java 2008-01-24
19:11:59 UTC (rev 17240)
+++ trunk/apps/Freemail/src/freemail/fcp/FCPMessage.java 2008-01-24
19:17:31 UTC (rev 17241)
@@ -32,8 +32,8 @@
import freemail.Freemail;
-import freenet.support.io.LineReader;
-import freenet.support.io.LineReadingInputStream;
+import freemail.support.io.LineReader;
+import freemail.support.io.LineReadingInputStream;
public class FCPMessage {
private String messagetype;
Copied: trunk/apps/Freemail/src/freemail/support (from rev 17237,
trunk/apps/Freemail/src/freenet/support)
Modified: trunk/apps/Freemail/src/freemail/support/io/LineReader.java
===================================================================
--- trunk/apps/Freemail/src/freenet/support/io/LineReader.java 2008-01-24
18:44:28 UTC (rev 17237)
+++ trunk/apps/Freemail/src/freemail/support/io/LineReader.java 2008-01-24
19:17:31 UTC (rev 17241)
@@ -1,5 +1,9 @@
-package freenet.support.io;
+package freemail.support.io;
+/*
+ * This file originates from the main Freenet distribution, originally in
freenet.support.io
+ */
+
import java.io.IOException;
public interface LineReader {
Modified:
trunk/apps/Freemail/src/freemail/support/io/LineReadingInputStream.java
===================================================================
--- trunk/apps/Freemail/src/freenet/support/io/LineReadingInputStream.java
2008-01-24 18:44:28 UTC (rev 17237)
+++ trunk/apps/Freemail/src/freemail/support/io/LineReadingInputStream.java
2008-01-24 19:17:31 UTC (rev 17241)
@@ -1,5 +1,9 @@
-package freenet.support.io;
+package freemail.support.io;
+/*
+ * This file originates from the main Freenet distribution, originally in
freenet.support.io
+ */
+
import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
Modified: trunk/apps/Freemail/src/freemail/support/io/TooLongException.java
===================================================================
--- trunk/apps/Freemail/src/freenet/support/io/TooLongException.java
2008-01-24 18:44:28 UTC (rev 17237)
+++ trunk/apps/Freemail/src/freemail/support/io/TooLongException.java
2008-01-24 19:17:31 UTC (rev 17241)
@@ -1,5 +1,9 @@
-package freenet.support.io;
+package freemail.support.io;
+/*
+ * This file originates from the main Freenet distribution, originally in
freenet.support.io
+ */
+
import java.io.IOException;
/** Exception thrown by a LineReadingInputStream when a line is too long. */
