From c9d8933bd1310c201f7acb274566e3e720563f42 Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 1 Mar 2008 05:53:34 +0000 Subject: [PATCH] move streamToString to SqliteDB.java darcs-hash:20080301055334-5007d-027d63fffbdea41950070009377561470fc0958e.gz --- src/org/ibex/mail/SqliteMailbox.java | 7 ------- src/org/ibex/mail/Whitelist.java | 8 +------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/org/ibex/mail/SqliteMailbox.java b/src/org/ibex/mail/SqliteMailbox.java index b28ef7f..c423fef 100644 --- a/src/org/ibex/mail/SqliteMailbox.java +++ b/src/org/ibex/mail/SqliteMailbox.java @@ -251,12 +251,5 @@ public class SqliteMailbox extends Mailbox.Default implements MailTree { } } - private static String streamToString(Stream stream) throws Exception { - // FIXME - StringBuffer b = new StringBuffer(); - for(String s = stream.readln(); s!=null; s=stream.readln()) - b.append(s+"\n"); - return b.toString(); - } } diff --git a/src/org/ibex/mail/Whitelist.java b/src/org/ibex/mail/Whitelist.java index 5d57407..7355a5c 100644 --- a/src/org/ibex/mail/Whitelist.java +++ b/src/org/ibex/mail/Whitelist.java @@ -219,18 +219,12 @@ public class Whitelist extends SqliteDB { PreparedStatement add = conn.prepareStatement("insert into pending values(?,?,?,?)"); add.setString(1, messageid); add.setString(2, to.toString(false)); - add.setString(3, streamToString(m.getStream())); + add.setString(3, SqliteDB.streamToString(m.getStream())); add.setTimestamp(4, new Timestamp(System.currentTimeMillis())); add.executeUpdate(); } } catch (Exception e) { throw new RuntimeException(e); } } - private static String streamToString(Stream stream) throws Exception { - StringBuffer b = new StringBuffer(); - for(String s = stream.readln(); s!=null; s=stream.readln()) - b.append(s+"\n"); - return b.toString(); - } } -- 1.7.10.4