From b6e3a51be79efc04fdd643378f67b2f7d3bc5af4 Mon Sep 17 00:00:00 2001 From: Johannes Mockenhaupt Date: Fri, 3 Oct 2014 00:17:55 +0200 Subject: [PATCH] TIKA-1435: Upgrade Rome to 1.5 Adopt new namespace and enjoy generics. --- tika-parsers/pom.xml | 4 ++-- .../org/apache/tika/parser/feed/FeedParser.java | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml index db26b87c06a..fa3057e7e06 100644 --- a/tika-parsers/pom.xml +++ b/tika-parsers/pom.xml @@ -180,9 +180,9 @@ 1.1.0 - rome + com.rometools rome - 1.0 + 1.5.0 org.gagravarr diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java index fccb65973d0..9effc8a9d60 100644 --- a/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java +++ b/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java @@ -35,11 +35,11 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import com.sun.syndication.feed.synd.SyndContent; -import com.sun.syndication.feed.synd.SyndEntry; -import com.sun.syndication.feed.synd.SyndFeed; -import com.sun.syndication.io.FeedException; -import com.sun.syndication.io.SyndFeedInput; +import com.rometools.rome.feed.synd.SyndContent; +import com.rometools.rome.feed.synd.SyndEntry; +import com.rometools.rome.feed.synd.SyndFeed; +import com.rometools.rome.io.FeedException; +import com.rometools.rome.io.SyndFeedInput; /** * Feed parser. @@ -85,8 +85,7 @@ public void parse( xhtml.element("p", description); xhtml.startElement("ul"); - for (Object e : feed.getEntries()) { - SyndEntry entry = (SyndEntry) e; + for (SyndEntry entry : feed.getEntries()) { String link = entry.getLink(); if (link != null) { xhtml.startElement("li");