r1108 - xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/feed

[Ludovic Dubost]

Author: ludovic
Date: 2006-07-31 20:10:53 +0200 (Mon, 31 Jul 2006)
New Revision: 1108

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/feed/FeedPlugin.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/feed/FeedPluginApi.java
Log:
Added apis to feedplugin to allow to ignore invalid feeds in multi feed interface

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/feed/FeedPlugin.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/feed/FeedPlugin.java	2006-07-31 15:30:24 UTC (rev 1107)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/feed/FeedPlugin.java	2006-07-31 18:10:53 UTC (rev 1108)
@@ -134,10 +134,14 @@
     }
 
     public SyndFeed getFeeds(String sfeeds, XWikiContext context) throws IOException {
-            return getFeeds(sfeeds, true, context);
+            return getFeeds(sfeeds, false, true, context);
     }
 
-    public SyndFeed getFeeds(String sfeeds, boolean ignoreInvalidFeeds, XWikiContext context) throws IOException {
+    public SyndFeed getFeeds(String sfeeds, boolean force, XWikiContext context) throws IOException {
+            return getFeeds(sfeeds, false, force, context);
+    }
+
+    public SyndFeed getFeeds(String sfeeds, boolean ignoreInvalidFeeds, boolean force, XWikiContext context) throws IOException {
         String[] feeds;
         if (sfeeds.indexOf("\n") != -1)
             feeds = sfeeds.split("\n");
@@ -163,7 +167,7 @@
         outputFeed.setEntries(entries);
         for (int i = 0; i < feeds.length; i++)
         {
-            SyndFeed feed = getFeed(feeds[i], ignoreInvalidFeeds, context);
+            SyndFeed feed = getFeed(feeds[i], ignoreInvalidFeeds, force, context);
             if (feed != null)
                 entries.addAll(feed.getEntries());
         }

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/feed/FeedPluginApi.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/feed/FeedPluginApi.java	2006-07-31 15:30:24 UTC (rev 1107)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/feed/FeedPluginApi.java	2006-07-31 18:10:53 UTC (rev 1108)
@@ -1,25 +1,25 @@
-/*
- * Copyright 2006, XpertNet SARL, and individual contributors as indicated
- * by the contributors.txt.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- * @author ludovic
- * @author sdumitriu
- */
+/*
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * @author ludovic
+ * @author sdumitriu
+ */
 
 package com.xpn.xwiki.plugin.feed;
 
@@ -49,6 +49,14 @@
         return plugin.getFeeds(sfeeds, context);
     }
 
+    public SyndFeed getFeeds(String sfeeds, boolean force) throws IOException {
+        return plugin.getFeeds(sfeeds, force, context);
+    }
+
+    public SyndFeed getFeeds(String sfeeds, boolean ignoreInvalidFeeds, boolean force) throws IOException {
+        return plugin.getFeeds(sfeeds, ignoreInvalidFeeds, force, context);
+    }
+
     public SyndFeed getFeed(String sfeed) throws IOException {
         return plugin.getFeed(sfeed, false, context);
     }