Updated to latest JDOM which supports generics
This commit is contained in:
parent
4e5f609053
commit
7cd1761fbd
44 changed files with 112 additions and 112 deletions
2
pom.xml
2
pom.xml
|
@ -85,7 +85,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jdom</groupId>
|
<groupId>org.jdom</groupId>
|
||||||
<artifactId>jdom</artifactId>
|
<artifactId>jdom</artifactId>
|
||||||
<version>1.1.3</version>
|
<version>2.0.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>junit</groupId>
|
<groupId>junit</groupId>
|
||||||
|
|
|
@ -18,7 +18,7 @@ package com.sun.syndication.io;
|
||||||
|
|
||||||
import com.sun.syndication.feed.module.Module;
|
import com.sun.syndication.feed.module.Module;
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.sun.syndication.feed.WireFeed;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
package com.sun.syndication.io;
|
package com.sun.syndication.io;
|
||||||
|
|
||||||
import com.sun.syndication.feed.module.Module;
|
import com.sun.syndication.feed.module.Module;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Parses module metadata from a XML node (JDOM element).
|
* Parses module metadata from a XML node (JDOM element).
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
*/
|
*/
|
||||||
package com.sun.syndication.io;
|
package com.sun.syndication.io;
|
||||||
|
|
||||||
import org.jdom.input.JDOMParseException;
|
import org.jdom2.input.JDOMParseException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Exception thrown by WireFeedInput instance if it can not parse a feed.
|
* Exception thrown by WireFeedInput instance if it can not parse a feed.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package com.sun.syndication.io;
|
package com.sun.syndication.io;
|
||||||
|
|
||||||
import org.jdom.JDOMException;
|
import org.jdom2.JDOMException;
|
||||||
import org.xml.sax.XMLReader;
|
import org.xml.sax.XMLReader;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -14,7 +14,7 @@ import org.xml.sax.XMLReader;
|
||||||
* Crimson is one parser which is known not to support these features.
|
* Crimson is one parser which is known not to support these features.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class SAXBuilder extends org.jdom.input.SAXBuilder {
|
public class SAXBuilder extends org.jdom2.input.SAXBuilder {
|
||||||
|
|
||||||
public SAXBuilder(boolean _validate) {
|
public SAXBuilder(boolean _validate) {
|
||||||
super(_validate);
|
super(_validate);
|
||||||
|
|
|
@ -18,7 +18,7 @@ package com.sun.syndication.io;
|
||||||
|
|
||||||
import com.sun.syndication.feed.synd.SyndFeed;
|
import com.sun.syndication.feed.synd.SyndFeed;
|
||||||
import com.sun.syndication.feed.synd.SyndFeedImpl;
|
import com.sun.syndication.feed.synd.SyndFeedImpl;
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
import org.xml.sax.InputSource;
|
import org.xml.sax.InputSource;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
package com.sun.syndication.io;
|
package com.sun.syndication.io;
|
||||||
|
|
||||||
import com.sun.syndication.feed.synd.SyndFeed;
|
import com.sun.syndication.feed.synd.SyndFeed;
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
|
@ -18,7 +18,7 @@ package com.sun.syndication.io;
|
||||||
|
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.sun.syndication.feed.WireFeed;
|
||||||
import com.sun.syndication.io.FeedException;
|
import com.sun.syndication.io.FeedException;
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generates an XML document (JDOM) out of a feed for a specific real feed type.
|
* Generates an XML document (JDOM) out of a feed for a specific real feed type.
|
||||||
|
|
|
@ -26,10 +26,10 @@ import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.WeakHashMap;
|
import java.util.WeakHashMap;
|
||||||
|
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
import org.jdom.JDOMException;
|
import org.jdom2.JDOMException;
|
||||||
import org.jdom.input.DOMBuilder;
|
import org.jdom2.input.DOMBuilder;
|
||||||
import org.jdom.input.JDOMParseException;
|
import org.jdom2.input.JDOMParseException;
|
||||||
import org.xml.sax.EntityResolver;
|
import org.xml.sax.EntityResolver;
|
||||||
import org.xml.sax.InputSource;
|
import org.xml.sax.InputSource;
|
||||||
import org.xml.sax.SAXNotRecognizedException;
|
import org.xml.sax.SAXNotRecognizedException;
|
||||||
|
@ -153,7 +153,7 @@ public class WireFeedInput {
|
||||||
/**
|
/**
|
||||||
* Builds an WireFeed (RSS or Atom) from a file.
|
* Builds an WireFeed (RSS or Atom) from a file.
|
||||||
* <p>
|
* <p>
|
||||||
* NOTE: This method delages to the 'AsbtractFeed WireFeedInput#build(org.jdom.Document)'.
|
* NOTE: This method delages to the 'AsbtractFeed WireFeedInput#build(org.jdom2.Document)'.
|
||||||
* <p>
|
* <p>
|
||||||
* @param file file to read to create the WireFeed.
|
* @param file file to read to create the WireFeed.
|
||||||
* @return the WireFeed read from the file.
|
* @return the WireFeed read from the file.
|
||||||
|
@ -177,7 +177,7 @@ public class WireFeedInput {
|
||||||
/**
|
/**
|
||||||
* Builds an WireFeed (RSS or Atom) from an Reader.
|
* Builds an WireFeed (RSS or Atom) from an Reader.
|
||||||
* <p>
|
* <p>
|
||||||
* NOTE: This method delages to the 'AsbtractFeed WireFeedInput#build(org.jdom.Document)'.
|
* NOTE: This method delages to the 'AsbtractFeed WireFeedInput#build(org.jdom2.Document)'.
|
||||||
* <p>
|
* <p>
|
||||||
* @param reader Reader to read to create the WireFeed.
|
* @param reader Reader to read to create the WireFeed.
|
||||||
* @return the WireFeed read from the Reader.
|
* @return the WireFeed read from the Reader.
|
||||||
|
@ -208,7 +208,7 @@ public class WireFeedInput {
|
||||||
/**
|
/**
|
||||||
* Builds an WireFeed (RSS or Atom) from an W3C SAX InputSource.
|
* Builds an WireFeed (RSS or Atom) from an W3C SAX InputSource.
|
||||||
* <p>
|
* <p>
|
||||||
* NOTE: This method delages to the 'AsbtractFeed WireFeedInput#build(org.jdom.Document)'.
|
* NOTE: This method delages to the 'AsbtractFeed WireFeedInput#build(org.jdom2.Document)'.
|
||||||
* <p>
|
* <p>
|
||||||
* @param is W3C SAX InputSource to read to create the WireFeed.
|
* @param is W3C SAX InputSource to read to create the WireFeed.
|
||||||
* @return the WireFeed read from the W3C SAX InputSource.
|
* @return the WireFeed read from the W3C SAX InputSource.
|
||||||
|
@ -236,7 +236,7 @@ public class WireFeedInput {
|
||||||
/**
|
/**
|
||||||
* Builds an WireFeed (RSS or Atom) from an W3C DOM document.
|
* Builds an WireFeed (RSS or Atom) from an W3C DOM document.
|
||||||
* <p>
|
* <p>
|
||||||
* NOTE: This method delages to the 'AsbtractFeed WireFeedInput#build(org.jdom.Document)'.
|
* NOTE: This method delages to the 'AsbtractFeed WireFeedInput#build(org.jdom2.Document)'.
|
||||||
* <p>
|
* <p>
|
||||||
* @param document W3C DOM document to read to create the WireFeed.
|
* @param document W3C DOM document to read to create the WireFeed.
|
||||||
* @return the WireFeed read from the W3C DOM document.
|
* @return the WireFeed read from the W3C DOM document.
|
||||||
|
@ -278,9 +278,9 @@ public class WireFeedInput {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates and sets up a org.jdom.input.SAXBuilder for parsing.
|
* Creates and sets up a org.jdom2.input.SAXBuilder for parsing.
|
||||||
*
|
*
|
||||||
* @return a new org.jdom.input.SAXBuilder object
|
* @return a new org.jdom2.input.SAXBuilder object
|
||||||
*/
|
*/
|
||||||
protected SAXBuilder createSAXBuilder() {
|
protected SAXBuilder createSAXBuilder() {
|
||||||
SAXBuilder saxBuilder = new SAXBuilder(_validate);
|
SAXBuilder saxBuilder = new SAXBuilder(_validate);
|
||||||
|
|
|
@ -18,11 +18,11 @@ package com.sun.syndication.io;
|
||||||
|
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.sun.syndication.feed.WireFeed;
|
||||||
import com.sun.syndication.io.impl.FeedGenerators;
|
import com.sun.syndication.io.impl.FeedGenerators;
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
import org.jdom.JDOMException;
|
import org.jdom2.JDOMException;
|
||||||
import org.jdom.output.DOMOutputter;
|
import org.jdom2.output.DOMOutputter;
|
||||||
import org.jdom.output.Format;
|
import org.jdom2.output.Format;
|
||||||
import org.jdom.output.XMLOutputter;
|
import org.jdom2.output.XMLOutputter;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.Writer;
|
import java.io.Writer;
|
||||||
|
|
|
@ -18,7 +18,7 @@ package com.sun.syndication.io;
|
||||||
|
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.sun.syndication.feed.WireFeed;
|
||||||
import com.sun.syndication.io.FeedException;
|
import com.sun.syndication.io.FeedException;
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Parses an XML document (JDOM) into a feed bean.
|
* Parses an XML document (JDOM) into a feed bean.
|
||||||
|
|
|
@ -19,11 +19,11 @@ package com.sun.syndication.io.impl;
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.sun.syndication.feed.WireFeed;
|
||||||
import com.sun.syndication.feed.atom.*;
|
import com.sun.syndication.feed.atom.*;
|
||||||
import com.sun.syndication.io.FeedException;
|
import com.sun.syndication.io.FeedException;
|
||||||
import org.jdom.Attribute;
|
import org.jdom2.Attribute;
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
import org.jdom.Namespace;
|
import org.jdom2.Namespace;
|
||||||
import org.jdom.input.SAXBuilder;
|
import org.jdom2.input.SAXBuilder;
|
||||||
|
|
||||||
import java.io.StringReader;
|
import java.io.StringReader;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
|
@ -19,10 +19,10 @@ package com.sun.syndication.io.impl;
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.sun.syndication.feed.WireFeed;
|
||||||
import com.sun.syndication.feed.atom.*;
|
import com.sun.syndication.feed.atom.*;
|
||||||
import com.sun.syndication.io.FeedException;
|
import com.sun.syndication.io.FeedException;
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
import org.jdom.Namespace;
|
import org.jdom2.Namespace;
|
||||||
import org.jdom.output.XMLOutputter;
|
import org.jdom2.output.XMLOutputter;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
|
@ -242,7 +242,7 @@ public class Atom03Parser extends BaseWireFeedParser {
|
||||||
List eContent = e.getContent();
|
List eContent = e.getContent();
|
||||||
Iterator i = eContent.iterator();
|
Iterator i = eContent.iterator();
|
||||||
while (i.hasNext()) {
|
while (i.hasNext()) {
|
||||||
org.jdom.Content c = (org.jdom.Content) i.next();
|
org.jdom2.Content c = (org.jdom2.Content) i.next();
|
||||||
if (c instanceof Element) {
|
if (c instanceof Element) {
|
||||||
Element eC = (Element) c;
|
Element eC = (Element) c;
|
||||||
if (eC.getNamespace().equals(getAtomNamespace())) {
|
if (eC.getNamespace().equals(getAtomNamespace())) {
|
||||||
|
|
|
@ -20,11 +20,11 @@ import java.io.StringReader;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.jdom.Attribute;
|
import org.jdom2.Attribute;
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
import org.jdom.Namespace;
|
import org.jdom2.Namespace;
|
||||||
import org.jdom.input.SAXBuilder;
|
import org.jdom2.input.SAXBuilder;
|
||||||
|
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.sun.syndication.feed.WireFeed;
|
||||||
import com.sun.syndication.feed.atom.Category;
|
import com.sun.syndication.feed.atom.Category;
|
||||||
|
@ -39,7 +39,7 @@ import com.sun.syndication.io.WireFeedOutput;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.Writer;
|
import java.io.Writer;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import org.jdom.output.XMLOutputter;
|
import org.jdom2.output.XMLOutputter;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Feed Generator for Atom
|
* Feed Generator for Atom
|
||||||
|
|
|
@ -20,10 +20,10 @@ import java.util.ArrayList;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
import org.jdom.Namespace;
|
import org.jdom2.Namespace;
|
||||||
import org.jdom.output.XMLOutputter;
|
import org.jdom2.output.XMLOutputter;
|
||||||
|
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.sun.syndication.feed.WireFeed;
|
||||||
import com.sun.syndication.feed.atom.Category;
|
import com.sun.syndication.feed.atom.Category;
|
||||||
|
@ -40,10 +40,10 @@ import java.io.IOException;
|
||||||
import java.io.Reader;
|
import java.io.Reader;
|
||||||
import java.net.MalformedURLException;
|
import java.net.MalformedURLException;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
import org.jdom.Attribute;
|
import org.jdom2.Attribute;
|
||||||
import org.jdom.JDOMException;
|
import org.jdom2.JDOMException;
|
||||||
import org.jdom.Parent;
|
import org.jdom2.Parent;
|
||||||
import org.jdom.input.SAXBuilder;
|
import org.jdom2.input.SAXBuilder;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Parser for Atom 1.0
|
* Parser for Atom 1.0
|
||||||
|
@ -323,7 +323,7 @@ public class Atom10Parser extends BaseWireFeedParser {
|
||||||
List eContent = e.getContent();
|
List eContent = e.getContent();
|
||||||
Iterator i = eContent.iterator();
|
Iterator i = eContent.iterator();
|
||||||
while (i.hasNext()) {
|
while (i.hasNext()) {
|
||||||
org.jdom.Content c = (org.jdom.Content) i.next();
|
org.jdom2.Content c = (org.jdom2.Content) i.next();
|
||||||
if (c instanceof Element) {
|
if (c instanceof Element) {
|
||||||
Element eC = (Element) c;
|
Element eC = (Element) c;
|
||||||
if (eC.getNamespace().equals(getAtomNamespace())) {
|
if (eC.getNamespace().equals(getAtomNamespace())) {
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
package com.sun.syndication.io.impl;
|
package com.sun.syndication.io.impl;
|
||||||
|
|
||||||
import com.sun.syndication.io.WireFeedGenerator;
|
import com.sun.syndication.io.WireFeedGenerator;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
import org.jdom.Namespace;
|
import org.jdom2.Namespace;
|
||||||
import org.jdom.Parent;
|
import org.jdom2.Parent;
|
||||||
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
|
|
@ -5,11 +5,11 @@ import com.sun.syndication.feed.module.Extendable;
|
||||||
import com.sun.syndication.io.WireFeedParser;
|
import com.sun.syndication.io.WireFeedParser;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.jdom.Namespace;
|
import org.jdom2.Namespace;
|
||||||
import org.jdom.Attribute;
|
import org.jdom2.Attribute;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Alejandro Abdelnur
|
* @author Alejandro Abdelnur
|
||||||
|
|
|
@ -20,9 +20,9 @@ import com.sun.syndication.feed.module.Module;
|
||||||
import com.sun.syndication.feed.module.DCModule;
|
import com.sun.syndication.feed.module.DCModule;
|
||||||
import com.sun.syndication.feed.module.DCSubject;
|
import com.sun.syndication.feed.module.DCSubject;
|
||||||
import com.sun.syndication.io.ModuleGenerator;
|
import com.sun.syndication.io.ModuleGenerator;
|
||||||
import org.jdom.Attribute;
|
import org.jdom2.Attribute;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
import org.jdom.Namespace;
|
import org.jdom2.Namespace;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
|
@ -23,9 +23,9 @@ import com.sun.syndication.feed.module.DCModule;
|
||||||
import com.sun.syndication.feed.module.DCSubject;
|
import com.sun.syndication.feed.module.DCSubject;
|
||||||
import com.sun.syndication.io.ModuleParser;
|
import com.sun.syndication.io.ModuleParser;
|
||||||
import com.sun.syndication.io.WireFeedParser;
|
import com.sun.syndication.io.WireFeedParser;
|
||||||
import org.jdom.Attribute;
|
import org.jdom2.Attribute;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
import org.jdom.Namespace;
|
import org.jdom2.Namespace;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
package com.sun.syndication.io.impl;
|
package com.sun.syndication.io.impl;
|
||||||
|
|
||||||
import com.sun.syndication.io.WireFeedParser;
|
import com.sun.syndication.io.WireFeedParser;
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -18,7 +18,7 @@ package com.sun.syndication.io.impl;
|
||||||
|
|
||||||
import com.sun.syndication.feed.module.Module;
|
import com.sun.syndication.feed.module.Module;
|
||||||
import com.sun.syndication.io.ModuleGenerator;
|
import com.sun.syndication.io.ModuleGenerator;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
|
@ -19,8 +19,8 @@ package com.sun.syndication.io.impl;
|
||||||
import com.sun.syndication.feed.module.Module;
|
import com.sun.syndication.feed.module.Module;
|
||||||
import com.sun.syndication.io.ModuleParser;
|
import com.sun.syndication.io.ModuleParser;
|
||||||
import com.sun.syndication.io.WireFeedParser;
|
import com.sun.syndication.io.WireFeedParser;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
import org.jdom.Namespace;
|
import org.jdom2.Namespace;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
|
@ -19,9 +19,9 @@ package com.sun.syndication.io.impl;
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.sun.syndication.feed.WireFeed;
|
||||||
import com.sun.syndication.feed.rss.*;
|
import com.sun.syndication.feed.rss.*;
|
||||||
import com.sun.syndication.io.FeedException;
|
import com.sun.syndication.io.FeedException;
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
import org.jdom.Namespace;
|
import org.jdom2.Namespace;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
|
@ -22,9 +22,9 @@ import com.sun.syndication.feed.rss.Image;
|
||||||
import com.sun.syndication.feed.rss.Item;
|
import com.sun.syndication.feed.rss.Item;
|
||||||
import com.sun.syndication.feed.rss.TextInput;
|
import com.sun.syndication.feed.rss.TextInput;
|
||||||
import com.sun.syndication.io.FeedException;
|
import com.sun.syndication.io.FeedException;
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
import org.jdom.Namespace;
|
import org.jdom2.Namespace;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
|
|
@ -16,9 +16,9 @@
|
||||||
*/
|
*/
|
||||||
package com.sun.syndication.io.impl;
|
package com.sun.syndication.io.impl;
|
||||||
|
|
||||||
import org.jdom.DocType;
|
import org.jdom2.DocType;
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Feed Generator for RSS 0.91
|
* Feed Generator for RSS 0.91
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
*/
|
*/
|
||||||
package com.sun.syndication.io.impl;
|
package com.sun.syndication.io.impl;
|
||||||
|
|
||||||
import org.jdom.*;
|
import org.jdom2.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -22,10 +22,10 @@ import com.sun.syndication.feed.rss.Image;
|
||||||
import com.sun.syndication.feed.rss.Item;
|
import com.sun.syndication.feed.rss.Item;
|
||||||
import com.sun.syndication.io.FeedException;
|
import com.sun.syndication.io.FeedException;
|
||||||
|
|
||||||
import org.jdom.Attribute;
|
import org.jdom2.Attribute;
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
import org.jdom.Namespace;
|
import org.jdom2.Namespace;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
|
@ -22,10 +22,10 @@ import com.sun.syndication.feed.rss.Content;
|
||||||
import com.sun.syndication.feed.rss.Description;
|
import com.sun.syndication.feed.rss.Description;
|
||||||
import com.sun.syndication.feed.rss.Image;
|
import com.sun.syndication.feed.rss.Image;
|
||||||
import com.sun.syndication.feed.rss.Item;
|
import com.sun.syndication.feed.rss.Item;
|
||||||
import org.jdom.Attribute;
|
import org.jdom2.Attribute;
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
import org.jdom.Namespace;
|
import org.jdom2.Namespace;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
|
|
|
@ -18,8 +18,8 @@ package com.sun.syndication.io.impl;
|
||||||
|
|
||||||
import com.sun.syndication.feed.rss.*;
|
import com.sun.syndication.feed.rss.*;
|
||||||
import com.sun.syndication.io.FeedException;
|
import com.sun.syndication.io.FeedException;
|
||||||
import org.jdom.Attribute;
|
import org.jdom2.Attribute;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ import com.sun.syndication.feed.rss.Description;
|
||||||
import com.sun.syndication.feed.rss.Enclosure;
|
import com.sun.syndication.feed.rss.Enclosure;
|
||||||
import com.sun.syndication.feed.rss.Item;
|
import com.sun.syndication.feed.rss.Item;
|
||||||
import com.sun.syndication.feed.rss.Source;
|
import com.sun.syndication.feed.rss.Source;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
package com.sun.syndication.io.impl;
|
package com.sun.syndication.io.impl;
|
||||||
|
|
||||||
import com.sun.syndication.feed.rss.Item;
|
import com.sun.syndication.feed.rss.Item;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
package com.sun.syndication.io.impl;
|
package com.sun.syndication.io.impl;
|
||||||
|
|
||||||
import com.sun.syndication.feed.rss.Item;
|
import com.sun.syndication.feed.rss.Item;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -18,8 +18,8 @@ package com.sun.syndication.io.impl;
|
||||||
|
|
||||||
import com.sun.syndication.feed.rss.Description;
|
import com.sun.syndication.feed.rss.Description;
|
||||||
import com.sun.syndication.feed.rss.Item;
|
import com.sun.syndication.feed.rss.Item;
|
||||||
import org.jdom.Attribute;
|
import org.jdom2.Attribute;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Feed Generator for RSS 0.94
|
* Feed Generator for RSS 0.94
|
||||||
|
|
|
@ -21,7 +21,7 @@ import com.sun.syndication.feed.rss.Channel;
|
||||||
import com.sun.syndication.feed.rss.Description;
|
import com.sun.syndication.feed.rss.Description;
|
||||||
import com.sun.syndication.feed.rss.Guid;
|
import com.sun.syndication.feed.rss.Guid;
|
||||||
import com.sun.syndication.feed.rss.Item;
|
import com.sun.syndication.feed.rss.Item;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
|
@ -20,8 +20,8 @@ import com.sun.syndication.feed.rss.Description;
|
||||||
import com.sun.syndication.feed.rss.Item;
|
import com.sun.syndication.feed.rss.Item;
|
||||||
import com.sun.syndication.feed.rss.Channel;
|
import com.sun.syndication.feed.rss.Channel;
|
||||||
import com.sun.syndication.io.FeedException;
|
import com.sun.syndication.io.FeedException;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
import org.jdom.Namespace;
|
import org.jdom2.Namespace;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
|
@ -21,9 +21,9 @@ import com.sun.syndication.feed.rss.Channel;
|
||||||
import com.sun.syndication.feed.rss.Content;
|
import com.sun.syndication.feed.rss.Content;
|
||||||
import com.sun.syndication.feed.rss.Description;
|
import com.sun.syndication.feed.rss.Description;
|
||||||
import com.sun.syndication.feed.rss.Item;
|
import com.sun.syndication.feed.rss.Item;
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
import org.jdom.Namespace;
|
import org.jdom2.Namespace;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ import com.sun.syndication.feed.rss.Category;
|
||||||
import com.sun.syndication.feed.rss.Channel;
|
import com.sun.syndication.feed.rss.Channel;
|
||||||
import com.sun.syndication.feed.rss.Guid;
|
import com.sun.syndication.feed.rss.Guid;
|
||||||
import com.sun.syndication.feed.rss.Item;
|
import com.sun.syndication.feed.rss.Item;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
|
@ -17,9 +17,9 @@
|
||||||
package com.sun.syndication.io.impl;
|
package com.sun.syndication.io.impl;
|
||||||
|
|
||||||
import com.sun.syndication.feed.rss.Description;
|
import com.sun.syndication.feed.rss.Description;
|
||||||
import org.jdom.Attribute;
|
import org.jdom2.Attribute;
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -16,9 +16,9 @@
|
||||||
*/
|
*/
|
||||||
package com.sun.syndication.io.impl;
|
package com.sun.syndication.io.impl;
|
||||||
|
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
import org.jdom.Namespace;
|
import org.jdom2.Namespace;
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.sun.syndication.feed.WireFeed;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -19,8 +19,8 @@ package com.sun.syndication.io.impl;
|
||||||
import com.sun.syndication.feed.module.Module;
|
import com.sun.syndication.feed.module.Module;
|
||||||
import com.sun.syndication.feed.module.SyModule;
|
import com.sun.syndication.feed.module.SyModule;
|
||||||
import com.sun.syndication.io.ModuleGenerator;
|
import com.sun.syndication.io.ModuleGenerator;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
import org.jdom.Namespace;
|
import org.jdom2.Namespace;
|
||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
|
|
@ -20,8 +20,8 @@ import com.sun.syndication.feed.module.Module;
|
||||||
import com.sun.syndication.feed.module.SyModule;
|
import com.sun.syndication.feed.module.SyModule;
|
||||||
import com.sun.syndication.feed.module.SyModuleImpl;
|
import com.sun.syndication.feed.module.SyModuleImpl;
|
||||||
import com.sun.syndication.io.ModuleParser;
|
import com.sun.syndication.io.ModuleParser;
|
||||||
import org.jdom.Element;
|
import org.jdom2.Element;
|
||||||
import org.jdom.Namespace;
|
import org.jdom2.Namespace;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -11,8 +11,8 @@ import java.io.InputStreamReader;
|
||||||
import java.io.Reader;
|
import java.io.Reader;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
|
|
||||||
import org.jdom.Document;
|
import org.jdom2.Document;
|
||||||
import org.jdom.input.SAXBuilder;
|
import org.jdom2.input.SAXBuilder;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author pat, tucu
|
* @author pat, tucu
|
||||||
|
|
|
@ -19,7 +19,7 @@ package com.sun.syndication.unittest;
|
||||||
import com.sun.syndication.io.XmlReader;
|
import com.sun.syndication.io.XmlReader;
|
||||||
import com.sun.syndication.io.impl.XmlFixerReader;
|
import com.sun.syndication.io.impl.XmlFixerReader;
|
||||||
import junit.framework.TestCase;
|
import junit.framework.TestCase;
|
||||||
import org.jdom.input.SAXBuilder;
|
import org.jdom2.input.SAXBuilder;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ import com.sun.syndication.io.impl.XmlFixerReader;
|
||||||
import com.sun.syndication.io.XmlReader;
|
import com.sun.syndication.io.XmlReader;
|
||||||
import com.sun.syndication.unittest.SyndFeedTest;
|
import com.sun.syndication.unittest.SyndFeedTest;
|
||||||
|
|
||||||
import org.jdom.input.SAXBuilder;
|
import org.jdom2.input.SAXBuilder;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.ByteArrayInputStream;
|
import java.io.ByteArrayInputStream;
|
||||||
|
|
Loading…
Reference in a new issue