1.1 --- a/org/sonews/feed/FeedManager.java	Wed Jul 01 10:48:22 2009 +0200
     1.2 +++ b/org/sonews/feed/FeedManager.java	Wed Jul 22 14:04:05 2009 +0200
     1.3 @@ -18,10 +18,10 @@
     1.4  
     1.5  package org.sonews.feed;
     1.6  
     1.7 -import java.sql.SQLException;
     1.8  import java.util.List;
     1.9 -import org.sonews.daemon.storage.Article;
    1.10 -import org.sonews.daemon.storage.Database;
    1.11 +import org.sonews.storage.Article;
    1.12 +import org.sonews.storage.StorageBackendException;
    1.13 +import org.sonews.storage.StorageManager;
    1.14  
    1.15  /**
    1.16   * Controlls push and pull feeder.
    1.17 @@ -42,9 +42,9 @@
    1.18     * PullFeeder or PushFeeder.
    1.19     */
    1.20    public static synchronized void startFeeding()
    1.21 -    throws SQLException
    1.22 +    throws StorageBackendException
    1.23    {
    1.24 -    List<Subscription> subsPull = Database.getInstance()
    1.25 +    List<Subscription> subsPull = StorageManager.current()
    1.26        .getSubscriptions(TYPE_PULL);
    1.27      for(Subscription sub : subsPull)
    1.28      {
    1.29 @@ -52,7 +52,7 @@
    1.30      }
    1.31      pullFeeder.start();
    1.32      
    1.33 -    List<Subscription> subsPush = Database.getInstance()
    1.34 +    List<Subscription> subsPush = StorageManager.current()
    1.35        .getSubscriptions(TYPE_PUSH);
    1.36      for(Subscription sub : subsPush)
    1.37      {