- * + * * @return the real feed type. * @see WireFeed for details on the format of this string. *
@@ -39,9 +39,10 @@ public class ConverterForOPML20 extends ConverterForOPML10 { *
* It assumes the given SyndFeedImpl has no properties set. *
- * + * * @param feed real feed to copy/convert. - * @param syndFeed the SyndFeedImpl that will contain the copied/converted values of the real feed. + * @param syndFeed the SyndFeedImpl that will contain the copied/converted values of the real + * feed. */ @Override public void copyInto(final WireFeed feed, final SyndFeed syndFeed) { @@ -51,7 +52,7 @@ public class ConverterForOPML20 extends ConverterForOPML10 { /** * Creates real feed with a deep copy/conversion of the values of a SyndFeedImpl. *
- * + * * @param syndFeed SyndFeedImpl to copy/convert value from. * @return a real feed with copied/converted values of the SyndFeedImpl. */ diff --git a/src/main/java/com/sun/syndication/io/impl/OPML10Generator.java b/src/main/java/com/sun/syndication/io/impl/OPML10Generator.java index 4ed5b07..d4f7f73 100644 --- a/src/main/java/com/sun/syndication/io/impl/OPML10Generator.java +++ b/src/main/java/com/sun/syndication/io/impl/OPML10Generator.java @@ -52,7 +52,8 @@ public class OPML10Generator extends BaseWireFeedGenerator implements WireFeedGe * * @param feed the feed bean to generate the XML document from. * @return the generated XML document (JDOM). - * @throws IllegalArgumentException thrown if the type of the given feed bean does not match with the type of the WireFeedGenerator. + * @throws IllegalArgumentException thrown if the type of the given feed bean does not match + * with the type of the WireFeedGenerator. * @throws FeedException thrown if the XML Document could not be created. */ @Override diff --git a/src/main/java/com/sun/syndication/io/impl/OPML20Generator.java b/src/main/java/com/sun/syndication/io/impl/OPML20Generator.java index c88826e..b75eac9 100644 --- a/src/main/java/com/sun/syndication/io/impl/OPML20Generator.java +++ b/src/main/java/com/sun/syndication/io/impl/OPML20Generator.java @@ -19,7 +19,7 @@ import com.sun.syndication.feed.opml.Outline; import com.sun.syndication.io.FeedException; /** - * + * * @author cooper */ public class OPML20Generator extends OPML10Generator { @@ -30,7 +30,7 @@ public class OPML20Generator extends OPML10Generator { /** * Returns the type of feed the generator creates. *
- * + * * @return the type of feed the generator creates. * @see WireFeed for details on the format of this string. *
@@ -43,10 +43,11 @@ public class OPML20Generator extends OPML10Generator { /** * Creates an XML document (JDOM) for the given feed bean. *
- * + * * @param feed the feed bean to generate the XML document from. * @return the generated XML document (JDOM). - * @throws IllegalArgumentException thrown if the type of the given feed bean does not match with the type of the WireFeedGenerator. + * @throws IllegalArgumentException thrown if the type of the given feed bean does not match + * with the type of the WireFeedGenerator. * @throws FeedException thrown if the XML Document could not be created. */ @Override diff --git a/src/main/java/com/sun/syndication/io/impl/OPML20Parser.java b/src/main/java/com/sun/syndication/io/impl/OPML20Parser.java index 089f686..7de2bc5 100644 --- a/src/main/java/com/sun/syndication/io/impl/OPML20Parser.java +++ b/src/main/java/com/sun/syndication/io/impl/OPML20Parser.java @@ -54,7 +54,7 @@ public class OPML20Parser extends OPML10Parser { if (e.getName().equals("opml") && (e.getChild("head") != null && e.getChild("head").getChild("docs") != null || e.getAttributeValue("version") != null - && e.getAttributeValue("version").equals("2.0") || e.getChild("head") != null && e.getChild("head").getChild("ownerId") != null)) { + && e.getAttributeValue("version").equals("2.0") || e.getChild("head") != null && e.getChild("head").getChild("ownerId") != null)) { return true; } diff --git a/src/test/java/com/sun/syndication/FeedOpsTest.java b/src/test/java/com/sun/syndication/FeedOpsTest.java index 2e1ddb0..65cb058 100644 --- a/src/test/java/com/sun/syndication/FeedOpsTest.java +++ b/src/test/java/com/sun/syndication/FeedOpsTest.java @@ -11,11 +11,11 @@ import com.sun.syndication.feed.synd.SyndFeed; import com.sun.syndication.feed.synd.SyndFeedImpl; /** - * + * *
- *
+ *
* @author Alejandro Abdelnur
- *
+ *
*/
public abstract class FeedOpsTest extends FeedTest {
diff --git a/src/test/java/com/sun/syndication/SyndFeedTest.java b/src/test/java/com/sun/syndication/SyndFeedTest.java
index 6020a8e..19341f2 100644
--- a/src/test/java/com/sun/syndication/SyndFeedTest.java
+++ b/src/test/java/com/sun/syndication/SyndFeedTest.java
@@ -2,7 +2,7 @@ package com.sun.syndication;
/**
* @author pat
- *
+ *
*/
public abstract class SyndFeedTest extends FeedTest {
private String _prefix = null;
@@ -29,100 +29,100 @@ public abstract class SyndFeedTest extends FeedTest {
}
/*
- * public void testType() throws Exception { assertEquals(getPrefix(), getCachedSyndFeed().getFeedType()); }
- *
- * public void testTitle() throws Exception { assertEqualsStr("channel.title", getCachedSyndFeed().getTitle()); }
- *
- * public void testLink() throws Exception { assertEqualsStr("channel.link", getCachedSyndFeed().getLink()); }
- *
- * public void testDescription() throws Exception { assertEqualsStr("channel.description", getCachedSyndFeed().getDescription()); }
- *
- * public void testLanguage() throws Exception { assertEqualsStr("channel.language", getCachedSyndFeed().getLanguage()); }
- *
- * public void testCategories() throws Exception { List catlist = getCachedSyndFeed().getCategories(); //don't understand why this one fails assertEquals(2,
- * catlist.size()); SyndCategory cat = (SyndCategory)catlist.get(0); assertEqualsStr("channel.category[0]", cat.getName());
- * assertEqualsStr("channel.category[0]^domain", cat.getTaxonomyUri()); cat = (SyndCategory)catlist.get(1); assertEqualsStr("channel.category[1]",
- * cat.getName()); assertEqualsStr("channel.category[1]^domain", cat.getTaxonomyUri()); }
- *
- * public void testPublishedDate() throws Exception { assertEquals(DateParser.parseRFC822("Mon, 01 Jan 2001 00:00:00 GMT"),
- * getCachedSyndFeed().getPublishedDate()); }
- *
- * //how do i get height and width? public void testImage() throws Exception { SyndImage img = getCachedSyndFeed().getImage();
- * assertEqualsStr("channel.image.description", img.getDescription()); assertEqualsStr("channel.image.link", img.getLink());
- * assertEqualsStr("channel.image.title", img.getTitle()); assertEqualsStr("channel.image.url", img.getUrl()); }
- *
- * public void testEntries() throws Exception { List entrylist = getCachedSyndFeed().getEntries(); assertEquals(2, entrylist.size()); }
- *
- * public void testEntryTitle() throws Exception { assertEqualsStr("channel.item[0].title", getEntryTitle(getCachedSyndFeed().getEntries().get(0)));
- * assertEqualsStr("channel.item[1].title", getEntryTitle(getCachedSyndFeed().getEntries().get(1))); }
- *
- * public String getEntryTitle(Object o) throws Exception { SyndEntry e = (SyndEntry) o; return e.getTitle(); }
- *
- * public void testEntryDescription() throws Exception { assertEqualsStr("channel.item[0].description",
- * getEntryDescription(getCachedSyndFeed().getEntries().get(0))); assertEqualsStr("channel.item[1].description",
- * getEntryDescription(getCachedSyndFeed().getEntries().get(1))); }
- *
- * public String getEntryDescription(Object o) throws Exception { SyndEntry e = (SyndEntry) o; return e.getDescription().getValue(); }
- *
- * public void testEntryLink() throws Exception { assertEqualsStr("channel.item[0].link", getEntryLink(getCachedSyndFeed().getEntries().get(0)));
- * assertEqualsStr("channel.item[1].link", getEntryLink(getCachedSyndFeed().getEntries().get(1))); }
- *
- * public String getEntryLink(Object o) { SyndEntry e = (SyndEntry) o; return e.getLink(); }
- *
- * public void testEntryPublishedDate() throws Exception { assertEquals(DateParser.parseRFC822("Mon, 01 Jan 2001 00:00:00 GMT"),
- * getEntryPublishedDate(getCachedSyndFeed().getEntries().get(0))); assertEquals(DateParser.parseRFC822("Mon, 01 Jan 2001 00:00:00 GMT"),
- * getEntryPublishedDate(getCachedSyndFeed().getEntries().get(1))); }
- *
- * public Date getEntryPublishedDate(Object o) { SyndEntry e = (SyndEntry) o; return e.getPublishedDate(); }
- *
- * public void testEntryCategories() throws Exception { SyndEntry e = (SyndEntry)getCachedSyndFeed().getEntries().get(0); List catlist = e.getCategories();
- * //don't understand why this one fails assertEquals(2, catlist.size()); SyndCategory cat = (SyndCategory)catlist.get(0);
- * assertEqualsStr("channel.item[0].category[0]", cat.getName()); assertEqualsStr("channel.item[0].category[0]^domain", cat.getTaxonomyUri()); cat =
- * (SyndCategory)catlist.get(1); assertEqualsStr("channel.item[0].category[1]", cat.getName()); assertEqualsStr("channel.item[0].category[1]^domain",
- * cat.getTaxonomyUri()); //DO 2nd set of items }
- *
- * public void testEntryAuthor() throws Exception { assertEqualsStr("channel.item[0].author", getEntryAuthor(getCachedSyndFeed().getEntries().get(0)));
- * assertEqualsStr("channel.item[1].author", getEntryAuthor(getCachedSyndFeed().getEntries().get(1))); }
- *
- * public String getEntryAuthor(Object o) { SyndEntry e = (SyndEntry) o; return e.getAuthor(); }
+ * public void testType() throws Exception { assertEquals(getPrefix(),
+ * getCachedSyndFeed().getFeedType()); } public void testTitle() throws Exception {
+ * assertEqualsStr("channel.title", getCachedSyndFeed().getTitle()); } public void testLink()
+ * throws Exception { assertEqualsStr("channel.link", getCachedSyndFeed().getLink()); } public
+ * void testDescription() throws Exception { assertEqualsStr("channel.description",
+ * getCachedSyndFeed().getDescription()); } public void testLanguage() throws Exception {
+ * assertEqualsStr("channel.language", getCachedSyndFeed().getLanguage()); } public void
+ * testCategories() throws Exception { List catlist = getCachedSyndFeed().getCategories();
+ * //don't understand why this one fails assertEquals(2, catlist.size()); SyndCategory cat =
+ * (SyndCategory)catlist.get(0); assertEqualsStr("channel.category[0]", cat.getName());
+ * assertEqualsStr("channel.category[0]^domain", cat.getTaxonomyUri()); cat =
+ * (SyndCategory)catlist.get(1); assertEqualsStr("channel.category[1]", cat.getName());
+ * assertEqualsStr("channel.category[1]^domain", cat.getTaxonomyUri()); } public void
+ * testPublishedDate() throws Exception {
+ * assertEquals(DateParser.parseRFC822("Mon, 01 Jan 2001 00:00:00 GMT"),
+ * getCachedSyndFeed().getPublishedDate()); } //how do i get height and width? public void
+ * testImage() throws Exception { SyndImage img = getCachedSyndFeed().getImage();
+ * assertEqualsStr("channel.image.description", img.getDescription());
+ * assertEqualsStr("channel.image.link", img.getLink()); assertEqualsStr("channel.image.title",
+ * img.getTitle()); assertEqualsStr("channel.image.url", img.getUrl()); } public void
+ * testEntries() throws Exception { List entrylist = getCachedSyndFeed().getEntries();
+ * assertEquals(2, entrylist.size()); } public void testEntryTitle() throws Exception {
+ * assertEqualsStr("channel.item[0].title",
+ * getEntryTitle(getCachedSyndFeed().getEntries().get(0)));
+ * assertEqualsStr("channel.item[1].title",
+ * getEntryTitle(getCachedSyndFeed().getEntries().get(1))); } public String getEntryTitle(Object
+ * o) throws Exception { SyndEntry e = (SyndEntry) o; return e.getTitle(); } public void
+ * testEntryDescription() throws Exception { assertEqualsStr("channel.item[0].description",
+ * getEntryDescription(getCachedSyndFeed().getEntries().get(0)));
+ * assertEqualsStr("channel.item[1].description",
+ * getEntryDescription(getCachedSyndFeed().getEntries().get(1))); } public String
+ * getEntryDescription(Object o) throws Exception { SyndEntry e = (SyndEntry) o; return
+ * e.getDescription().getValue(); } public void testEntryLink() throws Exception {
+ * assertEqualsStr("channel.item[0].link",
+ * getEntryLink(getCachedSyndFeed().getEntries().get(0)));
+ * assertEqualsStr("channel.item[1].link",
+ * getEntryLink(getCachedSyndFeed().getEntries().get(1))); } public String getEntryLink(Object
+ * o) { SyndEntry e = (SyndEntry) o; return e.getLink(); } public void testEntryPublishedDate()
+ * throws Exception { assertEquals(DateParser.parseRFC822("Mon, 01 Jan 2001 00:00:00 GMT"),
+ * getEntryPublishedDate(getCachedSyndFeed().getEntries().get(0)));
+ * assertEquals(DateParser.parseRFC822("Mon, 01 Jan 2001 00:00:00 GMT"),
+ * getEntryPublishedDate(getCachedSyndFeed().getEntries().get(1))); } public Date
+ * getEntryPublishedDate(Object o) { SyndEntry e = (SyndEntry) o; return e.getPublishedDate(); }
+ * public void testEntryCategories() throws Exception { SyndEntry e =
+ * (SyndEntry)getCachedSyndFeed().getEntries().get(0); List catlist = e.getCategories(); //don't
+ * understand why this one fails assertEquals(2, catlist.size()); SyndCategory cat =
+ * (SyndCategory)catlist.get(0); assertEqualsStr("channel.item[0].category[0]", cat.getName());
+ * assertEqualsStr("channel.item[0].category[0]^domain", cat.getTaxonomyUri()); cat =
+ * (SyndCategory)catlist.get(1); assertEqualsStr("channel.item[0].category[1]", cat.getName());
+ * assertEqualsStr("channel.item[0].category[1]^domain", cat.getTaxonomyUri()); //DO 2nd set of
+ * items } public void testEntryAuthor() throws Exception {
+ * assertEqualsStr("channel.item[0].author",
+ * getEntryAuthor(getCachedSyndFeed().getEntries().get(0)));
+ * assertEqualsStr("channel.item[1].author",
+ * getEntryAuthor(getCachedSyndFeed().getEntries().get(1))); } public String
+ * getEntryAuthor(Object o) { SyndEntry e = (SyndEntry) o; return e.getAuthor(); }
*/
/*
- * //things you cannot get from SyndEntryImpl //