[Freemail] r15792 - in trunk/apps/Freemail/src/freemail: . fcp

[d...@freenetproject.org]

Author: dbkr
Date: 2007-11-15 19:36:38 +0000 (Thu, 15 Nov 2007)
New Revision: 15792

Removed:
   trunk/apps/Freemail/src/freemail/support/
Modified:
   trunk/apps/Freemail/src/freemail/RTSFetcher.java
   trunk/apps/Freemail/src/freemail/fcp/FCPMessage.java
Log:
Remove unnecessary duplicates created in the plugin patch.


Modified: trunk/apps/Freemail/src/freemail/RTSFetcher.java
===================================================================
--- trunk/apps/Freemail/src/freemail/RTSFetcher.java    2007-11-15 19:35:23 UTC 
(rev 15791)
+++ trunk/apps/Freemail/src/freemail/RTSFetcher.java    2007-11-15 19:36:38 UTC 
(rev 15792)
@@ -23,8 +23,6 @@

 import freemail.fcp.HighLevelFCPClient;
 import freemail.fcp.ConnectionTerminatedException;
-import freemail.support.io.LineReadingInputStream;
-import freemail.support.io.TooLongException;
 import freemail.utils.DateStringFactory;
 import freemail.utils.PropsFile;

@@ -53,6 +51,8 @@
 import org.bouncycastle.crypto.modes.CBCBlockCipher;
 import org.bouncycastle.crypto.DataLengthException;

+import freenet.support.io.LineReadingInputStream;
+import freenet.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        2007-11-15 
19:35:23 UTC (rev 15791)
+++ trunk/apps/Freemail/src/freemail/fcp/FCPMessage.java        2007-11-15 
19:36:38 UTC (rev 15792)
@@ -31,9 +31,9 @@
 import java.util.Collections;

 import freemail.Freemail;
-import freemail.support.io.LineReader;
-import freemail.support.io.LineReadingInputStream;

+import freenet.support.io.LineReader;
+import freenet.support.io.LineReadingInputStream;

 public class FCPMessage {
        private String messagetype;