From 7b8c9259d0693b57d3d1f2aa38824e2869f39b9f Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Mon, 7 Oct 2013 21:11:47 +0200 Subject: [PATCH] Updated classes to use JDOM 2 Fixed tests Formatted code --- cleanup.xml | 56 + formatter.xml | 291 ++ .../activitystreams/ActivityStreamModule.java | 7 +- .../ActivityStreamModuleImpl.java | 29 +- .../activitystreams/types/ActivityObject.java | 19 +- .../module/activitystreams/types/Article.java | 50 +- .../module/activitystreams/types/Audio.java | 64 +- .../activitystreams/types/Bookmark.java | 118 +- .../module/activitystreams/types/Comment.java | 58 +- .../module/activitystreams/types/Event.java | 47 +- .../module/activitystreams/types/File.java | 55 +- .../module/activitystreams/types/Folder.java | 41 +- .../module/activitystreams/types/Group.java | 16 +- .../activitystreams/types/HasLocation.java | 118 +- .../module/activitystreams/types/List.java | 21 +- .../module/activitystreams/types/Mood.java | 54 +- .../module/activitystreams/types/Note.java | 54 +- .../module/activitystreams/types/Person.java | 73 +- .../module/activitystreams/types/Photo.java | 47 +- .../activitystreams/types/PhotoAlbum.java | 36 +- .../module/activitystreams/types/Place.java | 43 +- .../activitystreams/types/Playlist.java | 21 +- .../module/activitystreams/types/Product.java | 46 +- .../module/activitystreams/types/Review.java | 68 +- .../module/activitystreams/types/Service.java | 42 +- .../module/activitystreams/types/Song.java | 41 +- .../module/activitystreams/types/Status.java | 34 +- .../module/activitystreams/types/Verb.java | 194 +- .../module/activitystreams/types/Video.java | 45 +- .../feed/module/atomthread/ThreadModule.java | 2 +- .../rometools/feed/module/base/Article.java | 415 +- .../rometools/feed/module/base/Course.java | 709 ++-- .../rometools/feed/module/base/CustomTag.java | 139 +- .../feed/module/base/CustomTagImpl.java | 228 +- .../feed/module/base/CustomTags.java | 11 +- .../feed/module/base/CustomTagsImpl.java | 45 +- .../org/rometools/feed/module/base/Event.java | 1782 ++++---- .../feed/module/base/GlobalInterface.java | 812 ++-- .../feed/module/base/GoogleBase.java | 17 +- .../feed/module/base/GoogleBaseImpl.java | 425 +- .../rometools/feed/module/base/Housing.java | 1999 +++++---- .../org/rometools/feed/module/base/Job.java | 1136 +++--- .../rometools/feed/module/base/Person.java | 1158 +++--- .../rometools/feed/module/base/Product.java | 3611 ++++++++--------- .../rometools/feed/module/base/Review.java | 990 +++-- .../feed/module/base/ScholarlyArticle.java | 520 ++- .../rometools/feed/module/base/Service.java | 1636 ++++---- .../rometools/feed/module/base/Travel.java | 1710 ++++---- .../rometools/feed/module/base/Unknown.java | 9 +- .../feed/module/base/ValidationException.java | 15 +- .../rometools/feed/module/base/Vehicle.java | 2192 +++++----- .../rometools/feed/module/base/Wanted.java | 389 +- .../module/base/io/CustomTagGenerator.java | 114 +- .../feed/module/base/io/CustomTagParser.java | 161 +- .../module/base/io/GoogleBaseGenerator.java | 182 +- .../feed/module/base/io/GoogleBaseParser.java | 185 +- .../feed/module/base/types/CloneableType.java | 2 +- .../base/types/CurrencyEnumeration.java | 367 +- .../feed/module/base/types/DateTimeRange.java | 63 +- .../feed/module/base/types/FloatUnit.java | 78 +- .../module/base/types/GenderEnumeration.java | 19 +- .../feed/module/base/types/IntUnit.java | 63 +- .../base/types/PaymentTypeEnumeration.java | 10 +- .../base/types/PriceTypeEnumeration.java | 16 +- .../feed/module/base/types/ShippingType.java | 56 +- .../feed/module/base/types/ShortDate.java | 17 +- .../feed/module/base/types/Size.java | 56 +- .../feed/module/base/types/YearType.java | 41 +- .../feed/module/cc/CreativeCommons.java | 15 +- .../feed/module/cc/CreativeCommonsImpl.java | 79 +- .../feed/module/cc/io/CCModuleGenerator.java | 146 +- .../feed/module/cc/io/ModuleParserRSS1.java | 142 +- .../feed/module/cc/io/ModuleParserRSS2.java | 123 +- .../feed/module/cc/types/License.java | 249 +- .../feed/module/content/ContentItem.java | 117 +- .../feed/module/content/ContentModule.java | 32 +- .../module/content/ContentModuleImpl.java | 38 +- .../content/io/ContentModuleGenerator.java | 83 +- .../content/io/ContentModuleParser.java | 62 +- .../feed/module/feedburner/FeedBurner.java | 18 +- .../module/feedburner/FeedBurnerImpl.java | 81 +- .../io/FeedBurnerModuleGenerator.java | 34 +- .../feedburner/io/FeedBurnerModuleParser.java | 18 +- .../feed/module/georss/GMLGenerator.java | 156 +- .../feed/module/georss/GMLModuleImpl.java | 26 +- .../feed/module/georss/GMLParser.java | 135 +- .../feed/module/georss/GeoRSSModule.java | 124 +- .../feed/module/georss/GeoRSSPoint.java | 61 +- .../feed/module/georss/GeoRSSUtils.java | 147 +- .../feed/module/georss/SimpleGenerator.java | 77 +- .../feed/module/georss/SimpleModuleImpl.java | 7 +- .../feed/module/georss/SimpleParser.java | 87 +- .../feed/module/georss/W3CGeoGenerator.java | 40 +- .../feed/module/georss/W3CGeoModuleImpl.java | 27 +- .../feed/module/georss/W3CGeoParser.java | 62 +- .../georss/geometries/AbstractCurve.java | 5 +- .../AbstractGeometricPrimitive.java | 9 +- .../georss/geometries/AbstractGeometry.java | 17 +- .../georss/geometries/AbstractRing.java | 6 +- .../georss/geometries/AbstractSurface.java | 5 +- .../module/georss/geometries/Envelope.java | 44 +- .../module/georss/geometries/LineString.java | 45 +- .../module/georss/geometries/LinearRing.java | 46 +- .../feed/module/georss/geometries/Point.java | 47 +- .../module/georss/geometries/Polygon.java | 100 +- .../module/georss/geometries/Position.java | 47 +- .../georss/geometries/PositionList.java | 116 +- .../module/itunes/AbstractITunesObject.java | 61 +- .../feed/module/itunes/EntryInformation.java | 10 +- .../module/itunes/EntryInformationImpl.java | 36 +- .../feed/module/itunes/FeedInformation.java | 19 +- .../module/itunes/FeedInformationImpl.java | 72 +- .../rometools/feed/module/itunes/ITunes.java | 41 +- .../module/itunes/io/ITunesGenerator.java | 72 +- .../feed/module/itunes/io/ITunesParser.java | 179 +- .../itunes/io/ITunesParserOldNamespace.java | 10 +- .../feed/module/itunes/types/Category.java | 38 +- .../feed/module/itunes/types/Duration.java | 68 +- .../feed/module/itunes/types/Subcategory.java | 24 +- .../module/mediarss/MediaEntryModule.java | 4 +- .../module/mediarss/MediaEntryModuleImpl.java | 58 +- .../feed/module/mediarss/MediaModule.java | 13 +- .../feed/module/mediarss/MediaModuleImpl.java | 34 +- .../io/AlternateMediaModuleParser.java | 13 +- .../mediarss/io/MediaModuleGenerator.java | 211 +- .../module/mediarss/io/MediaModuleParser.java | 428 +- .../module/mediarss/io/RSS20YahooParser.java | 52 +- .../mediarss/types/AbstractSchemeValue.java | 16 +- .../feed/module/mediarss/types/Category.java | 65 +- .../feed/module/mediarss/types/Credit.java | 75 +- .../module/mediarss/types/Expression.java | 15 +- .../feed/module/mediarss/types/Hash.java | 50 +- .../module/mediarss/types/MediaContent.java | 338 +- .../module/mediarss/types/MediaGroup.java | 66 +- .../feed/module/mediarss/types/Metadata.java | 894 ++-- .../mediarss/types/PlayerReference.java | 63 +- .../feed/module/mediarss/types/Rating.java | 56 +- .../feed/module/mediarss/types/Reference.java | 9 +- .../module/mediarss/types/Restriction.java | 105 +- .../feed/module/mediarss/types/Text.java | 85 +- .../feed/module/mediarss/types/Thumbnail.java | 95 +- .../feed/module/mediarss/types/Time.java | 44 +- .../module/mediarss/types/UrlReference.java | 50 +- .../module/opensearch/OpenSearchModule.java | 10 +- .../module/opensearch/OpenSearchResponse.java | 144 +- .../RequiredAttributeMissingException.java | 24 +- .../module/opensearch/entity/OSQuery.java | 205 +- .../impl/OpenSearchModuleGenerator.java | 140 +- .../opensearch/impl/OpenSearchModuleImpl.java | 46 +- .../impl/OpenSearchModuleParser.java | 283 +- .../module/photocast/PhotocastModule.java | 23 +- .../module/photocast/PhotocastModuleImpl.java | 72 +- .../feed/module/photocast/io/Generator.java | 67 +- .../feed/module/photocast/io/Parser.java | 110 +- .../feed/module/photocast/types/Metadata.java | 34 +- .../module/photocast/types/PhotoDate.java | 69 +- .../portablecontacts/ContactModule.java | 2 +- .../portablecontacts/types/Address.java | 2 +- .../rometools/feed/module/slash/Slash.java | 31 +- .../feed/module/slash/SlashImpl.java | 62 +- .../module/slash/io/SlashModuleGenerator.java | 93 +- .../module/slash/io/SlashModuleParser.java | 89 +- .../feed/module/sle/SimpleListExtension.java | 28 +- .../module/sle/SimpleListExtensionImpl.java | 34 +- .../rometools/feed/module/sle/SleEntry.java | 23 +- .../feed/module/sle/SleEntryImpl.java | 112 +- .../rometools/feed/module/sle/SleUtility.java | 145 +- .../feed/module/sle/io/ItemParser.java | 103 +- .../module/sle/io/LabelNamespaceElement.java | 40 +- .../feed/module/sle/io/ModuleGenerator.java | 55 +- .../feed/module/sle/io/ModuleParser.java | 121 +- .../feed/module/sle/types/DateValue.java | 50 +- .../feed/module/sle/types/EntryValue.java | 11 +- .../feed/module/sle/types/Group.java | 61 +- .../feed/module/sle/types/NumberValue.java | 37 +- .../rometools/feed/module/sle/types/Sort.java | 89 +- .../feed/module/sle/types/StringValue.java | 41 +- .../feed/module/sse/SSE091Generator.java | 92 +- .../feed/module/sse/SSE091Parser.java | 155 +- .../feed/module/sse/modules/Conflict.java | 36 +- .../feed/module/sse/modules/Conflicts.java | 3 +- .../feed/module/sse/modules/History.java | 54 +- .../feed/module/sse/modules/Related.java | 64 +- .../feed/module/sse/modules/SSEModule.java | 21 +- .../feed/module/sse/modules/Sharing.java | 79 +- .../feed/module/sse/modules/Sync.java | 84 +- .../feed/module/sse/modules/Update.java | 44 +- .../yahooweather/YWeatherEntryModule.java | 6 +- .../yahooweather/YWeatherFeedModule.java | 12 +- .../module/yahooweather/YWeatherModule.java | 3 +- .../yahooweather/YWeatherModuleImpl.java | 58 +- .../io/WeatherModuleGenerator.java | 159 +- .../yahooweather/io/WeatherModuleParser.java | 149 +- .../module/yahooweather/types/Astronomy.java | 45 +- .../module/yahooweather/types/Atmosphere.java | 91 +- .../module/yahooweather/types/Condition.java | 73 +- .../yahooweather/types/ConditionCode.java | 605 ++- .../module/yahooweather/types/Forecast.java | 104 +- .../module/yahooweather/types/Location.java | 43 +- .../feed/module/yahooweather/types/Units.java | 64 +- .../feed/module/yahooweather/types/Wind.java | 58 +- .../feed/module/AbstractTestCase.java | 83 +- .../feed/module/ITunesGeneratorTest.java | 49 +- .../feed/module/MediaModuleTest.java | 191 +- .../activitystreams/types/VerbTest.java | 12 +- .../base/io/CustomTagGeneratorTest.java | 85 +- .../module/base/io/CustomTagParserTest.java | 123 +- .../base/io/GoogleBaseGeneratorTest.java | 67 +- .../module/base/io/GoogleBaseParserTest.java | 642 +-- .../feed/module/base/types/FloatUnitTest.java | 46 +- .../feed/module/base/types/IntUnitTest.java | 46 +- .../module/cc/io/CCModuleGeneratorTest.java | 84 +- .../feed/module/cc/io/ModuleParserTest.java | 78 +- .../feed/module/content/ContentItemTest.java | 101 +- .../content/ContentModuleGeneratorTest.java | 31 +- .../module/content/ContentModuleImplTest.java | 113 +- .../content/ContentModuleParserTest.java | 41 +- .../rometools/feed/module/georss/RssTest.java | 281 +- .../module/itunes/ITunesGeneratorTest.java | 95 +- .../feed/module/itunes/ITunesParserTest.java | 64 +- .../module/itunes/types/DurationTest.java | 42 +- .../feed/module/mediarss/GoogleTest.java | 42 +- .../feed/module/mediarss/MediaModuleTest.java | 214 +- .../feed/module/mediarss/types/TimeTest.java | 31 +- .../opensearch/OpenSearchModuleTest.java | 50 +- .../module/photocast/io/GeneratorTest.java | 49 +- .../feed/module/sle/GroupAndSortTest.java | 128 +- .../module/sle/io/ModuleGeneratorTest.java | 24 +- .../feed/module/sle/io/ModuleParserTest.java | 70 +- .../feed/module/sse/SSEParserTest.java | 195 +- .../yahooweather/io/WeahterGeneratorTest.java | 80 +- .../io/WeatherModuleParserTest.java | 97 +- 232 files changed, 18694 insertions(+), 18428 deletions(-) create mode 100644 cleanup.xml create mode 100644 formatter.xml diff --git a/cleanup.xml b/cleanup.xml new file mode 100644 index 0000000..40f9b7a --- /dev/null +++ b/cleanup.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/formatter.xml b/formatter.xml new file mode 100644 index 0000000..e7ba7aa --- /dev/null +++ b/formatter.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/org/rometools/feed/module/activitystreams/ActivityStreamModule.java b/src/main/java/org/rometools/feed/module/activitystreams/ActivityStreamModule.java index 7151995..266e9e9 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/ActivityStreamModule.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/ActivityStreamModule.java @@ -22,22 +22,25 @@ import org.rometools.feed.module.activitystreams.types.Mood; import org.rometools.feed.module.activitystreams.types.Verb; /** - * + * * @author robert.cooper */ public interface ActivityStreamModule { public Verb getVerb(); + public void setVerb(Verb verb); public ActivityObject getObject(); + public void setObject(ActivityObject object); public ActivityObject getTarget(); + public void setTarget(ActivityObject object); public Mood getMood(); + public void setMood(Mood mood); - } diff --git a/src/main/java/org/rometools/feed/module/activitystreams/ActivityStreamModuleImpl.java b/src/main/java/org/rometools/feed/module/activitystreams/ActivityStreamModuleImpl.java index f56bcb9..7453610 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/ActivityStreamModuleImpl.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/ActivityStreamModuleImpl.java @@ -20,9 +20,8 @@ import org.rometools.feed.module.activitystreams.types.ActivityObject; import org.rometools.feed.module.activitystreams.types.Mood; import org.rometools.feed.module.activitystreams.types.Verb; - /** - * + * * @author robert.cooper */ public class ActivityStreamModuleImpl implements ActivityStreamModule { @@ -31,53 +30,53 @@ public class ActivityStreamModuleImpl implements ActivityStreamModule { /** * Set the value of object - * + * * @param newobject new value of object */ - public void setObject(ActivityObject newobject) { - this.object = newobject; + public void setObject(final ActivityObject newobject) { + object = newobject; } /** * Get the value of object - * + * * @return the value of object */ public ActivityObject getObject() { - return this.object; + return object; } /** * Set the value of verb - * + * * @param newverb new value of verb */ - public void setVerb(Verb newverb) { - this.verb = newverb; + public void setVerb(final Verb newverb) { + verb = newverb; } /** * Get the value of verb - * + * * @return the value of verb */ public Verb getVerb() { - return this.verb; + return verb; } public ActivityObject getTarget() { throw new UnsupportedOperationException("Not supported yet."); } - public void setTarget(ActivityObject object) { + public void setTarget(final ActivityObject object) { throw new UnsupportedOperationException("Not supported yet."); - } + } public Mood getMood() { throw new UnsupportedOperationException("Not supported yet."); } - public void setMood(Mood mood) { + public void setMood(final Mood mood) { throw new UnsupportedOperationException("Not supported yet."); } } diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/ActivityObject.java b/src/main/java/org/rometools/feed/module/activitystreams/types/ActivityObject.java index 5b40c67..826a5ec 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/ActivityObject.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/ActivityObject.java @@ -17,32 +17,33 @@ package org.rometools.feed.module.activitystreams.types; -import com.sun.syndication.feed.atom.Entry; import org.rometools.feed.module.georss.GeoRSSModule; import org.rometools.feed.module.portablecontacts.ContactModule; + +import com.sun.syndication.feed.atom.Entry; + /** - * + * * @author robert.cooper */ public abstract class ActivityObject extends Entry implements HasLocation { - - + public abstract String getTypeIRI(); public GeoRSSModule getLocation() { throw new UnsupportedOperationException("Not supported yet."); } - public void setLocation(GeoRSSModule location) { + public void setLocation(final GeoRSSModule location) { throw new UnsupportedOperationException("Not supported yet."); } - public ContactModule getAddress(){ - throw new UnsupportedOperationException("Not supported yet."); + public ContactModule getAddress() { + throw new UnsupportedOperationException("Not supported yet."); } - public void setAddress(ContactModule address){ - throw new UnsupportedOperationException("Not supported yet."); + public void setAddress(final ContactModule address) { + throw new UnsupportedOperationException("Not supported yet."); } } diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Article.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Article.java index c094a77..8c73c69 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Article.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Article.java @@ -16,33 +16,31 @@ */ package org.rometools.feed.module.activitystreams.types; - /** - *

The "article" Object type indicates that the Object is an - * article, such as a news article, a knowledge base entry, or other - * similar construct. - *

- *

Articles generally consist of paragraphs of text, in some cases - * incorporating embedded media such as photos and inline hyperlinks to - * other resources. - *

- *

The "Article" Object type is identified by the URL http://activitystrea.ms/schema/1.0/article. - *

- *

An article has the following additional components: - *

- *

- *
- *
Name
- *
The title of the article. Represented by the - * Name component of the base Object Construct. - *
- *
Content
- *
The main body content of the article. - * Represented in JSON as a property called content - * whose value is a JSON string containing a fragment of HTML that - * represents the content. - *
- *
+ *

+ * The "article" Object type indicates that the Object is an article, such as a news article, a knowledge base entry, or other similar construct. + *

+ *

+ * Articles generally consist of paragraphs of text, in some cases incorporating embedded media such as photos and inline hyperlinks to other resources. + *

+ *

+ * The "Article" Object type is identified by the URL http://activitystrea.ms/schema/1.0/article. + *

+ *

+ * An article has the following additional components: + *

+ *

+ *

+ *
+ *
+ *
Name
+ *
The title of the article. Represented by the Name component of the base Object Construct.
+ *
Content
+ *
The main body content of the article. Represented in JSON as a property called content whose value is a JSON string containing a fragment of + * HTML that represents the content.
+ *
+ *
+ * * @author robert.cooper */ public class Article extends ActivityObject { diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Audio.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Audio.java index 102bfb3..eaab594 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Audio.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Audio.java @@ -16,30 +16,28 @@ */ package org.rometools.feed.module.activitystreams.types; - /** - *

The "audio" Object type represents audio content. - *

- *

The "audio" Object type is identified by the URI http://activitystrea.ms/schema/1.0/audio. - *

- *

An audio has the following additional components: - *

- *

- *
- *
Audio Stream Link
- *
A Media Link Construct linking - * to the audio content itself. Represented in JSON as a property - * called stream whose value is a JSON - * object with properties as defined in [TODO: xref the JSON - * serialization of a Media Link Construct] - *
- *
Embed Code
- *
An HTML fragment that, when embedded in - * an HTML page, will provide an interactive player UI for the - * audio stream. Represented in JSON as a property called embedCode whose value is a JSON string - * containing the fragment of HTML. - *
- *
+ *

+ * The "audio" Object type represents audio content. + *

+ *

+ * The "audio" Object type is identified by the URI http://activitystrea.ms/schema/1.0/audio. + *

+ *

+ * An audio has the following additional components: + *

+ *

+ *

+ *
+ *
+ *
Audio Stream Link
+ *
A Media Link Construct linking to the audio content itself. Represented in JSON as a property called stream whose value is a JSON object with + * properties as defined in [TODO: xref the JSON serialization of a Media Link Construct]
+ *
Embed Code
+ *
An HTML fragment that, when embedded in an HTML page, will provide an interactive player UI for the audio stream. Represented in JSON as a property + * called embedCode whose value is a JSON string containing the fragment of HTML.
+ *
+ * * @author robert.cooper */ public class Audio extends ActivityObject { @@ -48,38 +46,38 @@ public class Audio extends ActivityObject { /** * Set the value of embedCode - * + * * @param newembedCode new value of embedCode */ - public void setEmbedCode(String newembedCode) { - this.embedCode = newembedCode; + public void setEmbedCode(final String newembedCode) { + embedCode = newembedCode; } /** * Get the value of embedCode - * + * * @return the value of embedCode */ public String getEmbedCode() { - return this.embedCode; + return embedCode; } /** * Set the value of streamLink - * + * * @param newstreamLink new value of streamLink */ - public void setStreamLink(String newstreamLink) { - this.streamLink = newstreamLink; + public void setStreamLink(final String newstreamLink) { + streamLink = newstreamLink; } /** * Get the value of streamLink - * + * * @return the value of streamLink */ public String getStreamLink() { - return this.streamLink; + return streamLink; } @Override diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Bookmark.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Bookmark.java index ce6e9bc..b584958 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Bookmark.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Bookmark.java @@ -19,62 +19,49 @@ package org.rometools.feed.module.activitystreams.types; import com.sun.syndication.feed.atom.Link; - /** - *

The "bookmark" Object type represents a pointer to some URL -- - * typically a web page. In most cases, a bookmark is specific to a - * given user and contains metadata chosen by that user. Bookmark - * Objects are similar in principle to the concept of bookmarks or - * favorites in a web browser. A bookmark represents a pointer to the - * URL, not the URL or the associated resource itself. - *

- *

When dealing with bookmarks it is important to note the - * distinction between the title, description, and URL of the bookmark - * itself and the title, content, and URL of the resource that is the - * target of the bookmark. In some implementations these MAY be the - * same, but bookmark managers often allow a user to edit the title and - * description of his or her own bookmarks to differ from the metadata - * on the target itself. - *

- *

Some implementations refer to this Object type as a "link". This - * specification uses the term "bookmark" to avoid confusion with the - * general concept of hyperlinks which apply to all Object types. - *

- *

Since bookmarks are often specific to a particular user, even - * though multiple users might have bookmarks pointing at the same - * resource, it is appropriate to use the "post" Verb to describe the - * publication of such a bookmark. The "mark as favorite" Verb SHOULD - * be used when a user flags another user's bookmark as being a - * favorite without creating his own bookmark, or when a user flags his - * own bookmark as being a favorite as a special classification within - * his own bookmark collection. - *

- *

The "bookmark" Object type is identified by the URI http://activitystrea.ms/schema/1.0/bookmark. - *

- *

A bookmark has the following additional components: - *

- *

- *
- *
Title
- *
The title of the bookmark, as entered by the - * user who created the bookmark. Represented by the Name component - * of the base Object Construct. Publishers MAY use the title of - * the target resource as a default for this property where a user - * hasn't entered a customized value. - *
- *
Target URL
- *
The URL of the item that is the target - * of the bookmark. Represented in JSON by a property called targetUrl whose value is a JSON string - * containing the target URL. - *
- *
Thumbnail
- *
The URL and metadata for a thumbnail - * version of the page. Represented by the Representative Image - * component of the base Object Construct. Processors MAY ignore - * thumbnails that are of an inappropriate size for their user - * interface. - *
- *
+ *

+ * The "bookmark" Object type represents a pointer to some URL -- typically a web page. In most cases, a bookmark is specific to a given user and contains + * metadata chosen by that user. Bookmark Objects are similar in principle to the concept of bookmarks or favorites in a web browser. A bookmark represents a + * pointer to the URL, not the URL or the associated resource itself. + *

+ *

+ * When dealing with bookmarks it is important to note the distinction between the title, description, and URL of the bookmark itself and the title, content, + * and URL of the resource that is the target of the bookmark. In some implementations these MAY be the same, but bookmark managers often allow a user to edit + * the title and description of his or her own bookmarks to differ from the metadata on the target itself. + *

+ *

+ * Some implementations refer to this Object type as a "link". This specification uses the term "bookmark" to avoid confusion with the general concept of + * hyperlinks which apply to all Object types. + *

+ *

+ * Since bookmarks are often specific to a particular user, even though multiple users might have bookmarks pointing at the same resource, it is appropriate to + * use the "post" Verb to describe the publication of such a bookmark. The "mark as favorite" Verb SHOULD be used when a user flags another user's bookmark as + * being a favorite without creating his own bookmark, or when a user flags his own bookmark as being a favorite as a special classification within his own + * bookmark collection. + *

+ *

+ * The "bookmark" Object type is identified by the URI http://activitystrea.ms/schema/1.0/bookmark. + *

+ *

+ * A bookmark has the following additional components: + *

+ *

+ *

+ *
+ *
+ *
Title
+ *
The title of the bookmark, as entered by the user who created the bookmark. Represented by the Name component of the base Object Construct. Publishers + * MAY use the title of the target resource as a default for this property where a user hasn't entered a customized value.
+ *
Target URL
+ *
The URL of the item that is the target of the bookmark. Represented in JSON by a property called targetUrl whose value is a JSON string + * containing the target URL.
+ *
Thumbnail
+ *
The URL and metadata for a thumbnail version of the page. Represented by the Representative Image component of the base Object Construct. Processors MAY + * ignore thumbnails that are of an inappropriate size for their user interface.
+ *
+ *
+ * * @author robert.cooper */ public class Bookmark extends ActivityObject { @@ -84,36 +71,33 @@ public class Bookmark extends ActivityObject { return "http://activitystrea.ms/schema/1.0/bookmark"; } - - - /** * Get the value of thumbnail - * + * * @return the value of thumbnail */ public Link getThumbnail() { - return this.findRelatedLink("thumbnail"); + return findRelatedLink("thumbnail"); } /** * Set the value of thumbnail - * + * * @param newthumbnail new value of thumbnail */ - public void setThumbnail(Link newthumbnail) { + public void setThumbnail(final Link newthumbnail) { Link old = null; - for(Link l : this.getOtherLinks()){ - if("thumbnail".equals(l.getRel())){ + for (final Link l : getOtherLinks()) { + if ("thumbnail".equals(l.getRel())) { old = l; break; } } - if(old != null){ - this.getOtherLinks().remove(old); + if (old != null) { + getOtherLinks().remove(old); newthumbnail.setRel("thumbnail"); } - this.getOtherLinks().add(newthumbnail); + getOtherLinks().add(newthumbnail); } } diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Comment.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Comment.java index 0e5cfe0..453dcc1 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Comment.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Comment.java @@ -18,37 +18,33 @@ package org.rometools.feed.module.activitystreams.types; /** - *

The "comment" object type represents a textual response to - * another object. - *

- *

The comment object type MUST NOT be used for other kinds of - * replies, such as video replies or reviews. - *

- *

The "comment" object type is identified by the URI http://activitystrea.ms/schema/1.0/comment. - *

- *

A comment has the following additional components: - *

- *

- *
- *
Subject
- *
The subject of the comment. Represented by - * the Name component of the base Object Construct. Many systems do - * not have the concept of a title or subject for a comment; such - * systems MUST omit the Name component. Processors SHOULD refer to - * such comments as simply being "a comment", with appropriate - * localization, if they are to be described in a sentence. - *
- *
Content
- *
The content of the comment. Represented in - * JSON as a property called content - * whose value is a JSON string containing a fragment of HTML that - * represents the content. Publishers SHOULD include any markup - * necessary to achieve a similar presentation to that on the - * publisher's own HTML pages, including any links that the service - * automatically adds. Processors MAY remove all HTML markup and - * consider the comment to be plain text. - *
- *
+ *

+ * The "comment" object type represents a textual response to another object. + *

+ *

+ * The comment object type MUST NOT be used for other kinds of replies, such as video replies or reviews. + *

+ *

+ * The "comment" object type is identified by the URI http://activitystrea.ms/schema/1.0/comment. + *

+ *

+ * A comment has the following additional components: + *

+ *

+ *

+ *
+ *
+ *
Subject
+ *
The subject of the comment. Represented by the Name component of the base Object Construct. Many systems do not have the concept of a title or subject + * for a comment; such systems MUST omit the Name component. Processors SHOULD refer to such comments as simply being "a comment", with appropriate + * localization, if they are to be described in a sentence.
+ *
Content
+ *
The content of the comment. Represented in JSON as a property called content whose value is a JSON string containing a fragment of HTML that + * represents the content. Publishers SHOULD include any markup necessary to achieve a similar presentation to that on the publisher's own HTML pages, including + * any links that the service automatically adds. Processors MAY remove all HTML markup and consider the comment to be plain text.
+ *
+ *
+ * * @author robert.cooper */ public class Comment extends ActivityObject { diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Event.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Event.java index 4d9bed7..25875de 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Event.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Event.java @@ -18,31 +18,28 @@ package org.rometools.feed.module.activitystreams.types; /** - *

The "event" object type represents an event that occurs in a - * certain place during a particular interval of time. - *

- *

The object type URL for the "event" object type is http://activitystrea.ms/schema/1.0/event. - *

- *

An event has the following additional components: - *

- *

- *
- *
Start Date and Time
- *
The date and time that the - * event begins. Represented in JSON as a property called startTime whose value is JSON string - * containing a W3CDTF timestamp. [TODO: Reference W3CDTF spec.] - * [TODO: Include prose describing how to represent just a date vs. - * a date and time.] - *
- *
End Date and Time
- *
The date and time that the event - * ends. Represented in JSON as a property called endTime whose value is JSON string - * containing a W3CDTF timestamp. [TODO: Reference W3CDTF spec.] - * [TODO: Include prose describing how to represent just a date vs. - * a date and time.] - *
- *
- * + *

+ * The "event" object type represents an event that occurs in a certain place during a particular interval of time. + *

+ *

+ * The object type URL for the "event" object type is http://activitystrea.ms/schema/1.0/event. + *

+ *

+ * An event has the following additional components: + *

+ *

+ *

+ *
+ *
+ *
Start Date and Time
+ *
The date and time that the event begins. Represented in JSON as a property called startTime whose value is JSON string containing a W3CDTF + * timestamp. [TODO: Reference W3CDTF spec.] [TODO: Include prose describing how to represent just a date vs. a date and time.]
+ *
End Date and Time
+ *
The date and time that the event ends. Represented in JSON as a property called endTime whose value is JSON string containing a W3CDTF + * timestamp. [TODO: Reference W3CDTF spec.] [TODO: Include prose describing how to represent just a date vs. a date and time.]
+ *
+ *
+ * * @author robert.cooper */ public class Event extends ActivityObject { diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/File.java b/src/main/java/org/rometools/feed/module/activitystreams/types/File.java index 7d07359..7a16564 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/File.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/File.java @@ -18,33 +18,32 @@ package org.rometools.feed.module.activitystreams.types; /** - *

The "file" Object type represents some document or other file - * with no additional machine-readable semantics. - *

- *

It is intended that this type be used as a base type for other - * Objects that manifest as files, so that additional semantics can be - * added while providing a fallback ability for clients that do not - * support the more specific Object type. - *

- *

The "file" Object type is identified by the URI http://activitystrea.ms/schema/1.0/file. - *

- *

A file has the following additional components: - *

- *

- *
- *
Associated File URL
- *
The URL of the file described - * by this Object Construct. Represented in JSON by a property - * called fileUrl whose value is a JSON - * string containing the URL. - *
- *
File MIME Type
- *
The MIME type of the file described - * by this Object Construct. Represented in JSON by a property - * called mimeType whose value is a - * JSON string containing the MIME type. - *
- *
+ *

+ * The "file" Object type represents some document or other file with no additional machine-readable semantics. + *

+ *

+ * It is intended that this type be used as a base type for other Objects that manifest as files, so that additional semantics can be added while providing a + * fallback ability for clients that do not support the more specific Object type. + *

+ *

+ * The "file" Object type is identified by the URI http://activitystrea.ms/schema/1.0/file. + *

+ *

+ * A file has the following additional components: + *

+ *

+ *

+ *
+ *
+ *
Associated File URL
+ *
The URL of the file described by this Object Construct. Represented in JSON by a property called fileUrl whose value is a JSON string containing + * the URL.
+ *
File MIME Type
+ *
The MIME type of the file described by this Object Construct. Represented in JSON by a property called mimeType whose value is a JSON string + * containing the MIME type.
+ *
+ *
+ * * @author robert.cooper */ public class File extends ActivityObject { @@ -54,6 +53,4 @@ public class File extends ActivityObject { return "http://activitystrea.ms/schema/1.0/file"; } - - } diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Folder.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Folder.java index c5dca30..4e86fbe 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Folder.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Folder.java @@ -18,32 +18,33 @@ package org.rometools.feed.module.activitystreams.types; /** - *

The "folder" object type represents a collection of files or - * media objects. This is similar to the "photo album" object type, but - * not specifically representing a collection of "photos." - *

- *

The "folder" object type is identified by the URI http://activitystrea.ms/schema/1.0/folder. - *

- *

A folder has the following additional components: - *

- *

- *
- *
Preview Image Link
- *
A Media Link Construct - * describing an image file that can be used as a preview image for - * the folder. Represented by the Representative Image component of - * the base Object Construct. Processors MAY ignore thumbnails that - * are of an inappropriate size for their user interface. - *
- *
+ *

+ * The "folder" object type represents a collection of files or media objects. This is similar to the "photo album" object type, but not specifically + * representing a collection of "photos." + *

+ *

+ * The "folder" object type is identified by the URI http://activitystrea.ms/schema/1.0/folder. + *

+ *

+ * A folder has the following additional components: + *

+ *

+ *

+ *
+ *
+ *
Preview Image Link
+ *
A Media Link Construct describing an image file that can be used as a preview image for the folder. Represented by the Representative Image component of + * the base Object Construct. Processors MAY ignore thumbnails that are of an inappropriate size for their user interface.
+ *
+ *
+ * * @author robert.cooper */ -public class Folder extends ActivityObject{ +public class Folder extends ActivityObject { @Override public String getTypeIRI() { return "http://activitystrea.ms/schema/1.0/folder"; } - } diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Group.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Group.java index 663848e..47d98ea 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Group.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Group.java @@ -18,13 +18,15 @@ package org.rometools.feed.module.activitystreams.types; /** - *

The "group" Object type represents a social networking group. A - * group is a collection of people which people can join and leave. - *

- *

The "group" Object type is identified by the URI http://activitystrea.ms/schema/1.0/group. - *

- *

A group has no additional components. - + *

+ * The "group" Object type represents a social networking group. A group is a collection of people which people can join and leave. + *

+ *

+ * The "group" Object type is identified by the URI http://activitystrea.ms/schema/1.0/group. + *

+ *

+ * A group has no additional components. + * * @author robert.cooper */ public class Group { diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/HasLocation.java b/src/main/java/org/rometools/feed/module/activitystreams/types/HasLocation.java index 2ec3ec8..be3aca0 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/HasLocation.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/HasLocation.java @@ -21,64 +21,74 @@ import org.rometools.feed.module.georss.GeoRSSModule; import org.rometools.feed.module.portablecontacts.ContactModule; /** - *

Location is a concept which can be used inside the atom:entry - * level, atom:author and activity:object. Location can be specified - * via geographic coordinates, a street address, a free-form location - * name or a combination of these. Geographic coordinates should be - * included as a geo:point element as described by the GeoRSS - * specification. Addresses should be included using a poco:address - * element defined at Portable Contacts specification. The entry level - * location represents the location of the author at the time the - * activity was performed. The author level location represents the - * primary location of the author. Finally, the location within other - * objects represents the physical location of those objects. All - * location fields are optional. For free form addresses use the - * poco:formatted field. - *

- *

Figure 1 (Location Example) - *

- *


- * - *

- *
<entry>
- *  <id>tag:world:activity:1212121212121</id>
- *  <title>Rob liked Goldeberg's Deli</title>
- *  <author>
- *    <name>Rob Dolin</name>
- *    <id>tag:world:person:1212121212121</id>
- *    <link rel="alternate" type="text/html" href="http://robdolin.com" />
- *    <poco:address>
- *      <poco:locality>Marina del Rey</poco:locality>
- *      <poco:region>CA</poco:region>
- *      <poco:postalCode>90292</poco:postalCode>
- *      <poco:country>US</poco:country>
- *    </poco:address>
- *  </author>
- *  <activity:object>
- *    <activity:object-type>http://activitystrea.ms/schema/1.0/place</object-type>
- *    <id>tag:world:place:1212121212121</id>
- *    <title>Goldberg's Deli</title>
- *    <link rel="alternate" type="text/html" href="http://www.deli.com" />
- *    <geo:point>33.9777 -118.4351</geo:point>
- *    <poco:address>
- *      <poco:streetAddress>14016 Bora Bora Way</poco:streetAddress>
- *      <poco:locality>Marina del Rey</poco:locality>
- *      <poco:region>CA</poco:region>
- *      <poco:postalCode>90292</poco:postalCode>
- *      <poco:country>US</poco:country>
- *    </poco:address>
- *  </activity:object>
- *  <geo:point>33.9777 -119.4351</geo:point>
- *  <activity:verb>http://activitystrea.ms/schema/1.0/like</activity:verb>
- *</entry>

- *
 Figure 1: Location Example 

- * - *

+ *

+ * Location is a concept which can be used inside the atom:entry level, atom:author and activity:object. Location can be specified via geographic coordinates, a + * street address, a free-form location name or a combination of these. Geographic coordinates should be included as a geo:point element as described by the + * GeoRSS specification. Addresses should be included using a poco:address element defined at Portable Contacts specification. The entry level location + * represents the location of the author at the time the activity was performed. The author level location represents the primary location of the author. + * Finally, the location within other objects represents the physical location of those objects. All location fields are optional. For free form addresses use + * the poco:formatted field. + *

+ *

+ * Figure 1 (Location Example) + *

+ *

+ *
+ *

+ * + *

+ *
+ * + * 
+ * <entry>
+ *   <id>tag:world:activity:1212121212121</id>
+ *   <title>Rob liked Goldeberg's Deli</title>
+ *   <author>
+ *     <name>Rob Dolin</name>
+ *     <id>tag:world:person:1212121212121</id>
+ *     <link rel="alternate" type="text/html" href="http://robdolin.com" />
+ *     <poco:address>
+ *       <poco:locality>Marina del Rey</poco:locality>
+ *       <poco:region>CA</poco:region>
+ *       <poco:postalCode>90292</poco:postalCode>
+ *       <poco:country>US</poco:country>
+ *     </poco:address>
+ *   </author>
+ *   <activity:object>
+ *     <activity:object-type>http://activitystrea.ms/schema/1.0/place</object-type>
+ *     <id>tag:world:place:1212121212121</id>
+ *     <title>Goldberg's Deli</title>
+ *     <link rel="alternate" type="text/html" href="http://www.deli.com" />
+ *     <geo:point>33.9777 -118.4351</geo:point>
+ *     <poco:address>
+ *       <poco:streetAddress>14016 Bora Bora Way</poco:streetAddress>
+ *       <poco:locality>Marina del Rey</poco:locality>
+ *       <poco:region>CA</poco:region>
+ *       <poco:postalCode>90292</poco:postalCode>
+ *       <poco:country>US</poco:country>
+ *     </poco:address>
+ *   </activity:object>
+ *   <geo:point>33.9777 -119.4351</geo:point>
+ *   <activity:verb>http://activitystrea.ms/schema/1.0/like</activity:verb>
+ * </entry>
+ *
+ * + *
+ *

+ * + * + * + * + *
 Figure 1: Location Example 
+ *
+ *

+ * + *

+ * * @author robert.cooper */ public interface HasLocation { - public GeoRSSModule getLocation(); public void setLocation(GeoRSSModule location); diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/List.java b/src/main/java/org/rometools/feed/module/activitystreams/types/List.java index 8a79ac7..1521254 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/List.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/List.java @@ -18,18 +18,19 @@ package org.rometools.feed.module.activitystreams.types; /** - *

The "list" object type represents a collection of related - * objects. - *

- *

The "list" object type is identified by the URI http://activitystrea.ms/schema/1.0/list. - *

- *

A list has no additional components. - *

- + *

+ * The "list" object type represents a collection of related objects. + *

+ *

+ * The "list" object type is identified by the URI http://activitystrea.ms/schema/1.0/list. + *

+ *

+ * A list has no additional components. + *

+ * * @author robert.cooper */ -public class List extends ActivityObject -{ +public class List extends ActivityObject { @Override public String getTypeIRI() { diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Mood.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Mood.java index ba37cb4..c649638 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Mood.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Mood.java @@ -16,25 +16,23 @@ */ package org.rometools.feed.module.activitystreams.types; - /** - * - *

Mood describes the mood of the user when the activity was - * performed. This is usually collected via an extra field in the user - * interface used to perform the activity. For the purpose of this - * schema, a mood is a freeform, short mood keyword or phrase along - * with an optional mood icon image. - *

- *

Moods are included via a mood element in the namespace http://activitystrea.ms/context/. - *

- *

The content of the mood element is the mood keyword or - * phrase. - *

- *

The mood element may have an optional icon - * attribute which contains the URL of a mood icon image. The mood icon - * image SHOULD be small and appropriate to be displayed alongside the - * mood keyword at a normal text size. - *

+ * + *

+ * Mood describes the mood of the user when the activity was performed. This is usually collected via an extra field in the user interface used to perform the + * activity. For the purpose of this schema, a mood is a freeform, short mood keyword or phrase along with an optional mood icon image. + *

+ *

+ * Moods are included via a mood element in the namespace http://activitystrea.ms/context/. + *

+ *

+ * The content of the mood element is the mood keyword or phrase. + *

+ *

+ * The mood element may have an optional icon attribute which contains the URL of a mood icon image. The mood icon image SHOULD be small and + * appropriate to be displayed alongside the mood keyword at a normal text size. + *

+ * * @author robert.cooper */ public class Mood { @@ -43,37 +41,37 @@ public class Mood { /** * Set the value of iconUrl - * + * * @param newiconUrl new value of iconUrl */ - public void setIconUrl(String newiconUrl) { - this.iconUrl = newiconUrl; + public void setIconUrl(final String newiconUrl) { + iconUrl = newiconUrl; } /** * Get the value of iconUrl - * + * * @return the value of iconUrl */ public String getIconUrl() { - return this.iconUrl; + return iconUrl; } /** * Set the value of text - * + * * @param newtext new value of text */ - public void setText(String newtext) { - this.text = newtext; + public void setText(final String newtext) { + text = newtext; } /** * Get the value of text - * + * * @return the value of text */ public String getText() { - return this.text; + return text; } } diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Note.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Note.java index 63b20c5..adc01ad 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Note.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Note.java @@ -18,35 +18,31 @@ package org.rometools.feed.module.activitystreams.types; /** - *

The "note" Object type represents short-form text messages. This - * Object type is intended for use in "micro-blogging" and in systems - * where users are invited to publish short, often plain-text messages - * whose useful lifespan is generally shorter than that of an article - * or weblog entry. - *

- *

A note is similar in structure to an article, but it does not - * have a title and its body tends to be shorter. Applications will - * often display the entire content of a note in an activity stream UI, - * whereas they MAY display only the title or the title and summary for - * a weblog entry. - *

- *

The "note" Object type is identified by the URI http://activitystrea.ms/schema/1.0/note. - *

- *

A note has the following additional components: - *

- *

- *
- *
Content
- *
The content of the comment. Represented in - * JSON as a property called content - * whose value is a JSON string containing a fragment of HTML that - * represents the content. Publishers SHOULD include any markup - * necessary to achieve a similar presentation to that on the - * publisher's own HTML pages, including any links that the service - * automatically adds. Processors MAY remove all HTML markup and - * consider the comment to be plain text. - *
- *
+ *

+ * The "note" Object type represents short-form text messages. This Object type is intended for use in "micro-blogging" and in systems where users are invited + * to publish short, often plain-text messages whose useful lifespan is generally shorter than that of an article or weblog entry. + *

+ *

+ * A note is similar in structure to an article, but it does not have a title and its body tends to be shorter. Applications will often display the entire + * content of a note in an activity stream UI, whereas they MAY display only the title or the title and summary for a weblog entry. + *

+ *

+ * The "note" Object type is identified by the URI http://activitystrea.ms/schema/1.0/note. + *

+ *

+ * A note has the following additional components: + *

+ *

+ *

+ *
+ *
+ *
Content
+ *
The content of the comment. Represented in JSON as a property called content whose value is a JSON string containing a fragment of HTML that + * represents the content. Publishers SHOULD include any markup necessary to achieve a similar presentation to that on the publisher's own HTML pages, including + * any links that the service automatically adds. Processors MAY remove all HTML markup and consider the comment to be plain text.
+ *
+ *
+ * * @author robert.cooper */ public class Note extends ActivityObject { diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Person.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Person.java index e2009a8..8d67e88 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Person.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Person.java @@ -20,65 +20,62 @@ package org.rometools.feed.module.activitystreams.types; import com.sun.syndication.feed.atom.Link; /** - *

The "person" Object type represents a user account. This is often - represents a person, but might also be a company or fictitious - * character that is being represented by a user account. - *

- *

The "person" Object type is identified by the URI http://activitystrea.ms/schema/1.0/person. - *

- *

A person has the following additional components: - *

- *

- *
- *
Display Name
- *
A name that can be used for the - * person in the user interface. This is often a name by which the - * individual is known in a given context; no restriction is placed - * on what kind of name may be used here. Represented by the Name - * component of the base Object Construct. - *
- *
Avatar
- *
A link to an "avatar" or "userpic" image - * for the user. Represented by the Representative Image component - * of the base Object Construct. - *
- *
- @author robert.cooper + *

+ * The "person" Object type represents a user account. This is often represents a person, but might also be a company or fictitious character that is being + * represented by a user account. + *

+ *

+ * The "person" Object type is identified by the URI http://activitystrea.ms/schema/1.0/person. + *

+ *

+ * A person has the following additional components: + *

+ *

+ *

+ *
+ *
+ *
Display Name
+ *
A name that can be used for the person in the user interface. This is often a name by which the individual is known in a given context; no restriction is + * placed on what kind of name may be used here. Represented by the Name component of the base Object Construct.
+ *
Avatar
+ *
A link to an "avatar" or "userpic" image for the user. Represented by the Representative Image component of the base Object Construct.
+ *
+ *
+ * + * @author robert.cooper */ -public class Person extends ActivityObject { +public class Person extends ActivityObject { @Override public String getTypeIRI() { - return "http://activitystrea.ms/schema/1.0/person"; + return "http://activitystrea.ms/schema/1.0/person"; } - - /** * Get the value of avatar - * + * * @return the value of avatar */ public Link getAvatar() { - Link result = this.findRelatedLink("avatar"); - if(result != null){ + final Link result = findRelatedLink("avatar"); + if (result != null) { return result; } - return this.findRelatedLink("userpic"); + return findRelatedLink("userpic"); } /** * Set the value of avatar - * + * * @param newavatar new value of avatar */ - public void setAvatar(Link newavatar) { - Link old = this.getAvatar(); - if(old != null){ - this.getOtherLinks().remove(old); + public void setAvatar(final Link newavatar) { + final Link old = getAvatar(); + if (old != null) { + getOtherLinks().remove(old); } newavatar.setRel("avatar"); - this.getOtherLinks().add(newavatar); + getOtherLinks().add(newavatar); } } diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Photo.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Photo.java index 6f57edb..9ac783b 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Photo.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Photo.java @@ -18,29 +18,28 @@ package org.rometools.feed.module.activitystreams.types; /** - *

The "photo" object type represents a graphical still image. - *

- *

The "photo" Object type is identified by the URI http://activitystrea.ms/schema/1.0/photo. - *

- *

A photo has the following additional components: - *

- *

- *
- *
Thumbnail
- *
A link to a thumbnail version of the - * image. Represented by the Representative Image component of the - * base Object Construct. Processors MAY ignore thumbnails that are - * of an inappropriate size for their user interface. - *
- *
Larger Image
- *
A Media Link Construct linking to a - * larger -- ideally, full-size -- version of the photo intended - * for standalone viewing. Represented in JSON as a property named - * fullImage whose value is a JSON - * object with properties as defined in [TODO: xref the JSON - * serialization of a Media Link Construct]. - *
- *
+ *

+ * The "photo" object type represents a graphical still image. + *

+ *

+ * The "photo" Object type is identified by the URI http://activitystrea.ms/schema/1.0/photo. + *

+ *

+ * A photo has the following additional components: + *

+ *

+ *

+ *
+ *
+ *
Thumbnail
+ *
A link to a thumbnail version of the image. Represented by the Representative Image component of the base Object Construct. Processors MAY ignore + * thumbnails that are of an inappropriate size for their user interface.
+ *
Larger Image
+ *
A Media Link Construct linking to a larger -- ideally, full-size -- version of the photo intended for standalone viewing. Represented in JSON as a + * property named fullImage whose value is a JSON object with properties as defined in [TODO: xref the JSON serialization of a Media Link Construct].
+ *
+ *
+ * * @author robert.cooper */ public class Photo extends ActivityObject { @@ -50,6 +49,4 @@ public class Photo extends ActivityObject { return "http://activitystrea.ms/schema/1.0/photo"; } - - } diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/PhotoAlbum.java b/src/main/java/org/rometools/feed/module/activitystreams/types/PhotoAlbum.java index 2e4e2a1..ce777c2 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/PhotoAlbum.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/PhotoAlbum.java @@ -18,23 +18,25 @@ package org.rometools.feed.module.activitystreams.types; /** - *

The "photo album" object type represents a collection of - * images. - *

- *

The "photo album" object type is identified by the URI http://activitystrea.ms/schema/1.0/photo-album. - *

- *

The photo album has the following additional components: - *

- *

- *
- *
Preview Image Link
- *
A Media Link Construct - * describing an image file that can be used as a preview image for - * the album. Represented by the Representative Image component of - * the base Object Construct. Processors MAY ignore thumbnails that - * are of an inappropriate size for their user interface. - *
- *
+ *

+ * The "photo album" object type represents a collection of images. + *

+ *

+ * The "photo album" object type is identified by the URI http://activitystrea.ms/schema/1.0/photo-album. + *

+ *

+ * The photo album has the following additional components: + *

+ *

+ *

+ *
+ *
+ *
Preview Image Link
+ *
A Media Link Construct describing an image file that can be used as a preview image for the album. Represented by the Representative Image component of + * the base Object Construct. Processors MAY ignore thumbnails that are of an inappropriate size for their user interface.
+ *
+ *
+ * * @author robert.cooper */ public class PhotoAlbum extends ActivityObject { diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Place.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Place.java index 4d650b0..cc5a7fd 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Place.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Place.java @@ -18,27 +18,28 @@ package org.rometools.feed.module.activitystreams.types; /** - *

The "place" object type represents a location on Earth. - *

- *

The "place" object type is identified by the URI http://activitystrea.ms/schema/1.0/place. - *

- *

A place has the following additional components: - *

- *

- *
- *
Latitude
- *
The latitude of the place as a point on - * Earth. Represented in JSON as a property named latitude whose value is a JSON number - * containing a decimal representation of the latitude in - * degrees. - *
- *
Longitude
- *
The longitude of the place as a point on - * Earth. Represented in JSON as a property named longitude whose value is a JSON number - * containing a decimal representation of the longitude in - * degrees. - *
- *
+ *

+ * The "place" object type represents a location on Earth. + *

+ *

+ * The "place" object type is identified by the URI http://activitystrea.ms/schema/1.0/place. + *

+ *

+ * A place has the following additional components: + *

+ *

+ *

+ *
+ *
+ *
Latitude
+ *
The latitude of the place as a point on Earth. Represented in JSON as a property named latitude whose value is a JSON number containing a + * decimal representation of the latitude in degrees.
+ *
Longitude
+ *
The longitude of the place as a point on Earth. Represented in JSON as a property named longitude whose value is a JSON number containing a + * decimal representation of the longitude in degrees.
+ *
+ *
+ * * @author robert.cooper */ public class Place extends ActivityObject { diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Playlist.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Playlist.java index dfea5e8..bace92e 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Playlist.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Playlist.java @@ -18,17 +18,20 @@ package org.rometools.feed.module.activitystreams.types; /** - * - *

The "playlist" object type represents an ordered list of - * time-based media items, such as video and audio objects. - *

- *

The "playlist" object type is identified by the URI http://activitystrea.ms/schema/1.0/playlist. - *

- *

A playlist has no additional components. - *

+ * + *

+ * The "playlist" object type represents an ordered list of time-based media items, such as video and audio objects. + *

+ *

+ * The "playlist" object type is identified by the URI http://activitystrea.ms/schema/1.0/playlist. + *

+ *

+ * A playlist has no additional components. + *

+ * * @author robert.cooper */ -public class Playlist extends ActivityObject { +public class Playlist extends ActivityObject { @Override public String getTypeIRI() { diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Product.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Product.java index efee22d..045a012 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Product.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Product.java @@ -18,30 +18,28 @@ package org.rometools.feed.module.activitystreams.types; /** - *

The "product" object type represents a commercial good or - * service. - *

- *

The "product" object type is identified by the URI http://activitystrea.ms/schema/1.0/product. - *

- *

A product has the following additional components: - *

- *

- *
- *
Thumbnail
- *
A link to a thumbnail-sized image that - * contains a photo of the product. Represented by the - * Representative Image component of the base Object Construct. - * Processors MAY ignore thumbnails that are of an inappropriate - * size for their user interface. - *
- *
Larger Image
- *
A Media Link Construct linking to a - * larger -- ideally, full-size -- version of the photo of the - * product. Represented in JSON as a property named fullImage whose value is a JSON object with - * properties as defined in [TODO: xref the JSON serialization of a - * Media Link Construct]. - *
- *
+ *

+ * The "product" object type represents a commercial good or service. + *

+ *

+ * The "product" object type is identified by the URI http://activitystrea.ms/schema/1.0/product. + *

+ *

+ * A product has the following additional components: + *

+ *

+ *

+ *
+ *
+ *
Thumbnail
+ *
A link to a thumbnail-sized image that contains a photo of the product. Represented by the Representative Image component of the base Object Construct. + * Processors MAY ignore thumbnails that are of an inappropriate size for their user interface.
+ *
Larger Image
+ *
A Media Link Construct linking to a larger -- ideally, full-size -- version of the photo of the product. Represented in JSON as a property named + * fullImage whose value is a JSON object with properties as defined in [TODO: xref the JSON serialization of a Media Link Construct].
+ *
+ *
+ * * @author robert.cooper */ public class Product extends ActivityObject { diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Review.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Review.java index 06df4b8..009f1d7 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Review.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Review.java @@ -18,45 +18,35 @@ package org.rometools.feed.module.activitystreams.types; /** - *

The "review" object type represents a primarily prose-based - * commentary on another object. - *

- *

The "review" object type is identified by the URI http://activitystrea.ms/schema/1.0/review. - *

- *

A review has the following additional components: - *

- *

- *
- *
Title
- *
The title of the review. Represented by the - * Name component of the base Object Construct. Many systems do not - * have the concept of a title for a review; such systems MUST omit - * the Name component. Processors SHOULD refer to such reviews as - * simply being "a review", with appropriate localization, if they - * are to be described in a sentence. - *
- *
Content
- *
The content of the comment. Represented in - * JSON as a property called content - * whose value is a JSON string containing a fragment of HTML that - * represents the content. Publishers SHOULD include any markup - * necessary to achieve a similar presentation to that on the - * publisher's own HTML pages, including any links that the service - * automatically adds. Processors MAY remove all HTML markup and - * consider the comment to be plain text. - *
- *
Reviewed Object
- *
The Object Construct representing - * the item that this review applies to. Represented as the In - * Reply To Object component of the base Object Construct. - *
- *
Rating
- *
A rating for the item, given as a number - * between 1.0 and 5.0 inclusive with one decimal place of - * precision. Represented in JSON as a property called rating whose value is a JSON number giving - * the rating. - *
- *
+ *

+ * The "review" object type represents a primarily prose-based commentary on another object. + *

+ *

+ * The "review" object type is identified by the URI http://activitystrea.ms/schema/1.0/review. + *

+ *

+ * A review has the following additional components: + *

+ *

+ *

+ *
+ *
+ *
Title
+ *
The title of the review. Represented by the Name component of the base Object Construct. Many systems do not have the concept of a title for a review; + * such systems MUST omit the Name component. Processors SHOULD refer to such reviews as simply being "a review", with appropriate localization, if they are to + * be described in a sentence.
+ *
Content
+ *
The content of the comment. Represented in JSON as a property called content whose value is a JSON string containing a fragment of HTML that + * represents the content. Publishers SHOULD include any markup necessary to achieve a similar presentation to that on the publisher's own HTML pages, including + * any links that the service automatically adds. Processors MAY remove all HTML markup and consider the comment to be plain text.
+ *
Reviewed Object
+ *
The Object Construct representing the item that this review applies to. Represented as the In Reply To Object component of the base Object Construct.
+ *
Rating
+ *
A rating for the item, given as a number between 1.0 and 5.0 inclusive with one decimal place of precision. Represented in JSON as a property called + * rating whose value is a JSON number giving the rating.
+ *
+ *
+ * * @author robert.cooper */ public class Review extends ActivityObject { diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Service.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Service.java index b7d5584..922b613 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Service.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Service.java @@ -18,27 +18,27 @@ package org.rometools.feed.module.activitystreams.types; /** - *

The "service" Object type represents a website, personal website - * or blog, business, brand, or other entity that performs some kind of - * work for other entities, people, or services, or acts as kind of - * container for other objects. - *

- *

The "service" Object type is identified by the URI http://activitystrea.ms/schema/1.0/service. - *

- *

A service has the following additional components: - *

- *

- *
- *
icon
- *
A Media Link Construct representing a link to - * a small image representing the service. Represented in JSON as a - * property named icon whose value is a - * JSON object with properties as defined in [TODO: xref the JSON - * serialization of a Media Link Construct]. The linked image MUST - * have an aspect ratio of one (horizontal) to one (vertical) and - * SHOULD be suitable for presentation at a small size. - *
- *
+ *

+ * The "service" Object type represents a website, personal website or blog, business, brand, or other entity that performs some kind of work for other + * entities, people, or services, or acts as kind of container for other objects. + *

+ *

+ * The "service" Object type is identified by the URI http://activitystrea.ms/schema/1.0/service. + *

+ *

+ * A service has the following additional components: + *

+ *

+ *

+ *
+ *
+ *
icon
+ *
A Media Link Construct representing a link to a small image representing the service. Represented in JSON as a property named icon whose value + * is a JSON object with properties as defined in [TODO: xref the JSON serialization of a Media Link Construct]. The linked image MUST have an aspect ratio of + * one (horizontal) to one (vertical) and SHOULD be suitable for presentation at a small size.
+ *
+ *
+ * * @author robert.cooper */ public class Service extends ActivityObject { diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Song.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Song.java index d6be3ef..15bf7de 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Song.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Song.java @@ -16,22 +16,23 @@ */ package org.rometools.feed.module.activitystreams.types; - /** - *

The "song" Object type represents a song or a recording of a - * song. - *

- *

Objects of type Song might contain information about the song or - * recording, or they might contain some representation of the - * recording itself. In the latter case, the song SHOULD also be - * annotated with the "audio" object type as described in Section 3.2.2 (Audio) and use its properties. This type should only - * be used when the publisher can guarantee that the object is a song - * rather than merely a generic audio stream. - *

- *

The Object type URL for the "song" Object type is http://activitystrea.ms/schema/1.0/song. - *

- *

A song has no additional components. - *

+ *

+ * The "song" Object type represents a song or a recording of a song. + *

+ *

+ * Objects of type Song might contain information about the song or recording, or they might contain some representation of the recording itself. In the latter + * case, the song SHOULD also be annotated with the "audio" object type as described in Section 3.2.2 (Audio) and use its properties. This type should only be used when the publisher can guarantee that the object is a song + * rather than merely a generic audio stream. + *

+ *

+ * The Object type URL for the "song" Object type is http://activitystrea.ms/schema/1.0/song. + *

+ *

+ * A song has no additional components. + *

+ * * @author robert.cooper */ public class Song extends ActivityObject { @@ -39,20 +40,20 @@ public class Song extends ActivityObject { /** * Set the value of audio - * + * * @param newaudio new value of audio */ - public void setAudio(Audio newaudio) { - this.audio = newaudio; + public void setAudio(final Audio newaudio) { + audio = newaudio; } /** * Get the value of audio - * + * * @return the value of audio */ public Audio getAudio() { - return this.audio; + return audio; } @Override diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Status.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Status.java index 7636474..f51c6a9 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Status.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Status.java @@ -18,22 +18,24 @@ package org.rometools.feed.module.activitystreams.types; /** - *

The "status" Object type represents a human-readable update of - * the author's situation, mood, location or other status. - *

- *

A status is similar in structure to a note, but carries the - * additional meaning that the content is primarily describing - * something its author is doing, feeling or experiencing. - *

- *

A consumers MAY consider the content of the most recent status - * object it encountered to be the user's current status, unless the - * most recent status update is old. When a status becomes too old is - * not defined by this specification. - *

- *

The "status" object type is identified by the URI http://activitystrea.ms/schema/1.0/status. - *

- *

A status has the same components as a note. - *

+ *

+ * The "status" Object type represents a human-readable update of the author's situation, mood, location or other status. + *

+ *

+ * A status is similar in structure to a note, but carries the additional meaning that the content is primarily describing something its author is doing, + * feeling or experiencing. + *

+ *

+ * A consumers MAY consider the content of the most recent status object it encountered to be the user's current status, unless the most recent status update is + * old. When a status becomes too old is not defined by this specification. + *

+ *

+ * The "status" object type is identified by the URI http://activitystrea.ms/schema/1.0/status. + *

+ *

+ * A status has the same components as a note. + *

+ * * @author robert.cooper */ public class Status extends ActivityObject { diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Verb.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Verb.java index 9f2b0f3..a540ade 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Verb.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Verb.java @@ -16,164 +16,145 @@ */ package org.rometools.feed.module.activitystreams.types; - /** - * + * * @author robert.cooper */ public enum Verb { /** - * The "mark as favorite" Verb indicates that the Subject marked the Object as an item of - * special interest. Objects so marked often appear in a collection of such Objects which - * MAY be published as a feed of entries annotated with this Verb. - * If a particular service uses favorites as a mechanism by which a user can recall - * items that were earlier marked, it MAY be appropriate to also mark activities of - * this type with the "save" Verb as described in Section 3.1.8. - * The verb URI for the "mark as favorite" Verb is http://activitystrea.ms/schema/1.0/favorite. + * The "mark as favorite" Verb indicates that the Subject marked the Object as an item of special interest. Objects so marked often appear in a collection + * of such Objects which MAY be published as a feed of entries annotated with this Verb. If a particular service uses favorites as a mechanism by which a + * user can recall items that were earlier marked, it MAY be appropriate to also mark activities of this type with the "save" Verb as described in Section + * 3.1.8. The verb URI for the "mark as favorite" Verb is http://activitystrea.ms/schema/1.0/favorite. */ MARK_AS_FAVORITE("http://activitystrea.ms/schema/1.0/favorite"), /** - * The "start following" Verb indicates that the Subject began following the activity - * of the Object. In most cases, the Object of this Verb will be a user, but it can - * potentially be of any type that can sensibly generate activity. - * + * The "start following" Verb indicates that the Subject began following the activity of the Object. In most cases, the Object of this Verb will be a user, + * but it can potentially be of any type that can sensibly generate activity. + * * The verb URI for the "start following" Verb is http://activitystrea.ms/schema/1.0/follow. - * - * Processors MAY ignore (silently drop) successive identical "start following" activities - * regardless of whether they maintain state sufficient to determine (A), (B), or (C) above. + * + * Processors MAY ignore (silently drop) successive identical "start following" activities regardless of whether they maintain state sufficient to determine + * (A), (B), or (C) above. */ START_FOLLOWING("http://activitystrea.ms/schema/1.0/follow"), /** * The "mark as liked" verb indicates that the actor indicated that it likes the object. - * + * * The verb URI for the "mark as liked" Verb is http://activitystrea.ms/schema/1.0/like. */ MARK_AS_LIKED("http://activitystrea.ms/schema/1.0/like"), /** * The "make friend" Verb indicates the creation of a friendship that is reciprocated by the object. - * - * Since this verb implies an activity on the part of its object, processors MUST NOT accept - * activities with this Verb unless they are able to verify through some external means that - * there is in fact a reciprocated connection. For example, a processor MAY have received a - * guarantee from a particular publisher that the publisher will only use this Verb in cases - * where a reciprocal relationship exists. - * + * + * Since this verb implies an activity on the part of its object, processors MUST NOT accept activities with this Verb unless they are able to verify + * through some external means that there is in fact a reciprocated connection. For example, a processor MAY have received a guarantee from a particular + * publisher that the publisher will only use this Verb in cases where a reciprocal relationship exists. + * * The verb URI for the "make friend" Verb is http://activitystrea.ms/schema/1.0/make-friend. */ MAKE_FRIEND("http://activitystrea.ms/schema/1.0/make-friend"), /** - * The "join" Verb indicates that the actor has become a member of the Object. - * This specification only defines the meaning of this Verb when its Object is a Group, - * though implementors SHOULD be prepared to handle other Object types as meaning - * MAY be provided by extension specifications. - * - * Processors MAY ignore (silently drop) successive identical "join" activities - * regardless of whether they maintain state sufficient to determine (A) or (B) above. - * + * The "join" Verb indicates that the actor has become a member of the Object. This specification only defines the meaning of this Verb when its Object is a + * Group, though implementors SHOULD be prepared to handle other Object types as meaning MAY be provided by extension specifications. + * + * Processors MAY ignore (silently drop) successive identical "join" activities regardless of whether they maintain state sufficient to determine (A) or (B) + * above. + * * The "join" Verb is identified by the URI http://activitystrea.ms/schema/1.0/join. */ JOIN("http://activitystrea.ms/schema/1.0/join"), /** - * The "play" verb indicates that the subject spent some time enjoying the object. - * For example, if the object is a video this indicates that the subject watched all or part of the video. - * + * The "play" verb indicates that the subject spent some time enjoying the object. For example, if the object is a video this indicates that the subject + * watched all or part of the video. + * * The "play" Verb is identified by the URI http://activitystrea.ms/schema/1.0/play. */ PLAY("http://activitystrea.ms/schema/1.0/play"), /** - * The "Post" Verb is described in section 8 of the AtomActivity specification. - * It is only referenced here for completeness. - * + * The "Post" Verb is described in section 8 of the AtomActivity specification. It is only referenced here for completeness. + * * http://activitystrea.ms/schema/1.0/post */ POST("http://activitystrea.ms/schema/1.0/post"), /** - * The "save" Verb indicates that the Subject has called out the Object as being of - * interest primarily to him- or herself. Though this action MAY be shared publicly, - * the implication is that the Object has been saved primarily for the actor's own - * benefit rather than to show it to others as would be indicated by the "share" - * Verb (Section 3.1.9). - * + * The "save" Verb indicates that the Subject has called out the Object as being of interest primarily to him- or herself. Though this action MAY be shared + * publicly, the implication is that the Object has been saved primarily for the actor's own benefit rather than to show it to others as would be indicated + * by the "share" Verb (Section 3.1.9). + * * The "save" Verb is identified by the URI http://activitystrea.ms/schema/1.0/save. */ SAVE("http://activitystrea.ms/schema/1.0/save"), /** - * The "share" Verb indicates that the Subject has called out the Object to readers. - * In most cases, the actor did not create the Object being shared, but is instead - * drawing attention to it. - * + * The "share" Verb indicates that the Subject has called out the Object to readers. In most cases, the actor did not create the Object being shared, but is + * instead drawing attention to it. + * * The "share" Verb is identified by the URI http://activitystrea.ms/schema/1.0/share. */ SHARE("http://activitystrea.ms/schema/1.0/share"), /** - * The "tag" verb indicates that the actor has identified the presence of a target - * inside another object. For example, the actor may have specified that a particular - * user appears in a photo. - * + * The "tag" verb indicates that the actor has identified the presence of a target inside another object. For example, the actor may have specified that a + * particular user appears in a photo. + * * The "tag" verb is identified by the URI http://activitystrea.ms/schema/1.0/tag. - * - * The target of the "tag" verb gives the object in which the tag has been added. - * For example, if a user appears in a photo, the activity:object is the user and - * the activity:target is the photo. + * + * The target of the "tag" verb gives the object in which the tag has been added. For example, if a user appears in a photo, the activity:object is the user + * and the activity:target is the photo. */ TAG("http://activitystrea.ms/schema/1.0/tag"), /** * The "update" Verb indicates that the Subject has modified the referenced Object. - * - * Implementors SHOULD use verbs such as Section 3.1.7 where the Subject is adding - * new items to a Section 3.2.8 or similar. Update is reserved for modifications - * to existing Objects or data such as changing a user's profile information. - * + * + * Implementors SHOULD use verbs such as Section 3.1.7 where the Subject is adding new items to a Section 3.2.8 or similar. Update is reserved for + * modifications to existing Objects or data such as changing a user's profile information. + * * The "update" Verb is identified by the URI http://activitystrea.ms/schema/1.0/update. */ UPDATE("http://activitystrea.ms/schema/1.0/update"), /** - * - *

The "positive RSVP" verb indicates that the actor has made a - * positive RSVP for the object. This specification only defines the - * meaning of this verb when its object is an event (see Section 4.2.1 (Event)), though implementors SHOULD be prepared to - * handle other object types as meaning MAY be provided by extension - * specifications. - *

- *

The use of this Verb is only appropriate when the RSVP was - * created by an explicit action by the actor. It is not appropriate to - * use this verb when a user has been added as an attendee by an event - * organiser or administrator. - *

- *

The verb URI for the "positive RSVP" Verb is http://activitystrea.ms/schema/1.0/rsvp-yes. - *

+ * + *

+ * The "positive RSVP" verb indicates that the actor has made a positive RSVP for the object. This specification only defines the meaning of this verb when + * its object is an event (see Section 4.2.1 (Event)), though + * implementors SHOULD be prepared to handle other object types as meaning MAY be provided by extension specifications. + *

+ *

+ * The use of this Verb is only appropriate when the RSVP was created by an explicit action by the actor. It is not appropriate to use this verb when a user + * has been added as an attendee by an event organiser or administrator. + *

+ *

+ * The verb URI for the "positive RSVP" Verb is http://activitystrea.ms/schema/1.0/rsvp-yes. + *

*/ RSVP_YES("http://activitystrea.ms/schema/1.0/rsvp-yes"), /** - *

The "possible RSVP" verb indicates that the actor has made a - * possible RSVP for the object. This specification only defines the - * meaning of this verb when its object is an event (see Section 4.2.1 (Event)), though implementors SHOULD be prepared to - * handle other object types as meaning MAY be provided by extension - * specifications. - *

- *

The use of this Verb is only appropriate when the RSVP was - * created by an explicit action by the actor. It is not appropriate to - * use this verb when a user has been added as an attendee by an event - * organiser or administrator. - *

- *

The verb URI for the "possible RSVP" Verb is http://activitystrea.ms/schema/1.0/rsvp-maybe. - *

+ *

+ * The "possible RSVP" verb indicates that the actor has made a possible RSVP for the object. This specification only defines the meaning of this verb when + * its object is an event (see Section 4.2.1 (Event)), though + * implementors SHOULD be prepared to handle other object types as meaning MAY be provided by extension specifications. + *

+ *

+ * The use of this Verb is only appropriate when the RSVP was created by an explicit action by the actor. It is not appropriate to use this verb when a user + * has been added as an attendee by an event organiser or administrator. + *

+ *

+ * The verb URI for the "possible RSVP" Verb is http://activitystrea.ms/schema/1.0/rsvp-maybe. + *

*/ RSVP_MAYBE("http://activitystrea.ms/schema/1.0/rsvp-maybe"), /** - *

The "negative RSVP" verb indicates that the actor has made a - * negative RSVP for the object. This specification only defines the - * meaning of this verb when its object is an event (see Section 4.2.1 (Event)), though implementors SHOULD be prepared to - * handle other object types as meaning MAY be provided by extension - * specifications. - *

- *

The use of this Verb is only appropriate when the RSVP was - * created by an explicit action by the actor. It is not appropriate to - * use this verb when a user has been added as an attendee by an event - * organiser or administrator. - *

- *

The verb URI for the "negative RSVP" Verb is http://activitystrea.ms/schema/1.0/rsvp-no. - *

+ *

+ * The "negative RSVP" verb indicates that the actor has made a negative RSVP for the object. This specification only defines the meaning of this verb when + * its object is an event (see Section 4.2.1 (Event)), though + * implementors SHOULD be prepared to handle other object types as meaning MAY be provided by extension specifications. + *

+ *

+ * The use of this Verb is only appropriate when the RSVP was created by an explicit action by the actor. It is not appropriate to use this verb when a user + * has been added as an attendee by an event organiser or administrator. + *

+ *

+ * The verb URI for the "negative RSVP" Verb is http://activitystrea.ms/schema/1.0/rsvp-no. + *

*/ RSVP_NO("http://activitystrea.ms/schema/1.0/rsvp-no"); private final String iri; @@ -181,22 +162,23 @@ public enum Verb { /** * @param iri */ - Verb(final String iri){ + Verb(final String iri) { this.iri = iri; } @Override - public String toString(){ + public String toString() { return iri; } + /** * * @param iri * @return */ - public static Verb fromIRI(String iri){ - for(Verb v: Verb.values()){ - if(v.toString().equals(iri)){ + public static Verb fromIRI(final String iri) { + for (final Verb v : Verb.values()) { + if (v.toString().equals(iri)) { return v; } } diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Video.java b/src/main/java/org/rometools/feed/module/activitystreams/types/Video.java index 4044c86..72a2714 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Video.java +++ b/src/main/java/org/rometools/feed/module/activitystreams/types/Video.java @@ -18,29 +18,28 @@ package org.rometools.feed.module.activitystreams.types; /** - *

The "video" Object type represents video content, which usually - * consists of a motion picture track and an audio track. - *

- *

The "video" Object type is identified by the URI http://activitystrea.ms/schema/1.0/video. - *

- *

A video has the following additional components: - *

- *

- *
- *
Video Stream Link
- *
A Media Link Construct linking - * to the video content itself. Represented in JSON as a property - * called stream whose value is a JSON - * object with properties as defined in [TODO: xref the JSON - * serialization of a Media Link Construct] - *
- *
Embed Code
- *
An HTML fragment that, when embedded in - * an HTML page, will provide an interactive player UI for the - * video stream. Represented in JSON as a property called embedCode whose value is a JSON string - * containing the fragment of HTML. - *
- *
+ *

+ * The "video" Object type represents video content, which usually consists of a motion picture track and an audio track. + *

+ *

+ * The "video" Object type is identified by the URI http://activitystrea.ms/schema/1.0/video. + *

+ *

+ * A video has the following additional components: + *

+ *

+ *

+ *
+ *
+ *
Video Stream Link
+ *
A Media Link Construct linking to the video content itself. Represented in JSON as a property called stream whose value is a JSON object with + * properties as defined in [TODO: xref the JSON serialization of a Media Link Construct]
+ *
Embed Code
+ *
An HTML fragment that, when embedded in an HTML page, will provide an interactive player UI for the video stream. Represented in JSON as a property + * called embedCode whose value is a JSON string containing the fragment of HTML.
+ *
+ *
+ * * @author robert.cooper */ public class Video { diff --git a/src/main/java/org/rometools/feed/module/atomthread/ThreadModule.java b/src/main/java/org/rometools/feed/module/atomthread/ThreadModule.java index 37ef9d3..61d4be4 100644 --- a/src/main/java/org/rometools/feed/module/atomthread/ThreadModule.java +++ b/src/main/java/org/rometools/feed/module/atomthread/ThreadModule.java @@ -18,7 +18,7 @@ package org.rometools.feed.module.atomthread; /** - * + * * @author robert.cooper */ public interface ThreadModule { diff --git a/src/main/java/org/rometools/feed/module/base/Article.java b/src/main/java/org/rometools/feed/module/base/Article.java index 0c7dafc..3c5cc58 100644 --- a/src/main/java/org/rometools/feed/module/base/Article.java +++ b/src/main/java/org/rometools/feed/module/base/Article.java @@ -41,10 +41,9 @@ package org.rometools.feed.module.base; import java.util.Date; - /** - * This is an interface for the GoogleBase plug in that exposes methods used for - * Article or News entry types. + * This is an interface for the GoogleBase plug in that exposes methods used for Article or News entry types. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.2 $ */ @@ -52,39 +51,34 @@ public interface Article extends GlobalInterface { /** * Array of Author Names. Limit 10. * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * author
author
- * Details - * Author of the item. Details Author of the item.
- * Example <g:author>John Steinbeck</g:author> Example <g:author>John Steinbeck</g:author>
- * Attribute of - * Reference Items, News and Articles Attribute of Reference Items, News and Articles
- * Content type - * string Content type string
+ * + * + * * @param authors Array of Author Names. Limit 10. */ public void setAuthors(String[] authors); @@ -92,304 +86,283 @@ public interface Article extends GlobalInterface { /** * Array of Author Names. Limit 10. * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * author
author
- * Details - * Author of the item. Details Author of the item.
- * Example <g:author>John Steinbeck</g:author> Example <g:author>John Steinbeck</g:author>
- * Attribute of - * Reference Items, News and Articles Attribute of Reference Items, News and Articles
- * Content type - * string Content type string
+ * + * + * * @return Array of author names. */ public String[] getAuthors(); /** * Source for this article. - * - * + * + * * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * * - * + * * - * - * + * + * * - *
- * news_source
news_source
- * Details - * The source of news content. Details The source of news content.
- * Example <g:news_source>Journal</g:news_source> Example <g:news_source>Journal</g:news_source>
- * Attribute of - * News and Articles Attribute of News and Articles
- * - * Content type - * string + * + * Content type string
+ * + * + * * @param newsSource Source for this article */ public void setNewsSource(String newsSource); /** * Source for this article. - * + * * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * * - * + * * - * - * + * + * * - *
- * news_source
news_source
- * Details - * The source of news content. Details The source of news content.
- * Example <g:news_source>Journal</g:news_source> Example <g:news_source>Journal</g:news_source>
- * Attribute of - * News and Articles Attribute of News and Articles
- * - * Content type - * string + * + * Content type string
+ * + * + * * @return source for this article. */ public String getNewsSource(); /** * Number of pages in the article. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * pages
pages
- * Details - * - * The number of pages in the publication. Details + * + * The number of pages in the publication.
- * Example <g:pages>18</g:pages> Example <g:pages>18</g:pages>
- * Attribute of - * Reference Items, News and Articles Attribute of Reference Items, News and Articles
- * - * Content type - * integer + * + * Content type integer
+ * + * + * * @param pages Number of pages in the article */ public void setPages(Integer pages); /** * Number of pages in the article. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * pages
pages
- * Details - * - * The number of pages in the publication. Details + * + * The number of pages in the publication.
- * Example <g:pages>18</g:pages> Example <g:pages>18</g:pages>
- * Attribute of - * Reference Items, News and Articles Attribute of Reference Items, News and Articles
- * - * Content type - * integer + * + * Content type integer
+ * + * + * * @return Number of pages in the article */ public Integer getPages(); /** * Date article was published. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * * - * - * + * + * * - *
- * publish_date
publish_date
- * - * Details - * Date the item was published in ISO 8601 format: - * YYYY-MM-DD + * + * Details Date the item was published in ISO 8601 format: + * YYYY-MM-DD
- * - * Example <g:publish_date>2005-12-20</g:publish_date> + * + * Example <g:publish_date>2005-12-20</g:publish_date>
- * Attribute of - * Reference Items Attribute of Reference Items
- * - * Content type - * - * date + * + * Content type + * + * date
+ * + * + * * @param publishDate Date article was published */ public void setPublishDate(Date publishDate); /** - * Date article was published. - * + * Date article was published. + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * * - * - * + * + * * - *
- * publish_date
publish_date
- * - * Details - * Date the item was published in ISO 8601 format: - * YYYY-MM-DD + * + * Details Date the item was published in ISO 8601 format: + * YYYY-MM-DD
- * - * Example <g:publish_date>2005-12-20</g:publish_date> + * + * Example <g:publish_date>2005-12-20</g:publish_date>
- * Attribute of - * Reference Items Attribute of Reference Items
- * - * Content type - * - * date + * + * Content type + * + * date
+ * + * + * * @return Date article was published */ public Date getPublishDate(); diff --git a/src/main/java/org/rometools/feed/module/base/Course.java b/src/main/java/org/rometools/feed/module/base/Course.java index f4e1ce6..0273655 100644 --- a/src/main/java/org/rometools/feed/module/base/Course.java +++ b/src/main/java/org/rometools/feed/module/base/Course.java @@ -40,443 +40,430 @@ package org.rometools.feed.module.base; import org.rometools.feed.module.base.types.DateTimeRange; - /** - * This is an interface for the GoogleBase plug in that exposes methods used for - * Class or Course information entry types. + * This is an interface for the GoogleBase plug in that exposes methods used for Class or Course information entry types. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.2 $ */ public interface Course extends GlobalInterface { /** * The timeframe a course is running. - * - * + * + * * - * - * - * - * + * + * + * + * + * * * - * - * + * + * * * - * - * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * course_date_range
course_date_range
- * DetailsDate and time range a class is in session, in ISO 8601. Two sub-attributes - * are included in course_date_range attribute.
    - * - *
  • start = Start date and time of a trip in - * format YYYY-MM-DDThh:mm:ss
    • - *
  • end = End date and time of a trip in - * format YYYY-MM-DDThh:mm:ss
 DetailsDate and time range a class is in session, in ISO + * 8601. Two sub-attributes are included in course_date_range attribute. + *
    + * + *
  • start = Start date and time of a trip in format YYYY-MM-DDThh:mm:ss
    • + *
  • end = End date and time of a trip in format YYYY-MM-DDThh:mm:ss
    • + *
+ *
- * Example <g:course_date_range>
- * - * <g:start>2005-12-20T09:30:01</g:start> - *
+ * 		Example <g:course_date_range>
+ * + * <g:start>2005-12-20T09:30:01</g:start>
* <g:end>2005-12-29T10:30:59</g:end>
* </g:course_date_range>
- * - * Attribute of - * Course schedules + * + * Attribute of Course schedules
- * - * Content type - * dateTimeRange + * + * Content type dateTimeRange
+ * + * + * * @param courseDateRange The timeframe a course is running */ public void setCourseDateRange(DateTimeRange courseDateRange); /** * The timeframe a course is running. - * - * + * + * * - * - * - * - * + * + * + * + * + * * * - * - * + * + * * * - * - * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * course_date_range
course_date_range
- * DetailsDate and time range a class is in session, in ISO 8601. Two sub-attributes - * are included in course_date_range attribute.
    - * - *
  • start = Start date and time of a trip in - * format YYYY-MM-DDThh:mm:ss
    • - *
  • end = End date and time of a trip in - * format YYYY-MM-DDThh:mm:ss
 DetailsDate and time range a class is in session, in ISO + * 8601. Two sub-attributes are included in course_date_range attribute. + *
    + * + *
  • start = Start date and time of a trip in format YYYY-MM-DDThh:mm:ss
    • + *
  • end = End date and time of a trip in format YYYY-MM-DDThh:mm:ss
    • + *
+ *
- * Example <g:course_date_range>
- * - * <g:start>2005-12-20T09:30:01</g:start> - *
+ * 		Example <g:course_date_range>
+ * + * <g:start>2005-12-20T09:30:01</g:start>
* <g:end>2005-12-29T10:30:59</g:end>
* </g:course_date_range>
- * - * Attribute of - * Course schedules + * + * Attribute of Course schedules
- * - * Content type - * dateTimeRange + * + * Content type dateTimeRange
+ * + * + * * @return The timeframe a course is running */ public DateTimeRange getCourseDateRange(); /** * ID code associated with a course. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
course_number
Details ID code associated with a course
Example <g:course_number>HIST-90A</g:course_number>
Attribute - * of Course schedules
Content - * type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
course_number
DetailsID code associated with a course
Example<g:course_number>HIST-90A</g:course_number>
Attribute ofCourse schedules
Content typestring
+ * * @param courseNumber ID code associated with a course */ public void setCourseNumber(String courseNumber); /** * ID code associated with a course. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
course_number
Details ID code associated with a course
Example <g:course_number>HIST-90A</g:course_number>
Attribute - * of Course schedules
Content - * type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
course_number
DetailsID code associated with a course
Example<g:course_number>HIST-90A</g:course_number>
Attribute ofCourse schedules
Content typestring
+ * * @return ID code associated with a course */ public String getCourseNumber(); /** * Time a class is in session. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
course_times
Details Time a class is in session.
Example <g:course_times>MWF 08:30 - 09:45</g:course_times>
Attribute - * of Course schedules
Content - * type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
course_times
DetailsTime a class is in session.
Example<g:course_times>MWF 08:30 - 09:45</g:course_times>
Attribute ofCourse schedules
Content typestring
+ * * @param courseTimes Time a class is in session */ public void setCourseTimes(String courseTimes); /** * Time a class is in session. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
course_times
Details Time a class is in session.
Example <g:course_times>MWF 08:30 - 09:45</g:course_times>
Attribute - * of Course schedules
Content - * type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
course_times
DetailsTime a class is in session.
Example<g:course_times>MWF 08:30 - 09:45</g:course_times>
Attribute ofCourse schedules
Content typestring
+ * * @return Time a class is in session */ public String getCourseTimes(); /** * Salary for this position. - * - * - * + * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * * - *
- * salary
- * Details - * Salary for this position. Non-numeric values such as "$" symbols are not acceptable. salary
Details Salary for this position. Non-numeric values such as "$" symbols are not acceptable.
- * - * Example - * <g:salary>55000</g:salary> + * + * Example <g:salary>55000</g:salary>
- * - * Attribute of - * Jobs + * + * Attribute of Jobs
- * Content type - * + * Content type + * * float
+ * + * + * * @param salary Salary for this position */ public void setSalary(Float salary); /** * Salary for this position. - * - * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * * - *
- * salary
- * Details - * Salary for this position. Non-numeric values such as "$" symbols are not acceptable. salary
Details Salary for this position. Non-numeric values such as "$" symbols are not acceptable.
- * - * Example - * <g:salary>55000</g:salary> + * + * Example <g:salary>55000</g:salary>
- * - * Attribute of - * Jobs + * + * Attribute of Jobs
- * Content type - * + * Content type + * * float
+ * + * + * * @return Salary for this position */ public Float getSalary(); /** * Topics of study for a course. - * - * + * + * * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * * - * - * - * + * + * + * * - *
- * subject
subject
- * - * Details - * Topic of study for a course. + * + * Details Topic of study for a course.
- * Example <g:subject>Trigonometry</g:subject> Example <g:subject>Trigonometry</g:subject>
- * Attribute of - * - * Course schedules Attribute of + * + * Course schedules
- * Content type - * string Content type string
+ * + * + * * @param subject Topics of study for a course */ public void setSubjects(String[] subject); /** * Topics of study for a course. - * - * + * + * * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * * - * - * - * + * + * + * * - *
- * subject
subject
- * - * Details - * Topic of study for a course. + * + * Details Topic of study for a course.
- * Example <g:subject>Trigonometry</g:subject> Example <g:subject>Trigonometry</g:subject>
- * Attribute of - * - * Course schedules Attribute of + * + * Course schedules
- * Content type - * string Content type string
+ * + * + * * @return Topics of study for a course */ public String[] getSubjects(); @@ -484,41 +471,38 @@ public interface Course extends GlobalInterface { /** * Name of the school at which a class is offered. * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * university
university
- * Details - * Name of the school a class is offered at. Details Name of the school a class is offered at.
- * Example <g:university>Stanford</g:university> Example <g:university>Stanford</g:university>
- * - * Attribute of - * Course schedules + * + * Attribute of Course schedules
- * Content type - * - * string Content type + * + * string
+ * + * + * * @param university Name of the school at which a class is offered. */ public void setUniversity(String university); @@ -526,41 +510,38 @@ public interface Course extends GlobalInterface { /** * Name of the school at which a class is offered. * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * university
university
- * Details - * Name of the school a class is offered at. Details Name of the school a class is offered at.
- * Example <g:university>Stanford</g:university> Example <g:university>Stanford</g:university>
- * - * Attribute of - * Course schedules + * + * Attribute of Course schedules
- * Content type - * - * string Content type + * + * string
+ * + * + * * @return Name of the school at which a class is offered. */ public String getUniversity(); diff --git a/src/main/java/org/rometools/feed/module/base/CustomTag.java b/src/main/java/org/rometools/feed/module/base/CustomTag.java index 55139c6..dad4798 100644 --- a/src/main/java/org/rometools/feed/module/base/CustomTag.java +++ b/src/main/java/org/rometools/feed/module/base/CustomTag.java @@ -20,106 +20,111 @@ package org.rometools.feed.module.base; - /** * This class represents a custom tag name and value. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.2 $ */ -public interface CustomTag { - +public interface CustomTag { + /** * Returns the tag name used. + * * @return Returns the tag name used. */ public String getName(); - + /** - * The value of the custom tag. - *
+ * The value of the custom tag.
*
* - * - * + * + * + * * - * - * - * - * - * - * - * + * + * + * + * + * + * + * * - * - * - * - * - * - * - * + * + * + * + * + * + * + * * - * - * - * - * - * - * + * + * + * + * + * + * * - * + * * - * - * - * - * - * + * + * + * + * + * * - * - * + * + * * * - * - * - * - * + * + * + * + * * - * - * + * + * * - * - * - * - * - * + * + * + * + * + * * - * + * * - * - * - * - * - * + * + * + * + * * - * - * + * + * * - * - * - * - * - * + * + * + * + * + * * - * - * + * + * * - * - * - * + * + * + * + * + * + *
Type (JavaType)
Type (JavaType)DescriptionExamples
string (String)Any stringBlueDescriptionExamples
string (String)Any stringBlue
int (Integer)Whole number values1000
int (Integer)Whole number values1000
float (Float)Numbers with decimal digits3.5
intUnit (IntUnit)float (Float)Numbers with decimal digits3.5
intUnit (IntUnit)Whole number value and a stringWhole number value and a string10 km
floatUnit (FloatUnit)Numbers with decimal digits and a string10 km
floatUnit (FloatUnit)Numbers with decimal digits and a string1.5 km
1.5 km
date (ShortDate)Date of an event, in format YYYY-MM-DD2005-12-12
date (ShortDate)Date of an event, in format YYYY-MM-DD2005-12-12
dateTime (java.util.Date)
dateTime (java.util.Date)Date and time for an event, in format YYYY-MM-DDThh:mm:ss2005-12-12T12:00:00
dateTimeRange (DateTimeRange)Date and time for an event, in format YYYY-MM-DDThh:mm:ss2005-12-12T12:00:00
dateTimeRange (DateTimeRange)Start and end dates for an event. An attribute of this type will contain two sub-attributes, <start> and <end> in format YYYY-MM-DDStart and end dates for an event. An attribute of this type will contain two sub-attributes, <start> and <end> in format + * YYYY-MM-DD<start>1975-09-25</start>
<end>1975-09-25</end> + * 		<start>1975-09-25</start>
+ * <end>1975-09-25</end> * *
url (java.net.URL)HTTP URL
url (java.net.URL)HTTP URL http://www.google.com
http://www.google.com
boolean (Boolean)Value may be either true or false.true
boolean (Boolean)Value may be either true or false.true
location (CustomTagImpl.Location)
location (CustomTagImpl.Location)Location921 W. Dana Street, Mtn View, CA-94103
Location921 W. Dana Street, Mtn View, CA-94103
* - * * @return The value of the tag. The objects class is determined by the "type" attribute on the tag. */ public Object getValue(); - + } diff --git a/src/main/java/org/rometools/feed/module/base/CustomTagImpl.java b/src/main/java/org/rometools/feed/module/base/CustomTagImpl.java index 8438d8d..29eefda 100644 --- a/src/main/java/org/rometools/feed/module/base/CustomTagImpl.java +++ b/src/main/java/org/rometools/feed/module/base/CustomTagImpl.java @@ -19,179 +19,191 @@ */ package org.rometools.feed.module.base; +import java.net.URL; +import java.util.Date; + import org.rometools.feed.module.base.types.DateTimeRange; import org.rometools.feed.module.base.types.FloatUnit; import org.rometools.feed.module.base.types.IntUnit; import org.rometools.feed.module.base.types.ShortDate; -import java.net.URL; - -import java.util.Date; - - /** * @version $Revision: 1.1 $ * @author Robert "kebernet" Cooper */ public class CustomTagImpl implements CustomTag { private Object value; - private String name; + private final String name; /** Creates a new instance of CustomTagImpl */ - public CustomTagImpl(String name,String value) { - if( name == null || value == null ){ throw new NullPointerException("Name and Value cannont be null."); } + public CustomTagImpl(final String name, final String value) { + if (name == null || value == null) { + throw new NullPointerException("Name and Value cannont be null."); + } this.name = name; this.value = value; } - public CustomTagImpl(String name,Integer value) { - if( name == null || value == null ){ throw new NullPointerException("Name and Value cannont be null."); } + public CustomTagImpl(final String name, final Integer value) { + if (name == null || value == null) { + throw new NullPointerException("Name and Value cannont be null."); + } this.name = name; this.value = value; } - public CustomTagImpl(String name,Float value) { - if( name == null || value == null ){ throw new NullPointerException("Name and Value cannont be null."); } + public CustomTagImpl(final String name, final Float value) { + if (name == null || value == null) { + throw new NullPointerException("Name and Value cannont be null."); + } this.name = name; this.value = value; } - public CustomTagImpl(String name,IntUnit value) { - if( name == null || value == null ){ throw new NullPointerException("Name and Value cannont be null."); } + public CustomTagImpl(final String name, final IntUnit value) { + if (name == null || value == null) { + throw new NullPointerException("Name and Value cannont be null."); + } this.name = name; this.value = value; } - public CustomTagImpl(String name,FloatUnit value) { - if( name == null || value == null ){ throw new NullPointerException("Name and Value cannont be null."); } + public CustomTagImpl(final String name, final FloatUnit value) { + if (name == null || value == null) { + throw new NullPointerException("Name and Value cannont be null."); + } this.name = name; this.value = value; } - public CustomTagImpl(String name,ShortDate value) { - if( name == null || value == null ){ throw new NullPointerException("Name and Value cannont be null."); } + public CustomTagImpl(final String name, final ShortDate value) { + if (name == null || value == null) { + throw new NullPointerException("Name and Value cannont be null."); + } this.name = name; this.value = value; } - public CustomTagImpl(String name,Date value) { - if( name == null || value == null ){ throw new NullPointerException("Name and Value cannont be null."); } + public CustomTagImpl(final String name, final Date value) { + if (name == null || value == null) { + throw new NullPointerException("Name and Value cannont be null."); + } this.name = name; this.value = value; } - public CustomTagImpl(String name,DateTimeRange value) { - if( name == null || value == null ){ throw new NullPointerException("Name and Value cannont be null."); } + public CustomTagImpl(final String name, final DateTimeRange value) { + if (name == null || value == null) { + throw new NullPointerException("Name and Value cannont be null."); + } this.name = name; this.value = value; } - public CustomTagImpl(String name,URL value) { - if( name == null || value == null ){ throw new NullPointerException("Name and Value cannont be null."); } + public CustomTagImpl(final String name, final URL value) { + if (name == null || value == null) { + throw new NullPointerException("Name and Value cannont be null."); + } this.name = name; this.value = value; } - public CustomTagImpl(String name,Boolean value) { - if( name == null || value == null ){ throw new NullPointerException("Name and Value cannont be null."); } + public CustomTagImpl(final String name, final Boolean value) { + if (name == null || value == null) { + throw new NullPointerException("Name and Value cannont be null."); + } this.name = name; this.value = value; } - public CustomTagImpl(String name,Location value) { - if( name == null || value == null ){ throw new NullPointerException("Name and Value cannont be null."); } + public CustomTagImpl(final String name, final Location value) { + if (name == null || value == null) { + throw new NullPointerException("Name and Value cannont be null."); + } this.name = name; this.value = value; } public String getName() { - return this.name; + return name; } public Object getValue() { - return this.value; + return value; } - public boolean equals( Object o ){ - if( o instanceof CustomTag ){ - CustomTag tag = (CustomTag) o; - if( this.name.equals( tag.getName() ) && this.value.equals( tag.getValue() )) - return true; - } - return false; + @Override + public boolean equals(final Object o) { + if (o instanceof CustomTag) { + final CustomTag tag = (CustomTag) o; + if (name.equals(tag.getName()) && value.equals(tag.getValue())) { + return true; + } + } + return false; } - + /** - * Creates and returns a copy of this object. The precise meaning - * of "copy" may depend on the class of the object. The general - * intent is that, for any object x, the expression: - *
- * 
-     * x.clone() != x
- * will be true, and that the expression: - *
- * 
-     * x.clone().getClass() == x.getClass()
- * will be true, but these are not absolute requirements. - * While it is typically the case that: - *
- * 
-     * x.clone().equals(x)
- * will be true, this is not an absolute requirement. - *

- * By convention, the returned object should be obtained by calling - * super.clone. If a class and all of its superclasses (except - * Object) obey this convention, it will be the case that - * x.clone().getClass() == x.getClass(). - *

- * By convention, the object returned by this method should be independent - * of this object (which is being cloned). To achieve this independence, - * it may be necessary to modify one or more fields of the object returned - * by super.clone before returning it. Typically, this means - * copying any mutable objects that comprise the internal "deep structure" - * of the object being cloned and replacing the references to these - * objects with references to the copies. If a class contains only - * primitive fields or references to immutable objects, then it is usually - * the case that no fields in the object returned by super.clone - * need to be modified. - *

- * The method clone for class Object performs a - * specific cloning operation. First, if the class of this object does - * not implement the interface Cloneable, then a - * CloneNotSupportedException is thrown. Note that all arrays - * are considered to implement the interface Cloneable. - * Otherwise, this method creates a new instance of the class of this - * object and initializes all its fields with exactly the contents of - * the corresponding fields of this object, as if by assignment; the - * contents of the fields are not themselves cloned. Thus, this method - * performs a "shallow copy" of this object, not a "deep copy" operation. - *

- * The class Object does not itself implement the interface - * Cloneable, so calling the clone method on an object - * whose class is Object will result in throwing an - * exception at run time. + * Creates and returns a copy of this object. The precise meaning of "copy" may depend on the class of the object. The general intent is that, for any + * object x, the expression:

* - * @return a clone of this instance. - * @exception CloneNotSupportedException if the object's class does not - * support the Cloneable interface. Subclasses - * that override the clone method can also - * throw this exception to indicate that an instance cannot - * be cloned. + * 
+     * x.clone() != x
+     *
+ * + *
will be true, and that the expression:
+ * + * 
+     * x.clone().getClass() == x.getClass()
+     *
+ * + *
will be true, but these are not absolute requirements. While it is typically the case that:
+ * + * 
+     * x.clone().equals(x)
+     *
+ * + *
will be true, this is not an absolute requirement. + *

+ * By convention, the returned object should be obtained by calling super.clone. If a class and all of its superclasses (except Object) + * obey this convention, it will be the case that x.clone().getClass() == x.getClass(). + *

+ * By convention, the object returned by this method should be independent of this object (which is being cloned). To achieve this independence, it may be + * necessary to modify one or more fields of the object returned by super.clone before returning it. Typically, this means copying any mutable + * objects that comprise the internal "deep structure" of the object being cloned and replacing the references to these objects with references to the + * copies. If a class contains only primitive fields or references to immutable objects, then it is usually the case that no fields in the object returned + * by super.clone need to be modified. + *

+ * The method clone for class Object performs a specific cloning operation. First, if the class of this object does not implement the + * interface Cloneable, then a CloneNotSupportedException is thrown. Note that all arrays are considered to implement the interface + * Cloneable. Otherwise, this method creates a new instance of the class of this object and initializes all its fields with exactly the contents of + * the corresponding fields of this object, as if by assignment; the contents of the fields are not themselves cloned. Thus, this method performs a + * "shallow copy" of this object, not a "deep copy" operation. + *

+ * The class Object does not itself implement the interface Cloneable, so calling the clone method on an object whose class is + * Object will result in throwing an exception at run time. + * + * @return a clone of this instance. + * @exception CloneNotSupportedException if the object's class does not support the Cloneable interface. Subclasses that override the + * clone method can also throw this exception to indicate that an instance cannot be cloned. * @see java.lang.Cloneable */ + @Override public Object clone() throws CloneNotSupportedException { - CustomTagImpl cti = new CustomTagImpl( this.name, "" ); - cti.value = this.value; - return cti; + final CustomTagImpl cti = new CustomTagImpl(name, ""); + cti.value = value; + return cti; } + @Override public String toString() { - return "[custom name=\""+this.name+"\" value=\""+this.value.toString()+"\"]"; + return "[custom name=\"" + name + "\" value=\"" + value.toString() + "\"]"; } - public static class Location { - private String value; - public Location(String value) { + public static class Location { + private final String value; + + public Location(final String value) { this.value = value; } @@ -199,17 +211,23 @@ public class CustomTagImpl implements CustomTag { return value; } + @Override public Object clone() { - return new Location(this.value); + return new Location(value); } + @Override public String toString() { return value; } - - public boolean equals( Object o ){ - if( o instanceof Location && ((Location) o).value.equals(this.value) ) return true; - else return false; - } + + @Override + public boolean equals(final Object o) { + if (o instanceof Location && ((Location) o).value.equals(value)) { + return true; + } else { + return false; + } + } } } diff --git a/src/main/java/org/rometools/feed/module/base/CustomTags.java b/src/main/java/org/rometools/feed/module/base/CustomTags.java index 00bdb75..4e02bdd 100644 --- a/src/main/java/org/rometools/feed/module/base/CustomTags.java +++ b/src/main/java/org/rometools/feed/module/base/CustomTags.java @@ -20,19 +20,20 @@ package org.rometools.feed.module.base; -import com.sun.syndication.feed.module.Module; import java.util.List; +import com.sun.syndication.feed.module.Module; + /** * @version $Revision: 1.1 $ * @author Robert "kebernet" Cooper */ public interface CustomTags extends Module { - + public static final String URI = "http://base.google.com/cns/1.0"; - + public List getValues(); - + public void setValues(List values); - + } diff --git a/src/main/java/org/rometools/feed/module/base/CustomTagsImpl.java b/src/main/java/org/rometools/feed/module/base/CustomTagsImpl.java index 40263e7..f20a9ad 100644 --- a/src/main/java/org/rometools/feed/module/base/CustomTagsImpl.java +++ b/src/main/java/org/rometools/feed/module/base/CustomTagsImpl.java @@ -20,49 +20,50 @@ package org.rometools.feed.module.base; -import com.sun.syndication.feed.CopyFrom; import java.util.ArrayList; import java.util.List; +import com.sun.syndication.feed.CopyFrom; + /** * @version $Revision: 1.1 $ * @author Robert "kebernet" Cooper */ public class CustomTagsImpl implements CustomTags { - + private List values; + /** Creates a new instance of CustomTagsImpl */ public CustomTagsImpl() { } - - public List getValues(){ - values = (values == null )? new ArrayList() : values; - return values; + + public List getValues() { + values = values == null ? new ArrayList() : values; + return values; } - - public void setValues(List values){ - this.values = values; + + public void setValues(final List values) { + this.values = values; } - - public void copyFrom(CopyFrom object) { - CustomTags ct = (CustomTags) object; - this.values = new ArrayList( ct.getValues() ); + + public void copyFrom(final CopyFrom object) { + final CustomTags ct = (CustomTags) object; + values = new ArrayList(ct.getValues()); } - + @Override public Object clone() { - CustomTagsImpl cti = new CustomTagsImpl(); - cti.values = new ArrayList( this.values ); - return cti; + final CustomTagsImpl cti = new CustomTagsImpl(); + cti.values = new ArrayList(values); + return cti; } - - public Class getInterface(){ - return CustomTags.class; + + public Class getInterface() { + return CustomTags.class; } public String getUri() { - return CustomTags.URI; + return CustomTags.URI; } - } diff --git a/src/main/java/org/rometools/feed/module/base/Event.java b/src/main/java/org/rometools/feed/module/base/Event.java index cc14e66..c781c7d 100644 --- a/src/main/java/org/rometools/feed/module/base/Event.java +++ b/src/main/java/org/rometools/feed/module/base/Event.java @@ -46,246 +46,243 @@ import org.rometools.feed.module.base.types.PaymentTypeEnumeration; import org.rometools.feed.module.base.types.PriceTypeEnumeration; import org.rometools.feed.module.base.types.ShippingType; - /** - * This is an interface for the GoogleBase plug in that exposes methods used for - * Event entry types. + * This is an interface for the GoogleBase plug in that exposes methods used for Event entry types. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ public interface Event extends GlobalInterface { /** - * Currency of the price amount for an item. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
currency
Details Currency - * of the price amount for an item. Values must be in ISO - * 4217 currency code format.
Example Acceptable:
<g:currency>USD</g:currency>
- * - * Not acceptable:
<g:currency>US Dollars</g:currency>
Attribute - * of Events, - * Housing, Products, Services, Travel, Vehicles
Content - * type currencyEnumeration
- * @param value Currency of the price amount for an item. + * Currency of the price amount for an item. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
currency
DetailsCurrency of the price amount for an item. Values must be in ISO 4217 currency code format.
ExampleAcceptable:
+ * <g:currency>USD</g:currency>
+ * + * Not acceptable:
+ * <g:currency>US Dollars</g:currency>
Attribute ofEvents, Housing, Products, Services, Travel, Vehicles
Content typecurrencyEnumeration
+ * + * @param value Currency of the price amount for an item. */ public void setCurrency(CurrencyEnumeration value); /** - * Currency of the price amount for an item. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
currency
Details Currency - * of the price amount for an item. Values must be in ISO - * 4217 currency code format.
Example Acceptable:
<g:currency>USD</g:currency>
- * - * Not acceptable:
<g:currency>US Dollars</g:currency>
Attribute - * of Events, - * Housing, Products, Services, Travel, Vehicles
Content - * type currencyEnumeration
- * @return Currency of the price amount for an item. + * Currency of the price amount for an item. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
currency
DetailsCurrency of the price amount for an item. Values must be in ISO 4217 currency code format.
ExampleAcceptable:
+ * <g:currency>USD</g:currency>
+ * + * Not acceptable:
+ * <g:currency>US Dollars</g:currency>
Attribute ofEvents, Housing, Products, Services, Travel, Vehicles
Content typecurrencyEnumeration
+ * + * @return Currency of the price amount for an item. */ public CurrencyEnumeration getCurrency(); /** * Additional instructions to explain the item’s delivery process. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_notes
Details Additional instructions to explain the item’s delivery process.
Example - * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
- * - *
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_notes
DetailsAdditional instructions to explain the item’s delivery process.
Example + * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
+ * + *
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typestring
+ * * @param deliveryNotes Additional instructions to explain the item’s delivery process. */ public void setDeliveryNotes(String deliveryNotes); /** * Additional instructions to explain the item’s delivery process. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_notes
Details Additional instructions to explain the item’s delivery process.
Example - * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
- * - *
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_notes
DetailsAdditional instructions to explain the item’s delivery process.
Example + * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
+ * + *
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typestring
+ * * @return Additional instructions to explain the item’s delivery process. */ public String getDeliveryNotes(); /** * The maximum distance you will deliver an item in any direction. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_radius
Details The maximum - * distance you will deliver an item in any direction.
Example - * <g:delivery_radius>10<g:/delivery_radius> - * - *
<g:delivery_radius>10km</g:delivery_radius>
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type floatUnit
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_radius
DetailsThe maximum distance you will deliver an item in any direction.
Example + * <g:delivery_radius>10<g:/delivery_radius>
+ * <g:delivery_radius>10km</g:delivery_radius>
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typefloatUnit
+ * * @param deliveryRadius The maximum distance you will deliver an item in any direction. */ public void setDeliveryRadius(FloatUnit deliveryRadius); /** * The maximum distance you will deliver an item in any direction. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_radius
Details The maximum - * distance you will deliver an item in any direction.
Example - * <g:delivery_radius>10<g:/delivery_radius> - * - *
<g:delivery_radius>10km</g:delivery_radius>
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type floatUnit
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_radius
DetailsThe maximum distance you will deliver an item in any direction.
Example + * <g:delivery_radius>10<g:/delivery_radius>
+ * <g:delivery_radius>10km</g:delivery_radius>
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typefloatUnit
+ * * @return The maximum distance you will deliver an item in any direction. */ public FloatUnit getDeliveryRadius(); @@ -293,53 +290,50 @@ public interface Event extends GlobalInterface { /** * The time during which this event takes place. * - * - * - * - * + * + * + * + * + * * * - * - * + * + * * * - * - * - * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * - *
- * event_date_range
event_date_range
- * Details - * - * Information on the date and time an - * event will take place, in ISO 8601 format. Two sub-attributes are included in the event_date_range attribute:
    - * - *
  • from = Date and time an event will begin - * in format YYYY-MM-DDThh:mm:ss
    • - *
  • to = - * (Optional). Date and time an event will end, in format YYYY-MM-DDThh:mm:ss
 Details + * + * Information on the date and time an event will take place, in ISO 8601 + * format. Two sub-attributes are included in the event_date_range attribute: + *
    + * + *
  • from = Date and time an event will begin in format YYYY-MM-DDThh:mm:ss
    • + *
  • to = (Optional). Date and time an event will end, in format YYYY-MM-DDThh:mm:ss
    • + *
+ *
- * Example <g:event_dateTime>
- * - * <g:from>2005-12-20T14:00:00</g:from>
- * <g:to>2005-12-20T19:00:00</g:to>
- * + * + * 		Example <g:event_dateTime>
+ * + * <g:from>2005-12-20T14:00:00</g:from>
+ * <g:to>2005-12-20T19:00:00</g:to>
+ * * </g:eventdateTime>
- * Attribute of - * Events Attribute of Events
- * Content type - * dateTimeRange Content type dateTimeRange
+ * + * + * + * * @param eventDateRange The time during which this event takes place. */ public void setEventDateRange(DateTimeRange eventDateRange); @@ -347,53 +341,50 @@ public interface Event extends GlobalInterface { /** * The time during which this event takes place. * - * - * - * - * + * + * + * + * + * * * - * - * + * + * * * - * - * - * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * - *
- * event_date_range
event_date_range
- * Details - * - * Information on the date and time an - * event will take place, in ISO 8601 format. Two sub-attributes are included in the event_date_range attribute:
    - * - *
  • from = Date and time an event will begin - * in format YYYY-MM-DDThh:mm:ss
    • - *
  • to = - * (Optional). Date and time an event will end, in format YYYY-MM-DDThh:mm:ss
 Details + * + * Information on the date and time an event will take place, in ISO 8601 + * format. Two sub-attributes are included in the event_date_range attribute: + *
    + * + *
  • from = Date and time an event will begin in format YYYY-MM-DDThh:mm:ss
    • + *
  • to = (Optional). Date and time an event will end, in format YYYY-MM-DDThh:mm:ss
    • + *
+ *
- * Example <g:event_dateTime>
- * - * <g:from>2005-12-20T14:00:00</g:from>
- * <g:to>2005-12-20T19:00:00</g:to>
- * + * + * 		Example <g:event_dateTime>
+ * + * <g:from>2005-12-20T14:00:00</g:from>
+ * <g:to>2005-12-20T19:00:00</g:to>
+ * * </g:eventdateTime>
- * Attribute of - * Events Attribute of Events
- * Content type - * dateTimeRange Content type dateTimeRange
+ * + * + * + * * @return The time during which this event takes place. */ public DateTimeRange getEventDateRange(); @@ -401,49 +392,45 @@ public interface Event extends GlobalInterface { /** * Location where the event will be held. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * - * + * <g:location>123 Main St,, CA, 12345, + * USA</g:location>
+ * <g:location> Anytown, CA, 12345, + * USA</g:location> + * * * - * - * + * + * * - * + * * - * - * - * - * - *
- * location
location
- * Details Location of a property. Should - * include street, city, state, postal code, and country, in that order. Details Location of a property. Should include street, city, state, postal code, and country, in that order.
- * Example - * Acceptable:
- * <g:location>123 Main St, Anytown, CA, 12345, USA</g:location>
- * + * 		Example Acceptable:
+ * <g:location>123 Main St, Anytown, CA, 12345, + * USA</g:location>
+ * * Not acceptable:
- * <g:location>123 Main St,, CA, 12345, USA</g:location>
- * <g:location> - * Anytown, CA, 12345, USA</g:location>
- * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
- * Content type - * locationType
+ * + * Content type + * locationType + * + * + * + * * @param location Location where the event will be held. */ public void setLocation(String location); @@ -451,949 +438,854 @@ public interface Event extends GlobalInterface { /** * Location where the event will be held. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * - * + * <g:location>123 Main St,, CA, 12345, + * USA</g:location>
+ * <g:location> Anytown, CA, 12345, + * USA</g:location> + * * * - * - * + * + * * - * + * * - * - * - * - * - *
- * location
location
- * Details Location of a property. Should - * include street, city, state, postal code, and country, in that order. Details Location of a property. Should include street, city, state, postal code, and country, in that order.
- * Example - * Acceptable:
- * <g:location>123 Main St, Anytown, CA, 12345, USA</g:location>
- * + * 		Example Acceptable:
+ * <g:location>123 Main St, Anytown, CA, 12345, + * USA</g:location>
+ * * Not acceptable:
- * <g:location>123 Main St,, CA, 12345, USA</g:location>
- * <g:location> - * Anytown, CA, 12345, USA</g:location>
- * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
- * Content type - * locationType
+ * + * Content type + * locationType + * + * + * + * * @return Location where the event will be held. */ public String getLocation(); /** * Payment Methods acceptable for the event. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * <g:payment_accepted>Cash Check Paypal</g:payment_accepted> * - * + * * - * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * - *
- * payment_accepted
payment_accepted
- * Details Acceptable payment methods for item purchases. Acceptable - * values are "Cash," "Check," "Traveler’s Check," "Visa," "MasterCard," - * - * "American Express," "Discover," "Wire transfer" or "Paypal." If you accept - * more than one method, include multiple instances of the - * <payment_accepted> attribute for each acceptable method. Details Acceptable payment methods for item purchases. Acceptable values are "Cash," "Check," "Traveler’s Check," "Visa," "MasterCard," + * + * "American Express," "Discover," "Wire transfer" or "Paypal." If you accept more than one method, include multiple instances of the + * <payment_accepted> attribute for each acceptable method.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:payment_accepted>Cash</g:payment_accepted>
- * + * * <g:payment_accepted>Check</g:payment_accepted>
- * + * * <g:payment_accepted>Paypal</g:payment_accepted>
* Not acceptable:
- * <g:payment_accepted>Cash - * Check Paypal</g:payment_accepted>
- * Attribute of - * Events, Housing, - * Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * paymentMethodEnumeration Content type paymentMethodEnumeration
+ * + * + * * @param paymentAccepted Payment Methods acceptable for the event. */ public void setPaymentAccepted(PaymentTypeEnumeration[] paymentAccepted); /** * Payment Methods acceptable for the event. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * <g:payment_accepted>Cash Check Paypal</g:payment_accepted> * - * + * * - * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * - *
- * payment_accepted
payment_accepted
- * Details Acceptable payment methods for item purchases. Acceptable - * values are "Cash," "Check," "Traveler’s Check," "Visa," "MasterCard," - * - * "American Express," "Discover," "Wire transfer" or "Paypal." If you accept - * more than one method, include multiple instances of the - * <payment_accepted> attribute for each acceptable method. Details Acceptable payment methods for item purchases. Acceptable values are "Cash," "Check," "Traveler’s Check," "Visa," "MasterCard," + * + * "American Express," "Discover," "Wire transfer" or "Paypal." If you accept more than one method, include multiple instances of the + * <payment_accepted> attribute for each acceptable method.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:payment_accepted>Cash</g:payment_accepted>
- * + * * <g:payment_accepted>Check</g:payment_accepted>
- * + * * <g:payment_accepted>Paypal</g:payment_accepted>
* Not acceptable:
- * <g:payment_accepted>Cash - * Check Paypal</g:payment_accepted>
- * Attribute of - * Events, Housing, - * Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * paymentMethodEnumeration Content type paymentMethodEnumeration
+ * + * + * * @return Payment Methods acceptable for the event. */ public PaymentTypeEnumeration[] getPaymentAccepted(); /** * Additional information about payment. - * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * payment_notes
payment_notes
- * Details - * Additional instructions to explain - * a payment policy. Details Additional instructions to explain a payment policy.
- * Example <g:payment_notes>Cash only for local orders.</g:payment_notes> Example <g:payment_notes>Cash only for local orders.</g:payment_notes>
- * Attribute of - * - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of + * + * Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * string Content type string
- * - * - * + * + * + * + * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * payment_notes
payment_notes
- * Details - * Additional instructions to explain - * a payment policy. Details Additional instructions to explain a payment policy.
- * Example <g:payment_notes>Cash only for local orders.</g:payment_notes> Example <g:payment_notes>Cash only for local orders.</g:payment_notes>
- * Attribute of - * - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of + * + * Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * string Content type string
- * - * - * + * + * + * + * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * payment_notes
payment_notes
- * Details - * Additional instructions to explain - * a payment policy. Details Additional instructions to explain a payment policy.
- * Example <g:payment_notes>Cash only for local orders.</g:payment_notes> Example <g:payment_notes>Cash only for local orders.</g:payment_notes>
- * Attribute of - * - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of + * + * Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * string Content type string
+ * + * + * * @param paymentNotes Additional information about payment. */ public void setPaymentNotes(String paymentNotes); /** * Additional information about payment. - * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * payment_notes
payment_notes
- * Details - * Additional instructions to explain - * a payment policy. Details Additional instructions to explain a payment policy.
- * Example <g:payment_notes>Cash only for local orders.</g:payment_notes> Example <g:payment_notes>Cash only for local orders.</g:payment_notes>
- * Attribute of - * - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of + * + * Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * string Content type string
- * - * + * + * + * + * * @return Additional information about payment. */ public String getPaymentNotes(); /** * Price of the event. - * - * + * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * - * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * - *
- * price
price
- * - * Details Prices can be a single price, 0 - * (free), or blank if not applicable. Numerice values only. When used - * as a sub-attribute of <shipping>, the value included reflects the price - * of shipping. + * + * Details Prices can be a single price, 0 (free), or blank if not applicable. Numerice values only. When used as a sub-attribute of + * <shipping>, the value included reflects the price of shipping.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:price>5.95</g:price>
- * + * * <g:price>0</g:price>
- * Not acceptable:
- * + * Not acceptable:
+ * * <g:price>5,95</g:price>
* <g:price>5.00 – 10.00</g:price>
- * + * * <g:price>100 or best offer</g:price>
* <g:price>free</g:price>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content typefloatUnit Content typefloatUnit
+ * + * + * * @param price Price of the event. */ public void setPrice(FloatUnit price); /** * Price of the event. - * - * + * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * - * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * - *
- * price
price
- * - * Details Prices can be a single price, 0 - * (free), or blank if not applicable. Numerice values only. When used - * as a sub-attribute of <shipping>, the value included reflects the price - * of shipping. + * + * Details Prices can be a single price, 0 (free), or blank if not applicable. Numerice values only. When used as a sub-attribute of + * <shipping>, the value included reflects the price of shipping.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:price>5.95</g:price>
- * + * * <g:price>0</g:price>
- * Not acceptable:
- * + * Not acceptable:
+ * * <g:price>5,95</g:price>
* <g:price>5.00 – 10.00</g:price>
- * + * * <g:price>100 or best offer</g:price>
* <g:price>free</g:price>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content typefloatUnit Content typefloatUnit
+ * + * + * * @return Price of the event. */ public FloatUnit getPrice(); /** * Price qualifier for the even cost. - * - * + * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * - * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
price_type
price_type
DetailsThe type of pricing for the - * item. Acceptable values are "negotiable," or "starting." The default is - * "starting"DetailsThe type of pricing for the item. Acceptable values are "negotiable," or "starting." The default is "starting"
ExampleAcceptable:
+ * + * 		ExampleAcceptable:
* <g:price_type>starting</g:price_type>
* Not acceptable:
* <g:price_type>100 OBO</g:price_type>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * priceTypeEnumeration Content type priceTypeEnumeration
+ * + * + * * @param priceType Price qualifier for the even cost. */ public void setPriceType(PriceTypeEnumeration priceType); /** * Price qualifier for the even cost. - * - * + * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * - * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
price_type
price_type
DetailsThe type of pricing for the - * item. Acceptable values are "negotiable," or "starting." The default is - * "starting"DetailsThe type of pricing for the item. Acceptable values are "negotiable," or "starting." The default is "starting"
ExampleAcceptable:
+ * + * 		ExampleAcceptable:
* <g:price_type>starting</g:price_type>
* Not acceptable:
* <g:price_type>100 OBO</g:price_type>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * priceTypeEnumeration Content type priceTypeEnumeration
+ * + * + * * @return Price qualifier for the even cost. */ public PriceTypeEnumeration getPriceType(); /** * Quantity available. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * Not acceptable:
+ * <g:quantity>out of stock</g:quantity> * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * quantity
quantity
- * Details The number of units available for purchase. This - * attribute can be left blank if you have a large quantity or if it is not - * applicable. Details The number of units available for purchase. This attribute can be left blank if you have a large quantity or if it is not + * applicable.
- * Example - * Acceptable:
+ * + * 		Example Acceptable:
* <g:quantity>18</g:quantity>
- * + * * <g:quantity>0</g:quantity>
- * - * Not acceptable:
- * <g:quantity>out - * of stock</g:quantity>
- * - * Attribute of - * Events, Products, - * Services, Travel, Vehicles + * + * Attribute of Events, Products, Services, Travel, Vehicles
- * Content type - * - * integer Content type + * + * integer
+ * + * + * * @param quantity Quantity available. */ public void setQuantity(Integer quantity); /** * Quantity available. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * Not acceptable:
+ * <g:quantity>out of stock</g:quantity> * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * quantity
quantity
- * Details The number of units available for purchase. This - * attribute can be left blank if you have a large quantity or if it is not - * applicable. Details The number of units available for purchase. This attribute can be left blank if you have a large quantity or if it is not + * applicable.
- * Example - * Acceptable:
+ * + * 		Example Acceptable:
* <g:quantity>18</g:quantity>
- * + * * <g:quantity>0</g:quantity>
- * - * Not acceptable:
- * <g:quantity>out - * of stock</g:quantity>
- * - * Attribute of - * Events, Products, - * Services, Travel, Vehicles + * + * Attribute of Events, Products, Services, Travel, Vehicles
- * Content type - * - * integer Content type + * + * integer
+ * + * + * * @return Quantity available. */ public Integer getQuantity(); /** * Shipping information related to the event. - * - * + * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - *
- * - * shipping
+ * + * shipping
- * Details - * Shipping options available for an item. Up to 10 - * shipping options can be included for each item. Three sub-attributes are - * included in the shipping attribute:
    - * - *
  • service = The type of service used to ship an item. Acceptable values are 'FedEx', 'UPS', 'DHL', 'Mail', and 'Other'
    • - *
  • country = The country an item will ship to. Only acceptable values are ISO 3166 country codes.
    • - *
  • price = - * the price of shipping.
 Details Shipping options available for an item. Up to 10 shipping options can be included for each item. Three sub-attributes are included + * in the shipping attribute: + *
    + * + *
  • service = The type of service used to ship an item. Acceptable values are 'FedEx', 'UPS', 'DHL', 'Mail', and 'Other'
    • + *
  • country = The country an item will ship to. Only acceptable values are ISO 3166 country codes.
    • + *
  • price = the price of shipping.
    • + *
+ *
- * - * Example <g:shipping>
- * <g:country>US</g:country>
- * - * <g:service>UPS</g:shipping>
- * - * <g:price>35.95</g:price>
+ * 		+ * + * Example <g:shipping>
+ * <g:country>US</g:country>
+ * + * <g:service>UPS</g:shipping>
+ * + * <g:price>35.95</g:price>
* </g:shipping>
- * Attribute of - * Products Attribute of Products
- * - * Content type - * shippingType + * + * Content type shippingType
+ * + * + * * @param shipping Shipping information related to the event. */ public void setShipping(ShippingType[] shipping); /** * Shipping information related to the event. - * - * + * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - *
- * - * shipping
+ * + * shipping
- * Details - * Shipping options available for an item. Up to 10 - * shipping options can be included for each item. Three sub-attributes are - * included in the shipping attribute:
    - * - *
  • service = The type of service used to ship an item. Acceptable values are 'FedEx', 'UPS', 'DHL', 'Mail', and 'Other'
    • - *
  • country = The country an item will ship to. Only acceptable values are ISO 3166 country codes.
    • - *
  • price = - * the price of shipping.
 Details Shipping options available for an item. Up to 10 shipping options can be included for each item. Three sub-attributes are included + * in the shipping attribute: + *
    + * + *
  • service = The type of service used to ship an item. Acceptable values are 'FedEx', 'UPS', 'DHL', 'Mail', and 'Other'
    • + *
  • country = The country an item will ship to. Only acceptable values are ISO 3166 country codes.
    • + *
  • price = the price of shipping.
    • + *
+ *
- * - * Example <g:shipping>
- * <g:country>US</g:country>
- * - * <g:service>UPS</g:shipping>
- * - * <g:price>35.95</g:price>
+ * 		+ * + * Example <g:shipping>
+ * <g:country>US</g:country>
+ * + * <g:service>UPS</g:shipping>
+ * + * <g:price>35.95</g:price>
* </g:shipping>
- * Attribute of - * Products Attribute of Products
- * - * Content type - * shippingType + * + * Content type shippingType
+ * + * + * * @return Shipping information related to the event. */ public ShippingType[] getShipping(); /** * Tax rate associated with the event. - * + * * - * - * - * - * + * * - * - * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * - *
- * tax_percent
- * - * Details - * Tax rate as a percentage. tax_percent
+ * + * Details Tax rate as a percentage.
- * Example <g:tax_percent>8.2<g:/tax_percent> Example <g:tax_percent>8.2<g:/tax_percent>
- * - * Attribute of - * - * Products, Events + * + * Attribute of + * + * Products, Events
- * Content type - * percentType Content type percentType
+ * + * + * * @param taxPercent Tax rate associated with the event. */ public void setTaxPercent(Float taxPercent); /** * Tax rate associated with the event. - * + * * - * - * - * - * + * * - * - * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * - *
- * tax_percent
- * - * Details - * Tax rate as a percentage. tax_percent
+ * + * Details Tax rate as a percentage.
- * Example <g:tax_percent>8.2<g:/tax_percent> Example <g:tax_percent>8.2<g:/tax_percent>
- * - * Attribute of - * - * Products, Events + * + * Attribute of + * + * Products, Events
- * Content type - * percentType Content type percentType
+ * + * + * * @return Tax rate associated with the event. */ public Float getTaxPercent(); /** * Region where tax applies. - * - * - * + * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * - *
- * - * tax_region
- * Details - * Geographical region a tax rate - * applies to. + * + * tax_region
Details Geographical region a tax rate applies to.
- * - * Example <g:tax_region>California</g:tax_region> + * + * Example <g:tax_region>California</g:tax_region>
- * Attribute of - * Product, - * Events, Attribute of Product, Events,
- * Content typestring Content typestring
+ * + * + * * @param taxRegion Region where tax applies. */ public void setTaxRegion(String taxRegion); /** * Region where tax applies. - * - * - * + * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * - *
- * - * tax_region
- * Details - * Geographical region a tax rate - * applies to. + * + * tax_region
Details Geographical region a tax rate applies to.
- * - * Example <g:tax_region>California</g:tax_region> + * + * Example <g:tax_region>California</g:tax_region>
- * Attribute of - * Product, - * Events, Attribute of Product, Events,
- * Content typestring Content typestring
+ * + * + * * @return Region where tax applies. */ public String getTaxRegion(); diff --git a/src/main/java/org/rometools/feed/module/base/GlobalInterface.java b/src/main/java/org/rometools/feed/module/base/GlobalInterface.java index f5a41af..7c233f9 100644 --- a/src/main/java/org/rometools/feed/module/base/GlobalInterface.java +++ b/src/main/java/org/rometools/feed/module/base/GlobalInterface.java @@ -43,489 +43,479 @@ import java.io.Serializable; import java.net.URL; import java.util.Date; - /** * This is an interface representing the universals. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.2 $ */ public interface GlobalInterface extends Serializable { - /**Expiration Date for this item. - *
- * - * - * - * - * - * - * - * - * - * - * - * - * + * + * + * + * + * + * + * + * + * + * + *
expiration_date
Details Date that the item expires in ISO 8601 format: - * YYYY-MM-DD
Example - * <g:expiration_date>2005-20-12</g:expiration_date> - * + /** + * Expiration Date for this item.
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * - * - * - * - * - * - * - * - * - * - * - *
expiration_date
Details Date that the item expires in ISO 8601 format: + * YYYY-MM-DD
Example <g:expiration_date>2005-20-12</g:expiration_date> + * *
Attribute of Reference Items, Events, Housing, - * Jobs, People profiles, Products, Services, Travel, Vehicles, Wanted Ads.
Content type date
+ *
Attribute of Reference Items, Events, Housing, Jobs, People profiles, Products, Services, Travel, Vehicles, Wanted Ads.
Content type date
+ * * @param expirationDate the date this entry will expire */ public void setExpirationDate(Date expirationDate); - /** Expiration Date for this item. - *
- * - * - * - * - * - * - * - * - * - * - * - * - * + * + * + * + * + * + * + * + * + * + * + *
expiration_date
Details Date that the item expires in ISO 8601 format: - * YYYY-MM-DD
Example - * <g:expiration_date>2005-20-12</g:expiration_date> - * + /** + * Expiration Date for this item.
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * - * - * - * - * - * - * - * - * - * - * - *
expiration_date
Details Date that the item expires in ISO 8601 format: + * YYYY-MM-DD
Example <g:expiration_date>2005-20-12</g:expiration_date> + * *
Attribute of Reference Items, Events, Housing, - * Jobs, People profiles, Products, Services, Travel, Vehicles, Wanted Ads.
Content type date
+ *
Attribute of Reference Items, Events, Housing, Jobs, People profiles, Products, Services, Travel, Vehicles, Wanted Ads.
Content type date
+ * * @return the date this entry will expire */ public Date getExpirationDate(); /** * Date and time that the item expires. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
expiration_date_time
Details Date and time that the item expires in ISO 8601 format: - * YYYY-MM-DDThh:mm:ss
Example - * <g:expiration_date_time>12-20-05T11:59:59</g:expiration_date_time> - *
Attribute of Reference Items, Events, Housing, - * Jobs, People profiles, Products, Services, Travel, Vehicles, Wanted Ads.
Content type dateTime
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
expiration_date_time
Details Date and time that the item expires in ISO 8601 + * format: YYYY-MM-DDThh:mm:ss
Example <g:expiration_date_time>12-20-05T11:59:59</g:expiration_date_time>
Attribute of Reference Items, Events, Housing, Jobs, People profiles, Products, Services, Travel, Vehicles, Wanted Ads.
Content type dateTime
+ * * @param expirationDateTime Date and time that the item expires. */ public void setExpirationDateTime(Date expirationDateTime); /** * Date and time that the item expires. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
expiration_date_time
Details Date and time that the item expires in ISO 8601 format: - * YYYY-MM-DDThh:mm:ss
Example - * <g:expiration_date_time>12-20-05T11:59:59</g:expiration_date_time> - *
Attribute of Reference Items, Events, Housing, - * Jobs, People profiles, Products, Services, Travel, Vehicles, Wanted Ads.
Content type dateTime
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
expiration_date_time
Details Date and time that the item expires in ISO 8601 + * format: YYYY-MM-DDThh:mm:ss
Example <g:expiration_date_time>12-20-05T11:59:59</g:expiration_date_time>
Attribute of Reference Items, Events, Housing, Jobs, People profiles, Products, Services, Travel, Vehicles, Wanted Ads.
Content type dateTime
+ * * @return Date and time that the item expires. */ public Date getExpirationDateTime(); - /** Unique id for this item. + /** + * Unique id for this item. * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
id
Details Unique alphanumeric identifier for each item - * - e.g., your internal ID code.
- * IMPORTANT: Once you submit an item with a unique id, this identifier - * must not change when you send in a new bulk upload. Each item must - * retain the same id in subsequent bulk uploads.
Example - * - * <g:id>01flx</g:id>
Attribute of Reference Items, Events, Housing, - * Jobs, News and Articles, People profiles, Products, Reviews, Services, - * Travel, Vehicles, Wanted Ads.
Content type string
+ * + * + * id + * + * + * Details + * + * Unique alphanumeric identifier for each item - e.g., your internal ID code.
+ * IMPORTANT: Once you submit an item with a unique id, this identifier must not change when you send in a new bulk upload. Each item must retain the same + * id in subsequent bulk uploads. + * + * + * Example + * + * + * <g:id>01flx</g:id> + * + * + * Attribute of + * Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads. + * + * + * + * + * Content type + * string + * + * + * + * * @param id unique identifier for this entry */ public void setId(String id); - /** Unique id for this item. + /** + * Unique id for this item. * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
id
Details Unique alphanumeric identifier for each item - * - e.g., your internal ID code.
- * IMPORTANT: Once you submit an item with a unique id, this identifier - * must not change when you send in a new bulk upload. Each item must - * retain the same id in subsequent bulk uploads.
Example - * - * <g:id>01flx</g:id>
Attribute of Reference Items, Events, Housing, - * Jobs, News and Articles, People profiles, Products, Reviews, Services, - * Travel, Vehicles, Wanted Ads.
Content type string
+ * + * + * id + * + * + * Details + * + * Unique alphanumeric identifier for each item - e.g., your internal ID code.
+ * IMPORTANT: Once you submit an item with a unique id, this identifier must not change when you send in a new bulk upload. Each item must retain the same + * id in subsequent bulk uploads. + * + * + * Example + * + * + * <g:id>01flx</g:id> + * + * + * Attribute of + * Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads. + * + * + * + * + * Content type + * string + * + * + * + * * @return unique identifier for this entry */ public String getId(); - /**Images for this item. - *
- * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
image_link
Details URL of an associated image if available online. - * Use your full-sized images; do not use thumbnail images. Up to ten - * image_links, all placed in between their own <image_link> - * and </image_link> attributes, can be included with each item. - * If you do not have an image available, do not include this attribute. - * Please do not include an image that says "Image not available." - * Relative URLs and logo images are not acceptable.
Example Acceptable:
- * <image_link>http://example.com/images/1006.jpg</image_link>
- * - * <image_link>http://example.com/i/6.jpg,http://example.com/i/9.jpg</image_link>
- * - * Not acceptable:
- * <image_link>/images/1006.jpg</image_link>
- * <image_link>example.com/images/1006.jpg</image_link>
Attribute of Reference Items, Events, Housing, - * Jobs, News and Articles, People profiles, Products, Reviews, Services, - * Travel, Vehicles, Wanted Ads.
Content type url
+ /** + * Images for this item.
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
image_link
Details URL of an associated image if available online. Use your full-sized images; do not use thumbnail images. Up to ten image_links, all + * placed in between their own <image_link> and </image_link> attributes, can be included with each item. If you do not have an image available, + * do not include this attribute. Please do not include an image that says "Image not available." Relative URLs and logo images are not acceptable.
Example Acceptable:
+ * <image_link>http://example.com/images/1006.jpg</image_link>
+ * + * <image_link>http://example.com/i/6.jpg,http://example.com/i/9.jpg</image_link>
+ * + * Not acceptable:
+ * <image_link>/images/1006.jpg</image_link>
+ * <image_link>example.com/images/1006.jpg</image_link>
Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
Content type url
+ * * @param imageLinks URLs to images. Limit 10. */ public void setImageLinks(URL[] imageLinks); - /**Images for this item. - *
- * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
image_link
Details URL of an associated image if available online. - * Use your full-sized images; do not use thumbnail images. Up to ten - * image_links, all placed in between their own <image_link> - * and </image_link> attributes, can be included with each item. - * If you do not have an image available, do not include this attribute. - * Please do not include an image that says "Image not available." - * Relative URLs and logo images are not acceptable.
Example Acceptable:
- * <image_link>http://example.com/images/1006.jpg</image_link>
- * - * <image_link>http://example.com/i/6.jpg,http://example.com/i/9.jpg</image_link>
- * - * Not acceptable:
- * <image_link>/images/1006.jpg</image_link>
- * <image_link>example.com/images/1006.jpg</image_link>
Attribute of Reference Items, Events, Housing, - * Jobs, News and Articles, People profiles, Products, Reviews, Services, - * Travel, Vehicles, Wanted Ads.
Content type url
+ /** + * Images for this item.
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
image_link
Details URL of an associated image if available online. Use your full-sized images; do not use thumbnail images. Up to ten image_links, all + * placed in between their own <image_link> and </image_link> attributes, can be included with each item. If you do not have an image available, + * do not include this attribute. Please do not include an image that says "Image not available." Relative URLs and logo images are not acceptable.
Example Acceptable:
+ * <image_link>http://example.com/images/1006.jpg</image_link>
+ * + * <image_link>http://example.com/i/6.jpg,http://example.com/i/9.jpg</image_link>
+ * + * Not acceptable:
+ * <image_link>/images/1006.jpg</image_link>
+ * <image_link>example.com/images/1006.jpg</image_link>
Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
Content type url
+ * * @return URLs to images */ public URL[] getImageLinks(); - /**Labels for this item. - *
- * + /** + * Labels for this item.
+ * * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * + * + * + * + * <g:label>Leather</g:label>
+ * <g:label>Power locks</g:label>
+ * + * <g:label>sunroof</g:label>
+ * + * <g:label>ABS</g:label>
+ *
+ * For a concert in an Events information type:
+ * + * <g:label>VIP</g:label>
+ * + * <g:label>front row</g:label>
+ * <g:label>backstage</g:label>
+ * + * + * + * <g:label>KROCK 101.5</g:label>
+ * <g:label>parking passes</g:label>
+ *
+ * Not acceptable:
+ * + * <g:label> leater, power locks, sunroof, ABS </g:label> * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * label
+ * label
- * - * Details - * A - * list of classifications the item may fall under. Up to ten user-selected - * label, each placed in between their own <label> - * - * and </label> tags, can be included with each item. These attributes will be used to match your items to search queries. Each attribute value will be checked for policy compliance. + * + * Details + * A list of classifications the item may fall under. Up to ten user-selected label, each placed in between their own <label> + * + * and </label> tags, can be included with each item. These attributes will be used to match your items to search queries. Each attribute value will + * be checked for policy compliance.
- * Example - * - * Acceptable:
+ * 		+ * Example + * + * Acceptable:
* For an automobile in a Vehicles information type:
- * - * - * <g:label>Leather</g:label>
- * - * <g:label>Power locks</g:label>
- * - * - * <g:label>sunroof</g:label>
- * - * - * <g:label>ABS</g:label>

- * - * For a concert in an Events information type:
- * - * <g:label>VIP</g:label>
- * - * - * <g:label>front row</g:label>
- * - * <g:label>backstage</g:label>
- * - * - * - * <g:label>KROCK 101.5</g:label>
- * - * <g:label>parking passes</g:label>

- * - * Not acceptable:
- * - * - * <g:label> leater, power locks, sunroof, ABS </g:label>
- * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. + * Attribute of + * Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
- * Content type - * - * string + * Content type + * + * string
+ * + * + * * @param labels labels for this entry. Limit 10. */ public void setLabels(String[] labels); - /**Labels for this item. - *
- * + /** + * Labels for this item.
+ * * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * + * + * + * + * <g:label>Leather</g:label>
+ * <g:label>Power locks</g:label>
+ * + * <g:label>sunroof</g:label>
+ * + * <g:label>ABS</g:label>
+ *
+ * For a concert in an Events information type:
+ * + * <g:label>VIP</g:label>
+ * + * <g:label>front row</g:label>
+ * <g:label>backstage</g:label>
+ * + * + * + * <g:label>KROCK 101.5</g:label>
+ * <g:label>parking passes</g:label>
+ *
+ * Not acceptable:
+ * + * <g:label> leater, power locks, sunroof, ABS </g:label> * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * label
+ * label
- * - * Details - * A - * list of classifications the item may fall under. Up to ten user-selected - * label, each placed in between their own <label> - * - * and </label> tags, can be included with each item. These attributes will be used to match your items to search queries. Each attribute value will be checked for policy compliance. + * + * Details + * A list of classifications the item may fall under. Up to ten user-selected label, each placed in between their own <label> + * + * and </label> tags, can be included with each item. These attributes will be used to match your items to search queries. Each attribute value will + * be checked for policy compliance.
- * Example - * - * Acceptable:
+ * 		+ * Example + * + * Acceptable:
* For an automobile in a Vehicles information type:
- * - * - * <g:label>Leather</g:label>
- * - * <g:label>Power locks</g:label>
- * - * - * <g:label>sunroof</g:label>
- * - * - * <g:label>ABS</g:label>

- * - * For a concert in an Events information type:
- * - * <g:label>VIP</g:label>
- * - * - * <g:label>front row</g:label>
- * - * <g:label>backstage</g:label>
- * - * - * - * <g:label>KROCK 101.5</g:label>
- * - * <g:label>parking passes</g:label>

- * - * Not acceptable:
- * - * - * <g:label> leater, power locks, sunroof, ABS </g:label>
- * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. + * Attribute of + * Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
- * Content type - * - * string + * Content type + * + * string
+ * + * + * * @return labels for this entry */ public String[] getLabels(); diff --git a/src/main/java/org/rometools/feed/module/base/GoogleBase.java b/src/main/java/org/rometools/feed/module/base/GoogleBase.java index f52ab24..49bda6f 100644 --- a/src/main/java/org/rometools/feed/module/base/GoogleBase.java +++ b/src/main/java/org/rometools/feed/module/base/GoogleBase.java @@ -41,22 +41,19 @@ package org.rometools.feed.module.base; import com.sun.syndication.feed.module.Module; - /** * This is the root interface for the Google Base module. - * + * *

- * It supports all the individual data "types". If you want to work with, for - * instance, just the Article or Job datatype, you can cast it to the - * respective interface and see only methods related to a particular entry - * type. + * It supports all the individual data "types". If you want to work with, for instance, just the Article or Job datatype, you can cast it to the respective + * interface and see only methods related to a particular entry type. *

- * - * @author Robert "kebernet" - * Cooper + * + * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ -public interface GoogleBase extends Module,Article,Course,Event,Job,Person,Product,Review,ScholarlyArticle,Service,Travel,Unknown,Vehicle,Wanted,Housing { +public interface GoogleBase extends Module, Article, Course, Event, Job, Person, Product, Review, ScholarlyArticle, Service, Travel, Unknown, Vehicle, Wanted, + Housing { /** This is the URI for the Google Base Schema. */ public static final String URI = "http://base.google.com/ns/1.0"; } diff --git a/src/main/java/org/rometools/feed/module/base/GoogleBaseImpl.java b/src/main/java/org/rometools/feed/module/base/GoogleBaseImpl.java index ab89e2f..ee69193 100644 --- a/src/main/java/org/rometools/feed/module/base/GoogleBaseImpl.java +++ b/src/main/java/org/rometools/feed/module/base/GoogleBaseImpl.java @@ -38,8 +38,9 @@ */ package org.rometools.feed.module.base; -import com.sun.syndication.feed.CopyFrom; -import com.sun.syndication.feed.impl.EqualsBean; +import java.lang.reflect.Array; +import java.net.URL; +import java.util.Date; import org.rometools.feed.module.base.types.CloneableType; import org.rometools.feed.module.base.types.CurrencyEnumeration; @@ -54,18 +55,13 @@ import org.rometools.feed.module.base.types.ShortDate; import org.rometools.feed.module.base.types.Size; import org.rometools.feed.module.base.types.YearType; -import java.lang.reflect.Array; - -import java.net.URL; - -import java.util.Date; - +import com.sun.syndication.feed.CopyFrom; +import com.sun.syndication.feed.impl.EqualsBean; /** * This is the implementation class for the GoogleBase module interface. - * - * @author Robert "kebernet" - * Cooper + * + * @author Robert "kebernet" Cooper * @version $Revision: 1.2 $ */ public class GoogleBaseImpl implements GoogleBase { @@ -347,10 +343,10 @@ public class GoogleBaseImpl implements GoogleBase { /** * DOCUMENT ME! - * + * * @param actors */ - public void setActors(String[] actors) { + public void setActors(final String[] actors) { this.actors = actors; } @@ -358,7 +354,7 @@ public class GoogleBaseImpl implements GoogleBase { return actors == null ? new String[0] : actors; } - public void setAge(Integer age) { + public void setAge(final Integer age) { this.age = age; } @@ -366,7 +362,7 @@ public class GoogleBaseImpl implements GoogleBase { return age; } - public void setAgents(String[] agents) { + public void setAgents(final String[] agents) { this.agents = agents == null ? new String[0] : agents; } @@ -374,7 +370,7 @@ public class GoogleBaseImpl implements GoogleBase { return agents; } - public void setApparelType(String apparelType) { + public void setApparelType(final String apparelType) { this.apparelType = apparelType; } @@ -382,7 +378,7 @@ public class GoogleBaseImpl implements GoogleBase { return apparelType; } - public void setArea(IntUnit area) { + public void setArea(final IntUnit area) { this.area = area; } @@ -390,7 +386,7 @@ public class GoogleBaseImpl implements GoogleBase { return area; } - public void setArtists(String[] artists) { + public void setArtists(final String[] artists) { this.artists = artists; } @@ -398,7 +394,7 @@ public class GoogleBaseImpl implements GoogleBase { return artists == null ? new String[0] : artists; } - public void setAuthors(String[] authors) { + public void setAuthors(final String[] authors) { this.authors = authors; } @@ -406,7 +402,7 @@ public class GoogleBaseImpl implements GoogleBase { return authors == null ? new String[0] : authors; } - public void setBathrooms(Float bathrooms) { + public void setBathrooms(final Float bathrooms) { this.bathrooms = bathrooms; } @@ -414,7 +410,7 @@ public class GoogleBaseImpl implements GoogleBase { return bathrooms; } - public void setBedrooms(Integer bedrooms) { + public void setBedrooms(final Integer bedrooms) { this.bedrooms = bedrooms; } @@ -422,7 +418,7 @@ public class GoogleBaseImpl implements GoogleBase { return bedrooms; } - public void setBrand(String brand) { + public void setBrand(final String brand) { this.brand = brand; } @@ -430,7 +426,7 @@ public class GoogleBaseImpl implements GoogleBase { return brand; } - public void setColors(String[] color) { + public void setColors(final String[] color) { this.color = color; } @@ -438,7 +434,7 @@ public class GoogleBaseImpl implements GoogleBase { return color == null ? new String[0] : color; } - public void setCondition(String condition) { + public void setCondition(final String condition) { this.condition = condition; } @@ -446,7 +442,7 @@ public class GoogleBaseImpl implements GoogleBase { return condition; } - public void setCourseDateRange(DateTimeRange courseDateRange) { + public void setCourseDateRange(final DateTimeRange courseDateRange) { this.courseDateRange = courseDateRange; } @@ -454,7 +450,7 @@ public class GoogleBaseImpl implements GoogleBase { return courseDateRange; } - public void setCourseNumber(String courseNumber) { + public void setCourseNumber(final String courseNumber) { this.courseNumber = courseNumber; } @@ -462,7 +458,7 @@ public class GoogleBaseImpl implements GoogleBase { return courseNumber; } - public void setCourseTimes(String courseTimes) { + public void setCourseTimes(final String courseTimes) { this.courseTimes = courseTimes; } @@ -470,7 +466,7 @@ public class GoogleBaseImpl implements GoogleBase { return courseTimes; } - public void setCurrency(CurrencyEnumeration currency) { + public void setCurrency(final CurrencyEnumeration currency) { this.currency = currency; } @@ -478,7 +474,7 @@ public class GoogleBaseImpl implements GoogleBase { return currency; } - public void setDeliveryNotes(String deliveryNotes) { + public void setDeliveryNotes(final String deliveryNotes) { this.deliveryNotes = deliveryNotes; } @@ -486,7 +482,7 @@ public class GoogleBaseImpl implements GoogleBase { return deliveryNotes; } - public void setDeliveryRadius(FloatUnit deliveryRadius) { + public void setDeliveryRadius(final FloatUnit deliveryRadius) { this.deliveryRadius = deliveryRadius; } @@ -494,7 +490,7 @@ public class GoogleBaseImpl implements GoogleBase { return deliveryRadius; } - public void setEducation(String education) { + public void setEducation(final String education) { this.education = education; } @@ -502,7 +498,7 @@ public class GoogleBaseImpl implements GoogleBase { return education; } - public void setEmployer(String employer) { + public void setEmployer(final String employer) { this.employer = employer; } @@ -510,7 +506,7 @@ public class GoogleBaseImpl implements GoogleBase { return employer; } - public void setEthnicities(String[] ethnicities) { + public void setEthnicities(final String[] ethnicities) { this.ethnicities = ethnicities; } @@ -518,7 +514,7 @@ public class GoogleBaseImpl implements GoogleBase { return ethnicities == null ? new String[0] : ethnicities; } - public void setEventDateRange(DateTimeRange eventDateRange) { + public void setEventDateRange(final DateTimeRange eventDateRange) { this.eventDateRange = eventDateRange; } @@ -526,8 +522,8 @@ public class GoogleBaseImpl implements GoogleBase { return eventDateRange; } - public void setExpirationDate(Date expirationDate) { - if((expirationDate != null)&&!(expirationDate instanceof ShortDate)) { + public void setExpirationDate(final Date expirationDate) { + if (expirationDate != null && !(expirationDate instanceof ShortDate)) { this.expirationDate = new ShortDate(expirationDate); } else { this.expirationDate = null; @@ -538,7 +534,7 @@ public class GoogleBaseImpl implements GoogleBase { return expirationDate; } - public void setExpirationDateTime(Date expirationDateTime) { + public void setExpirationDateTime(final Date expirationDateTime) { this.expirationDateTime = expirationDateTime; } @@ -546,7 +542,7 @@ public class GoogleBaseImpl implements GoogleBase { return expirationDateTime; } - public void setFormat(String[] format) { + public void setFormat(final String[] format) { this.format = format; } @@ -554,7 +550,7 @@ public class GoogleBaseImpl implements GoogleBase { return format == null ? new String[0] : format; } - public void setFromLocation(String fromLocation) { + public void setFromLocation(final String fromLocation) { this.fromLocation = fromLocation; } @@ -562,7 +558,7 @@ public class GoogleBaseImpl implements GoogleBase { return fromLocation; } - public void setGender(GenderEnumeration gender) { + public void setGender(final GenderEnumeration gender) { this.gender = gender; } @@ -570,7 +566,7 @@ public class GoogleBaseImpl implements GoogleBase { return gender; } - public void setHoaDues(Float hoaDues) { + public void setHoaDues(final Float hoaDues) { this.hoaDues = hoaDues; } @@ -578,7 +574,7 @@ public class GoogleBaseImpl implements GoogleBase { return hoaDues; } - public void setId(String id) { + public void setId(final String id) { this.id = id; } @@ -586,7 +582,7 @@ public class GoogleBaseImpl implements GoogleBase { return id; } - public void setImageLinks(URL[] imageLinks) { + public void setImageLinks(final URL[] imageLinks) { this.imageLinks = imageLinks; } @@ -594,7 +590,7 @@ public class GoogleBaseImpl implements GoogleBase { return imageLinks == null ? new URL[0] : imageLinks; } - public void setImmigrationStatus(String immigrationStatus) { + public void setImmigrationStatus(final String immigrationStatus) { this.immigrationStatus = immigrationStatus; } @@ -602,7 +598,7 @@ public class GoogleBaseImpl implements GoogleBase { return immigrationStatus; } - public void setInterestedIn(String[] interestedIn) { + public void setInterestedIn(final String[] interestedIn) { this.interestedIn = interestedIn; } @@ -614,7 +610,7 @@ public class GoogleBaseImpl implements GoogleBase { return GoogleBase.class; } - public void setIsbn(String isbn) { + public void setIsbn(final String isbn) { this.isbn = isbn; } @@ -622,7 +618,7 @@ public class GoogleBaseImpl implements GoogleBase { return isbn; } - public void setJobFunctions(String[] jobFunctions) { + public void setJobFunctions(final String[] jobFunctions) { this.jobFunctions = jobFunctions; } @@ -630,7 +626,7 @@ public class GoogleBaseImpl implements GoogleBase { return jobFunctions == null ? new String[0] : jobFunctions; } - public void setJobIndustries(String[] jobIndustries) { + public void setJobIndustries(final String[] jobIndustries) { this.jobIndustries = jobIndustries; } @@ -638,7 +634,7 @@ public class GoogleBaseImpl implements GoogleBase { return jobIndustries == null ? new String[0] : jobIndustries; } - public void setJobTypes(String[] jobTypes) { + public void setJobTypes(final String[] jobTypes) { this.jobTypes = jobTypes; } @@ -646,7 +642,7 @@ public class GoogleBaseImpl implements GoogleBase { return jobTypes == null ? new String[0] : jobTypes; } - public void setLabels(String[] labels) { + public void setLabels(final String[] labels) { this.labels = labels; } @@ -654,7 +650,7 @@ public class GoogleBaseImpl implements GoogleBase { return labels == null ? new String[0] : labels; } - public void setLicenses(String[] licenses) { + public void setLicenses(final String[] licenses) { this.licenses = licenses; } @@ -662,7 +658,7 @@ public class GoogleBaseImpl implements GoogleBase { return licenses == null ? new String[0] : licenses; } - public void setListingType(Boolean listingType) { + public void setListingType(final Boolean listingType) { this.listingType = listingType; } @@ -670,7 +666,7 @@ public class GoogleBaseImpl implements GoogleBase { return listingType; } - public void setLocation(String location) { + public void setLocation(final String location) { this.location = location; } @@ -678,7 +674,7 @@ public class GoogleBaseImpl implements GoogleBase { return location; } - public void setMake(String make) { + public void setMake(final String make) { this.make = make; } @@ -686,7 +682,7 @@ public class GoogleBaseImpl implements GoogleBase { return make; } - public void setManufacturer(String manufacturer) { + public void setManufacturer(final String manufacturer) { this.manufacturer = manufacturer; } @@ -694,7 +690,7 @@ public class GoogleBaseImpl implements GoogleBase { return manufacturer; } - public void setManufacturerId(String manufacturerId) { + public void setManufacturerId(final String manufacturerId) { this.manufacturerId = manufacturerId; } @@ -702,7 +698,7 @@ public class GoogleBaseImpl implements GoogleBase { return manufacturerId; } - public void setMaritalStatus(String maritalStatus) { + public void setMaritalStatus(final String maritalStatus) { this.maritalStatus = maritalStatus; } @@ -710,7 +706,7 @@ public class GoogleBaseImpl implements GoogleBase { return maritalStatus; } - public void setMegapixels(FloatUnit megapixels) { + public void setMegapixels(final FloatUnit megapixels) { this.megapixels = megapixels; } @@ -718,7 +714,7 @@ public class GoogleBaseImpl implements GoogleBase { return megapixels; } - public void setMemory(FloatUnit memory) { + public void setMemory(final FloatUnit memory) { this.memory = memory; } @@ -726,7 +722,7 @@ public class GoogleBaseImpl implements GoogleBase { return memory; } - public void setMileage(Integer mileage) { + public void setMileage(final Integer mileage) { this.mileage = mileage; } @@ -734,7 +730,7 @@ public class GoogleBaseImpl implements GoogleBase { return mileage; } - public void setModel(String model) { + public void setModel(final String model) { this.model = model; } @@ -742,7 +738,7 @@ public class GoogleBaseImpl implements GoogleBase { return model; } - public void setModelNumber(String modelNumber) { + public void setModelNumber(final String modelNumber) { this.modelNumber = modelNumber; } @@ -750,7 +746,7 @@ public class GoogleBaseImpl implements GoogleBase { return modelNumber; } - public void setNameOfItemBeingReviewed(String nameOfItemBeingReviewed) { + public void setNameOfItemBeingReviewed(final String nameOfItemBeingReviewed) { this.nameOfItemBeingReviewed = nameOfItemBeingReviewed; } @@ -758,7 +754,7 @@ public class GoogleBaseImpl implements GoogleBase { return nameOfItemBeingReviewed; } - public void setNewsSource(String newsSource) { + public void setNewsSource(final String newsSource) { this.newsSource = newsSource; } @@ -766,7 +762,7 @@ public class GoogleBaseImpl implements GoogleBase { return newsSource; } - public void setOccupation(String occupation) { + public void setOccupation(final String occupation) { this.occupation = occupation; } @@ -774,7 +770,7 @@ public class GoogleBaseImpl implements GoogleBase { return occupation; } - public void setOperatingSystems(String operatingSystems) { + public void setOperatingSystems(final String operatingSystems) { this.operatingSystems = operatingSystems; } @@ -782,7 +778,7 @@ public class GoogleBaseImpl implements GoogleBase { return operatingSystems; } - public void setPages(Integer pages) { + public void setPages(final Integer pages) { this.pages = pages; } @@ -790,7 +786,7 @@ public class GoogleBaseImpl implements GoogleBase { return pages; } - public void setPaymentAccepted(PaymentTypeEnumeration[] paymentAccepted) { + public void setPaymentAccepted(final PaymentTypeEnumeration[] paymentAccepted) { this.paymentAccepted = paymentAccepted; } @@ -798,7 +794,7 @@ public class GoogleBaseImpl implements GoogleBase { return paymentAccepted == null ? new PaymentTypeEnumeration[0] : paymentAccepted; } - public void setPaymentNotes(String paymentNotes) { + public void setPaymentNotes(final String paymentNotes) { this.paymentNotes = paymentNotes; } @@ -806,7 +802,7 @@ public class GoogleBaseImpl implements GoogleBase { return paymentNotes; } - public void setPickup(Boolean pickup) { + public void setPickup(final Boolean pickup) { this.pickup = pickup; } @@ -814,7 +810,7 @@ public class GoogleBaseImpl implements GoogleBase { return pickup; } - public void setPrice(FloatUnit price) { + public void setPrice(final FloatUnit price) { this.price = price; } @@ -822,7 +818,7 @@ public class GoogleBaseImpl implements GoogleBase { return price; } - public void setPriceType(PriceTypeEnumeration priceType) { + public void setPriceType(final PriceTypeEnumeration priceType) { this.priceType = priceType; } @@ -830,7 +826,7 @@ public class GoogleBaseImpl implements GoogleBase { return priceType; } - public void setProcessorSpeed(FloatUnit processorSpeed) { + public void setProcessorSpeed(final FloatUnit processorSpeed) { this.processorSpeed = processorSpeed; } @@ -838,7 +834,7 @@ public class GoogleBaseImpl implements GoogleBase { return processorSpeed; } - public void setProductTypes(String[] productTypes) { + public void setProductTypes(final String[] productTypes) { this.productTypes = productTypes; } @@ -846,7 +842,7 @@ public class GoogleBaseImpl implements GoogleBase { return productTypes == null ? new String[0] : productTypes; } - public void setProgrammingLanguages(String[] programmingLanguages) { + public void setProgrammingLanguages(final String[] programmingLanguages) { this.programmingLanguages = programmingLanguages; } @@ -854,7 +850,7 @@ public class GoogleBaseImpl implements GoogleBase { return programmingLanguages == null ? new String[0] : programmingLanguages; } - public void setPropertyTypes(String[] propertyTypes) { + public void setPropertyTypes(final String[] propertyTypes) { this.propertyTypes = propertyTypes; } @@ -862,7 +858,7 @@ public class GoogleBaseImpl implements GoogleBase { return propertyTypes == null ? new String[0] : propertyTypes; } - public void setPublicationName(String publicationName) { + public void setPublicationName(final String publicationName) { this.publicationName = publicationName; } @@ -870,7 +866,7 @@ public class GoogleBaseImpl implements GoogleBase { return publicationName; } - public void setPublicationVolume(String publicationVolume) { + public void setPublicationVolume(final String publicationVolume) { this.publicationVolume = publicationVolume; } @@ -878,8 +874,8 @@ public class GoogleBaseImpl implements GoogleBase { return publicationVolume; } - public void setPublishDate(Date publishDate) { - if((publishDate != null)&&!(publishDate instanceof ShortDate)) { + public void setPublishDate(final Date publishDate) { + if (publishDate != null && !(publishDate instanceof ShortDate)) { this.publishDate = new ShortDate(publishDate); } else { this.publishDate = null; @@ -890,7 +886,7 @@ public class GoogleBaseImpl implements GoogleBase { return publishDate; } - public void setQuantity(Integer quantity) { + public void setQuantity(final Integer quantity) { this.quantity = quantity; } @@ -898,7 +894,7 @@ public class GoogleBaseImpl implements GoogleBase { return quantity; } - public void setRating(Float rating) { + public void setRating(final Float rating) { this.rating = rating; } @@ -906,7 +902,7 @@ public class GoogleBaseImpl implements GoogleBase { return rating; } - public void setRelatedLinks(URL[] relatedLinks) { + public void setRelatedLinks(final URL[] relatedLinks) { this.relatedLinks = relatedLinks; } @@ -914,7 +910,7 @@ public class GoogleBaseImpl implements GoogleBase { return relatedLinks == null ? new URL[0] : relatedLinks; } - public void setReviewType(String reviewType) { + public void setReviewType(final String reviewType) { this.reviewType = reviewType; } @@ -922,7 +918,7 @@ public class GoogleBaseImpl implements GoogleBase { return reviewType; } - public void setReviewerType(String reviewerType) { + public void setReviewerType(final String reviewerType) { this.reviewerType = reviewerType; } @@ -930,7 +926,7 @@ public class GoogleBaseImpl implements GoogleBase { return reviewerType; } - public void setSalary(Float salary) { + public void setSalary(final Float salary) { this.salary = salary; } @@ -938,7 +934,7 @@ public class GoogleBaseImpl implements GoogleBase { return salary; } - public void setSalaryType(PriceTypeEnumeration salaryType) { + public void setSalaryType(final PriceTypeEnumeration salaryType) { this.salaryType = salaryType; } @@ -946,7 +942,7 @@ public class GoogleBaseImpl implements GoogleBase { return salaryType; } - public void setSchoolDistrict(String schoolDistrict) { + public void setSchoolDistrict(final String schoolDistrict) { this.schoolDistrict = schoolDistrict; } @@ -954,7 +950,7 @@ public class GoogleBaseImpl implements GoogleBase { return schoolDistrict; } - public void setServiceType(String serviceType) { + public void setServiceType(final String serviceType) { this.serviceType = serviceType; } @@ -962,7 +958,7 @@ public class GoogleBaseImpl implements GoogleBase { return serviceType; } - public void setSexualOrientation(String SexualOrientation) { + public void setSexualOrientation(final String SexualOrientation) { this.SexualOrientation = SexualOrientation; } @@ -970,7 +966,7 @@ public class GoogleBaseImpl implements GoogleBase { return SexualOrientation; } - public void setShipping(ShippingType[] shipping) { + public void setShipping(final ShippingType[] shipping) { this.shipping = shipping; } @@ -978,7 +974,7 @@ public class GoogleBaseImpl implements GoogleBase { return shipping == null ? new ShippingType[0] : shipping; } - public void setSize(Size size) { + public void setSize(final Size size) { this.size = size; } @@ -986,7 +982,7 @@ public class GoogleBaseImpl implements GoogleBase { return size; } - public void setSquareFootages(IntUnit[] squareFootages) { + public void setSquareFootages(final IntUnit[] squareFootages) { this.squareFootages = squareFootages; } @@ -994,7 +990,7 @@ public class GoogleBaseImpl implements GoogleBase { return squareFootages == null ? new IntUnit[0] : squareFootages; } - public void setSubjectAreas(String[] subjectAreas) { + public void setSubjectAreas(final String[] subjectAreas) { this.subjectAreas = subjectAreas; } @@ -1002,7 +998,7 @@ public class GoogleBaseImpl implements GoogleBase { return subjectAreas == null ? new String[0] : subjectAreas; } - public void setSubjects(String[] subjects) { + public void setSubjects(final String[] subjects) { this.subjects = subjects; } @@ -1010,7 +1006,7 @@ public class GoogleBaseImpl implements GoogleBase { return subjects == null ? new String[0] : subjects; } - public void setTaxPercent(Float taxPercent) { + public void setTaxPercent(final Float taxPercent) { this.taxPercent = taxPercent; } @@ -1018,7 +1014,7 @@ public class GoogleBaseImpl implements GoogleBase { return taxPercent; } - public void setTaxRegion(String taxRegion) { + public void setTaxRegion(final String taxRegion) { this.taxRegion = taxRegion; } @@ -1026,7 +1022,7 @@ public class GoogleBaseImpl implements GoogleBase { return taxRegion; } - public void setToLocation(String toLocation) { + public void setToLocation(final String toLocation) { this.toLocation = toLocation; } @@ -1034,7 +1030,7 @@ public class GoogleBaseImpl implements GoogleBase { return toLocation; } - public void setTravelDateRange(DateTimeRange travelDateRange) { + public void setTravelDateRange(final DateTimeRange travelDateRange) { this.travelDateRange = travelDateRange; } @@ -1042,7 +1038,7 @@ public class GoogleBaseImpl implements GoogleBase { return travelDateRange; } - public void setUniversity(String university) { + public void setUniversity(final String university) { this.university = university; } @@ -1050,7 +1046,7 @@ public class GoogleBaseImpl implements GoogleBase { return university; } - public void setUpc(String upc) { + public void setUpc(final String upc) { this.upc = upc; } @@ -1062,7 +1058,7 @@ public class GoogleBaseImpl implements GoogleBase { return GoogleBase.URI; } - public void setUrlOfItemBeingReviewed(URL urlOfItemBeingReviewed) { + public void setUrlOfItemBeingReviewed(final URL urlOfItemBeingReviewed) { this.urlOfItemBeingReviewed = urlOfItemBeingReviewed; } @@ -1070,7 +1066,7 @@ public class GoogleBaseImpl implements GoogleBase { return urlOfItemBeingReviewed; } - public void setVehicleType(String vehicleType) { + public void setVehicleType(final String vehicleType) { this.vehicleType = vehicleType; } @@ -1078,7 +1074,7 @@ public class GoogleBaseImpl implements GoogleBase { return vehicleType; } - public void setVin(String vin) { + public void setVin(final String vin) { this.vin = vin; } @@ -1086,7 +1082,7 @@ public class GoogleBaseImpl implements GoogleBase { return vin; } - public void setWeight(FloatUnit weight) { + public void setWeight(final FloatUnit weight) { this.weight = weight; } @@ -1094,7 +1090,7 @@ public class GoogleBaseImpl implements GoogleBase { return weight; } - public void setYear(YearType year) { + public void setYear(final YearType year) { this.year = year; } @@ -1102,151 +1098,152 @@ public class GoogleBaseImpl implements GoogleBase { return year; } - //TODO: Finish + // TODO: Finish @Override public Object clone() throws CloneNotSupportedException { try { - GoogleBaseImpl gbi = new GoogleBaseImpl(); + final GoogleBaseImpl gbi = new GoogleBaseImpl(); gbi.copyFrom(this); return gbi; - } catch(Exception e) { + } catch (final Exception e) { e.printStackTrace(); throw new CloneNotSupportedException(); } } - public void copyFrom(CopyFrom obj) { - if(!(obj instanceof GoogleBase)) { + public void copyFrom(final CopyFrom obj) { + if (!(obj instanceof GoogleBase)) { return; } - GoogleBase source = (GoogleBase)obj; + final GoogleBase source = (GoogleBase) obj; - this.setActors((String[])arrayCopy(source.getActors())); - this.setAge(source.getAge()); - this.setAgents((String[])arrayCopy(source.getAgents())); - this.setApparelType(source.getApparelType()); - this.setArea(source.getArea()); - this.setArtists((String[])arrayCopy(source.getArtists())); - this.setAuthors((String[])arrayCopy(source.getAuthors())); - this.setBathrooms(source.getBathrooms()); - this.setBedrooms(source.getBedrooms()); - this.setBrand(source.getBrand()); - this.setColors((String[])arrayCopy(source.getColors())); - this.setCondition(source.getCondition()); - this.setCourseDateRange((DateTimeRange)cloneOrNull(source.getCourseDateRange())); - this.setCourseNumber(source.getCourseNumber()); - this.setCourseTimes(source.getCourseTimes()); - this.setDeliveryNotes(source.getDeliveryNotes()); - this.setDeliveryRadius(source.getDeliveryRadius()); - this.setEducation(source.getEducation()); - this.setEmployer(source.getEmployer()); - this.setEthnicities((String[])arrayCopy(source.getEthnicities())); - this.setEventDateRange((DateTimeRange)cloneOrNull(source.getEventDateRange())); - this.setExpirationDate(dateOrNull(source.getExpirationDate())); - this.setExpirationDateTime(dateOrNull(source.getExpirationDateTime())); - this.setFormat(source.getFormat()); - this.setFromLocation(source.getFromLocation()); - this.setGender(source.getGender()); - this.setHoaDues(source.getHoaDues()); - this.setId(source.getId()); - this.setImageLinks((URL[])arrayCopy(source.getImageLinks())); - this.setImmigrationStatus(source.getImmigrationStatus()); - this.setInterestedIn(source.getInterestedIn()); - this.setIsbn(source.getIsbn()); - this.setJobFunctions((String[])arrayCopy(source.getJobFunctions())); - this.setJobIndustries((String[])arrayCopy(source.getJobIndustries())); - this.setJobTypes((String[])arrayCopy(source.getJobTypes())); - this.setLabels((String[])arrayCopy(source.getLabels())); - this.setListingType(source.getListingType()); - this.setLocation(source.getLocation()); - this.setMake(source.getMake()); - this.setManufacturer(source.getManufacturer()); - this.setManufacturerId(source.getManufacturerId()); - this.setMaritalStatus(source.getMaritalStatus()); - this.setMegapixels(source.getMegapixels()); - this.setMemory(source.getMemory()); - this.setMileage(source.getMileage()); - this.setModel(source.getModel()); - this.setModelNumber(source.getModelNumber()); - this.setNameOfItemBeingReviewed(source.getNameOfItemBeingReviewed()); - this.setNewsSource(source.getNewsSource()); - this.setOccupation(source.getOccupation()); - this.setPages(source.getPages()); - this.setPaymentAccepted((PaymentTypeEnumeration[])arrayCopy(source.getPaymentAccepted())); - this.setPaymentNotes(source.getPaymentNotes()); - this.setPickup(source.getPickup()); - this.setPrice(source.getPrice()); - this.setPriceType(source.getPriceType()); - this.setProcessorSpeed(source.getProcessorSpeed()); - this.setProductTypes((String[])arrayCopy(source.getProductTypes())); - this.setPropertyTypes((String[])arrayCopy(source.getPropertyTypes())); - this.setPublicationName(source.getPublicationName()); - this.setPublicationVolume(source.getPublicationVolume()); - this.setPublishDate(dateOrNull(source.getPublishDate())); - this.setQuantity(source.getQuantity()); - this.setRating(source.getRating()); - this.setReviewType(source.getReviewType()); - this.setReviewerType(source.getReviewerType()); - this.setSalary(source.getSalary()); - this.setSalaryType(source.getSalaryType()); - this.setServiceType(source.getServiceType()); - this.setSexualOrientation(source.getSexualOrientation()); - this.setShipping((ShippingType[])arrayCopy(source.getShipping())); - this.setSize(source.getSize()); - this.setSubjects((String[])arrayCopy(source.getSubjects())); - this.setTaxPercent(source.getTaxPercent()); - this.setTaxRegion(source.getTaxRegion()); - this.setToLocation(source.getToLocation()); - this.setTravelDateRange((DateTimeRange)cloneOrNull(source.getTravelDateRange())); - this.setUpc(source.getUpc()); - this.setUrlOfItemBeingReviewed(source.getUrlOfItemBeingReviewed()); - this.setVehicleType(source.getVehicleType()); - this.setVin(source.getVin()); - this.setYear(source.getYear()); - this.setLicenses((String[])arrayCopy(source.getLicenses())); - this.setRelatedLinks((URL[])arrayCopy(source.getRelatedLinks())); - this.setSubjectAreas((String[])arrayCopy(source.getSubjectAreas())); - this.setProgrammingLanguages((String[])arrayCopy(source.getProgrammingLanguages())); - this.setSquareFootages(((IntUnit[])arrayCopy(source.getSquareFootages()))); - this.setCurrency(source.getCurrency()); - this.setSchoolDistrict(source.getSchoolDistrict()); - this.setUniversity(source.getUniversity()); - this.setWeight(source.getWeight()); - this.setOperatingSystems(source.getOperatingSystems()); + setActors((String[]) arrayCopy(source.getActors())); + setAge(source.getAge()); + setAgents((String[]) arrayCopy(source.getAgents())); + setApparelType(source.getApparelType()); + setArea(source.getArea()); + setArtists((String[]) arrayCopy(source.getArtists())); + setAuthors((String[]) arrayCopy(source.getAuthors())); + setBathrooms(source.getBathrooms()); + setBedrooms(source.getBedrooms()); + setBrand(source.getBrand()); + setColors((String[]) arrayCopy(source.getColors())); + setCondition(source.getCondition()); + setCourseDateRange((DateTimeRange) cloneOrNull(source.getCourseDateRange())); + setCourseNumber(source.getCourseNumber()); + setCourseTimes(source.getCourseTimes()); + setDeliveryNotes(source.getDeliveryNotes()); + setDeliveryRadius(source.getDeliveryRadius()); + setEducation(source.getEducation()); + setEmployer(source.getEmployer()); + setEthnicities((String[]) arrayCopy(source.getEthnicities())); + setEventDateRange((DateTimeRange) cloneOrNull(source.getEventDateRange())); + setExpirationDate(dateOrNull(source.getExpirationDate())); + setExpirationDateTime(dateOrNull(source.getExpirationDateTime())); + setFormat(source.getFormat()); + setFromLocation(source.getFromLocation()); + setGender(source.getGender()); + setHoaDues(source.getHoaDues()); + setId(source.getId()); + setImageLinks((URL[]) arrayCopy(source.getImageLinks())); + setImmigrationStatus(source.getImmigrationStatus()); + setInterestedIn(source.getInterestedIn()); + setIsbn(source.getIsbn()); + setJobFunctions((String[]) arrayCopy(source.getJobFunctions())); + setJobIndustries((String[]) arrayCopy(source.getJobIndustries())); + setJobTypes((String[]) arrayCopy(source.getJobTypes())); + setLabels((String[]) arrayCopy(source.getLabels())); + setListingType(source.getListingType()); + setLocation(source.getLocation()); + setMake(source.getMake()); + setManufacturer(source.getManufacturer()); + setManufacturerId(source.getManufacturerId()); + setMaritalStatus(source.getMaritalStatus()); + setMegapixels(source.getMegapixels()); + setMemory(source.getMemory()); + setMileage(source.getMileage()); + setModel(source.getModel()); + setModelNumber(source.getModelNumber()); + setNameOfItemBeingReviewed(source.getNameOfItemBeingReviewed()); + setNewsSource(source.getNewsSource()); + setOccupation(source.getOccupation()); + setPages(source.getPages()); + setPaymentAccepted((PaymentTypeEnumeration[]) arrayCopy(source.getPaymentAccepted())); + setPaymentNotes(source.getPaymentNotes()); + setPickup(source.getPickup()); + setPrice(source.getPrice()); + setPriceType(source.getPriceType()); + setProcessorSpeed(source.getProcessorSpeed()); + setProductTypes((String[]) arrayCopy(source.getProductTypes())); + setPropertyTypes((String[]) arrayCopy(source.getPropertyTypes())); + setPublicationName(source.getPublicationName()); + setPublicationVolume(source.getPublicationVolume()); + setPublishDate(dateOrNull(source.getPublishDate())); + setQuantity(source.getQuantity()); + setRating(source.getRating()); + setReviewType(source.getReviewType()); + setReviewerType(source.getReviewerType()); + setSalary(source.getSalary()); + setSalaryType(source.getSalaryType()); + setServiceType(source.getServiceType()); + setSexualOrientation(source.getSexualOrientation()); + setShipping((ShippingType[]) arrayCopy(source.getShipping())); + setSize(source.getSize()); + setSubjects((String[]) arrayCopy(source.getSubjects())); + setTaxPercent(source.getTaxPercent()); + setTaxRegion(source.getTaxRegion()); + setToLocation(source.getToLocation()); + setTravelDateRange((DateTimeRange) cloneOrNull(source.getTravelDateRange())); + setUpc(source.getUpc()); + setUrlOfItemBeingReviewed(source.getUrlOfItemBeingReviewed()); + setVehicleType(source.getVehicleType()); + setVin(source.getVin()); + setYear(source.getYear()); + setLicenses((String[]) arrayCopy(source.getLicenses())); + setRelatedLinks((URL[]) arrayCopy(source.getRelatedLinks())); + setSubjectAreas((String[]) arrayCopy(source.getSubjectAreas())); + setProgrammingLanguages((String[]) arrayCopy(source.getProgrammingLanguages())); + setSquareFootages((IntUnit[]) arrayCopy(source.getSquareFootages())); + setCurrency(source.getCurrency()); + setSchoolDistrict(source.getSchoolDistrict()); + setUniversity(source.getUniversity()); + setWeight(source.getWeight()); + setOperatingSystems(source.getOperatingSystems()); } - public boolean equals(Object obj) { - EqualsBean eBean = new EqualsBean(this.getClass(),this); + @Override + public boolean equals(final Object obj) { + final EqualsBean eBean = new EqualsBean(this.getClass(), this); return eBean.beanEquals(obj); } - private Object arrayCopy(Object[] source) { - if(source == null) { + private Object arrayCopy(final Object[] source) { + if (source == null) { return null; } - Object[] array = (Object[])Array.newInstance(source.getClass().getComponentType(),source.length); + final Object[] array = (Object[]) Array.newInstance(source.getClass().getComponentType(), source.length); - for(int i = 0; i < source.length; i++) { + for (int i = 0; i < source.length; i++) { array[i] = source[i]; } return array; } - private Object cloneOrNull(CloneableType o) { - if(o == null) { + private Object cloneOrNull(final CloneableType o) { + if (o == null) { return null; } else { return o.clone(); } } - private Date dateOrNull(Date date) { - if(date == null) { + private Date dateOrNull(final Date date) { + if (date == null) { return null; } else { return new Date(date.getTime()); diff --git a/src/main/java/org/rometools/feed/module/base/Housing.java b/src/main/java/org/rometools/feed/module/base/Housing.java index 4473c16..fb84963 100644 --- a/src/main/java/org/rometools/feed/module/base/Housing.java +++ b/src/main/java/org/rometools/feed/module/base/Housing.java @@ -46,10 +46,9 @@ import org.rometools.feed.module.base.types.PaymentTypeEnumeration; import org.rometools.feed.module.base.types.PriceTypeEnumeration; import org.rometools.feed.module.base.types.YearType; - /** - * This is an interface for the GoogleBase plug in that exposes methods used for - * Housing entry types. + * This is an interface for the GoogleBase plug in that exposes methods used for Housing entry types. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ @@ -57,32 +56,35 @@ public interface Housing extends GlobalInterface { /** * An array of agent name Strings, not to exceed 10 in lenght. * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
agent
DetailsIndividual who is negotiating and arranging the real estate sale.
Example<g:agent>Sue Smith</g:agent>
Attribute ofHousing
Content typestring
+ * + * + * agent + * + * + * + * Details + * Individual who is negotiating and arranging the real estate sale. + * + * + * + * Example + * + * <g:agent>Sue Smith</g:agent> + * + * + * + * Attribute of + * Housing + * + * + * + * Content type + * string + * + * + * + * + * * @param agents An array of agent name Strings, not to exceed 10 in lenght. */ public void setAgents(String[] agents); @@ -90,100 +92,109 @@ public interface Housing extends GlobalInterface { /** * An array of agent name Strings, not to exceed 10 in lenght. * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
agent
DetailsIndividual who is negotiating and arranging the real estate sale.
Example<g:agent>Sue Smith</g:agent>
Attribute ofHousing
Content typestring
+ * + * + * agent + * + * + * + * Details + * Individual who is negotiating and arranging the real estate sale. + * + * + * + * Example + * + * <g:agent>Sue Smith</g:agent> + * + * + * + * Attribute of + * Housing + * + * + * + * Content type + * string + * + * + * + * + * * @return An array of agent name Strings, not to exceed 10 in lenght. */ public String[] getAgents(); /** * The area of the real estate. - * + * * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
area
DetailsThe size of an area of real estate.
Example<g:area>1000</g:area>
Attribute ofHousing
Content typeintUnit
+ * + * + * + * area + * + * + * + * Details + * The size of an area of real estate. + * + * + * + * Example + * <g:area>1000</g:area> + * + * + * + * Attribute of + * + * Housing + * + * + * Content type + * + * intUnit + * + * + * + * * @param area The area of the real estate */ public void setArea(IntUnit area); /** * The area of the real estate. - * + * * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
area
DetailsThe size of an area of real estate.
Example<g:area>1000</g:area>
Attribute ofHousing
Content typeintUnit
+ * + * + * + * area + * + * + * + * Details + * The size of an area of real estate. + * + * + * + * Example + * <g:area>1000</g:area> + * + * + * + * Attribute of + * + * Housing + * + * + * Content type + * + * intUnit + * + * + * + * * @return The area of the real estate */ public IntUnit getArea(); @@ -191,48 +202,44 @@ public interface Housing extends GlobalInterface { /** * The number of bathrooms. * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * + * + * - * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * bathrooms
bathrooms
- * - * Details - * - * Number of bathrooms. Numeric - * values only. + * + * Details + * + * Number of bathrooms. Numeric values only.
- * Example - * Acceptable:
- * + * 		Example Acceptable:
+ * * <g:bathrooms>2</g:bathrooms>
- * Not acceptable:
+ * Not acceptable:
* <g:bathrooms>2 bathrooms</g:bathrooms>
- * - * Attribute of - * Housing + * + * Attribute of Housing
- * Content type - * float Content type float
+ * + * + * * @param bathrooms The number of bathrooms. */ public void setBathrooms(Float bathrooms); @@ -240,48 +247,44 @@ public interface Housing extends GlobalInterface { /** * The number of bathrooms. * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * + * + * - * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * bathrooms
bathrooms
- * - * Details - * - * Number of bathrooms. Numeric - * values only. + * + * Details + * + * Number of bathrooms. Numeric values only.
- * Example - * Acceptable:
- * + * 		Example Acceptable:
+ * * <g:bathrooms>2</g:bathrooms>
- * Not acceptable:
+ * Not acceptable:
* <g:bathrooms>2 bathrooms</g:bathrooms>
- * - * Attribute of - * Housing + * + * Attribute of Housing
- * Content type - * float Content type float
+ * + * + * * @return number of bathrooms */ public Float getBathrooms(); @@ -289,364 +292,378 @@ public interface Housing extends GlobalInterface { /** * Number of bedrooms. * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - *
bedrooms
bedrooms
Details Number of bedrooms. Numeric values - * only. Details Number of bedrooms. Numeric values only.
Example Acceptable:
<g:bedrooms>3</g:bedrooms>
- * Not acceptable:
- * + * 		Example Acceptable:
+ * <g:bedrooms>3</g:bedrooms>
+ * Not acceptable:
+ * * <g:bedrooms>3 bedrooms</g:bedrooms>
Attribute of Housing Attribute of Housing
Content type integer Content type integer
+ * + * + * * @param bedrooms Number of bedrooms. */ public void setBedrooms(Integer bedrooms); /** * Number of bedrooms. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - *
bedrooms
bedrooms
Details Number of bedrooms. Numeric values - * only. Details Number of bedrooms. Numeric values only.
Example Acceptable:
<g:bedrooms>3</g:bedrooms>
- * Not acceptable:
- * + * 		Example Acceptable:
+ * <g:bedrooms>3</g:bedrooms>
+ * Not acceptable:
+ * * <g:bedrooms>3 bedrooms</g:bedrooms>
Attribute of Housing Attribute of Housing
Content type integer Content type integer
+ * + * + * * @return Number of bedrooms */ public Integer getBedrooms(); /** - * Currency of the price amount for an item. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
currency
Details Currency - * of the price amount for an item. Values must be in ISO - * 4217 currency code format.
Example Acceptable:
<g:currency>USD</g:currency>
- * - * Not acceptable:
<g:currency>US Dollars</g:currency>
Attribute - * of Events, - * Housing, Products, Services, Travel, Vehicles
Content - * type currencyEnumeration
- * @param value Currency of the price amount for an item. + * Currency of the price amount for an item. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
currency
DetailsCurrency of the price amount for an item. Values must be in ISO 4217 currency code format.
ExampleAcceptable:
+ * <g:currency>USD</g:currency>
+ * + * Not acceptable:
+ * <g:currency>US Dollars</g:currency>
Attribute ofEvents, Housing, Products, Services, Travel, Vehicles
Content typecurrencyEnumeration
+ * + * @param value Currency of the price amount for an item. */ public void setCurrency(CurrencyEnumeration value); /** - * Currency of the price amount for an item. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
currency
Details Currency - * of the price amount for an item. Values must be in ISO - * 4217 currency code format.
Example Acceptable:
<g:currency>USD</g:currency>
- * - * Not acceptable:
<g:currency>US Dollars</g:currency>
Attribute - * of Events, - * Housing, Products, Services, Travel, Vehicles
Content - * type currencyEnumeration
- * @return Currency of the price amount for an item. + * Currency of the price amount for an item. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
currency
DetailsCurrency of the price amount for an item. Values must be in ISO 4217 currency code format.
ExampleAcceptable:
+ * <g:currency>USD</g:currency>
+ * + * Not acceptable:
+ * <g:currency>US Dollars</g:currency>
Attribute ofEvents, Housing, Products, Services, Travel, Vehicles
Content typecurrencyEnumeration
+ * + * @return Currency of the price amount for an item. */ public CurrencyEnumeration getCurrency(); /** * Homeowners association dues on the property. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
hoa_dues
Details Monthly dues paid to a homeowners association.
Example <g:hoa_dues>100</g:hoa_dues>
Attribute of Housing
Content type float
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
hoa_dues
Details Monthly dues paid to a homeowners association.
Example<g:hoa_dues>100</g:hoa_dues>
Attribute of Housing
Content type float
+ * * @param hoaDues Homeowners association dues on the property. */ public void setHoaDues(Float hoaDues); /** * Homeowners association dues on the property. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
hoa_dues
Details Monthly dues paid to a homeowners association.
Example <g:hoa_dues>100</g:hoa_dues>
Attribute of Housing
Content type float
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
hoa_dues
Details Monthly dues paid to a homeowners association.
Example<g:hoa_dues>100</g:hoa_dues>
Attribute of Housing
Content type float
+ * * @return Homeowners association dues on the property. */ public Float getHoaDues(); /** * Indicates whether this property is for sale or not. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
listing_type
Details Information about whether or not a property is - * for sale or not. Acceptable values are "True" or "False".
Example Acceptable:
- * - * <g:for_sale>true</g:for_sale>
- * <g:for_sale>false</g:for_sale>
- * Not acceptable:
- * - * <g:for_sale>Sale</g:for_sale>
- * - * <g:for_sale>Rent</g:for_sale>
Attribute of Housing
Content type Boolean
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
listing_type
Details Information about whether or not a property is for sale or not. Acceptable values are "True" or "False".
Example Acceptable:
+ * + * <g:for_sale>true</g:for_sale>
+ * <g:for_sale>false</g:for_sale>
+ * Not acceptable:
+ * + * <g:for_sale>Sale</g:for_sale>
+ * + * <g:for_sale>Rent</g:for_sale>
Attribute of Housing
Content type Boolean
+ * * @param forSale Indicates whether this property is for sale or not. */ public void setListingType(Boolean forSale); /** * Indicates whether this property is for sale or not. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
listing_type
Details Information about whether or not a property is - * for sale or not. Acceptable values are "True" or "False".
Example Acceptable:
- * - * <g:for_sale>true</g:for_sale>
- * <g:for_sale>false</g:for_sale>
- * Not acceptable:
- * - * <g:for_sale>Sale</g:for_sale>
- * - * <g:for_sale>Rent</g:for_sale>
Attribute of Housing
Content type Boolean
- * @return Indicates whether this property is for sale or not. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
listing_type
Details Information about whether or not a property is for sale or not. Acceptable values are "True" or "False".
Example Acceptable:
+ * + * <g:for_sale>true</g:for_sale>
+ * <g:for_sale>false</g:for_sale>
+ * Not acceptable:
+ * + * <g:for_sale>Sale</g:for_sale>
+ * + * <g:for_sale>Rent</g:for_sale>
Attribute of Housing
Content type Boolean
+ * + * @return Indicates whether this property is for sale or not. */ public Boolean getListingType(); /** * Location of the property. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * - * + * <g:location>123 Main St,, CA, 12345, + * USA</g:location>
+ * <g:location> Anytown, CA, 12345, + * USA</g:location> + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * location
location
- * Details Location of a property. Should - * include street, city, state, postal code, and country, in that order. Details Location of a property. Should include street, city, state, postal code, and country, in that order.
- * Example - * Acceptable:
- * <g:location>123 Main St, Anytown, CA, 12345, USA</g:location>
- * + * 		Example Acceptable:
+ * <g:location>123 Main St, Anytown, CA, 12345, + * USA</g:location>
+ * * Not acceptable:
- * <g:location>123 Main St,, CA, 12345, USA</g:location>
- * <g:location> - * Anytown, CA, 12345, USA</g:location>
- * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
- * Content type - * locationType Content type locationType
+ * + * + * * @param location Location of the property. */ public void setLocation(String location); @@ -654,453 +671,395 @@ public interface Housing extends GlobalInterface { /** * Location of the property. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * - * + * <g:location>123 Main St,, CA, 12345, + * USA</g:location>
+ * <g:location> Anytown, CA, 12345, + * USA</g:location> + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * location
location
- * Details Location of a property. Should - * include street, city, state, postal code, and country, in that order. Details Location of a property. Should include street, city, state, postal code, and country, in that order.
- * Example - * Acceptable:
- * <g:location>123 Main St, Anytown, CA, 12345, USA</g:location>
- * + * 		Example Acceptable:
+ * <g:location>123 Main St, Anytown, CA, 12345, + * USA</g:location>
+ * * Not acceptable:
- * <g:location>123 Main St,, CA, 12345, USA</g:location>
- * <g:location> - * Anytown, CA, 12345, USA</g:location>
- * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
- * Content type - * locationType Content type locationType
+ * + * + * * @return Location of the property. */ public String getLocation(); /** * Payment Methods acceptable for the property. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * <g:payment_accepted>Cash Check Paypal</g:payment_accepted> * - * + * * - * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * - *
- * payment_accepted
payment_accepted
- * Details Acceptable payment methods for item purchases. Acceptable - * values are "Cash," "Check," "Traveler’s Check," "Visa," "MasterCard," - * - * "American Express," "Discover," "Wire transfer" or "Paypal." If you accept - * more than one method, include multiple instances of the - * <payment_accepted> attribute for each acceptable method. Details Acceptable payment methods for item purchases. Acceptable values are "Cash," "Check," "Traveler’s Check," "Visa," "MasterCard," + * + * "American Express," "Discover," "Wire transfer" or "Paypal." If you accept more than one method, include multiple instances of the + * <payment_accepted> attribute for each acceptable method.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:payment_accepted>Cash</g:payment_accepted>
- * + * * <g:payment_accepted>Check</g:payment_accepted>
- * + * * <g:payment_accepted>Paypal</g:payment_accepted>
* Not acceptable:
- * <g:payment_accepted>Cash - * Check Paypal</g:payment_accepted>
- * Attribute of - * Events, Housing, - * Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * paymentMethodEnumeration Content type paymentMethodEnumeration
+ * + * + * * @param paymentAccepted Payment Methods acceptable for the property. */ public void setPaymentAccepted(PaymentTypeEnumeration[] paymentAccepted); /** * Payment Methods acceptable for the property. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * <g:payment_accepted>Cash Check Paypal</g:payment_accepted> * - * + * * - * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * - *
- * payment_accepted
payment_accepted
- * Details Acceptable payment methods for item purchases. Acceptable - * values are "Cash," "Check," "Traveler’s Check," "Visa," "MasterCard," - * - * "American Express," "Discover," "Wire transfer" or "Paypal." If you accept - * more than one method, include multiple instances of the - * <payment_accepted> attribute for each acceptable method. Details Acceptable payment methods for item purchases. Acceptable values are "Cash," "Check," "Traveler’s Check," "Visa," "MasterCard," + * + * "American Express," "Discover," "Wire transfer" or "Paypal." If you accept more than one method, include multiple instances of the + * <payment_accepted> attribute for each acceptable method.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:payment_accepted>Cash</g:payment_accepted>
- * + * * <g:payment_accepted>Check</g:payment_accepted>
- * + * * <g:payment_accepted>Paypal</g:payment_accepted>
* Not acceptable:
- * <g:payment_accepted>Cash - * Check Paypal</g:payment_accepted>
- * Attribute of - * Events, Housing, - * Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * paymentMethodEnumeration Content type paymentMethodEnumeration
- * @return Payment Methods acceptable for the property. + * + * + * + * @return Payment Methods acceptable for the property. */ public PaymentTypeEnumeration[] getPaymentAccepted(); /** * Additional payment information. - * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * payment_notes
payment_notes
- * Details - * Additional instructions to explain - * a payment policy. Details Additional instructions to explain a payment policy.
- * Example <g:payment_notes>Cash only for local orders.</g:payment_notes> Example <g:payment_notes>Cash only for local orders.</g:payment_notes>
- * Attribute of - * - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of + * + * Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * string Content type string
+ * + * + * * @param paymentNotes Additional payment information. */ public void setPaymentNotes(String paymentNotes); /** * Additional payment information. - * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * payment_notes
payment_notes
- * Details - * Additional instructions to explain - * a payment policy. Details Additional instructions to explain a payment policy.
- * Example <g:payment_notes>Cash only for local orders.</g:payment_notes> Example <g:payment_notes>Cash only for local orders.</g:payment_notes>
- * Attribute of - * - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of + * + * Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * string Content type string
+ * + * + * * @return Additional payment information. */ public String getPaymentNotes(); /** - * Price for the property. - *
- * - * + * Price for the property.
+ * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * price
price
- * Details Prices can be a single price, 0 - * (free), or blank if not applicable. Numerice values only. When used - * as a sub-attribute of <shipping>, the value included reflects the price - * of shipping. Details Prices can be a single price, 0 (free), or blank if not applicable. Numerice values only. When used as a sub-attribute of + * <shipping>, the value included reflects the price of shipping.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:price>5.95</g:price>
- * + * * <g:price>0</g:price>
- * Not acceptable:
+ * Not acceptable:
* <g:price>5,95</g:price>
* <g:price>5.00 � 10.00</g:price>
- * + * * <g:price>100 or best offer</g:price>
* <g:price>free</g:price>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content typefloatUnit Content typefloatUnit
+ * + * + * * @param price Price for the property. */ public void setPrice(FloatUnit price); /** - * Price for the property. - *
- * - * + * Price for the property.
+ * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * price
price
- * Details Prices can be a single price, 0 - * (free), or blank if not applicable. Numerice values only. When used - * as a sub-attribute of <shipping>, the value included reflects the price - * of shipping. Details Prices can be a single price, 0 (free), or blank if not applicable. Numerice values only. When used as a sub-attribute of + * <shipping>, the value included reflects the price of shipping.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:price>5.95</g:price>
- * + * * <g:price>0</g:price>
- * Not acceptable:
+ * Not acceptable:
* <g:price>5,95</g:price>
* <g:price>5.00 � 10.00</g:price>
- * + * * <g:price>100 or best offer</g:price>
* <g:price>free</g:price>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content typefloatUnit Content typefloatUnit
+ * + * + * * @return Price for the property. */ public FloatUnit getPrice(); /** * Price type information. - * - * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * - * + * + * - * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
price_type
DetailsThe type of pricing for the - * item. Acceptable values are �negotiable,� or �starting.� The default is - * �starting�price_type
DetailsThe type of pricing for the item. Acceptable values are �negotiable,� or �starting.� The default is �starting�
ExampleAcceptable:
+ * + * 		ExampleAcceptable:
* <g:price_type>starting</g:price_type>
* Not acceptable:
* <g:price_type>100 OBO</g:price_type>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * priceTypeEnumeration Content type priceTypeEnumeration
+ * + * + * * @param priceType Price type information. */ public void setPriceType(PriceTypeEnumeration priceType); /** * Price type information. - * - * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * - * + * + * - * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
price_type
DetailsThe type of pricing for the - * item. Acceptable values are �negotiable,� or �starting.� The default is - * �starting�price_type
DetailsThe type of pricing for the item. Acceptable values are �negotiable,� or �starting.� The default is �starting�
ExampleAcceptable:
+ * + * 		ExampleAcceptable:
* <g:price_type>starting</g:price_type>
* Not acceptable:
* <g:price_type>100 OBO</g:price_type>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * priceTypeEnumeration Content type priceTypeEnumeration
+ * + * + * * @return Price type information. */ public PriceTypeEnumeration getPriceType(); @@ -1108,43 +1067,40 @@ public interface Housing extends GlobalInterface { /** * Types of property represented here. Limit 10. * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * - *
- * property_type
property_type
- * - * Details - * - * Type of property: house, apartment, condominium, - * etc. + * + * Details + * + * Type of property: house, apartment, condominium, etc.
- * Example <g:property_type>house</g:property_type> Example <g:property_type>house</g:property_type>
- * Attribute of - * - * Housing Attribute of + * + * Housing
- * Content type - * string Content type string
+ * + * + * * @param propertyTypes Types of property represented here. Limit 10. */ public void setPropertyTypes(String[] propertyTypes); @@ -1152,133 +1108,122 @@ public interface Housing extends GlobalInterface { /** * Types of property represented here. * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * - *
- * property_type
property_type
- * - * Details - * - * Type of property: house, apartment, condominium, - * etc. + * + * Details + * + * Type of property: house, apartment, condominium, etc.
- * Example <g:property_type>house</g:property_type> Example <g:property_type>house</g:property_type>
- * Attribute of - * - * Housing Attribute of + * + * Housing
- * Content type - * string Content type string
+ * + * + * * @return Types of property represented here. Limit 10. */ public String[] getPropertyTypes(); /** * School district a property is in. - * + * * - * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * school_district
- * Details - * The school district the property is in. school_district
Details The school district the property is in.
- * Example <g:school_district>Union School - * District</g:school_district> Example <g:school_district>Union School + * District</g:school_district>
- * Attribute of - * Housing Attribute of Housing
- * - * Content type - * string + * + * Content type string
+ * + * + * * @param schoolDistrict School district a property is in. */ public void setSchoolDistrict(String schoolDistrict); /** * School district a property is in. - * + * * - * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * school_district
- * Details - * The school district the property is in. school_district
Details The school district the property is in.
- * Example <g:school_district>Union School - * District</g:school_district> Example <g:school_district>Union School + * District</g:school_district>
- * Attribute of - * Housing Attribute of Housing
- * - * Content type - * string + * + * Content type string
+ * + * + * * @return School district a property is in. */ public String getSchoolDistrict(); @@ -1286,42 +1231,40 @@ public interface Housing extends GlobalInterface { /** * Percentage tax rate. * - * - * - * - * + * * - * - * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * - *
- * tax_percent
- * - * Details - * Tax rate as a percentage. tax_percent
+ * + * Details Tax rate as a percentage.
- * Example <g:tax_percent>8.2<g:/tax_percent> Example <g:tax_percent>8.2<g:/tax_percent>
- * - * Attribute of - * - * Products, Events + * + * Attribute of + * + * Products, Events
- * Content type - * percentType Content type percentType
+ * + * + * * @param taxPercent Percentage tax rate. */ public void setTaxPercent(Float taxPercent); @@ -1329,234 +1272,214 @@ public interface Housing extends GlobalInterface { /** * Percentage tax rate. * - * - * - * - * + * * - * - * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * - *
- * tax_percent
- * - * Details - * Tax rate as a percentage. tax_percent
+ * + * Details Tax rate as a percentage.
- * Example <g:tax_percent>8.2<g:/tax_percent> Example <g:tax_percent>8.2<g:/tax_percent>
- * - * Attribute of - * - * Products, Events + * + * Attribute of + * + * Products, Events
- * Content type - * percentType Content type percentType
+ * + * + * * @return Percentage tax rate. */ public Float getTaxPercent(); /** * Geographical region a tax rate applies to. - * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * - *
- * - * tax_region
- * Details - * Geographical region a tax rate - * applies to. + * + * tax_region
Details Geographical region a tax rate applies to.
- * - * Example <g:tax_region>California</g:tax_region> + * + * Example <g:tax_region>California</g:tax_region>
- * Attribute of - * Product, - * Events, Attribute of Product, Events,
- * Content typestring Content typestring
+ * + * + * * @param taxRegion Geographical region a tax rate applies to. */ public void setTaxRegion(String taxRegion); /** * Geographical region a tax rate applies to. - * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * - *
- * - * tax_region
- * Details - * Geographical region a tax rate - * applies to. + * + * tax_region
Details Geographical region a tax rate applies to.
- * - * Example <g:tax_region>California</g:tax_region> + * + * Example <g:tax_region>California</g:tax_region>
- * Attribute of - * Product, - * Events, Attribute of Product, Events,
- * Content typestring Content typestring
+ * + * + * * @return Geographical region a tax rate applies to. */ public String getTaxRegion(); /** * The four digit model year or year built. - * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * * - * + * * - * - * - * + * + * + * * * - * - * + * + * * - * - *
- * year
year
- * Details - * The four digit model year or year built. Format - * YYYY Details The four digit model year or year built. Format YYYY
- * - * Example - * Acceptable:
- * + * 		+ * + * Example Acceptable:
+ * * <g:year>2005</g:year>
- * Not acceptable:
+ * Not acceptable:
* <g:year>79</g:year>
- * + * * <g:year>26</g:year>
- * Attribute of - * Housing, Vehicles Attribute of Housing, Vehicles
- * - * Content type - * year + * + * Content type year
+ * + * + * + * * @param year The four digit model year or year built. */ public void setYear(YearType year); /** * The four digit model year or year built. - * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * * - * + * * - * - * - * + * + * + * * * - * - * + * + * * - * - *
- * year
year
- * Details - * The four digit model year or year built. Format - * YYYY Details The four digit model year or year built. Format YYYY
- * - * Example - * Acceptable:
- * + * 		+ * + * Example Acceptable:
+ * * <g:year>2005</g:year>
- * Not acceptable:
+ * Not acceptable:
* <g:year>79</g:year>
- * + * * <g:year>26</g:year>
- * Attribute of - * Housing, Vehicles Attribute of Housing, Vehicles
- * - * Content type - * year + * + * Content type year
+ * + * + * + * * @return The four digit model year or year built. */ public YearType getYear(); diff --git a/src/main/java/org/rometools/feed/module/base/Job.java b/src/main/java/org/rometools/feed/module/base/Job.java index 943c5e4..2f206fb 100644 --- a/src/main/java/org/rometools/feed/module/base/Job.java +++ b/src/main/java/org/rometools/feed/module/base/Job.java @@ -42,292 +42,297 @@ package org.rometools.feed.module.base; import org.rometools.feed.module.base.types.CurrencyEnumeration; import org.rometools.feed.module.base.types.PriceTypeEnumeration; - -/** This is an interface for the GoogleBase plug in that exposes methods used for - * Job listing entry types. - * +/** + * This is an interface for the GoogleBase plug in that exposes methods used for Job listing entry types. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ public interface Job extends GlobalInterface { /** * Level of education required for an employment position. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
education
Details Level of education required for an employment - * position.
Example <g:education>PhD</g:education>
Attribute of Jobs
Content type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
education
Details Level of education required for an employment position.
Example<g:education>PhD</g:education>
Attribute of Jobs
Content type string
+ * * @param education Level of education required for an employment position. */ public void setEducation(String education); /** * Level of education required for an employment position. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
education
Details Level of education required for an employment - * position.
Example <g:education>PhD</g:education>
Attribute of Jobs
Content type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
education
Details Level of education required for an employment position.
Example<g:education>PhD</g:education>
Attribute of Jobs
Content type string
+ * * @return Level of education required for an employment position. */ public String getEducation(); /** * Company providing employment. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
employer
Details Company providing employment.
Example <g:employer>Google, Inc</g:employer>
Attribute of Jobs
Content type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
employer
Details Company providing employment.
Example<g:employer>Google, Inc</g:employer>
Attribute of Jobs
Content type string
+ * * @param employer Company providing employment. */ public void setEmployer(String employer); /** * Company providing employment. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
employer
Details Company providing employment.
Example <g:employer>Google, Inc</g:employer>
Attribute of Jobs
Content type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
employer
Details Company providing employment.
Example<g:employer>Google, Inc</g:employer>
Attribute of Jobs
Content type string
+ * * @return Company providing employment. */ public String getEmployer(); /** * Legal residency requirements for an employment position. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
immigration_status
Details Legal residency requirements for an employment - * position.
Example <g:immigration_status>Permanent resident</g:immigration_status>
Attribute of Jobs
Content type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
immigration_status
Details Legal residency requirements for an employment position.
Example<g:immigration_status>Permanent resident</g:immigration_status>
Attribute of Jobs
Content type string
+ * * @param immigrationStatus Legal residency requirements for an employment position. */ public void setImmigrationStatus(String immigrationStatus); /** * Legal residency requirements for an employment position. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
immigration_status
Details Legal residency requirements for an employment - * position.
Example <g:immigration_status>Permanent resident</g:immigration_status>
Attribute of Jobs
Content type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
immigration_status
Details Legal residency requirements for an employment position.
Example<g:immigration_status>Permanent resident</g:immigration_status>
Attribute of Jobs
Content type string
+ * * @return Legal residency requirements for an employment position. */ public String getImmigrationStatus(); /** * The functions of an employment position. - * + * * - * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
- * job_function
- * Details - * The function of an employment position. job_function
Details The function of an employment position.
- * Example <g:job_function>Product - * Manager</g:job_function> Example <g:job_function>Product Manager</g:job_function>
- * - * Attribute of - * Jobs + * + * Attribute of Jobs
- * - * Content type - * string + * + * Content type string
+ * + * + * * @param function The functions of an employment position. */ public void setJobFunctions(String[] function); /** * The functions of an employment position. - * + * * - * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
- * job_function
- * Details - * The function of an employment position. job_function
Details The function of an employment position.
- * Example <g:job_function>Product - * Manager</g:job_function> Example <g:job_function>Product Manager</g:job_function>
- * - * Attribute of - * Jobs + * + * Attribute of Jobs
- * - * Content type - * string + * + * Content type string
+ * + * + * * @return The functions of an employment position. */ public String[] getJobFunctions(); @@ -335,40 +340,37 @@ public interface Job extends GlobalInterface { /** * The industry of an employment position. * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
- * - * job_industry
+ * + * job_industry
- * Details - * The industry of an employment position. Details The industry of an employment position.
- * Example <g:job_industry>Government</g:job_industry> Example <g:job_industry>Government</g:job_industry>
- * Attribute of - * Jobs Attribute of Jobs
- * - * Content type - * string + * + * Content type string
+ * + * + * * @param jobIndustries The industry of an employment position. */ public void setJobIndustries(String[] jobIndustries); @@ -376,174 +378,159 @@ public interface Job extends GlobalInterface { /** * The industry of an employment position. * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
- * - * job_industry
+ * + * job_industry
- * Details - * The industry of an employment position. Details The industry of an employment position.
- * Example <g:job_industry>Government</g:job_industry> Example <g:job_industry>Government</g:job_industry>
- * Attribute of - * Jobs Attribute of Jobs
- * - * Content type - * string + * + * Content type string
+ * + * + * * @return The industry of an employment position. */ public String[] getJobIndustries(); /** - * Type of employment position. Example: Full-time, part-time, contractor, etc. + * Type of employment position. Example: Full-time, part-time, contractor, etc. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * * - * + * * - * - * + * + * * - *
- * job_type
job_type
- * Details - * Type of employment position. Example: Full-time, part-time, contractor, etc. Details Type of employment position. Example: Full-time, part-time, contractor, etc.
- * Example <g:job_type>contractor</g:job_type> Example <g:job_type>contractor</g:job_type>
- * Attribute of - * Jobs Attribute of Jobs
- * - * Content type - * string + * + * Content type string
- * @param jobTypes Type of employment position. Example: Full-time, part-time, contractor, etc. + * + * + * + * @param jobTypes Type of employment position. Example: Full-time, part-time, contractor, etc. */ public void setJobTypes(String[] jobTypes); /** - * Type of employment position. Example: Full-time, part-time, contractor, etc. + * Type of employment position. Example: Full-time, part-time, contractor, etc. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * * - * + * * - * - * + * + * * - *
- * job_type
job_type
- * Details - * Type of employment position. Example: Full-time, part-time, contractor, etc. Details Type of employment position. Example: Full-time, part-time, contractor, etc.
- * Example <g:job_type>contractor</g:job_type> Example <g:job_type>contractor</g:job_type>
- * Attribute of - * Jobs Attribute of Jobs
- * - * Content type - * string + * + * Content type string
- * @return Type of employment position. Example: Full-time, part-time, contractor, etc. + * + * + * + * @return Type of employment position. Example: Full-time, part-time, contractor, etc. */ public String[] getJobTypes(); /** * Location of the position. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * - * + * <g:location>123 Main St,, CA, 12345, + * USA</g:location>
+ * <g:location> Anytown, CA, 12345, + * USA</g:location> + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * location
location
- * Details Location of a property. Should - * include street, city, state, postal code, and country, in that order. Details Location of a property. Should include street, city, state, postal code, and country, in that order.
- * Example - * Acceptable:
- * <g:location>123 Main St, Anytown, CA, 12345, USA</g:location>
- * + * 		Example Acceptable:
+ * <g:location>123 Main St, Anytown, CA, 12345, + * USA</g:location>
+ * * Not acceptable:
- * <g:location>123 Main St,, CA, 12345, USA</g:location>
- * <g:location> - * Anytown, CA, 12345, USA</g:location>
- * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
- * Content type - * locationType Content type locationType
+ * + * + * * @param location Location of the position. */ public void setLocation(String location); @@ -551,49 +538,45 @@ public interface Job extends GlobalInterface { /** * Location of the position. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * - * + * <g:location>123 Main St,, CA, 12345, + * USA</g:location>
+ * <g:location> Anytown, CA, 12345, + * USA</g:location> + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * location
location
- * Details Location of a property. Should - * include street, city, state, postal code, and country, in that order. Details Location of a property. Should include street, city, state, postal code, and country, in that order.
- * Example - * Acceptable:
- * <g:location>123 Main St, Anytown, CA, 12345, USA</g:location>
- * + * 		Example Acceptable:
+ * <g:location>123 Main St, Anytown, CA, 12345, + * USA</g:location>
+ * * Not acceptable:
- * <g:location>123 Main St,, CA, 12345, USA</g:location>
- * <g:location> - * Anytown, CA, 12345, USA</g:location>
- * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
- * Content type - * locationType Content type locationType
+ * + * + * * @return Location of the position. */ public String getLocation(); @@ -601,43 +584,40 @@ public interface Job extends GlobalInterface { /** * Salary for this position. Non-numeric values such as "$" symbols are not acceptable. * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * * - *
- * salary
- * Details - * Salary for this position. Non-numeric values such as "$" symbols are not acceptable. salary
Details Salary for this position. Non-numeric values such as "$" symbols are not acceptable.
- * - * Example - * <g:salary>55000</g:salary> + * + * Example <g:salary>55000</g:salary>
- * - * Attribute of - * Jobs + * + * Attribute of Jobs
- * Content type - * + * Content type + * * float
+ * + * + * * @param salary Salary for this position. Non-numeric values such as "$" symbols are not acceptable. */ public void setSalary(Float salary); @@ -645,43 +625,40 @@ public interface Job extends GlobalInterface { /** * Salary for this position. Non-numeric values such as "$" symbols are not acceptable. * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * * - *
- * salary
- * Details - * Salary for this position. Non-numeric values such as "$" symbols are not acceptable. salary
Details Salary for this position. Non-numeric values such as "$" symbols are not acceptable.
- * - * Example - * <g:salary>55000</g:salary> + * + * Example <g:salary>55000</g:salary>
- * - * Attribute of - * Jobs + * + * Attribute of Jobs
- * Content type - * + * Content type + * * float
+ * + * + * * @return Salary for this position. Non-numeric values such as "$" symbols are not acceptable. */ public Float getSalary(); @@ -689,43 +666,40 @@ public interface Job extends GlobalInterface { /** * The type of salary included. * - * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * * - * - * + * + * * - *
- * salary_type
- * Details The type of salary included. - * Accepted values are �starting� or �negotiable;� The default is �starting - * at.� salary_type
Details The type of salary included. Accepted values are �starting� or �negotiable;� The default is �starting at.�
- * - * Example <g:salary_type>negotiable</g:salary_type> + * + * Example <g:salary_type>negotiable</g:salary_type>
- * Attribute of - * Jobs Attribute of Jobs
- * - * Content type - * - * "starting" or "negotiable" + * + * Content type + * + * "starting" or "negotiable"
+ * + * + * * @param salaryType The type of salary included. */ public void setSalaryType(PriceTypeEnumeration salaryType); @@ -733,127 +707,125 @@ public interface Job extends GlobalInterface { /** * The type of salary included. * - * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * * - * - * + * + * * - *
- * salary_type
- * Details The type of salary included. - * Accepted values are �starting� or �negotiable;� The default is �starting - * at.� salary_type
Details The type of salary included. Accepted values are �starting� or �negotiable;� The default is �starting at.�
- * - * Example <g:salary_type>negotiable</g:salary_type> + * + * Example <g:salary_type>negotiable</g:salary_type>
- * Attribute of - * Jobs Attribute of Jobs
- * - * Content type - * - * "starting" or "negotiable" + * + * Content type + * + * "starting" or "negotiable"
+ * + * + * * @return The type of salary included. */ public PriceTypeEnumeration getSalaryType(); - - + /** - * Currency of the price amount for an item. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
currency
Details Currency - * of the price amount for an item. Values must be in ISO - * 4217 currency code format.
Example Acceptable:
<g:currency>USD</g:currency>
- * - * Not acceptable:
<g:currency>US Dollars</g:currency>
Attribute - * of Events, - * Housing, Products, Services, Travel, Vehicles
Content - * type currencyEnumeration
- * @param value Currency of the price amount for an item. + * Currency of the price amount for an item. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
currency
DetailsCurrency of the price amount for an item. Values must be in ISO 4217 currency code format.
ExampleAcceptable:
+ * <g:currency>USD</g:currency>
+ * + * Not acceptable:
+ * <g:currency>US Dollars</g:currency>
Attribute ofEvents, Housing, Products, Services, Travel, Vehicles
Content typecurrencyEnumeration
+ * + * @param value Currency of the price amount for an item. */ public void setCurrency(CurrencyEnumeration value); /** - * Currency of the price amount for an item. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
currency
Details Currency - * of the price amount for an item. Values must be in ISO - * 4217 currency code format.
Example Acceptable:
<g:currency>USD</g:currency>
- * - * Not acceptable:
<g:currency>US Dollars</g:currency>
Attribute - * of Events, - * Housing, Products, Services, Travel, Vehicles
Content - * type currencyEnumeration
- * @return Currency of the price amount for an item. + * Currency of the price amount for an item. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
currency
DetailsCurrency of the price amount for an item. Values must be in ISO 4217 currency code format.
ExampleAcceptable:
+ * <g:currency>USD</g:currency>
+ * + * Not acceptable:
+ * <g:currency>US Dollars</g:currency>
Attribute ofEvents, Housing, Products, Services, Travel, Vehicles
Content typecurrencyEnumeration
+ * + * @return Currency of the price amount for an item. */ public CurrencyEnumeration getCurrency(); diff --git a/src/main/java/org/rometools/feed/module/base/Person.java b/src/main/java/org/rometools/feed/module/base/Person.java index f3d43fd..ae97f94 100644 --- a/src/main/java/org/rometools/feed/module/base/Person.java +++ b/src/main/java/org/rometools/feed/module/base/Person.java @@ -41,9 +41,9 @@ package org.rometools.feed.module.base; import org.rometools.feed.module.base.types.GenderEnumeration; - -/** This is an interface for the GoogleBase plug in that exposes methods used for - * Person (personal ad, resume, profile) entry types. +/** + * This is an interface for the GoogleBase plug in that exposes methods used for Person (personal ad, resume, profile) entry types. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.2 $ */ @@ -51,36 +51,36 @@ public interface Person extends GlobalInterface { /** * Age of the individual. * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
age
DetailsMinimum age requirement for the event or the age of the individual in a People profiles - * bulk upload entry.
ExampleAcceptable:
- * < - * g:age>18</g:age>
- * Not acceptable:
- * - * < - * g:age>18 and over</g:age>
Attribute ofEvents, People profiles
Content typeinteger
+ * + * + * age + * + * + * Details + * Minimum age requirement for the event or the age of the individual in a People profiles bulk upload entry. + * + * + * + * Example + * Acceptable:
+ * < g:age>18</g:age>
+ * Not acceptable:
+ * + * < g:age>18 and over</g:age> + * + * + * Attribute of + * Events, People profiles + * + * + * + * + * Content type + * integer + * + * + * + * * @param age Age of the individual. */ public void setAge(Integer age); @@ -88,370 +88,388 @@ public interface Person extends GlobalInterface { /** * Age of the individual. * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
age
DetailsMinimum age requirement for the event or the age of the individual in a People profiles - * bulk upload entry.
ExampleAcceptable:
- * < - * g:age>18</g:age>
- * Not acceptable:
- * - * < - * g:age>18 and over</g:age>
Attribute ofEvents, People profiles
Content typeinteger
+ * + * + * age + * + * + * Details + * Minimum age requirement for the event or the age of the individual in a People profiles bulk upload entry. + * + * + * + * Example + * Acceptable:
+ * < g:age>18</g:age>
+ * Not acceptable:
+ * + * < g:age>18 and over</g:age> + * + * + * Attribute of + * Events, People profiles + * + * + * + * + * Content type + * integer + * + * + * + * * @return Age of the individual. */ public Integer getAge(); /** * Education of the individual. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
education
Details Level of education required for an employment - * position.
Example <g:education>PhD</g:education>
Attribute of Jobs
Content type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
education
Details Level of education required for an employment position.
Example<g:education>PhD</g:education>
Attribute of Jobs
Content type string
+ * * @param education Education of the individual. */ public void setEducation(String education); /** * Education of the individual. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
education
Details Level of education required for an employment - * position.
Example <g:education>PhD</g:education>
Attribute of Jobs
Content type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
education
Details Level of education required for an employment position.
Example<g:education>PhD</g:education>
Attribute of Jobs
Content type string
+ * * @return Education of the individual. */ public String getEducation(); /** * Individuals employer. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
employer
Details Company providing employment.
Example <g:employer>Google, Inc</g:employer>
Attribute of Jobs
Content type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
employer
Details Company providing employment.
Example<g:employer>Google, Inc</g:employer>
Attribute of Jobs
Content type string
+ * * @param employer Individuals employer. */ public void setEmployer(String employer); /** * Individuals employer. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
employer
Details Company providing employment.
Example <g:employer>Google, Inc</g:employer>
Attribute of Jobs
Content type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
employer
Details Company providing employment.
Example<g:employer>Google, Inc</g:employer>
Attribute of Jobs
Content type string
+ * * @return Individuals employer. */ public String getEmployer(); /** * Ethnicity of the individual in the People profiles bulk upload entry. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
ethnicity
Details Ethnicity of the individual in the People profiles - * bulk upload entry.
Example <g:ethnicity>Latino</g:ethnicity>
Attribute of People profiles
Content type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
ethnicity
Details Ethnicity of the individual in the People profiles bulk upload entry.
Example<g:ethnicity>Latino</g:ethnicity>
Attribute of People profiles
Content type string
+ * * @param ethnicities Ethnicity of the individual in the People profiles bulk upload entry. */ public void setEthnicities(String[] ethnicities); /** * Ethnicity of the individual in the People profiles bulk upload entry. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
ethnicity
Details Ethnicity of the individual in the People profiles - * bulk upload entry.
Example <g:ethnicity>Latino</g:ethnicity>
Attribute of People profiles
Content type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
ethnicity
Details Ethnicity of the individual in the People profiles bulk upload entry.
Example<g:ethnicity>Latino</g:ethnicity>
Attribute of People profiles
Content type string
+ * * @return Ethnicity of the individual in the People profiles bulk upload entry. */ public String[] getEthnicities(); /** * Gender of an individual in a People profiles bulk upload. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
gender
Details Gender of an individual in a People profiles bulk upload - * item. Acceptable values are �Male�, �M�, - * �Female�, or �F�.
Example - * <gender>Female</gender>
Attribute of People profiles
Content type genderEnumeration
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
gender
Details Gender of an individual in a People profiles bulk upload item. Acceptable values are �Male�, �M�, �Female�, or �F�.
Example <gender>Female</gender>
Attribute of People profiles
Content type genderEnumeration
+ * * @param gender Gender of an individual in a People profiles bulk upload. */ public void setGender(GenderEnumeration gender); /** * Gender of an individual in a People profiles bulk upload. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
gender
Details Gender of an individual in a People profiles bulk upload - * item. Acceptable values are �Male�, �M�, - * �Female�, or �F�.
Example - * <gender>Female</gender>
Attribute of People profiles
Content type genderEnumeration
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
gender
Details Gender of an individual in a People profiles bulk upload item. Acceptable values are �Male�, �M�, �Female�, or �F�.
Example <gender>Female</gender>
Attribute of People profiles
Content type genderEnumeration
+ * * @return Gender of an individual in a People profiles bulk upload. */ public GenderEnumeration getGender(); /** * Interest of a person being profiled. - * + * * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
interested_in
Details Interest of a person being profiled.
Example - * <g:interested_in>Long walks on the beach.</g:interested_in>
Attribute ofPeople profiles
Content type string
+ * + * + * interested_in + * + * + * + * Details + * Interest of a person being profiled. + * + * + * + * Example + * + * <g:interested_in>Long walks on the beach.</g:interested_in> + * + * + * Attribute of + * + * People profiles + * + * + * + * Content type + * string + * + * + * + * + * * @param interestedIn Interest of a person being profiled. */ public void setInterestedIn(String[] interestedIn); /** * Interest of a person being profiled. - * + * * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
interested_in
Details Interest of a person being profiled.
Example - * <g:interested_in>Long walks on the beach.</g:interested_in>
Attribute ofPeople profiles
Content type string
+ * + * + * interested_in + * + * + * + * Details + * Interest of a person being profiled. + * + * + * + * Example + * + * <g:interested_in>Long walks on the beach.</g:interested_in> + * + * + * Attribute of + * + * People profiles + * + * + * + * Content type + * string + * + * + * + * + * * @return Interest of a person being profiled. */ public String[] getInterestedIn(); @@ -459,49 +477,45 @@ public interface Person extends GlobalInterface { /** * Location of a person. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * - * + * <g:location>123 Main St,, CA, 12345, + * USA</g:location>
+ * <g:location> Anytown, CA, 12345, + * USA</g:location> + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * location
location
- * Details Location of a property. Should - * include street, city, state, postal code, and country, in that order. Details Location of a property. Should include street, city, state, postal code, and country, in that order.
- * Example - * Acceptable:
- * <g:location>123 Main St, Anytown, CA, 12345, USA</g:location>
- * + * 		Example Acceptable:
+ * <g:location>123 Main St, Anytown, CA, 12345, + * USA</g:location>
+ * * Not acceptable:
- * <g:location>123 Main St,, CA, 12345, USA</g:location>
- * <g:location> - * Anytown, CA, 12345, USA</g:location>
- * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
- * Content type - * locationType Content type locationType
+ * + * + * * @param location Location of a person. */ public void setLocation(String location); @@ -509,322 +523,300 @@ public interface Person extends GlobalInterface { /** * Location of a person. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * - * + * <g:location>123 Main St,, CA, 12345, + * USA</g:location>
+ * <g:location> Anytown, CA, 12345, + * USA</g:location> + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * location
location
- * Details Location of a property. Should - * include street, city, state, postal code, and country, in that order. Details Location of a property. Should include street, city, state, postal code, and country, in that order.
- * Example - * Acceptable:
- * <g:location>123 Main St, Anytown, CA, 12345, USA</g:location>
- * + * 		Example Acceptable:
+ * <g:location>123 Main St, Anytown, CA, 12345, + * USA</g:location>
+ * * Not acceptable:
- * <g:location>123 Main St,, CA, 12345, USA</g:location>
- * <g:location> - * Anytown, CA, 12345, USA</g:location>
- * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
- * Content type - * locationType Content type locationType
- * @return Location of a person. + * + * + * + * @return Location of a person. */ public String getLocation(); /** * Marital status of an individual. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * - * + * + * + * + * + * * - * - * - * + * + * + * * * - * - * + * + * * - *
- * marital_status
marital_status
- * - * Details Marital status of an individual - * in a People profiles bulk upload entry. - * For example -single, divorced, separated, widowed, married, and �in - * relationship.� + * + * Details Marital status of an individual in a People profiles bulk upload entry. For example -single, divorced, separated, widowed, married, + * and �in relationship.�
- * Example - * <g:marital_status>single</g:marital_status>
- * - *
Example <g:marital_status>single</g:marital_status>
+ * + *
- * Attribute of - * People profiles Attribute of People profiles
- * - * Content type - * - * string + * + * Content type + * + * string
+ * + * + * * @param maritalStatus Marital status of an individual. */ public void setMaritalStatus(String maritalStatus); /** * Marital status of an individual. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * - * + * + * + * + * + * * - * - * - * + * + * + * * * - * - * + * + * * - *
- * marital_status
marital_status
- * - * Details Marital status of an individual - * in a People profiles bulk upload entry. - * For example -single, divorced, separated, widowed, married, and �in - * relationship.� + * + * Details Marital status of an individual in a People profiles bulk upload entry. For example -single, divorced, separated, widowed, married, + * and �in relationship.�
- * Example - * <g:marital_status>single</g:marital_status>
- * - *
Example <g:marital_status>single</g:marital_status>
+ * + *
- * Attribute of - * People profiles Attribute of People profiles
- * - * Content type - * - * string + * + * Content type + * + * string
- * @return Marital status of an individual. + * + * + * + * @return Marital status of an individual. */ public String getMaritalStatus(); /** * Occupation of an individual. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
- * occupation
occupation
- * - * Details - * Industry the individual in a People profiles bulk upload - * is employed in. + * + * Details Industry the individual in a People profiles bulk upload is employed in.
- * Example <g:occupation>Sales</g:occupation> Example <g:occupation>Sales</g:occupation>
- * Attribute of - * - * People profiles Attribute of + * + * People profiles
- * - * Content type - * string + * + * Content type string
+ * + * + * * @param occupation Occupation of an individual. */ public void setOccupation(String occupation); /** * Occupation of an individual. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
- * occupation
occupation
- * - * Details - * Industry the individual in a People profiles bulk upload - * is employed in. + * + * Details Industry the individual in a People profiles bulk upload is employed in.
- * Example <g:occupation>Sales</g:occupation> Example <g:occupation>Sales</g:occupation>
- * Attribute of - * - * People profiles Attribute of + * + * People profiles
- * - * Content type - * string + * + * Content type string
- * @return Occupation of an individual. + * + * + * + * @return Occupation of an individual. */ public String getOccupation(); /** * Individual's sexual orientation. - * + * * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * - *
- * sexual_orientation
sexual_orientation
- * - * Details - * Sexual orientation of an individual in a People profiles information type.. + * + * Details Sexual orientation of an individual in a People profiles information type..
- * Example <g:sexual_orientation>straight</g:sexual_orientation> Example <g:sexual_orientation>straight</g:sexual_orientation>
- * Attribute of - * - * Personal Attribute of + * + * Personal
- * Content type - * string Content type string
+ * + * + * * @param sexualOrientation Individual's sexual orientation. */ public void setSexualOrientation(String sexualOrientation); /** * Individual's sexual orientation. - * + * * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * - *
- * sexual_orientation
sexual_orientation
- * - * Details - * Sexual orientation of an individual in a People profiles information type.. + * + * Details Sexual orientation of an individual in a People profiles information type..
- * Example <g:sexual_orientation>straight</g:sexual_orientation> Example <g:sexual_orientation>straight</g:sexual_orientation>
- * Attribute of - * - * Personal Attribute of + * + * Personal
- * Content type - * string Content type string
- * @return Individual's sexual orientation. + * + * + * + * @return Individual's sexual orientation. */ public String getSexualOrientation(); } diff --git a/src/main/java/org/rometools/feed/module/base/Product.java b/src/main/java/org/rometools/feed/module/base/Product.java index 2bd82b7..4ef0550 100644 --- a/src/main/java/org/rometools/feed/module/base/Product.java +++ b/src/main/java/org/rometools/feed/module/base/Product.java @@ -46,10 +46,9 @@ import org.rometools.feed.module.base.types.PriceTypeEnumeration; import org.rometools.feed.module.base.types.ShippingType; import org.rometools.feed.module.base.types.Size; - /** - * This is an interface for the GoogleBase plug in that exposes methods used for - * Products. + * This is an interface for the GoogleBase plug in that exposes methods used for Products. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ @@ -57,32 +56,35 @@ public interface Product extends GlobalInterface { /** * Actor featured in the video. * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
actor
DetailsActor featured in the video.
Example<g:actor>Charlie Chaplin</g:actor>
Attribute ofProducts
Content typestring
+ * + * + * + * + * actor + * + * + * Details + * Actor featured in the video. + * + * + * + * + * Example + * <g:actor>Charlie Chaplin</g:actor> + * + * + * Attribute of + * + * Products + * + * + * + * Content type + * string + * + * + * + * * @param actors Actor featured in the video. */ public void setActors(String[] actors); @@ -90,144 +92,147 @@ public interface Product extends GlobalInterface { /** * Actor featured in the video. * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
actor
DetailsActor featured in the video.
Example<g:actor>Charlie Chaplin</g:actor>
Attribute ofProducts
Content typestring
+ * + * + * + * + * actor + * + * + * Details + * Actor featured in the video. + * + * + * + * + * Example + * <g:actor>Charlie Chaplin</g:actor> + * + * + * Attribute of + * + * Products + * + * + * + * Content type + * string + * + * + * + * * @return Actor featured in the video. */ public String[] getActors(); /** - * The type of apparel being offered. - *
- * + * The type of apparel being offered.
+ * * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
apparel_type
Details The type of apparel being offered. Skirt, pants, sleepwear, etc.
Example<g:apparel_type>sweater</g:apparel_type>
Attribute ofProducts
Content typestring
+ * + * + * + * apparel_type + * + * + * Details + * + * The type of apparel being offered. Skirt, pants, sleepwear, etc. + * + * + * + * Example + * <g:apparel_type>sweater</g:apparel_type> + * + * + * + * Attribute of + * Products + * + * + * + * Content type + * + * string + * + * + * + * * @param apparelType The type of apparel being offered. */ public void setApparelType(String apparelType); /** - * The type of apparel being offered. - *
- * + * The type of apparel being offered.
+ * * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
apparel_type
Details The type of apparel being offered. Skirt, pants, sleepwear, etc.
Example<g:apparel_type>sweater</g:apparel_type>
Attribute ofProducts
Content typestring
- * @return The type of apparel being offered. + * + * + * + * apparel_type + * + * + * Details + * + * The type of apparel being offered. Skirt, pants, sleepwear, etc. + * + * + * + * Example + * <g:apparel_type>sweater</g:apparel_type> + * + * + * + * Attribute of + * Products + * + * + * + * Content type + * + * string + * + * + * + * + * @return The type of apparel being offered. */ public String getApparelType(); /** * Artist that created the work. * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * artist
artist
- * Details - * Artist that created the work. Details Artist that created the work.
- * Example <g:artist>Vincent van Gogh</g:artist> Example <g:artist>Vincent van Gogh</g:artist>
- * Attribute of - * Products Attribute of Products
- * - * Content type - * string + * + * Content type string
+ * + * + * * @param artists Artist that created the work. */ public void setArtists(String[] artists); @@ -235,123 +240,109 @@ public interface Product extends GlobalInterface { /** * Artist that created the work. * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * artist
artist
- * Details - * Artist that created the work. Details Artist that created the work.
- * Example <g:artist>Vincent van Gogh</g:artist> Example <g:artist>Vincent van Gogh</g:artist>
- * Attribute of - * Products Attribute of Products
- * - * Content type - * string + * + * Content type string
+ * + * + * * @return Artist that created the work. */ public String[] getArtists(); /** * Author of the item. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * author
author
- * Details - * Author of the item. Details Author of the item.
- * Example <g:author>John Steinbeck</g:author> Example <g:author>John Steinbeck</g:author>
- * Attribute of - * Reference Items, News and Articles Attribute of Reference Items, News and Articles
- * Content type - * string Content type string
+ * + * + * * @param authors Author of the item. */ public void setAuthors(String[] authors); /** * Author of the item. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * author
author
- * Details - * Author of the item. Details Author of the item.
- * Example <g:author>John Steinbeck</g:author> Example <g:author>John Steinbeck</g:author>
- * Attribute of - * Reference Items, News and Articles Attribute of Reference Items, News and Articles
- * Content type - * string Content type string
+ * + * + * * @return Author of the item. */ public String[] getAuthors(); @@ -359,30 +350,33 @@ public interface Product extends GlobalInterface { /** * The brand name of an item. * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * - *
brand
brand
Details The brand name of an item. Details The brand name of an item.
Example <g:brand>Acme</g:brand> Example <g:brand>Acme</g:brand>
Attribute of Products Attribute of Products
Content type string Content type string
+ * + * + * * @param brand The brand name of an item. */ public void setBrand(String brand); @@ -390,565 +384,566 @@ public interface Product extends GlobalInterface { /** * The brand name of an item. * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * - *
brand
brand
Details The brand name of an item. Details The brand name of an item.
Example <g:brand>Acme</g:brand> Example <g:brand>Acme</g:brand>
Attribute of Products Attribute of Products
Content type string Content type string
+ * + * + * * @return The brand name of an item. */ public String getBrand(); /** * Color of an item. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * color
color
- * Details - * Color of an item. Details Color of an item.
- * Example <g:color>Black</g:color> Example <g:color>Black</g:color>
- * - * Attribute of - * Products, Vehicles + * + * Attribute of Products, Vehicles
- * Content type - * string Content type string
+ * + * + * * @param color Color of an item. */ public void setColors(String[] color); /** * Color of an item. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * color
color
- * Details - * Color of an item. Details Color of an item.
- * Example <g:color>Black</g:color> Example <g:color>Black</g:color>
- * - * Attribute of - * Products, Vehicles + * + * Attribute of Products, Vehicles
- * Content type - * string Content type string
+ * + * + * * @return Color of an item. */ public String[] getColors(); /** * Condition of the item. For example: new, used, or refurbished. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
condition
Details Condition - * of the item. For example: new, used, or refurbished.
Example - * <g:condition>refurbished</g:condition>
Attribute - * of Products, - * Vehicles
Content - * type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
condition
DetailsCondition of the item. For example: new, used, or refurbished.
Example + * <g:condition>refurbished</g:condition>
Attribute ofProducts, Vehicles
Content typestring
+ * * @param condition Condition of the item. For example: new, used, or refurbished. */ public void setCondition(String condition); /** * Condition of the item. For example: new, used, or refurbished. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
condition
Details Condition - * of the item. For example: new, used, or refurbished.
Example - * <g:condition>refurbished</g:condition>
Attribute - * of Products, - * Vehicles
Content - * type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
condition
DetailsCondition of the item. For example: new, used, or refurbished.
Example + * <g:condition>refurbished</g:condition>
Attribute ofProducts, Vehicles
Content typestring
+ * * @return Condition of the item. For example: new, used, or refurbished. */ public String getCondition(); /** - * Currency of the price amount for an item. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
currency
Details Currency - * of the price amount for an item. Values must be in ISO - * 4217 currency code format.
Example Acceptable:
<g:currency>USD</g:currency>
- * - * Not acceptable:
<g:currency>US Dollars</g:currency>
Attribute - * of Events, - * Housing, Products, Services, Travel, Vehicles
Content - * type currencyEnumeration
- * @param value Currency of the price amount for an item. + * Currency of the price amount for an item. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
currency
DetailsCurrency of the price amount for an item. Values must be in ISO 4217 currency code format.
ExampleAcceptable:
+ * <g:currency>USD</g:currency>
+ * + * Not acceptable:
+ * <g:currency>US Dollars</g:currency>
Attribute ofEvents, Housing, Products, Services, Travel, Vehicles
Content typecurrencyEnumeration
+ * + * @param value Currency of the price amount for an item. */ public void setCurrency(CurrencyEnumeration value); /** - * Currency of the price amount for an item. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
currency
Details Currency - * of the price amount for an item. Values must be in ISO - * 4217 currency code format.
Example Acceptable:
<g:currency>USD</g:currency>
- * - * Not acceptable:
<g:currency>US Dollars</g:currency>
Attribute - * of Events, - * Housing, Products, Services, Travel, Vehicles
Content - * type currencyEnumeration
- * @return Currency of the price amount for an item. + * Currency of the price amount for an item. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
currency
DetailsCurrency of the price amount for an item. Values must be in ISO 4217 currency code format.
ExampleAcceptable:
+ * <g:currency>USD</g:currency>
+ * + * Not acceptable:
+ * <g:currency>US Dollars</g:currency>
Attribute ofEvents, Housing, Products, Services, Travel, Vehicles
Content typecurrencyEnumeration
+ * + * @return Currency of the price amount for an item. */ public CurrencyEnumeration getCurrency(); /** * Additional instructions to explain the item’s delivery process. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_notes
Details Additional instructions to explain the item’s delivery process.
Example - * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
- * - *
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_notes
DetailsAdditional instructions to explain the item’s delivery process.
Example + * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
+ * + *
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typestring
+ * * @param deliveryNotes Additional instructions to explain the item’s delivery process. */ public void setDeliveryNotes(String deliveryNotes); /** * Additional instructions to explain the item;s delivery process. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_notes
Details Additional instructions to explain the item�s delivery process.
Example - * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
- * - *
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_notes
DetailsAdditional instructions to explain the item�s delivery process.
Example + * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
+ * + *
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typestring
+ * * @return Additional instructions to explain the item�s delivery process. */ public String getDeliveryNotes(); /** * The maximum distance you will deliver an item in any direction. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_radius
Details The maximum - * distance you will deliver an item in any direction.
Example - * <g:delivery_radius>10<g:/delivery_radius> - * - *
<g:delivery_radius>10km</g:delivery_radius>
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type floatUnit
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_radius
DetailsThe maximum distance you will deliver an item in any direction.
Example + * <g:delivery_radius>10<g:/delivery_radius>
+ * <g:delivery_radius>10km</g:delivery_radius>
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typefloatUnit
+ * * @param deliveryRadius The maximum distance you will deliver an item in any direction. */ public void setDeliveryRadius(FloatUnit deliveryRadius); /** * The maximum distance you will deliver an item in any direction. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_radius
Details The maximum - * distance you will deliver an item in any direction.
Example - * <g:delivery_radius>10<g:/delivery_radius> - * - *
<g:delivery_radius>10km</g:delivery_radius>
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type floatUnit
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_radius
DetailsThe maximum distance you will deliver an item in any direction.
Example + * <g:delivery_radius>10<g:/delivery_radius>
+ * <g:delivery_radius>10km</g:delivery_radius>
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typefloatUnit
+ * * @return The maximum distance you will deliver an item in any direction. */ public FloatUnit getDeliveryRadius(); /** * Format of the content. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
format
Details Format of the content.
Example <g:format>DVD</g:format>
- * - * <g:format>CD</g:format>
Attribute of Products
Content type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
format
Details Format of the content.
Example<g:format>DVD</g:format>
+ * + * <g:format>CD</g:format>
Attribute of Products
Content type string
+ * * @param format Format of the content. */ public void setFormat(String[] format); /** * Format of the content. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
format
Details Format of the content.
Example <g:format>DVD</g:format>
- * - * <g:format>CD</g:format>
Attribute of Products
Content type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
format
Details Format of the content.
Example<g:format>DVD</g:format>
+ * + * <g:format>CD</g:format>
Attribute of Products
Content type string
+ * * @return Format of the content. */ public String[] getFormat(); /** * A unique 10 or 13 digit number assigned to every printed book. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
isbn
DetailsA unique 10 or 13 digit number assigned to every printed - * book.
Example<g:isbn>0451524233</g:isbn>
Attribute ofProducts
Content typestring
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
isbn
DetailsA unique 10 or 13 digit number assigned to every printed book.
Example<g:isbn>0451524233</g:isbn>
Attribute ofProducts
Content typestring
+ * * @param isbn A unique 10 or 13 digit number assigned to every printed book. */ public void setIsbn(String isbn); /** * A unique 10 or 13 digit number assigned to every printed book. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
isbn
DetailsA unique 10 or 13 digit number assigned to every printed - * book.
Example<g:isbn>0451524233</g:isbn>
Attribute ofProducts
Content typestring
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
isbn
DetailsA unique 10 or 13 digit number assigned to every printed book.
Example<g:isbn>0451524233</g:isbn>
Attribute ofProducts
Content typestring
+ * * @return A unique 10 or 13 digit number assigned to every printed book. */ public String getIsbn(); @@ -956,49 +951,45 @@ public interface Product extends GlobalInterface { /** * Location of a property. Should include street, city, state, postal code, and country, in that order. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * - * + * <g:location>123 Main St,, CA, 12345, + * USA</g:location>
+ * <g:location> Anytown, CA, 12345, + * USA</g:location> + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * location
location
- * Details Location of a property. Should - * include street, city, state, postal code, and country, in that order. Details Location of a property. Should include street, city, state, postal code, and country, in that order.
- * Example - * Acceptable:
- * <g:location>123 Main St, Anytown, CA, 12345, USA</g:location>
- * + * 		Example Acceptable:
+ * <g:location>123 Main St, Anytown, CA, 12345, + * USA</g:location>
+ * * Not acceptable:
- * <g:location>123 Main St,, CA, 12345, USA</g:location>
- * <g:location> - * Anytown, CA, 12345, USA</g:location>
- * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
- * Content type - * locationType Content type locationType
+ * + * + * * @param location Location of a property. Should include street, city, state, postal code, and country, in that order. */ public void setLocation(String location); @@ -1006,49 +997,45 @@ public interface Product extends GlobalInterface { /** * Location of a property. Should include street, city, state, postal code, and country, in that order. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * - * + * <g:location>123 Main St,, CA, 12345, + * USA</g:location>
+ * <g:location> Anytown, CA, 12345, + * USA</g:location> + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * location
location
- * Details Location of a property. Should - * include street, city, state, postal code, and country, in that order. Details Location of a property. Should include street, city, state, postal code, and country, in that order.
- * Example - * Acceptable:
- * <g:location>123 Main St, Anytown, CA, 12345, USA</g:location>
- * + * 		Example Acceptable:
+ * <g:location>123 Main St, Anytown, CA, 12345, + * USA</g:location>
+ * * Not acceptable:
- * <g:location>123 Main St,, CA, 12345, USA</g:location>
- * <g:location> - * Anytown, CA, 12345, USA</g:location>
- * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
- * Content type - * locationType Content type locationType
+ * + * + * * @return Location of a property. Should include street, city, state, postal code, and country, in that order. */ public String getLocation(); @@ -1056,44 +1043,46 @@ public interface Product extends GlobalInterface { /** * Company that manufactures the item. * - * - * - * - * - * + * + * * - * - * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * manufacturer
- * Details - * - * Company that manufactures the - * item. + * manufacturer
+ * Details + * + * Company that manufactures the item.
- * Example - * <g:manufacturer>Acme, Inc</g:manufacturer> + * Example + * <g:manufacturer>Acme, Inc</g:manufacturer>
- * Attribute of - * Products + * Attribute of + * Products
- * - * Content type - * string + * + * Content type + * string
+ * + * + * * @param manufacturer Company that manufactures the item. */ public void setManufacturer(String manufacturer); @@ -1101,128 +1090,120 @@ public interface Product extends GlobalInterface { /** * Company that manufactures the item. * - * - * - * - * - * + * + * * - * - * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * manufacturer
- * Details - * - * Company that manufactures the - * item. + * manufacturer
+ * Details + * + * Company that manufactures the item.
- * Example - * <g:manufacturer>Acme, Inc</g:manufacturer> + * Example + * <g:manufacturer>Acme, Inc</g:manufacturer>
- * Attribute of - * Products + * Attribute of + * Products
- * - * Content type - * string + * + * Content type + * string
+ * + * + * * @return Company that manufactures the item. */ public String getManufacturer(); /** * Unique product ID code assigned by its manufacturer. - * + * * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * manufacturer_id
manufacturer_id
- * Details - * - * Unique product ID code assigned by its - * manufacturer. Details + * + * Unique product ID code assigned by its manufacturer.
- * Example <g:manufacturer_id>030779A</g:manufacturer_id> Example <g:manufacturer_id>030779A</g:manufacturer_id>
- * Attribute of - * Products Attribute of Products
- * Content type - * string Content type string
+ * + * + * * @param manufacturerId Unique product ID code assigned by its manufacturer. */ public void setManufacturerId(String manufacturerId); /** * Unique product ID code assigned by its manufacturer. - * + * * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * manufacturer_id
manufacturer_id
- * Details - * - * Unique product ID code assigned by its - * manufacturer. Details + * + * Unique product ID code assigned by its manufacturer.
- * Example <g:manufacturer_id>030779A</g:manufacturer_id> Example <g:manufacturer_id>030779A</g:manufacturer_id>
- * Attribute of - * Products Attribute of Products
- * Content type - * string Content type string
+ * + * + * * @return Unique product ID code assigned by its manufacturer. */ public String getManufacturerId(); @@ -1230,42 +1211,39 @@ public interface Product extends GlobalInterface { /** * Resolution of a digital imaging device. * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * * - * + * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * - * megapixels
+ * + * megapixels
- * Details - * Resolution of a digital imaging device. Details Resolution of a digital imaging device.
- * Example <g:megapixels>5.2 MP</g:megapixels> Example <g:megapixels>5.2 MP</g:megapixels>
- * Attribute of - * Products Attribute of Products
- * - * Content type - * floatUnit + * + * Content type floatUnit
+ * + * + * * @param megapixels Resolution of a digital imaging device. */ public void setMegapixels(FloatUnit megapixels); @@ -1273,42 +1251,39 @@ public interface Product extends GlobalInterface { /** * Resolution of a digital imaging device. * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * * - * + * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * - * megapixels
+ * + * megapixels
- * Details - * Resolution of a digital imaging device. Details Resolution of a digital imaging device.
- * Example <g:megapixels>5.2 MP</g:megapixels> Example <g:megapixels>5.2 MP</g:megapixels>
- * Attribute of - * Products Attribute of Products
- * - * Content type - * floatUnit + * + * Content type floatUnit
+ * + * + * * @return Resolution of a digital imaging device. */ public FloatUnit getMegapixels(); @@ -1316,42 +1291,38 @@ public interface Product extends GlobalInterface { /** * The amount of memory included in an item. * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * memory
memory
- * Details - * The amount of memory included in an - * item. Details The amount of memory included in an item.
- * Example <g:memory>128 MB</g:memory> Example <g:memory>128 MB</g:memory>
- * - * Attribute of - * Products + * + * Attribute of Products
- * - * Content type - * floatUnit + * + * Content type floatUnit
+ * + * + * * @param memory The amount of memory included in an item. */ public void setMemory(FloatUnit memory); @@ -1359,714 +1330,628 @@ public interface Product extends GlobalInterface { /** * The amount of memory included in an item. * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * memory
memory
- * Details - * The amount of memory included in an - * item. Details The amount of memory included in an item.
- * Example <g:memory>128 MB</g:memory> Example <g:memory>128 MB</g:memory>
- * - * Attribute of - * Products + * + * Attribute of Products
- * - * Content type - * floatUnit + * + * Content type floatUnit
+ * + * + * * @return The amount of memory included in an item. */ public FloatUnit getMemory(); /** * Model number of the product. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * model_number
model_number
- * Details - * - * Model number of the product. Details + * + * Model number of the product.
- * Example <g:model_number>1924863</g:model_number> Example <g:model_number>1924863</g:model_number>
- * Attribute of - * Products Attribute of Products
- * Content type - * string Content type string
+ * + * + * * @param modelNumber Model number of the product. */ public void setModelNumber(String modelNumber); /** * Model number of the product. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * model_number
model_number
- * Details - * - * Model number of the product. Details + * + * Model number of the product.
- * Example <g:model_number>1924863</g:model_number> Example <g:model_number>1924863</g:model_number>
- * Attribute of - * Products Attribute of Products
- * Content type - * string Content type string
+ * + * + * * @return Model number of the product. */ public String getModelNumber(); /** * Acceptable payment methods for item purchases. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * <g:payment_accepted>Cash Check</g:payment_accepted> * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * payment_accepted
payment_accepted
- * Details Acceptable payment methods for item purchases. Acceptable - * values are “Cash,” “Check,” “Traveler’s Check,” “Visa,” “MasterCard,” - * - * “American Express,” “Discover,” or “Wire - * transfer.” - * If you accept more than one method, include multiple instances of the - * <payment_accepted> attribute - * for each acceptable method. Details Acceptable payment methods for item purchases. Acceptable values are “Cash,” “Check,” “Traveler’s Check,” “Visa,” “MasterCard,” + * + * “American Express,” “Discover,” or “Wire transfer.” If you accept more than one method, include multiple instances of the <payment_accepted> + * attribute for each acceptable method.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:payment_accepted>Cash</g:payment_accepted>
- * + * * <g:payment_accepted>Check</g:payment_accepted>
* Not acceptable:
- * <g:payment_accepted>Cash - * Check</g:payment_accepted>
- * Attribute of - * Events, Housing, - * Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * - * paymentMethodEnumeration Content type + * + * paymentMethodEnumeration
+ * + * + * * @param paymentAccepted Acceptable payment methods for item purchases. */ public void setPaymentAccepted(PaymentTypeEnumeration[] paymentAccepted); /** * Acceptable payment methods for item purchases. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * <g:payment_accepted>Cash Check</g:payment_accepted> * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * payment_accepted
payment_accepted
- * Details Acceptable payment methods for item purchases. Acceptable - * values are “Cash,” “Check,” “Traveler’s Check,” “Visa,” “MasterCard,” - * - * “American Express,” “Discover,” or “Wire - * transfer.” - * If you accept more than one method, include multiple instances of the - * <payment_accepted> attribute - * for each acceptable method. Details Acceptable payment methods for item purchases. Acceptable values are “Cash,” “Check,” “Traveler’s Check,” “Visa,” “MasterCard,” + * + * “American Express,” “Discover,” or “Wire transfer.” If you accept more than one method, include multiple instances of the <payment_accepted> + * attribute for each acceptable method.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:payment_accepted>Cash</g:payment_accepted>
- * + * * <g:payment_accepted>Check</g:payment_accepted>
* Not acceptable:
- * <g:payment_accepted>Cash - * Check</g:payment_accepted>
- * Attribute of - * Events, Housing, - * Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * - * paymentMethodEnumeration Content type + * + * paymentMethodEnumeration
+ * + * + * * @return Acceptable payment methods for item purchases. */ public PaymentTypeEnumeration[] getPaymentAccepted(); /** * Additional instructions to explain a payment policy. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * payment_notes
payment_notes
- * Details - * Additional instructions to explain - * a payment policy. Details Additional instructions to explain a payment policy.
- * Example <g:payment_notes>Cash only for local orders.</g:payment_notes> Example <g:payment_notes>Cash only for local orders.</g:payment_notes>
- * Attribute of - * - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of + * + * Events, Housing, Products, Services, Travel, Vehicles
- * - * Content type - * string + * + * Content type string
+ * + * + * * @param paymentNotes Additional instructions to explain a payment policy. */ public void setPaymentNotes(String paymentNotes); /** * Additional instructions to explain a payment policy. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * payment_notes
payment_notes
- * Details - * Additional instructions to explain - * a payment policy. Details Additional instructions to explain a payment policy.
- * Example <g:payment_notes>Cash only for local orders.</g:payment_notes> Example <g:payment_notes>Cash only for local orders.</g:payment_notes>
- * Attribute of - * - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of + * + * Events, Housing, Products, Services, Travel, Vehicles
- * - * Content type - * string + * + * Content type string
+ * + * + * * @return Additional instructions to explain a payment policy. */ public String getPaymentNotes(); /** * Whether or not an item is available for pick up. - * + * * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * Not acceptable:
+ * <g:pickup>Not on Tuesdays</g:pickup> * - * + * * - * - * - * + * + * + * * * - * - * + * + * * - *
- * pickup
pickup
- * Details - * Information about whether or not - * an item is available for pick up. Acceptable values are "True and "False". Details Information about whether or not an item is available for pick up. Acceptable values are "True and "False".
- * Example - * + * Example + * * Acceptable:
* <g:pickup>True</g:pickup>
- * Not acceptable:
- * <g:pickup>Not - * on Tuesdays</g:pickup>
- * Attribute of - * Products Attribute of Products
- * - * Content type - * boolean + * + * Content type boolean
+ * + * + * * @param pickup Whether or not an item is available for pick up. */ public void setPickup(Boolean pickup); /** * Whether or not an item is available for pick up. - * + * * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * Not acceptable:
+ * <g:pickup>Not on Tuesdays</g:pickup> * - * + * * - * - * - * + * + * + * * * - * - * + * + * * - *
- * pickup
pickup
- * Details - * Information about whether or not - * an item is available for pick up. Acceptable values are "True and "False". Details Information about whether or not an item is available for pick up. Acceptable values are "True and "False".
- * Example - * + * Example + * * Acceptable:
* <g:pickup>True</g:pickup>
- * Not acceptable:
- * <g:pickup>Not - * on Tuesdays</g:pickup>
- * Attribute of - * Products Attribute of Products
- * - * Content type - * boolean + * + * Content type boolean
+ * + * + * * @return Whether or not an item is available for pick up. */ public Boolean getPickup(); /** * Price of the item. - * - * + * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * price
price
- * Details Prices can be a single price, 0 - * (free), or blank if not applicable. Numerice values only. When used - * as a sub-attribute of <shipping>, the value included reflects the price - * of shipping. Details Prices can be a single price, 0 (free), or blank if not applicable. Numerice values only. When used as a sub-attribute of + * <shipping>, the value included reflects the price of shipping.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:price>5.95</g:price>
- * + * * <g:price>0</g:price>
- * Not acceptable:
+ * Not acceptable:
* <g:price>5,95</g:price>
* <g:price>5.00 – 10.00</g:price>
- * + * * <g:price>100 or best offer</g:price>
* <g:price>free</g:price>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content typefloatUnit Content typefloatUnit
+ * + * + * * @param price Price of the item. */ public void setPrice(FloatUnit price); /** * Price of the item. - * - * + * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * price
price
- * Details Prices can be a single price, 0 - * (free), or blank if not applicable. Numerice values only. When used - * as a sub-attribute of <shipping>, the value included reflects the price - * of shipping. Details Prices can be a single price, 0 (free), or blank if not applicable. Numerice values only. When used as a sub-attribute of + * <shipping>, the value included reflects the price of shipping.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:price>5.95</g:price>
- * + * * <g:price>0</g:price>
- * Not acceptable:
+ * Not acceptable:
* <g:price>5,95</g:price>
* <g:price>5.00 – 10.00</g:price>
- * + * * <g:price>100 or best offer</g:price>
* <g:price>free</g:price>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content typefloatUnit Content typefloatUnit
+ * + * + * * @return Price of the item. */ public FloatUnit getPrice(); /** * The type of pricing for the item. - * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * - * + * + * - * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
price_type
DetailsThe type of pricing for the - * item. Acceptable values are “negotiable,” or “starting.” The default is - * “starting”price_type
DetailsThe type of pricing for the item. Acceptable values are “negotiable,” or “starting.” The default is “starting”
ExampleAcceptable:
+ * + * 		ExampleAcceptable:
* <g:price_type>starting</g:price_type>
* Not acceptable:
* <g:price_type>100 OBO</g:price_type>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * priceTypeEnumeration Content type priceTypeEnumeration
+ * + * + * * @param priceType The type of pricing for the item. */ public void setPriceType(PriceTypeEnumeration priceType); /** * The type of pricing for the item. - * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * - * + * + * - * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
price_type
DetailsThe type of pricing for the - * item. Acceptable values are “negotiable,” or “starting.” The default is - * “starting”price_type
DetailsThe type of pricing for the item. Acceptable values are “negotiable,” or “starting.” The default is “starting”
ExampleAcceptable:
+ * + * 		ExampleAcceptable:
* <g:price_type>starting</g:price_type>
* Not acceptable:
* <g:price_type>100 OBO</g:price_type>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * priceTypeEnumeration Content type priceTypeEnumeration
+ * + * + * * @return The type of pricing for the item. */ public PriceTypeEnumeration getPriceType(); /** * The processor speed for the product. - * - * + * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
- * - * processor_speed
+ * + * processor_speed
- * Details - * The processor speed for the - * product. Details The processor speed for the product.
- * Example <g:processor_speed>2</g:processor_speed> Example <g:processor_speed>2</g:processor_speed>
- * Attribute of - * Products Attribute of Products
- * Content type - * floatUnit Content type floatUnit
+ * + * + * * @param processorSpeed The processor speed for the product. */ public void setProcessorSpeed(FloatUnit processorSpeed); /** * The processor speed for the product. - * - * + * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
- * - * processor_speed
+ * + * processor_speed
- * Details - * The processor speed for the - * product. Details The processor speed for the product.
- * Example <g:processor_speed>2</g:processor_speed> Example <g:processor_speed>2</g:processor_speed>
- * Attribute of - * Products Attribute of Products
- * Content type - * floatUnit Content type floatUnit
+ * + * + * * @return The processor speed for the product. */ public FloatUnit getProcessorSpeed(); @@ -2074,41 +1959,36 @@ public interface Product extends GlobalInterface { /** * The type of product being offered. * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * product_type
product_type
- * Details - * - * The type of product being offered. Toys, books, - * flowers, etc. Details + * + * The type of product being offered. Toys, books, flowers, etc.
- * Example <g:product_type>electronics</g:product_type> Example <g:product_type>electronics</g:product_type>
- * Attribute of - * Products Attribute of Products
- * Content type - * string Content type string
+ * + * + * * @param productTypes The type of product being offered. */ public void setProductTypes(String[] productTypes); @@ -2116,717 +1996,662 @@ public interface Product extends GlobalInterface { /** * The type of product being offered. * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * product_type
product_type
- * Details - * - * The type of product being offered. Toys, books, - * flowers, etc. Details + * + * The type of product being offered. Toys, books, flowers, etc.
- * Example <g:product_type>electronics</g:product_type> Example <g:product_type>electronics</g:product_type>
- * Attribute of - * Products Attribute of Products
- * Content type - * string Content type string
+ * + * + * * @return The type of product being offered. */ public String[] getProductTypes(); /** * Quantity available. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * Not acceptable:
+ * <g:quantity>out of stock</g:quantity> * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * quantity
quantity
- * Details The number of units available for purchase. This - * attribute can be left blank if you have a large quantity or if it is not - * applicable. Details The number of units available for purchase. This attribute can be left blank if you have a large quantity or if it is not + * applicable.
- * Example - * Acceptable:
+ * + * 		Example Acceptable:
* <g:quantity>18</g:quantity>
- * + * * <g:quantity>0</g:quantity>
- * - * Not acceptable:
- * <g:quantity>out - * of stock</g:quantity>
- * - * Attribute of - * Events, Products, - * Services, Travel, Vehicles + * + * Attribute of Events, Products, Services, Travel, Vehicles
- * Content type - * - * integer Content type + * + * integer
+ * + * + * * @param quantity Quantity available. */ public void setQuantity(Integer quantity); /** * Quantity available. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * Not acceptable:
+ * <g:quantity>out of stock</g:quantity> * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * quantity
quantity
- * Details The number of units available for purchase. This - * attribute can be left blank if you have a large quantity or if it is not - * applicable. Details The number of units available for purchase. This attribute can be left blank if you have a large quantity or if it is not + * applicable.
- * Example - * Acceptable:
+ * + * 		Example Acceptable:
* <g:quantity>18</g:quantity>
- * + * * <g:quantity>0</g:quantity>
- * - * Not acceptable:
- * <g:quantity>out - * of stock</g:quantity>
- * - * Attribute of - * Events, Products, - * Services, Travel, Vehicles + * + * Attribute of Events, Products, Services, Travel, Vehicles
- * Content type - * - * integer Content type + * + * integer
+ * + * + * * @return Quantity available. */ public Integer getQuantity(); /** * Shipping options available for an item. - * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - *
- * - * shipping
+ * + * shipping
- * Details - * Shipping options available for an item. Up to 10 - * shipping options can be included for each item. Three sub-attributes are - * included in the shipping attribute:
    - * - *
  • service = The type of service used to ship an item. Acceptable values are 'FedEx', 'UPS', 'DHL', 'Mail', and 'Other'
    • - *
  • country = The country an item will ship to. Only acceptable values are ISO 3166 country codes.
    • - *
  • price = - * the price of shipping.
 Details Shipping options available for an item. Up to 10 shipping options can be included for each item. Three sub-attributes are included + * in the shipping attribute: + *
    + * + *
  • service = The type of service used to ship an item. Acceptable values are 'FedEx', 'UPS', 'DHL', 'Mail', and 'Other'
    • + *
  • country = The country an item will ship to. Only acceptable values are ISO 3166 country codes.
    • + *
  • price = the price of shipping.
    • + *
+ *
- * - * Example <g:shipping>
- * <g:country>US</g:country>
- * - * <g:service>UPS</g:shipping>
- * - * <g:price>35.95</g:price>
+ * 		+ * + * Example <g:shipping>
+ * <g:country>US</g:country>
+ * + * <g:service>UPS</g:shipping>
+ * + * <g:price>35.95</g:price>
* </g:shipping>
- * Attribute of - * Products Attribute of Products
- * - * Content type - * shippingType + * + * Content type shippingType
+ * + * + * * @param shipping Shipping options available for an item. */ public void setShipping(ShippingType[] shipping); /** * Shipping options available for an item. - * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - *
- * - * shipping
+ * + * shipping
- * Details - * Shipping options available for an item. Up to 10 - * shipping options can be included for each item. Three sub-attributes are - * included in the shipping attribute:
    - * - *
  • service = The type of service used to ship an item. Acceptable values are 'FedEx', 'UPS', 'DHL', 'Mail', and 'Other'
    • - *
  • country = The country an item will ship to. Only acceptable values are ISO 3166 country codes.
    • - *
  • price = - * the price of shipping.
 Details Shipping options available for an item. Up to 10 shipping options can be included for each item. Three sub-attributes are included + * in the shipping attribute: + *
    + * + *
  • service = The type of service used to ship an item. Acceptable values are 'FedEx', 'UPS', 'DHL', 'Mail', and 'Other'
    • + *
  • country = The country an item will ship to. Only acceptable values are ISO 3166 country codes.
    • + *
  • price = the price of shipping.
    • + *
+ *
- * - * Example <g:shipping>
- * <g:country>US</g:country>
- * - * <g:service>UPS</g:shipping>
- * - * <g:price>35.95</g:price>
+ * 		+ * + * Example <g:shipping>
+ * <g:country>US</g:country>
+ * + * <g:service>UPS</g:shipping>
+ * + * <g:price>35.95</g:price>
* </g:shipping>
- * Attribute of - * Products Attribute of Products
- * - * Content type - * shippingType + * + * Content type shippingType
+ * + * + * * @return Shipping options available for an item. */ public ShippingType[] getShipping(); /** * Dimensions of the item, expressed in either two or three dimensions. - * - * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * - *
- * size
- * Details - * Dimensions of the item, expressed - * in either two or three dimensions. size
Details Dimensions of the item, expressed in either two or three dimensions.
- * Example <g:size>12x10x4</g:size> Example <g:size>12x10x4</g:size>
- * - * Attribute of - * Products + * + * Attribute of Products
- * Content type - * string Content type string
+ * + * + * * @param size Dimensions of the item, expressed in either two or three dimensions. */ public void setSize(Size size); /** * Dimensions of the item, expressed in either two or three dimensions. - * - * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * - *
- * size
- * Details - * Dimensions of the item, expressed - * in either two or three dimensions. size
Details Dimensions of the item, expressed in either two or three dimensions.
- * Example <g:size>12x10x4</g:size> Example <g:size>12x10x4</g:size>
- * - * Attribute of - * Products + * + * Attribute of Products
- * Content type - * string Content type string
+ * + * + * * @return Dimensions of the item, expressed in either two or three dimensions. */ public Size getSize(); /** * Tax rate associated with the event. - * + * * - * - * - * - * + * * - * - * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * - *
- * tax_percent
- * - * Details - * Tax rate as a percentage. tax_percent
+ * + * Details Tax rate as a percentage.
- * Example <g:tax_percent>8.2<g:/tax_percent> Example <g:tax_percent>8.2<g:/tax_percent>
- * - * Attribute of - * - * Products, Events + * + * Attribute of + * + * Products, Events
- * Content type - * percentType Content type percentType
+ * + * + * * @param taxPercent Tax rate associated with the event. */ public void setTaxPercent(Float taxPercent); /** * Tax rate associated with the event. - * + * * - * - * - * - * + * * - * - * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * - *
- * tax_percent
- * - * Details - * Tax rate as a percentage. tax_percent
+ * + * Details Tax rate as a percentage.
- * Example <g:tax_percent>8.2<g:/tax_percent> Example <g:tax_percent>8.2<g:/tax_percent>
- * - * Attribute of - * - * Products, Events + * + * Attribute of + * + * Products, Events
- * Content type - * percentType Content type percentType
+ * + * + * * @return Tax rate associated with the event. */ public Float getTaxPercent(); /** * Region where tax applies. - * - * - * + * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * - *
- * - * tax_region
- * Details - * Geographical region a tax rate - * applies to. + * + * tax_region
Details Geographical region a tax rate applies to.
- * - * Example <g:tax_region>California</g:tax_region> + * + * Example <g:tax_region>California</g:tax_region>
- * Attribute of - * Product, - * Events, Attribute of Product, Events,
- * Content typestring Content typestring
+ * + * + * * @param taxRegion Region where tax applies. */ public void setTaxRegion(String taxRegion); /** * Region where tax applies. - * - * - * + * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * - *
- * - * tax_region
- * Details - * Geographical region a tax rate - * applies to. + * + * tax_region
Details Geographical region a tax rate applies to.
- * - * Example <g:tax_region>California</g:tax_region> + * + * Example <g:tax_region>California</g:tax_region>
- * Attribute of - * Product, - * Events, Attribute of Product, Events,
- * Content typestring Content typestring
+ * + * + * * @return Region where tax applies. */ public String getTaxRegion(); /** * Product UPC code (Isn't that redundant?). - * - * - * + * + * + * * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * * - * + * * - * - * + * + * * - *
- * - * upc
+ * + * upc
- * Details - * Product UPC code. Details Product UPC code.
- * Example <g:upc>834721479305</g:upc> Example <g:upc>834721479305</g:upc>
- * Attribute of - * Products Attribute of Products
- * - * Content type - * string + * + * Content type string
+ * + * + * * @param upc Product UPC code (Isn't that redundant?). */ public void setUpc(String upc); /** * Product UPC code (Isn't that redundant?). - * - * - * + * + * + * * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * * - * + * * - * - * + * + * * - *
- * - * upc
+ * + * upc
- * Details - * Product UPC code. Details Product UPC code.
- * Example <g:upc>834721479305</g:upc> Example <g:upc>834721479305</g:upc>
- * Attribute of - * Products Attribute of Products
- * - * Content type - * string + * + * Content type string
+ * + * + * * @return Product UPC code (Isn't that redundant?). */ public String getUpc(); /** * Weight of the item. - * + * * - * - * - * - * - * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * * - * + * * - * - * + * + * * - *
- * weight
weight
- * Details - * Weight of the item. Details Weight of the item.
- * Example <g:weight>5</g:weight> Example <g:weight>5</g:weight>
- * Attribute of - * Products Attribute of Products
- * - * Content type - * floatUnit + * + * Content type floatUnit
+ * + * + * * @param weight Weight of the item. */ public void setWeight(FloatUnit weight); /** * Weight of the item. - * + * * - * - * - * - * - * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * * - * + * * - * - * + * + * * - *
- * weight
weight
- * Details - * Weight of the item. Details Weight of the item.
- * Example <g:weight>5</g:weight> Example <g:weight>5</g:weight>
- * Attribute of - * Products Attribute of Products
- * - * Content type - * floatUnit + * + * Content type floatUnit
+ * + * + * * @return Weight of the item. */ public FloatUnit getWeight(); diff --git a/src/main/java/org/rometools/feed/module/base/Review.java b/src/main/java/org/rometools/feed/module/base/Review.java index dd0143b..19e75bf 100644 --- a/src/main/java/org/rometools/feed/module/base/Review.java +++ b/src/main/java/org/rometools/feed/module/base/Review.java @@ -39,425 +39,396 @@ */ package org.rometools.feed.module.base; -import org.rometools.feed.module.base.types.FloatUnit; import java.net.URL; - import java.util.Date; +import org.rometools.feed.module.base.types.FloatUnit; /** - * This is an interface for the GoogleBase plug in that exposes methods used for - * critical reviews of other things. + * This is an interface for the GoogleBase plug in that exposes methods used for critical reviews of other things. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ public interface Review extends GlobalInterface { /** * Author of the item. - * - * + * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * author
author
- * Details - * Author of the item. Details Author of the item.
- * Example <g:author>John Steinbeck</g:author> Example <g:author>John Steinbeck</g:author>
- * Attribute of - * Reference Items, News and Articles Attribute of Reference Items, News and Articles
- * Content type - * string Content type string
+ * + * + * * @param authors Author of the item. */ public void setAuthors(String[] authors); /** * Author of the item. - * - * + * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * author
author
- * Details - * Author of the item. Details Author of the item.
- * Example <g:author>John Steinbeck</g:author> Example <g:author>John Steinbeck</g:author>
- * Attribute of - * Reference Items, News and Articles Attribute of Reference Items, News and Articles
- * Content type - * string Content type string
+ * + * + * * @return Author of the item. */ public String[] getAuthors(); /** * Additional instructions to explain the item’s delivery process. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_notes
Details Additional instructions to explain the item’s delivery process.
Example - * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
- * - *
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_notes
DetailsAdditional instructions to explain the item’s delivery process.
Example + * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
+ * + *
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typestring
+ * * @param deliveryNotes Additional instructions to explain the item’s delivery process. */ public void setDeliveryNotes(String deliveryNotes); /** * Additional instructions to explain the item’s delivery process. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_notes
Details Additional instructions to explain the item’s delivery process.
Example - * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
- * - *
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_notes
DetailsAdditional instructions to explain the item’s delivery process.
Example + * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
+ * + *
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typestring
+ * * @return Additional instructions to explain the item’s delivery process. */ public String getDeliveryNotes(); /** * The maximum distance you will deliver an item in any direction. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_radius
Details The maximum - * distance you will deliver an item in any direction.
Example - * <g:delivery_radius>10<g:/delivery_radius> - * - *
<g:delivery_radius>10km</g:delivery_radius>
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type floatUnit
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_radius
DetailsThe maximum distance you will deliver an item in any direction.
Example + * <g:delivery_radius>10<g:/delivery_radius>
+ * <g:delivery_radius>10km</g:delivery_radius>
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typefloatUnit
+ * * @param deliveryRadius The maximum distance you will deliver an item in any direction. */ public void setDeliveryRadius(FloatUnit deliveryRadius); /** * The maximum distance you will deliver an item in any direction. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_radius
Details The maximum - * distance you will deliver an item in any direction.
Example - * <g:delivery_radius>10<g:/delivery_radius> - * - *
<g:delivery_radius>10km</g:delivery_radius>
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type floatUnit
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_radius
DetailsThe maximum distance you will deliver an item in any direction.
Example + * <g:delivery_radius>10<g:/delivery_radius>
+ * <g:delivery_radius>10km</g:delivery_radius>
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typefloatUnit
+ * * @return The maximum distance you will deliver an item in any direction. */ public FloatUnit getDeliveryRadius(); /** * The name of an item being reviewed. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * * - * - * - * + * + * + * * - *
- * name_of_item_being_reviewed
name_of_item_being_reviewed
- * Details - * - * The name of an item being reviewed. Details + * + * The name of an item being reviewed.
- * Example <g:name_of_item_being__reviewed>Fleur de lys Restaurant</g:name_of_item_being_reviewed> Example <g:name_of_item_being__reviewed>Fleur de lys Restaurant</g:name_of_item_being_reviewed>
- * Attribute of - * Reviews Attribute of Reviews
- * Content type - * string Content type string
+ * + * + * * @param nameOfItemBeingReviewed The name of an item being reviewed. */ public void setNameOfItemBeingReviewed(String nameOfItemBeingReviewed); /** * The name of an item being reviewed. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * * - * - * - * + * + * + * * - *
- * name_of_item_being_reviewed
name_of_item_being_reviewed
- * Details - * - * The name of an item being reviewed. Details + * + * The name of an item being reviewed.
- * Example <g:name_of_item_being__reviewed>Fleur de lys Restaurant</g:name_of_item_being_reviewed> Example <g:name_of_item_being__reviewed>Fleur de lys Restaurant</g:name_of_item_being_reviewed>
- * Attribute of - * Reviews Attribute of Reviews
- * Content type - * string Content type string
+ * + * + * * @return The name of an item being reviewed. */ public String getNameOfItemBeingReviewed(); /** * Date the item was published. - * + * * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
- * publish_date
publish_date
- * Details - * Date the item was published in ISO 8601 format: - * YYYY-MM-DD Details Date the item was published in ISO 8601 format: + * YYYY-MM-DD
- * Example <g:publish_date>2005-12-20</g:publish_date> Example <g:publish_date>2005-12-20</g:publish_date>
- * Attribute of - * - * Reference Items Attribute of + * + * Reference Items
- * - * Content type - * date + * + * Content type date
+ * + * + * * @param publishDate Date the item was published. */ public void setPublishDate(Date publishDate); /** * Date the item was published. - * + * * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
- * publish_date
publish_date
- * Details - * Date the item was published in ISO 8601 format: - * YYYY-MM-DD Details Date the item was published in ISO 8601 format: + * YYYY-MM-DD
- * Example <g:publish_date>2005-12-20</g:publish_date> Example <g:publish_date>2005-12-20</g:publish_date>
- * Attribute of - * - * Reference Items Attribute of + * + * Reference Items
- * - * Content type - * date + * + * Content type date
+ * + * + * * @return Date the item was published. */ public Date getPublishDate(); @@ -465,47 +436,41 @@ public interface Review extends GlobalInterface { /** * Rating of the product or service on a scale of 1-5, with 5 as the best. * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * * * - * - * - * - * + * + * + * + * * * - * - * + * * - *
- * rating
rating
- * Details - * Rating of the product or service - * on a scale of 1-5, with 5 as the best. Numeric values only. Details Rating of the product or service on a scale of 1-5, with 5 as the best. Numeric values only.
- * Example - * Acceptable:
+ * + * 		Example Acceptable:
* <g:rating>4</g:rating>
- * - * Not acceptable:
- * + * + * Not acceptable:
+ * * <g:rating>good</g:rating>
- * Attribute of - * Reviews Attribute of Reviews
- * Content type - * + * Content type + * * string
+ * + * + * * @param rating Rating of the product or service on a scale of 1-5, with 5 as the best. */ public void setRating(Float rating); @@ -513,323 +478,288 @@ public interface Review extends GlobalInterface { /** * Rating of the product or service on a scale of 1-5, with 5 as the best. * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * * * - * - * - * - * + * + * + * + * * * - * - * + * * - *
- * rating
rating
- * Details - * Rating of the product or service - * on a scale of 1-5, with 5 as the best. Numeric values only. Details Rating of the product or service on a scale of 1-5, with 5 as the best. Numeric values only.
- * Example - * Acceptable:
+ * + * 		Example Acceptable:
* <g:rating>4</g:rating>
- * - * Not acceptable:
- * + * + * Not acceptable:
+ * * <g:rating>good</g:rating>
- * Attribute of - * Reviews Attribute of Reviews
- * Content type - * + * Content type + * * string
+ * + * + * * @return Rating of the product or service on a scale of 1-5, with 5 as the best. */ public Float getRating(); /** * The category of the item being reviewed. - * + * * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * * - * + * * - * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * - *
- * review_type
review_type
- * - * Details The category of the item being reviewed. + * + * Details The category of the item being reviewed.
- * Example - * <g:review_type>toy</g:review_type>
- * + * 		Example <g:review_type>toy</g:review_type>
+ * * <g:review_type>music</g:review_type>
* <g:review_type>restaraunt</g:review_type>
- * Attribute of - * Reviews Attribute of Reviews
- * Content type - * string Content type string
+ * + * + * * @param reviewType The category of the item being reviewed. */ public void setReviewType(String reviewType); /** * The category of the item being reviewed. - * + * * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * * - * + * * - * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * - *
- * review_type
review_type
- * - * Details The category of the item being reviewed. + * + * Details The category of the item being reviewed.
- * Example - * <g:review_type>toy</g:review_type>
- * + * 		Example <g:review_type>toy</g:review_type>
+ * * <g:review_type>music</g:review_type>
* <g:review_type>restaraunt</g:review_type>
- * Attribute of - * Reviews Attribute of Reviews
- * Content type - * string Content type string
+ * + * + * * @return The category of the item being reviewed. */ public String getReviewType(); /** - * The type of rating being provided: editorial (a - * review written by a member of your staff) or “user” ( a review written by a - * user of your site). + * The type of rating being provided: editorial (a review written by a member of your staff) or “user” ( a review written by a user of your site). * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * - *
- * reviewer_type
reviewer_type
- * Details The type of rating being provided: editorial (a - * review written by a member of your staff) or “user” ( a review written by a - * user of your site) Details The type of rating being provided: editorial (a review written by a member of your staff) or “user” ( a review written by a user of + * your site)
- * - * Example - * <g:reviewer_type>editorial</g:reviewer_type> + * + * Example <g:reviewer_type>editorial</g:reviewer_type>
- * Attribute of - * Reviews Attribute of Reviews
- * Content type - * string Content type string
- * @param reviewerType The type of rating being provided: editorial (a - * review written by a member of your staff) or “user” ( a review written by a - * user of your site). + * + * + * + * @param reviewerType The type of rating being provided: editorial (a review written by a member of your staff) or “user” ( a review written by a user of + * your site). */ public void setReviewerType(String reviewerType); /** - * The type of rating being provided: editorial (a - * review written by a member of your staff) or “user” ( a review written by a - * user of your site). + * The type of rating being provided: editorial (a review written by a member of your staff) or “user” ( a review written by a user of your site). * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * - *
- * reviewer_type
reviewer_type
- * Details The type of rating being provided: editorial (a - * review written by a member of your staff) or “user” ( a review written by a - * user of your site) Details The type of rating being provided: editorial (a review written by a member of your staff) or “user” ( a review written by a user of + * your site)
- * - * Example - * <g:reviewer_type>editorial</g:reviewer_type> + * + * Example <g:reviewer_type>editorial</g:reviewer_type>
- * Attribute of - * Reviews Attribute of Reviews
- * Content type - * string Content type string
- * @return The type of rating being provided: editorial (a - * review written by a member of your staff) or “user” ( a review written by a - * user of your site). + * + * + * + * @return The type of rating being provided: editorial (a review written by a member of your staff) or “user” ( a review written by a user of your site). */ public String getReviewerType(); /** * The web page of an item being reviewed. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * * * - * - * + * + * * - * - *
- * url_of_item_being_reviewed
url_of_item_being_reviewed
- * - * Details - * The web page of an item being reviewed. + * + * Details The web page of an item being reviewed.
- * Example <g:url_of_item_being_reviewed>http://www.fleurdelyssf.com/</g:url_of_item_being_reviewed> Example <g:url_of_item_being_reviewed>http://www.fleurdelyssf.com/</g:url_of_item_being_reviewed>
- * Attribute of - * + * Attribute of + * * Reviews
- * - * Content type - * uri + * + * Content type uri
+ * + * + * + * * @param urlOfItemBeingReviewed The web page of an item being reviewed. */ public void setUrlOfItemBeingReviewed(URL urlOfItemBeingReviewed); /** * The web page of an item being reviewed. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * * * - * - * + * + * * - * - *
- * url_of_item_being_reviewed
url_of_item_being_reviewed
- * - * Details - * The web page of an item being reviewed. + * + * Details The web page of an item being reviewed.
- * Example <g:url_of_item_being_reviewed>http://www.fleurdelyssf.com/</g:url_of_item_being_reviewed> Example <g:url_of_item_being_reviewed>http://www.fleurdelyssf.com/</g:url_of_item_being_reviewed>
- * Attribute of - * + * Attribute of + * * Reviews
- * - * Content type - * uri + * + * Content type uri
+ * + * + * + * * @return The web page of an item being reviewed. */ public URL getUrlOfItemBeingReviewed(); diff --git a/src/main/java/org/rometools/feed/module/base/ScholarlyArticle.java b/src/main/java/org/rometools/feed/module/base/ScholarlyArticle.java index 4e2549a..d624039 100644 --- a/src/main/java/org/rometools/feed/module/base/ScholarlyArticle.java +++ b/src/main/java/org/rometools/feed/module/base/ScholarlyArticle.java @@ -41,11 +41,9 @@ package org.rometools.feed.module.base; import java.util.Date; - /** - * This is an interface for the GoogleBase plug in that exposes methods used for - * Scholarly publication, research studies and reference materials. - * + * This is an interface for the GoogleBase plug in that exposes methods used for Scholarly publication, research studies and reference materials. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.2 $ */ @@ -53,39 +51,34 @@ public interface ScholarlyArticle extends GlobalInterface { /** * Array of Author Names. Limit 10. * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * author
author
- * Details - * Author of the item. Details Author of the item.
- * Example <g:author>John Steinbeck</g:author> Example <g:author>John Steinbeck</g:author>
- * Attribute of - * Reference Items, News and Articles Attribute of Reference Items, News and Articles
- * Content type - * string Content type string
+ * + * + * * @param authors Array of Author Names. Limit 10. */ public void setAuthors(String[] authors); @@ -93,215 +86,198 @@ public interface ScholarlyArticle extends GlobalInterface { /** * Array of Author Names. Limit 10. * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * author
author
- * Details - * Author of the item. Details Author of the item.
- * Example <g:author>John Steinbeck</g:author> Example <g:author>John Steinbeck</g:author>
- * Attribute of - * Reference Items, News and Articles Attribute of Reference Items, News and Articles
- * Content type - * string Content type string
+ * + * + * * @return Array of author names. */ public String[] getAuthors(); /** * Number of pages in the article. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * pages
pages
- * Details - * - * The number of pages in the publication. Details + * + * The number of pages in the publication.
- * Example <g:pages>18</g:pages> Example <g:pages>18</g:pages>
- * Attribute of - * Reference Items, News and Articles Attribute of Reference Items, News and Articles
- * - * Content type - * integer + * + * Content type integer
+ * + * + * * @param pages Number of pages in the article */ public void setPages(Integer pages); /** * Number of pages in the article. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * pages
pages
- * Details - * - * The number of pages in the publication. Details + * + * The number of pages in the publication.
- * Example <g:pages>18</g:pages> Example <g:pages>18</g:pages>
- * Attribute of - * Reference Items, News and Articles Attribute of Reference Items, News and Articles
- * - * Content type - * integer + * + * Content type integer
+ * + * + * * @return Number of pages in the article */ public Integer getPages(); /** * Name of the publication. - * + * * - * - * - * - * - * + * + * * - * - * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * publication_name
- * Details - * - * Name of the publication. publication_name
Details + * + * Name of the publication.
- * Example <g:publication_name> Journal of Appropriate Technology</g:publication_name> Example <g:publication_name> Journal of Appropriate Technology</g:publication_name>
- * Attribute of - * Research studies and publications Attribute of Research studies and publications
- * - * Content type - * string + * + * Content type string
+ * + * + * * @param publicationName Name of the publication. */ public void setPublicationName(String publicationName); /** * Name of the publication. - * + * * - * - * - * - * - * + * + * * - * - * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * publication_name
- * Details - * - * Name of the publication. publication_name
Details + * + * Name of the publication.
- * Example <g:publication_name> Journal of Appropriate Technology</g:publication_name> Example <g:publication_name> Journal of Appropriate Technology</g:publication_name>
- * Attribute of - * Research studies and publications Attribute of Research studies and publications
- * - * Content type - * string + * + * Content type string
+ * + * + * * @return Name of the publication. */ public String getPublicationName(); @@ -309,41 +285,37 @@ public interface ScholarlyArticle extends GlobalInterface { /** * Volume of the publication. * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * - *
- * publication_volume
publication_volume
- * Details - * - * Volume of the publication. Details + * + * Volume of the publication.
- * Example<g:publication_volume>VI</g:publication_volume> Example<g:publication_volume>VI</g:publication_volume>
- * Attribute of - * Reference Items Attribute of Reference Items
- * Content type - * string Content type string
+ * + * + * * @param publicationVolume Volume of the publication. */ public void setPublicationVolume(String publicationVolume); @@ -351,131 +323,125 @@ public interface ScholarlyArticle extends GlobalInterface { /** * Volume of the publication. * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * - *
- * publication_volume
publication_volume
- * Details - * - * Volume of the publication. Details + * + * Volume of the publication.
- * Example<g:publication_volume>VI</g:publication_volume> Example<g:publication_volume>VI</g:publication_volume>
- * Attribute of - * Reference Items Attribute of Reference Items
- * Content type - * string Content type string
+ * + * + * * @return Volume of the publication. */ public String getPublicationVolume(); /** * Date article was published. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * * - * - * + * + * * - *
- * publish_date
publish_date
- * - * Details - * Date the item was published in ISO 8601 format: - * YYYY-MM-DD + * + * Details Date the item was published in ISO 8601 format: + * YYYY-MM-DD
- * - * Example <g:publish_date>2005-12-20</g:publish_date> + * + * Example <g:publish_date>2005-12-20</g:publish_date>
- * Attribute of - * Reference Items Attribute of Reference Items
- * - * Content type - * - * date + * + * Content type + * + * date
+ * + * + * * @param publishDate Date article was published */ public void setPublishDate(Date publishDate); /** - * Date article was published. - * + * Date article was published. + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * * - * - * + * + * * - *
- * publish_date
publish_date
- * - * Details - * Date the item was published in ISO 8601 format: - * YYYY-MM-DD + * + * Details Date the item was published in ISO 8601 format: + * YYYY-MM-DD
- * - * Example <g:publish_date>2005-12-20</g:publish_date> + * + * Example <g:publish_date>2005-12-20</g:publish_date>
- * Attribute of - * Reference Items Attribute of Reference Items
- * - * Content type - * - * date + * + * Content type + * + * date
+ * + * + * * @return Date article was published */ public Date getPublishDate(); diff --git a/src/main/java/org/rometools/feed/module/base/Service.java b/src/main/java/org/rometools/feed/module/base/Service.java index 1f977ab..4f0a629 100644 --- a/src/main/java/org/rometools/feed/module/base/Service.java +++ b/src/main/java/org/rometools/feed/module/base/Service.java @@ -45,247 +45,243 @@ import org.rometools.feed.module.base.types.PaymentTypeEnumeration; import org.rometools.feed.module.base.types.PriceTypeEnumeration; import org.rometools.feed.module.base.types.ShippingType; - /** - * This is an interface for the GoogleBase plug in that exposes methods used for - * service offerings. - * + * This is an interface for the GoogleBase plug in that exposes methods used for service offerings. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ public interface Service extends GlobalInterface { /** - * Currency of the price amount for an item. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
currency
Details Currency - * of the price amount for an item. Values must be in ISO - * 4217 currency code format.
Example Acceptable:
<g:currency>USD</g:currency>
- * - * Not acceptable:
<g:currency>US Dollars</g:currency>
Attribute - * of Events, - * Housing, Products, Services, Travel, Vehicles
Content - * type currencyEnumeration
- * @param value Currency of the price amount for an item. + * Currency of the price amount for an item. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
currency
DetailsCurrency of the price amount for an item. Values must be in ISO 4217 currency code format.
ExampleAcceptable:
+ * <g:currency>USD</g:currency>
+ * + * Not acceptable:
+ * <g:currency>US Dollars</g:currency>
Attribute ofEvents, Housing, Products, Services, Travel, Vehicles
Content typecurrencyEnumeration
+ * + * @param value Currency of the price amount for an item. */ public void setCurrency(CurrencyEnumeration value); /** - * Currency of the price amount for an item. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
currency
Details Currency - * of the price amount for an item. Values must be in ISO - * 4217 currency code format.
Example Acceptable:
<g:currency>USD</g:currency>
- * - * Not acceptable:
<g:currency>US Dollars</g:currency>
Attribute - * of Events, - * Housing, Products, Services, Travel, Vehicles
Content - * type currencyEnumeration
- * @return Currency of the price amount for an item. + * Currency of the price amount for an item. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
currency
DetailsCurrency of the price amount for an item. Values must be in ISO 4217 currency code format.
ExampleAcceptable:
+ * <g:currency>USD</g:currency>
+ * + * Not acceptable:
+ * <g:currency>US Dollars</g:currency>
Attribute ofEvents, Housing, Products, Services, Travel, Vehicles
Content typecurrencyEnumeration
+ * + * @return Currency of the price amount for an item. */ public CurrencyEnumeration getCurrency(); /** * Additional instructions to explain the item’s delivery process. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_notes
Details Additional instructions to explain the item’s delivery process.
Example - * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
- * - *
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_notes
DetailsAdditional instructions to explain the item’s delivery process.
Example + * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
+ * + *
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typestring
+ * * @param deliveryNotes Additional instructions to explain the item’s delivery process. */ public void setDeliveryNotes(String deliveryNotes); - /** * Additional instructions to explain the item’s delivery process. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_notes
Details Additional instructions to explain the item’s delivery process.
Example - * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
- * - *
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_notes
DetailsAdditional instructions to explain the item’s delivery process.
Example + * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
+ * + *
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typestring
+ * * @return Additional instructions to explain the item’s delivery process. */ public String getDeliveryNotes(); /** * The maximum distance you will deliver an item in any direction. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_radius
Details The maximum - * distance you will deliver an item in any direction.
Example - * <g:delivery_radius>10<g:/delivery_radius> - * - *
<g:delivery_radius>10km</g:delivery_radius>
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type floatUnit
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_radius
DetailsThe maximum distance you will deliver an item in any direction.
Example + * <g:delivery_radius>10<g:/delivery_radius>
+ * <g:delivery_radius>10km</g:delivery_radius>
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typefloatUnit
+ * * @param deliveryRadius The maximum distance you will deliver an item in any direction. */ public void setDeliveryRadius(FloatUnit deliveryRadius); + /** * The maximum distance you will deliver an item in any direction. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_radius
Details The maximum - * distance you will deliver an item in any direction.
Example - * <g:delivery_radius>10<g:/delivery_radius> - * - *
<g:delivery_radius>10km</g:delivery_radius>
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type floatUnit
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_radius
DetailsThe maximum distance you will deliver an item in any direction.
Example + * <g:delivery_radius>10<g:/delivery_radius>
+ * <g:delivery_radius>10km</g:delivery_radius>
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typefloatUnit
+ * * @return The maximum distance you will deliver an item in any direction. */ public FloatUnit getDeliveryRadius(); @@ -293,49 +289,45 @@ public interface Service extends GlobalInterface { /** * Location of the where the service is offered. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * - * + * <g:location>123 Main St,, CA, 12345, + * USA</g:location>
+ * <g:location> Anytown, CA, 12345, + * USA</g:location> + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * location
location
- * Details Location of a property. Should - * include street, city, state, postal code, and country, in that order. Details Location of a property. Should include street, city, state, postal code, and country, in that order.
- * Example - * Acceptable:
- * <g:location>123 Main St, Anytown, CA, 12345, USA</g:location>
- * + * 		Example Acceptable:
+ * <g:location>123 Main St, Anytown, CA, 12345, + * USA</g:location>
+ * * Not acceptable:
- * <g:location>123 Main St,, CA, 12345, USA</g:location>
- * <g:location> - * Anytown, CA, 12345, USA</g:location>
- * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
- * Content type - * locationType Content type locationType
+ * + * + * * @param location Location of the where the service is offered. */ public void setLocation(String location); @@ -343,943 +335,847 @@ public interface Service extends GlobalInterface { /** * Location of the where the service is offered. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * - * + * <g:location>123 Main St,, CA, 12345, + * USA</g:location>
+ * <g:location> Anytown, CA, 12345, + * USA</g:location> + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * location
location
- * Details Location of a property. Should - * include street, city, state, postal code, and country, in that order. Details Location of a property. Should include street, city, state, postal code, and country, in that order.
- * Example - * Acceptable:
- * <g:location>123 Main St, Anytown, CA, 12345, USA</g:location>
- * + * 		Example Acceptable:
+ * <g:location>123 Main St, Anytown, CA, 12345, + * USA</g:location>
+ * * Not acceptable:
- * <g:location>123 Main St,, CA, 12345, USA</g:location>
- * <g:location> - * Anytown, CA, 12345, USA</g:location>
- * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
- * Content type - * locationType Content type locationType
- * @return Location of the where the service is offered. + * + * + * + * @return Location of the where the service is offered. */ public String getLocation(); /** * Payment Methods acceptable for the service. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * <g:payment_accepted>Cash Check Paypal</g:payment_accepted> * - * + * * - * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * - *
- * payment_accepted
payment_accepted
- * Details Acceptable payment methods for item purchases. Acceptable - * values are "Cash," "Check," "Traveler’s Check," "Visa," "MasterCard," - * - * "American Express," "Discover," "Wire transfer" or "Paypal." If you accept - * more than one method, include multiple instances of the - * <payment_accepted> attribute for each acceptable method. Details Acceptable payment methods for item purchases. Acceptable values are "Cash," "Check," "Traveler’s Check," "Visa," "MasterCard," + * + * "American Express," "Discover," "Wire transfer" or "Paypal." If you accept more than one method, include multiple instances of the + * <payment_accepted> attribute for each acceptable method.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:payment_accepted>Cash</g:payment_accepted>
- * + * * <g:payment_accepted>Check</g:payment_accepted>
- * + * * <g:payment_accepted>Paypal</g:payment_accepted>
* Not acceptable:
- * <g:payment_accepted>Cash - * Check Paypal</g:payment_accepted>
- * Attribute of - * Events, Housing, - * Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * paymentMethodEnumeration Content type paymentMethodEnumeration
+ * + * + * * @param paymentAccepted Payment Methods acceptable for the service. */ public void setPaymentAccepted(PaymentTypeEnumeration[] paymentAccepted); /** * Payment Methods acceptable for the service. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * <g:payment_accepted>Cash Check Paypal</g:payment_accepted> * - * + * * - * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * - *
- * payment_accepted
payment_accepted
- * Details Acceptable payment methods for item purchases. Acceptable - * values are "Cash," "Check," "Traveler’s Check," "Visa," "MasterCard," - * - * "American Express," "Discover," "Wire transfer" or "Paypal." If you accept - * more than one method, include multiple instances of the - * <payment_accepted> attribute for each acceptable method. Details Acceptable payment methods for item purchases. Acceptable values are "Cash," "Check," "Traveler’s Check," "Visa," "MasterCard," + * + * "American Express," "Discover," "Wire transfer" or "Paypal." If you accept more than one method, include multiple instances of the + * <payment_accepted> attribute for each acceptable method.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:payment_accepted>Cash</g:payment_accepted>
- * + * * <g:payment_accepted>Check</g:payment_accepted>
- * + * * <g:payment_accepted>Paypal</g:payment_accepted>
* Not acceptable:
- * <g:payment_accepted>Cash - * Check Paypal</g:payment_accepted>
- * Attribute of - * Events, Housing, - * Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * paymentMethodEnumeration Content type paymentMethodEnumeration
+ * + * + * * @return Payment Methods acceptable for the service. */ public PaymentTypeEnumeration[] getPaymentAccepted(); /** * Additional payment information. - * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * payment_notes
payment_notes
- * Details - * Additional instructions to explain - * a payment policy. Details Additional instructions to explain a payment policy.
- * Example <g:payment_notes>Cash only for local orders.</g:payment_notes> Example <g:payment_notes>Cash only for local orders.</g:payment_notes>
- * Attribute of - * - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of + * + * Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * string Content type string
+ * + * + * * @param paymentNotes Additional payment information. */ public void setPaymentNotes(String paymentNotes); /** * Additional payment information. - * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * payment_notes
payment_notes
- * Details - * Additional instructions to explain - * a payment policy. Details Additional instructions to explain a payment policy.
- * Example <g:payment_notes>Cash only for local orders.</g:payment_notes> Example <g:payment_notes>Cash only for local orders.</g:payment_notes>
- * Attribute of - * - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of + * + * Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * string Content type string
+ * + * + * * @return Additional payment information. */ public String getPaymentNotes(); /** - * Price for the service. - *
- * - * + * Price for the service.
+ * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * price
price
- * Details Prices can be a single price, 0 - * (free), or blank if not applicable. Numerice values only. When used - * as a sub-attribute of <shipping>, the value included reflects the price - * of shipping. Details Prices can be a single price, 0 (free), or blank if not applicable. Numerice values only. When used as a sub-attribute of + * <shipping>, the value included reflects the price of shipping.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:price>5.95</g:price>
- * + * * <g:price>0</g:price>
- * Not acceptable:
+ * Not acceptable:
* <g:price>5,95</g:price>
* <g:price>5.00 � 10.00</g:price>
- * + * * <g:price>100 or best offer</g:price>
* <g:price>free</g:price>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content typefloatUnit Content typefloatUnit
+ * + * + * * @param price Price for the service. */ public void setPrice(FloatUnit price); /** - * Price for the service. - *
- * - * + * Price for the service.
+ * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * price
price
- * Details Prices can be a single price, 0 - * (free), or blank if not applicable. Numerice values only. When used - * as a sub-attribute of <shipping>, the value included reflects the price - * of shipping. Details Prices can be a single price, 0 (free), or blank if not applicable. Numerice values only. When used as a sub-attribute of + * <shipping>, the value included reflects the price of shipping.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:price>5.95</g:price>
- * + * * <g:price>0</g:price>
- * Not acceptable:
+ * Not acceptable:
* <g:price>5,95</g:price>
* <g:price>5.00 � 10.00</g:price>
- * + * * <g:price>100 or best offer</g:price>
* <g:price>free</g:price>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content typefloatUnit Content typefloatUnit
+ * + * + * * @return Price for the service. */ public FloatUnit getPrice(); /** * Price type information. - * - * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * - * + * + * - * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
price_type
DetailsThe type of pricing for the - * item. Acceptable values are �negotiable,� or �starting.� The default is - * �starting�price_type
DetailsThe type of pricing for the item. Acceptable values are �negotiable,� or �starting.� The default is �starting�
ExampleAcceptable:
+ * + * 		ExampleAcceptable:
* <g:price_type>starting</g:price_type>
* Not acceptable:
* <g:price_type>100 OBO</g:price_type>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * priceTypeEnumeration Content type priceTypeEnumeration
+ * + * + * * @param priceType Price type information. */ public void setPriceType(PriceTypeEnumeration priceType); /** * Price type information. - * - * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * - * + * + * - * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
price_type
DetailsThe type of pricing for the - * item. Acceptable values are �negotiable,� or �starting.� The default is - * �starting�price_type
DetailsThe type of pricing for the item. Acceptable values are �negotiable,� or �starting.� The default is �starting�
ExampleAcceptable:
+ * + * 		ExampleAcceptable:
* <g:price_type>starting</g:price_type>
* Not acceptable:
* <g:price_type>100 OBO</g:price_type>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * priceTypeEnumeration Content type priceTypeEnumeration
+ * + * + * * @return Price type information. */ public PriceTypeEnumeration getPriceType(); /** * Quantity available. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * Not acceptable:
+ * <g:quantity>out of stock</g:quantity> * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * quantity
quantity
- * Details The number of units available for purchase. This - * attribute can be left blank if you have a large quantity or if it is not - * applicable. Details The number of units available for purchase. This attribute can be left blank if you have a large quantity or if it is not + * applicable.
- * Example - * Acceptable:
+ * + * 		Example Acceptable:
* <g:quantity>18</g:quantity>
- * + * * <g:quantity>0</g:quantity>
- * - * Not acceptable:
- * <g:quantity>out - * of stock</g:quantity>
- * - * Attribute of - * Events, Products, - * Services, Travel, Vehicles + * + * Attribute of Events, Products, Services, Travel, Vehicles
- * Content type - * - * integer Content type + * + * integer
+ * + * + * * @param quantity Quantity available. */ public void setQuantity(Integer quantity); /** * Quantity available. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * Not acceptable:
+ * <g:quantity>out of stock</g:quantity> * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * quantity
quantity
- * Details The number of units available for purchase. This - * attribute can be left blank if you have a large quantity or if it is not - * applicable. Details The number of units available for purchase. This attribute can be left blank if you have a large quantity or if it is not + * applicable.
- * Example - * Acceptable:
+ * + * 		Example Acceptable:
* <g:quantity>18</g:quantity>
- * + * * <g:quantity>0</g:quantity>
- * - * Not acceptable:
- * <g:quantity>out - * of stock</g:quantity>
- * - * Attribute of - * Events, Products, - * Services, Travel, Vehicles + * + * Attribute of Events, Products, Services, Travel, Vehicles
- * Content type - * - * integer Content type + * + * integer
+ * + * + * * @return Quantity available. */ public Integer getQuantity(); /** * The type of service being offered. - * - * + * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * service_type
service_type
- * Details - * The type of service being offered. Web hosting, - * legal, gardening, etc. Details The type of service being offered. Web hosting, legal, gardening, etc.
- * Example <g:service_type>consulting</g:service_type> Example <g:service_type>consulting</g:service_type>
- * Attribute of - * Housing Attribute of Housing
- * Content type - * string Content type string
+ * + * + * * @param serviceType The type of service being offered. */ public void setServiceType(String serviceType); /** * The type of service being offered. - * - * + * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
- * service_type
service_type
- * Details - * The type of service being offered. Web hosting, - * legal, gardening, etc. Details The type of service being offered. Web hosting, legal, gardening, etc.
- * Example <g:service_type>consulting</g:service_type> Example <g:service_type>consulting</g:service_type>
- * Attribute of - * Housing Attribute of Housing
- * Content type - * string Content type string
+ * + * + * * @return The type of service being offered. */ public String getServiceType(); /** * Shipping options available for an item. - * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - *
- * - * shipping
+ * + * shipping
- * Details - * Shipping options available for an item. Up to 10 - * shipping options can be included for each item. Three sub-attributes are - * included in the shipping attribute:
    - * - *
  • service = The type of service used to ship an item. Acceptable values are 'FedEx', 'UPS', 'DHL', 'Mail', and 'Other'
    • - *
  • country = The country an item will ship to. Only acceptable values are ISO 3166 country codes.
    • - *
  • price = - * the price of shipping.
 Details Shipping options available for an item. Up to 10 shipping options can be included for each item. Three sub-attributes are included + * in the shipping attribute: + *
    + * + *
  • service = The type of service used to ship an item. Acceptable values are 'FedEx', 'UPS', 'DHL', 'Mail', and 'Other'
    • + *
  • country = The country an item will ship to. Only acceptable values are ISO 3166 country codes.
    • + *
  • price = the price of shipping.
    • + *
+ *
- * - * Example <g:shipping>
- * <g:country>US</g:country>
- * - * <g:service>UPS</g:shipping>
- * - * <g:price>35.95</g:price>
+ * 		+ * + * Example <g:shipping>
+ * <g:country>US</g:country>
+ * + * <g:service>UPS</g:shipping>
+ * + * <g:price>35.95</g:price>
* </g:shipping>
- * Attribute of - * Products Attribute of Products
- * - * Content type - * shippingType + * + * Content type shippingType
+ * + * + * * @param shipping Shipping options available for an item. */ public void setShipping(ShippingType[] shipping); /** * Shipping options available for an item. - * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - *
- * - * shipping
+ * + * shipping
- * Details - * Shipping options available for an item. Up to 10 - * shipping options can be included for each item. Three sub-attributes are - * included in the shipping attribute:
    - * - *
  • service = The type of service used to ship an item. Acceptable values are 'FedEx', 'UPS', 'DHL', 'Mail', and 'Other'
    • - *
  • country = The country an item will ship to. Only acceptable values are ISO 3166 country codes.
    • - *
  • price = - * the price of shipping.
 Details Shipping options available for an item. Up to 10 shipping options can be included for each item. Three sub-attributes are included + * in the shipping attribute: + *
    + * + *
  • service = The type of service used to ship an item. Acceptable values are 'FedEx', 'UPS', 'DHL', 'Mail', and 'Other'
    • + *
  • country = The country an item will ship to. Only acceptable values are ISO 3166 country codes.
    • + *
  • price = the price of shipping.
    • + *
+ *
- * - * Example <g:shipping>
- * <g:country>US</g:country>
- * - * <g:service>UPS</g:shipping>
- * - * <g:price>35.95</g:price>
+ * 		+ * + * Example <g:shipping>
+ * <g:country>US</g:country>
+ * + * <g:service>UPS</g:shipping>
+ * + * <g:price>35.95</g:price>
* </g:shipping>
- * Attribute of - * Products Attribute of Products
- * - * Content type - * shippingType + * + * Content type shippingType
+ * + * + * * @return Shipping options available for an item. */ public ShippingType[] getShipping(); /** * Tax rate associated with the item. - * + * * - * - * - * - * + * * - * - * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * - *
- * tax_percent
- * - * Details - * Tax rate as a percentage. tax_percent
+ * + * Details Tax rate as a percentage.
- * Example <g:tax_percent>8.2<g:/tax_percent> Example <g:tax_percent>8.2<g:/tax_percent>
- * - * Attribute of - * - * Products, Events + * + * Attribute of + * + * Products, Events
- * Content type - * percentType Content type percentType
+ * + * + * * @param taxPercent Tax rate associated with the event. */ public void setTaxPercent(Float taxPercent); /** - * Tax rate associated with the service. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
- * tax_percent
- * - * Details - * Tax rate as a percentage.
- * Example <g:tax_percent>8.2<g:/tax_percent>
- * - * Attribute of - * - * Products, Events
- * Content type - * percentType
- * @return Tax rate associated with the event. - */ + * Tax rate associated with the service. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
tax_percent
+ * + * Details Tax rate as a percentage.
Example <g:tax_percent>8.2<g:/tax_percent>
+ * + * Attribute of + * + * Products, Events
Content type percentType
+ * + * @return Tax rate associated with the event. + */ public Float getTaxPercent(); /** * Region where tax applies. - * - * - * + * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * - *
- * - * tax_region
- * Details - * Geographical region a tax rate - * applies to. + * + * tax_region
Details Geographical region a tax rate applies to.
- * - * Example <g:tax_region>California</g:tax_region> + * + * Example <g:tax_region>California</g:tax_region>
- * Attribute of - * Product, - * Events, Attribute of Product, Events,
- * Content typestring Content typestring
+ * + * + * * @param taxRegion Region where tax applies. */ public void setTaxRegion(String taxRegion); /** * Region where tax applies. - * - * - * + * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * - *
- * - * tax_region
- * Details - * Geographical region a tax rate - * applies to. + * + * tax_region
Details Geographical region a tax rate applies to.
- * - * Example <g:tax_region>California</g:tax_region> + * + * Example <g:tax_region>California</g:tax_region>
- * Attribute of - * Product, - * Events, Attribute of Product, Events,
- * Content typestring Content typestring
+ * + * + * * @return Region where tax applies. */ public String getTaxRegion(); diff --git a/src/main/java/org/rometools/feed/module/base/Travel.java b/src/main/java/org/rometools/feed/module/base/Travel.java index 5d647a9..6df019e 100644 --- a/src/main/java/org/rometools/feed/module/base/Travel.java +++ b/src/main/java/org/rometools/feed/module/base/Travel.java @@ -46,246 +46,243 @@ import org.rometools.feed.module.base.types.PaymentTypeEnumeration; import org.rometools.feed.module.base.types.PriceTypeEnumeration; import org.rometools.feed.module.base.types.ShippingType; - -/**This is an interface for the GoogleBase plug in that exposes methods used for - * travel items. - * +/** + * This is an interface for the GoogleBase plug in that exposes methods used for travel items. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ public interface Travel extends GlobalInterface { /** - * Currency of the price amount for an item. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
currency
Details Currency - * of the price amount for an item. Values must be in ISO - * 4217 currency code format.
Example Acceptable:
<g:currency>USD</g:currency>
- * - * Not acceptable:
<g:currency>US Dollars</g:currency>
Attribute - * of Events, - * Housing, Products, Services, Travel, Vehicles
Content - * type currencyEnumeration
- * @param value Currency of the price amount for an item. + * Currency of the price amount for an item. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
currency
DetailsCurrency of the price amount for an item. Values must be in ISO 4217 currency code format.
ExampleAcceptable:
+ * <g:currency>USD</g:currency>
+ * + * Not acceptable:
+ * <g:currency>US Dollars</g:currency>
Attribute ofEvents, Housing, Products, Services, Travel, Vehicles
Content typecurrencyEnumeration
+ * + * @param value Currency of the price amount for an item. */ public void setCurrency(CurrencyEnumeration value); /** - * Currency of the price amount for an item. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
currency
Details Currency - * of the price amount for an item. Values must be in ISO - * 4217 currency code format.
Example Acceptable:
<g:currency>USD</g:currency>
- * - * Not acceptable:
<g:currency>US Dollars</g:currency>
Attribute - * of Events, - * Housing, Products, Services, Travel, Vehicles
Content - * type currencyEnumeration
- * @return Currency of the price amount for an item. + * Currency of the price amount for an item. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
currency
DetailsCurrency of the price amount for an item. Values must be in ISO 4217 currency code format.
ExampleAcceptable:
+ * <g:currency>USD</g:currency>
+ * + * Not acceptable:
+ * <g:currency>US Dollars</g:currency>
Attribute ofEvents, Housing, Products, Services, Travel, Vehicles
Content typecurrencyEnumeration
+ * + * @return Currency of the price amount for an item. */ public CurrencyEnumeration getCurrency(); /** * Additional instructions to explain the item’s delivery process. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_notes
Details Additional instructions to explain the item’s delivery process.
Example - * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
- * - *
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_notes
DetailsAdditional instructions to explain the item’s delivery process.
Example + * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
+ * + *
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typestring
+ * * @param deliveryNotes Additional instructions to explain the item’s delivery process. */ public void setDeliveryNotes(String deliveryNotes); /** * Additional instructions to explain the item’s delivery process. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_notes
Details Additional instructions to explain the item’s delivery process.
Example - * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
- * - *
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type string
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_notes
DetailsAdditional instructions to explain the item’s delivery process.
Example + * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
+ * + *
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typestring
+ * * @return Additional instructions to explain the item’s delivery process. */ public String getDeliveryNotes(); /** * The maximum distance you will deliver an item in any direction. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_radius
Details The maximum - * distance you will deliver an item in any direction.
Example - * <g:delivery_radius>10<g:/delivery_radius> - * - *
<g:delivery_radius>10km</g:delivery_radius>
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type floatUnit
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_radius
DetailsThe maximum distance you will deliver an item in any direction.
Example + * <g:delivery_radius>10<g:/delivery_radius>
+ * <g:delivery_radius>10km</g:delivery_radius>
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typefloatUnit
+ * * @param deliveryRadius The maximum distance you will deliver an item in any direction. */ public void setDeliveryRadius(FloatUnit deliveryRadius); /** * The maximum distance you will deliver an item in any direction. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
delivery_radius
Details The maximum - * distance you will deliver an item in any direction.
Example - * <g:delivery_radius>10<g:/delivery_radius> - * - *
<g:delivery_radius>10km</g:delivery_radius>
Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
Content - * type floatUnit
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
delivery_radius
DetailsThe maximum distance you will deliver an item in any direction.
Example + * <g:delivery_radius>10<g:/delivery_radius>
+ * <g:delivery_radius>10km</g:delivery_radius>
Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
Content typefloatUnit
+ * * @return The maximum distance you will deliver an item in any direction. */ public FloatUnit getDeliveryRadius(); @@ -293,41 +290,44 @@ public interface Travel extends GlobalInterface { /** * Starting city and state/country of the trip. * - * - * - * + *
from_location
+ * + * + * * - * - * - * + * + * + * * - * - * - * - * + * + * + * + * * - * + * Not acceptable:
+ * <g:from_location> San Francisco International + * Airport</g:from_location> * - * - * - * + * + * + * * - * - * - * - * + * + * + * + * * - * - * + * + * + * + * + *
from_location
Details
Details Starting city and state/country of the trip.
Example Starting city and state/country of the trip.
Example Acceptable:
- * <g:from_location>San Francisco, CA</g:from_location>
+ * 		Acceptable:
+ * <g:from_location>San Francisco, CA</g:from_location>
* - * <g:from_location>Paris, France</g:from_location>
+ * <g:from_location>Paris, France</g:from_location>
* - * Not acceptable:
- * <g:from_location> San Francisco - * International Airport</g:from_location>
Attribute of
Attribute of Travel
Content type Travel
Content type location
location
* - * * @param fromLocation Starting city and state/country of the trip. */ public void setFromLocation(String fromLocation); @@ -335,732 +335,659 @@ public interface Travel extends GlobalInterface { /** * Starting city and state/country of the trip. * - * - * - * + *
from_location
+ * + * + * * - * - * - * + * + * + * * - * - * - * - * + * + * + * + * * - * + * Not acceptable:
+ * <g:from_location> San Francisco International + * Airport</g:from_location> * - * - * - * + * + * + * * - * - * - * - * + * + * + * + * * - * - * + * + * + * + * + *
from_location
Details
Details Starting city and state/country of the trip.
Example Starting city and state/country of the trip.
Example Acceptable:
- * <g:from_location>San Francisco, CA</g:from_location>
+ * 		Acceptable:
+ * <g:from_location>San Francisco, CA</g:from_location>
* - * <g:from_location>Paris, France</g:from_location>
+ * <g:from_location>Paris, France</g:from_location>
* - * Not acceptable:
- * <g:from_location> San Francisco - * International Airport</g:from_location>
Attribute of
Attribute of Travel
Content type Travel
Content type location
location
* - * * @return Starting city and state/country of the trip. */ public String getFromLocation(); /** * Acceptable payment methods for item purchases. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * <g:payment_accepted>Cash Check</g:payment_accepted> * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * payment_accepted
payment_accepted
- * Details Acceptable payment methods for item purchases. Acceptable - * values are “Cash,” “Check,” “Traveler’s Check,” “Visa,” “MasterCard,” - * - * “American Express,” “Discover,” or “Wire - * transfer.” - * If you accept more than one method, include multiple instances of the - * <payment_accepted> attribute - * for each acceptable method. Details Acceptable payment methods for item purchases. Acceptable values are “Cash,” “Check,” “Traveler’s Check,” “Visa,” “MasterCard,” + * + * “American Express,” “Discover,” or “Wire transfer.” If you accept more than one method, include multiple instances of the <payment_accepted> + * attribute for each acceptable method.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:payment_accepted>Cash</g:payment_accepted>
- * + * * <g:payment_accepted>Check</g:payment_accepted>
* Not acceptable:
- * <g:payment_accepted>Cash - * Check</g:payment_accepted>
- * Attribute of - * Events, Housing, - * Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * - * paymentMethodEnumeration Content type + * + * paymentMethodEnumeration
+ * + * + * * @param paymentAccepted Acceptable payment methods for item purchases. */ public void setPaymentAccepted(PaymentTypeEnumeration[] paymentAccepted); /** * Acceptable payment methods for item purchases. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * <g:payment_accepted>Cash Check</g:payment_accepted> * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * payment_accepted
payment_accepted
- * Details Acceptable payment methods for item purchases. Acceptable - * values are “Cash,” “Check,” “Traveler’s Check,” “Visa,” “MasterCard,” - * - * “American Express,” “Discover,” or “Wire - * transfer.” - * If you accept more than one method, include multiple instances of the - * <payment_accepted> attribute - * for each acceptable method. Details Acceptable payment methods for item purchases. Acceptable values are “Cash,” “Check,” “Traveler’s Check,” “Visa,” “MasterCard,” + * + * “American Express,” “Discover,” or “Wire transfer.” If you accept more than one method, include multiple instances of the <payment_accepted> + * attribute for each acceptable method.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:payment_accepted>Cash</g:payment_accepted>
- * + * * <g:payment_accepted>Check</g:payment_accepted>
* Not acceptable:
- * <g:payment_accepted>Cash - * Check</g:payment_accepted>
- * Attribute of - * Events, Housing, - * Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * - * paymentMethodEnumeration Content type + * + * paymentMethodEnumeration
+ * + * + * * @return Acceptable payment methods for item purchases. */ public PaymentTypeEnumeration[] getPaymentAccepted(); /** * Additional instructions to explain a payment policy. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * payment_notes
payment_notes
- * Details - * Additional instructions to explain - * a payment policy. Details Additional instructions to explain a payment policy.
- * Example <g:payment_notes>Cash only for local orders.</g:payment_notes> Example <g:payment_notes>Cash only for local orders.</g:payment_notes>
- * Attribute of - * - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of + * + * Events, Housing, Products, Services, Travel, Vehicles
- * - * Content type - * string + * + * Content type string
+ * + * + * * @param paymentNotes Additional instructions to explain a payment policy. */ public void setPaymentNotes(String paymentNotes); /** * Additional instructions to explain a payment policy. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * payment_notes
payment_notes
- * Details - * Additional instructions to explain - * a payment policy. Details Additional instructions to explain a payment policy.
- * Example <g:payment_notes>Cash only for local orders.</g:payment_notes> Example <g:payment_notes>Cash only for local orders.</g:payment_notes>
- * Attribute of - * - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of + * + * Events, Housing, Products, Services, Travel, Vehicles
- * - * Content type - * string + * + * Content type string
+ * + * + * * @return Additional instructions to explain a payment policy. */ public String getPaymentNotes(); /** * Price of the item. - * - * + * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * price
price
- * Details Prices can be a single price, 0 - * (free), or blank if not applicable. Numerice values only. When used - * as a sub-attribute of <shipping>, the value included reflects the price - * of shipping. Details Prices can be a single price, 0 (free), or blank if not applicable. Numerice values only. When used as a sub-attribute of + * <shipping>, the value included reflects the price of shipping.
- * Example - * Acceptable:
+ * 		Example Acceptable:
* <g:price>5.95</g:price>
- * + * * <g:price>0</g:price>
- * Not acceptable:
+ * Not acceptable:
* <g:price>5,95</g:price>
* <g:price>5.00 – 10.00</g:price>
- * + * * <g:price>100 or best offer</g:price>
* <g:price>free</g:price>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content typefloatUnit Content typefloatUnit
+ * + * + * * @return Price of the item. */ public FloatUnit getPrice(); /** * The type of pricing for the item. - * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * - * + * + * - * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
price_type
DetailsThe type of pricing for the - * item. Acceptable values are “negotiable,” or “starting.” The default is - * “starting”price_type
DetailsThe type of pricing for the item. Acceptable values are “negotiable,” or “starting.” The default is “starting”
ExampleAcceptable:
+ * + * 		ExampleAcceptable:
* <g:price_type>starting</g:price_type>
* Not acceptable:
* <g:price_type>100 OBO</g:price_type>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * priceTypeEnumeration Content type priceTypeEnumeration
+ * + * + * * @param priceType The type of pricing for the item. */ public void setPriceType(PriceTypeEnumeration priceType); /** * The type of pricing for the item. - * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * - * + * + * - * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
price_type
DetailsThe type of pricing for the - * item. Acceptable values are “negotiable,” or “starting.” The default is - * “starting”price_type
DetailsThe type of pricing for the item. Acceptable values are “negotiable,” or “starting.” The default is “starting”
ExampleAcceptable:
+ * + * 		ExampleAcceptable:
* <g:price_type>starting</g:price_type>
* Not acceptable:
* <g:price_type>100 OBO</g:price_type>
- * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
- * Content type - * priceTypeEnumeration Content type priceTypeEnumeration
+ * + * + * * @return The type of pricing for the item. */ public PriceTypeEnumeration getPriceType(); - /** * Quantity available. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * Not acceptable:
+ * <g:quantity>out of stock</g:quantity> * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * quantity
quantity
- * Details The number of units available for purchase. This - * attribute can be left blank if you have a large quantity or if it is not - * applicable. Details The number of units available for purchase. This attribute can be left blank if you have a large quantity or if it is not + * applicable.
- * Example - * Acceptable:
+ * + * 		Example Acceptable:
* <g:quantity>18</g:quantity>
- * + * * <g:quantity>0</g:quantity>
- * - * Not acceptable:
- * <g:quantity>out - * of stock</g:quantity>
- * - * Attribute of - * Events, Products, - * Services, Travel, Vehicles + * + * Attribute of Events, Products, Services, Travel, Vehicles
- * Content type - * - * integer Content type + * + * integer
+ * + * + * * @param quantity Quantity available. */ public void setQuantity(Integer quantity); /** * Quantity available. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * Not acceptable:
+ * <g:quantity>out of stock</g:quantity> * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
- * quantity
quantity
- * Details The number of units available for purchase. This - * attribute can be left blank if you have a large quantity or if it is not - * applicable. Details The number of units available for purchase. This attribute can be left blank if you have a large quantity or if it is not + * applicable.
- * Example - * Acceptable:
+ * + * 		Example Acceptable:
* <g:quantity>18</g:quantity>
- * + * * <g:quantity>0</g:quantity>
- * - * Not acceptable:
- * <g:quantity>out - * of stock</g:quantity>
- * - * Attribute of - * Events, Products, - * Services, Travel, Vehicles + * + * Attribute of Events, Products, Services, Travel, Vehicles
- * Content type - * - * integer Content type + * + * integer
+ * + * + * * @return Quantity available. */ public Integer getQuantity(); - /** * Tax rate associated with the event. - * + * * - * - * - * - * + * * - * - * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * - *
- * tax_percent
- * - * Details - * Tax rate as a percentage. tax_percent
+ * + * Details Tax rate as a percentage.
- * Example <g:tax_percent>8.2<g:/tax_percent> Example <g:tax_percent>8.2<g:/tax_percent>
- * - * Attribute of - * - * Products, Events + * + * Attribute of + * + * Products, Events
- * Content type - * percentType Content type percentType
+ * + * + * * @param taxPercent Tax rate associated with the event. */ public void setTaxPercent(Float taxPercent); /** - * Tax rate associated with the service. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
- * tax_percent
- * - * Details - * Tax rate as a percentage.
- * Example <g:tax_percent>8.2<g:/tax_percent>
- * - * Attribute of - * - * Products, Events
- * Content type - * percentType
- * @return Tax rate associated with the event. - */ + * Tax rate associated with the service. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
tax_percent
+ * + * Details Tax rate as a percentage.
Example <g:tax_percent>8.2<g:/tax_percent>
+ * + * Attribute of + * + * Products, Events
Content type percentType
+ * + * @return Tax rate associated with the event. + */ public Float getTaxPercent(); /** * Region where tax applies. - * - * - * + * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * - *
- * - * tax_region
- * Details - * Geographical region a tax rate - * applies to. + * + * tax_region
Details Geographical region a tax rate applies to.
- * - * Example <g:tax_region>California</g:tax_region> + * + * Example <g:tax_region>California</g:tax_region>
- * Attribute of - * Product, - * Events, Attribute of Product, Events,
- * Content typestring Content typestring
+ * + * + * * @param taxRegion Region where tax applies. */ public void setTaxRegion(String taxRegion); /** * Region where tax applies. - * - * - * + * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * - *
- * - * tax_region
- * Details - * Geographical region a tax rate - * applies to. + * + * tax_region
Details Geographical region a tax rate applies to.
- * - * Example <g:tax_region>California</g:tax_region> + * + * Example <g:tax_region>California</g:tax_region>
- * Attribute of - * Product, - * Events, Attribute of Product, Events,
- * Content typestring Content typestring
+ * + * + * * @return Region where tax applies. */ public String getTaxRegion(); - + /** * Destination city and state/country of the trip. * * * - * - * + * + * + * * * * - * - * + * Details + * * * - * + * Example * - * + * Not acceptable:
+ * <g:to_location>San Francisco International + * Airport</g:to_location> * * - * - * + * Attribute of + * * * - * + * * - * + * * - *
- * to_location
to_location
+ * * - * Details - * Destination city and state/country - * of the trip. Destination city and state/country of the trip.
+ * * - * Example - * Acceptable:
- * <g:to_location>San - * Francisco, CA</g:to_location>
+ * 		Acceptable:
+ * <g:to_location>San Francisco, CA</g:to_location>
* <g:to_location>Paris, France</g:to_location>
* - * Not acceptable:
- * <g:to_location>San - * Francisco International Airport</g:to_location>
+ * * - * Attribute of - * Travel Travel
- * Content type Content type - * locationyTpe locationyTpe
+ * + * + * * @param toLocation Destination city and state/country of the trip. */ public void setToLocation(String toLocation); @@ -1070,49 +997,44 @@ public interface Travel extends GlobalInterface { * * * - * - * + * + * + * * * * - * - * + * Details + * * * - * + * Example * - * + * Not acceptable:
+ * <g:to_location>San Francisco International + * Airport</g:to_location> * * - * - * + * Attribute of + * * * - * + * * - * + * * - *
- * to_location
to_location
+ * * - * Details - * Destination city and state/country - * of the trip. Destination city and state/country of the trip.
+ * * - * Example - * Acceptable:
- * <g:to_location>San - * Francisco, CA</g:to_location>
+ * 		Acceptable:
+ * <g:to_location>San Francisco, CA</g:to_location>
* <g:to_location>Paris, France</g:to_location>
* - * Not acceptable:
- * <g:to_location>San - * Francisco International Airport</g:to_location>
+ * * - * Attribute of - * Travel Travel
- * Content type Content type - * locationyTpe locationyTpe
+ * + * + * * @return Destination city and state/country of the trip. */ public String getToLocation(); @@ -1121,51 +1043,47 @@ public interface Travel extends GlobalInterface { * Departure date and time of the trip. * * - * - * + * + * + * * * * - * - * + * + *
  • start = Start date and time of a trip in format YYYY-MM-DDThh:mm:ss
    • + *
  • end = End date and time of a trip in format YYYY-MM-DDThh:mm:ss
    • + * + * * * - * - * + * * * * - * - * + * Attribute of + * * * - * + * Content type * - * + * * - *
    - * travel_date_range
    travel_date_range
    - * Details - * Departure date and time of the trip in ISO 8601 format: YYYY-MM-DD,hh:mmAM (12 hour - * clock) or YYYY-MM-DD,hh:mm (24 hour clock). Two sub-attributes - * are included in travel_date_range attribute.
      + *
    		Details Departure date and time of the trip in ISO 8601 + * format: YYYY-MM-DD,hh:mmAM (12 hour clock) or YYYY-MM-DD,hh:mm (24 hour clock). Two sub-attributes are included in travel_date_range attribute. + *
      * - *
    • start = Start date and time of a trip in - * format YYYY-MM-DDThh:mm:ss
      • - *
    • end = End date and time of a trip in - * format YYYY-MM-DDThh:mm:ss
    - * Example <g:travel_date_range>
    + *     		Example <g:travel_date_range>
    * - * <g:start>2005-12-20T06:00:00</g:start> - *
    + * <g:start>2005-12-20T06:00:00</g:start>
    * <g:end>2005-12-29T13:00:00</g:end>
    * </g:travel_date_range>
    + * * - * Attribute of - * Travel Travel
    + * * - * Content type - * dateTimeRange dateTimeRange
    + * + * + * * @param travelDateRange Departure date and time of the trip. */ public void setTravelDateRange(DateTimeRange travelDateRange); @@ -1174,100 +1092,93 @@ public interface Travel extends GlobalInterface { * Departure date and time of the trip. * * - * - * + * + * + * * * * - * - * + * + *
  • start = Start date and time of a trip in format YYYY-MM-DDThh:mm:ss
    • + *
  • end = End date and time of a trip in format YYYY-MM-DDThh:mm:ss
    • + * + * * * - * - * + * * * * - * - * + * Attribute of + * * * - * + * Content type * - * + * * - *
    - * travel_date_range
    travel_date_range
    - * Details - * Departure date and time of the trip in ISO 8601 format: YYYY-MM-DD,hh:mmAM (12 hour - * clock) or YYYY-MM-DD,hh:mm (24 hour clock). Two sub-attributes - * are included in travel_date_range attribute.
      + *
    		Details Departure date and time of the trip in ISO 8601 + * format: YYYY-MM-DD,hh:mmAM (12 hour clock) or YYYY-MM-DD,hh:mm (24 hour clock). Two sub-attributes are included in travel_date_range attribute. + *
      * - *
    • start = Start date and time of a trip in - * format YYYY-MM-DDThh:mm:ss
      • - *
    • end = End date and time of a trip in - * format YYYY-MM-DDThh:mm:ss
    - * Example <g:travel_date_range>
    + *     		Example <g:travel_date_range>
    * - * <g:start>2005-12-20T06:00:00</g:start> - *
    + * <g:start>2005-12-20T06:00:00</g:start>
    * <g:end>2005-12-29T13:00:00</g:end>
    * </g:travel_date_range>
    + * * - * Attribute of - * Travel Travel
    + * * - * Content type - * dateTimeRange dateTimeRange
    + * + * + * * @return Departure date and time of the trip. */ public DateTimeRange getTravelDateRange(); + /** * Location of the property. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * - * + * <g:location>123 Main St,, CA, 12345, + * USA</g:location>
    + * <g:location> Anytown, CA, 12345, + * USA</g:location> + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
    - * location
    location
    - * Details Location of a property. Should - * include street, city, state, postal code, and country, in that order. Details Location of a property. Should include street, city, state, postal code, and country, in that order.
    - * Example - * Acceptable:
    - * <g:location>123 Main St, Anytown, CA, 12345, USA</g:location>
    - * + *     		Example Acceptable:
    + * <g:location>123 Main St, Anytown, CA, 12345, + * USA</g:location>
    + * * Not acceptable:
    - * <g:location>123 Main St,, CA, 12345, USA</g:location>
    - * <g:location> - * Anytown, CA, 12345, USA</g:location>
    - * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
    - * Content type - * locationType Content type locationType
    + * + * + * * @param location Location of the property. */ public void setLocation(String location); @@ -1275,110 +1186,103 @@ public interface Travel extends GlobalInterface { /** * Location of the property. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * - * + * <g:location>123 Main St,, CA, 12345, + * USA</g:location>
    + * <g:location> Anytown, CA, 12345, + * USA</g:location> + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
    - * location
    location
    - * Details Location of a property. Should - * include street, city, state, postal code, and country, in that order. Details Location of a property. Should include street, city, state, postal code, and country, in that order.
    - * Example - * Acceptable:
    - * <g:location>123 Main St, Anytown, CA, 12345, USA</g:location>
    - * + *     		Example Acceptable:
    + * <g:location>123 Main St, Anytown, CA, 12345, + * USA</g:location>
    + * * Not acceptable:
    - * <g:location>123 Main St,, CA, 12345, USA</g:location>
    - * <g:location> - * Anytown, CA, 12345, USA</g:location>
    - * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
    - * Content type - * locationType Content type locationType
    + * + * + * * @return Location of the property. */ public String getLocation(); - - + /** * Shipping options available for an item. - * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - *
    - * - * shipping
    + * + * shipping
    - * Details - * Shipping options available for an item. Up to 10 - * shipping options can be included for each item. Three sub-attributes are - * included in the shipping attribute:
      - * - *
    • service = The type of service used to ship an item. Acceptable values are 'FedEx', 'UPS', 'DHL', 'Mail', and 'Other'
      • - *
    • country = The country an item will ship to. Only acceptable values are ISO 3166 country codes.
      • - *
    • price = - * the price of shipping.
    		 Details Shipping options available for an item. Up to 10 shipping options can be included for each item. Three sub-attributes are included + * in the shipping attribute: + *
      + * + *
    • service = The type of service used to ship an item. Acceptable values are 'FedEx', 'UPS', 'DHL', 'Mail', and 'Other'
      • + *
    • country = The country an item will ship to. Only acceptable values are ISO 3166 country codes.
      • + *
    • price = the price of shipping.
      • + *
    + *
    - * - * Example <g:shipping>
    - * <g:country>US</g:country>
    - * - * <g:service>UPS</g:shipping>
    - * - * <g:price>35.95</g:price>
    + *     		+ * + * Example <g:shipping>
    + * <g:country>US</g:country>
    + * + * <g:service>UPS</g:shipping>
    + * + * <g:price>35.95</g:price>
    * </g:shipping>
    - * Attribute of - * Products Attribute of Products
    - * - * Content type - * shippingType + * + * Content type shippingType
    + * + * + * * @return Shipping options available for an item. */ public ShippingType[] getShipping(); - } diff --git a/src/main/java/org/rometools/feed/module/base/Unknown.java b/src/main/java/org/rometools/feed/module/base/Unknown.java index 6a095b1..7173971 100644 --- a/src/main/java/org/rometools/feed/module/base/Unknown.java +++ b/src/main/java/org/rometools/feed/module/base/Unknown.java @@ -43,13 +43,10 @@ import java.net.URL; import org.rometools.feed.module.base.types.IntUnit; - /** - * This interface contains all the other schema elements that the document - * doesn't associate with a particular type. - * - * @author Robert "kebernet" - * Cooper + * This interface contains all the other schema elements that the document doesn't associate with a particular type. + * + * @author Robert "kebernet" Cooper */ public interface Unknown extends GlobalInterface { public void setLicenses(String[] licenses); diff --git a/src/main/java/org/rometools/feed/module/base/ValidationException.java b/src/main/java/org/rometools/feed/module/base/ValidationException.java index faaafdc..bfb6310 100644 --- a/src/main/java/org/rometools/feed/module/base/ValidationException.java +++ b/src/main/java/org/rometools/feed/module/base/ValidationException.java @@ -20,16 +20,17 @@ package org.rometools.feed.module.base; -/** This is an unchecked exception that is thrown when a data value violates - * the Google Schema limits. +/** + * This is an unchecked exception that is thrown when a data value violates the Google Schema limits. + * * @version $Revision: 1.1 $ * @author Robert "kebernet" Cooper */ -public class ValidationException extends RuntimeException{ - +public class ValidationException extends RuntimeException { + /** Creates a new instance of ValidationException */ - public ValidationException(String message) { - super( message ); + public ValidationException(final String message) { + super(message); } - + } diff --git a/src/main/java/org/rometools/feed/module/base/Vehicle.java b/src/main/java/org/rometools/feed/module/base/Vehicle.java index 6a5c512..72e3458 100644 --- a/src/main/java/org/rometools/feed/module/base/Vehicle.java +++ b/src/main/java/org/rometools/feed/module/base/Vehicle.java @@ -46,412 +46,399 @@ import org.rometools.feed.module.base.types.PriceTypeEnumeration; import org.rometools.feed.module.base.types.ShippingType; import org.rometools.feed.module.base.types.YearType; - /** - * This is an interface for the GoogleBase plug in that exposes methods used for - * vehicles. + * This is an interface for the GoogleBase plug in that exposes methods used for vehicles. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ public interface Vehicle extends GlobalInterface { /** * Color of an item. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
    - * color
    color
    - * Details - * Color of an item. Details Color of an item.
    - * Example <g:color>Black</g:color> Example <g:color>Black</g:color>
    - * - * Attribute of - * Products, Vehicles + * + * Attribute of Products, Vehicles
    - * Content type - * string Content type string
    + * + * + * * @param color Color of an item. */ public void setColors(String[] color); /** * Color of an item. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
    - * color
    color
    - * Details - * Color of an item. Details Color of an item.
    - * Example <g:color>Black</g:color> Example <g:color>Black</g:color>
    - * - * Attribute of - * Products, Vehicles + * + * Attribute of Products, Vehicles
    - * Content type - * string Content type string
    + * + * + * * @return Color of an item. */ public String[] getColors(); /** * Condition of the item. For example: new, used, or refurbished. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
    condition
    Details Condition - * of the item. For example: new, used, or refurbished.
    Example - * <g:condition>refurbished</g:condition>
    Attribute - * of Products, - * Vehicles
    Content - * type string
    + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    condition
    DetailsCondition of the item. For example: new, used, or refurbished.
    Example + * <g:condition>refurbished</g:condition>
    Attribute ofProducts, Vehicles
    Content typestring
    + * * @param condition Condition of the item. For example: new, used, or refurbished. */ public void setCondition(String condition); /** * Condition of the item. For example: new, used, or refurbished. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
    condition
    Details Condition - * of the item. For example: new, used, or refurbished.
    Example - * <g:condition>refurbished</g:condition>
    Attribute - * of Products, - * Vehicles
    Content - * type string
    + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    condition
    DetailsCondition of the item. For example: new, used, or refurbished.
    Example + * <g:condition>refurbished</g:condition>
    Attribute ofProducts, Vehicles
    Content typestring
    + * * @return Condition of the item. For example: new, used, or refurbished. */ public String getCondition(); /** - * Currency of the price amount for an item. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
    currency
    Details Currency - * of the price amount for an item. Values must be in ISO - * 4217 currency code format.
    Example Acceptable:
    <g:currency>USD</g:currency>
    - * - * Not acceptable:
    <g:currency>US Dollars</g:currency>
    Attribute - * of Events, - * Housing, Products, Services, Travel, Vehicles
    Content - * type currencyEnumeration
    - * @param value Currency of the price amount for an item. + * Currency of the price amount for an item. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    currency
    DetailsCurrency of the price amount for an item. Values must be in ISO 4217 currency code format.
    ExampleAcceptable:
    + * <g:currency>USD</g:currency>
    + * + * Not acceptable:
    + * <g:currency>US Dollars</g:currency>
    Attribute ofEvents, Housing, Products, Services, Travel, Vehicles
    Content typecurrencyEnumeration
    + * + * @param value Currency of the price amount for an item. */ public void setCurrency(CurrencyEnumeration value); /** - * Currency of the price amount for an item. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
    currency
    Details Currency - * of the price amount for an item. Values must be in ISO - * 4217 currency code format.
    Example Acceptable:
    <g:currency>USD</g:currency>
    - * - * Not acceptable:
    <g:currency>US Dollars</g:currency>
    Attribute - * of Events, - * Housing, Products, Services, Travel, Vehicles
    Content - * type currencyEnumeration
    - * @return Currency of the price amount for an item. + * Currency of the price amount for an item. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    currency
    DetailsCurrency of the price amount for an item. Values must be in ISO 4217 currency code format.
    ExampleAcceptable:
    + * <g:currency>USD</g:currency>
    + * + * Not acceptable:
    + * <g:currency>US Dollars</g:currency>
    Attribute ofEvents, Housing, Products, Services, Travel, Vehicles
    Content typecurrencyEnumeration
    + * + * @return Currency of the price amount for an item. */ public CurrencyEnumeration getCurrency(); /** * Additional instructions to explain the item’s delivery process. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
    delivery_notes
    Details Additional instructions to explain the item’s delivery process.
    Example - * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
    - * - *
    Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
    Content - * type string
    + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    delivery_notes
    DetailsAdditional instructions to explain the item’s delivery process.
    Example + * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
    + * + *
    Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
    Content typestring
    + * * @param deliveryNotes Additional instructions to explain the item’s delivery process. */ public void setDeliveryNotes(String deliveryNotes); /** * Additional instructions to explain the item’s delivery process. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
    delivery_notes
    Details Additional instructions to explain the item’s delivery process.
    Example - * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
    - * - *
    Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
    Content - * type string
    + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    delivery_notes
    DetailsAdditional instructions to explain the item’s delivery process.
    Example + * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
    + * + *
    Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
    Content typestring
    + * * @return Additional instructions to explain the item’s delivery process. */ public String getDeliveryNotes(); /** * The maximum distance you will deliver an item in any direction. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
    delivery_radius
    Details The maximum - * distance you will deliver an item in any direction.
    Example - * <g:delivery_radius>10<g:/delivery_radius> - * - *
    <g:delivery_radius>10km</g:delivery_radius>
    Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
    Content - * type floatUnit
    + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    delivery_radius
    DetailsThe maximum distance you will deliver an item in any direction.
    Example + * <g:delivery_radius>10<g:/delivery_radius>
    + * <g:delivery_radius>10km</g:delivery_radius>
    Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
    Content typefloatUnit
    + * * @param deliveryRadius The maximum distance you will deliver an item in any direction. */ public void setDeliveryRadius(FloatUnit deliveryRadius); /** * The maximum distance you will deliver an item in any direction. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
    delivery_radius
    Details The maximum - * distance you will deliver an item in any direction.
    Example - * <g:delivery_radius>10<g:/delivery_radius> - * - *
    <g:delivery_radius>10km</g:delivery_radius>
    Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
    Content - * type floatUnit
    + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    delivery_radius
    DetailsThe maximum distance you will deliver an item in any direction.
    Example + * <g:delivery_radius>10<g:/delivery_radius>
    + * <g:delivery_radius>10km</g:delivery_radius>
    Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
    Content typefloatUnit
    + * * @return The maximum distance you will deliver an item in any direction. */ public FloatUnit getDeliveryRadius(); @@ -459,49 +446,45 @@ public interface Vehicle extends GlobalInterface { /** * Location of a property. Should include street, city, state, postal code, and country, in that order. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * - * + * <g:location>123 Main St,, CA, 12345, + * USA</g:location>
    + * <g:location> Anytown, CA, 12345, + * USA</g:location> + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
    - * location
    location
    - * Details Location of a property. Should - * include street, city, state, postal code, and country, in that order. Details Location of a property. Should include street, city, state, postal code, and country, in that order.
    - * Example - * Acceptable:
    - * <g:location>123 Main St, Anytown, CA, 12345, USA</g:location>
    - * + *     		Example Acceptable:
    + * <g:location>123 Main St, Anytown, CA, 12345, + * USA</g:location>
    + * * Not acceptable:
    - * <g:location>123 Main St,, CA, 12345, USA</g:location>
    - * <g:location> - * Anytown, CA, 12345, USA</g:location>
    - * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
    - * Content type - * locationType Content type locationType
    + * + * + * * @param location Location of a property. Should include street, city, state, postal code, and country, in that order. */ public void setLocation(String location); @@ -509,94 +492,87 @@ public interface Vehicle extends GlobalInterface { /** * Location of a property. Should include street, city, state, postal code, and country, in that order. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * - * + * <g:location>123 Main St,, CA, 12345, + * USA</g:location>
    + * <g:location> Anytown, CA, 12345, + * USA</g:location> + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
    - * location
    location
    - * Details Location of a property. Should - * include street, city, state, postal code, and country, in that order. Details Location of a property. Should include street, city, state, postal code, and country, in that order.
    - * Example - * Acceptable:
    - * <g:location>123 Main St, Anytown, CA, 12345, USA</g:location>
    - * + *     		Example Acceptable:
    + * <g:location>123 Main St, Anytown, CA, 12345, + * USA</g:location>
    + * * Not acceptable:
    - * <g:location>123 Main St,, CA, 12345, USA</g:location>
    - * <g:location> - * Anytown, CA, 12345, USA</g:location>
    - * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
    - * Content type - * locationType Content type locationType
    + * + * + * * @return Location of a property. Should include street, city, state, postal code, and country, in that order. */ public String getLocation(); - /** * The vehicle manufacturer. * * * - * - * + * + * + * * * - * - * + * + * The vehicle manufacturer. * * - * + * * - * + * * * * - * - * + * + * Vehicles * * * - * - * + * + * * * - *
    - * make
    make
    + * * - * Details + * Details * - * The vehicle manufacturer.
    - * Example Example <g:make>Honda</g:make> <g:make>Honda</g:make>
    - * Attribute of + * Attribute of * - * Vehicles
    - * Content type - * string Content type string
    + * + * + * * @param make The vehicle manufacturer. */ public void setMake(String make); @@ -606,41 +582,39 @@ public interface Vehicle extends GlobalInterface { * * * - * - * + * + * + * * * - * - * + * + * The vehicle manufacturer. * * - * + * * - * + * * * * - * - * + * + * Vehicles * * * - * - * + * + * * * - *
    - * make
    make
    + * * - * Details + * Details * - * The vehicle manufacturer.
    - * Example Example <g:make>Honda</g:make> <g:make>Honda</g:make>
    - * Attribute of + * Attribute of * - * Vehicles
    - * Content type - * string Content type string
    + * + * + * * @return The vehicle manufacturer. */ public String getMake(); @@ -649,41 +623,40 @@ public interface Vehicle extends GlobalInterface { * Current mileage of the vehicle. * * - * + * + * * - * + * * * * - * - * + * + * * * - * + * - * * * * * - * - * + * + * * * * - * + * * - * + * * - *
    mileagemileage
    Details Current mileage of the vehicle. Details Current mileage of the vehicle.
    + *
    * * Example - * <g:mileage>1700</g:mileage>
    + *     		<g:mileage>1700</g:mileage>
    *
    * <g:mileage>1,700 miles</g:mileage>
    - * Attribute of - * Vehicles Attribute of Vehicles
    - * Content type Content type - * intUnit intUnit
    + * + * + * * @param mileage Current mileage of the vehicle. */ public void setMileage(Integer mileage); @@ -692,41 +665,40 @@ public interface Vehicle extends GlobalInterface { * Current mileage of the vehicle. * * - * + * + * * - * + * * * * - * - * + * + * * * - * + * - * * * * * - * - * + * + * * * * - * + * * - * + * * - *
    mileagemileage
    Details Current mileage of the vehicle. Details Current mileage of the vehicle.
    + *
    * * Example - * <g:mileage>1700</g:mileage>
    + *     		<g:mileage>1700</g:mileage>
    *
    * <g:mileage>1,700 miles</g:mileage>
    - * Attribute of - * Vehicles Attribute of Vehicles
    - * Content type Content type - * intUnit intUnit
    + * + * + * * @return Current mileage of the vehicle. */ public Integer getMileage(); @@ -734,33 +706,35 @@ public interface Vehicle extends GlobalInterface { /** * The vehicle model. * - * - * + * + * + * * * * - * + * * - * + * * * - * + * * - * + * * * * - * - * + * + * * * * * - * - * + * + * * - *
    model
    model
    Details DetailsThe vehicle model.The vehicle model.
    ExampleExample <g:model>Camry</g:model> <g:model>Camry</g:model>
    Attribute of - * Vehicles Attribute of Vehicles
    Content typestringContent typestring
    + * + * + * * @param model The vehicle model. */ public void setModel(String model); @@ -768,890 +742,806 @@ public interface Vehicle extends GlobalInterface { /** * The vehicle model. * - * - * + * + * + * * * * - * + * * - * + * * * - * + * * - * + * * * * - * - * + * + * * * * * - * - * + * + * * - *
    model
    model
    Details DetailsThe vehicle model.The vehicle model.
    ExampleExample <g:model>Camry</g:model> <g:model>Camry</g:model>
    Attribute of - * Vehicles Attribute of Vehicles
    Content typestringContent typestring
    + * + * + * * @return The vehicle model. */ public String getModel(); -/** + /** * Payment Methods acceptable for the service. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * <g:payment_accepted>Cash Check Paypal</g:payment_accepted> * - * + * * - * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * - *
    - * payment_accepted
    payment_accepted
    - * Details Acceptable payment methods for item purchases. Acceptable - * values are "Cash," "Check," "Traveler’s Check," "Visa," "MasterCard," - * - * "American Express," "Discover," "Wire transfer" or "Paypal." If you accept - * more than one method, include multiple instances of the - * <payment_accepted> attribute for each acceptable method. Details Acceptable payment methods for item purchases. Acceptable values are "Cash," "Check," "Traveler’s Check," "Visa," "MasterCard," + * + * "American Express," "Discover," "Wire transfer" or "Paypal." If you accept more than one method, include multiple instances of the + * <payment_accepted> attribute for each acceptable method.
    - * Example - * Acceptable:
    + *     		Example Acceptable:
    * <g:payment_accepted>Cash</g:payment_accepted>
    - * + * * <g:payment_accepted>Check</g:payment_accepted>
    - * + * * <g:payment_accepted>Paypal</g:payment_accepted>
    * Not acceptable:
    - * <g:payment_accepted>Cash - * Check Paypal</g:payment_accepted>
    - * Attribute of - * Events, Housing, - * Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
    - * Content type - * paymentMethodEnumeration Content type paymentMethodEnumeration
    + * + * + * * @param paymentAccepted Payment Methods acceptable for the service. */ public void setPaymentAccepted(PaymentTypeEnumeration[] paymentAccepted); /** * Payment Methods acceptable for the service. - * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * + * + * <g:payment_accepted>Cash Check Paypal</g:payment_accepted> * - * + * * - * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * - *
    - * payment_accepted
    payment_accepted
    - * Details Acceptable payment methods for item purchases. Acceptable - * values are "Cash," "Check," "Traveler’s Check," "Visa," "MasterCard," - * - * "American Express," "Discover," "Wire transfer" or "Paypal." If you accept - * more than one method, include multiple instances of the - * <payment_accepted> attribute for each acceptable method. Details Acceptable payment methods for item purchases. Acceptable values are "Cash," "Check," "Traveler’s Check," "Visa," "MasterCard," + * + * "American Express," "Discover," "Wire transfer" or "Paypal." If you accept more than one method, include multiple instances of the + * <payment_accepted> attribute for each acceptable method.
    - * Example - * Acceptable:
    + *     		Example Acceptable:
    * <g:payment_accepted>Cash</g:payment_accepted>
    - * + * * <g:payment_accepted>Check</g:payment_accepted>
    - * + * * <g:payment_accepted>Paypal</g:payment_accepted>
    * Not acceptable:
    - * <g:payment_accepted>Cash - * Check Paypal</g:payment_accepted>
    - * Attribute of - * Events, Housing, - * Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
    - * Content type - * paymentMethodEnumeration Content type paymentMethodEnumeration
    + * + * + * * @return Payment Methods acceptable for the service. */ public PaymentTypeEnumeration[] getPaymentAccepted(); /** * Additional payment information. - * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
    - * payment_notes
    payment_notes
    - * Details - * Additional instructions to explain - * a payment policy. Details Additional instructions to explain a payment policy.
    - * Example <g:payment_notes>Cash only for local orders.</g:payment_notes> Example <g:payment_notes>Cash only for local orders.</g:payment_notes>
    - * Attribute of - * - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of + * + * Events, Housing, Products, Services, Travel, Vehicles
    - * Content type - * string Content type string
    + * + * + * * @param paymentNotes Additional payment information. */ public void setPaymentNotes(String paymentNotes); /** * Additional payment information. - * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
    - * payment_notes
    payment_notes
    - * Details - * Additional instructions to explain - * a payment policy. Details Additional instructions to explain a payment policy.
    - * Example <g:payment_notes>Cash only for local orders.</g:payment_notes> Example <g:payment_notes>Cash only for local orders.</g:payment_notes>
    - * Attribute of - * - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of + * + * Events, Housing, Products, Services, Travel, Vehicles
    - * Content type - * string Content type string
    + * + * + * * @return Additional payment information. */ public String getPaymentNotes(); /** - * Price for the service. - *
    - * - * + * Price for the service.
    + * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
    - * price
    price
    - * Details Prices can be a single price, 0 - * (free), or blank if not applicable. Numerice values only. When used - * as a sub-attribute of <shipping>, the value included reflects the price - * of shipping. Details Prices can be a single price, 0 (free), or blank if not applicable. Numerice values only. When used as a sub-attribute of + * <shipping>, the value included reflects the price of shipping.
    - * Example - * Acceptable:
    + *     		Example Acceptable:
    * <g:price>5.95</g:price>
    - * + * * <g:price>0</g:price>
    - * Not acceptable:
    + * Not acceptable:
    * <g:price>5,95</g:price>
    * <g:price>5.00 � 10.00</g:price>
    - * + * * <g:price>100 or best offer</g:price>
    * <g:price>free</g:price>
    - * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
    - * Content typefloatUnit Content typefloatUnit
    + * + * + * * @param price Price for the service. */ public void setPrice(FloatUnit price); /** - * Price for the service. - *
    - * - * + * Price for the service.
    + * + * * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * * - * - * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
    - * price
    price
    - * Details Prices can be a single price, 0 - * (free), or blank if not applicable. Numerice values only. When used - * as a sub-attribute of <shipping>, the value included reflects the price - * of shipping. Details Prices can be a single price, 0 (free), or blank if not applicable. Numerice values only. When used as a sub-attribute of + * <shipping>, the value included reflects the price of shipping.
    - * Example - * Acceptable:
    + *     		Example Acceptable:
    * <g:price>5.95</g:price>
    - * + * * <g:price>0</g:price>
    - * Not acceptable:
    + * Not acceptable:
    * <g:price>5,95</g:price>
    * <g:price>5.00 � 10.00</g:price>
    - * + * * <g:price>100 or best offer</g:price>
    * <g:price>free</g:price>
    - * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
    - * Content typefloatUnit Content typefloatUnit
    + * + * + * * @return Price for the service. */ public FloatUnit getPrice(); /** * Price type information. - * - * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * - * + * + * - * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
    price_type
    DetailsThe type of pricing for the - * item. Acceptable values are �negotiable,� or �starting.� The default is - * �starting�price_type
    DetailsThe type of pricing for the item. Acceptable values are �negotiable,� or �starting.� The default is �starting�
    ExampleAcceptable:
    + * + *     		ExampleAcceptable:
    * <g:price_type>starting</g:price_type>
    * Not acceptable:
    * <g:price_type>100 OBO</g:price_type>
    - * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
    - * Content type - * priceTypeEnumeration Content type priceTypeEnumeration
    + * + * + * * @param priceType Price type information. */ public void setPriceType(PriceTypeEnumeration priceType); /** * Price type information. - * - * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * - * + * + * - * + * * - * + * * - * - * + * + * * * - * - * - * + * + * + * * - *
    price_type
    DetailsThe type of pricing for the - * item. Acceptable values are �negotiable,� or �starting.� The default is - * �starting�price_type
    DetailsThe type of pricing for the item. Acceptable values are �negotiable,� or �starting.� The default is �starting�
    ExampleAcceptable:
    + * + *     		ExampleAcceptable:
    * <g:price_type>starting</g:price_type>
    * Not acceptable:
    * <g:price_type>100 OBO</g:price_type>
    - * Attribute of - * Events, - * Housing, Products, Services, Travel, Vehicles Attribute of Events, Housing, Products, Services, Travel, Vehicles
    - * Content type - * priceTypeEnumeration Content type priceTypeEnumeration
    + * + * + * * @return Price type information. */ public PriceTypeEnumeration getPriceType(); - /** * Quantity available. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * Not acceptable:
    + * <g:quantity>out of stock</g:quantity> * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
    - * quantity
    quantity
    - * Details The number of units available for purchase. This - * attribute can be left blank if you have a large quantity or if it is not - * applicable. Details The number of units available for purchase. This attribute can be left blank if you have a large quantity or if it is not + * applicable.
    - * Example - * Acceptable:
    + * + *     		Example Acceptable:
    * <g:quantity>18</g:quantity>
    - * + * * <g:quantity>0</g:quantity>
    - * - * Not acceptable:
    - * <g:quantity>out - * of stock</g:quantity>
    - * - * Attribute of - * Events, Products, - * Services, Travel, Vehicles + * + * Attribute of Events, Products, Services, Travel, Vehicles
    - * Content type - * - * integer Content type + * + * integer
    + * + * + * * @param quantity Quantity available. */ public void setQuantity(Integer quantity); /** * Quantity available. - * + * * - * - * - * - * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * Not acceptable:
    + * <g:quantity>out of stock</g:quantity> * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - *
    - * quantity
    quantity
    - * Details The number of units available for purchase. This - * attribute can be left blank if you have a large quantity or if it is not - * applicable. Details The number of units available for purchase. This attribute can be left blank if you have a large quantity or if it is not + * applicable.
    - * Example - * Acceptable:
    + * + *     		Example Acceptable:
    * <g:quantity>18</g:quantity>
    - * + * * <g:quantity>0</g:quantity>
    - * - * Not acceptable:
    - * <g:quantity>out - * of stock</g:quantity>
    - * - * Attribute of - * Events, Products, - * Services, Travel, Vehicles + * + * Attribute of Events, Products, Services, Travel, Vehicles
    - * Content type - * - * integer Content type + * + * integer
    + * + * + * * @return Quantity available. */ public Integer getQuantity(); /** * Shipping options available for an item. - * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - *
    - * - * shipping
    + * + * shipping
    - * Details - * Shipping options available for an item. Up to 10 - * shipping options can be included for each item. Three sub-attributes are - * included in the shipping attribute:
      - * - *
    • service = The type of service used to ship an item. Acceptable values are 'FedEx', 'UPS', 'DHL', 'Mail', and 'Other'
      • - *
    • country = The country an item will ship to. Only acceptable values are ISO 3166 country codes.
      • - *
    • price = - * the price of shipping.
    		 Details Shipping options available for an item. Up to 10 shipping options can be included for each item. Three sub-attributes are included + * in the shipping attribute: + *
      + * + *
    • service = The type of service used to ship an item. Acceptable values are 'FedEx', 'UPS', 'DHL', 'Mail', and 'Other'
      • + *
    • country = The country an item will ship to. Only acceptable values are ISO 3166 country codes.
      • + *
    • price = the price of shipping.
      • + *
    + *
    - * - * Example <g:shipping>
    - * <g:country>US</g:country>
    - * - * <g:service>UPS</g:shipping>
    - * - * <g:price>35.95</g:price>
    + *     		+ * + * Example <g:shipping>
    + * <g:country>US</g:country>
    + * + * <g:service>UPS</g:shipping>
    + * + * <g:price>35.95</g:price>
    * </g:shipping>
    - * Attribute of - * Products Attribute of Products
    - * - * Content type - * shippingType + * + * Content type shippingType
    + * + * + * * @param shipping Shipping options available for an item. */ public void setShipping(ShippingType[] shipping); /** * Shipping options available for an item. - * + * * - * - * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * + * * - *
    - * - * shipping
    + * + * shipping
    - * Details - * Shipping options available for an item. Up to 10 - * shipping options can be included for each item. Three sub-attributes are - * included in the shipping attribute:
      - * - *
    • service = The type of service used to ship an item. Acceptable values are 'FedEx', 'UPS', 'DHL', 'Mail', and 'Other'
      • - *
    • country = The country an item will ship to. Only acceptable values are ISO 3166 country codes.
      • - *
    • price = - * the price of shipping.
    		 Details Shipping options available for an item. Up to 10 shipping options can be included for each item. Three sub-attributes are included + * in the shipping attribute: + *
      + * + *
    • service = The type of service used to ship an item. Acceptable values are 'FedEx', 'UPS', 'DHL', 'Mail', and 'Other'
      • + *
    • country = The country an item will ship to. Only acceptable values are ISO 3166 country codes.
      • + *
    • price = the price of shipping.
      • + *
    + *
    - * - * Example <g:shipping>
    - * <g:country>US</g:country>
    - * - * <g:service>UPS</g:shipping>
    - * - * <g:price>35.95</g:price>
    + *     		+ * + * Example <g:shipping>
    + * <g:country>US</g:country>
    + * + * <g:service>UPS</g:shipping>
    + * + * <g:price>35.95</g:price>
    * </g:shipping>
    - * Attribute of - * Products Attribute of Products
    - * - * Content type - * shippingType + * + * Content type shippingType
    + * + * + * * @return Shipping options available for an item. */ public ShippingType[] getShipping(); - - /** * Tax rate associated with the item. - * + * * - * - * - * - * + * * - * - * + * + * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * + * + * * * - * - * - * - * + * + * + * + * * - *
    - * tax_percent
    - * - * Details - * Tax rate as a percentage. tax_percent
    + * + * Details Tax rate as a percentage.
    - * Example <g:tax_percent>8.2<g:/tax_percent> Example <g:tax_percent>8.2<g:/tax_percent>
    - * - * Attribute of - * - * Products, Events + * + * Attribute of + * + * Products, Events
    - * Content type - * percentType Content type percentType
    + * + * + * * @param taxPercent Tax rate associated with the event. */ public void setTaxPercent(Float taxPercent); /** - * Tax rate associated with the item. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
    - * tax_percent
    - * - * Details - * Tax rate as a percentage.
    - * Example <g:tax_percent>8.2<g:/tax_percent>
    - * - * Attribute of - * - * Products, Events
    - * Content type - * percentType
    - * @return Tax rate associated with the event. - */ + * Tax rate associated with the item. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    tax_percent
    + * + * Details Tax rate as a percentage.
    Example <g:tax_percent>8.2<g:/tax_percent>
    + * + * Attribute of + * + * Products, Events
    Content type percentType
    + * + * @return Tax rate associated with the event. + */ public Float getTaxPercent(); /** * Region where tax applies. - * - * - * + * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * - *
    - * - * tax_region
    - * Details - * Geographical region a tax rate - * applies to. + * + * tax_region
    Details Geographical region a tax rate applies to.
    - * - * Example <g:tax_region>California</g:tax_region> + * + * Example <g:tax_region>California</g:tax_region>
    - * Attribute of - * Product, - * Events, Attribute of Product, Events,
    - * Content typestring Content typestring
    + * + * + * * @param taxRegion Region where tax applies. */ public void setTaxRegion(String taxRegion); /** * Region where tax applies. - * - * - * + * + * + * * - * - * - * - * + * * - * - * - * + * + * + * + * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * - * + * * - * - * - * + * + * + * * - *
    - * - * tax_region
    - * Details - * Geographical region a tax rate - * applies to. + * + * tax_region
    Details Geographical region a tax rate applies to.
    - * - * Example <g:tax_region>California</g:tax_region> + * + * Example <g:tax_region>California</g:tax_region>
    - * Attribute of - * Product, - * Events, Attribute of Product, Events,
    - * Content typestring Content typestring
    + * + * + * * @return Region where tax applies. */ public String getTaxRegion(); - /** * The type of vehicle: Car, motorcycle, scooter, etc. * * - * - * + * + * + * vehicle_type * * * - * - * + * + * * * * - * - * + * Example + * * * * - * + * * - * + * * * - * - * + * + * string * - *
    + *
    * - * vehicle_type
    - * Details - * The type of vehicle: Car, motorcycle, scooter, etc. - * Details The type of vehicle: Car, motorcycle, scooter, etc.
    + * * - * Example <g:vehicle_type>truck</g:vehicle_type> <g:vehicle_type>truck</g:vehicle_type>
    - * Attribute of Attribute of - * Products Products
    + * * - * Content type + * Content type * - * string
    + * + * + * * @param vehicleType The type of vehicle: Car, motorcycle, scooter, etc. */ public void setVehicleType(String vehicleType); @@ -1660,43 +1550,41 @@ public interface Vehicle extends GlobalInterface { * The type of vehicle: Car, motorcycle, scooter, etc. * * - * - * + * + * + * vehicle_type * * * - * - * + * + * * * * - * - * + * Example + * * * * - * + * * - * + * * * - * - * + * + * string * - *
    + *
    * - * vehicle_type
    - * Details - * The type of vehicle: Car, motorcycle, scooter, etc. - * Details The type of vehicle: Car, motorcycle, scooter, etc.
    + * * - * Example <g:vehicle_type>truck</g:vehicle_type> <g:vehicle_type>truck</g:vehicle_type>
    - * Attribute of Attribute of - * Products Products
    + * * - * Content type + * Content type * - * string
    + * + * + * * @return The type of vehicle: Car, motorcycle, scooter, etc. */ public String getVehicleType(); @@ -1705,41 +1593,37 @@ public interface Vehicle extends GlobalInterface { * Vehicle Identification Number. * * - * + * + * * - * + * * * * - * - * + * + * * * * * - * - * + * + * * * * * - * - * + * + * * * - * - * + * Content type + * * - *
    - * vin vin
    - * Details - * Vehicle Identification Number. Details Vehicle Identification Number.
    - * Example <g:vin>1M8GDM9AXKP042788</g:vin> Example <g:vin>1M8GDM9AXKP042788</g:vin>
    - * Attribute of - * Vehicles Attribute of Vehicles
    + * * - * Content type - * string string
    + * + * + * * @param vin Vehicle Identification Number. */ public void setVin(String vin); @@ -1748,148 +1632,134 @@ public interface Vehicle extends GlobalInterface { * Vehicle Identification Number. * * - * + * + * * - * + * * * * - * - * + * + * * * * * - * - * + * + * * * * * - * - * + * + * * * - * - * + * Content type + * * - *
    - * vin vin
    - * Details - * Vehicle Identification Number. Details Vehicle Identification Number.
    - * Example <g:vin>1M8GDM9AXKP042788</g:vin> Example <g:vin>1M8GDM9AXKP042788</g:vin>
    - * Attribute of - * Vehicles Attribute of Vehicles
    + * * - * Content type - * string string
    + * + * + * * @return Vehicle Identification Number. */ public String getVin(); /** - * The four digit model year or year built. + * The four digit model year or year built. * * * * - * - * + * + * + * * * * - * + * * - * + * * * - * - * + * * * * - * - * + * + * * * * - * - * + * Content type + * * * - *
    - * year
    year
    - * Details Details - * The four digit model year or year built. Format - * YYYY The four digit model year or year built. Format YYYY
    + * * - * Example - * Acceptable:
    + * Example    		 Acceptable:
    * * <g:year>2005</g:year>
    - * Not acceptable:
    + * Not acceptable:
    * <g:year>79</g:year>
    * * <g:year>26</g:year>
    - * Attribute of - * Housing, Vehicles Attribute of Housing, Vehicles
    + * * - * Content type - * year year
    - * @param year The four digit model year or year built. + * + * + * + * @param year The four digit model year or year built. */ public void setYear(YearType year); /** - * The four digit model year or year built. + * The four digit model year or year built. * * * * - * - * + * + * + * * * * - * + * * - * + * * * - * - * + * * * * - * - * + * + * * * * - * - * + * Content type + * * * - *
    - * year
    year
    - * Details Details - * The four digit model year or year built. Format - * YYYY The four digit model year or year built. Format YYYY
    + * * - * Example - * Acceptable:
    + * Example    		 Acceptable:
    * * <g:year>2005</g:year>
    - * Not acceptable:
    + * Not acceptable:
    * <g:year>79</g:year>
    * * <g:year>26</g:year>
    - * Attribute of - * Housing, Vehicles Attribute of Housing, Vehicles
    + * * - * Content type - * year year
    - * @return The four digit model year or year built. + * + * + * + * @return The four digit model year or year built. */ public YearType getYear(); } diff --git a/src/main/java/org/rometools/feed/module/base/Wanted.java b/src/main/java/org/rometools/feed/module/base/Wanted.java index c3333c7..db77a3a 100644 --- a/src/main/java/org/rometools/feed/module/base/Wanted.java +++ b/src/main/java/org/rometools/feed/module/base/Wanted.java @@ -41,214 +41,205 @@ package org.rometools.feed.module.base; import org.rometools.feed.module.base.types.FloatUnit; - -/**This is an interface for the GoogleBase plug in that exposes methods used for - * wanted ads. - * +/** + * This is an interface for the GoogleBase plug in that exposes methods used for wanted ads. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ public interface Wanted extends GlobalInterface { /** * Additional instructions to explain the item’s delivery process. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
    delivery_notes
    Details Additional instructions to explain the item’s delivery process.
    Example - * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
    - * - *
    Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
    Content - * type string
    + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    delivery_notes
    DetailsAdditional instructions to explain the item’s delivery process.
    Example + * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
    + * + *
    Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
    Content typestring
    + * * @param deliveryNotes Additional instructions to explain the item’s delivery process. */ public void setDeliveryNotes(String deliveryNotes); /** * Additional instructions to explain the item’s delivery process. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
    delivery_notes
    Details Additional instructions to explain the item’s delivery process.
    Example - * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
    - * - *
    Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
    Content - * type string
    + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    delivery_notes
    DetailsAdditional instructions to explain the item’s delivery process.
    Example + * <g:delivery_notes>Items usually shipped within 24 hours.<g:/delivery_notes>
    + * + *
    Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
    Content typestring
    + * * @return Additional instructions to explain the item’s delivery process. */ public String getDeliveryNotes(); /** * The maximum distance you will deliver an item in any direction. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
    delivery_radius
    Details The maximum - * distance you will deliver an item in any direction.
    Example - * <g:delivery_radius>10<g:/delivery_radius> - * - *
    <g:delivery_radius>10km</g:delivery_radius>
    Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
    Content - * type floatUnit
    + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    delivery_radius
    DetailsThe maximum distance you will deliver an item in any direction.
    Example + * <g:delivery_radius>10<g:/delivery_radius>
    + * <g:delivery_radius>10km</g:delivery_radius>
    Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
    Content typefloatUnit
    + * * @param deliveryRadius The maximum distance you will deliver an item in any direction. */ public void setDeliveryRadius(FloatUnit deliveryRadius); /** * The maximum distance you will deliver an item in any direction. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
    delivery_radius
    Details The maximum - * distance you will deliver an item in any direction.
    Example - * <g:delivery_radius>10<g:/delivery_radius> - * - *
    <g:delivery_radius>10km</g:delivery_radius>
    Attribute - * of - * Events, Products, Reviews, Services, Travel, Vehicles, Wanted - * Ads.
    Content - * type floatUnit
    + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    delivery_radius
    DetailsThe maximum distance you will deliver an item in any direction.
    Example + * <g:delivery_radius>10<g:/delivery_radius>
    + * <g:delivery_radius>10km</g:delivery_radius>
    Attribute of + * Events, Products, Reviews, Services, Travel, Vehicles, Wanted Ads.
    Content typefloatUnit
    + * * @return The maximum distance you will deliver an item in any direction. */ public FloatUnit getDeliveryRadius(); -/** + /** * Location of the property. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * - * + * <g:location>123 Main St,, CA, 12345, + * USA</g:location>
    + * <g:location> Anytown, CA, 12345, + * USA</g:location> + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
    - * location
    location
    - * Details Location of a property. Should - * include street, city, state, postal code, and country, in that order. Details Location of a property. Should include street, city, state, postal code, and country, in that order.
    - * Example - * Acceptable:
    - * <g:location>123 Main St, Anytown, CA, 12345, USA</g:location>
    - * + *     		Example Acceptable:
    + * <g:location>123 Main St, Anytown, CA, 12345, + * USA</g:location>
    + * * Not acceptable:
    - * <g:location>123 Main St,, CA, 12345, USA</g:location>
    - * <g:location> - * Anytown, CA, 12345, USA</g:location>
    - * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
    - * Content type - * locationType Content type locationType
    + * + * + * * @param location Location of the property. */ public void setLocation(String location); @@ -256,49 +247,45 @@ public interface Wanted extends GlobalInterface { /** * Location of the property. * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * + * + * - * + * <g:location>123 Main St,, CA, 12345, + * USA</g:location>
    + * <g:location> Anytown, CA, 12345, + * USA</g:location> + * * * - * - * + * + * * - * + * * - * - * - * + * + * + * * - *
    - * location
    location
    - * Details Location of a property. Should - * include street, city, state, postal code, and country, in that order. Details Location of a property. Should include street, city, state, postal code, and country, in that order.
    - * Example - * Acceptable:
    - * <g:location>123 Main St, Anytown, CA, 12345, USA</g:location>
    - * + *     		Example Acceptable:
    + * <g:location>123 Main St, Anytown, CA, 12345, + * USA</g:location>
    + * * Not acceptable:
    - * <g:location>123 Main St,, CA, 12345, USA</g:location>
    - * <g:location> - * Anytown, CA, 12345, USA</g:location>
    - * Attribute of - * Reference Items, Events, Housing, Jobs, News and Articles, - * People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted Ads. Attribute of Reference Items, Events, Housing, Jobs, News and Articles, People profiles, Products, Reviews, Services, Travel, Vehicles, Wanted + * Ads.
    - * Content type - * locationType Content type locationType
    + * + * + * * @return Location of the property. */ public String getLocation(); diff --git a/src/main/java/org/rometools/feed/module/base/io/CustomTagGenerator.java b/src/main/java/org/rometools/feed/module/base/io/CustomTagGenerator.java index 6b76239..d8c4917 100644 --- a/src/main/java/org/rometools/feed/module/base/io/CustomTagGenerator.java +++ b/src/main/java/org/rometools/feed/module/base/io/CustomTagGenerator.java @@ -19,7 +19,13 @@ */ package org.rometools.feed.module.base.io; -import com.sun.syndication.feed.module.Module; +import java.net.URL; +import java.util.Date; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; + +import org.jdom2.Element; import org.rometools.feed.module.base.CustomTag; import org.rometools.feed.module.base.CustomTagImpl; import org.rometools.feed.module.base.CustomTags; @@ -27,18 +33,10 @@ import org.rometools.feed.module.base.types.DateTimeRange; import org.rometools.feed.module.base.types.FloatUnit; import org.rometools.feed.module.base.types.IntUnit; import org.rometools.feed.module.base.types.ShortDate; + +import com.sun.syndication.feed.module.Module; import com.sun.syndication.io.ModuleGenerator; -import org.jdom.Element; - -import java.net.URL; - -import java.util.Date; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; - - /** * @version $Revision: 1.1 $ * @author Robert "kebernet" Cooper @@ -62,72 +60,72 @@ public class CustomTagGenerator implements ModuleGenerator { return NAMESPACES; } - public void generate(Module module,Element element) { - if(!(module instanceof CustomTags)) { + public void generate(final Module module, final Element element) { + if (!(module instanceof CustomTags)) { return; } - List tags = ((CustomTags)module).getValues(); - Iterator it = tags.iterator(); + final List tags = ((CustomTags) module).getValues(); + final Iterator it = tags.iterator(); - while(it.hasNext()) { - CustomTag tag = (CustomTag)it.next(); + while (it.hasNext()) { + final CustomTag tag = (CustomTag) it.next(); - if(tag.getValue() instanceof DateTimeRange) { - DateTimeRange dtr = (DateTimeRange)tag.getValue(); - Element newTag = new Element(tag.getName(),CustomTagParser.NS); - newTag.setAttribute("type","dateTimeRange"); - newTag.addContent(this.generateSimpleElement("start",GoogleBaseParser.LONG_DT_FMT.format(dtr.getStart()))); - newTag.addContent(this.generateSimpleElement("end",GoogleBaseParser.LONG_DT_FMT.format(dtr.getEnd()))); + if (tag.getValue() instanceof DateTimeRange) { + final DateTimeRange dtr = (DateTimeRange) tag.getValue(); + final Element newTag = new Element(tag.getName(), CustomTagParser.NS); + newTag.setAttribute("type", "dateTimeRange"); + newTag.addContent(generateSimpleElement("start", GoogleBaseParser.LONG_DT_FMT.format(dtr.getStart()))); + newTag.addContent(generateSimpleElement("end", GoogleBaseParser.LONG_DT_FMT.format(dtr.getEnd()))); element.addContent(newTag); - } else if(tag.getValue() instanceof ShortDate) { - ShortDate sd = (ShortDate)tag.getValue(); - Element newTag = this.generateSimpleElement(tag.getName(),GoogleBaseParser.SHORT_DT_FMT.format(sd)); - newTag.setAttribute("type","date"); + } else if (tag.getValue() instanceof ShortDate) { + final ShortDate sd = (ShortDate) tag.getValue(); + final Element newTag = generateSimpleElement(tag.getName(), GoogleBaseParser.SHORT_DT_FMT.format(sd)); + newTag.setAttribute("type", "date"); element.addContent(newTag); - } else if(tag.getValue() instanceof Date) { - Date d = (Date)tag.getValue(); - Element newTag = this.generateSimpleElement(tag.getName(),GoogleBaseParser.SHORT_DT_FMT.format(d)); - newTag.setAttribute("type","dateTime"); + } else if (tag.getValue() instanceof Date) { + final Date d = (Date) tag.getValue(); + final Element newTag = generateSimpleElement(tag.getName(), GoogleBaseParser.SHORT_DT_FMT.format(d)); + newTag.setAttribute("type", "dateTime"); element.addContent(newTag); - } else if(tag.getValue() instanceof Integer) { - Element newTag = this.generateSimpleElement(tag.getName(),tag.getValue().toString()); - newTag.setAttribute("type","int"); + } else if (tag.getValue() instanceof Integer) { + final Element newTag = generateSimpleElement(tag.getName(), tag.getValue().toString()); + newTag.setAttribute("type", "int"); element.addContent(newTag); - } else if(tag.getValue() instanceof IntUnit) { - Element newTag = this.generateSimpleElement(tag.getName(),tag.getValue().toString()); - newTag.setAttribute("type","intUnit"); + } else if (tag.getValue() instanceof IntUnit) { + final Element newTag = generateSimpleElement(tag.getName(), tag.getValue().toString()); + newTag.setAttribute("type", "intUnit"); element.addContent(newTag); - } else if(tag.getValue() instanceof Float) { - Element newTag = this.generateSimpleElement(tag.getName(),tag.getValue().toString()); - newTag.setAttribute("type","float"); + } else if (tag.getValue() instanceof Float) { + final Element newTag = generateSimpleElement(tag.getName(), tag.getValue().toString()); + newTag.setAttribute("type", "float"); element.addContent(newTag); - } else if(tag.getValue() instanceof FloatUnit) { - Element newTag = this.generateSimpleElement(tag.getName(),tag.getValue().toString()); - newTag.setAttribute("type","floatUnit"); + } else if (tag.getValue() instanceof FloatUnit) { + final Element newTag = generateSimpleElement(tag.getName(), tag.getValue().toString()); + newTag.setAttribute("type", "floatUnit"); element.addContent(newTag); - } else if(tag.getValue() instanceof String) { - Element newTag = this.generateSimpleElement(tag.getName(),tag.getValue().toString()); - newTag.setAttribute("type","string"); + } else if (tag.getValue() instanceof String) { + final Element newTag = generateSimpleElement(tag.getName(), tag.getValue().toString()); + newTag.setAttribute("type", "string"); element.addContent(newTag); - } else if(tag.getValue() instanceof URL) { - Element newTag = this.generateSimpleElement(tag.getName(),tag.getValue().toString()); - newTag.setAttribute("type","url"); + } else if (tag.getValue() instanceof URL) { + final Element newTag = generateSimpleElement(tag.getName(), tag.getValue().toString()); + newTag.setAttribute("type", "url"); element.addContent(newTag); - } else if(tag.getValue() instanceof Boolean) { - Element newTag = this.generateSimpleElement(tag.getName(),tag.getValue().toString()); - newTag.setAttribute("type","boolean"); + } else if (tag.getValue() instanceof Boolean) { + final Element newTag = generateSimpleElement(tag.getName(), tag.getValue().toString()); + newTag.setAttribute("type", "boolean"); element.addContent(newTag); - } else if( tag.getValue() instanceof CustomTagImpl.Location ){ - Element newTag = this.generateSimpleElement(tag.getName(),tag.getValue().toString()); - newTag.setAttribute("type","location"); + } else if (tag.getValue() instanceof CustomTagImpl.Location) { + final Element newTag = generateSimpleElement(tag.getName(), tag.getValue().toString()); + newTag.setAttribute("type", "location"); element.addContent(newTag); - } + } } } - protected Element generateSimpleElement(String name,String value) { - Element element = new Element(name,CustomTagParser.NS); + protected Element generateSimpleElement(final String name, final String value) { + final Element element = new Element(name, CustomTagParser.NS); element.addContent(value); return element; diff --git a/src/main/java/org/rometools/feed/module/base/io/CustomTagParser.java b/src/main/java/org/rometools/feed/module/base/io/CustomTagParser.java index db13c79..c7e5a02 100644 --- a/src/main/java/org/rometools/feed/module/base/io/CustomTagParser.java +++ b/src/main/java/org/rometools/feed/module/base/io/CustomTagParser.java @@ -20,16 +20,6 @@ package org.rometools.feed.module.base.io; -import com.sun.syndication.feed.module.Module; -import org.rometools.feed.module.base.CustomTagImpl; -import org.rometools.feed.module.base.CustomTags; -import org.rometools.feed.module.base.CustomTagsImpl; -import org.rometools.feed.module.base.types.DateTimeRange; -import org.rometools.feed.module.base.types.FloatUnit; -import org.rometools.feed.module.base.types.IntUnit; -import org.rometools.feed.module.base.types.ShortDate; -import com.sun.syndication.io.ModuleParser; - import java.net.MalformedURLException; import java.net.URL; import java.text.ParseException; @@ -38,85 +28,98 @@ import java.util.Iterator; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import org.jdom.Element; -import org.jdom.Namespace; + +import org.jdom2.Element; +import org.jdom2.Namespace; +import org.rometools.feed.module.base.CustomTagImpl; +import org.rometools.feed.module.base.CustomTags; +import org.rometools.feed.module.base.CustomTagsImpl; +import org.rometools.feed.module.base.types.DateTimeRange; +import org.rometools.feed.module.base.types.FloatUnit; +import org.rometools.feed.module.base.types.IntUnit; +import org.rometools.feed.module.base.types.ShortDate; + +import com.sun.syndication.feed.module.Module; +import com.sun.syndication.io.ModuleParser; /** * @version $Revision: 1.4 $ * @author Robert "kebernet" Cooper */ -public class CustomTagParser implements ModuleParser { +public class CustomTagParser implements ModuleParser { private static final Logger log = Logger.getAnonymousLogger(); - - static final Namespace NS = Namespace.getNamespace( "g-custom", CustomTags.URI ); - + + static final Namespace NS = Namespace.getNamespace("g-custom", CustomTags.URI); + /** Creates a new instance of CustomTagParser */ public CustomTagParser() { } - - public Module parse(Element element) { - CustomTags module = new CustomTagsImpl(); - ArrayList tags = new ArrayList(); - List elements = element.getChildren(); - Iterator it = elements.iterator(); - while( it.hasNext() ){ - Element child = (Element) it.next(); - if( child.getNamespace().equals( NS ) ){ - String type = child.getAttributeValue( "type" ); - try{ - if( type == null ){ - continue; - } else if( type.equals( "string") ){ - tags.add( new CustomTagImpl( child.getName(), child.getText() ) ); - } else if( type.equals( "int") ){ - tags.add( new CustomTagImpl( child.getName(), new Integer( child.getTextTrim() ))); - } else if( type.equals( "float") ){ - tags.add( new CustomTagImpl( child.getName(), new Float( child.getTextTrim() ) ) ); - } else if( type.equals("intUnit") ){ - tags.add( new CustomTagImpl( child.getName(), new IntUnit( child.getTextTrim()) ) ); - } else if( type.equals( "floatUnit") ){ - tags.add( new CustomTagImpl( child.getName(), new FloatUnit( child.getTextTrim()) ) ); - } else if( type.equals( "date") ){ - try{ - tags.add( new CustomTagImpl( child.getName(), new ShortDate( GoogleBaseParser.SHORT_DT_FMT.parse( child.getTextTrim()))) ); - } catch( ParseException e ){ - log.log( Level.WARNING, "Unable to parse date type on "+child.getName(), e ); - } - } else if( type.equals( "dateTime") ){ - try{ - tags.add( new CustomTagImpl( child.getName(), GoogleBaseParser.LONG_DT_FMT.parse( child.getTextTrim() ))); - } catch(ParseException e){ - log.log( Level.WARNING, "Unable to parse date type on "+child.getName(), e ); - } - } else if( type.equals( "dateTimeRange") ){ - try{ - tags.add( new CustomTagImpl( child.getName(), new DateTimeRange(GoogleBaseParser.LONG_DT_FMT.parse(child.getChild("start",CustomTagParser.NS).getText().trim()),GoogleBaseParser.LONG_DT_FMT.parse(child.getChild("end",CustomTagParser.NS).getText().trim())))); - } catch(Exception e){ - log.log( Level.WARNING, "Unable to parse date type on "+child.getName(), e ); - } - } else if( type.equals( "url") ){ - try{ - tags.add( new CustomTagImpl( child.getName(), new URL( child.getTextTrim() )) ); - } catch( MalformedURLException e){ - log.log( Level.WARNING, "Unable to parse URL type on "+child.getName(), e ); - } - } else if( type.equals( "boolean") ){ - tags.add( new CustomTagImpl( child.getName(), new Boolean( child.getTextTrim().toLowerCase()) )); - } else if( type.equals( "location") ) { - tags.add( new CustomTagImpl( child.getName(), new CustomTagImpl.Location( child.getText() ))); - } else { - throw new Exception( "Unknown type: "+ type ); - } - } catch(Exception e){ - log.log( Level.WARNING, "Unable to parse type on "+child.getName(), e ); - } - } - } - module.setValues( tags ); - return module; + + public Module parse(final Element element) { + final CustomTags module = new CustomTagsImpl(); + final ArrayList tags = new ArrayList(); + final List elements = element.getChildren(); + final Iterator it = elements.iterator(); + while (it.hasNext()) { + final Element child = (Element) it.next(); + if (child.getNamespace().equals(NS)) { + final String type = child.getAttributeValue("type"); + try { + if (type == null) { + continue; + } else if (type.equals("string")) { + tags.add(new CustomTagImpl(child.getName(), child.getText())); + } else if (type.equals("int")) { + tags.add(new CustomTagImpl(child.getName(), new Integer(child.getTextTrim()))); + } else if (type.equals("float")) { + tags.add(new CustomTagImpl(child.getName(), new Float(child.getTextTrim()))); + } else if (type.equals("intUnit")) { + tags.add(new CustomTagImpl(child.getName(), new IntUnit(child.getTextTrim()))); + } else if (type.equals("floatUnit")) { + tags.add(new CustomTagImpl(child.getName(), new FloatUnit(child.getTextTrim()))); + } else if (type.equals("date")) { + try { + tags.add(new CustomTagImpl(child.getName(), new ShortDate(GoogleBaseParser.SHORT_DT_FMT.parse(child.getTextTrim())))); + } catch (final ParseException e) { + log.log(Level.WARNING, "Unable to parse date type on " + child.getName(), e); + } + } else if (type.equals("dateTime")) { + try { + tags.add(new CustomTagImpl(child.getName(), GoogleBaseParser.LONG_DT_FMT.parse(child.getTextTrim()))); + } catch (final ParseException e) { + log.log(Level.WARNING, "Unable to parse date type on " + child.getName(), e); + } + } else if (type.equals("dateTimeRange")) { + try { + tags.add(new CustomTagImpl(child.getName(), new DateTimeRange(GoogleBaseParser.LONG_DT_FMT.parse(child + .getChild("start", CustomTagParser.NS).getText().trim()), GoogleBaseParser.LONG_DT_FMT.parse(child + .getChild("end", CustomTagParser.NS).getText().trim())))); + } catch (final Exception e) { + log.log(Level.WARNING, "Unable to parse date type on " + child.getName(), e); + } + } else if (type.equals("url")) { + try { + tags.add(new CustomTagImpl(child.getName(), new URL(child.getTextTrim()))); + } catch (final MalformedURLException e) { + log.log(Level.WARNING, "Unable to parse URL type on " + child.getName(), e); + } + } else if (type.equals("boolean")) { + tags.add(new CustomTagImpl(child.getName(), new Boolean(child.getTextTrim().toLowerCase()))); + } else if (type.equals("location")) { + tags.add(new CustomTagImpl(child.getName(), new CustomTagImpl.Location(child.getText()))); + } else { + throw new Exception("Unknown type: " + type); + } + } catch (final Exception e) { + log.log(Level.WARNING, "Unable to parse type on " + child.getName(), e); + } + } + } + module.setValues(tags); + return module; } - + public String getNamespaceUri() { - return CustomTags.URI; + return CustomTags.URI; } } diff --git a/src/main/java/org/rometools/feed/module/base/io/GoogleBaseGenerator.java b/src/main/java/org/rometools/feed/module/base/io/GoogleBaseGenerator.java index a57e8d4..3f221c7 100644 --- a/src/main/java/org/rometools/feed/module/base/io/GoogleBaseGenerator.java +++ b/src/main/java/org/rometools/feed/module/base/io/GoogleBaseGenerator.java @@ -39,9 +39,15 @@ */ package org.rometools.feed.module.base.io; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleGenerator; +import java.beans.PropertyDescriptor; +import java.net.URL; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Set; +import org.jdom2.Element; +import org.jdom2.Namespace; import org.rometools.feed.module.base.GoogleBase; import org.rometools.feed.module.base.GoogleBaseImpl; import org.rometools.feed.module.base.types.CurrencyEnumeration; @@ -56,111 +62,101 @@ import org.rometools.feed.module.base.types.ShortDate; import org.rometools.feed.module.base.types.Size; import org.rometools.feed.module.base.types.YearType; -import org.jdom.Element; -import org.jdom.Namespace; - -import java.beans.PropertyDescriptor; - -import java.net.URL; - -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Set; - +import com.sun.syndication.feed.module.Module; +import com.sun.syndication.io.ModuleGenerator; /** - * + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ public class GoogleBaseGenerator implements ModuleGenerator { - private static final Namespace NS = Namespace.getNamespace("g-core",GoogleBase.URI); - + private static final Namespace NS = Namespace.getNamespace("g-core", GoogleBase.URI); + /** Creates a new instance of GoogleBaseGenerator */ public GoogleBaseGenerator() { - super(); + super(); } - + public String getNamespaceUri() { - return GoogleBase.URI; + return GoogleBase.URI; } - + public Set getNamespaces() { - HashSet set = new HashSet(); - set.add(GoogleBaseGenerator.NS); - - return set; + final HashSet set = new HashSet(); + set.add(GoogleBaseGenerator.NS); + + return set; } - - public void generate(Module module,Element element) { - GoogleBaseImpl mod = (GoogleBaseImpl)module; - HashMap props2tags = new HashMap(GoogleBaseParser.PROPS2TAGS); - PropertyDescriptor[] pds = GoogleBaseParser.pds; - - for(int i = 0; i < pds.length; i++) { - String tagName = (String)props2tags.get(pds[i].getName()); - - if(tagName == null) { - continue; - } - - Object[] values = null; - - try { - if(pds[i].getPropertyType().isArray()) { - values = (Object[])pds[i].getReadMethod().invoke(mod,(Object[])null); - } else { - values = new Object[] { - pds[i].getReadMethod().invoke(mod,(Object[])null) - }; - } - - for(int j = 0; (values != null)&&(j < values.length); j++) { - if(values[j] != null) { - element.addContent(this.generateTag(values[j],tagName)); - } - } - } catch(Exception e) { - e.printStackTrace(); - } - } + + public void generate(final Module module, final Element element) { + final GoogleBaseImpl mod = (GoogleBaseImpl) module; + final HashMap props2tags = new HashMap(GoogleBaseParser.PROPS2TAGS); + final PropertyDescriptor[] pds = GoogleBaseParser.pds; + + for (final PropertyDescriptor pd : pds) { + final String tagName = (String) props2tags.get(pd.getName()); + + if (tagName == null) { + continue; + } + + Object[] values = null; + + try { + if (pd.getPropertyType().isArray()) { + values = (Object[]) pd.getReadMethod().invoke(mod, (Object[]) null); + } else { + values = new Object[] { pd.getReadMethod().invoke(mod, (Object[]) null) }; + } + + for (int j = 0; values != null && j < values.length; j++) { + if (values[j] != null) { + element.addContent(generateTag(values[j], tagName)); + } + } + } catch (final Exception e) { + e.printStackTrace(); + } + } } - - public Element generateTag(Object o,String tagName) { - if(o instanceof URL||o instanceof Float||o instanceof Boolean||o instanceof Integer||o instanceof String||o instanceof FloatUnit||o instanceof IntUnit||o instanceof GenderEnumeration||o instanceof PaymentTypeEnumeration||o instanceof PriceTypeEnumeration||o instanceof CurrencyEnumeration||o instanceof Size||o instanceof YearType) { - return this.generateSimpleElement(tagName,o.toString()); - } else if(o instanceof ShortDate) { - return this.generateSimpleElement(tagName,GoogleBaseParser.SHORT_DT_FMT.format(o)); - } else if(o instanceof Date) { - return this.generateSimpleElement(tagName,GoogleBaseParser.LONG_DT_FMT.format(o)); - } else if(o instanceof ShippingType) { - ShippingType st = (ShippingType)o; - Element element = new Element(tagName,GoogleBaseGenerator.NS); - - element.addContent(this.generateSimpleElement("country",st.getCountry())); - - element.addContent(this.generateSimpleElement("service", st.getService().toString() )); - - element.addContent(this.generateSimpleElement("price",st.getPrice().toString())); - - return element; - } else if(o instanceof DateTimeRange) { - DateTimeRange dtr = (DateTimeRange)o; - Element element = new Element(tagName,GoogleBaseGenerator.NS); - element.addContent(this.generateSimpleElement("start",GoogleBaseParser.LONG_DT_FMT.format(dtr.getStart()))); - element.addContent(this.generateSimpleElement("end",GoogleBaseParser.LONG_DT_FMT.format(dtr.getEnd()))); - - return element; - } - - throw new RuntimeException("Unknown class type to handle: " + o.getClass().getName()); + + public Element generateTag(final Object o, final String tagName) { + if (o instanceof URL || o instanceof Float || o instanceof Boolean || o instanceof Integer || o instanceof String || o instanceof FloatUnit + || o instanceof IntUnit || o instanceof GenderEnumeration || o instanceof PaymentTypeEnumeration || o instanceof PriceTypeEnumeration + || o instanceof CurrencyEnumeration || o instanceof Size || o instanceof YearType) { + return generateSimpleElement(tagName, o.toString()); + } else if (o instanceof ShortDate) { + return generateSimpleElement(tagName, GoogleBaseParser.SHORT_DT_FMT.format(o)); + } else if (o instanceof Date) { + return generateSimpleElement(tagName, GoogleBaseParser.LONG_DT_FMT.format(o)); + } else if (o instanceof ShippingType) { + final ShippingType st = (ShippingType) o; + final Element element = new Element(tagName, GoogleBaseGenerator.NS); + + element.addContent(generateSimpleElement("country", st.getCountry())); + + element.addContent(generateSimpleElement("service", st.getService().toString())); + + element.addContent(generateSimpleElement("price", st.getPrice().toString())); + + return element; + } else if (o instanceof DateTimeRange) { + final DateTimeRange dtr = (DateTimeRange) o; + final Element element = new Element(tagName, GoogleBaseGenerator.NS); + element.addContent(generateSimpleElement("start", GoogleBaseParser.LONG_DT_FMT.format(dtr.getStart()))); + element.addContent(generateSimpleElement("end", GoogleBaseParser.LONG_DT_FMT.format(dtr.getEnd()))); + + return element; + } + + throw new RuntimeException("Unknown class type to handle: " + o.getClass().getName()); } - - protected Element generateSimpleElement(String name,String value) { - Element element = new Element(name,GoogleBaseGenerator.NS); - element.addContent(value); - - return element; + + protected Element generateSimpleElement(final String name, final String value) { + final Element element = new Element(name, GoogleBaseGenerator.NS); + element.addContent(value); + + return element; } } diff --git a/src/main/java/org/rometools/feed/module/base/io/GoogleBaseParser.java b/src/main/java/org/rometools/feed/module/base/io/GoogleBaseParser.java index e4e93c0..940a2cf 100644 --- a/src/main/java/org/rometools/feed/module/base/io/GoogleBaseParser.java +++ b/src/main/java/org/rometools/feed/module/base/io/GoogleBaseParser.java @@ -39,10 +39,25 @@ */ package org.rometools.feed.module.base.io; -import com.sun.syndication.feed.module.Module; +import java.beans.IntrospectionException; +import java.beans.Introspector; +import java.beans.PropertyDescriptor; +import java.io.IOException; +import java.lang.reflect.Array; +import java.net.URL; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.jdom2.Element; +import org.jdom2.Namespace; import org.rometools.feed.module.base.GoogleBase; import org.rometools.feed.module.base.GoogleBaseImpl; -import com.sun.syndication.io.ModuleParser; import org.rometools.feed.module.base.types.CurrencyEnumeration; import org.rometools.feed.module.base.types.DateTimeRange; import org.rometools.feed.module.base.types.FloatUnit; @@ -54,34 +69,13 @@ import org.rometools.feed.module.base.types.ShippingType; import org.rometools.feed.module.base.types.Size; import org.rometools.feed.module.base.types.YearType; -import org.jdom.Element; -import org.jdom.Namespace; - -import java.beans.IntrospectionException; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; - -import java.io.IOException; - -import java.lang.reflect.Array; - -import java.net.URL; - -import java.text.SimpleDateFormat; - -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Properties; -import java.util.logging.Level; -import java.util.logging.Logger; +import com.sun.syndication.feed.module.Module; +import com.sun.syndication.io.ModuleParser; /** * DOCUMENT ME! - * - * @author Robert "kebernet" - * Cooper + * + * @author Robert "kebernet" Cooper * @version $Revision: 1.3 $ */ public class GoogleBaseParser implements ModuleParser { @@ -98,12 +92,12 @@ public class GoogleBaseParser implements ModuleParser { try { pds = Introspector.getBeanInfo(GoogleBaseImpl.class).getPropertyDescriptors(); PROPS2TAGS.load(GoogleBaseParser.class.getResourceAsStream("/org/rometools/feed/module/base/io/tags.properties")); - } catch(IOException e) { + } catch (final IOException e) { e.printStackTrace(); - log.log(Level.SEVERE,"Unable to read properties file for Google Base tags!",e); - } catch(IntrospectionException e) { + log.log(Level.SEVERE, "Unable to read properties file for Google Base tags!", e); + } catch (final IntrospectionException e) { e.printStackTrace(); - log.log(Level.SEVERE,"Unable to get property descriptors for GoogleBaseImpl!",e); + log.log(Level.SEVERE, "Unable to get property descriptors for GoogleBaseImpl!", e); } } @@ -114,39 +108,38 @@ public class GoogleBaseParser implements ModuleParser { super(); } - public Module parse(Element element) { - HashMap tag2pd = new HashMap(); - GoogleBaseImpl module = new GoogleBaseImpl(); + public Module parse(final Element element) { + final HashMap tag2pd = new HashMap(); + final GoogleBaseImpl module = new GoogleBaseImpl(); try { - for(int i = 0; i < pds.length; i++) { - PropertyDescriptor pd = pds[i]; - String tagName = GoogleBaseParser.PROPS2TAGS.getProperty(pd.getName()); + for (final PropertyDescriptor pd : pds) { + final String tagName = GoogleBaseParser.PROPS2TAGS.getProperty(pd.getName()); - if(tagName == null) { - log.log(Level.FINE,"Property: " + pd.getName() + " doesn't have a tag mapping. "); + if (tagName == null) { + log.log(Level.FINE, "Property: " + pd.getName() + " doesn't have a tag mapping. "); } else { - tag2pd.put(tagName,pd); + tag2pd.put(tagName, pd); } } - } catch(Exception e) { - throw new RuntimeException("Exception building tag to property mapping. ",e); + } catch (final Exception e) { + throw new RuntimeException("Exception building tag to property mapping. ", e); } - List children = element.getChildren(); - Iterator it = children.iterator(); + final List children = element.getChildren(); + final Iterator it = children.iterator(); - while(it.hasNext()) { - Element child = (Element)it.next(); + while (it.hasNext()) { + final Element child = (Element) it.next(); - if(child.getNamespace().equals(GoogleBaseParser.NS)) { - PropertyDescriptor pd = (PropertyDescriptor)tag2pd.get(child.getName()); + if (child.getNamespace().equals(GoogleBaseParser.NS)) { + final PropertyDescriptor pd = (PropertyDescriptor) tag2pd.get(child.getName()); - if(pd != null) { + if (pd != null) { try { - this.handleTag(child,pd,module); - } catch(Exception e) { - log.log(Level.WARNING,"Unable to handle tag: " + child.getName(),e); + handleTag(child, pd, module); + } catch (final Exception e) { + log.log(Level.WARNING, "Unable to handle tag: " + child.getName(), e); e.printStackTrace(); } } @@ -156,13 +149,13 @@ public class GoogleBaseParser implements ModuleParser { return module; } - public static String stripNonValidCharacters(char[] validCharacters,String input) { - StringBuffer newString = new StringBuffer(); + public static String stripNonValidCharacters(final char[] validCharacters, final String input) { + final StringBuffer newString = new StringBuffer(); - for(int i = 0; i < input.length(); i++) { - for(int j = 0; j < validCharacters.length; j++) { - if(input.charAt(i) == validCharacters[j]) { - newString.append(validCharacters[j]); + for (int i = 0; i < input.length(); i++) { + for (final char validCharacter : validCharacters) { + if (input.charAt(i) == validCharacter) { + newString.append(validCharacter); } } } @@ -174,72 +167,74 @@ public class GoogleBaseParser implements ModuleParser { return GoogleBase.URI; } - private void handleTag(Element tag,PropertyDescriptor pd,GoogleBase module) throws Exception { + private void handleTag(final Element tag, final PropertyDescriptor pd, final GoogleBase module) throws Exception { Object tagValue = null; - if((pd.getPropertyType() == Integer.class)||(pd.getPropertyType().getComponentType() == Integer.class)) { - tagValue = new Integer(GoogleBaseParser.stripNonValidCharacters(GoogleBaseParser.INTEGER_CHARS,tag.getText())); - } else if((pd.getPropertyType() == Float.class)||(pd.getPropertyType().getComponentType() == Float.class)) { - tagValue = new Float(GoogleBaseParser.stripNonValidCharacters(GoogleBaseParser.FLOAT_CHARS,tag.getText())); - } else if((pd.getPropertyType() == String.class)||(pd.getPropertyType().getComponentType() == String.class)) { + if (pd.getPropertyType() == Integer.class || pd.getPropertyType().getComponentType() == Integer.class) { + tagValue = new Integer(GoogleBaseParser.stripNonValidCharacters(GoogleBaseParser.INTEGER_CHARS, tag.getText())); + } else if (pd.getPropertyType() == Float.class || pd.getPropertyType().getComponentType() == Float.class) { + tagValue = new Float(GoogleBaseParser.stripNonValidCharacters(GoogleBaseParser.FLOAT_CHARS, tag.getText())); + } else if (pd.getPropertyType() == String.class || pd.getPropertyType().getComponentType() == String.class) { tagValue = tag.getText(); - } else if((pd.getPropertyType() == URL.class)||(pd.getPropertyType().getComponentType() == URL.class)) { + } else if (pd.getPropertyType() == URL.class || pd.getPropertyType().getComponentType() == URL.class) { tagValue = new URL(tag.getText().trim()); - } else if((pd.getPropertyType() == Boolean.class)||(pd.getPropertyType().getComponentType() == Boolean.class)) { + } else if (pd.getPropertyType() == Boolean.class || pd.getPropertyType().getComponentType() == Boolean.class) { tagValue = new Boolean(tag.getText().trim()); - } else if((pd.getPropertyType() == Date.class)||(pd.getPropertyType().getComponentType() == Date.class)) { - String text = tag.getText().trim(); + } else if (pd.getPropertyType() == Date.class || pd.getPropertyType().getComponentType() == Date.class) { + final String text = tag.getText().trim(); - if(text.length() > 10) { + if (text.length() > 10) { tagValue = GoogleBaseParser.LONG_DT_FMT.parse(text); } else { tagValue = GoogleBaseParser.SHORT_DT_FMT.parse(text); } - } else if((pd.getPropertyType() == IntUnit.class)||(pd.getPropertyType().getComponentType() == IntUnit.class)) { + } else if (pd.getPropertyType() == IntUnit.class || pd.getPropertyType().getComponentType() == IntUnit.class) { tagValue = new IntUnit(tag.getText()); - } else if((pd.getPropertyType() == FloatUnit.class)||(pd.getPropertyType().getComponentType() == FloatUnit.class)) { + } else if (pd.getPropertyType() == FloatUnit.class || pd.getPropertyType().getComponentType() == FloatUnit.class) { tagValue = new FloatUnit(tag.getText()); - } else if((pd.getPropertyType() == DateTimeRange.class)||(pd.getPropertyType().getComponentType() == DateTimeRange.class)) { - tagValue = new DateTimeRange(LONG_DT_FMT.parse(tag.getChild("start",GoogleBaseParser.NS).getText().trim()),LONG_DT_FMT.parse(tag.getChild("end",GoogleBaseParser.NS).getText().trim())); - } else if((pd.getPropertyType() == ShippingType.class)||(pd.getPropertyType().getComponentType() == ShippingType.class)) { - FloatUnit price = new FloatUnit(tag.getChild("price",GoogleBaseParser.NS).getText().trim()); - ShippingType.ServiceEnumeration service = ShippingType.ServiceEnumeration.findByValue(tag.getChild("service",GoogleBaseParser.NS).getText().trim()); + } else if (pd.getPropertyType() == DateTimeRange.class || pd.getPropertyType().getComponentType() == DateTimeRange.class) { + tagValue = new DateTimeRange(LONG_DT_FMT.parse(tag.getChild("start", GoogleBaseParser.NS).getText().trim()), LONG_DT_FMT.parse(tag + .getChild("end", GoogleBaseParser.NS).getText().trim())); + } else if (pd.getPropertyType() == ShippingType.class || pd.getPropertyType().getComponentType() == ShippingType.class) { + final FloatUnit price = new FloatUnit(tag.getChild("price", GoogleBaseParser.NS).getText().trim()); + ShippingType.ServiceEnumeration service = ShippingType.ServiceEnumeration + .findByValue(tag.getChild("service", GoogleBaseParser.NS).getText().trim()); - if(service == null) { + if (service == null) { service = ShippingType.ServiceEnumeration.STANDARD; } - String country = tag.getChild("country",GoogleBaseParser.NS).getText().trim(); - tagValue = new ShippingType(price,service,country); - } else if((pd.getPropertyType() == PaymentTypeEnumeration.class)||(pd.getPropertyType().getComponentType() == PaymentTypeEnumeration.class)) { + final String country = tag.getChild("country", GoogleBaseParser.NS).getText().trim(); + tagValue = new ShippingType(price, service, country); + } else if (pd.getPropertyType() == PaymentTypeEnumeration.class || pd.getPropertyType().getComponentType() == PaymentTypeEnumeration.class) { tagValue = PaymentTypeEnumeration.findByValue(tag.getText().trim()); - } else if((pd.getPropertyType() == PriceTypeEnumeration.class)||(pd.getPropertyType().getComponentType() == PriceTypeEnumeration.class)) { + } else if (pd.getPropertyType() == PriceTypeEnumeration.class || pd.getPropertyType().getComponentType() == PriceTypeEnumeration.class) { tagValue = PriceTypeEnumeration.findByValue(tag.getText().trim()); - } else if((pd.getPropertyType() == CurrencyEnumeration.class)||(pd.getPropertyType().getComponentType() == CurrencyEnumeration.class)) { + } else if (pd.getPropertyType() == CurrencyEnumeration.class || pd.getPropertyType().getComponentType() == CurrencyEnumeration.class) { tagValue = CurrencyEnumeration.findByValue(tag.getText().trim()); - } else if((pd.getPropertyType() == GenderEnumeration.class)||(pd.getPropertyType().getComponentType() == GenderEnumeration.class)) { + } else if (pd.getPropertyType() == GenderEnumeration.class || pd.getPropertyType().getComponentType() == GenderEnumeration.class) { tagValue = GenderEnumeration.findByValue(tag.getText().trim()); - } else if((pd.getPropertyType() == YearType.class)||(pd.getPropertyType().getComponentType() == YearType.class)) { + } else if (pd.getPropertyType() == YearType.class || pd.getPropertyType().getComponentType() == YearType.class) { tagValue = new YearType(tag.getText().trim()); - } else if((pd.getPropertyType() == Size.class)||(pd.getPropertyType().getComponentType() == Size.class)) { + } else if (pd.getPropertyType() == Size.class || pd.getPropertyType().getComponentType() == Size.class) { tagValue = new Size(tag.getText().trim()); - } + } - if(!pd.getPropertyType().isArray()) { - pd.getWriteMethod().invoke(module,new Object[] {tagValue}); + if (!pd.getPropertyType().isArray()) { + pd.getWriteMethod().invoke(module, new Object[] { tagValue }); } else { - Object[] current = (Object[])pd.getReadMethod().invoke(module,(Object[])null); - int newSize = (current == null) ? 1 : (current.length + 1); - Object setValue = Array.newInstance(pd.getPropertyType().getComponentType(),newSize); + final Object[] current = (Object[]) pd.getReadMethod().invoke(module, (Object[]) null); + final int newSize = current == null ? 1 : current.length + 1; + final Object setValue = Array.newInstance(pd.getPropertyType().getComponentType(), newSize); int i = 0; - for(; (current != null)&&(i < current.length); i++) { - Array.set(setValue,i,current[i]); + for (; current != null && i < current.length; i++) { + Array.set(setValue, i, current[i]); } - Array.set(setValue,i,tagValue); - pd.getWriteMethod().invoke(module,new Object[] {setValue}); + Array.set(setValue, i, tagValue); + pd.getWriteMethod().invoke(module, new Object[] { setValue }); } } } diff --git a/src/main/java/org/rometools/feed/module/base/types/CloneableType.java b/src/main/java/org/rometools/feed/module/base/types/CloneableType.java index f4a4064..3ab9d34 100644 --- a/src/main/java/org/rometools/feed/module/base/types/CloneableType.java +++ b/src/main/java/org/rometools/feed/module/base/types/CloneableType.java @@ -39,9 +39,9 @@ */ package org.rometools.feed.module.base.types; - /** * This is just a holder interface for cloneable elements. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ diff --git a/src/main/java/org/rometools/feed/module/base/types/CurrencyEnumeration.java b/src/main/java/org/rometools/feed/module/base/types/CurrencyEnumeration.java index 82fab93..3701ae0 100644 --- a/src/main/java/org/rometools/feed/module/base/types/CurrencyEnumeration.java +++ b/src/main/java/org/rometools/feed/module/base/types/CurrencyEnumeration.java @@ -41,558 +41,559 @@ package org.rometools.feed.module.base.types; import java.util.HashMap; - /** * An Enumeration of valid currency types. - * + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ public class CurrencyEnumeration { private static final HashMap lookup = new HashMap(); - // - // + // + // public static final CurrencyEnumeration AED = new CurrencyEnumeration("AED"); - // + // public static final CurrencyEnumeration AFA = new CurrencyEnumeration("AFA"); - // + // public static final CurrencyEnumeration ALL = new CurrencyEnumeration("ALL"); - // + // public static final CurrencyEnumeration AMD = new CurrencyEnumeration("AMD"); - // + // public static final CurrencyEnumeration ANG = new CurrencyEnumeration("ANG"); - // + // public static final CurrencyEnumeration AOA = new CurrencyEnumeration("AOA"); - // + // public static final CurrencyEnumeration ARS = new CurrencyEnumeration("ARS"); - // + // public static final CurrencyEnumeration AUD = new CurrencyEnumeration("AUD"); - // + // public static final CurrencyEnumeration AWG = new CurrencyEnumeration("AWG"); - // + // public static final CurrencyEnumeration AZM = new CurrencyEnumeration("AZM"); - // + // public static final CurrencyEnumeration BAM = new CurrencyEnumeration("BAM"); - // + // public static final CurrencyEnumeration BBD = new CurrencyEnumeration("BBD"); - // + // public static final CurrencyEnumeration BDT = new CurrencyEnumeration("BDT"); - // + // public static final CurrencyEnumeration BGN = new CurrencyEnumeration("BGN"); - // + // public static final CurrencyEnumeration BHD = new CurrencyEnumeration("BHD"); - // + // public static final CurrencyEnumeration BIF = new CurrencyEnumeration("BIF"); - // + // public static final CurrencyEnumeration BMD = new CurrencyEnumeration("BMD"); - // + // public static final CurrencyEnumeration BND = new CurrencyEnumeration("BND"); - // + // public static final CurrencyEnumeration BOB = new CurrencyEnumeration("BOB"); - // + // public static final CurrencyEnumeration BRL = new CurrencyEnumeration("BRL"); - // + // public static final CurrencyEnumeration BSD = new CurrencyEnumeration("BSD"); - // + // public static final CurrencyEnumeration BTN = new CurrencyEnumeration("BTN"); - // + // public static final CurrencyEnumeration BWP = new CurrencyEnumeration("BWP"); - // + // public static final CurrencyEnumeration BYR = new CurrencyEnumeration("BYR"); - // + // public static final CurrencyEnumeration BZD = new CurrencyEnumeration("BZD"); - // + // public static final CurrencyEnumeration CAD = new CurrencyEnumeration("CAD"); - // + // public static final CurrencyEnumeration CDF = new CurrencyEnumeration("CDF"); - // + // public static final CurrencyEnumeration CHF = new CurrencyEnumeration("CHF"); - // + // public static final CurrencyEnumeration CLP = new CurrencyEnumeration("CLP"); - // + // public static final CurrencyEnumeration CNY = new CurrencyEnumeration("CNY"); - // + // public static final CurrencyEnumeration CRC = new CurrencyEnumeration("CRC"); - // + // public static final CurrencyEnumeration CSD = new CurrencyEnumeration("CSD"); - // + // public static final CurrencyEnumeration CUP = new CurrencyEnumeration("CUP"); - // + // public static final CurrencyEnumeration CVE = new CurrencyEnumeration("CVE"); - // + // public static final CurrencyEnumeration CYP = new CurrencyEnumeration("CYP"); - // + // public static final CurrencyEnumeration CZK = new CurrencyEnumeration("CZK"); - // + // public static final CurrencyEnumeration DJF = new CurrencyEnumeration("DJF"); - // + // public static final CurrencyEnumeration DKK = new CurrencyEnumeration("DKK"); - // + // public static final CurrencyEnumeration DOP = new CurrencyEnumeration("DOP"); - // + // public static final CurrencyEnumeration DZD = new CurrencyEnumeration("DZD"); - // + // public static final CurrencyEnumeration EEK = new CurrencyEnumeration("EEK"); - // + // public static final CurrencyEnumeration EGP = new CurrencyEnumeration("EGP"); - // + // public static final CurrencyEnumeration ERN = new CurrencyEnumeration("ERN"); - // + // public static final CurrencyEnumeration ETB = new CurrencyEnumeration("ETB"); - // + // public static final CurrencyEnumeration EUR = new CurrencyEnumeration("EUR"); - // + // public static final CurrencyEnumeration FJD = new CurrencyEnumeration("FJD"); - // + // public static final CurrencyEnumeration FKP = new CurrencyEnumeration("FKP"); - // + // public static final CurrencyEnumeration GBP = new CurrencyEnumeration("GBP"); - // + // public static final CurrencyEnumeration GEL = new CurrencyEnumeration("GEL"); - // + // public static final CurrencyEnumeration GGP = new CurrencyEnumeration("GGP"); - // + // public static final CurrencyEnumeration GHC = new CurrencyEnumeration("GHC"); - // + // public static final CurrencyEnumeration GIP = new CurrencyEnumeration("GIP"); - // + // public static final CurrencyEnumeration GMD = new CurrencyEnumeration("GMD"); - // + // public static final CurrencyEnumeration GNF = new CurrencyEnumeration("GNF"); - // + // public static final CurrencyEnumeration GTQ = new CurrencyEnumeration("GTQ"); - // + // public static final CurrencyEnumeration GYD = new CurrencyEnumeration("GYD"); - // + // public static final CurrencyEnumeration HKD = new CurrencyEnumeration("HKD"); - // + // public static final CurrencyEnumeration HNL = new CurrencyEnumeration("HNL"); - // + // public static final CurrencyEnumeration HRK = new CurrencyEnumeration("HRK"); - // + // public static final CurrencyEnumeration HTG = new CurrencyEnumeration("HTG"); - // + // public static final CurrencyEnumeration HUF = new CurrencyEnumeration("HUF"); - // + // public static final CurrencyEnumeration IDR = new CurrencyEnumeration("IDR"); - // + // public static final CurrencyEnumeration ILS = new CurrencyEnumeration("ILS"); - // + // public static final CurrencyEnumeration IMP = new CurrencyEnumeration("IMP"); - // + // public static final CurrencyEnumeration INR = new CurrencyEnumeration("INR"); - // + // public static final CurrencyEnumeration IQD = new CurrencyEnumeration("IQD"); - // + // public static final CurrencyEnumeration IRR = new CurrencyEnumeration("IRR"); - // + // public static final CurrencyEnumeration ISK = new CurrencyEnumeration("ISK"); - // + // public static final CurrencyEnumeration JEP = new CurrencyEnumeration("JEP"); - // + // public static final CurrencyEnumeration JMD = new CurrencyEnumeration("JMD"); - // + // public static final CurrencyEnumeration JOD = new CurrencyEnumeration("JOD"); - // + // public static final CurrencyEnumeration JPY = new CurrencyEnumeration("JPY"); - // + // public static final CurrencyEnumeration KES = new CurrencyEnumeration("KES"); - // + // public static final CurrencyEnumeration KGS = new CurrencyEnumeration("KGS"); - // + // public static final CurrencyEnumeration KHR = new CurrencyEnumeration("KHR"); - // + // public static final CurrencyEnumeration KMF = new CurrencyEnumeration("KMF"); - // + // public static final CurrencyEnumeration KPW = new CurrencyEnumeration("KPW"); - // + // public static final CurrencyEnumeration KRW = new CurrencyEnumeration("KRW"); - // + // public static final CurrencyEnumeration KWD = new CurrencyEnumeration("KWD"); - // + // public static final CurrencyEnumeration KYD = new CurrencyEnumeration("KYD"); - // + // public static final CurrencyEnumeration KZT = new CurrencyEnumeration("KZT"); - // + // public static final CurrencyEnumeration LAK = new CurrencyEnumeration("LAK"); - // + // public static final CurrencyEnumeration LBP = new CurrencyEnumeration("LBP"); - // + // public static final CurrencyEnumeration LKR = new CurrencyEnumeration("LKR"); - // + // public static final CurrencyEnumeration LRD = new CurrencyEnumeration("LRD"); - // + // public static final CurrencyEnumeration LSL = new CurrencyEnumeration("LSL"); - // + // public static final CurrencyEnumeration LTL = new CurrencyEnumeration("LTL"); - // + // public static final CurrencyEnumeration LVL = new CurrencyEnumeration("LVL"); - // + // public static final CurrencyEnumeration LYD = new CurrencyEnumeration("LYD"); - // + // public static final CurrencyEnumeration MAD = new CurrencyEnumeration("MAD"); - // + // public static final CurrencyEnumeration MDL = new CurrencyEnumeration("MDL"); - // + // public static final CurrencyEnumeration MGA = new CurrencyEnumeration("MGA"); - // + // public static final CurrencyEnumeration MKD = new CurrencyEnumeration("MKD"); - // + // public static final CurrencyEnumeration MMK = new CurrencyEnumeration("MMK"); - // + // public static final CurrencyEnumeration MNT = new CurrencyEnumeration("MNT"); - // + // public static final CurrencyEnumeration MOP = new CurrencyEnumeration("MOP"); - // + // public static final CurrencyEnumeration MRO = new CurrencyEnumeration("MRO"); - // + // public static final CurrencyEnumeration MTL = new CurrencyEnumeration("MTL"); - // + // public static final CurrencyEnumeration MUR = new CurrencyEnumeration("MUR"); - // + // public static final CurrencyEnumeration MVR = new CurrencyEnumeration("MVR"); - // + // public static final CurrencyEnumeration MWK = new CurrencyEnumeration("MWK"); - // + // public static final CurrencyEnumeration MXN = new CurrencyEnumeration("MXN"); - // + // public static final CurrencyEnumeration MYR = new CurrencyEnumeration("MYR"); - // + // public static final CurrencyEnumeration MZM = new CurrencyEnumeration("MZM"); - // + // public static final CurrencyEnumeration NAD = new CurrencyEnumeration("NAD"); - // + // public static final CurrencyEnumeration NGN = new CurrencyEnumeration("NGN"); - // + // public static final CurrencyEnumeration NIO = new CurrencyEnumeration("NIO"); - // + // public static final CurrencyEnumeration NOK = new CurrencyEnumeration("NOK"); - // + // public static final CurrencyEnumeration NPR = new CurrencyEnumeration("NPR"); - // + // public static final CurrencyEnumeration NZD = new CurrencyEnumeration("NZD"); - // + // public static final CurrencyEnumeration OMR = new CurrencyEnumeration("OMR"); - // + // public static final CurrencyEnumeration PAB = new CurrencyEnumeration("PAB"); - // + // public static final CurrencyEnumeration PEN = new CurrencyEnumeration("PEN"); - // + // public static final CurrencyEnumeration PGK = new CurrencyEnumeration("PGK"); - // + // public static final CurrencyEnumeration PHP = new CurrencyEnumeration("PHP"); - // + // public static final CurrencyEnumeration PKR = new CurrencyEnumeration("PKR"); - // + // public static final CurrencyEnumeration PLN = new CurrencyEnumeration("PLN"); - // + // public static final CurrencyEnumeration PYG = new CurrencyEnumeration("PYG"); - // + // public static final CurrencyEnumeration QAR = new CurrencyEnumeration("QAR"); - // + // public static final CurrencyEnumeration RON = new CurrencyEnumeration("RON"); - // + // public static final CurrencyEnumeration RUB = new CurrencyEnumeration("RUB"); - // + // public static final CurrencyEnumeration RWF = new CurrencyEnumeration("MOP"); - // + // public static final CurrencyEnumeration SAR = new CurrencyEnumeration("SAR"); - // + // public static final CurrencyEnumeration SBD = new CurrencyEnumeration("SBD"); - // + // public static final CurrencyEnumeration SCR = new CurrencyEnumeration("SCR"); - // + // public static final CurrencyEnumeration SDD = new CurrencyEnumeration("SDD"); - // + // public static final CurrencyEnumeration SEK = new CurrencyEnumeration("SEK"); - // + // public static final CurrencyEnumeration SGD = new CurrencyEnumeration("SGD"); - // + // public static final CurrencyEnumeration SHP = new CurrencyEnumeration("SHP"); - // + // public static final CurrencyEnumeration SIT = new CurrencyEnumeration("SIT"); - // + // public static final CurrencyEnumeration SKK = new CurrencyEnumeration("SKK"); - // + // public static final CurrencyEnumeration SLL = new CurrencyEnumeration("SLL"); - // + // public static final CurrencyEnumeration SOS = new CurrencyEnumeration("SOS"); - // + // public static final CurrencyEnumeration SPL = new CurrencyEnumeration("SPL"); - // + // public static final CurrencyEnumeration SRD = new CurrencyEnumeration("SRD"); - // + // public static final CurrencyEnumeration STD = new CurrencyEnumeration("STD"); - // + // public static final CurrencyEnumeration SVC = new CurrencyEnumeration("SVC"); - // + // public static final CurrencyEnumeration SYP = new CurrencyEnumeration("SYP"); - // + // public static final CurrencyEnumeration SZL = new CurrencyEnumeration("SZL"); - // + // public static final CurrencyEnumeration THB = new CurrencyEnumeration("THB"); - // + // public static final CurrencyEnumeration TJS = new CurrencyEnumeration("TJS"); - // + // public static final CurrencyEnumeration TMM = new CurrencyEnumeration("TMM"); - // + // public static final CurrencyEnumeration TND = new CurrencyEnumeration("TND"); - // + // public static final CurrencyEnumeration TOP = new CurrencyEnumeration("TOP"); - // + // public static final CurrencyEnumeration TRL = new CurrencyEnumeration("TRL"); - // + // public static final CurrencyEnumeration TRY = new CurrencyEnumeration("TRY"); - // + // public static final CurrencyEnumeration TTD = new CurrencyEnumeration("TTD"); - // + // public static final CurrencyEnumeration TVD = new CurrencyEnumeration("TVD"); - // + // public static final CurrencyEnumeration TWD = new CurrencyEnumeration("TWD"); - // + // public static final CurrencyEnumeration TZS = new CurrencyEnumeration("TZS"); - // + // public static final CurrencyEnumeration UAH = new CurrencyEnumeration("UAH"); - // + // public static final CurrencyEnumeration UGX = new CurrencyEnumeration("UGX"); - // + // public static final CurrencyEnumeration USD = new CurrencyEnumeration("USD"); - // + // public static final CurrencyEnumeration UYU = new CurrencyEnumeration("UYU"); - // + // public static final CurrencyEnumeration UZS = new CurrencyEnumeration("UZS"); - // + // public static final CurrencyEnumeration VEB = new CurrencyEnumeration("VEB"); - // + // public static final CurrencyEnumeration VND = new CurrencyEnumeration("VND"); - // + // public static final CurrencyEnumeration VUV = new CurrencyEnumeration("VUV"); - // + // public static final CurrencyEnumeration WST = new CurrencyEnumeration("WST"); - // + // public static final CurrencyEnumeration XAF = new CurrencyEnumeration("XAF"); - // + // public static final CurrencyEnumeration XAG = new CurrencyEnumeration("XAG"); - // + // public static final CurrencyEnumeration XAU = new CurrencyEnumeration("XAU"); - // + // public static final CurrencyEnumeration XCD = new CurrencyEnumeration("XCD"); - // + // public static final CurrencyEnumeration XDR = new CurrencyEnumeration("XDR"); - // + // public static final CurrencyEnumeration XOF = new CurrencyEnumeration("XOF"); - // + // public static final CurrencyEnumeration XPD = new CurrencyEnumeration("XPD"); - // + // public static final CurrencyEnumeration XPF = new CurrencyEnumeration("XPF"); - // + // public static final CurrencyEnumeration XPT = new CurrencyEnumeration("XPT"); - // + // public static final CurrencyEnumeration YER = new CurrencyEnumeration("YER"); - // + // public static final CurrencyEnumeration ZAR = new CurrencyEnumeration("ZAR"); - // + // public static final CurrencyEnumeration ZMK = new CurrencyEnumeration("ZMK"); - // + // public static final CurrencyEnumeration ZWD = new CurrencyEnumeration("ZWD"); - // - private String value; + // + private final String value; /** * Creates a new instance of CurrencyEnumeration - * + * * @param value DOCUMENT ME! */ - private CurrencyEnumeration(String value) { + private CurrencyEnumeration(final String value) { this.value = value; - lookup.put(value,this); + lookup.put(value, this); } public String getValue() { - return this.value; + return value; } + @Override public Object clone() { return this; } - public static CurrencyEnumeration findByValue(String value) { - return (CurrencyEnumeration)lookup.get(value.trim().toUpperCase()); + public static CurrencyEnumeration findByValue(final String value) { + return (CurrencyEnumeration) lookup.get(value.trim().toUpperCase()); } + @Override public String toString() { return value; } diff --git a/src/main/java/org/rometools/feed/module/base/types/DateTimeRange.java b/src/main/java/org/rometools/feed/module/base/types/DateTimeRange.java index 4907def..e7eddbb 100644 --- a/src/main/java/org/rometools/feed/module/base/types/DateTimeRange.java +++ b/src/main/java/org/rometools/feed/module/base/types/DateTimeRange.java @@ -41,9 +41,9 @@ package org.rometools.feed.module.base.types; import java.util.Date; - -/** Represents a time range. - * +/** + * Represents a time range. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.2 $ */ @@ -59,26 +59,27 @@ public class DateTimeRange implements CloneableType { /** * Creates a new instance of DateTimeRange + * * @param start Beginning of the timeframe. * @param end End of the Timeframe. */ - public DateTimeRange(Date start, Date end) { - this.start= start; - this.end = end ; + public DateTimeRange(final Date start, final Date end) { + this.start = start; + this.end = end; } - /** * The end of the timeframe. + * * @return The end of the timeframe. */ public Date getEnd() { return end; } - /** * The beginning of the timeframe. + * * @return The beginning of the timeframe. */ public Date getStart() { @@ -87,17 +88,19 @@ public class DateTimeRange implements CloneableType { /** * Clones the object + * * @return Duplicate of this object. */ + @Override public Object clone() { - DateTimeRange retValue = new DateTimeRange(null, null); + final DateTimeRange retValue = new DateTimeRange(null, null); - if (this.getStart() != null) { - retValue.start = ((Date) this.getStart().clone()); + if (getStart() != null) { + retValue.start = (Date) getStart().clone(); } - if (this.getEnd() != null) { - retValue.end = ((Date) this.getEnd().clone()); + if (getEnd() != null) { + retValue.end = (Date) getEnd().clone(); } return retValue; @@ -105,23 +108,29 @@ public class DateTimeRange implements CloneableType { /** * String representation of the object. + * * @return String representation of the object. */ + @Override public String toString() { - return "Start: " + this.start + " End: " + this.end; + return "Start: " + start + " End: " + end; } - - public boolean equals( Object o ){ - if( !(o instanceof DateTimeRange ) || o == null ) - return false; - DateTimeRange d = (DateTimeRange) o; - if( this.start == d.getStart() && this.end == d.getEnd() ){ - return true; - } - if( this.start != null && !this.start.equals( d.getStart()) ) - return false; - if( this.end != null && !this.end.equals( d.getEnd()) ) - return false; - return true; + + @Override + public boolean equals(final Object o) { + if (!(o instanceof DateTimeRange) || o == null) { + return false; + } + final DateTimeRange d = (DateTimeRange) o; + if (start == d.getStart() && end == d.getEnd()) { + return true; + } + if (start != null && !start.equals(d.getStart())) { + return false; + } + if (end != null && !end.equals(d.getEnd())) { + return false; + } + return true; } } diff --git a/src/main/java/org/rometools/feed/module/base/types/FloatUnit.java b/src/main/java/org/rometools/feed/module/base/types/FloatUnit.java index 933b1f1..3a9eeba 100644 --- a/src/main/java/org/rometools/feed/module/base/types/FloatUnit.java +++ b/src/main/java/org/rometools/feed/module/base/types/FloatUnit.java @@ -41,10 +41,9 @@ package org.rometools.feed.module.base.types; import org.rometools.feed.module.base.io.GoogleBaseParser; - -/** This class represents a quantity consisting of a float value and an optional - * units specification. - * +/** + * This class represents a quantity consisting of a float value and an optional units specification. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ @@ -56,31 +55,34 @@ public class FloatUnit implements CloneableType { /** * Float value */ - private float value; + private final float value; /** * Looks for a char in an array + * * @param find char to search for * @param array array to search * @return boolean indicating presence. */ - private boolean inCharArray( char find, char[] array ){ - for( int i=0; i < array.length; i++ ){ - if( find == array[i]) + private boolean inCharArray(final char find, final char[] array) { + for (final char element : array) { + if (find == element) { return true; + } } return false; } - + /** * Creates a new float unit by parsing a String value + * * @param source String value to parse */ - public FloatUnit(String source) { - String parse = source.trim(); + public FloatUnit(final String source) { + final String parse = source.trim(); int space = -1; - for( int i=0; i < parse.length(); i++ ){ - if( !inCharArray( parse.charAt(i), GoogleBaseParser.FLOAT_CHARS ) ){ + for (int i = 0; i < parse.length(); i++) { + if (!inCharArray(parse.charAt(i), GoogleBaseParser.FLOAT_CHARS)) { space = i; break; } @@ -90,26 +92,27 @@ public class FloatUnit implements CloneableType { space = parse.length(); } - this.value = Float.parseFloat( - GoogleBaseParser.stripNonValidCharacters(GoogleBaseParser.FLOAT_CHARS, parse.substring(0, space))); + value = Float.parseFloat(GoogleBaseParser.stripNonValidCharacters(GoogleBaseParser.FLOAT_CHARS, parse.substring(0, space))); - if (space != parse.length()) { - this.units = parse.substring(space, parse.length()).trim(); - } + if (space != parse.length()) { + units = parse.substring(space, parse.length()).trim(); + } } /** * Creates a new instance of FloatUnit + * * @param value float value * @param units Units represented, or null. */ - public FloatUnit(float value, String units) { + public FloatUnit(final float value, final String units) { this.value = value; this.units = units; } /** * Returns the units. + * * @return Returns the units. */ public String getUnits() { @@ -118,6 +121,7 @@ public class FloatUnit implements CloneableType { /** * Returns the float value. + * * @return Returns the float value. */ public float getValue() { @@ -126,34 +130,40 @@ public class FloatUnit implements CloneableType { /** * Duplicates the object. + * * @return Duplicate FloatUnit */ + @Override public Object clone() { - return new FloatUnit(0 + this.value, this.units); + return new FloatUnit(0 + value, units); } /** * Returns a String representation of the object. + * * @return Returns a String representation of the object. */ + @Override public String toString() { - if ((this.units != null) && (this.units.trim().length() > 0)) { - return this.value + " " + this.units; + if (units != null && units.trim().length() > 0) { + return value + " " + units; } else { return Float.toString(value); } } - - public boolean equals( Object o ){ - if(!(o instanceof FloatUnit) ) - return false; - FloatUnit f = (FloatUnit) o; - if( f.getValue() != this.value ){ - return false; - } - if( this.units == f.getUnits() || ( this.units != null && this.units.equals( f.getUnits() )) ){ - return true; - } - return false; + + @Override + public boolean equals(final Object o) { + if (!(o instanceof FloatUnit)) { + return false; + } + final FloatUnit f = (FloatUnit) o; + if (f.getValue() != value) { + return false; + } + if (units == f.getUnits() || units != null && units.equals(f.getUnits())) { + return true; + } + return false; } } diff --git a/src/main/java/org/rometools/feed/module/base/types/GenderEnumeration.java b/src/main/java/org/rometools/feed/module/base/types/GenderEnumeration.java index 8e6ef33..a339b41 100644 --- a/src/main/java/org/rometools/feed/module/base/types/GenderEnumeration.java +++ b/src/main/java/org/rometools/feed/module/base/types/GenderEnumeration.java @@ -39,8 +39,9 @@ */ package org.rometools.feed.module.base.types; -/** Simple enumeration for Genders. - * +/** + * Simple enumeration for Genders. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ @@ -49,19 +50,19 @@ public class GenderEnumeration implements CloneableType { public static final GenderEnumeration MALE = new GenderEnumeration("Male"); /** Women */ public static final GenderEnumeration FEMALE = new GenderEnumeration("Female"); - private String value; + private final String value; - private GenderEnumeration(String value) { + private GenderEnumeration(final String value) { this.value = value; } /** Returns the proper instance based on the string value */ - public static GenderEnumeration findByValue(String value) { + public static GenderEnumeration findByValue(final String value) { if (value == null) { return null; } - String gender = value.toUpperCase(); + final String gender = value.toUpperCase(); if (gender.charAt(0) == 'M') { return GenderEnumeration.MALE; @@ -74,14 +75,16 @@ public class GenderEnumeration implements CloneableType { /** Returns the value of the instance */ public String getValue() { - return this.value; + return value; } - + /** Returns a reference to the same object. :P */ + @Override public Object clone() { return this; } + @Override public String toString() { return value; } diff --git a/src/main/java/org/rometools/feed/module/base/types/IntUnit.java b/src/main/java/org/rometools/feed/module/base/types/IntUnit.java index bb424b2..af163a7 100644 --- a/src/main/java/org/rometools/feed/module/base/types/IntUnit.java +++ b/src/main/java/org/rometools/feed/module/base/types/IntUnit.java @@ -41,27 +41,29 @@ package org.rometools.feed.module.base.types; import org.rometools.feed.module.base.io.GoogleBaseParser; - /** - * + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ public class IntUnit implements CloneableType { private String units; - private int value; - private boolean inCharArray( char find, char[] array ){ - for( int i=0; i < array.length; i++ ){ - if( find == array[i]) + private final int value; + + private boolean inCharArray(final char find, final char[] array) { + for (final char element : array) { + if (find == element) { return true; + } } return false; } - public IntUnit(String source) { - String parse = source.trim(); + + public IntUnit(final String source) { + final String parse = source.trim(); int space = -1; - for( int i=0; i < parse.length(); i++ ){ - if( !inCharArray( parse.charAt(i), GoogleBaseParser.INTEGER_CHARS ) ){ + for (int i = 0; i < parse.length(); i++) { + if (!inCharArray(parse.charAt(i), GoogleBaseParser.INTEGER_CHARS)) { space = i; break; } @@ -70,16 +72,15 @@ public class IntUnit implements CloneableType { space = parse.length(); } - this.value = Integer.parseInt( - GoogleBaseParser.stripNonValidCharacters(GoogleBaseParser.INTEGER_CHARS, parse.substring(0, space))); + value = Integer.parseInt(GoogleBaseParser.stripNonValidCharacters(GoogleBaseParser.INTEGER_CHARS, parse.substring(0, space))); if (space != parse.length()) { - this.units = parse.substring(space, parse.length()).trim(); + units = parse.substring(space, parse.length()).trim(); } } /** Creates a new instance of IntUnit */ - public IntUnit(int value, String units) { + public IntUnit(final int value, final String units) { this.value = value; this.units = units; } @@ -92,28 +93,32 @@ public class IntUnit implements CloneableType { return value; } + @Override public Object clone() { - return new IntUnit(this.value, this.units); + return new IntUnit(value, units); } + @Override public String toString() { - if ((this.units != null) && (this.units.trim().length() > 0)) { - return this.value + " " + this.units; + if (units != null && units.trim().length() > 0) { + return value + " " + units; } else { return Integer.toString(value); } } - - public boolean equals( Object o ){ - if(!(o instanceof IntUnit) ) - return false; - IntUnit f = (IntUnit) o; - if( f.getValue() != this.value ){ - return false; - } - if( this.units == f.getUnits() || ( this.units != null && this.units.equals( f.getUnits() )) ){ - return true; - } - return false; + + @Override + public boolean equals(final Object o) { + if (!(o instanceof IntUnit)) { + return false; + } + final IntUnit f = (IntUnit) o; + if (f.getValue() != value) { + return false; + } + if (units == f.getUnits() || units != null && units.equals(f.getUnits())) { + return true; + } + return false; } } diff --git a/src/main/java/org/rometools/feed/module/base/types/PaymentTypeEnumeration.java b/src/main/java/org/rometools/feed/module/base/types/PaymentTypeEnumeration.java index 335b938..6393ee4 100644 --- a/src/main/java/org/rometools/feed/module/base/types/PaymentTypeEnumeration.java +++ b/src/main/java/org/rometools/feed/module/base/types/PaymentTypeEnumeration.java @@ -42,7 +42,7 @@ package org.rometools.feed.module.base.types; import java.util.HashMap; /** - * + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ @@ -57,10 +57,10 @@ public class PaymentTypeEnumeration { public static final PaymentTypeEnumeration DISCOVER = new PaymentTypeEnumeration("Discover"); public static final PaymentTypeEnumeration WIRE_TRANSFER = new PaymentTypeEnumeration("Wire transfer"); public static final PaymentTypeEnumeration PAYPAL = new PaymentTypeEnumeration("Paypal"); - private String value; + private final String value; /** Creates a new instance of PaymentTypeEnumeration */ - private PaymentTypeEnumeration(String value) { + private PaymentTypeEnumeration(final String value) { this.value = value; lookup.put(this.value.toUpperCase(), this); } @@ -69,14 +69,16 @@ public class PaymentTypeEnumeration { return value; } - public static PaymentTypeEnumeration findByValue(String value) { + public static PaymentTypeEnumeration findByValue(final String value) { return (PaymentTypeEnumeration) lookup.get(value.toUpperCase()); } + @Override public Object clone() { return this; } + @Override public String toString() { return value; } diff --git a/src/main/java/org/rometools/feed/module/base/types/PriceTypeEnumeration.java b/src/main/java/org/rometools/feed/module/base/types/PriceTypeEnumeration.java index 5adc7de..fd7e2a5 100644 --- a/src/main/java/org/rometools/feed/module/base/types/PriceTypeEnumeration.java +++ b/src/main/java/org/rometools/feed/module/base/types/PriceTypeEnumeration.java @@ -39,10 +39,9 @@ */ package org.rometools.feed.module.base.types; - - /** * Enumeration of values suitable for "price_type" or "salary_type". + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ @@ -58,18 +57,20 @@ public class PriceTypeEnumeration implements CloneableType { /** * String value encapsulated */ - private String value; + private final String value; /** * Creates a new instance of PriceTypeEnumeration + * * @param value Value to encapsulate */ - private PriceTypeEnumeration(String value) { + private PriceTypeEnumeration(final String value) { this.value = value; } /** * Returns the string value of this instance. + * * @return Returns the string value of this instance. */ public String getValue() { @@ -78,10 +79,11 @@ public class PriceTypeEnumeration implements CloneableType { /** * Returns a PriceTypeEnumeration based on the String value or null. + * * @param value Value to search for. * @return PriceTypeEnumeration or null. */ - public static PriceTypeEnumeration findByValue(String value) { + public static PriceTypeEnumeration findByValue(final String value) { if (value.equalsIgnoreCase("negotiable")) { return PriceTypeEnumeration.NEGOTIABLE; } else { @@ -91,16 +93,20 @@ public class PriceTypeEnumeration implements CloneableType { /** * Returns a duplicate of this instance + * * @return The same instance. */ + @Override public Object clone() { return this; } /** * Returns the string value of this instance. + * * @return Returns the string value of this instance. */ + @Override public String toString() { return value; } diff --git a/src/main/java/org/rometools/feed/module/base/types/ShippingType.java b/src/main/java/org/rometools/feed/module/base/types/ShippingType.java index e696463..39ea7bc 100644 --- a/src/main/java/org/rometools/feed/module/base/types/ShippingType.java +++ b/src/main/java/org/rometools/feed/module/base/types/ShippingType.java @@ -43,6 +43,7 @@ import java.util.HashMap; /** * This class represents a specific shipping option for an item. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ @@ -50,23 +51,24 @@ public class ShippingType implements CloneableType { /** * price of the shipping. */ - private FloatUnit price; + private final FloatUnit price; /** * Service used. */ - private ServiceEnumeration service; + private final ServiceEnumeration service; /** * Country to ship to */ - private String country; + private final String country; /** * Creates a new instance of ShippingType + * * @param price The price of the shipping option * @param service Shipping service used. * @param country Country shipped to. */ - public ShippingType(FloatUnit price, ServiceEnumeration service, String country) { + public ShippingType(final FloatUnit price, final ServiceEnumeration service, final String country) { this.price = price; this.service = service; this.country = country; @@ -74,6 +76,7 @@ public class ShippingType implements CloneableType { /** * Returns the destination country. + * * @return Returns the destination country. */ public String getCountry() { @@ -82,6 +85,7 @@ public class ShippingType implements CloneableType { /** * Returns the price of this shipping option. + * * @return Returns the price of this shipping option. */ public FloatUnit getPrice() { @@ -90,6 +94,7 @@ public class ShippingType implements CloneableType { /** * Returns the ServiceEnumeration instance for the shipping service used. + * * @return Returns the ServiceEnumeration instance for the shipping service used. */ public ServiceEnumeration getService() { @@ -98,32 +103,40 @@ public class ShippingType implements CloneableType { /** * Clones this object. + * * @return Duplicate ShippingType object. */ + @Override public Object clone() { - return new ShippingType(this.price, this.service, this.country); + return new ShippingType(price, service, country); } /** * Returns a String representation of this object. + * * @return String representation of this object. */ + @Override public String toString() { - return this.country + " " + this.price + " " + this.service; + return country + " " + price + " " + service; } - public boolean equals( Object o ){ - if( !(o instanceof ShippingType)) - return false; - if( this.toString().equals( o.toString() ) ) - return true; - return false; + @Override + public boolean equals(final Object o) { + if (!(o instanceof ShippingType)) { + return false; + } + if (toString().equals(o.toString())) { + return true; + } + return false; } + /** * Enumeration class of valid options for ServiceType. */ public static class ServiceEnumeration { - /** + /** * Looks up a ServiceEnumeration based on the string value. */ private static final HashMap lookup = new HashMap(); @@ -139,44 +152,49 @@ public class ShippingType implements CloneableType { * Overnight */ public static final ServiceEnumeration OVERNIGHT = new ServiceEnumeration("Overnight"); - + /** * String value */ - private String value; + private final String value; /** * Creates a new instance of ServiceEnumeration. + * * @param value String value to encapsulate. */ - private ServiceEnumeration(String value) { + private ServiceEnumeration(final String value) { this.value = value; lookup.put(this.value.toUpperCase(), this); } /** * String value of this Service. + * * @return String value of this Service. */ public String getValue() { - return this.value; + return value; } /** * Looks up a ServiceEnumeration based on the string value. + * * @param value String value to search for. * @return ServiceEnumeration or null. */ - public static ServiceEnumeration findByValue(String value) { + public static ServiceEnumeration findByValue(final String value) { return (ServiceEnumeration) lookup.get(value.toUpperCase()); } /** * String value of this Service. + * * @return String value of this Service. */ + @Override public String toString() { - return this.value; + return value; } } } diff --git a/src/main/java/org/rometools/feed/module/base/types/ShortDate.java b/src/main/java/org/rometools/feed/module/base/types/ShortDate.java index 62fd0e2..8655161 100644 --- a/src/main/java/org/rometools/feed/module/base/types/ShortDate.java +++ b/src/main/java/org/rometools/feed/module/base/types/ShortDate.java @@ -41,13 +41,12 @@ package org.rometools.feed.module.base.types; import java.util.Date; - /** - * This is a simple wrapper for java.util.Date that indicates it should be - * formatted without time of day for Google Base. It should be transparent to - * module developers. + * This is a simple wrapper for java.util.Date that indicates it should be formatted without time of day for Google Base. It should be transparent to module + * developers. * * Move along. Nothing to see here. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ @@ -59,25 +58,29 @@ public class ShortDate extends Date implements CloneableType { /** * Creates a new Short Date based on a Date value. + * * @param date Date value to read from. */ - public ShortDate(Date date) { + public ShortDate(final Date date) { super(date.getTime()); } /** * Creates a new ShortDate based on a millisecond time. + * * @param time Millisecond time to start with. */ - public ShortDate(long time) { + public ShortDate(final long time) { super(time); } /** * Returns a duplicate of this object. + * * @return Duplicate of the object. */ + @Override public Object clone() { - return new ShortDate(this.getTime()); + return new ShortDate(getTime()); } } diff --git a/src/main/java/org/rometools/feed/module/base/types/Size.java b/src/main/java/org/rometools/feed/module/base/types/Size.java index 716faa3..eb11992 100644 --- a/src/main/java/org/rometools/feed/module/base/types/Size.java +++ b/src/main/java/org/rometools/feed/module/base/types/Size.java @@ -41,9 +41,9 @@ package org.rometools.feed.module.base.types; import java.util.StringTokenizer; - -/** Represents the size on an item in 2 or 3 dimensions. - * +/** + * Represents the size on an item in 2 or 3 dimensions. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.2 $ */ @@ -55,43 +55,46 @@ public class Size implements CloneableType { /** * length */ - private FloatUnit length; + private final FloatUnit length; /** * width */ - private FloatUnit width; + private final FloatUnit width; /** * Creates a new Size object parsing a string value. + * * @param source String value to parse */ - public Size(String source) { - StringTokenizer tok = new StringTokenizer(source, "Xx"); - this.length = new FloatUnit( tok.nextToken()); - this.width = new FloatUnit( tok.nextToken()); + public Size(final String source) { + final StringTokenizer tok = new StringTokenizer(source, "Xx"); + length = new FloatUnit(tok.nextToken()); + width = new FloatUnit(tok.nextToken()); if (tok.hasMoreTokens()) { - this.height = new FloatUnit( tok.nextToken()); + height = new FloatUnit(tok.nextToken()); } } /** * Creates a new instance of Size + * * @param length lenght value * @param width width value */ - public Size(FloatUnit length, FloatUnit width) { + public Size(final FloatUnit length, final FloatUnit width) { this.length = length; this.width = width; } /** * Creates a new instance of Size. + * * @param length Length value. * @param width Width value. * @param height Height value. */ - public Size(FloatUnit length, FloatUnit width, FloatUnit height) { + public Size(final FloatUnit length, final FloatUnit width, final FloatUnit height) { this.length = length; this.width = width; this.height = height; @@ -99,6 +102,7 @@ public class Size implements CloneableType { /** * Height value. + * * @return Height value. */ public FloatUnit getHeight() { @@ -107,6 +111,7 @@ public class Size implements CloneableType { /** * Length value. + * * @return Length value. */ public FloatUnit getLength() { @@ -115,6 +120,7 @@ public class Size implements CloneableType { /** * Width value. + * * @return Width value. */ public FloatUnit getWidth() { @@ -123,20 +129,24 @@ public class Size implements CloneableType { /** * Duplicates this object. + * * @return A duplicate Size object. */ + @Override public Object clone() { - if (this.height != null) { - return new Size(this.length, this.width, this.height); + if (height != null) { + return new Size(length, width, height); } else { - return new Size(this.length, this.width); + return new Size(length, width); } } /** * Returns a string representation of this object. + * * @return A string representation of this object. */ + @Override public String toString() { if (height != null) { return length + "x" + width + "x" + height; @@ -144,11 +154,15 @@ public class Size implements CloneableType { return length + "x" + width; } } - public boolean equals( Object o ){ - if( !(o instanceof Size)) - return false; - if( this.toString().equals( o.toString() ) ) - return true; - return false; + + @Override + public boolean equals(final Object o) { + if (!(o instanceof Size)) { + return false; + } + if (toString().equals(o.toString())) { + return true; + } + return false; } } diff --git a/src/main/java/org/rometools/feed/module/base/types/YearType.java b/src/main/java/org/rometools/feed/module/base/types/YearType.java index 98e8f2b..a577450 100644 --- a/src/main/java/org/rometools/feed/module/base/types/YearType.java +++ b/src/main/java/org/rometools/feed/module/base/types/YearType.java @@ -42,9 +42,9 @@ package org.rometools.feed.module.base.types; import java.util.Calendar; import java.util.Date; - -/** This class represents a simple 4 digit year. - * +/** + * This class represents a simple 4 digit year. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.1 $ */ @@ -56,43 +56,52 @@ public class YearType implements CloneableType { /** * Creates a new year from a string value. + * * @param year String to parse. */ - public YearType(String year) { + public YearType(final String year) { this.year = Integer.parseInt(year.trim()); } /** * Creates a new instance of YearType + * * @param date Date to get the year from. */ - public YearType(Date date) { - Calendar cal = Calendar.getInstance(); - cal.setTime(date); - this.year = cal.get( Calendar.YEAR ); + public YearType(final Date date) { + final Calendar cal = Calendar.getInstance(); + cal.setTime(date); + year = cal.get(Calendar.YEAR); } /** * Duplicates this object. + * * @return Cloned Year. */ + @Override public Object clone() { - return new YearType(Integer.toString(this.year)); + return new YearType(Integer.toString(year)); } /** * Returns a String representation of this object. + * * @return Returns a String representation of this object. */ + @Override public String toString() { return Integer.toString(year); } - - public boolean equals( Object o ){ - if( !(o instanceof YearType)) - return false; - if( this.toString().equals( o.toString() ) ) - return true; - return false; + + @Override + public boolean equals(final Object o) { + if (!(o instanceof YearType)) { + return false; + } + if (toString().equals(o.toString())) { + return true; + } + return false; } } diff --git a/src/main/java/org/rometools/feed/module/cc/CreativeCommons.java b/src/main/java/org/rometools/feed/module/cc/CreativeCommons.java index 839d633..f31831a 100644 --- a/src/main/java/org/rometools/feed/module/cc/CreativeCommons.java +++ b/src/main/java/org/rometools/feed/module/cc/CreativeCommons.java @@ -40,20 +40,23 @@ package org.rometools.feed.module.cc; -import com.sun.syndication.feed.module.Module; import org.rometools.feed.module.cc.types.License; +import com.sun.syndication.feed.module.Module; + /** - * + * * @author Robert "kebernet" Cooper */ public interface CreativeCommons extends Module { - + public static final String URI = "rome:CreativeCommons"; - + public License[] getAllLicenses(); + public void setAllLicenses(License[] licenses); - + public License[] getLicenses(); - public void setLicenses(License[] license ); + + public void setLicenses(License[] license); } diff --git a/src/main/java/org/rometools/feed/module/cc/CreativeCommonsImpl.java b/src/main/java/org/rometools/feed/module/cc/CreativeCommonsImpl.java index b4d3f70..24d948e 100644 --- a/src/main/java/org/rometools/feed/module/cc/CreativeCommonsImpl.java +++ b/src/main/java/org/rometools/feed/module/cc/CreativeCommonsImpl.java @@ -40,86 +40,89 @@ package org.rometools.feed.module.cc; +import java.lang.reflect.Array; + +import org.rometools.feed.module.cc.types.License; + import com.sun.syndication.feed.CopyFrom; import com.sun.syndication.feed.impl.EqualsBean; import com.sun.syndication.feed.impl.ToStringBean; -import org.rometools.feed.module.cc.types.License; -import java.lang.reflect.Array; /** * @version $Revision: 1.1 $ * @author Robert "kebernet" Cooper */ public class CreativeCommonsImpl implements CreativeCommons { - - public static final String RDF_URI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - public static final String RSS2_URI ="http://backend.userland.com/creativeCommonsRssModule"; - public static final String RSS1_URI = "http://web.resource.org/cc/"; - - private License[] allLicenses; - private License[] licenses; - - protected Object arrayCopy(Object[] source) { - if(source == null) { + + public static final String RDF_URI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + public static final String RSS2_URI = "http://backend.userland.com/creativeCommonsRssModule"; + public static final String RSS1_URI = "http://web.resource.org/cc/"; + + private License[] allLicenses; + private License[] licenses; + + protected Object arrayCopy(final Object[] source) { + if (source == null) { return null; } - Object[] array = (Object[])Array.newInstance(source.getClass().getComponentType(),source.length); + final Object[] array = (Object[]) Array.newInstance(source.getClass().getComponentType(), source.length); - for(int i = 0; i < source.length; i++) { + for (int i = 0; i < source.length; i++) { array[i] = source[i]; } return array; } - + public License[] getAllLicenses() { return allLicenses; } - public void setAllLicenses(License[] allLicenses) { + public void setAllLicenses(final License[] allLicenses) { this.allLicenses = allLicenses; } - - public Class getInterface() { - return CreativeCommons.class; - } + public Class getInterface() { + return CreativeCommons.class; + } public String getUri() { - return CreativeCommons.URI; + return CreativeCommons.URI; } - public Object clone() { - CreativeCommonsImpl clone = new CreativeCommonsImpl(); - clone.copyFrom( this ); - return clone; + @Override + public Object clone() { + final CreativeCommonsImpl clone = new CreativeCommonsImpl(); + clone.copyFrom(this); + return clone; } - public void copyFrom(CopyFrom object) { - CreativeCommons source = (CreativeCommons) object; - this.setAllLicenses( (License[]) arrayCopy( source.getAllLicenses() )); - this.setLicenses( source.getLicenses() ); + public void copyFrom(final CopyFrom object) { + final CreativeCommons source = (CreativeCommons) object; + setAllLicenses((License[]) arrayCopy(source.getAllLicenses())); + setLicenses(source.getLicenses()); } - - public boolean equals(Object obj) { - EqualsBean eBean = new EqualsBean(this.getClass(),this); + + @Override + public boolean equals(final Object obj) { + final EqualsBean eBean = new EqualsBean(this.getClass(), this); return eBean.beanEquals(obj); } - public License[] getLicenses() { return licenses; } - public void setLicenses(License[] licenses) { + public void setLicenses(final License[] licenses) { this.licenses = licenses; } - + + @Override public String toString() { - - ToStringBean tsb = new ToStringBean( CreativeCommonsImpl.class, this ); - return tsb.toString(); + + final ToStringBean tsb = new ToStringBean(CreativeCommonsImpl.class, this); + return tsb.toString(); } } diff --git a/src/main/java/org/rometools/feed/module/cc/io/CCModuleGenerator.java b/src/main/java/org/rometools/feed/module/cc/io/CCModuleGenerator.java index f9ab5b0..1a8870c 100644 --- a/src/main/java/org/rometools/feed/module/cc/io/CCModuleGenerator.java +++ b/src/main/java/org/rometools/feed/module/cc/io/CCModuleGenerator.java @@ -40,103 +40,105 @@ package org.rometools.feed.module.cc.io; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleGenerator; +import java.util.HashSet; +import java.util.Set; + +import org.jdom2.Element; +import org.jdom2.Namespace; import org.rometools.feed.module.cc.CreativeCommons; import org.rometools.feed.module.cc.CreativeCommonsImpl; import org.rometools.feed.module.cc.types.License; -import java.util.HashSet; -import java.util.Set; -import org.jdom.Element; -import org.jdom.Namespace; + +import com.sun.syndication.feed.module.Module; +import com.sun.syndication.io.ModuleGenerator; /** * @version $Revision: 1.1 $ * @author Robert "kebernet" Cooper */ -public class CCModuleGenerator implements ModuleGenerator{ - - private static final Namespace RSS1 = Namespace.getNamespace( "cc", CreativeCommonsImpl.RSS1_URI ); - private static final Namespace RSS2 = Namespace.getNamespace( "creativeCommons", CreativeCommonsImpl.RSS2_URI); +public class CCModuleGenerator implements ModuleGenerator { + + private static final Namespace RSS1 = Namespace.getNamespace("cc", CreativeCommonsImpl.RSS1_URI); + private static final Namespace RSS2 = Namespace.getNamespace("creativeCommons", CreativeCommonsImpl.RSS2_URI); private static final Namespace RSS = Namespace.getNamespace("http://purl.org/rss/1.0/"); private static final Namespace RDF = Namespace.getNamespace("rdf", "http://www.w3.org/1999/02/22-rdf-syntax-ns#"); private static final HashSet NAMESPACES = new HashSet(); - static{ - NAMESPACES.add( RSS1 ); - NAMESPACES.add( RSS2 ); - NAMESPACES.add( RDF ); + static { + NAMESPACES.add(RSS1); + NAMESPACES.add(RSS2); + NAMESPACES.add(RDF); } - + /** * Creates a new instance of CCModuleGenerator */ public CCModuleGenerator() { - super(); + super(); } - public void generate(Module module, Element element) { - Element root = element; - while( root.getParentElement() != null ){ - root = root.getParentElement(); - } - if( root.getNamespace().equals( RDF )|| root.getNamespace().equals( RSS )){ - generateRSS1( (CreativeCommons) module, element); - } else { - generateRSS2( (CreativeCommons) module, element); - } + public void generate(final Module module, final Element element) { + Element root = element; + while (root.getParentElement() != null) { + root = root.getParentElement(); + } + if (root.getNamespace().equals(RDF) || root.getNamespace().equals(RSS)) { + generateRSS1((CreativeCommons) module, element); + } else { + generateRSS2((CreativeCommons) module, element); + } } public Set getNamespaces() { - return NAMESPACES; + return NAMESPACES; } public String getNamespaceUri() { - return CreativeCommons.URI; + return CreativeCommons.URI; } - - private void generateRSS1( CreativeCommons module, Element element ){ - //throw new RuntimeException( "Generating RSS1 Feeds not currently Supported."); - - System.out.println(element.getName()); - if( element.getName().equals("channel")){ - // Do all licenses list. - License[] all = module.getAllLicenses(); - for( int i=0; i < all.length ; i++){ - Element license = new Element( "License", RSS1 ); - license.setAttribute( "about", all[i].getValue(), RDF ); - License.Behaviour[] permits = all[i].getPermits(); - for( int j=0; permits != null && j < permits.length; j++ ){ - Element permit = new Element( "permits", RSS1 ); - permit.setAttribute( "resource", permits[j].toString(), RDF); - license.addContent( permit ); - } - License.Behaviour[] requires = all[i].getPermits(); - for( int j=0; requires != null && j < requires.length; j++ ){ - Element permit = new Element( "requires", RSS1 ); - permit.setAttribute( "resource", permits[j].toString(), RDF); - license.addContent( permit ); - } - System.out.println("Is Root?"+element.getParentElement()); - element.getParentElement().addContent( license ); - } - } - - //Do local licenses - License[] licenses = module.getLicenses(); - for( int i=0; i < licenses.length; i++ ){ - Element license = new Element( "license", RSS1 ); - license.setAttribute( "resource", licenses[i].getValue(), RDF); - element.addContent( license ); - } - + + private void generateRSS1(final CreativeCommons module, final Element element) { + // throw new RuntimeException( "Generating RSS1 Feeds not currently Supported."); + + System.out.println(element.getName()); + if (element.getName().equals("channel")) { + // Do all licenses list. + final License[] all = module.getAllLicenses(); + for (final License element2 : all) { + final Element license = new Element("License", RSS1); + license.setAttribute("about", element2.getValue(), RDF); + final License.Behaviour[] permits = element2.getPermits(); + for (int j = 0; permits != null && j < permits.length; j++) { + final Element permit = new Element("permits", RSS1); + permit.setAttribute("resource", permits[j].toString(), RDF); + license.addContent(permit); + } + final License.Behaviour[] requires = element2.getPermits(); + for (int j = 0; requires != null && j < requires.length; j++) { + final Element permit = new Element("requires", RSS1); + permit.setAttribute("resource", permits[j].toString(), RDF); + license.addContent(permit); + } + System.out.println("Is Root?" + element.getParentElement()); + element.getParentElement().addContent(license); + } + } + + // Do local licenses + final License[] licenses = module.getLicenses(); + for (final License license2 : licenses) { + final Element license = new Element("license", RSS1); + license.setAttribute("resource", license2.getValue(), RDF); + element.addContent(license); + } + } - - private void generateRSS2( CreativeCommons module, Element element ){ - License[] licenses = module.getLicenses(); - for( int i=0; licenses != null && i < licenses.length; i++ ){ - Element license = new Element( "license", RSS2 ); - license.setText( licenses[i].getValue() ); - element.addContent( license ); - } + + private void generateRSS2(final CreativeCommons module, final Element element) { + final License[] licenses = module.getLicenses(); + for (int i = 0; licenses != null && i < licenses.length; i++) { + final Element license = new Element("license", RSS2); + license.setText(licenses[i].getValue()); + element.addContent(license); + } } } diff --git a/src/main/java/org/rometools/feed/module/cc/io/ModuleParserRSS1.java b/src/main/java/org/rometools/feed/module/cc/io/ModuleParserRSS1.java index 934f00a..dec665f 100644 --- a/src/main/java/org/rometools/feed/module/cc/io/ModuleParserRSS1.java +++ b/src/main/java/org/rometools/feed/module/cc/io/ModuleParserRSS1.java @@ -40,94 +40,96 @@ package org.rometools.feed.module.cc.io; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleParser; -import org.rometools.feed.module.cc.CreativeCommonsImpl; -import org.rometools.feed.module.cc.types.License; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.jdom.Element; -import org.jdom.Namespace; +import org.jdom2.Element; +import org.jdom2.Namespace; +import org.rometools.feed.module.cc.CreativeCommonsImpl; +import org.rometools.feed.module.cc.types.License; + +import com.sun.syndication.feed.module.Module; +import com.sun.syndication.io.ModuleParser; /** * @version $Revision: 1.3 $ * @author Robert "kebernet" Cooper */ public class ModuleParserRSS1 implements ModuleParser { - - private static final Namespace NS = Namespace.getNamespace( CreativeCommonsImpl.RSS1_URI ); - static final Namespace RDF = Namespace.getNamespace( CreativeCommonsImpl.RDF_URI ); + + private static final Namespace NS = Namespace.getNamespace(CreativeCommonsImpl.RSS1_URI); + static final Namespace RDF = Namespace.getNamespace(CreativeCommonsImpl.RDF_URI); + /** * Creates a new instance of ModuleParserRSS1 */ public ModuleParserRSS1() { } - public Module parse(Element element) { - CreativeCommonsImpl module = new CreativeCommonsImpl(); - { - // Parsing Channel level. - Element root =element; - while(root.getParentElement() != null ) - root = root.getParentElement(); - List licenseList = root.getChildren( "License", NS ); - ArrayList licenses = new ArrayList(); - Iterator it = licenseList.iterator(); - while( it.hasNext() ){ - Element licenseTag = (Element) it.next(); - String licenseURI = licenseTag.getAttributeValue("about", RDF); - if( licenseURI == null ) - continue; - License license = License.findByValue( licenseURI ); - { - ArrayList permitsValues = new ArrayList(); - ArrayList requiresValues = new ArrayList(); - List permitsTags = licenseTag.getChildren("permits", NS ); - Iterator sit = permitsTags.iterator(); - while(sit.hasNext() ){ - Element permitTag = (Element) sit.next(); - permitsValues.add( License.Behaviour.findByValue( permitTag.getAttributeValue( "resource", RDF) )); - } - List requiresTags = licenseTag.getChildren( "requires", NS); - sit = requiresTags.iterator(); - while(sit.hasNext()){ - Element requireTag = (Element) sit.next(); - requiresValues.add( License.Behaviour.findByValue(requireTag.getAttributeValue("resource", RDF))); - } - license = new License( licenseURI, - (License.Behaviour[]) requiresValues.toArray( new License.Behaviour[requiresValues.size()]), - (License.Behaviour[]) permitsValues.toArray( new License.Behaviour[permitsValues.size()]) ); - - } - - licenses.add( license ); - } - module.setAllLicenses( (License[]) licenses.toArray( new License[0] ) ); - } - ArrayList licenses = new ArrayList(); - List licenseTags = element.getChildren( "license", NS ); - Iterator lit = licenseTags.iterator(); - while( lit.hasNext() ){ - Element licenseTag = (Element) lit.next(); - licenses.add( License.findByValue( licenseTag.getAttributeValue( "resource", RDF))); - } - - if( licenses.size() > 0 ){ - module.setLicenses( (License[]) licenses.toArray( new License[licenses.size()])); - } - - if( module.getLicenses() != null || module.getAllLicenses() != null ){ - return module; - } else { - return null; - } + public Module parse(final Element element) { + final CreativeCommonsImpl module = new CreativeCommonsImpl(); + { + // Parsing Channel level. + Element root = element; + while (root.getParentElement() != null) { + root = root.getParentElement(); + } + final List licenseList = root.getChildren("License", NS); + final ArrayList licenses = new ArrayList(); + final Iterator it = licenseList.iterator(); + while (it.hasNext()) { + final Element licenseTag = (Element) it.next(); + final String licenseURI = licenseTag.getAttributeValue("about", RDF); + if (licenseURI == null) { + continue; + } + License license = License.findByValue(licenseURI); + { + final ArrayList permitsValues = new ArrayList(); + final ArrayList requiresValues = new ArrayList(); + final List permitsTags = licenseTag.getChildren("permits", NS); + Iterator sit = permitsTags.iterator(); + while (sit.hasNext()) { + final Element permitTag = (Element) sit.next(); + permitsValues.add(License.Behaviour.findByValue(permitTag.getAttributeValue("resource", RDF))); + } + final List requiresTags = licenseTag.getChildren("requires", NS); + sit = requiresTags.iterator(); + while (sit.hasNext()) { + final Element requireTag = (Element) sit.next(); + requiresValues.add(License.Behaviour.findByValue(requireTag.getAttributeValue("resource", RDF))); + } + license = new License(licenseURI, (License.Behaviour[]) requiresValues.toArray(new License.Behaviour[requiresValues.size()]), + (License.Behaviour[]) permitsValues.toArray(new License.Behaviour[permitsValues.size()])); + + } + + licenses.add(license); + } + module.setAllLicenses((License[]) licenses.toArray(new License[0])); + } + final ArrayList licenses = new ArrayList(); + final List licenseTags = element.getChildren("license", NS); + final Iterator lit = licenseTags.iterator(); + while (lit.hasNext()) { + final Element licenseTag = (Element) lit.next(); + licenses.add(License.findByValue(licenseTag.getAttributeValue("resource", RDF))); + } + + if (licenses.size() > 0) { + module.setLicenses((License[]) licenses.toArray(new License[licenses.size()])); + } + + if (module.getLicenses() != null || module.getAllLicenses() != null) { + return module; + } else { + return null; + } } public String getNamespaceUri() { - return CreativeCommonsImpl.RSS1_URI; + return CreativeCommonsImpl.RSS1_URI; } - + } diff --git a/src/main/java/org/rometools/feed/module/cc/io/ModuleParserRSS2.java b/src/main/java/org/rometools/feed/module/cc/io/ModuleParserRSS2.java index 69dd1e9..9b8f996 100644 --- a/src/main/java/org/rometools/feed/module/cc/io/ModuleParserRSS2.java +++ b/src/main/java/org/rometools/feed/module/cc/io/ModuleParserRSS2.java @@ -40,80 +40,85 @@ package org.rometools.feed.module.cc.io; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleParser; -import org.rometools.feed.module.cc.CreativeCommonsImpl; -import org.rometools.feed.module.cc.types.License; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.jdom.Element; -import org.jdom.Namespace; + +import org.jdom2.Element; +import org.jdom2.Namespace; +import org.rometools.feed.module.cc.CreativeCommonsImpl; +import org.rometools.feed.module.cc.types.License; + +import com.sun.syndication.feed.module.Module; +import com.sun.syndication.io.ModuleParser; /** - * + * * @version $Revision: 1.3 $ * @author Robert "kebernet" Cooper */ public class ModuleParserRSS2 implements ModuleParser { - - private static final Namespace NS = Namespace.getNamespace( CreativeCommonsImpl.RSS2_URI ); - + + private static final Namespace NS = Namespace.getNamespace(CreativeCommonsImpl.RSS2_URI); + /** Creates a new instance of ModuleParserRSS2 */ public ModuleParserRSS2() { } - public Module parse(Element element) { - CreativeCommonsImpl module = new CreativeCommonsImpl(); - //Do channel global - { - Element root = element; - while( !root.getName().equals("channel") && !root.getName().equals("feed") ) - root = root.getParentElement(); - ArrayList licenses = new ArrayList(); - List items = null; - if( root.getName().equals("channel")) - items = root.getChildren("item"); - else - items = root.getChildren("entry"); - - Iterator iit = items.iterator(); - while( iit.hasNext() ){ - Element item = (Element) iit.next(); - List licenseTags = item.getChildren( "license", NS ); - Iterator lit = licenseTags.iterator(); - while(lit.hasNext() ){ - Element licenseTag = (Element) lit.next(); - License license = License.findByValue( licenseTag.getTextTrim() ); - if( !licenses.contains( license )); - licenses.add( license ); - } - } - if( licenses.size() > 0 ){ - module.setAllLicenses( (License[]) licenses.toArray( new License[0] ) ); - } - } - // do element local - ArrayList licenses = new ArrayList(); - List licenseTags = element.getChildren( "license", NS ); - Iterator it = licenseTags.iterator(); - while( it.hasNext() ){ - Element licenseTag = (Element) it.next(); - licenses.add( License.findByValue(licenseTag.getTextTrim() )); - } - if( licenses.size() > 0 ){ - module.setLicenses( (License[]) licenses.toArray( new License[0])); - } - - if( module.getLicenses() != null && module.getAllLicenses() != null ){ - return module; - } else { - return null; - } + public Module parse(final Element element) { + final CreativeCommonsImpl module = new CreativeCommonsImpl(); + // Do channel global + { + Element root = element; + while (!root.getName().equals("channel") && !root.getName().equals("feed")) { + root = root.getParentElement(); + } + final ArrayList licenses = new ArrayList(); + List items = null; + if (root.getName().equals("channel")) { + items = root.getChildren("item"); + } else { + items = root.getChildren("entry"); + } + + final Iterator iit = items.iterator(); + while (iit.hasNext()) { + final Element item = (Element) iit.next(); + final List licenseTags = item.getChildren("license", NS); + final Iterator lit = licenseTags.iterator(); + while (lit.hasNext()) { + final Element licenseTag = (Element) lit.next(); + final License license = License.findByValue(licenseTag.getTextTrim()); + if (!licenses.contains(license)) { + ; + } + licenses.add(license); + } + } + if (licenses.size() > 0) { + module.setAllLicenses((License[]) licenses.toArray(new License[0])); + } + } + // do element local + final ArrayList licenses = new ArrayList(); + final List licenseTags = element.getChildren("license", NS); + final Iterator it = licenseTags.iterator(); + while (it.hasNext()) { + final Element licenseTag = (Element) it.next(); + licenses.add(License.findByValue(licenseTag.getTextTrim())); + } + if (licenses.size() > 0) { + module.setLicenses((License[]) licenses.toArray(new License[0])); + } + + if (module.getLicenses() != null && module.getAllLicenses() != null) { + return module; + } else { + return null; + } } public String getNamespaceUri() { - return CreativeCommonsImpl.RSS2_URI; + return CreativeCommonsImpl.RSS2_URI; } } diff --git a/src/main/java/org/rometools/feed/module/cc/types/License.java b/src/main/java/org/rometools/feed/module/cc/types/License.java index 60aacd1..0b2d5d6 100644 --- a/src/main/java/org/rometools/feed/module/cc/types/License.java +++ b/src/main/java/org/rometools/feed/module/cc/types/License.java @@ -3,7 +3,7 @@ * * Created on November 20, 2005, 3:20 PM * -* This library is provided under dual licenses. + * This library is provided under dual licenses. * You may choose the terms of the Lesser General Public License or the Apache * License at your discretion. * @@ -39,12 +39,13 @@ */ package org.rometools.feed.module.cc.types; -import com.sun.syndication.feed.impl.EqualsBean; -import com.sun.syndication.feed.impl.ToStringBean; import java.util.HashMap; import java.util.Iterator; import java.util.StringTokenizer; +import com.sun.syndication.feed.impl.EqualsBean; +import com.sun.syndication.feed.impl.ToStringBean; + /** * @version $Revision: 1.1 $ * @author Robert "kebernet" Cooper @@ -52,151 +53,135 @@ import java.util.StringTokenizer; public class License { private static final String CC_START = "http://creativecommons.org/licenses/"; private static final HashMap lookupLicense = new HashMap(); - public static final License NO_DERIVS = new License("http://creativecommons.org/licenses/nd/1.0/",new Behaviour[0],new Behaviour[] { - Behaviour.DISTRIBUTION,Behaviour.REPRODUCTION - }); - public static final License NO_DERIVS_NONCOMMERCIAL = new License("http://creativecommons.org/licenses/nd-nc/1.0/",new Behaviour[] { - Behaviour.NONCOMMERCIAL - },new Behaviour[] {Behaviour.DISTRIBUTION,Behaviour.REPRODUCTION}); - public static final License NONCOMMERCIAL = new License("http://creativecommons.org/licenses/nc/1.0/",new Behaviour[] { - Behaviour.NONCOMMERCIAL - },new Behaviour[] { - Behaviour.DERIVATIVE,Behaviour.DISTRIBUTION,Behaviour.REPRODUCTION - }); - public static final License SHARE_ALIKE = new License("http://creativecommons.org/licenses/sa/1.0/",new Behaviour[] { - Behaviour.COPYLEFT - },new Behaviour[] { - Behaviour.DERIVATIVE,Behaviour.DISTRIBUTION,Behaviour.REPRODUCTION - }); - public static final License SHARE_ALIKE_NONCOMMERCIAL = new License("http://creativecommons.org/licenses/nc-sa/1.0/",new Behaviour[] { - Behaviour.COPYLEFT,Behaviour.NONCOMMERCIAL - },new Behaviour[] { - Behaviour.DERIVATIVE,Behaviour.DISTRIBUTION,Behaviour.REPRODUCTION - }); - public static final License SHARE_ALIKE_ATTRIBUTION = new License("http://creativecommons.org/licenses/by-sa/2.5/",new Behaviour[] { - Behaviour.COPYLEFT,Behaviour.ATTRIBUTION - },new Behaviour[] { - Behaviour.DERIVATIVE,Behaviour.DISTRIBUTION,Behaviour.REPRODUCTION - }); - public static final License SHARE_ALIKE_NONCOMMERCIAL_ATTRIBUTION = new License("http://creativecommons.org/licenses/by-nc-sa/2.5/",new Behaviour[] { - Behaviour.COPYLEFT,Behaviour.ATTRIBUTION,Behaviour.NONCOMMERCIAL - },new Behaviour[] { - Behaviour.DERIVATIVE,Behaviour.DISTRIBUTION,Behaviour.REPRODUCTION - }); - public static final License NONCOMMERCIAL_ATTRIBUTION = new License("http://creativecommons.org/licenses/by-nc/2.5/",new Behaviour[] { - Behaviour.ATTRIBUTION,Behaviour.NONCOMMERCIAL - },new Behaviour[] { - Behaviour.DERIVATIVE,Behaviour.DISTRIBUTION,Behaviour.REPRODUCTION - }); - public static final License NONCOMMERCIAL_ATTRIBUTION_NO_DERIVS = new License("http://creativecommons.org/licenses/by-nc-nd/2.5/",new Behaviour[] { - Behaviour.ATTRIBUTION,Behaviour.NONCOMMERCIAL - },new Behaviour[] {Behaviour.DISTRIBUTION,Behaviour.REPRODUCTION}); - public static final License ATTRIBUTION_NO_DERIVS = new License("http://creativecommons.org/licenses/by-nd/2.5/",new Behaviour[] { - Behaviour.ATTRIBUTION - },new Behaviour[] {Behaviour.DISTRIBUTION,Behaviour.REPRODUCTION}); - public static final License ATTRIBUTION = new License("http://creativecommons.org/licenses/by/2.5/",new Behaviour[] { - Behaviour.ATTRIBUTION - },new Behaviour[] { - Behaviour.DERIVATIVE,Behaviour.DISTRIBUTION,Behaviour.REPRODUCTION - }); - private String uri; - private Behaviour[] permits; - private Behaviour[] requires; - + public static final License NO_DERIVS = new License("http://creativecommons.org/licenses/nd/1.0/", new Behaviour[0], new Behaviour[] { + Behaviour.DISTRIBUTION, Behaviour.REPRODUCTION }); + public static final License NO_DERIVS_NONCOMMERCIAL = new License("http://creativecommons.org/licenses/nd-nc/1.0/", + new Behaviour[] { Behaviour.NONCOMMERCIAL }, new Behaviour[] { Behaviour.DISTRIBUTION, Behaviour.REPRODUCTION }); + public static final License NONCOMMERCIAL = new License("http://creativecommons.org/licenses/nc/1.0/", new Behaviour[] { Behaviour.NONCOMMERCIAL }, + new Behaviour[] { Behaviour.DERIVATIVE, Behaviour.DISTRIBUTION, Behaviour.REPRODUCTION }); + public static final License SHARE_ALIKE = new License("http://creativecommons.org/licenses/sa/1.0/", new Behaviour[] { Behaviour.COPYLEFT }, + new Behaviour[] { Behaviour.DERIVATIVE, Behaviour.DISTRIBUTION, Behaviour.REPRODUCTION }); + public static final License SHARE_ALIKE_NONCOMMERCIAL = new License("http://creativecommons.org/licenses/nc-sa/1.0/", new Behaviour[] { Behaviour.COPYLEFT, + Behaviour.NONCOMMERCIAL }, new Behaviour[] { Behaviour.DERIVATIVE, Behaviour.DISTRIBUTION, Behaviour.REPRODUCTION }); + public static final License SHARE_ALIKE_ATTRIBUTION = new License("http://creativecommons.org/licenses/by-sa/2.5/", new Behaviour[] { Behaviour.COPYLEFT, + Behaviour.ATTRIBUTION }, new Behaviour[] { Behaviour.DERIVATIVE, Behaviour.DISTRIBUTION, Behaviour.REPRODUCTION }); + public static final License SHARE_ALIKE_NONCOMMERCIAL_ATTRIBUTION = new License("http://creativecommons.org/licenses/by-nc-sa/2.5/", new Behaviour[] { + Behaviour.COPYLEFT, Behaviour.ATTRIBUTION, Behaviour.NONCOMMERCIAL }, new Behaviour[] { Behaviour.DERIVATIVE, Behaviour.DISTRIBUTION, + Behaviour.REPRODUCTION }); + public static final License NONCOMMERCIAL_ATTRIBUTION = new License("http://creativecommons.org/licenses/by-nc/2.5/", new Behaviour[] { + Behaviour.ATTRIBUTION, Behaviour.NONCOMMERCIAL }, new Behaviour[] { Behaviour.DERIVATIVE, Behaviour.DISTRIBUTION, Behaviour.REPRODUCTION }); + public static final License NONCOMMERCIAL_ATTRIBUTION_NO_DERIVS = new License("http://creativecommons.org/licenses/by-nc-nd/2.5/", new Behaviour[] { + Behaviour.ATTRIBUTION, Behaviour.NONCOMMERCIAL }, new Behaviour[] { Behaviour.DISTRIBUTION, Behaviour.REPRODUCTION }); + public static final License ATTRIBUTION_NO_DERIVS = new License("http://creativecommons.org/licenses/by-nd/2.5/", + new Behaviour[] { Behaviour.ATTRIBUTION }, new Behaviour[] { Behaviour.DISTRIBUTION, Behaviour.REPRODUCTION }); + public static final License ATTRIBUTION = new License("http://creativecommons.org/licenses/by/2.5/", new Behaviour[] { Behaviour.ATTRIBUTION }, + new Behaviour[] { Behaviour.DERIVATIVE, Behaviour.DISTRIBUTION, Behaviour.REPRODUCTION }); + private final String uri; + private final Behaviour[] permits; + private final Behaviour[] requires; + /** * Creates a new instance of License */ - public License(String uri,Behaviour[] requires,Behaviour[] permits) { - this.requires = requires; - this.permits = permits; - this.uri = uri; - License.lookupLicense.put(uri,this); - - if(this.uri.endsWith("/")) { - //System.out.println(uri.substring(0,this.uri.lastIndexOf("/"))); - License.lookupLicense.put(uri.substring(0,this.uri.lastIndexOf("/")),this); - } + public License(final String uri, final Behaviour[] requires, final Behaviour[] permits) { + this.requires = requires; + this.permits = permits; + this.uri = uri; + License.lookupLicense.put(uri, this); + + if (this.uri.endsWith("/")) { + // System.out.println(uri.substring(0,this.uri.lastIndexOf("/"))); + License.lookupLicense.put(uri.substring(0, this.uri.lastIndexOf("/")), this); + } } - - public static License findByValue(String uri) { - License found = (License)License.lookupLicense.get(uri); - - //No I am going to try an guess about unknown licenses - // This is try and match known CC licenses of other versions or various URLs to - // current licenses, then make a new one with the same permissions. - if(found == null && uri.startsWith("http://") && uri.toLowerCase().indexOf("creativecommons.org") != -1) { - Iterator it = License.lookupLicense.keySet().iterator(); - while(it.hasNext()&&(found == null)) { - try{ - String key = (String)it.next(); - if(key.startsWith( CC_START ) ){ - String licensePath = key.substring( CC_START.length(), key.length() ); - StringTokenizer tok = new StringTokenizer( licensePath, "/"); - String license = tok.nextToken(); - String version = tok.nextToken(); - if( uri.toLowerCase().indexOf("creativecommons.org/licenses/"+license) != -1){ - License current = (License) lookupLicense.get( key ); - found = new License( uri, current.getRequires(), current.getPermits() ); - } - } - } catch(Exception e){ - e.printStackTrace(); - } - } - } - //OK, we got here. If we haven't found a match, return a new License with unknown permissions. - if( found == null ){ - found = new License( uri, null, null ); - } - return found; + + public static License findByValue(final String uri) { + License found = (License) License.lookupLicense.get(uri); + + // No I am going to try an guess about unknown licenses + // This is try and match known CC licenses of other versions or various URLs to + // current licenses, then make a new one with the same permissions. + if (found == null && uri.startsWith("http://") && uri.toLowerCase().indexOf("creativecommons.org") != -1) { + final Iterator it = License.lookupLicense.keySet().iterator(); + while (it.hasNext() && found == null) { + try { + final String key = (String) it.next(); + if (key.startsWith(CC_START)) { + final String licensePath = key.substring(CC_START.length(), key.length()); + final StringTokenizer tok = new StringTokenizer(licensePath, "/"); + final String license = tok.nextToken(); + final String version = tok.nextToken(); + if (uri.toLowerCase().indexOf("creativecommons.org/licenses/" + license) != -1) { + final License current = (License) lookupLicense.get(key); + found = new License(uri, current.getRequires(), current.getPermits()); + } + } + } catch (final Exception e) { + e.printStackTrace(); + } + } + } + // OK, we got here. If we haven't found a match, return a new License with unknown permissions. + if (found == null) { + found = new License(uri, null, null); + } + return found; } - + public Behaviour[] getPermits() { - return this.permits; + return permits; } - + public Behaviour[] getRequires() { - return this.requires; + return requires; } + + @Override public String toString() { - - ToStringBean tsb = new ToStringBean( License.class, this ); - return tsb.toString(); + + final ToStringBean tsb = new ToStringBean(License.class, this); + return tsb.toString(); } + public String getValue() { - return this.uri; + return uri; } - public boolean equals(Object obj) { - EqualsBean eBean = new EqualsBean(License.class,this); - return eBean.beanEquals(obj); + + @Override + public boolean equals(final Object obj) { + final EqualsBean eBean = new EqualsBean(License.class, this); + return eBean.beanEquals(obj); } - + + @Override public int hashCode() { - EqualsBean equals = new EqualsBean(License.class,this); - return equals.beanHashCode(); + final EqualsBean equals = new EqualsBean(License.class, this); + return equals.beanHashCode(); } + public static class Behaviour { - private static final HashMap lookup = new HashMap(); - public static final Behaviour REPRODUCTION = new Behaviour("http://web.resource.org/cc/Reproduction"); - public static final Behaviour DISTRIBUTION = new Behaviour("http://web.resource.org/cc/Distribution"); - public static final Behaviour DERIVATIVE = new Behaviour("http://web.resource.org/cc/DerivativeWorks"); - public static final Behaviour NOTICE = new Behaviour("http://web.resource.org/cc/Notice"); - public static final Behaviour ATTRIBUTION = new Behaviour("http://web.resource.org/cc/Attribution"); - public static final Behaviour COPYLEFT = new Behaviour("http://web.resource.org/cc/Copyleft"); - public static final Behaviour NONCOMMERCIAL = new Behaviour("http://web.resource.org/cc/Noncommercial"); - private String uri; - - private Behaviour(String uri) { - this.uri = uri; - Behaviour.lookup.put(uri,this); - } - - public static Behaviour findByValue(String uri) { - return (Behaviour)Behaviour.lookup.get(uri); - } - - public String toString() { - return this.uri; - } + private static final HashMap lookup = new HashMap(); + public static final Behaviour REPRODUCTION = new Behaviour("http://web.resource.org/cc/Reproduction"); + public static final Behaviour DISTRIBUTION = new Behaviour("http://web.resource.org/cc/Distribution"); + public static final Behaviour DERIVATIVE = new Behaviour("http://web.resource.org/cc/DerivativeWorks"); + public static final Behaviour NOTICE = new Behaviour("http://web.resource.org/cc/Notice"); + public static final Behaviour ATTRIBUTION = new Behaviour("http://web.resource.org/cc/Attribution"); + public static final Behaviour COPYLEFT = new Behaviour("http://web.resource.org/cc/Copyleft"); + public static final Behaviour NONCOMMERCIAL = new Behaviour("http://web.resource.org/cc/Noncommercial"); + private final String uri; + + private Behaviour(final String uri) { + this.uri = uri; + Behaviour.lookup.put(uri, this); + } + + public static Behaviour findByValue(final String uri) { + return (Behaviour) Behaviour.lookup.get(uri); + } + + @Override + public String toString() { + return uri; + } } } diff --git a/src/main/java/org/rometools/feed/module/content/ContentItem.java b/src/main/java/org/rometools/feed/module/content/ContentItem.java index 8f9a45e..c70f250 100644 --- a/src/main/java/org/rometools/feed/module/content/ContentItem.java +++ b/src/main/java/org/rometools/feed/module/content/ContentItem.java @@ -43,11 +43,11 @@ package org.rometools.feed.module.content; import java.util.List; - -/** This class represents a content item per the "Original Syntax". - * http://purl.org/rss/1.0/modules/content/ +/** + * This class represents a content item per the "Original Syntax". http://purl.org/rss/1.0/modules/content/ + * * @version $Revision: 1.1 $ - * @author Robert "kebernet" Cooper + * @author Robert "kebernet" Cooper */ public class ContentItem implements Cloneable { private String contentFormat; @@ -64,70 +64,71 @@ public class ContentItem implements Cloneable { } public String getContentFormat() { - return this.contentFormat; + return contentFormat; } - public void setContentFormat(String contentFormat) { + public void setContentFormat(final String contentFormat) { this.contentFormat = contentFormat; } public String getContentEncoding() { - return this.contentEncoding; + return contentEncoding; } - public void setContentEncoding(String contentEncoding) { + public void setContentEncoding(final String contentEncoding) { this.contentEncoding = contentEncoding; } public String getContentValue() { - return this.contentValue; + return contentValue; } - public void setContentValue(String contentValue) { + public void setContentValue(final String contentValue) { this.contentValue = contentValue; } public List getContentValueDOM() { - return this.contentValueDOM; + return contentValueDOM; } - public void setContentValueDOM(List contentValueDOM) { + public void setContentValueDOM(final List contentValueDOM) { this.contentValueDOM = contentValueDOM; } public String getContentAbout() { - return this.contentAbout; + return contentAbout; } - public void setContentAbout(String contentAbout) { + public void setContentAbout(final String contentAbout) { this.contentAbout = contentAbout; } public String getContentValueParseType() { - return this.contentValueParseType; + return contentValueParseType; } - public void setContentValueParseType(String contentValueParseType) { + public void setContentValueParseType(final String contentValueParseType) { this.contentValueParseType = contentValueParseType; } public List getContentValueNamespaces() { - return this.contentValueNamespace; + return contentValueNamespace; } - public void setContentValueNamespaces(List contentValueNamespace) { + public void setContentValueNamespaces(final List contentValueNamespace) { this.contentValueNamespace = contentValueNamespace; } public String getContentResource() { - return this.contentResource; + return contentResource; } - public void setContentResource(String contentResource) { + public void setContentResource(final String contentResource) { this.contentResource = contentResource; } - public boolean equals(Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == null) { return false; } @@ -135,68 +136,70 @@ public class ContentItem implements Cloneable { return false; } final ContentItem other = (ContentItem) obj; - if ((this.contentFormat == null) ? (other.contentFormat != null) : !this.contentFormat.equals(other.contentFormat)) { - //System.out.println("format"); + if (contentFormat == null ? other.contentFormat != null : !contentFormat.equals(other.contentFormat)) { + // System.out.println("format"); return false; } - if ((this.contentEncoding == null) ? (other.contentEncoding != null) : !this.contentEncoding.equals(other.contentEncoding)) { - //System.out.println("enc"); + if (contentEncoding == null ? other.contentEncoding != null : !contentEncoding.equals(other.contentEncoding)) { + // System.out.println("enc"); return false; } - String thisCV = this.contentValue.replaceAll(" xmlns=\"http://www.w3.org/1999/xhtml\"", "").trim();; - String thatCV = other.contentValue.replaceAll(" xmlns=\"http://www.w3.org/1999/xhtml\"", "").trim(); - if ((this.contentValue == null) ? (other.contentValue != null) : !thisCV.equals(thatCV)) { + final String thisCV = contentValue.replaceAll(" xmlns=\"http://www.w3.org/1999/xhtml\"", "").trim(); + ; + final String thatCV = other.contentValue.replaceAll(" xmlns=\"http://www.w3.org/1999/xhtml\"", "").trim(); + if (contentValue == null ? other.contentValue != null : !thisCV.equals(thatCV)) { return false; } - if (this.contentValueDOM != other.contentValueDOM && (this.contentValueDOM == null || !this.contentValueDOM.equals(other.contentValueDOM))) { - //System.out.println("vd"); + if (contentValueDOM != other.contentValueDOM && (contentValueDOM == null || !contentValueDOM.equals(other.contentValueDOM))) { + // System.out.println("vd"); return false; } - if ((this.contentAbout == null) ? (other.contentAbout != null) : !this.contentAbout.equals(other.contentAbout)) { - //System.out.println("abt"); + if (contentAbout == null ? other.contentAbout != null : !contentAbout.equals(other.contentAbout)) { + // System.out.println("abt"); return false; } - if ((this.contentValueParseType == null) ? (other.contentValueParseType != null) : !this.contentValueParseType.equals(other.contentValueParseType)) { - //System.out.println("pt"); + if (contentValueParseType == null ? other.contentValueParseType != null : !contentValueParseType.equals(other.contentValueParseType)) { + // System.out.println("pt"); return false; } - if (this.contentValueNamespace != other.contentValueNamespace && (this.contentValueNamespace == null || !this.contentValueNamespace.equals(other.contentValueNamespace))) { - //System.out.println("ns"); + if (contentValueNamespace != other.contentValueNamespace + && (contentValueNamespace == null || !contentValueNamespace.equals(other.contentValueNamespace))) { + // System.out.println("ns"); return false; } - if ((this.contentResource == null) ? (other.contentResource != null) : !this.contentResource.equals(other.contentResource)) { - //System.out.println("res"); + if (contentResource == null ? other.contentResource != null : !contentResource.equals(other.contentResource)) { + // System.out.println("res"); return false; } return true; } - + @Override public int hashCode() { int hash = 7; - hash = 97 * hash + (this.contentFormat != null ? this.contentFormat.hashCode() : 0); - hash = 97 * hash + (this.contentEncoding != null ? this.contentEncoding.hashCode() : 0); - hash = 97 * hash + (this.contentValue != null ? this.contentValue.hashCode() : 0); - hash = 97 * hash + (this.contentValueDOM != null ? this.contentValueDOM.hashCode() : 0); - hash = 97 * hash + (this.contentAbout != null ? this.contentAbout.hashCode() : 0); - hash = 97 * hash + (this.contentValueParseType != null ? this.contentValueParseType.hashCode() : 0); - hash = 97 * hash + (this.contentValueNamespace != null ? this.contentValueNamespace.hashCode() : 0); - hash = 97 * hash + (this.contentResource != null ? this.contentResource.hashCode() : 0); + hash = 97 * hash + (contentFormat != null ? contentFormat.hashCode() : 0); + hash = 97 * hash + (contentEncoding != null ? contentEncoding.hashCode() : 0); + hash = 97 * hash + (contentValue != null ? contentValue.hashCode() : 0); + hash = 97 * hash + (contentValueDOM != null ? contentValueDOM.hashCode() : 0); + hash = 97 * hash + (contentAbout != null ? contentAbout.hashCode() : 0); + hash = 97 * hash + (contentValueParseType != null ? contentValueParseType.hashCode() : 0); + hash = 97 * hash + (contentValueNamespace != null ? contentValueNamespace.hashCode() : 0); + hash = 97 * hash + (contentResource != null ? contentResource.hashCode() : 0); return hash; } - + @Override public Object clone() { - ContentItem o = new ContentItem(); - o.contentAbout = this.contentAbout; - o.contentEncoding = this.contentEncoding; - o.contentFormat = this.contentFormat; - o.contentResource = this.contentResource; - o.contentValue = this.contentValue; - o.contentValueDOM = this.contentValueDOM; - o.contentValueNamespace = this.contentValueNamespace; - o.contentValueParseType = this.contentValueParseType; + final ContentItem o = new ContentItem(); + o.contentAbout = contentAbout; + o.contentEncoding = contentEncoding; + o.contentFormat = contentFormat; + o.contentResource = contentResource; + o.contentValue = contentValue; + o.contentValueDOM = contentValueDOM; + o.contentValueNamespace = contentValueNamespace; + o.contentValueParseType = contentValueParseType; return o; } diff --git a/src/main/java/org/rometools/feed/module/content/ContentModule.java b/src/main/java/org/rometools/feed/module/content/ContentModule.java index 15b4b6d..687fe57 100644 --- a/src/main/java/org/rometools/feed/module/content/ContentModule.java +++ b/src/main/java/org/rometools/feed/module/content/ContentModule.java @@ -40,26 +40,28 @@ */ package org.rometools.feed.module.content; -import com.sun.syndication.feed.module.Module; import java.util.List; +import com.sun.syndication.feed.module.Module; /** * @version $Revision: 1.1 $ - * @author Robert "kebernet" Cooper + * @author Robert "kebernet" Cooper */ public interface ContentModule extends Module { public static final String URI = "http://purl.org/rss/1.0/modules/content/"; public static final String RDF_URI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - /** Returns a List of Strings containing the New Syntax Encoded values - * are in the element. + /** + * Returns a List of Strings containing the New Syntax Encoded values are in the element. + * * @return List of content Strings */ public List getEncodeds(); - /** Sets a List of Strings containing the New Syntax Encoded values - * are in the element. + /** + * Sets a List of Strings containing the New Syntax Encoded values are in the element. + * * @return List of content Strings */ public void setEncodeds(List encodeds); @@ -68,26 +70,32 @@ public interface ContentModule extends Module { public String toString(String str); - /** Contains a list of ContentItems that represent the "Original Syntax" set. + /** + * Contains a list of ContentItems that represent the "Original Syntax" set. + * * @see com.totsp.xml.syndication.content.ContentItem * @return List of ContentItems. */ public List getContentItems(); - /** Contains a list of ContentItems that represent the "Original Syntax" set. + /** + * Contains a list of ContentItems that represent the "Original Syntax" set. + * * @see com.totsp.xml.syndication.content.ContentItem * @param List of ContentItems. */ public void setContentItems(List list); - /** Returns a List of Strings containing whatever new or original syntax items - * are in the element. + /** + * Returns a List of Strings containing whatever new or original syntax items are in the element. + * * @return List of content Strings */ public List getContents(); - /** Sets a List of Strings containing whatever new or original syntax items - * are in the element. + /** + * Sets a List of Strings containing whatever new or original syntax items are in the element. + * * @return List of content Strings */ public void setContents(List contents); diff --git a/src/main/java/org/rometools/feed/module/content/ContentModuleImpl.java b/src/main/java/org/rometools/feed/module/content/ContentModuleImpl.java index d0f1e74..d5491af 100644 --- a/src/main/java/org/rometools/feed/module/content/ContentModuleImpl.java +++ b/src/main/java/org/rometools/feed/module/content/ContentModuleImpl.java @@ -43,14 +43,14 @@ */ package org.rometools.feed.module.content; -import com.sun.syndication.feed.CopyFrom; import java.util.ArrayList; import java.util.List; +import com.sun.syndication.feed.CopyFrom; /** * @version $Revision: 1.4 $ - * @author Robert "kebernet" Cooper + * @author Robert "kebernet" Cooper */ public class ContentModuleImpl extends com.sun.syndication.feed.module.ModuleImpl implements ContentModule { private List encodeds; @@ -61,24 +61,24 @@ public class ContentModuleImpl extends com.sun.syndication.feed.module.ModuleImp super(ContentModuleImpl.class, URI); } - protected ContentModuleImpl(java.lang.Class beanClass, java.lang.String uri) { + protected ContentModuleImpl(final java.lang.Class beanClass, final java.lang.String uri) { super(beanClass, uri); } public List getEncodeds() { - this.encodeds = this.encodeds == null ? new ArrayList() : this.encodeds; - return this.encodeds; + encodeds = encodeds == null ? new ArrayList() : encodeds; + return encodeds; } - public void setEncodeds(List encodeds) { + public void setEncodeds(final List encodeds) { this.encodeds = encodeds; } - public void copyFrom(CopyFrom obj) { - ContentModule cm = (ContentModule) obj; - this.setEncodeds(cm.getEncodeds()); - this.setContentItems(cm.getContentItems()); - this.setContents(cm.getContents()); + public void copyFrom(final CopyFrom obj) { + final ContentModule cm = (ContentModule) obj; + setEncodeds(cm.getEncodeds()); + setContentItems(cm.getContentItems()); + setContents(cm.getContents()); } public Class getInterface() { @@ -86,24 +86,24 @@ public class ContentModuleImpl extends com.sun.syndication.feed.module.ModuleImp } public List getContentItems() { - this.contentItems = this.contentItems == null ? new ArrayList() : this.contentItems; - return this.contentItems; + contentItems = contentItems == null ? new ArrayList() : contentItems; + return contentItems; } - public void setContentItems(List list) { - this.contentItems = list; + public void setContentItems(final List list) { + contentItems = list; } public List getContents() { - this.contents = this.contents == null ? new ArrayList() : this.contents; - return this.contents; + contents = contents == null ? new ArrayList() : contents; + return contents; } - public void setContents(List contents) { + public void setContents(final List contents) { this.contents = contents; } - public String toString(String str) { + public String toString(final String str) { return contentItems.toString(); } } diff --git a/src/main/java/org/rometools/feed/module/content/io/ContentModuleGenerator.java b/src/main/java/org/rometools/feed/module/content/io/ContentModuleGenerator.java index b381b71..0a01529 100644 --- a/src/main/java/org/rometools/feed/module/content/io/ContentModuleGenerator.java +++ b/src/main/java/org/rometools/feed/module/content/io/ContentModuleGenerator.java @@ -41,23 +41,23 @@ */ package org.rometools.feed.module.content.io; -import org.rometools.feed.module.content.ContentItem; -import org.rometools.feed.module.content.ContentModule; -import org.jdom.Attribute; -import org.jdom.CDATA; -import org.jdom.Content; -import org.jdom.Element; -import org.jdom.Namespace; - import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; +import org.jdom2.Attribute; +import org.jdom2.CDATA; +import org.jdom2.Content; +import org.jdom2.Element; +import org.jdom2.Namespace; +import org.rometools.feed.module.content.ContentItem; +import org.rometools.feed.module.content.ContentModule; + /** * @version $Revision: 1.2 $ - * @author Robert "kebernet" Cooper + * @author Robert "kebernet" Cooper */ public class ContentModuleGenerator implements com.sun.syndication.io.ModuleGenerator { private static final Namespace CONTENT_NS = Namespace.getNamespace("content", ContentModule.URI); @@ -65,7 +65,7 @@ public class ContentModuleGenerator implements com.sun.syndication.io.ModuleGene private static final Set NAMESPACES; static { - Set nss = new HashSet(); + final Set nss = new HashSet(); nss.add(CONTENT_NS); NAMESPACES = Collections.unmodifiableSet(nss); } @@ -74,11 +74,11 @@ public class ContentModuleGenerator implements com.sun.syndication.io.ModuleGene public ContentModuleGenerator() { } - public void generate(com.sun.syndication.feed.module.Module module, org.jdom.Element element) { + public void generate(final com.sun.syndication.feed.module.Module module, final org.jdom2.Element element) { // this is not necessary, it is done to avoid the namespace definition in every item. Element root = element; - while ((root.getParent() != null) && root.getParent() instanceof Element) { + while (root.getParent() != null && root.getParent() instanceof Element) { root = (Element) root.getParent(); } @@ -88,10 +88,10 @@ public class ContentModuleGenerator implements com.sun.syndication.io.ModuleGene return; } - ContentModule cm = (ContentModule) module; + final ContentModule cm = (ContentModule) module; + + final List encodeds = cm.getEncodeds(); - List encodeds = cm.getEncodeds(); - // if (encodeds != null) { System.out.println(cm.getEncodeds().size()); @@ -100,61 +100,60 @@ public class ContentModuleGenerator implements com.sun.syndication.io.ModuleGene } } - List contentItems = cm.getContentItems(); + final List contentItems = cm.getContentItems(); - if ((contentItems != null) && (contentItems.size() > 0)) { - Element items = new Element("items", CONTENT_NS); - Element bag = new Element("Bag", RDF_NS); + if (contentItems != null && contentItems.size() > 0) { + final Element items = new Element("items", CONTENT_NS); + final Element bag = new Element("Bag", RDF_NS); items.addContent(bag); for (int i = 0; i < contentItems.size(); i++) { - ContentItem contentItem = (ContentItem) contentItems.get(i); - Element li = new Element("li", RDF_NS); - Element item = new Element("item", CONTENT_NS); + final ContentItem contentItem = (ContentItem) contentItems.get(i); + final Element li = new Element("li", RDF_NS); + final Element item = new Element("item", CONTENT_NS); if (contentItem.getContentAbout() != null) { - Attribute about = new Attribute("about", contentItem.getContentAbout(), RDF_NS); + final Attribute about = new Attribute("about", contentItem.getContentAbout(), RDF_NS); item.setAttribute(about); } if (contentItem.getContentFormat() != null) { - //System.out.println( "Format"); - Element format = new Element("format", CONTENT_NS); - Attribute formatResource = new Attribute("resource", contentItem.getContentFormat(), RDF_NS); + // System.out.println( "Format"); + final Element format = new Element("format", CONTENT_NS); + final Attribute formatResource = new Attribute("resource", contentItem.getContentFormat(), RDF_NS); format.setAttribute(formatResource); item.addContent(format); } if (contentItem.getContentEncoding() != null) { - //System.out.println( "Encoding"); - Element encoding = new Element("encoding", CONTENT_NS); - Attribute encodingResource = new Attribute("resource", contentItem.getContentEncoding(), RDF_NS); + // System.out.println( "Encoding"); + final Element encoding = new Element("encoding", CONTENT_NS); + final Attribute encodingResource = new Attribute("resource", contentItem.getContentEncoding(), RDF_NS); encoding.setAttribute(encodingResource); item.addContent(encoding); } if (contentItem.getContentValue() != null) { - Element value = new Element("value", RDF_NS); + final Element value = new Element("value", RDF_NS); if (contentItem.getContentValueParseType() != null) { - Attribute parseType = new Attribute("parseType", contentItem.getContentValueParseType(), RDF_NS); + final Attribute parseType = new Attribute("parseType", contentItem.getContentValueParseType(), RDF_NS); value.setAttribute(parseType); } if (contentItem.getContentValueNamespaces() != null) { - List namespaces = contentItem.getContentValueNamespaces(); + final List namespaces = contentItem.getContentValueNamespaces(); for (int ni = 0; ni < namespaces.size(); ni++) { value.addNamespaceDeclaration((Namespace) namespaces.get(ni)); } } - List detached = new ArrayList(); + final List detached = new ArrayList(); - for (int c = 0; - c < contentItem.getContentValueDOM().size(); c++) { - detached.add(((Content) ((Content) contentItem.getContentValueDOM().get(c)).clone()).detach()); + for (int c = 0; c < contentItem.getContentValueDOM().size(); c++) { + detached.add(((Content) contentItem.getContentValueDOM().get(c)).clone().detach()); } value.setContent(detached); @@ -163,22 +162,22 @@ public class ContentModuleGenerator implements com.sun.syndication.io.ModuleGene li.addContent(item); bag.addContent(li); - } //end contentItems loop + } // end contentItems loop element.addContent(items); } } - protected Element generateSimpleElement(String name, String value) { - Element element = new Element(name, CONTENT_NS); + protected Element generateSimpleElement(final String name, final String value) { + final Element element = new Element(name, CONTENT_NS); element.addContent(value); return element; } - protected Element generateCDATAElement(String name, String value) { - Element element = new Element(name, CONTENT_NS); - CDATA cdata = new CDATA(value); + protected Element generateCDATAElement(final String name, final String value) { + final Element element = new Element(name, CONTENT_NS); + final CDATA cdata = new CDATA(value); element.addContent(cdata); return element; diff --git a/src/main/java/org/rometools/feed/module/content/io/ContentModuleParser.java b/src/main/java/org/rometools/feed/module/content/io/ContentModuleParser.java index 36accd9..a235ea4 100644 --- a/src/main/java/org/rometools/feed/module/content/io/ContentModuleParser.java +++ b/src/main/java/org/rometools/feed/module/content/io/ContentModuleParser.java @@ -43,20 +43,20 @@ */ package org.rometools.feed.module.content.io; +import java.util.ArrayList; +import java.util.List; + +import org.jdom2.Attribute; +import org.jdom2.Element; +import org.jdom2.Namespace; +import org.jdom2.output.XMLOutputter; import org.rometools.feed.module.content.ContentItem; import org.rometools.feed.module.content.ContentModule; import org.rometools.feed.module.content.ContentModuleImpl; -import org.jdom.Attribute; -import org.jdom.Element; -import org.jdom.Namespace; -import org.jdom.output.XMLOutputter; - -import java.util.ArrayList; -import java.util.List; /** * @version $Revision: 1.3 $ - * @author Robert "kebernet" Cooper + * @author Robert "kebernet" Cooper */ public class ContentModuleParser implements com.sun.syndication.io.ModuleParser { private static final Namespace CONTENT_NS = Namespace.getNamespace("content", ContentModule.URI); @@ -70,45 +70,45 @@ public class ContentModuleParser implements com.sun.syndication.io.ModuleParser return ContentModule.URI; } - public com.sun.syndication.feed.module.Module parse(org.jdom.Element element) { + public com.sun.syndication.feed.module.Module parse(final org.jdom2.Element element) { boolean foundSomething = false; - ContentModule cm = new ContentModuleImpl(); - List encodeds = element.getChildren("encoded", CONTENT_NS); - ArrayList contentStrings = new ArrayList(); - ArrayList encodedStrings = new ArrayList(); + final ContentModule cm = new ContentModuleImpl(); + final List encodeds = element.getChildren("encoded", CONTENT_NS); + final ArrayList contentStrings = new ArrayList(); + final ArrayList encodedStrings = new ArrayList(); if (encodeds.size() > 0) { foundSomething = true; for (int i = 0; i < encodeds.size(); i++) { - Element encodedElement = (Element) encodeds.get(i); + final Element encodedElement = (Element) encodeds.get(i); encodedStrings.add(encodedElement.getText()); contentStrings.add(encodedElement.getText()); } } - ArrayList contentItems = new ArrayList(); - List items = element.getChildren("items", CONTENT_NS); + final ArrayList contentItems = new ArrayList(); + final List items = element.getChildren("items", CONTENT_NS); for (int i = 0; i < items.size(); i++) { foundSomething = true; - List lis = ((Element) items.get(i)).getChild("Bag", RDF_NS).getChildren("li", RDF_NS); + final List lis = ((Element) items.get(i)).getChild("Bag", RDF_NS).getChildren("li", RDF_NS); for (int j = 0; j < lis.size(); j++) { - ContentItem ci = new ContentItem(); - Element li = (Element) lis.get(j); - Element item = li.getChild("item", CONTENT_NS); - Element format = item.getChild("format", CONTENT_NS); - Element encoding = item.getChild("encoding", CONTENT_NS); - Element value = item.getChild("value", RDF_NS); + final ContentItem ci = new ContentItem(); + final Element li = (Element) lis.get(j); + final Element item = li.getChild("item", CONTENT_NS); + final Element format = item.getChild("format", CONTENT_NS); + final Element encoding = item.getChild("encoding", CONTENT_NS); + final Element value = item.getChild("value", RDF_NS); if (value != null) { if (value.getAttributeValue("parseType", RDF_NS) != null) { ci.setContentValueParseType(value.getAttributeValue("parseType", RDF_NS)); } - if ((ci.getContentValueParseType() != null) && ci.getContentValueParseType().equals("Literal")) { + if (ci.getContentValueParseType() != null && ci.getContentValueParseType().equals("Literal")) { ci.setContentValue(getXmlInnerText(value)); contentStrings.add(getXmlInnerText(value)); ci.setContentValueNamespaces(value.getAdditionalNamespaces()); @@ -117,7 +117,7 @@ public class ContentModuleParser implements com.sun.syndication.io.ModuleParser contentStrings.add(value.getText()); } - ci.setContentValueDOM(((Element) value.clone()).getContent()); + ci.setContentValueDOM(value.clone().getContent()); } if (format != null) { @@ -129,7 +129,7 @@ public class ContentModuleParser implements com.sun.syndication.io.ModuleParser } if (item != null) { - Attribute about = item.getAttribute("about", RDF_NS); + final Attribute about = item.getAttribute("about", RDF_NS); if (about != null) { ci.setContentAbout(about.getValue()); @@ -144,13 +144,13 @@ public class ContentModuleParser implements com.sun.syndication.io.ModuleParser cm.setContentItems(contentItems); cm.setContents(contentStrings); - return (foundSomething) ? cm : null; + return foundSomething ? cm : null; } - protected String getXmlInnerText(Element e) { - StringBuffer sb = new StringBuffer(); - XMLOutputter xo = new XMLOutputter(); - List children = e.getContent(); + protected String getXmlInnerText(final Element e) { + final StringBuffer sb = new StringBuffer(); + final XMLOutputter xo = new XMLOutputter(); + final List children = e.getContent(); sb.append(xo.outputString(children)); return sb.toString(); diff --git a/src/main/java/org/rometools/feed/module/feedburner/FeedBurner.java b/src/main/java/org/rometools/feed/module/feedburner/FeedBurner.java index 3da1200..268047f 100644 --- a/src/main/java/org/rometools/feed/module/feedburner/FeedBurner.java +++ b/src/main/java/org/rometools/feed/module/feedburner/FeedBurner.java @@ -23,25 +23,25 @@ import com.sun.syndication.feed.module.Module; /** * Interface for the FeedBurner RSS extension. - * + * * @version 1.0 * @author Georg Schmidl - * + * */ public interface FeedBurner extends Module, Serializable, Cloneable { - public static final String URI = "http://rssnamespace.org/feedburner/ext/1.0"; + public static final String URI = "http://rssnamespace.org/feedburner/ext/1.0"; - public String getAwareness(); + public String getAwareness(); - public void setAwareness(String awareness); + public void setAwareness(String awareness); - public String getOrigLink(); + public String getOrigLink(); - public void setOrigLink(String origLink); + public void setOrigLink(String origLink); - public String getOrigEnclosureLink(); + public String getOrigEnclosureLink(); - public void setOrigEnclosureLink(String origEnclosureLink); + public void setOrigEnclosureLink(String origEnclosureLink); } diff --git a/src/main/java/org/rometools/feed/module/feedburner/FeedBurnerImpl.java b/src/main/java/org/rometools/feed/module/feedburner/FeedBurnerImpl.java index 925a7f9..b9671f0 100644 --- a/src/main/java/org/rometools/feed/module/feedburner/FeedBurnerImpl.java +++ b/src/main/java/org/rometools/feed/module/feedburner/FeedBurnerImpl.java @@ -21,61 +21,62 @@ import com.sun.syndication.feed.CopyFrom; /** * Implementation of the FeedBurner RSS extension. - * + * * @version 1.0 * @author Georg Schmidl - * + * */ public class FeedBurnerImpl implements FeedBurner { - private static final long serialVersionUID = 4595722221441468838L; + private static final long serialVersionUID = 4595722221441468838L; - private String awareness; - private String origLink; - private String origEnclosureLink; + private String awareness; + private String origLink; + private String origEnclosureLink; - public String getAwareness() { - return awareness; - } + public String getAwareness() { + return awareness; + } - public void setAwareness(String awareness) { - this.awareness = awareness; - } + public void setAwareness(final String awareness) { + this.awareness = awareness; + } - public String getOrigLink() { - return origLink; - } + public String getOrigLink() { + return origLink; + } - public void setOrigLink(String origLink) { - this.origLink = origLink; - } + public void setOrigLink(final String origLink) { + this.origLink = origLink; + } - public String getOrigEnclosureLink() { - return origEnclosureLink; - } + public String getOrigEnclosureLink() { + return origEnclosureLink; + } - public void setOrigEnclosureLink(String origEnclosureLink) { - this.origEnclosureLink = origEnclosureLink; - } + public void setOrigEnclosureLink(final String origEnclosureLink) { + this.origEnclosureLink = origEnclosureLink; + } - public String getUri() { - return FeedBurner.URI; - } + public String getUri() { + return FeedBurner.URI; + } - public void copyFrom(CopyFrom object) { - FeedBurner source = (FeedBurner) object; - this.setAwareness(source.getAwareness()); - this.setOrigLink(source.getOrigLink()); - this.setOrigEnclosureLink(source.getOrigEnclosureLink()); - } + public void copyFrom(final CopyFrom object) { + final FeedBurner source = (FeedBurner) object; + setAwareness(source.getAwareness()); + setOrigLink(source.getOrigLink()); + setOrigEnclosureLink(source.getOrigEnclosureLink()); + } - public Class getInterface() { - return FeedBurner.class; - } + public Class getInterface() { + return FeedBurner.class; + } - public Object clone() { - FeedBurnerImpl fbi = new FeedBurnerImpl(); - fbi.copyFrom( this ); - return fbi; + @Override + public Object clone() { + final FeedBurnerImpl fbi = new FeedBurnerImpl(); + fbi.copyFrom(this); + return fbi; } } diff --git a/src/main/java/org/rometools/feed/module/feedburner/io/FeedBurnerModuleGenerator.java b/src/main/java/org/rometools/feed/module/feedburner/io/FeedBurnerModuleGenerator.java index 15fbb4e..50e2e92 100644 --- a/src/main/java/org/rometools/feed/module/feedburner/io/FeedBurnerModuleGenerator.java +++ b/src/main/java/org/rometools/feed/module/feedburner/io/FeedBurnerModuleGenerator.java @@ -16,24 +16,22 @@ */ package org.rometools.feed.module.feedburner.io; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleGenerator; - -import org.jdom.Element; -import org.jdom.Namespace; - -import org.rometools.feed.module.feedburner.FeedBurner; - import java.util.HashSet; import java.util.Set; +import org.jdom2.Element; +import org.jdom2.Namespace; +import org.rometools.feed.module.feedburner.FeedBurner; + +import com.sun.syndication.feed.module.Module; +import com.sun.syndication.io.ModuleGenerator; /** * ModuleGenerator implementation for the FeedBurner RSS extension. - * + * * @version 1.0 * @author Georg Schmidl - * + * */ public class FeedBurnerModuleGenerator implements ModuleGenerator { private static final Namespace NS = Namespace.getNamespace("feedburner", FeedBurner.URI); @@ -43,34 +41,34 @@ public class FeedBurnerModuleGenerator implements ModuleGenerator { } public Set getNamespaces() { - HashSet set = new HashSet(); + final HashSet set = new HashSet(); set.add(FeedBurnerModuleGenerator.NS); return set; } - public void generate(Module module, Element element) { + public void generate(final Module module, final Element element) { if (!(module instanceof FeedBurner)) { return; } - FeedBurner feedBurner = (FeedBurner) module; + final FeedBurner feedBurner = (FeedBurner) module; if (feedBurner.getAwareness() != null) { - element.addContent(this.generateSimpleElement("awareness", feedBurner.getAwareness())); + element.addContent(generateSimpleElement("awareness", feedBurner.getAwareness())); } if (feedBurner.getOrigLink() != null) { - element.addContent(this.generateSimpleElement("origLink", feedBurner.getOrigLink())); + element.addContent(generateSimpleElement("origLink", feedBurner.getOrigLink())); } if (feedBurner.getOrigEnclosureLink() != null) { - element.addContent(this.generateSimpleElement("origEnclosureLink", feedBurner.getOrigEnclosureLink())); + element.addContent(generateSimpleElement("origEnclosureLink", feedBurner.getOrigEnclosureLink())); } } - protected Element generateSimpleElement(String name, String value) { - Element element = new Element(name, FeedBurnerModuleGenerator.NS); + protected Element generateSimpleElement(final String name, final String value) { + final Element element = new Element(name, FeedBurnerModuleGenerator.NS); element.addContent(value); return element; diff --git a/src/main/java/org/rometools/feed/module/feedburner/io/FeedBurnerModuleParser.java b/src/main/java/org/rometools/feed/module/feedburner/io/FeedBurnerModuleParser.java index 3a0b6e4..e763b8e 100644 --- a/src/main/java/org/rometools/feed/module/feedburner/io/FeedBurnerModuleParser.java +++ b/src/main/java/org/rometools/feed/module/feedburner/io/FeedBurnerModuleParser.java @@ -16,22 +16,20 @@ */ package org.rometools.feed.module.feedburner.io; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleParser; - -import org.jdom.Element; -import org.jdom.Namespace; - +import org.jdom2.Element; +import org.jdom2.Namespace; import org.rometools.feed.module.feedburner.FeedBurner; import org.rometools.feed.module.feedburner.FeedBurnerImpl; +import com.sun.syndication.feed.module.Module; +import com.sun.syndication.io.ModuleParser; /** * ModuleParser implementation for the FeedBurner RSS extension. - * + * * @version 1.0 * @author Georg Schmidl - * + * */ public class FeedBurnerModuleParser implements ModuleParser { private static final Namespace NS = Namespace.getNamespace(FeedBurner.URI); @@ -40,8 +38,8 @@ public class FeedBurnerModuleParser implements ModuleParser { return FeedBurner.URI; } - public Module parse(Element element) { - FeedBurnerImpl fbi = new FeedBurnerImpl(); + public Module parse(final Element element) { + final FeedBurnerImpl fbi = new FeedBurnerImpl(); boolean returnObj = false; Element tag = element.getChild("awareness", FeedBurnerModuleParser.NS); diff --git a/src/main/java/org/rometools/feed/module/georss/GMLGenerator.java b/src/main/java/org/rometools/feed/module/georss/GMLGenerator.java index 597552a..9180c88 100644 --- a/src/main/java/org/rometools/feed/module/georss/GMLGenerator.java +++ b/src/main/java/org/rometools/feed/module/georss/GMLGenerator.java @@ -16,67 +16,78 @@ */ package org.rometools.feed.module.georss; -import java.util.*; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; -import org.jdom.Element; +import org.jdom2.Element; +import org.rometools.feed.module.georss.geometries.AbstractGeometry; +import org.rometools.feed.module.georss.geometries.AbstractRing; +import org.rometools.feed.module.georss.geometries.Envelope; +import org.rometools.feed.module.georss.geometries.LineString; +import org.rometools.feed.module.georss.geometries.LinearRing; +import org.rometools.feed.module.georss.geometries.Point; +import org.rometools.feed.module.georss.geometries.Polygon; +import org.rometools.feed.module.georss.geometries.Position; +import org.rometools.feed.module.georss.geometries.PositionList; import com.sun.syndication.feed.module.Module; import com.sun.syndication.io.ModuleGenerator; -import org.rometools.feed.module.georss.geometries.*; - /** * GMLGenerator produces georss elements in georss GML format. - * + * * @author Marc Wick * @version $Id: GMLGenerator.java,v 1.1 2007/04/18 09:59:29 marcwick Exp $ - * + * */ public class GMLGenerator implements ModuleGenerator { - + private static final Set NAMESPACES; - + static { - Set nss = new HashSet(); + final Set nss = new HashSet(); nss.add(GeoRSSModule.GML_NS); NAMESPACES = Collections.unmodifiableSet(nss); } - - private Element createPosListElement(PositionList posList) { - Element posElement = new Element("posList", GeoRSSModule.GML_NS); - StringBuffer sb = new StringBuffer(); - for (int i=0; i"http://www.georss.org/georss" */ public static final String GEORSS_GEORSS_URI = "http://www.georss.org/georss"; - + /** - * namespace URI for w3c georss : - * "http://www.w3.org/2003/01/geo/wgs84_pos#" + * namespace URI for w3c georss : "http://www.w3.org/2003/01/geo/wgs84_pos#" */ public static final String GEORSS_W3CGEO_URI = "http://www.w3.org/2003/01/geo/wgs84_pos#"; - + /** * namespace URI for GML georss : "http://www.opengis.net/gml" */ public static final String GEORSS_GML_URI = "http://www.opengis.net/gml"; - + /** - * Namespace for georss simple : - * xmlns:georss="http://www.georss.org/georss" + * Namespace for georss simple : xmlns:georss="http://www.georss.org/georss" */ - public static final Namespace SIMPLE_NS = Namespace.getNamespace("georss", - GeoRSSModule.GEORSS_GEORSS_URI); - + public static final Namespace SIMPLE_NS = Namespace.getNamespace("georss", GeoRSSModule.GEORSS_GEORSS_URI); + /** - * - * Namespace for w3c georss : - * xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" + * + * Namespace for w3c georss : xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" */ - public static final Namespace W3CGEO_NS = Namespace.getNamespace("geo", - GeoRSSModule.GEORSS_W3CGEO_URI); - + public static final Namespace W3CGEO_NS = Namespace.getNamespace("geo", GeoRSSModule.GEORSS_W3CGEO_URI); + /** - * + * * Namespace for gml georss : xmlns:gml="http://www.opengis.net/gml" */ - public static final Namespace GML_NS = Namespace.getNamespace("gml", - GeoRSSModule.GEORSS_GML_URI); - - protected GeoRSSModule(java.lang.Class beanClass, java.lang.String uri) { + public static final Namespace GML_NS = Namespace.getNamespace("gml", GeoRSSModule.GEORSS_GML_URI); + + protected GeoRSSModule(final java.lang.Class beanClass, final java.lang.String uri) { super(beanClass, uri); } - + /** * Set geometry of georss element - * - * @param geometry - * geometry + * + * @param geometry geometry */ - public void setGeometry(AbstractGeometry geometry) { + public void setGeometry(final AbstractGeometry geometry) { this.geometry = geometry; } - - + /** * returns the geometry - * + * * @return geometry */ public AbstractGeometry getGeometry() { return geometry; } - + /** - * Convenience method to return point geometry. - * Returns null if the geometry is non-point. - * + * Convenience method to return point geometry. Returns null if the geometry is non-point. + * * @return geometry */ public Position getPosition() { - if (geometry instanceof Point) - return ((Point)geometry).getPosition(); + if (geometry instanceof Point) { + return ((Point) geometry).getPosition(); + } return null; } - + /** * Convenience method to set point geometry. - * + * * @return geometry */ - public void setPosition(Position pos) { - if (pos != null) + public void setPosition(final Position pos) { + if (pos != null) { geometry = new Point(pos); + } } - - /* - * (non-Javadoc) - * - * @see com.sun.syndication.feed.CopyFrom#copyFrom(java.lang.Object) - */ - public void copyFrom(CopyFrom obj) { - GeoRSSModule geoRSSModule = (GeoRSSModule) obj; + + /* + * (non-Javadoc) + * + * @see com.sun.syndication.feed.CopyFrom#copyFrom(java.lang.Object) + */ + public void copyFrom(final CopyFrom obj) { + final GeoRSSModule geoRSSModule = (GeoRSSModule) obj; geometry = geoRSSModule.getGeometry(); try { - geometry = (AbstractGeometry)geometry.clone(); - } catch (CloneNotSupportedException ex) { + geometry = (AbstractGeometry) geometry.clone(); + } catch (final CloneNotSupportedException ex) { ex.printStackTrace(); } } - + + @Override public Object clone() throws CloneNotSupportedException { try { - GeoRSSModule retval = (GeoRSSModule)super.clone(); - if (geometry != null) - retval.geometry = (AbstractGeometry)geometry.clone(); + final GeoRSSModule retval = (GeoRSSModule) super.clone(); + if (geometry != null) { + retval.geometry = (AbstractGeometry) geometry.clone(); + } return retval; - } catch(Exception ex) {ex.printStackTrace();} + } catch (final Exception ex) { + ex.printStackTrace(); + } throw new CloneNotSupportedException(); } } diff --git a/src/main/java/org/rometools/feed/module/georss/GeoRSSPoint.java b/src/main/java/org/rometools/feed/module/georss/GeoRSSPoint.java index 5e392aa..bca5cdf 100644 --- a/src/main/java/org/rometools/feed/module/georss/GeoRSSPoint.java +++ b/src/main/java/org/rometools/feed/module/georss/GeoRSSPoint.java @@ -21,42 +21,41 @@ package org.rometools.feed.module.georss; * */ public class GeoRSSPoint implements Cloneable { - private double latitude; + private double latitude; - private double longitude; + private double longitude; - /** - * @return the latitude - */ - public double getLatitude() { - return latitude; - } + /** + * @return the latitude + */ + public double getLatitude() { + return latitude; + } - /** - * @param latitude - * the latitude to set - */ - public void setLatitude(double latitude) { - this.latitude = latitude; - } + /** + * @param latitude the latitude to set + */ + public void setLatitude(final double latitude) { + this.latitude = latitude; + } - /** - * @return the longitude - */ - public double getLongitude() { - return longitude; - } + /** + * @return the longitude + */ + public double getLongitude() { + return longitude; + } - /** - * @param longitude - * the longitude to set - */ - public void setLongitude(double longitude) { - this.longitude = longitude; - } + /** + * @param longitude the longitude to set + */ + public void setLongitude(final double longitude) { + this.longitude = longitude; + } - public Object clone() throws CloneNotSupportedException { - return super.clone(); - } + @Override + public Object clone() throws CloneNotSupportedException { + return super.clone(); + } } diff --git a/src/main/java/org/rometools/feed/module/georss/GeoRSSUtils.java b/src/main/java/org/rometools/feed/module/georss/GeoRSSUtils.java index 95cf0b8..3d96ad6 100644 --- a/src/main/java/org/rometools/feed/module/georss/GeoRSSUtils.java +++ b/src/main/java/org/rometools/feed/module/georss/GeoRSSUtils.java @@ -21,110 +21,95 @@ import com.sun.syndication.feed.synd.SyndFeed; /** * static utility methods for georss. - * + * * @author Marc Wick * @version $Id: GeoRSSUtils.java,v 1.4 2007/04/18 09:59:29 marcwick Exp $ - * + * */ public class GeoRSSUtils { - - - static String trimWhitespace(String in) { - StringBuffer strbuf = new StringBuffer(); + + static String trimWhitespace(final String in) { + final StringBuffer strbuf = new StringBuffer(); int i = 0; - for (; i= new_size) + if (longitude != null && longitude.length >= new_size) { return; - if (new_size < 4) + } + if (new_size < 4) { new_size = 4; - else - new_size = (int)Math.ceil(Math.pow(2, Math.ceil(Math.log(new_size)/Math.log(2)))); - double [] tmp = new double[new_size]; - if (longitude != null) + } else { + new_size = (int) Math.ceil(Math.pow(2, Math.ceil(Math.log(new_size) / Math.log(2)))); + } + double[] tmp = new double[new_size]; + if (longitude != null) { System.arraycopy(longitude, 0, tmp, 0, size); + } longitude = tmp; tmp = new double[new_size]; - if (latitude != null) + if (latitude != null) { System.arraycopy(latitude, 0, tmp, 0, size); + } latitude = tmp; } - + /** * @return the number of positions in the list */ public int size() { return size; } - + /** * @param pos position index * @return longitude for position */ - public double getLongitude(int pos) { + public double getLongitude(final int pos) { return longitude[pos]; } - + /** * @param pos position index * @return latitude for position */ - public double getLatitude(int pos) { + public double getLatitude(final int pos) { return latitude[pos]; } - + /** * Add a position at the end of the list + * * @param latitude * @param longitude */ - public void add(double latitude, double longitude) { - ensureCapacity(size+1); + public void add(final double latitude, final double longitude) { + ensureCapacity(size + 1); this.longitude[size] = longitude; - this.latitude[size] = latitude; + this.latitude[size] = latitude; ++size; } - + /** - * Add a position at a given index in the list. The rest of the list is - * shifted one place to the "right" - * + * Add a position at a given index in the list. The rest of the list is shifted one place to the "right" + * * @param pos position index * @param latitude * @param longitude */ - public void insert(int pos, double latitude, double longitude) { - ensureCapacity(size+1); - System.arraycopy(this.longitude, pos, this.longitude, pos+1, size-pos); - System.arraycopy(this.latitude, pos, this.latitude, pos+1, size-pos); + public void insert(final int pos, final double latitude, final double longitude) { + ensureCapacity(size + 1); + System.arraycopy(this.longitude, pos, this.longitude, pos + 1, size - pos); + System.arraycopy(this.latitude, pos, this.latitude, pos + 1, size - pos); this.longitude[pos] = longitude; - this.latitude[pos] = latitude; + this.latitude[pos] = latitude; ++size; } - + /** * Replace the position at the index with new values * @@ -126,19 +140,19 @@ public class PositionList implements Cloneable, Serializable { * @param latitude * @param longitude */ - public void replace(int pos, double latitude, double longitude) { + public void replace(final int pos, final double latitude, final double longitude) { this.longitude[pos] = longitude; - this.latitude[pos] = latitude; + this.latitude[pos] = latitude; } - + /** * Remove the position at the index, the rest of the list is shifted one place to the "left" * * @param pos position index */ - public void remove(int pos) { - System.arraycopy(longitude, pos+1, longitude, pos, size-pos-1); - System.arraycopy(latitude, pos+1, latitude, pos, size-pos-1); + public void remove(final int pos) { + System.arraycopy(longitude, pos + 1, longitude, pos, size - pos - 1); + System.arraycopy(latitude, pos + 1, latitude, pos, size - pos - 1); --size; } } diff --git a/src/main/java/org/rometools/feed/module/itunes/AbstractITunesObject.java b/src/main/java/org/rometools/feed/module/itunes/AbstractITunesObject.java index 637a23b..be3409a 100644 --- a/src/main/java/org/rometools/feed/module/itunes/AbstractITunesObject.java +++ b/src/main/java/org/rometools/feed/module/itunes/AbstractITunesObject.java @@ -42,18 +42,19 @@ package org.rometools.feed.module.itunes; import com.sun.syndication.feed.CopyFrom; - - /** - * This is an abstract object that implements the attributes common across Feeds - * or Items in an iTunes compatible RSS feed. + * This is an abstract object that implements the attributes common across Feeds or Items in an iTunes compatible RSS feed. + * * @version $Revision: 1.4 $ * @author Robert "kebernet" Cooper */ public abstract class AbstractITunesObject implements ITunes, java.lang.Cloneable { /** * The URI that iTunes used for its custom tags. - *

    What is up with using a versioned DTD anyway?

    \ + *

    + * What is up with using a versioned DTD anyway? + *

    + * \ */ public static final String URI = "http://www.itunes.com/dtds/podcast-1.0.dtd"; @@ -75,12 +76,14 @@ public abstract class AbstractITunesObject implements ITunes, java.lang.Cloneabl /** * Defined by the ROME module API + * * @param obj Object to copy from */ public abstract void copyFrom(CopyFrom obj); /** * Defined by the ROME API + * * @return Class of the Interface for this module. */ public Class getInterface() { @@ -89,6 +92,7 @@ public abstract class AbstractITunesObject implements ITunes, java.lang.Cloneabl /** * The URI this module implements + * * @return "http://www.itunes.com/dtds/podcast-1.0.dtd" */ public String getUri() { @@ -97,12 +101,15 @@ public abstract class AbstractITunesObject implements ITunes, java.lang.Cloneabl /** * Required by the ROME API + * * @return A clone of this module object */ + @Override public abstract Object clone(); /** * Returns the author string for this feed or entry + * * @return Returns the author string for this feed or entry */ public String getAuthor() { @@ -111,14 +118,16 @@ public abstract class AbstractITunesObject implements ITunes, java.lang.Cloneabl /** * Sets the author string for this feed or entry + * * @param author Sets the author string for this feed or entry */ - public void setAuthor(String author) { + public void setAuthor(final String author) { this.author = author; } /** * Boolean as to whether to block this feed or entry + * * @return Boolean as to whether to block this feed or entry */ public boolean getBlock() { @@ -127,14 +136,16 @@ public abstract class AbstractITunesObject implements ITunes, java.lang.Cloneabl /** * Boolean as to whether to block this feed or entry + * * @param block Boolean as to whether to block this feed or entry */ - public void setBlock(boolean block) { + public void setBlock(final boolean block) { this.block = block; } /** * Boolean as to whether this feed or entry contains adult content + * * @return Boolean as to whether this feed or entry contains adult content */ public boolean getExplicit() { @@ -143,16 +154,18 @@ public abstract class AbstractITunesObject implements ITunes, java.lang.Cloneabl /** * Boolean as to whether this feed or entry contains adult content + * * @param explicit Boolean as to whether this feed or entry contains adult content */ - public void setExplicit(boolean explicit) { + public void setExplicit(final boolean explicit) { this.explicit = explicit; } /** * A list of keywords for this feed or entry - * + * * Must not contain spaces + * * @return A list of keywords for this feed or entry */ public String[] getKeywords() { @@ -161,16 +174,18 @@ public abstract class AbstractITunesObject implements ITunes, java.lang.Cloneabl /** * A list of keywords for this feed or entry - * + * * Must not contain spaces + * * @param keywords A list of keywords for this feed or enty */ - public void setKeywords(String[] keywords) { + public void setKeywords(final String[] keywords) { this.keywords = keywords; } /** * A subtitle for this feed or entry + * * @return A subtitle for this feed or entry */ public String getSubtitle() { @@ -179,14 +194,16 @@ public abstract class AbstractITunesObject implements ITunes, java.lang.Cloneabl /** * A subtitle for this feed or entry + * * @param subtitle A subtitle for this feed or entry */ - public void setSubtitle(String subtitle) { + public void setSubtitle(final String subtitle) { this.subtitle = subtitle; } /** * A subtitle for this feed or entry + * * @return A subtitle for this feed or entry */ public String getSummary() { @@ -195,32 +212,34 @@ public abstract class AbstractITunesObject implements ITunes, java.lang.Cloneabl /** * A subtitle for this feed or entry + * * @param summary A subtitle for this feed or entry */ - public void setSummary(String summary) { + public void setSummary(final String summary) { this.summary = summary; } + @Override public String toString() { - StringBuffer sb = new StringBuffer("["); + final StringBuffer sb = new StringBuffer("["); sb.append(" Author: "); - sb.append(this.getAuthor()); + sb.append(getAuthor()); sb.append(" Block: "); - sb.append(this.getBlock()); + sb.append(getBlock()); sb.append(" Explicit: "); - sb.append(this.getExplicit()); + sb.append(getExplicit()); sb.append(" Keywords: "); - if (this.getKeywords() != null) { + if (getKeywords() != null) { for (int i = 0; i < keywords.length; i++) { - sb.append("'" + this.getKeywords()[i] + "'"); + sb.append("'" + getKeywords()[i] + "'"); } } sb.append(" Subtitle: "); - sb.append(this.getSubtitle()); + sb.append(getSubtitle()); sb.append(" Summary: "); - sb.append(this.getSummary()); + sb.append(getSummary()); sb.append("]"); return sb.toString(); diff --git a/src/main/java/org/rometools/feed/module/itunes/EntryInformation.java b/src/main/java/org/rometools/feed/module/itunes/EntryInformation.java index afca1a8..17bba08 100644 --- a/src/main/java/org/rometools/feed/module/itunes/EntryInformation.java +++ b/src/main/java/org/rometools/feed/module/itunes/EntryInformation.java @@ -43,25 +43,27 @@ package org.rometools.feed.module.itunes; import org.rometools.feed.module.itunes.types.Duration; - /** * This class contains information for iTunes podcast feeds that exist at the Item level. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.2 $ - * + * */ -public interface EntryInformation extends ITunes{ +public interface EntryInformation extends ITunes { /** * Returns the Duration object for this Item + * * @return Returns the Duration object for this Item */ public Duration getDuration(); /** * Sets the Duration object for this Item + * * @param duration Sets the Duration object for this Item */ - public void setDuration(Duration duration) ; + public void setDuration(Duration duration); } diff --git a/src/main/java/org/rometools/feed/module/itunes/EntryInformationImpl.java b/src/main/java/org/rometools/feed/module/itunes/EntryInformationImpl.java index 5631842..fc39a10 100644 --- a/src/main/java/org/rometools/feed/module/itunes/EntryInformationImpl.java +++ b/src/main/java/org/rometools/feed/module/itunes/EntryInformationImpl.java @@ -40,12 +40,13 @@ */ package org.rometools.feed.module.itunes; -import com.sun.syndication.feed.CopyFrom; import org.rometools.feed.module.itunes.types.Duration; +import com.sun.syndication.feed.CopyFrom; /** * This class contains information for iTunes podcast feeds that exist at the Item level. + * * @version $Revision: 1.2 $ * @author Robert "kebernet" Cooper */ @@ -60,6 +61,7 @@ public class EntryInformationImpl extends AbstractITunesObject implements EntryI /** * Returns the Duration object for this Item + * * @return Returns the Duration object for this Item */ public Duration getDuration() { @@ -68,50 +70,56 @@ public class EntryInformationImpl extends AbstractITunesObject implements EntryI /** * Sets the Duration object for this Item + * * @param duration Sets the Duration object for this Item */ - public void setDuration(Duration duration) { + public void setDuration(final Duration duration) { this.duration = duration; } /** * Defined by the ROME module API + * * @param obj Object to copy from */ - public void copyFrom(CopyFrom obj) { - EntryInformationImpl info = (EntryInformationImpl) obj; - this.setAuthor(info.getAuthor()); - this.setBlock(info.getBlock()); + @Override + public void copyFrom(final CopyFrom obj) { + final EntryInformationImpl info = (EntryInformationImpl) obj; + setAuthor(info.getAuthor()); + setBlock(info.getBlock()); if (info.getDuration() != null) { - this.setDuration(new Duration(info.getDuration().getMilliseconds())); + setDuration(new Duration(info.getDuration().getMilliseconds())); } - this.setExplicit(info.getExplicit()); + setExplicit(info.getExplicit()); if (info.getKeywords() != null) { - this.setKeywords((String[]) info.getKeywords().clone()); + setKeywords(info.getKeywords().clone()); } - this.setSubtitle(info.getSubtitle()); - this.setSummary(info.getSummary()); + setSubtitle(info.getSubtitle()); + setSummary(info.getSummary()); } /** * Required by the ROME API + * * @return A clone of this module object */ + @Override public Object clone() { - EntryInformationImpl info = new EntryInformationImpl(); + final EntryInformationImpl info = new EntryInformationImpl(); info.copyFrom(this); return info; } + @Override public String toString() { - StringBuffer sb = new StringBuffer("["); + final StringBuffer sb = new StringBuffer("["); sb.append(" Duration: "); - sb.append(this.getDuration()); + sb.append(getDuration()); sb.append("]"); sb.append(super.toString()); diff --git a/src/main/java/org/rometools/feed/module/itunes/FeedInformation.java b/src/main/java/org/rometools/feed/module/itunes/FeedInformation.java index be0a4e4..e2fd226 100644 --- a/src/main/java/org/rometools/feed/module/itunes/FeedInformation.java +++ b/src/main/java/org/rometools/feed/module/itunes/FeedInformation.java @@ -43,7 +43,6 @@ package org.rometools.feed.module.itunes; import java.net.URL; import java.util.List; - /** * This class contains information for iTunes podcast feeds that exist at the Channel level. * @@ -54,53 +53,61 @@ public interface FeedInformation extends ITunes { /** * The parent categories for this feed + * * @return The parent categories for this feed */ - public List getCategories() ; + public List getCategories(); /** * The parent categories for this feed + * * @param categories The parent categories for this feed */ public void setCategories(List categories); - + /** * Sets the URL for the image. - * + * * NOTE: To specification images should be in PNG or JPEG format. + * * @param image Sets the URL for the image. */ public void setImage(URL image); /** * Returns the URL for the image. - * + * * NOTE: To specification images should be in PNG or JPEG format. + * * @return Returns the URL for the image. */ public URL getImage(); /** * Sets the owner email address for the feed. + * * @param ownerEmailAddress Sets the owner email address for the feed. */ public void setOwnerEmailAddress(String ownerEmailAddress); /** * Returns the owner email address for the feed. + * * @return Returns the owner email address for the feed. */ public String getOwnerEmailAddress(); /** * Sets the owner name for the feed + * * @param ownerName Sets the owner name for the feed */ public void setOwnerName(String ownerName); /** * Returns the owner name for the feed - * @return Returns the owner name for the feed + * + * @return Returns the owner name for the feed */ public String getOwnerName(); } diff --git a/src/main/java/org/rometools/feed/module/itunes/FeedInformationImpl.java b/src/main/java/org/rometools/feed/module/itunes/FeedInformationImpl.java index 134f8fb..151887d 100644 --- a/src/main/java/org/rometools/feed/module/itunes/FeedInformationImpl.java +++ b/src/main/java/org/rometools/feed/module/itunes/FeedInformationImpl.java @@ -40,16 +40,18 @@ * */ package org.rometools.feed.module.itunes; -import com.sun.syndication.feed.CopyFrom; + import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; +import com.sun.syndication.feed.CopyFrom; /** * This class contains information for iTunes podcast feeds that exist at the Channel level. + * * @version $Revision: 1.2 $ * @author Robert "kebernet" Cooper */ @@ -67,23 +69,26 @@ public class FeedInformationImpl extends AbstractITunesObject implements FeedInf /** * The parent categories for this feed + * * @return The parent categories for this feed */ public List getCategories() { - return (categories==null) ? (categories=new ArrayList()) : categories; + return categories == null ? (categories = new ArrayList()) : categories; } /** * The parent categories for this feed + * * @param categories The parent categories for this feed */ - public void setCategories(List categories) { + public void setCategories(final List categories) { this.categories = categories; } /** * Returns the owner name for the feed - * @return Returns the owner name for the feed + * + * @return Returns the owner name for the feed */ public String getOwnerName() { return ownerName; @@ -91,14 +96,16 @@ public class FeedInformationImpl extends AbstractITunesObject implements FeedInf /** * Sets the owner name for the feed + * * @param ownerName Sets the owner name for the feed */ - public void setOwnerName(String ownerName) { + public void setOwnerName(final String ownerName) { this.ownerName = ownerName; } /** * Returns the owner email address for the feed. + * * @return Returns the owner email address for the feed. */ public String getOwnerEmailAddress() { @@ -107,16 +114,18 @@ public class FeedInformationImpl extends AbstractITunesObject implements FeedInf /** * Sets the owner email address for the feed. + * * @param ownerEmailAddress Sets the owner email address for the feed. */ - public void setOwnerEmailAddress(String ownerEmailAddress) { + public void setOwnerEmailAddress(final String ownerEmailAddress) { this.ownerEmailAddress = ownerEmailAddress; } /** * Returns the URL for the image. - * + * * NOTE: To specification images should be in PNG or JPEG format. + * * @return Returns the URL for the image. */ public URL getImage() { @@ -125,46 +134,49 @@ public class FeedInformationImpl extends AbstractITunesObject implements FeedInf /** * Sets the URL for the image. - * + * * NOTE: To specification images should be in PNG or JPEG format. + * * @param image Sets the URL for the image. */ - public void setImage(URL image) { + public void setImage(final URL image) { this.image = image; } /** * Required by the ROME API + * * @param obj object to copy property values from */ - public void copyFrom(CopyFrom obj) { - FeedInformationImpl info = (FeedInformationImpl) obj; - this.setAuthor(info.getAuthor()); - this.setBlock(info.getBlock()); + @Override + public void copyFrom(final CopyFrom obj) { + final FeedInformationImpl info = (FeedInformationImpl) obj; + setAuthor(info.getAuthor()); + setBlock(info.getBlock()); - this.getCategories().clear(); + getCategories().clear(); if (info.getCategories() != null) { - this.getCategories().addAll(info.getCategories()); + getCategories().addAll(info.getCategories()); } - this.setExplicit(info.getExplicit()); + setExplicit(info.getExplicit()); try { if (info.getImage() != null) { - this.setImage(new URL(info.getImage().toExternalForm())); + setImage(new URL(info.getImage().toExternalForm())); } - } catch (MalformedURLException e) { + } catch (final MalformedURLException e) { Logger.getAnonymousLogger().fine("Error copying URL:" + info.getImage()); } if (info.getKeywords() != null) { - this.setKeywords((String[]) info.getKeywords().clone()); + setKeywords(info.getKeywords().clone()); } - this.setOwnerEmailAddress(info.getOwnerEmailAddress()); - this.setOwnerName(info.getOwnerName()); - this.setSubtitle(info.getSubtitle()); - this.setSummary(info.getSummary()); + setOwnerEmailAddress(info.getOwnerEmailAddress()); + setOwnerName(info.getOwnerName()); + setSubtitle(info.getSubtitle()); + setSummary(info.getSummary()); } /** @@ -172,23 +184,25 @@ public class FeedInformationImpl extends AbstractITunesObject implements FeedInf * * @return Returns a copy of this FeedInformationImpl object */ + @Override public Object clone() { - FeedInformationImpl info = new FeedInformationImpl(); + final FeedInformationImpl info = new FeedInformationImpl(); info.copyFrom(this); return info; } + @Override public String toString() { - StringBuffer sb = new StringBuffer("["); + final StringBuffer sb = new StringBuffer("["); sb.append(" email: "); - sb.append(this.getOwnerEmailAddress()); + sb.append(getOwnerEmailAddress()); sb.append(" name: "); - sb.append(this.getOwnerName()); + sb.append(getOwnerName()); sb.append(" image: "); - sb.append(this.getImage()); + sb.append(getImage()); sb.append(" categories: "); - sb.append(this.getCategories()); + sb.append(getCategories()); sb.append("]"); sb.append(super.toString()); diff --git a/src/main/java/org/rometools/feed/module/itunes/ITunes.java b/src/main/java/org/rometools/feed/module/itunes/ITunes.java index d26e5cd..baf66d5 100644 --- a/src/main/java/org/rometools/feed/module/itunes/ITunes.java +++ b/src/main/java/org/rometools/feed/module/itunes/ITunes.java @@ -41,92 +41,103 @@ package org.rometools.feed.module.itunes; import com.sun.syndication.feed.module.Module; -import org.rometools.feed.module.itunes.types.Category; /** * This interface contains the methods common to all iTunes module points. - * + * * @author Robert "kebernet" Cooper * @version $Revision: 1.3 $ */ public interface ITunes extends Module { - + public static final String URI = AbstractITunesObject.URI; - + /** * Returns the author string for this feed or entry + * * @return Returns the author string for this feed or entry */ public String getAuthor(); /** * Sets the author string for this feed or entry + * * @param author Sets the author string for this feed or entry */ - public void setAuthor(String author) ; - + public void setAuthor(String author); + /** * Boolean as to whether to block this feed or entry + * * @return Boolean as to whether to block this feed or entry */ public boolean getBlock(); /** * Boolean as to whether to block this feed or entry + * * @param block Boolean as to whether to block this feed or entry */ - public void setBlock(boolean block) ; + public void setBlock(boolean block); /** * Boolean as to whether this feed or entry contains adult content + * * @return Boolean as to whether this feed or entry contains adult content */ - public boolean getExplicit() ; + public boolean getExplicit(); /** * Boolean as to whether this feed or entry contains adult content + * * @param explicit Boolean as to whether this feed or entry contains adult content */ - public void setExplicit(boolean explicit) ; + public void setExplicit(boolean explicit); /** * A list of keywords for this feed or entry - * + * * Must not contain spaces + * * @return A list of keywords for this feed or entry */ - public String[] getKeywords() ; + public String[] getKeywords(); /** * A list of keywords for this feed or entry - * + * * Must not contain spaces + * * @param keywords A list of keywords for this feed or enty */ public void setKeywords(String[] keywords); + /** * A subtitle for this feed or entry + * * @return A subtitle for this feed or entry */ public String getSubtitle(); /** * A subtitle for this feed or entry + * * @param subtitle A subtitle for this feed or entry */ public void setSubtitle(String subtitle); - /** * A subtitle for this feed or entry + * * @return A subtitle for this feed or entry */ - public String getSummary() ; + public String getSummary(); /** * A subtitle for this feed or entry + * * @param summary A subtitle for this feed or entry */ public void setSummary(String summary); - + } diff --git a/src/main/java/org/rometools/feed/module/itunes/io/ITunesGenerator.java b/src/main/java/org/rometools/feed/module/itunes/io/ITunesGenerator.java index c56f453..edeceb6 100644 --- a/src/main/java/org/rometools/feed/module/itunes/io/ITunesGenerator.java +++ b/src/main/java/org/rometools/feed/module/itunes/io/ITunesGenerator.java @@ -40,19 +40,19 @@ */ package org.rometools.feed.module.itunes.io; -import com.sun.syndication.feed.module.Module; +import java.util.HashSet; +import java.util.Iterator; + +import org.jdom2.Element; +import org.jdom2.Namespace; import org.rometools.feed.module.itunes.AbstractITunesObject; import org.rometools.feed.module.itunes.EntryInformationImpl; import org.rometools.feed.module.itunes.FeedInformationImpl; import org.rometools.feed.module.itunes.types.Category; + +import com.sun.syndication.feed.module.Module; import com.sun.syndication.io.ModuleGenerator; -import org.jdom.Element; -import org.jdom.Namespace; - -import java.util.HashSet; -import java.util.Iterator; - /** * @version $Revision: 1.3 $ * @author Robert "kebernet" Cooper @@ -69,10 +69,10 @@ public class ITunesGenerator implements ModuleGenerator { public ITunesGenerator() { } - public void generate(Module module, Element element) { + public void generate(final Module module, final Element element) { Element root = element; - while ((root.getParent() != null) && root.getParent() instanceof Element) { + while (root.getParent() != null && root.getParent() instanceof Element) { root = (Element) root.getParent(); } @@ -82,32 +82,32 @@ public class ITunesGenerator implements ModuleGenerator { return; } - AbstractITunesObject itunes = (AbstractITunesObject) module; + final AbstractITunesObject itunes = (AbstractITunesObject) module; if (itunes instanceof FeedInformationImpl) { - //Do Channel Specific Stuff. - FeedInformationImpl info = (FeedInformationImpl) itunes; - Element owner = this.generateSimpleElement("owner", ""); - Element email = this.generateSimpleElement("email", info.getOwnerEmailAddress()); + // Do Channel Specific Stuff. + final FeedInformationImpl info = (FeedInformationImpl) itunes; + final Element owner = generateSimpleElement("owner", ""); + final Element email = generateSimpleElement("email", info.getOwnerEmailAddress()); owner.addContent(email); - Element name = this.generateSimpleElement("name", info.getOwnerName()); + final Element name = generateSimpleElement("name", info.getOwnerName()); owner.addContent(name); element.addContent(owner); if (info.getImage() != null) { - Element image = this.generateSimpleElement("image", ""); + final Element image = generateSimpleElement("image", ""); image.setAttribute("href", info.getImage().toExternalForm()); element.addContent(image); } - for (Iterator it = info.getCategories().iterator(); it.hasNext();) { - Category cat = (Category) it.next(); - Element category = this.generateSimpleElement("category", ""); + for (final Iterator it = info.getCategories().iterator(); it.hasNext();) { + final Category cat = (Category) it.next(); + final Element category = generateSimpleElement("category", ""); category.setAttribute("text", cat.getName()); if (cat.getSubcategory() != null) { - Element subcat = this.generateSimpleElement("category", ""); + final Element subcat = generateSimpleElement("category", ""); subcat.setAttribute("text", cat.getSubcategory().getName()); category.addContent(subcat); } @@ -115,29 +115,29 @@ public class ITunesGenerator implements ModuleGenerator { element.addContent(category); } } else if (itunes instanceof EntryInformationImpl) { - EntryInformationImpl info = (EntryInformationImpl) itunes; + final EntryInformationImpl info = (EntryInformationImpl) itunes; if (info.getDuration() != null) { - element.addContent(this.generateSimpleElement("duration", info.getDuration().toString())); + element.addContent(generateSimpleElement("duration", info.getDuration().toString())); } } if (itunes.getAuthor() != null) { - element.addContent(this.generateSimpleElement("author", itunes.getAuthor())); + element.addContent(generateSimpleElement("author", itunes.getAuthor())); } if (itunes.getBlock()) { - element.addContent(this.generateSimpleElement("block", "")); + element.addContent(generateSimpleElement("block", "")); } if (itunes.getExplicit()) { - element.addContent(this.generateSimpleElement("explicit", "yes")); + element.addContent(generateSimpleElement("explicit", "yes")); } else { - element.addContent(this.generateSimpleElement("explicit", "no")); + element.addContent(generateSimpleElement("explicit", "no")); } if (itunes.getKeywords() != null) { - StringBuffer sb = new StringBuffer(); + final StringBuffer sb = new StringBuffer(); for (int i = 0; i < itunes.getKeywords().length; i++) { if (i != 0) { @@ -147,34 +147,38 @@ public class ITunesGenerator implements ModuleGenerator { sb.append(itunes.getKeywords()[i]); } - element.addContent(this.generateSimpleElement("keywords", sb.toString())); + element.addContent(generateSimpleElement("keywords", sb.toString())); } if (itunes.getSubtitle() != null) { - element.addContent(this.generateSimpleElement("subtitle", itunes.getSubtitle())); + element.addContent(generateSimpleElement("subtitle", itunes.getSubtitle())); } if (itunes.getSummary() != null) { - element.addContent(this.generateSimpleElement("summary", itunes.getSummary())); + element.addContent(generateSimpleElement("summary", itunes.getSummary())); } } - /** Returns the list of namespaces this module uses. + /** + * Returns the list of namespaces this module uses. + * * @return set of Namespace objects. */ public java.util.Set getNamespaces() { return SET; } - /** Returns the namespace URI this module handles. + /** + * Returns the namespace URI this module handles. + * * @return Returns the namespace URI this module handles. */ public String getNamespaceUri() { return AbstractITunesObject.URI; } - protected Element generateSimpleElement(String name, String value) { - Element element = new Element(name, NS); + protected Element generateSimpleElement(final String name, final String value) { + final Element element = new Element(name, NS); element.addContent(value); return element; diff --git a/src/main/java/org/rometools/feed/module/itunes/io/ITunesParser.java b/src/main/java/org/rometools/feed/module/itunes/io/ITunesParser.java index 7b9fe51..5d17345 100644 --- a/src/main/java/org/rometools/feed/module/itunes/io/ITunesParser.java +++ b/src/main/java/org/rometools/feed/module/itunes/io/ITunesParser.java @@ -40,28 +40,26 @@ */ package org.rometools.feed.module.itunes.io; -import org.rometools.feed.module.itunes.AbstractITunesObject; -import org.rometools.feed.module.itunes.EntryInformationImpl; -import org.rometools.feed.module.itunes.FeedInformationImpl; -import com.sun.syndication.io.ModuleParser; -import org.rometools.feed.module.itunes.types.Category; -import org.rometools.feed.module.itunes.types.Duration; -import org.rometools.feed.module.itunes.types.Subcategory; -import com.sun.syndication.io.WireFeedParser; - -import org.jdom.Element; -import org.jdom.Namespace; - -import org.jdom.output.XMLOutputter; - import java.net.MalformedURLException; import java.net.URL; - import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; import java.util.logging.Logger; +import org.jdom2.Element; +import org.jdom2.Namespace; +import org.jdom2.output.XMLOutputter; +import org.rometools.feed.module.itunes.AbstractITunesObject; +import org.rometools.feed.module.itunes.EntryInformationImpl; +import org.rometools.feed.module.itunes.FeedInformationImpl; +import org.rometools.feed.module.itunes.types.Category; +import org.rometools.feed.module.itunes.types.Duration; +import org.rometools.feed.module.itunes.types.Subcategory; + +import com.sun.syndication.io.ModuleParser; +import com.sun.syndication.io.WireFeedParser; + /** * @version $Revision: 1.10 $ * @author Robert "kebernet" Cooper @@ -69,141 +67,140 @@ import java.util.logging.Logger; public class ITunesParser implements ModuleParser { static Logger log = Logger.getLogger(ITunesParser.class.getName()); Namespace ns = Namespace.getNamespace(AbstractITunesObject.URI); - + /** Creates a new instance of ITunesParser */ public ITunesParser() { } - - public void setParser(WireFeedParser feedParser) { + + public void setParser(final WireFeedParser feedParser) { } - + public String getNamespaceUri() { return AbstractITunesObject.URI; } - - public com.sun.syndication.feed.module.Module parse(org.jdom.Element element) { + + public com.sun.syndication.feed.module.Module parse(final org.jdom2.Element element) { AbstractITunesObject module = null; - + if (element.getName().equals("channel")) { - FeedInformationImpl feedInfo = new FeedInformationImpl(); + final FeedInformationImpl feedInfo = new FeedInformationImpl(); module = feedInfo; - - //Now I am going to get the channel specific tags - Element owner = element.getChild("owner", ns); - + + // Now I am going to get the channel specific tags + final Element owner = element.getChild("owner", ns); + if (owner != null) { - Element name = owner.getChild("name", ns); - + final Element name = owner.getChild("name", ns); + if (name != null) { feedInfo.setOwnerName(name.getValue().trim()); } - - Element email = owner.getChild("email", ns); - + + final Element email = owner.getChild("email", ns); + if (email != null) { feedInfo.setOwnerEmailAddress(email.getValue().trim()); } } - - Element image = element.getChild("image", ns); - - if ((image != null) && (image.getAttributeValue("href") != null)) { + + final Element image = element.getChild("image", ns); + + if (image != null && image.getAttributeValue("href") != null) { try { - URL imageURL = new URL(image.getAttributeValue("href").trim()); + final URL imageURL = new URL(image.getAttributeValue("href").trim()); feedInfo.setImage(imageURL); - } catch (MalformedURLException e) { + } catch (final MalformedURLException e) { log.finer("Malformed URL Exception reading itunes:image tag: " + image.getAttributeValue("href")); } } - - List categories = element.getChildren("category", ns); - for (Iterator it = categories.iterator(); it.hasNext();) { - Element category = (Element) it.next(); - if ((category != null) && (category.getAttribute("text") != null)) { - Category cat = new Category(); + + final List categories = element.getChildren("category", ns); + for (final Iterator it = categories.iterator(); it.hasNext();) { + final Element category = (Element) it.next(); + if (category != null && category.getAttribute("text") != null) { + final Category cat = new Category(); cat.setName(category.getAttribute("text").getValue().trim()); - - Element subcategory = category.getChild("category", ns); - + + final Element subcategory = category.getChild("category", ns); + if (subcategory != null && subcategory.getAttribute("text") != null) { - Subcategory subcat = new Subcategory(); + final Subcategory subcat = new Subcategory(); subcat.setName(subcategory.getAttribute("text").getValue().trim()); cat.setSubcategory(subcat); } - + feedInfo.getCategories().add(cat); } } - + } else if (element.getName().equals("item")) { - EntryInformationImpl entryInfo = new EntryInformationImpl(); + final EntryInformationImpl entryInfo = new EntryInformationImpl(); module = entryInfo; - - //Now I am going to get the item specific tags - - Element duration = element.getChild("duration", ns); - - if (duration != null && duration.getValue() != null ) { - Duration dur = new Duration(duration.getValue().trim()); + + // Now I am going to get the item specific tags + + final Element duration = element.getChild("duration", ns); + + if (duration != null && duration.getValue() != null) { + final Duration dur = new Duration(duration.getValue().trim()); entryInfo.setDuration(dur); } } if (module != null) { - //All these are common to both Channel and Item - Element author = element.getChild("author", ns); - - if (author != null && author.getText() != null ) { + // All these are common to both Channel and Item + final Element author = element.getChild("author", ns); + + if (author != null && author.getText() != null) { module.setAuthor(author.getText()); } - - Element block = element.getChild("block", ns); - + + final Element block = element.getChild("block", ns); + if (block != null) { module.setBlock(true); } - - Element explicit = element.getChild("explicit", ns); - - if ((explicit != null) && explicit.getValue() != null - && explicit.getValue().trim().equalsIgnoreCase("yes")) { + + final Element explicit = element.getChild("explicit", ns); + + if (explicit != null && explicit.getValue() != null && explicit.getValue().trim().equalsIgnoreCase("yes")) { module.setExplicit(true); } - - Element keywords = element.getChild("keywords", ns); - + + final Element keywords = element.getChild("keywords", ns); + if (keywords != null) { - StringTokenizer tok = new StringTokenizer(getXmlInnerText(keywords).trim(), ","); - String[] keywordsArray = new String[tok.countTokens()]; - + final StringTokenizer tok = new StringTokenizer(getXmlInnerText(keywords).trim(), ","); + final String[] keywordsArray = new String[tok.countTokens()]; + for (int i = 0; tok.hasMoreTokens(); i++) { keywordsArray[i] = tok.nextToken(); } - + module.setKeywords(keywordsArray); } - - Element subtitle = element.getChild("subtitle", ns); - + + final Element subtitle = element.getChild("subtitle", ns); + if (subtitle != null) { module.setSubtitle(subtitle.getTextTrim()); } - - Element summary = element.getChild("summary", ns); - + + final Element summary = element.getChild("summary", ns); + if (summary != null) { module.setSummary(summary.getTextTrim()); - } + } } - + return module; } - - protected String getXmlInnerText(Element e) { - StringBuffer sb = new StringBuffer(); - XMLOutputter xo = new XMLOutputter(); - List children = e.getContent(); + + protected String getXmlInnerText(final Element e) { + final StringBuffer sb = new StringBuffer(); + final XMLOutputter xo = new XMLOutputter(); + final List children = e.getContent(); sb.append(xo.outputString(children)); - + return sb.toString(); } } diff --git a/src/main/java/org/rometools/feed/module/itunes/io/ITunesParserOldNamespace.java b/src/main/java/org/rometools/feed/module/itunes/io/ITunesParserOldNamespace.java index 9d0a12c..b56e011 100644 --- a/src/main/java/org/rometools/feed/module/itunes/io/ITunesParserOldNamespace.java +++ b/src/main/java/org/rometools/feed/module/itunes/io/ITunesParserOldNamespace.java @@ -21,22 +21,22 @@ package org.rometools.feed.module.itunes.io; -import org.jdom.Namespace; -import com.sun.syndication.io.WireFeedParser; +import org.jdom2.Namespace; /** - * + * * @author Robert "kebernet" Cooper */ -public class ITunesParserOldNamespace extends ITunesParser{ +public class ITunesParserOldNamespace extends ITunesParser { String URI = "http://www.itunes.com/DTDs/Podcast-1.0.dtd"; /** Creates a new instance of ITunesParserOldNamespace */ public ITunesParserOldNamespace() { super(); - super.ns = Namespace.getNamespace( URI ); + super.ns = Namespace.getNamespace(URI); } + @Override public String getNamespaceUri() { return URI; } diff --git a/src/main/java/org/rometools/feed/module/itunes/types/Category.java b/src/main/java/org/rometools/feed/module/itunes/types/Category.java index 8cd0505..a129499 100644 --- a/src/main/java/org/rometools/feed/module/itunes/types/Category.java +++ b/src/main/java/org/rometools/feed/module/itunes/types/Category.java @@ -42,10 +42,9 @@ package org.rometools.feed.module.itunes.types; import java.io.Serializable; - /** - * This Category information. Basically a name and an optional Subcategory. - * Categories are defined by Apple. See ITMS for a view. + * This Category information. Basically a name and an optional Subcategory. Categories are defined by Apple. See ITMS for a view. + * * @version $Revision: 1.2 $ * @author Robert "kebernet" Cooper */ @@ -57,15 +56,18 @@ public class Category implements Serializable { public Category() { } - /** Creates a new instance of Category with a given name. + /** + * Creates a new instance of Category with a given name. + * * @param name Name of the category. */ - public Category(String name) { - this.setName(name); + public Category(final String name) { + setName(name); } /** * Returns the name of the category + * * @return Returns the name of the category */ public String getName() { @@ -74,14 +76,16 @@ public class Category implements Serializable { /** * Sets the name of the category + * * @param name Sets the name of the category */ - public void setName(String name) { + public void setName(final String name) { this.name = name; } /** * Returns the Subcategory object for this category + * * @return Returns the Subcategory object for this category */ public Subcategory getSubcategory() { @@ -90,32 +94,36 @@ public class Category implements Serializable { /** * Sets the Subcategory object for this category + * * @param subcategory Sets the Subcategory object for this category */ - public void setSubcategory(Subcategory subcategory) { + public void setSubcategory(final Subcategory subcategory) { this.subcategory = subcategory; } /** * Returns a copy of this category. + * * @return Returns a copy of this category. */ + @Override public Object clone() { - Category c = new Category(); - c.setName(this.getName()); + final Category c = new Category(); + c.setName(getName()); - if (this.getSubcategory() != null) { - c.setSubcategory((Subcategory) this.getSubcategory().clone()); + if (getSubcategory() != null) { + c.setSubcategory((Subcategory) getSubcategory().clone()); } return c; } + @Override public String toString() { - StringBuffer sb = new StringBuffer(this.getName()); + final StringBuffer sb = new StringBuffer(getName()); - if (this.getSubcategory() != null) { - sb.append(" -> " + this.getSubcategory().toString()); + if (getSubcategory() != null) { + sb.append(" -> " + getSubcategory().toString()); } return sb.toString(); diff --git a/src/main/java/org/rometools/feed/module/itunes/types/Duration.java b/src/main/java/org/rometools/feed/module/itunes/types/Duration.java index d7c179c..38663f6 100644 --- a/src/main/java/org/rometools/feed/module/itunes/types/Duration.java +++ b/src/main/java/org/rometools/feed/module/itunes/types/Duration.java @@ -39,16 +39,15 @@ */ package org.rometools.feed.module.itunes.types; +import java.io.Serializable; import java.text.NumberFormat; import java.util.StringTokenizer; -import java.io.Serializable; import com.sun.syndication.io.impl.NumberParser; - /** - * An encapsulation of the duration of a podcast. This will serialize (via .toString()) - * to HH:MM:SS format, and can parse [H]*H:[M]*M:[S]*S or [M]*M:[S]*S. + * An encapsulation of the duration of a podcast. This will serialize (via .toString()) to HH:MM:SS format, and can parse [H]*H:[M]*M:[S]*S or [M]*M:[S]*S. + * * @version $Revision: 1.7 $ * @author Robert "kebernet" Cooper */ @@ -57,7 +56,7 @@ public class Duration implements Serializable { static final long MINUTE = SECOND * 60; static final long HOUR = MINUTE * 60; static final NumberFormat NUM_FORMAT = NumberFormat.getNumberInstance(); - static{ + static { NUM_FORMAT.setMinimumFractionDigits(0); NUM_FORMAT.setMaximumFractionDigits(0); NUM_FORMAT.setMinimumIntegerDigits(2); @@ -74,58 +73,62 @@ public class Duration implements Serializable { /** * Creates a new instance of Duration specifying a length in milliseconds - * @param milliseconds Creates a new instance of Duration specifying a length in milliseconds + * + * @param milliseconds Creates a new instance of Duration specifying a length in milliseconds */ public Duration(final long milliseconds) { - this.setMilliseconds(milliseconds); + setMilliseconds(milliseconds); } /** * Creates a new duration object with the given hours, minutes and seconds + * * @param hours number of hours * @param minutes number of minutes * @param seconds number of seconds */ public Duration(final int hours, final int minutes, final float seconds) { - this.setMilliseconds((hours * HOUR) + (minutes * MINUTE) + - (long)(seconds * SECOND)); + setMilliseconds(hours * HOUR + minutes * MINUTE + (long) (seconds * SECOND)); } - + /** * Creates a new Duration parsing the String value. + * * @param duration A String to parse */ - public Duration( final String duration ){ - StringTokenizer tok = new StringTokenizer( duration, ":" ); - switch (tok.countTokens() ){ - case 1: - this.setMilliseconds( (long) (NumberParser.parseFloat(tok.nextToken(), 0f) * SECOND) ); - break; - case 2: - this.setMilliseconds(NumberParser.parseLong( tok.nextToken(), 0l ) * MINUTE + (long) (NumberParser.parseFloat(tok.nextToken(), 0f) * SECOND) ); - break; - case 3: - this.setMilliseconds(NumberParser.parseLong(tok.nextToken(), 0l) * HOUR + NumberParser.parseLong(tok.nextToken(), 0l) * MINUTE + (long) (NumberParser.parseFloat(tok.nextToken(), 0f) * SECOND) ); - break; - default: - throw new RuntimeException("Illegal time value: "+ duration); + public Duration(final String duration) { + final StringTokenizer tok = new StringTokenizer(duration, ":"); + switch (tok.countTokens()) { + case 1: + setMilliseconds((long) (NumberParser.parseFloat(tok.nextToken(), 0f) * SECOND)); + break; + case 2: + setMilliseconds(NumberParser.parseLong(tok.nextToken(), 0l) * MINUTE + (long) (NumberParser.parseFloat(tok.nextToken(), 0f) * SECOND)); + break; + case 3: + setMilliseconds(NumberParser.parseLong(tok.nextToken(), 0l) * HOUR + NumberParser.parseLong(tok.nextToken(), 0l) * MINUTE + + (long) (NumberParser.parseFloat(tok.nextToken(), 0f) * SECOND)); + break; + default: + throw new RuntimeException("Illegal time value: " + duration); } } /** * Returns a String representation in the formation HH:MM:SS + * * @return Returns a String representation in the formation HH:MM:SS */ + @Override public String toString() { - Time time = new Time(); + final Time time = new Time(); - - return NUM_FORMAT.format(time.hours) + ":" + NUM_FORMAT.format(time.minutes) + ":" + - NUM_FORMAT.format( Math.round(time.seconds) ); + return NUM_FORMAT.format(time.hours) + ":" + NUM_FORMAT.format(time.minutes) + ":" + NUM_FORMAT.format(Math.round(time.seconds)); } /** * Returns the millisecond length + * * @return the millisecond length */ public long getMilliseconds() { @@ -134,9 +137,10 @@ public class Duration implements Serializable { /** * Sets the millisecond length + * * @param milliseconds the millisecond length */ - public void setMilliseconds(long milliseconds) { + public void setMilliseconds(final long milliseconds) { this.milliseconds = milliseconds; } @@ -148,10 +152,10 @@ public class Duration implements Serializable { public Time() { long time = getMilliseconds(); hours = (int) (time / HOUR); - time = time - (long) hours * HOUR; + time = time - hours * HOUR; minutes = (int) (time / MINUTE); - time = time - (long) minutes * MINUTE; - seconds = (float) ( (float) time / (float) SECOND); + time = time - minutes * MINUTE; + seconds = (float) time / (float) SECOND; } } } diff --git a/src/main/java/org/rometools/feed/module/itunes/types/Subcategory.java b/src/main/java/org/rometools/feed/module/itunes/types/Subcategory.java index 405e61d..78b7e64 100644 --- a/src/main/java/org/rometools/feed/module/itunes/types/Subcategory.java +++ b/src/main/java/org/rometools/feed/module/itunes/types/Subcategory.java @@ -42,9 +42,9 @@ package org.rometools.feed.module.itunes.types; import java.io.Serializable; - /** * This class represents a Subcategor of a Category. + * * @author Robert "kebernet" Cooper * @version $Revision: 1.2 $ */ @@ -55,15 +55,18 @@ public class Subcategory implements Serializable { public Subcategory() { } - /** Creates a new instance of Category with a given name. + /** + * Creates a new instance of Category with a given name. + * * @param name Name of the category. */ - public Subcategory(String name) { - this.setName(name); + public Subcategory(final String name) { + setName(name); } /** * Returns the name of the subcategory. + * * @return Returns the name of the subcategory. */ public String getName() { @@ -72,28 +75,33 @@ public class Subcategory implements Serializable { /** * Set the name of the subcategory. + * * @param name Set the name of the subcategory. */ - public void setName(String name) { + public void setName(final String name) { this.name = name; } /** * Clones the object. + * * @return Clone of the object. */ + @Override public Object clone() { - Subcategory sc = new Subcategory(); - sc.setName(this.getName()); + final Subcategory sc = new Subcategory(); + sc.setName(getName()); return sc; } /** * String representation of the object. + * * @return String representation of the object. */ + @Override public String toString() { - return new StringBuffer(this.getName()).toString(); + return new StringBuffer(getName()).toString(); } } diff --git a/src/main/java/org/rometools/feed/module/mediarss/MediaEntryModule.java b/src/main/java/org/rometools/feed/module/mediarss/MediaEntryModule.java index 9f52962..675984e 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/MediaEntryModule.java +++ b/src/main/java/org/rometools/feed/module/mediarss/MediaEntryModule.java @@ -25,20 +25,22 @@ package org.rometools.feed.module.mediarss; import org.rometools.feed.module.mediarss.types.MediaContent; import org.rometools.feed.module.mediarss.types.MediaGroup; - /** * Represents entry/item level information. + * * @author cooper */ public interface MediaEntryModule extends MediaModule { /** * Returns the MediaContent items for the entry. + * * @return Returns the MediaContent items for the entry. */ public MediaContent[] getMediaContents(); /** * Returns the media groups for the entry. + * * @return Returns the media groups for the entry. */ public MediaGroup[] getMediaGroups(); diff --git a/src/main/java/org/rometools/feed/module/mediarss/MediaEntryModuleImpl.java b/src/main/java/org/rometools/feed/module/mediarss/MediaEntryModuleImpl.java index eb26c06..245bb49 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/MediaEntryModuleImpl.java +++ b/src/main/java/org/rometools/feed/module/mediarss/MediaEntryModuleImpl.java @@ -21,27 +21,26 @@ */ package org.rometools.feed.module.mediarss; -import com.sun.syndication.feed.CopyFrom; import java.io.Serializable; -import com.sun.syndication.feed.impl.EqualsBean; -import com.sun.syndication.feed.impl.ToStringBean; import org.rometools.feed.module.mediarss.types.MediaContent; import org.rometools.feed.module.mediarss.types.MediaGroup; import org.rometools.feed.module.mediarss.types.Metadata; +import com.sun.syndication.feed.CopyFrom; +import com.sun.syndication.feed.impl.EqualsBean; +import com.sun.syndication.feed.impl.ToStringBean; /** * Represents information for an Entry/Item level. + * * @author Nathanial X. Freitas */ -public class MediaEntryModuleImpl extends MediaModuleImpl - implements MediaEntryModule, Cloneable, Serializable { - private static final long serialVersionUID = -1564409507033924835L; +public class MediaEntryModuleImpl extends MediaModuleImpl implements MediaEntryModule, Cloneable, Serializable { + private static final long serialVersionUID = -1564409507033924835L; - /* - * the variables in the MediaModule are set when they apply to - * all MediaContent instances in the set + /* + * the variables in the MediaModule are set when they apply to all MediaContent instances in the set */ private MediaContent[] mediaContents = new MediaContent[0]; private MediaGroup[] mediaGroups = new MediaGroup[0]; @@ -55,15 +54,16 @@ public class MediaEntryModuleImpl extends MediaModuleImpl /** * MediaContent items for the entry + * * @param mediaContents MediaContent items for the entry */ - public void setMediaContents(MediaContent[] mediaContents) { - this.mediaContents = (mediaContents == null) ? new MediaContent[0] - : mediaContents; + public void setMediaContents(final MediaContent[] mediaContents) { + this.mediaContents = mediaContents == null ? new MediaContent[0] : mediaContents; } /** * MediaContent items for the entry + * * @return MediaContent items for the entry */ public MediaContent[] getMediaContents() { @@ -72,14 +72,16 @@ public class MediaEntryModuleImpl extends MediaModuleImpl /** * MediaGroups for the entry + * * @param mediaGroups MediaGroups for the entry */ - public void setMediaGroups(MediaGroup[] mediaGroups) { - this.mediaGroups = (mediaGroups == null) ? new MediaGroup[0] : mediaGroups; + public void setMediaGroups(final MediaGroup[] mediaGroups) { + this.mediaGroups = mediaGroups == null ? new MediaGroup[0] : mediaGroups; } /** * MediaGroups for the entry + * * @return MediaGroups for the entry */ public MediaGroup[] getMediaGroups() { @@ -88,43 +90,43 @@ public class MediaEntryModuleImpl extends MediaModuleImpl @Override public Object clone() { - MediaEntryModuleImpl m = new MediaEntryModuleImpl(); - m.setMediaContents((MediaContent[]) mediaContents.clone()); - m.setMediaGroups((MediaGroup[]) mediaGroups.clone()); - m.setMetadata((getMetadata() == null) ? null - : (Metadata) getMetadata().clone()); + final MediaEntryModuleImpl m = new MediaEntryModuleImpl(); + m.setMediaContents(mediaContents.clone()); + m.setMediaGroups(mediaGroups.clone()); + m.setMetadata(getMetadata() == null ? null : (Metadata) getMetadata().clone()); m.setPlayer(getPlayer()); return m; } @Override - public boolean equals(Object obj) { - EqualsBean eBean = new EqualsBean(MediaEntryModuleImpl.class, this); + public boolean equals(final Object obj) { + final EqualsBean eBean = new EqualsBean(MediaEntryModuleImpl.class, this); return eBean.beanEquals(obj); } @Override public int hashCode() { - EqualsBean equals = new EqualsBean(MediaEntryModuleImpl.class, this); + final EqualsBean equals = new EqualsBean(MediaEntryModuleImpl.class, this); return equals.beanHashCode(); } @Override public String toString() { - ToStringBean tsBean = new ToStringBean(MediaEntryModuleImpl.class, this); + final ToStringBean tsBean = new ToStringBean(MediaEntryModuleImpl.class, this); return tsBean.toString(); } - public void copyFrom(CopyFrom obj) { + @Override + public void copyFrom(final CopyFrom obj) { MediaEntryModuleImpl other = (MediaEntryModuleImpl) obj; other = (MediaEntryModuleImpl) other.clone(); - this.setMediaContents(other.getMediaContents()); - this.setMediaGroups(other.getMediaGroups()); - this.setMetadata(other.getMetadata()); - this.setPlayer(other.getPlayer()); + setMediaContents(other.getMediaContents()); + setMediaGroups(other.getMediaGroups()); + setMetadata(other.getMetadata()); + setPlayer(other.getPlayer()); } } diff --git a/src/main/java/org/rometools/feed/module/mediarss/MediaModule.java b/src/main/java/org/rometools/feed/module/mediarss/MediaModule.java index 13d51e5..01e69d2 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/MediaModule.java +++ b/src/main/java/org/rometools/feed/module/mediarss/MediaModule.java @@ -21,30 +21,33 @@ */ package org.rometools.feed.module.mediarss; -import com.sun.syndication.feed.module.Module; import org.rometools.feed.module.mediarss.types.Metadata; import org.rometools.feed.module.mediarss.types.PlayerReference; +import com.sun.syndication.feed.module.Module; /** * This is the base module for MediaRSS. - *

    It represents information that can be stored at the feed level, - * as well is a base for entry level information, as the same - * information can apply.

    + *

    + * It represents information that can be stored at the feed level, as well is a base for entry level information, as the same information can apply. + *

    + * * @author Nathanial X. Freitas */ public interface MediaModule extends Module { - //the URI of the MediaRSS specification as hosted by yahoo + // the URI of the MediaRSS specification as hosted by yahoo public final static String URI = "http://search.yahoo.com/mrss/"; /** * Returns Metadata associated with the feed. + * * @return Returns Metadata associated with the feed. */ public Metadata getMetadata(); /** * Returns a player reference associated with the feed. + * * @return Returns a player reference associated with the feed. */ public PlayerReference getPlayer(); diff --git a/src/main/java/org/rometools/feed/module/mediarss/MediaModuleImpl.java b/src/main/java/org/rometools/feed/module/mediarss/MediaModuleImpl.java index db88921..edc47d1 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/MediaModuleImpl.java +++ b/src/main/java/org/rometools/feed/module/mediarss/MediaModuleImpl.java @@ -22,23 +22,24 @@ */ package org.rometools.feed.module.mediarss; -import com.sun.syndication.feed.CopyFrom; import java.io.Serializable; -import com.sun.syndication.feed.module.ModuleImpl; import org.rometools.feed.module.mediarss.types.Metadata; import org.rometools.feed.module.mediarss.types.PlayerReference; +import com.sun.syndication.feed.CopyFrom; +import com.sun.syndication.feed.module.ModuleImpl; /** - * + * * This class represents feed/channel level elements for MediaRSS + * * @author cooper */ public class MediaModuleImpl extends ModuleImpl implements MediaModule, Serializable { - private static final long serialVersionUID = 1506805082848531979L; + private static final long serialVersionUID = 1506805082848531979L; - private Metadata metadata; + private Metadata metadata; private PlayerReference player; /** Creates a new instance of MediaModuleImpl */ @@ -48,10 +49,11 @@ public class MediaModuleImpl extends ModuleImpl implements MediaModule, Serializ /** * constructor that passes values up to ModuleImpl. + * * @param clazz * @param uri */ - public MediaModuleImpl(Class clazz, String uri) { + public MediaModuleImpl(final Class clazz, final String uri) { super(clazz, uri); } @@ -61,14 +63,16 @@ public class MediaModuleImpl extends ModuleImpl implements MediaModule, Serializ /** * Metadata for a feed. + * * @param metadata Metadata for a feed. */ - public void setMetadata(Metadata metadata) { + public void setMetadata(final Metadata metadata) { this.metadata = metadata; } /** * Metadata for a feed. + * * @return Metadata for a feed. */ public Metadata getMetadata() { @@ -77,35 +81,39 @@ public class MediaModuleImpl extends ModuleImpl implements MediaModule, Serializ /** * Player for a feed. + * * @param player Player for a feed. */ - public void setPlayer(PlayerReference player) { + public void setPlayer(final PlayerReference player) { this.player = player; } /** * Player for a feed. + * * @return Player for a feed. */ public PlayerReference getPlayer() { return player; } + @Override public String getUri() { return MediaModule.URI; } + @Override public Object clone() { - MediaModuleImpl m = new MediaModuleImpl(); + final MediaModuleImpl m = new MediaModuleImpl(); m.setMetadata((Metadata) metadata.clone()); m.setPlayer(player); return m; } - public void copyFrom(CopyFrom obj) { - MediaModule m = (MediaModule) obj; - this.metadata = (Metadata) m.getMetadata().clone(); - this.player = m.getPlayer(); + public void copyFrom(final CopyFrom obj) { + final MediaModule m = (MediaModule) obj; + metadata = (Metadata) m.getMetadata().clone(); + player = m.getPlayer(); } } diff --git a/src/main/java/org/rometools/feed/module/mediarss/io/AlternateMediaModuleParser.java b/src/main/java/org/rometools/feed/module/mediarss/io/AlternateMediaModuleParser.java index 4e1ff9e..5ff6145 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/io/AlternateMediaModuleParser.java +++ b/src/main/java/org/rometools/feed/module/mediarss/io/AlternateMediaModuleParser.java @@ -9,27 +9,28 @@ package org.rometools.feed.module.mediarss.io; -import org.jdom.Namespace; +import org.jdom2.Namespace; /** - * + * * @author cooper */ public class AlternateMediaModuleParser extends MediaModuleParser { - + private static final Namespace NS = Namespace.getNamespace("http://search.yahoo.com/mrss"); - /** Creates a new instance of AlternateMediaModuleParser */ public AlternateMediaModuleParser() { super(); } + @Override public String getNamespaceUri() { return "http://search.yahoo.com/mrss"; } - - public Namespace getNS(){ + + @Override + public Namespace getNS() { return AlternateMediaModuleParser.NS; } } diff --git a/src/main/java/org/rometools/feed/module/mediarss/io/MediaModuleGenerator.java b/src/main/java/org/rometools/feed/module/mediarss/io/MediaModuleGenerator.java index f7f35e4..a204c6f 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/io/MediaModuleGenerator.java +++ b/src/main/java/org/rometools/feed/module/mediarss/io/MediaModuleGenerator.java @@ -21,7 +21,11 @@ */ package org.rometools.feed.module.mediarss.io; -import com.sun.syndication.feed.module.Module; +import java.util.HashSet; +import java.util.Set; + +import org.jdom2.Element; +import org.jdom2.Namespace; import org.rometools.feed.module.mediarss.MediaEntryModule; import org.rometools.feed.module.mediarss.MediaModule; import org.rometools.feed.module.mediarss.types.Category; @@ -35,19 +39,13 @@ import org.rometools.feed.module.mediarss.types.Restriction; import org.rometools.feed.module.mediarss.types.Text; import org.rometools.feed.module.mediarss.types.Thumbnail; import org.rometools.feed.module.mediarss.types.UrlReference; -import com.sun.syndication.io.*; - -import org.jdom.Element; -import org.jdom.Namespace; - -import java.util.HashSet; -import java.util.Set; +import com.sun.syndication.feed.module.Module; +import com.sun.syndication.io.ModuleGenerator; //this class TBI public class MediaModuleGenerator implements ModuleGenerator { - private static final Namespace NS = Namespace.getNamespace("media", - MediaModule.URI); + private static final Namespace NS = Namespace.getNamespace("media", MediaModule.URI); private static final Set NAMESPACES = new HashSet(); static { @@ -62,198 +60,195 @@ public class MediaModuleGenerator implements ModuleGenerator { return NAMESPACES; } - public void generate(Module module, Element element) { + public void generate(final Module module, final Element element) { if (module instanceof MediaModule) { - MediaModule m = (MediaModule) module; - this.generateMetadata(m.getMetadata(), element); - this.generatePlayer(m.getPlayer(), element); + final MediaModule m = (MediaModule) module; + generateMetadata(m.getMetadata(), element); + generatePlayer(m.getPlayer(), element); } if (module instanceof MediaEntryModule) { - MediaEntryModule m = (MediaEntryModule) module; - MediaGroup[] g = m.getMediaGroups(); + final MediaEntryModule m = (MediaEntryModule) module; + final MediaGroup[] g = m.getMediaGroups(); - for (int i = 0; i < g.length; i++) { - this.generateGroup(g[i], element); + for (final MediaGroup element2 : g) { + generateGroup(element2, element); } - MediaContent[] c = m.getMediaContents(); + final MediaContent[] c = m.getMediaContents(); - for (int i = 0; i < c.length; i++) { - this.generateContent(c[i], element); + for (final MediaContent element2 : c) { + generateContent(element2, element); } } } - public void generateContent(MediaContent c, Element e) { - Element mc = new Element("content", NS); - this.addNotNullAttribute(mc, "medium", c.getMedium()); - this.addNotNullAttribute(mc, "channels", c.getAudioChannels()); - this.addNotNullAttribute(mc, "bitrate", c.getBitrate()); - this.addNotNullAttribute(mc, "duration", c.getDuration()); - this.addNotNullAttribute(mc, "expression", c.getExpression()); - this.addNotNullAttribute(mc, "fileSize", c.getFileSize()); - this.addNotNullAttribute(mc, "framerate", c.getFramerate()); - this.addNotNullAttribute(mc, "height", c.getHeight()); - this.addNotNullAttribute(mc, "lang", c.getLanguage()); - this.addNotNullAttribute(mc, "samplingrate", c.getSamplingrate()); - this.addNotNullAttribute(mc, "type", c.getType()); - this.addNotNullAttribute(mc, "width", c.getWidth()); + public void generateContent(final MediaContent c, final Element e) { + final Element mc = new Element("content", NS); + addNotNullAttribute(mc, "medium", c.getMedium()); + addNotNullAttribute(mc, "channels", c.getAudioChannels()); + addNotNullAttribute(mc, "bitrate", c.getBitrate()); + addNotNullAttribute(mc, "duration", c.getDuration()); + addNotNullAttribute(mc, "expression", c.getExpression()); + addNotNullAttribute(mc, "fileSize", c.getFileSize()); + addNotNullAttribute(mc, "framerate", c.getFramerate()); + addNotNullAttribute(mc, "height", c.getHeight()); + addNotNullAttribute(mc, "lang", c.getLanguage()); + addNotNullAttribute(mc, "samplingrate", c.getSamplingrate()); + addNotNullAttribute(mc, "type", c.getType()); + addNotNullAttribute(mc, "width", c.getWidth()); if (c.isDefaultContent()) { - this.addNotNullAttribute(mc, "isDefault", "true"); + addNotNullAttribute(mc, "isDefault", "true"); } if (c.getReference() instanceof UrlReference) { - this.addNotNullAttribute(mc, "url", c.getReference()); - this.generatePlayer(c.getPlayer(), mc); + addNotNullAttribute(mc, "url", c.getReference()); + generatePlayer(c.getPlayer(), mc); } else { - this.generatePlayer(c.getPlayer(), mc); + generatePlayer(c.getPlayer(), mc); } - this.generateMetadata(c.getMetadata(), mc); + generateMetadata(c.getMetadata(), mc); e.addContent(mc); } - public void generateGroup(MediaGroup g, Element e) { - Element t = new Element("group", NS); - MediaContent[] c = g.getContents(); + public void generateGroup(final MediaGroup g, final Element e) { + final Element t = new Element("group", NS); + final MediaContent[] c = g.getContents(); - for (int i = 0; i < c.length; i++) { - this.generateContent(c[i], t); + for (final MediaContent element : c) { + generateContent(element, t); } - this.generateMetadata(g.getMetadata(), t); + generateMetadata(g.getMetadata(), t); e.addContent(t); } - public void generateMetadata(Metadata m, Element e) { + public void generateMetadata(final Metadata m, final Element e) { if (m == null) { return; } - Category[] cats = m.getCategories(); + final Category[] cats = m.getCategories(); - for (int i = 0; i < cats.length; i++) { - Element c = generateSimpleElement("category", cats[i].getValue()); - this.addNotNullAttribute(c, "scheme", cats[i].getScheme()); - this.addNotNullAttribute(c, "label", cats[i].getLabel()); + for (final Category cat : cats) { + final Element c = generateSimpleElement("category", cat.getValue()); + addNotNullAttribute(c, "scheme", cat.getScheme()); + addNotNullAttribute(c, "label", cat.getLabel()); e.addContent(c); } - Element copyright = addNotNullElement(e, "copyright", m.getCopyright()); - this.addNotNullAttribute(copyright, "url", m.getCopyrightUrl()); + final Element copyright = addNotNullElement(e, "copyright", m.getCopyright()); + addNotNullAttribute(copyright, "url", m.getCopyrightUrl()); - Credit[] creds = m.getCredits(); + final Credit[] creds = m.getCredits(); - for (int i = 0; i < creds.length; i++) { - Element c = generateSimpleElement("credit", creds[i].getName()); - this.addNotNullAttribute(c, "role", creds[i].getRole()); - this.addNotNullAttribute(c, "scheme", creds[i].getScheme()); + for (final Credit cred : creds) { + final Element c = generateSimpleElement("credit", cred.getName()); + addNotNullAttribute(c, "role", cred.getRole()); + addNotNullAttribute(c, "scheme", cred.getScheme()); e.addContent(c); } - Element desc = addNotNullElement(e, "description", m.getDescription()); - this.addNotNullAttribute(desc, "type", m.getDescriptionType()); + final Element desc = addNotNullElement(e, "description", m.getDescription()); + addNotNullAttribute(desc, "type", m.getDescriptionType()); if (m.getHash() != null) { - Element hash = this.addNotNullElement(e, "hash", - m.getHash().getValue()); - this.addNotNullAttribute(hash, "algo", m.getHash().getAlgorithm()); + final Element hash = addNotNullElement(e, "hash", m.getHash().getValue()); + addNotNullAttribute(hash, "algo", m.getHash().getAlgorithm()); } - String[] keywords = m.getKeywords(); + final String[] keywords = m.getKeywords(); if (keywords.length > 0) { String keyword = keywords[0]; for (int i = 1; i < keywords.length; i++) { - keyword += (", " + keywords[i]); + keyword += ", " + keywords[i]; } - this.addNotNullElement(e, "keywords", keyword); + addNotNullElement(e, "keywords", keyword); } - Rating[] rats = m.getRatings(); + final Rating[] rats = m.getRatings(); - for (int i = 0; i < rats.length; i++) { - Element rat = this.addNotNullElement(e, "rating", rats[i].getValue()); - this.addNotNullAttribute(rat, "scheme", rats[i].getScheme()); + for (final Rating rat2 : rats) { + final Element rat = addNotNullElement(e, "rating", rat2.getValue()); + addNotNullAttribute(rat, "scheme", rat2.getScheme()); - if (rats[i].equals(Rating.ADULT)) { - this.addNotNullElement(e, "adult", "true"); - } else if (rats[i].equals(Rating.NONADULT)) { - this.addNotNullElement(e, "adult", "false"); + if (rat2.equals(Rating.ADULT)) { + addNotNullElement(e, "adult", "true"); + } else if (rat2.equals(Rating.NONADULT)) { + addNotNullElement(e, "adult", "false"); } } - Text[] text = m.getText(); + final Text[] text = m.getText(); - for (int i = 0; i < text.length; i++) { - Element t = this.addNotNullElement(e, "text", text[i].getValue()); - this.addNotNullAttribute(t, "type", text[i].getType()); - this.addNotNullAttribute(t, "start", text[i].getStart()); - this.addNotNullAttribute(t, "end", text[i].getEnd()); + for (final Text element : text) { + final Element t = addNotNullElement(e, "text", element.getValue()); + addNotNullAttribute(t, "type", element.getType()); + addNotNullAttribute(t, "start", element.getStart()); + addNotNullAttribute(t, "end", element.getEnd()); } - Thumbnail[] thumbs = m.getThumbnail(); + final Thumbnail[] thumbs = m.getThumbnail(); - for (int i = 0; i < thumbs.length; i++) { - Element t = new Element("thumbnail", NS); - this.addNotNullAttribute(t, "url", thumbs[i].getUrl()); - this.addNotNullAttribute(t, "width", thumbs[i].getWidth()); - this.addNotNullAttribute(t, "height", thumbs[i].getHeight()); - this.addNotNullAttribute(t, "time", thumbs[i].getTime()); + for (final Thumbnail thumb : thumbs) { + final Element t = new Element("thumbnail", NS); + addNotNullAttribute(t, "url", thumb.getUrl()); + addNotNullAttribute(t, "width", thumb.getWidth()); + addNotNullAttribute(t, "height", thumb.getHeight()); + addNotNullAttribute(t, "time", thumb.getTime()); e.addContent(t); } - Element title = this.addNotNullElement(e, "title", m.getTitle()); - this.addNotNullAttribute(title, "type", m.getTitleType()); + final Element title = addNotNullElement(e, "title", m.getTitle()); + addNotNullAttribute(title, "type", m.getTitleType()); - Restriction[] r = m.getRestrictions(); + final Restriction[] r = m.getRestrictions(); - for (int i = 0; i < r.length; i++) { - Element res = this.addNotNullElement(e, "restriction", - r[i].getValue()); - this.addNotNullAttribute(res, "type", r[i].getType()); - this.addNotNullAttribute(res, "relationship", r[i].getRelationship()); + for (final Restriction element : r) { + final Element res = addNotNullElement(e, "restriction", element.getValue()); + addNotNullAttribute(res, "type", element.getType()); + addNotNullAttribute(res, "relationship", element.getRelationship()); } } - public void generatePlayer(PlayerReference p, Element e) { + public void generatePlayer(final PlayerReference p, final Element e) { if (p == null) { return; } - Element t = new Element("player", NS); - this.addNotNullAttribute(t, "url", p.getUrl()); - this.addNotNullAttribute(t, "width", p.getWidth()); - this.addNotNullAttribute(t, "height", p.getHeight()); + final Element t = new Element("player", NS); + addNotNullAttribute(t, "url", p.getUrl()); + addNotNullAttribute(t, "width", p.getWidth()); + addNotNullAttribute(t, "height", p.getHeight()); e.addContent(t); } - protected void addNotNullAttribute(Element target, String name, Object value) { - if ((target == null) || (value == null)) { + protected void addNotNullAttribute(final Element target, final String name, final Object value) { + if (target == null || value == null) { return; } else { target.setAttribute(name, value.toString()); } } - protected Element addNotNullElement(Element target, String name, - Object value) { + protected Element addNotNullElement(final Element target, final String name, final Object value) { if (value == null) { return null; } else { - Element e = generateSimpleElement(name, value.toString()); + final Element e = generateSimpleElement(name, value.toString()); target.addContent(e); return e; } } - protected Element generateSimpleElement(String name, String value) { - Element element = new Element(name, NS); + protected Element generateSimpleElement(final String name, final String value) { + final Element element = new Element(name, NS); element.addContent(value); return element; diff --git a/src/main/java/org/rometools/feed/module/mediarss/io/MediaModuleParser.java b/src/main/java/org/rometools/feed/module/mediarss/io/MediaModuleParser.java index 56d4855..efb0d30 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/io/MediaModuleParser.java +++ b/src/main/java/org/rometools/feed/module/mediarss/io/MediaModuleParser.java @@ -21,7 +21,15 @@ */ package org.rometools.feed.module.mediarss.io; -import com.sun.syndication.feed.module.Module; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.jdom2.Element; +import org.jdom2.Namespace; import org.rometools.feed.module.mediarss.MediaEntryModuleImpl; import org.rometools.feed.module.mediarss.MediaModule; import org.rometools.feed.module.mediarss.MediaModuleImpl; @@ -39,82 +47,73 @@ import org.rometools.feed.module.mediarss.types.Text; import org.rometools.feed.module.mediarss.types.Thumbnail; import org.rometools.feed.module.mediarss.types.Time; import org.rometools.feed.module.mediarss.types.UrlReference; + +import com.sun.syndication.feed.module.Module; import com.sun.syndication.io.ModuleParser; import com.sun.syndication.io.impl.NumberParser; -import java.net.URI; - -import org.jdom.Element; -import org.jdom.Namespace; - - -import java.util.ArrayList; -import java.util.List; -import java.util.StringTokenizer; -import java.util.logging.Level; -import java.util.logging.Logger; - - /** * @author Nathanial X. Freitas - * + * */ public class MediaModuleParser implements ModuleParser { private static final Logger LOG = Logger.getLogger(MediaModuleParser.class.getName()); - + /* * Namespace instance for this URI. */ private static final Namespace NS = Namespace.getNamespace(MediaModule.URI); - - /* (non-Javadoc) + + /* + * (non-Javadoc) + * * @see com.sun.syndication.io.ModuleParser#getNamespaceUri() */ public String getNamespaceUri() { // TODO Auto-generated method stub return MediaModule.URI; } - - /* (non-Javadoc) - * @see com.sun.syndication.io.ModuleParser#parse(org.jdom.Element) + + /* + * (non-Javadoc) + * + * @see com.sun.syndication.io.ModuleParser#parse(org.jdom2.Element) */ - public Module parse(Element mmRoot) { + public Module parse(final Element mmRoot) { MediaModuleImpl mod = null; - - if (mmRoot.getName().equals("channel") || - mmRoot.getName().equals("feed")) { + + if (mmRoot.getName().equals("channel") || mmRoot.getName().equals("feed")) { mod = new MediaModuleImpl(); } else { mod = new MediaEntryModuleImpl(); } - + mod.setMetadata(parseMetadata(mmRoot)); mod.setPlayer(parsePlayer(mmRoot)); - + if (mod instanceof MediaEntryModuleImpl) { - MediaEntryModuleImpl m = (MediaEntryModuleImpl) mod; + final MediaEntryModuleImpl m = (MediaEntryModuleImpl) mod; m.setMediaContents(parseContent(mmRoot)); m.setMediaGroups(parseGroup(mmRoot)); } - + return mod; } - - private MediaContent[] parseContent(Element e) { - List contents = e.getChildren("content", getNS()); - ArrayList values = new ArrayList(); - + + private MediaContent[] parseContent(final Element e) { + final List contents = e.getChildren("content", getNS()); + final ArrayList values = new ArrayList(); + try { - for (int i = 0; (contents != null) && (i < contents.size()); i++) { - Element content = (Element) contents.get(i); + for (int i = 0; contents != null && i < contents.size(); i++) { + final Element content = (Element) contents.get(i); MediaContent mc = null; - + if (content.getAttributeValue("url") != null) { - try{ - mc = new MediaContent(new UrlReference( - new URI(content.getAttributeValue("url")))); + try { + mc = new MediaContent(new UrlReference(new URI(content.getAttributeValue("url")))); mc.setPlayer(parsePlayer(content)); - } catch (Exception ex) { + } catch (final Exception ex) { LOG.log(Level.WARNING, "Exception parsing content tag.", ex); } } else { @@ -122,29 +121,26 @@ public class MediaModuleParser implements ModuleParser { } if (mc != null) { values.add(mc); - try{ - mc.setAudioChannels((content.getAttributeValue("channels") == null) - ? null : new Integer(content.getAttributeValue("channels"))); - } catch (Exception ex) { + try { + mc.setAudioChannels(content.getAttributeValue("channels") == null ? null : new Integer(content.getAttributeValue("channels"))); + } catch (final Exception ex) { LOG.log(Level.WARNING, "Exception parsing content tag.", ex); } - try{ - mc.setBitrate((content.getAttributeValue("bitrate") == null) - ? null : new Float(content.getAttributeValue("bitrate"))); - } catch (Exception ex) { + try { + mc.setBitrate(content.getAttributeValue("bitrate") == null ? null : new Float(content.getAttributeValue("bitrate"))); + } catch (final Exception ex) { LOG.log(Level.WARNING, "Exception parsing content tag.", ex); } - try{ - mc.setDuration((content.getAttributeValue("duration") == null) - ? null : new Long(content.getAttributeValue("duration"))); - } catch (Exception ex) { + try { + mc.setDuration(content.getAttributeValue("duration") == null ? null : new Long(content.getAttributeValue("duration"))); + } catch (final Exception ex) { LOG.log(Level.WARNING, "Exception parsing content tag.", ex); } mc.setMedium(content.getAttributeValue("medium")); - String expression = content.getAttributeValue("expression"); - + final String expression = content.getAttributeValue("expression"); + if (expression != null) { if (expression.equalsIgnoreCase("full")) { mc.setExpression(Expression.FULL); @@ -154,245 +150,215 @@ public class MediaModuleParser implements ModuleParser { mc.setExpression(Expression.NONSTOP); } } - - try{ - mc.setFileSize((content.getAttributeValue("fileSize") == null) - ? null : NumberParser.parseLong(content.getAttributeValue("fileSize"))); - } catch (Exception ex) { + + try { + mc.setFileSize(content.getAttributeValue("fileSize") == null ? null : NumberParser.parseLong(content.getAttributeValue("fileSize"))); + } catch (final Exception ex) { LOG.log(Level.WARNING, "Exception parsing content tag.", ex); } - try{ - mc.setFramerate((content.getAttributeValue("framerate") == null) - ? null : NumberParser.parseFloat(content.getAttributeValue("framerate"))); - } catch (Exception ex) { + try { + mc.setFramerate(content.getAttributeValue("framerate") == null ? null : NumberParser.parseFloat(content.getAttributeValue("framerate"))); + } catch (final Exception ex) { LOG.log(Level.WARNING, "Exception parsing content tag.", ex); } - try { - mc.setHeight((content.getAttributeValue("height") == null) - ? null : NumberParser.parseInt(content.getAttributeValue("height"))); - } catch (Exception ex) { + try { + mc.setHeight(content.getAttributeValue("height") == null ? null : NumberParser.parseInt(content.getAttributeValue("height"))); + } catch (final Exception ex) { LOG.log(Level.WARNING, "Exception parsing content tag.", ex); } - + mc.setLanguage(content.getAttributeValue("lang")); mc.setMetadata(parseMetadata(content)); - try{ - mc.setSamplingrate((content.getAttributeValue("samplingrate") == null) - ? null : NumberParser.parseFloat(content.getAttributeValue("samplingrate"))); - } catch (Exception ex) { + try { + mc.setSamplingrate(content.getAttributeValue("samplingrate") == null ? null : NumberParser.parseFloat(content + .getAttributeValue("samplingrate"))); + } catch (final Exception ex) { LOG.log(Level.WARNING, "Exception parsing content tag.", ex); } - - mc.setType(content.getAttributeValue("type")); - try{ - mc.setWidth((content.getAttributeValue("width") == null) ? null - : NumberParser.parseInt(content.getAttributeValue("width"))); - } catch (Exception ex) { - LOG.log(Level.WARNING, "Exception parsing content tag.", ex); - } - - mc.setDefaultContent((content.getAttributeValue("isDefault") == null) - ? false - : Boolean.getBoolean(content.getAttributeValue( - "isDefault"))); - } else { - LOG.log(Level.WARNING, "Could not find MediaContent."); - } - - + mc.setType(content.getAttributeValue("type")); + try { + mc.setWidth(content.getAttributeValue("width") == null ? null : NumberParser.parseInt(content.getAttributeValue("width"))); + } catch (final Exception ex) { + LOG.log(Level.WARNING, "Exception parsing content tag.", ex); + } + + mc.setDefaultContent(content.getAttributeValue("isDefault") == null ? false : Boolean.getBoolean(content.getAttributeValue("isDefault"))); + } else { + LOG.log(Level.WARNING, "Could not find MediaContent."); + } + } - } catch (Exception ex) { + } catch (final Exception ex) { LOG.log(Level.WARNING, "Exception parsing content tag.", ex); } - + return (MediaContent[]) values.toArray(new MediaContent[values.size()]); } - - private MediaGroup[] parseGroup(Element e) { - List groups = e.getChildren("group", getNS()); - ArrayList values = new ArrayList(); - - for (int i = 0; (groups != null) && (i < groups.size()); i++) { - Element group = (Element) groups.get(i); - MediaGroup g = new MediaGroup(parseContent(group)); - + + private MediaGroup[] parseGroup(final Element e) { + final List groups = e.getChildren("group", getNS()); + final ArrayList values = new ArrayList(); + + for (int i = 0; groups != null && i < groups.size(); i++) { + final Element group = (Element) groups.get(i); + final MediaGroup g = new MediaGroup(parseContent(group)); + for (int j = 0; j < g.getContents().length; j++) { if (g.getContents()[j].isDefaultContent()) { g.setDefaultContentIndex(new Integer(j)); - + break; } } - + g.setMetadata(parseMetadata(group)); values.add(g); } - + return (MediaGroup[]) values.toArray(new MediaGroup[values.size()]); } - - private Metadata parseMetadata(Element e) { - Metadata md = new Metadata(); + + private Metadata parseMetadata(final Element e) { + final Metadata md = new Metadata(); // categories { - List categories = e.getChildren("category", getNS()); - ArrayList values = new ArrayList(); - - for (int i = 0; (categories != null) && (i < categories.size()); - i++) { + final List categories = e.getChildren("category", getNS()); + final ArrayList values = new ArrayList(); + + for (int i = 0; categories != null && i < categories.size(); i++) { try { - Element cat = (Element) categories.get(i); - values.add(new Category(cat.getAttributeValue("scheme"), - cat.getAttributeValue("label"), cat.getText())); - } catch (Exception ex) { + final Element cat = (Element) categories.get(i); + values.add(new Category(cat.getAttributeValue("scheme"), cat.getAttributeValue("label"), cat.getText())); + } catch (final Exception ex) { LOG.log(Level.WARNING, "Exception parsing category tag.", ex); } } - - md.setCategories((Category[]) values.toArray( - new Category[values.size()])); + + md.setCategories((Category[]) values.toArray(new Category[values.size()])); } - + // copyright try { - Element copy = e.getChild("copyright", getNS()); - + final Element copy = e.getChild("copyright", getNS()); + if (copy != null) { md.setCopyright(copy.getText()); - md.setCopyrightUrl((copy.getAttributeValue("url") != null) - ? new URI(copy.getAttributeValue("url")) : null); + md.setCopyrightUrl(copy.getAttributeValue("url") != null ? new URI(copy.getAttributeValue("url")) : null); } - } catch (Exception ex) { + } catch (final Exception ex) { LOG.log(Level.WARNING, "Exception parsing copyright tag.", ex); } // credits { - List credits = e.getChildren("credit", getNS()); - ArrayList values = new ArrayList(); - - for (int i = 0; (credits != null) && (i < credits.size()); i++) { + final List credits = e.getChildren("credit", getNS()); + final ArrayList values = new ArrayList(); + + for (int i = 0; credits != null && i < credits.size(); i++) { try { - Element cred = (Element) credits.get(i); - values.add(new Credit(cred.getAttributeValue("scheme"), - cred.getAttributeValue("role"), cred.getText())); - md.setCredits( (Credit[]) values.toArray( new Credit[ values.size()])); - } catch (Exception ex) { + final Element cred = (Element) credits.get(i); + values.add(new Credit(cred.getAttributeValue("scheme"), cred.getAttributeValue("role"), cred.getText())); + md.setCredits((Credit[]) values.toArray(new Credit[values.size()])); + } catch (final Exception ex) { LOG.log(Level.WARNING, "Exception parsing credit tag.", ex); } } } - + // description try { - Element description = e.getChild("description", getNS()); - + final Element description = e.getChild("description", getNS()); + if (description != null) { md.setDescription(description.getText()); md.setDescriptionType(description.getAttributeValue("type")); } - } catch (Exception ex) { + } catch (final Exception ex) { LOG.log(Level.WARNING, "Exception parsing description tag.", ex); } - + // hash try { - Element hash = e.getChild("hash", getNS()); - + final Element hash = e.getChild("hash", getNS()); + if (hash != null) { - md.setHash(new Hash(hash.getAttributeValue("algo"), - hash.getText())); + md.setHash(new Hash(hash.getAttributeValue("algo"), hash.getText())); } - } catch (Exception ex) { + } catch (final Exception ex) { LOG.log(Level.WARNING, "Exception parsing hash tag.", ex); } // keywords { - Element keywords = e.getChild("keywords", getNS()); - + final Element keywords = e.getChild("keywords", getNS()); + if (keywords != null) { - StringTokenizer tok = new StringTokenizer(keywords.getText(), - ","); - String[] value = new String[tok.countTokens()]; - + final StringTokenizer tok = new StringTokenizer(keywords.getText(), ","); + final String[] value = new String[tok.countTokens()]; + for (int i = 0; tok.hasMoreTokens(); i++) { value[i] = tok.nextToken().trim(); } - + md.setKeywords(value); } } // ratings { - List ratings = e.getChildren("rating", getNS()); - ArrayList values = new ArrayList(); - - for (int i = 0; (ratings != null) && (i < ratings.size()); i++) { + final List ratings = e.getChildren("rating", getNS()); + final ArrayList values = new ArrayList(); + + for (int i = 0; ratings != null && i < ratings.size(); i++) { try { - Element rat = (Element) ratings.get(i); - values.add(new Rating(rat.getAttributeValue("scheme"), - rat.getText())); - } catch (Exception ex) { + final Element rat = (Element) ratings.get(i); + values.add(new Rating(rat.getAttributeValue("scheme"), rat.getText())); + } catch (final Exception ex) { LOG.log(Level.WARNING, "Exception parsing rating tag.", ex); } } - + md.setRatings((Rating[]) values.toArray(new Rating[values.size()])); } // text { - List texts = e.getChildren("text", getNS()); - ArrayList values = new ArrayList(); - - for (int i = 0; (texts != null) && (i < texts.size()); i++) { + final List texts = e.getChildren("text", getNS()); + final ArrayList values = new ArrayList(); + + for (int i = 0; texts != null && i < texts.size(); i++) { try { - Element text = (Element) texts.get(i); - Time start = (text.getAttributeValue("start") == null) - ? null : new Time(text.getAttributeValue("start")); - Time end = (text.getAttributeValue("end") == null) ? null - : new Time(text.getAttributeValue( - "end")); - values.add(new Text(text.getAttributeValue("type"), - text.getTextTrim(), start, end)); - } catch (Exception ex) { + final Element text = (Element) texts.get(i); + final Time start = text.getAttributeValue("start") == null ? null : new Time(text.getAttributeValue("start")); + final Time end = text.getAttributeValue("end") == null ? null : new Time(text.getAttributeValue("end")); + values.add(new Text(text.getAttributeValue("type"), text.getTextTrim(), start, end)); + } catch (final Exception ex) { LOG.log(Level.WARNING, "Exception parsing text tag.", ex); } } - + md.setText((Text[]) values.toArray(new Text[values.size()])); } // thumbnails { - List thumbnails = e.getChildren("thumbnail", getNS()); - ArrayList values = new ArrayList(); - - for (int i = 0; (thumbnails != null) && (i < thumbnails.size()); - i++) { + final List thumbnails = e.getChildren("thumbnail", getNS()); + final ArrayList values = new ArrayList(); + + for (int i = 0; thumbnails != null && i < thumbnails.size(); i++) { try { - Element thumb = (Element) thumbnails.get(i); - Time t = (thumb.getAttributeValue("time") == null) ? null - : new Time(thumb.getAttributeValue( - "time")); - Integer width = (thumb.getAttributeValue("width") == null) - ? null : new Integer(thumb.getAttributeValue("width")); - Integer height = (thumb.getAttributeValue("height") == null) - ? null : new Integer(thumb.getAttributeValue("height")); - values.add(new Thumbnail( - new URI(thumb.getAttributeValue("url")), width, - height, t)); - } catch (Exception ex) { - LOG.log(Level.WARNING, "Exception parsing thumbnail tag.", - ex); + final Element thumb = (Element) thumbnails.get(i); + final Time t = thumb.getAttributeValue("time") == null ? null : new Time(thumb.getAttributeValue("time")); + final Integer width = thumb.getAttributeValue("width") == null ? null : new Integer(thumb.getAttributeValue("width")); + final Integer height = thumb.getAttributeValue("height") == null ? null : new Integer(thumb.getAttributeValue("height")); + values.add(new Thumbnail(new URI(thumb.getAttributeValue("url")), width, height, t)); + } catch (final Exception ex) { + LOG.log(Level.WARNING, "Exception parsing thumbnail tag.", ex); } } - - md.setThumbnail((Thumbnail[]) values.toArray( - new Thumbnail[values.size()])); + + md.setThumbnail((Thumbnail[]) values.toArray(new Thumbnail[values.size()])); } // title { - Element title = e.getChild("title", getNS()); - + final Element title = e.getChild("title", getNS()); + if (title != null) { md.setTitle(title.getText()); md.setTitleType(title.getAttributeValue("type")); @@ -400,77 +366,71 @@ public class MediaModuleParser implements ModuleParser { } // restrictions { - List restrictions = e.getChildren("restriction", getNS()); - ArrayList values = new ArrayList(); - + final List restrictions = e.getChildren("restriction", getNS()); + final ArrayList values = new ArrayList(); + for (int i = 0; i < restrictions.size(); i++) { - Element r = (Element) restrictions.get(i); + final Element r = (Element) restrictions.get(i); Restriction.Type type = null; - + if (r.getAttributeValue("type").equalsIgnoreCase("uri")) { type = Restriction.Type.URI; } else if (r.getAttributeValue("type").equalsIgnoreCase("country")) { type = Restriction.Type.COUNTRY; } - + Restriction.Relationship relationship = null; - + if (r.getAttributeValue("relationship").equalsIgnoreCase("allow")) { relationship = Restriction.Relationship.ALLOW; } else if (r.getAttributeValue("relationship").equalsIgnoreCase("deny")) { relationship = Restriction.Relationship.DENY; } - - Restriction value = new Restriction(relationship, type, - r.getTextTrim()); + + final Restriction value = new Restriction(relationship, type, r.getTextTrim()); values.add(value); } - - md.setRestrictions((Restriction[]) values.toArray( - new Restriction[values.size()])); + + md.setRestrictions((Restriction[]) values.toArray(new Restriction[values.size()])); } // handle adult { - Element adult = e.getChild("adult", getNS()); - - if ((adult != null) && (md.getRatings().length == 0)) { - Rating[] r = new Rating[1]; - + final Element adult = e.getChild("adult", getNS()); + + if (adult != null && md.getRatings().length == 0) { + final Rating[] r = new Rating[1]; + if (adult.getTextTrim().equals("true")) { r[0] = new Rating("urn:simple", "adult"); } else { r[0] = new Rating("urn:simple", "nonadult"); } - + md.setRatings(r); } } - + return md; } - - private PlayerReference parsePlayer(Element e) { - Element player = e.getChild("player", getNS()); + + private PlayerReference parsePlayer(final Element e) { + final Element player = e.getChild("player", getNS()); PlayerReference p = null; - + if (player != null) { - Integer width = (player.getAttributeValue("width") == null) ? null - : new Integer(player.getAttributeValue( - "width")); - Integer height = (player.getAttributeValue("height") == null) - ? null : new Integer(player.getAttributeValue("height")); - + final Integer width = player.getAttributeValue("width") == null ? null : new Integer(player.getAttributeValue("width")); + final Integer height = player.getAttributeValue("height") == null ? null : new Integer(player.getAttributeValue("height")); + try { - p = new PlayerReference(new URI(player.getAttributeValue("url")), - width, height); - } catch (Exception ex) { + p = new PlayerReference(new URI(player.getAttributeValue("url")), width, height); + } catch (final Exception ex) { LOG.log(Level.WARNING, "Exception parsing player tag.", ex); } } - + return p; } - + public Namespace getNS() { return NS; } diff --git a/src/main/java/org/rometools/feed/module/mediarss/io/RSS20YahooParser.java b/src/main/java/org/rometools/feed/module/mediarss/io/RSS20YahooParser.java index 158dcb0..424bc9f 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/io/RSS20YahooParser.java +++ b/src/main/java/org/rometools/feed/module/mediarss/io/RSS20YahooParser.java @@ -21,51 +21,50 @@ */ package org.rometools.feed.module.mediarss.io; +import java.util.List; + +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.Namespace; + import com.sun.syndication.feed.WireFeed; import com.sun.syndication.io.impl.RSS20Parser; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.Namespace; - -import java.util.List; - - /** * @author Nathanial X. Freitas - * - * + * + * */ public class RSS20YahooParser extends RSS20Parser { - //the Yahoo Namespace URI they sometimes use in the returns for video.search.yahoo.com RSS feed + // the Yahoo Namespace URI they sometimes use in the returns for video.search.yahoo.com RSS feed private static final String RSS_URI = "urn:yahoo:yn"; - // + // public RSS20YahooParser() { this("rss_2.0yahoo"); } - protected RSS20YahooParser(String type) { + protected RSS20YahooParser(final String type) { super(type); } /** * Indicates if a JDom document is an RSS instance that can be parsed with the parser. *

    - * It checks for RDF ("http://www.w3.org/1999/02/22-rdf-syntax-ns#") and - * RSS ("http://purl.org/rss/1.0/") namespaces being defined in the root element. - * + * It checks for RDF ("http://www.w3.org/1999/02/22-rdf-syntax-ns#") and RSS ("http://purl.org/rss/1.0/") namespaces being defined in the root element. + * * @param document document to check if it can be parsed with this parser implementation. * @return true if the document is RSS1., false otherwise. */ - public boolean isMyType(Document document) { + @Override + public boolean isMyType(final Document document) { boolean ok = false; - Element rssRoot = document.getRootElement(); - Namespace defaultNS = rssRoot.getNamespace(); - List additionalNSs = rssRoot.getAdditionalNamespaces(); + final Element rssRoot = document.getRootElement(); + final Namespace defaultNS = rssRoot.getNamespace(); + final List additionalNSs = rssRoot.getAdditionalNamespaces(); - ok = (defaultNS != null) && defaultNS.equals(getRSSNamespace()); + ok = defaultNS != null && defaultNS.equals(getRSSNamespace()); return ok; } @@ -73,20 +72,21 @@ public class RSS20YahooParser extends RSS20Parser { /** * Returns the namespace used by RSS elements in document of the RSS 1.0 *

    - * + * * @return returns "http://purl.org/rss/1.0/". */ + @Override protected Namespace getRSSNamespace() { return Namespace.getNamespace(RSS_URI); } /** - * After we parse the feed we put "rss_2.0" in it (so converters and generators work) - * this parser is a phantom. - * + * After we parse the feed we put "rss_2.0" in it (so converters and generators work) this parser is a phantom. + * */ - protected WireFeed parseChannel(Element rssRoot) { - WireFeed wFeed = super.parseChannel(rssRoot); + @Override + protected WireFeed parseChannel(final Element rssRoot) { + final WireFeed wFeed = super.parseChannel(rssRoot); wFeed.setFeedType("rss_2.0"); return wFeed; diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/AbstractSchemeValue.java b/src/main/java/org/rometools/feed/module/mediarss/types/AbstractSchemeValue.java index a87f530..80339dd 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/AbstractSchemeValue.java +++ b/src/main/java/org/rometools/feed/module/mediarss/types/AbstractSchemeValue.java @@ -25,18 +25,18 @@ package org.rometools.feed.module.mediarss.types; import java.io.Serializable; - -/** Simple data bean parent for scheme-value type entities. - * +/** + * Simple data bean parent for scheme-value type entities. + * * @author cooper */ public abstract class AbstractSchemeValue implements Serializable { - private static final long serialVersionUID = -917128796432458636L; - private String scheme; - private String value; + private static final long serialVersionUID = -917128796432458636L; + private final String scheme; + private final String value; - public AbstractSchemeValue(String scheme, String value) { - if ((scheme == null) || (value == null)) { + public AbstractSchemeValue(final String scheme, final String value) { + if (scheme == null || value == null) { throw new NullPointerException("Scheme and value cannot be null."); } diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Category.java b/src/main/java/org/rometools/feed/module/mediarss/types/Category.java index 0e8b4bb..afec0b1 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/Category.java +++ b/src/main/java/org/rometools/feed/module/mediarss/types/Category.java @@ -27,44 +27,54 @@ import java.io.Serializable; import com.sun.syndication.feed.impl.EqualsBean; import com.sun.syndication.feed.impl.ToStringBean; - /** - * + * * <media:category>

    - *

    Allows a taxonomy to be set that gives an indication of the type of media content, and its particular contents. - * It has 2 optional attributes.

    - * 
            <media:category scheme="http://search.yahoo.com/mrss/category_
+ * 
    
+ * Allows a taxonomy to be set that gives an indication of the type of media content, and its particular contents. It has 2 optional attributes.
+ * 
    
+ * 
+ * 
    + * <media:category scheme="http://search.yahoo.com/mrss/category_
  *        schema">music/artist/album/song</media:category>
- *
+ * 
  *        <media:category scheme="http://dmoz.org" label="Ace Ventura - Pet
  *        Detective">Arts/Movies/Titles/A/Ace_Ventura_Series/Ace_Ventura_
  *        -_Pet_Detective</media:category>
- *
+ * 
  *        <media:category scheme="urn:flickr:tags">ycantpark
- *        mobile</media:category>
    
- *
- * 
    scheme is the URI that identifies the categorization scheme. It is an optional attribute. If this attribute is not included, the default scheme is 'http://search.yahoo.com/mrss/category_schema'.
    
- *
- * 
    label is the human readable label that can be displayed in end user applications. It is an optional attribute.
    
+ *        mobile</media:category>
+ *
    + * + *

    + * scheme is the URI that identifies the categorization scheme. It is an optional attribute. If this attribute is not included, the default scheme is + * 'http://search.yahoo.com/mrss/category_schema'. + *

    + * + *

    + * label is the human readable label that can be displayed in end user applications. It is an optional attribute. + *

    + * * @author cooper */ public class Category implements Serializable { - private static final long serialVersionUID = 5182373808661745402L; - /** + private static final long serialVersionUID = 5182373808661745402L; + /** * Schem for FLICKR tags */ public static final String SCHEME_FLICKR_TAGS = "urn:flickr:tags"; private String label; private String scheme; - private String value; + private final String value; /** * Creates a new instance of Category + * * @param scheme scheme used * @param label label for the category * @param value value of the category item */ - public Category(String scheme, String label, String value) { + public Category(final String scheme, final String label, final String value) { this.scheme = scheme; this.value = value; this.label = label; @@ -72,14 +82,16 @@ public class Category implements Serializable { /** * Creates a new Category. + * * @param value value of the category. */ - public Category(String value) { + public Category(final String value) { this.value = value; } /** * label is the human readable label that can be displayed in end user applications. It is an optional attribute. + * * @return label is the human readable label that can be displayed in end user applications. It is an optional attribute. */ public String getLabel() { @@ -87,8 +99,11 @@ public class Category implements Serializable { } /** - * scheme is the URI that identifies the categorization scheme. It is an optional attribute. If this attribute is not included, the default scheme is 'http://search.yahoo.com/mrss/category_schema'. - * @return scheme is the URI that identifies the categorization scheme. It is an optional attribute. If this attribute is not included, the default scheme is 'http://search.yahoo.com/mrss/category_schema'. + * scheme is the URI that identifies the categorization scheme. It is an optional attribute. If this attribute is not included, the default scheme is + * 'http://search.yahoo.com/mrss/category_schema'. + * + * @return scheme is the URI that identifies the categorization scheme. It is an optional attribute. If this attribute is not included, the default scheme + * is 'http://search.yahoo.com/mrss/category_schema'. */ public String getScheme() { return scheme; @@ -96,26 +111,30 @@ public class Category implements Serializable { /** * value of the category + * * @return value of the category */ public String getValue() { return value; } - public boolean equals(Object obj) { - EqualsBean eBean = new EqualsBean(this.getClass(), this); + @Override + public boolean equals(final Object obj) { + final EqualsBean eBean = new EqualsBean(this.getClass(), this); return eBean.beanEquals(obj); } + @Override public int hashCode() { - EqualsBean equals = new EqualsBean(this.getClass(), this); + final EqualsBean equals = new EqualsBean(this.getClass(), this); return equals.beanHashCode(); } + @Override public String toString() { - ToStringBean tsBean = new ToStringBean(this.getClass(), this); + final ToStringBean tsBean = new ToStringBean(this.getClass(), this); return tsBean.toString(); } diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Credit.java b/src/main/java/org/rometools/feed/module/mediarss/types/Credit.java index 3e0343e..8378b6a 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/Credit.java +++ b/src/main/java/org/rometools/feed/module/mediarss/types/Credit.java @@ -27,23 +27,35 @@ import java.io.Serializable; import com.sun.syndication.feed.impl.EqualsBean; import com.sun.syndication.feed.impl.ToStringBean; - /** - * + * * <media:credit>

    - * - *

    Notable entity and the contribution to the creation of the media object. Current entities can include people, companies, locations, etc. Specific entities can have multiple roles, and several entities can have the same role. - * These should appear as distinct <media:credit> elements. - * It has 2 optional attributes.

    - * 
            <media:credit role="producer" scheme="urn:ebu">entity name</media:credit>
+ * 
+ * 
    
+ * Notable entity and the contribution to the creation of the media object. Current entities can include people, companies, locations, etc. Specific entities
+ * can have multiple roles, and several entities can have the same role. These should appear as distinct <media:credit> elements. It has 2 optional
+ * attributes.
+ * 
    
+ * 
+ * 
    + * <media:credit role="producer" scheme="urn:ebu">entity name</media:credit>
  * 
    
- * 
    role specifies the role the entity played. Must be lowercase. It is an optional attribute.
    
- *
- * 
    scheme is the URI that identifies the role scheme. It is an optional attribute. If this attribute is not included, the default scheme is 'urn:ebu'. See: European Broadcasting Union Role Codes.
    
- *
- *
- * 
    Example roles:
    
- * 
            actor
+ * 
    
+ * role specifies the role the entity played. Must be lowercase. It is an optional attribute.
+ * 
    
+ * 
+ * 
    
+ * scheme is the URI that identifies the role scheme. It is an optional attribute. If this attribute is not included, the default scheme is 'urn:ebu'.
+ * See: European Broadcasting Union Role Codes.
+ * 
    
+ * 
+ * 
+ * 
    
+ * Example roles:
+ * 
    
+ * 
+ * 
    + * actor
  *        anchor person
  *        author
  *        choreographer
@@ -65,37 +77,41 @@ import com.sun.syndication.feed.impl.ToStringBean;
  *        reporter
  *        vocalist
  * 
    
- * 
    Additional roles: European Broadcasting Union Role Codes
+ * 
    
+ * Additional roles: European Broadcasting Union Role Codes
+ * 
  * @author cooper
  */
 public class Credit implements Serializable {
-	private static final long serialVersionUID = 7722721287224043428L;
-	/**
+    private static final long serialVersionUID = 7722721287224043428L;
+    /**
      * Scheme value for the EBU credits.
      */
     public static final String SCHEME_EBU = "urn:ebu";
-    private String name;
-    private String role;
-    private String scheme;
+    private final String name;
+    private final String role;
+    private final String scheme;
 
     /**
      * Creates a new instance of Credit
+     * 
      * @param scheme schem used
      * @param role role name
      * @param name persons name
      */
-    public Credit(String scheme, String role, String name) {
+    public Credit(final String scheme, final String role, final String name) {
         if (name == null) {
             throw new NullPointerException("A credit name cannot be null.");
         }
 
-        this.scheme = (scheme == null) ? SCHEME_EBU : scheme;
-        this.role = (role == null) ? null : role.toLowerCase();
+        this.scheme = scheme == null ? SCHEME_EBU : scheme;
+        this.role = role == null ? null : role.toLowerCase();
         this.name = name;
     }
 
     /**
      * Person/organizations name
+     * 
      * @return Person/organizations name
      */
     public String getName() {
@@ -104,6 +120,7 @@ public class Credit implements Serializable {
 
     /**
      * Role name
+     * 
      * @return Role name
      */
     public String getRole() {
@@ -112,26 +129,30 @@ public class Credit implements Serializable {
 
     /**
      * Scheme used.
+     * 
      * @return Scheme used.
      */
     public String getScheme() {
         return scheme;
     }
 
-    public boolean equals(Object obj) {
-        EqualsBean eBean = new EqualsBean(this.getClass(), this);
+    @Override
+    public boolean equals(final Object obj) {
+        final EqualsBean eBean = new EqualsBean(this.getClass(), this);
 
         return eBean.beanEquals(obj);
     }
 
+    @Override
     public int hashCode() {
-        EqualsBean equals = new EqualsBean(this.getClass(), this);
+        final EqualsBean equals = new EqualsBean(this.getClass(), this);
 
         return equals.beanHashCode();
     }
 
+    @Override
     public String toString() {
-        ToStringBean tsBean = new ToStringBean(this.getClass(), this);
+        final ToStringBean tsBean = new ToStringBean(this.getClass(), this);
 
         return tsBean.toString();
     }
diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Expression.java b/src/main/java/org/rometools/feed/module/mediarss/types/Expression.java
index 95fac21..6bf9f5d 100644
--- a/src/main/java/org/rometools/feed/module/mediarss/types/Expression.java
+++ b/src/main/java/org/rometools/feed/module/mediarss/types/Expression.java
@@ -19,14 +19,14 @@ package org.rometools.feed.module.mediarss.types;
 
 import java.io.Serializable;
 
-
 /**
- * expression determines if the object is a sample or the full version of the object, or even if it is a continuous stream (sample | full | nonstop). Default value is 'full'. It is an optional attribute.
+ * expression determines if the object is a sample or the full version of the object, or even if it is a continuous stream (sample | full | nonstop). Default
+ * value is 'full'. It is an optional attribute.
  */
 public class Expression implements Serializable {
-	private static final long serialVersionUID = 2356898289547679768L;
+    private static final long serialVersionUID = 2356898289547679768L;
 
-	/**
+    /**
      * Represents a complete media object.
      */
     public static final Expression FULL = new Expression("full");
@@ -40,13 +40,14 @@ public class Expression implements Serializable {
      * represents a streaming media object.
      */
     public static final Expression NONSTOP = new Expression("nonstop");
-    private String value;
+    private final String value;
 
-    private Expression(String value) {
+    private Expression(final String value) {
         this.value = value;
     }
 
+    @Override
     public String toString() {
-        return this.value;
+        return value;
     }
 }
diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Hash.java b/src/main/java/org/rometools/feed/module/mediarss/types/Hash.java
index 5558d14..f718a50 100644
--- a/src/main/java/org/rometools/feed/module/mediarss/types/Hash.java
+++ b/src/main/java/org/rometools/feed/module/mediarss/types/Hash.java
@@ -27,59 +27,73 @@ import java.io.Serializable;
 import com.sun.syndication.feed.impl.EqualsBean;
 import com.sun.syndication.feed.impl.ToStringBean;
 
-
 /**
- *
+ * 
  * <media:hash>
    
- *
- * 
    This is the hash of the binary media file. It can appear multiple times as long as each instance is a different algo. It has 1 optional attribute.
    
- *
- * 
            <media:hash algo="md5">dfdec888b72151965a34b4b59031290a</media:hash>
    
- *
- * 
    algo indicates the algorithm used to create the hash. Possible values are 'md5' and 'sha-1'. Default value is 'md5'. It is an optional attribute.
+ * 
+ * 
    
+ * This is the hash of the binary media file. It can appear multiple times as long as each instance is a different algo. It has 1 optional attribute.
+ * 
    
+ * 
    
+ * 
    
+ * 
+ * 
    + * <media:hash algo="md5">dfdec888b72151965a34b4b59031290a</media:hash>
+ * 
    
+ * 
+ * 
    
+ * algo indicates the algorithm used to create the hash. Possible values are 'md5' and 'sha-1'. Default value is 'md5'. It is an optional attribute.
+ * 
  * @author cooper
  */
 public class Hash extends AbstractSchemeValue implements Serializable {
-	private static final long serialVersionUID = 3566980635881544337L;
+    private static final long serialVersionUID = 3566980635881544337L;
 
-	/**
+    /**
      * Creates a new instance of Hash
+     * 
      * @param algorithm algoright used
      * @param value value of the hash
      */
-    public Hash(String algorithm, String value) {
-        super(algorithm == null ? "MD5": algorithm , value);
+    public Hash(final String algorithm, final String value) {
+        super(algorithm == null ? "MD5" : algorithm, value);
     }
+
     /**
      * Creates a new instance of Hash assuming the default algorithm of MD5
+     * 
      * @param algorithm algoright used
      */
-    public Hash(String value ){
-        this( null, value);
+    public Hash(final String value) {
+        this(null, value);
     }
 
     /**
      * Alsorithm used for the hash
+     * 
      * @return Alsorithm used for the hash
      */
     public String getAlgorithm() {
         return super.getScheme();
     }
 
-    public boolean equals(Object obj) {
-        EqualsBean eBean = new EqualsBean(this.getClass(), this);
+    @Override
+    public boolean equals(final Object obj) {
+        final EqualsBean eBean = new EqualsBean(this.getClass(), this);
 
         return eBean.beanEquals(obj);
     }
 
+    @Override
     public int hashCode() {
-        EqualsBean equals = new EqualsBean(this.getClass(), this);
+        final EqualsBean equals = new EqualsBean(this.getClass(), this);
 
         return equals.beanHashCode();
     }
 
+    @Override
     public String toString() {
-        ToStringBean tsBean = new ToStringBean(this.getClass(), this);
+        final ToStringBean tsBean = new ToStringBean(this.getClass(), this);
 
         return tsBean.toString();
     }
diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/MediaContent.java b/src/main/java/org/rometools/feed/module/mediarss/types/MediaContent.java
index 24f79cf..74686d3 100644
--- a/src/main/java/org/rometools/feed/module/mediarss/types/MediaContent.java
+++ b/src/main/java/org/rometools/feed/module/mediarss/types/MediaContent.java
@@ -21,18 +21,19 @@
  */
 package org.rometools.feed.module.mediarss.types;
 
+import java.io.Serializable;
+
 import com.sun.syndication.feed.impl.EqualsBean;
 import com.sun.syndication.feed.impl.ToStringBean;
 
-import java.io.Serializable;
-
-
 /**
  * <media:content>
    
- * 
    <media:content> is a sub-element of either <item> or <media:group>. Media objects that are not the same content should not be included in the same <media:group> element. The sequence of these items implies the order of presentation.
- * While many of the attributes appear to be audio/video specific, this element can be used to publish any type of media.
- * It contains 14 attributes, most of which are optional.
    
- *
+ * 
    
+ * <media:content> is a sub-element of either <item> or <media:group>. Media objects that are not the same content should not be included
+ * in the same <media:group> element. The sequence of these items implies the order of presentation. While many of the attributes appear to be
+ * audio/video specific, this element can be used to publish any type of media. It contains 14 attributes, most of which are optional.
+ * 
    
+ * 
  * 
      *        <media:content
  *               url="http://www.foo.com/movie.mov"
@@ -48,43 +49,79 @@ import java.io.Serializable;
  *               duration="185"
  *               height="200"
  *               width="300"
- *               lang="en" />
    
- *
- * 
    url should specify the direct url to the media object. If not included, a <media:player> element must be specified.
    fileSize is the number of bytes of the media object. It is an optional attribute.
    
- * 
    type is the standard MIME type of the object. It is an optional attribute.
    
- *
- * 
    medium is the type of object (image | audio | video | document | executable). While this attribute can at times seem redundant if type is supplied, it is included because it simplifies decision making on the reader side, as well as flushes out any ambiguities between MIME type and object type. It is an optional attribute.
    
- *
- *
- * 
    isDefault determines if this is the default object that should be used for the <media:group>.  There should only be one default object per <media:group>. It is an optional attribute.
    
- *
- * 
    expression determines if the object is a sample or the full version of the object, or even if it is a continuous stream (sample | full | nonstop).
- * Default value is 'full'.
- * It is an optional attribute. 
    
- *
- * 
    bitrate is the kilobits per second rate of media. It is an optional attribute.
    
- * 
    framerate is the number of frames per second for the media object. It is an optional attribute.
    
- * 
    samplingrate is the number of samples per second taken to create the media object. It is expressed in thousands of samples per second (kHz). It is an optional attribute.
    
- * 
    channels is number of audio channels in the media object. It is an optional attribute.
- * 
    duration is the number of seconds the media object plays. It is an optional attribute.
    
- *
- *
- *
- *
- *
- * 
    height is the height of the media object. It is an optional attribute.
    
- * 
    width is the width of the media object. It is an optional attribute.
    
- *
- * 
    lang is the primary language encapsulated in the media object. Language codes possible are detailed in RFC 3066. This attribute is used similar to the xml:lang attribute detailed in the XML 1.0 Specification (Third Edition). It is an optional attribute.
    
- *
- *
- *        
     These optional attributes, along with the optional elements below, contain the primary metadata entries needed to index and organize media content.
- *            Additional supported attributes for describing images, audio, and video may be added in future revisions of this document.
    
+ *               lang="en" />
+ * 
    
+ * 
+ * 
    
+ * url should specify the direct url to the media object. If not included, a <media:player> element must be specified.
+ * 
    
+ * 
    
+ * fileSize is the number of bytes of the media object. It is an optional attribute.
+ * 
    
+ * 
    
+ * type is the standard MIME type of the object. It is an optional attribute.
+ * 
    
+ * 
+ * 
    
+ * medium is the type of object (image | audio | video | document | executable). While this attribute can at times seem redundant if type is
+ * supplied, it is included because it simplifies decision making on the reader side, as well as flushes out any ambiguities between MIME type and object type.
+ * It is an optional attribute.
+ * 
    
+ * 
+ * 
+ * 
    
+ * isDefault determines if this is the default object that should be used for the <media:group>. There should only be one default object per
+ * <media:group>. It is an optional attribute.
+ * 
    
+ * 
+ * 
    
+ * expression determines if the object is a sample or the full version of the object, or even if it is a continuous stream (sample | full | nonstop).
+ * Default value is 'full'. It is an optional attribute.
+ * 
    
+ * 
+ * 
    
+ * bitrate is the kilobits per second rate of media. It is an optional attribute.
+ * 
    
+ * 
    
+ * framerate is the number of frames per second for the media object. It is an optional attribute.
+ * 
    
+ * 
    
+ * samplingrate is the number of samples per second taken to create the media object. It is expressed in thousands of samples per second (kHz). It is
+ * an optional attribute.
+ * 
    
+ * 
    
+ * channels is number of audio channels in the media object. It is an optional attribute.
+ * 
    
+ * 
    
+ * duration is the number of seconds the media object plays. It is an optional attribute.
+ * 
    
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
    
+ * height is the height of the media object. It is an optional attribute.
+ * 
    
+ * 
    
+ * width is the width of the media object. It is an optional attribute.
+ * 
    
+ * 
+ * 
    
+ * lang is the primary language encapsulated in the media object. Language codes possible are detailed in RFC 3066. This attribute is used similar to
+ * the xml:lang attribute detailed in the XML 1.0 Specification (Third Edition). It is an optional attribute.
+ * 
    
+ * 
+ * 
+ * 
    
+ * These optional attributes, along with the optional elements below, contain the primary metadata entries needed to index and organize media content.
+ * Additional supported attributes for describing images, audio, and video may be added in future revisions of this document.
+ * 
    
+ * 
  * @author Nathanial X. Freitas
- *
- * MediaContent corresponds to the  element defined within the MediaRSS specification.
- * There may be one or more  instances within each instance of an  within an
- * RSS 2.0 document.
+ * 
+ *         MediaContent corresponds to the  element defined within the MediaRSS specification. There may be one or more  instances
+ *         within each instance of an  within an RSS 2.0 document.
  */
 public class MediaContent implements Serializable {
     private static final long serialVersionUID = -4990262574794352616L;
@@ -93,20 +130,21 @@ public class MediaContent implements Serializable {
     private Float framerate = null;
     private Float samplingrate = null;
 
-    /*private variable for storing instances of Thumbnail class
-      each MediaContent can have zero to many thumbnails*/
+    /*
+     * private variable for storing instances of Thumbnail class each MediaContent can have zero to many thumbnails
+     */
     private Integer audioChannels = null;
 
-    /*the height in pixels of the resource*/
+    /* the height in pixels of the resource */
     private Integer height = null;
 
-    /*the width in pixels of the resource*/
+    /* the width in pixels of the resource */
     private Integer width = null;
 
-    /*the duration in seconds of the resource*/
+    /* the duration in seconds of the resource */
     private Long duration = null;
 
-    /*the file size in bytes of the resouce*/
+    /* the file size in bytes of the resouce */
     private Long fileSize = null;
     private Metadata metadata;
     private PlayerReference player;
@@ -114,7 +152,7 @@ public class MediaContent implements Serializable {
     private String language;
     private String medium;
 
-    /*the MIME type of the resource*/
+    /* the MIME type of the resource */
     private String type = null;
     private boolean defaultContent;
 
@@ -124,28 +162,31 @@ public class MediaContent implements Serializable {
 
     /**
      * Creates a new MediaContent
+     * 
      * @param reference UrlReference or Player reference for the item.
      */
-    public MediaContent(Reference reference) {
+    public MediaContent(final Reference reference) {
         super();
 
         if (reference == null) {
             throw new NullPointerException("You must provide either a PlayerReference or URL reference.");
         }
 
-        this.setReference(reference);
+        setReference(reference);
     }
 
     /**
      * channels is number of audio channels in the media object. It is an optional attribute.
+     * 
      * @param audioChannels channels is number of audio channels in the media object. It is an optional attribute.
      */
-    public void setAudioChannels(Integer audioChannels) {
+    public void setAudioChannels(final Integer audioChannels) {
         this.audioChannels = audioChannels;
     }
 
     /**
      * channels is number of audio channels in the media object. It is an optional attribute.
+     * 
      * @return channels is number of audio channels in the media object. It is an optional attribute.
      */
     public Integer getAudioChannels() {
@@ -154,14 +195,16 @@ public class MediaContent implements Serializable {
 
     /**
      * bitrate is the kilobits per second rate of media. It is an optional attribute.
+     * 
      * @param bitrate bitrate is the kilobits per second rate of media. It is an optional attribute.
      */
-    public void setBitrate(Float bitrate) {
+    public void setBitrate(final Float bitrate) {
         this.bitrate = bitrate;
     }
 
     /**
      * bitrate is the kilobits per second rate of media. It is an optional attribute.
+     * 
      * @return bitrate is the kilobits per second rate of media. It is an optional attribute.
      */
     public Float getBitrate() {
@@ -169,16 +212,22 @@ public class MediaContent implements Serializable {
     }
 
     /**
-     * isDefault determines if this is the default object that should be used for the . There should only be one default object per . It is an optional attribute.
-     * @param defaultContent isDefault determines if this is the default object that should be used for the . There should only be one default object per . It is an optional attribute.
+     * isDefault determines if this is the default object that should be used for the . There should only be one default object per .
+     * It is an optional attribute.
+     * 
+     * @param defaultContent isDefault determines if this is the default object that should be used for the . There should only be one default
+     *            object per . It is an optional attribute.
      */
-    public void setDefaultContent(boolean defaultContent) {
+    public void setDefaultContent(final boolean defaultContent) {
         this.defaultContent = defaultContent;
     }
 
     /**
-     * isDefault determines if this is the default object that should be used for the . There should only be one default object per . It is an optional attribute.
-     * @return isDefault determines if this is the default object that should be used for the . There should only be one default object per . It is an optional attribute.
+     * isDefault determines if this is the default object that should be used for the . There should only be one default object per .
+     * It is an optional attribute.
+     * 
+     * @return isDefault determines if this is the default object that should be used for the . There should only be one default object per
+     *         . It is an optional attribute.
      */
     public boolean isDefaultContent() {
         return defaultContent;
@@ -186,14 +235,16 @@ public class MediaContent implements Serializable {
 
     /**
      * duration is the number of seconds the media object plays. It is an optional attribute.
+     * 
      * @param duration duration is the number of seconds the media object plays. It is an optional attribute.
      */
-    public void setDuration(Long duration) {
+    public void setDuration(final Long duration) {
         this.duration = duration;
     }
 
     /**
      * duration is the number of seconds the media object plays. It is an optional attribute.
+     * 
      * @return duration is the number of seconds the media object plays. It is an optional attribute.
      */
     public Long getDuration() {
@@ -201,32 +252,40 @@ public class MediaContent implements Serializable {
     }
 
     /**
-     * expression determines if the object is a sample or the full version of the object, or even if it is a continuous stream (sample | full | nonstop). Default value is 'full'. It is an optional attribute.
-     * @param expression expression determines if the object is a sample or the full version of the object, or even if it is a continuous stream (sample | full | nonstop). Default value is 'full'. It is an optional attribute.
+     * expression determines if the object is a sample or the full version of the object, or even if it is a continuous stream (sample | full | nonstop).
+     * Default value is 'full'. It is an optional attribute.
+     * 
+     * @param expression expression determines if the object is a sample or the full version of the object, or even if it is a continuous stream (sample | full
+     *            | nonstop). Default value is 'full'. It is an optional attribute.
      */
-    public void setExpression(Expression expression) {
+    public void setExpression(final Expression expression) {
         this.expression = expression;
     }
 
     /**
-     * expression determines if the object is a sample or the full version of the object, or even if it is a continuous stream (sample | full | nonstop). Default value is 'full'. It is an optional attribute.
-     * @return expression determines if the object is a sample or the full version of the object, or even if it is a continuous stream (sample | full | nonstop). Default value is 'full'. It is an optional attribute.
+     * expression determines if the object is a sample or the full version of the object, or even if it is a continuous stream (sample | full | nonstop).
+     * Default value is 'full'. It is an optional attribute.
+     * 
+     * @return expression determines if the object is a sample or the full version of the object, or even if it is a continuous stream (sample | full |
+     *         nonstop). Default value is 'full'. It is an optional attribute.
      */
     public Expression getExpression() {
         return expression;
     }
 
     /**
-     *
+     * 
      * fileSize is the number of bytes of the media object. It is an optional attribute.
+     * 
      * @param fileSize The fileSize to set.
      */
-    public void setFileSize(Long fileSize) {
+    public void setFileSize(final Long fileSize) {
         this.fileSize = fileSize;
     }
 
     /**
      * fileSize is the number of bytes of the media object. It is an optional attribute.
+     * 
      * @return Returns the fileSize.
      */
     public Long getFileSize() {
@@ -235,14 +294,16 @@ public class MediaContent implements Serializable {
 
     /**
      * framerate is the number of frames per second for the media object. It is an optional attribute.
+     * 
      * @param framerate framerate is the number of frames per second for the media object. It is an optional attribute.
      */
-    public void setFramerate(Float framerate) {
+    public void setFramerate(final Float framerate) {
         this.framerate = framerate;
     }
 
     /**
      * framerate is the number of frames per second for the media object. It is an optional attribute.
+     * 
      * @return framerate is the number of frames per second for the media object. It is an optional attribute.
      */
     public Float getFramerate() {
@@ -251,14 +312,16 @@ public class MediaContent implements Serializable {
 
     /**
      * height is the height of the media object. It is an optional attribute.
+     * 
      * @param height height is the height of the media object. It is an optional attribute.
      */
-    public void setHeight(Integer height) {
+    public void setHeight(final Integer height) {
         this.height = height;
     }
 
     /**
      * height is the height of the media object. It is an optional attribute.
+     * 
      * @return height is the height of the media object. It is an optional attribute.
      */
     public Integer getHeight() {
@@ -266,16 +329,22 @@ public class MediaContent implements Serializable {
     }
 
     /**
-     * lang is the primary language encapsulated in the media object. Language codes possible are detailed in RFC 3066. This attribute is used similar to the xml:lang attribute detailed in the XML 1.0 Specification (Third Edition). It is an optional attribute.
-     * @param language lang is the primary language encapsulated in the media object. Language codes possible are detailed in RFC 3066. This attribute is used similar to the xml:lang attribute detailed in the XML 1.0 Specification (Third Edition). It is an optional attribute.
+     * lang is the primary language encapsulated in the media object. Language codes possible are detailed in RFC 3066. This attribute is used similar to the
+     * xml:lang attribute detailed in the XML 1.0 Specification (Third Edition). It is an optional attribute.
+     * 
+     * @param language lang is the primary language encapsulated in the media object. Language codes possible are detailed in RFC 3066. This attribute is used
+     *            similar to the xml:lang attribute detailed in the XML 1.0 Specification (Third Edition). It is an optional attribute.
      */
-    public void setLanguage(String language) {
+    public void setLanguage(final String language) {
         this.language = language;
     }
 
     /**
-     * lang is the primary language encapsulated in the media object. Language codes possible are detailed in RFC 3066. This attribute is used similar to the xml:lang attribute detailed in the XML 1.0 Specification (Third Edition). It is an optional attribute.
-     * @return lang is the primary language encapsulated in the media object. Language codes possible are detailed in RFC 3066. This attribute is used similar to the xml:lang attribute detailed in the XML 1.0 Specification (Third Edition). It is an optional attribute.
+     * lang is the primary language encapsulated in the media object. Language codes possible are detailed in RFC 3066. This attribute is used similar to the
+     * xml:lang attribute detailed in the XML 1.0 Specification (Third Edition). It is an optional attribute.
+     * 
+     * @return lang is the primary language encapsulated in the media object. Language codes possible are detailed in RFC 3066. This attribute is used similar
+     *         to the xml:lang attribute detailed in the XML 1.0 Specification (Third Edition). It is an optional attribute.
      */
     public String getLanguage() {
         return language;
@@ -283,32 +352,34 @@ public class MediaContent implements Serializable {
 
     /**
      * Set the value of medium
-     *
+     * 
      * @param newmedium new value of medium
      */
-    public void setMedium(String newmedium) {
-        this.medium = newmedium;
+    public void setMedium(final String newmedium) {
+        medium = newmedium;
     }
 
     /**
      * Get the value of medium
-     *
+     * 
      * @return the value of medium
      */
     public String getMedium() {
-        return this.medium;
+        return medium;
     }
 
     /**
      * The metadata for the item
+     * 
      * @param metadata The metadata for the item
      */
-    public void setMetadata(Metadata metadata) {
+    public void setMetadata(final Metadata metadata) {
         this.metadata = metadata;
     }
 
     /**
      * The metadata for the item
+     * 
      * @return The metadata for the item
      */
     public Metadata getMetadata() {
@@ -317,30 +388,54 @@ public class MediaContent implements Serializable {
 
     /**
      * <media:player>
    
-     * 
    Allows the media object to be accessed through a web browser media player console.
-     * This element is required only if a direct media url attribute is not specified in the <media:content> element. It has 1 required attribute, and 2 optional attributes.
    
-     * 
            <media:player url="http://www.foo.com/player?id=1111" height="200" width="400" />
    
-     * 
    url is the url of the player console that plays the media. It is a required attribute.
    
-     *
-     * 
    height is the height of the browser window that the url should be opened in. It is an optional attribute.
    
-     * 
    width is the width of the browser window that the url should be opened in. It is an optional attribute.
    
-     *
      * 
    
+     * Allows the media object to be accessed through a web browser media player console. This element is required only if a direct media url attribute
+     * is not specified in the <media:content> element. It has 1 required attribute, and 2 optional attributes.
+     * 
    
+     * 
+     * 
    +     * <media:player url="http://www.foo.com/player?id=1111" height="200" width="400" />
+     * 
    
+     * 
    
+     * url is the url of the player console that plays the media. It is a required attribute.
+     * 
    
+     * 
+     * 
    
+     * height is the height of the browser window that the url should be opened in. It is an optional attribute.
+     * 
    
+     * 
    
+     * width is the width of the browser window that the url should be opened in. It is an optional attribute.
+     * 
    
+     * 
+     * 
    
+     * 
      * @param player PlayerReference for the item.
      */
-    public void setPlayer(PlayerReference player) {
+    public void setPlayer(final PlayerReference player) {
         this.player = player;
     }
 
     /**
      * <media:player>
    
-     * 
    Allows the media object to be accessed through a web browser media player console.
-     * This element is required only if a direct media url attribute is not specified in the <media:content> element. It has 1 required attribute, and 2 optional attributes.
    
-     * 
            <media:player url="http://www.foo.com/player?id=1111" height="200" width="400" />
    
-     * 
    url is the url of the player console that plays the media. It is a required attribute.
    
-     *
-     * 
    height is the height of the browser window that the url should be opened in. It is an optional attribute.
    
-     * 
    width is the width of the browser window that the url should be opened in. It is an optional attribute.
    
+     * 
    
+     * Allows the media object to be accessed through a web browser media player console. This element is required only if a direct media url attribute
+     * is not specified in the <media:content> element. It has 1 required attribute, and 2 optional attributes.
+     * 
    
+     * 
+     * 
    +     * <media:player url="http://www.foo.com/player?id=1111" height="200" width="400" />
+     * 
    
+     * 
    
+     * url is the url of the player console that plays the media. It is a required attribute.
+     * 
    
+     * 
+     * 
    
+     * height is the height of the browser window that the url should be opened in. It is an optional attribute.
+     * 
    
+     * 
    
+     * width is the width of the browser window that the url should be opened in. It is an optional attribute.
+     * 
    
+     * 
      * @return PlayerReference for the item.
      */
     public PlayerReference getPlayer() {
@@ -349,18 +444,20 @@ public class MediaContent implements Serializable {
 
     /**
      * The player or URL reference for the item
+     * 
      * @param reference The player or URL reference for the item
      */
-    public void setReference(Reference reference) {
+    public void setReference(final Reference reference) {
         this.reference = reference;
 
         if (reference instanceof PlayerReference) {
-            this.setPlayer((PlayerReference) reference);
+            setPlayer((PlayerReference) reference);
         }
     }
 
     /**
      * The player or URL reference for the item
+     * 
      * @return The player or URL reference for the item
      */
     public Reference getReference() {
@@ -368,33 +465,41 @@ public class MediaContent implements Serializable {
     }
 
     /**
-     * samplingrate is the number of samples per second taken to create the media object. It is expressed in thousands of samples per second (kHz). It is an optional attribute.
-     * @param samplingrate samplingrate is the number of samples per second taken to create the media object. It is expressed in thousands of samples per second (kHz). It is an optional attribute.
+     * samplingrate is the number of samples per second taken to create the media object. It is expressed in thousands of samples per second (kHz). It is an
+     * optional attribute.
+     * 
+     * @param samplingrate samplingrate is the number of samples per second taken to create the media object. It is expressed in thousands of samples per second
+     *            (kHz). It is an optional attribute.
      */
-    public void setSamplingrate(Float samplingrate) {
+    public void setSamplingrate(final Float samplingrate) {
         this.samplingrate = samplingrate;
     }
 
     /**
-     * samplingrate is the number of samples per second taken to create the media object. It is expressed in thousands of samples per second (kHz). It is an optional attribute.
-     * @return samplingrate is the number of samples per second taken to create the media object. It is expressed in thousands of samples per second (kHz). It is an optional attribute.
+     * samplingrate is the number of samples per second taken to create the media object. It is expressed in thousands of samples per second (kHz). It is an
+     * optional attribute.
+     * 
+     * @return samplingrate is the number of samples per second taken to create the media object. It is expressed in thousands of samples per second (kHz). It
+     *         is an optional attribute.
      */
     public Float getSamplingrate() {
         return samplingrate;
     }
 
     /**
-     *
+     * 
      * type is the standard MIME type of the object. It is an optional attribute.
+     * 
      * @param type The type to set.
      */
-    public void setType(String type) {
+    public void setType(final String type) {
         this.type = type;
     }
 
     /**
-     *
+     * 
      * type is the standard MIME type of the object. It is an optional attribute.
+     * 
      * @return Returns the type.
      */
     public String getType() {
@@ -403,22 +508,25 @@ public class MediaContent implements Serializable {
 
     /**
      * width is the width of the media object. It is an optional attribute.
+     * 
      * @param width width is the width of the media object. It is an optional attribute.
      */
-    public void setWidth(Integer width) {
+    public void setWidth(final Integer width) {
         this.width = width;
     }
 
     /**
      * width is the width of the media object. It is an optional attribute.
+     * 
      * @return width is the width of the media object. It is an optional attribute.
      */
     public Integer getWidth() {
         return width;
     }
 
+    @Override
     public Object clone() {
-        MediaContent c = new MediaContent(getReference());
+        final MediaContent c = new MediaContent(getReference());
         c.setAudioChannels(getAudioChannels());
         c.setBitrate(getBitrate());
         c.setDefaultContent(isDefaultContent());
@@ -428,8 +536,7 @@ public class MediaContent implements Serializable {
         c.setFramerate(getFramerate());
         c.setHeight(getHeight());
         c.setLanguage(getLanguage());
-        c.setMetadata((getMetadata() == null) ? null : (Metadata) getMetadata()
-                                                                      .clone());
+        c.setMetadata(getMetadata() == null ? null : (Metadata) getMetadata().clone());
         c.setPlayer(getPlayer());
         c.setSamplingrate(getSamplingrate());
         c.setType(getType());
@@ -438,20 +545,23 @@ public class MediaContent implements Serializable {
         return c;
     }
 
-    public boolean equals(Object obj) {
-        EqualsBean eBean = new EqualsBean(MediaContent.class, this);
+    @Override
+    public boolean equals(final Object obj) {
+        final EqualsBean eBean = new EqualsBean(MediaContent.class, this);
 
         return eBean.beanEquals(obj);
     }
 
+    @Override
     public int hashCode() {
-        EqualsBean equals = new EqualsBean(MediaContent.class, this);
+        final EqualsBean equals = new EqualsBean(MediaContent.class, this);
 
         return equals.beanHashCode();
     }
 
+    @Override
     public String toString() {
-        ToStringBean tsBean = new ToStringBean(MediaContent.class, this);
+        final ToStringBean tsBean = new ToStringBean(MediaContent.class, this);
 
         return tsBean.toString();
     }
diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/MediaGroup.java b/src/main/java/org/rometools/feed/module/mediarss/types/MediaGroup.java
index d7604c4..3a2631f 100644
--- a/src/main/java/org/rometools/feed/module/mediarss/types/MediaGroup.java
+++ b/src/main/java/org/rometools/feed/module/mediarss/types/MediaGroup.java
@@ -28,61 +28,68 @@ import java.io.Serializable;
 import com.sun.syndication.feed.impl.EqualsBean;
 import com.sun.syndication.feed.impl.ToStringBean;
 
-
 /**
  * <media:group>
    
- * 
    <media:group> is a sub-element of <item>. It allows grouping of <media:content> elements that are effectively the same content, yet different representations. For instance: the same song recorded in both the WAV and MP3 format.
- * It's an optional element that must only be used for this purpose.
    
+ * 
    
+ * <media:group> is a sub-element of <item>. It allows grouping of <media:content> elements that are effectively the same content, yet
+ * different representations. For instance: the same song recorded in both the WAV and MP3 format. It's an optional element that must only be used for this
+ * purpose.
+ * 
    
+ * 
  * @author cooper
  */
 public class MediaGroup implements Cloneable, Serializable {
-	private static final long serialVersionUID = 768465435081309082L;
-	
-	private Integer defaultContentIndex;
+    private static final long serialVersionUID = 768465435081309082L;
+
+    private Integer defaultContentIndex;
     private Metadata metadata;
     private MediaContent[] contents = new MediaContent[0];
 
     /**
      * Creates a new instance of MediaGroup
+     * 
      * @param contents Contents of the group.
      */
-    public MediaGroup(MediaContent[] contents) {
-        this.setContents(contents);
+    public MediaGroup(final MediaContent[] contents) {
+        setContents(contents);
     }
 
     /**
      * Creates a new instance of MediaGroup
+     * 
      * @param contents contents of the group
      * @param defaultContentIndex index of the default content value.
      */
-    public MediaGroup(MediaContent[] contents, Integer defaultContentIndex) {
-        this.setContents(contents);
-        this.setDefaultContentIndex(defaultContentIndex);
+    public MediaGroup(final MediaContent[] contents, final Integer defaultContentIndex) {
+        setContents(contents);
+        setDefaultContentIndex(defaultContentIndex);
     }
 
     /**
      * Creates a new instance of MediaGroup
+     * 
      * @param contents contents of the group
      * @param defaultContentIndex index of the default content item.
      * @param metadata metadata for the group.
      */
-    public MediaGroup(MediaContent[] contents, Integer defaultContentIndex,
-        Metadata metadata) {
-        this.setContents(contents);
-        this.setDefaultContentIndex(defaultContentIndex);
-        this.setMetadata(metadata);
+    public MediaGroup(final MediaContent[] contents, final Integer defaultContentIndex, final Metadata metadata) {
+        setContents(contents);
+        setDefaultContentIndex(defaultContentIndex);
+        setMetadata(metadata);
     }
 
     /**
      * MediaContents for the group
+     * 
      * @param contents MediaContents for the group
      */
-    public void setContents(MediaContent[] contents) {
-        this.contents = (contents == null) ? new MediaContent[0] : contents;
+    public void setContents(final MediaContent[] contents) {
+        this.contents = contents == null ? new MediaContent[0] : contents;
     }
 
     /**
      * MediaContents for the group
+     * 
      * @return MediaContents for the group
      */
     public MediaContent[] getContents() {
@@ -91,9 +98,10 @@ public class MediaGroup implements Cloneable, Serializable {
 
     /**
      * Default content index MediaContent.
+     * 
      * @param defaultContentIndex Default content index MediaContent.
      */
-    public void setDefaultContentIndex(Integer defaultContentIndex) {
+    public void setDefaultContentIndex(final Integer defaultContentIndex) {
         for (int i = 0; i < getContents().length; i++) {
             if (i == defaultContentIndex.intValue()) {
                 getContents()[i].setDefaultContent(true);
@@ -107,6 +115,7 @@ public class MediaGroup implements Cloneable, Serializable {
 
     /**
      * Default content index MediaContent.
+     * 
      * @return Default content index MediaContent.
      */
     public Integer getDefaultContentIndex() {
@@ -115,39 +124,44 @@ public class MediaGroup implements Cloneable, Serializable {
 
     /**
      * Metadata for the group
+     * 
      * @param metadata Metadata for the group
      */
-    public void setMetadata(Metadata metadata) {
+    public void setMetadata(final Metadata metadata) {
         this.metadata = metadata;
     }
 
     /**
      * Metadata for the group
+     * 
      * @return Metadata for the group
      */
     public Metadata getMetadata() {
         return metadata;
     }
 
+    @Override
     public Object clone() {
-        return new MediaGroup(getContents(), getDefaultContentIndex(),
-            getMetadata());
+        return new MediaGroup(getContents(), getDefaultContentIndex(), getMetadata());
     }
 
-    public boolean equals(Object obj) {
-        EqualsBean eBean = new EqualsBean(this.getClass(), this);
+    @Override
+    public boolean equals(final Object obj) {
+        final EqualsBean eBean = new EqualsBean(this.getClass(), this);
 
         return eBean.beanEquals(obj);
     }
 
+    @Override
     public int hashCode() {
-        EqualsBean equals = new EqualsBean(this.getClass(), this);
+        final EqualsBean equals = new EqualsBean(this.getClass(), this);
 
         return equals.beanHashCode();
     }
 
+    @Override
     public String toString() {
-        ToStringBean tsBean = new ToStringBean(this.getClass(), this);
+        final ToStringBean tsBean = new ToStringBean(this.getClass(), this);
 
         return tsBean.toString();
     }
diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Metadata.java b/src/main/java/org/rometools/feed/module/mediarss/types/Metadata.java
index de4ab32..d32c3da 100644
--- a/src/main/java/org/rometools/feed/module/mediarss/types/Metadata.java
+++ b/src/main/java/org/rometools/feed/module/mediarss/types/Metadata.java
@@ -23,37 +23,42 @@
  */
 package org.rometools.feed.module.mediarss.types;
 
-import com.sun.syndication.feed.impl.EqualsBean;
-import com.sun.syndication.feed.impl.ToStringBean;
-
 import java.io.Serializable;
 import java.net.URI;
 
+import com.sun.syndication.feed.impl.EqualsBean;
+import com.sun.syndication.feed.impl.ToStringBean;
 
 /**
- *
- *
- *
+ * 
+ * 
+ * 
  * Optional Elements
- *        
     The following elements are optional and may appear as sub-elements of <channel>, <item>, <media:content> and/or <media:group>.
- *
- *
- * 
    
- *
- * When an element appears at a shallow level, such as <channel> or <item>, it means that the element should be applied to every media object within its scope.
    
- *
- *
+ * 
    
+ * The following elements are optional and may appear as sub-elements of <channel>, <item>, <media:content> and/or <media:group>.
+ * 
+ * 
+ * 
    
+ * 
    
+ * 
+ * When an element appears at a shallow level, such as <channel> or <item>, it means that the element should be applied to every media object within
+ * its scope.
+ * 
    
+ * 
+ * 
  * 
    
  * Duplicated elements appearing at deeper levels of the document tree have higher priority over other levels.
- *
- * For example, <media:content> level elements are favored over <item> level elements.
- * The priority level is listed from strongest to weakest: <media:content>, <media:group>, <item>, <channel>.
    
+ * 
+ * For example, <media:content> level elements are favored over <item> level elements. The priority level is listed from strongest to weakest:
+ * <media:content>, <media:group>, <item>, <channel>.
+ * 
    
+ * 
  * @author cooper
  */
 public class Metadata implements Cloneable, Serializable {
-	private static final long serialVersionUID = 649350950456005250L;
-	
-	private Hash hash;
+    private static final long serialVersionUID = 649350950456005250L;
+
+    private Hash hash;
     private String copyright;
     private String description;
     private String descriptionType;
@@ -67,121 +72,186 @@ public class Metadata implements Cloneable, Serializable {
     private Restriction[] restrictions = new Restriction[0];
     private Text[] text = new Text[0];
     private Thumbnail[] thumbnail = new Thumbnail[0];
-    
+
     /** Creates a new instance of Metadata */
     public Metadata() {
         super();
     }
-    
+
     /**
      * <media:category>
    
-     *        
     Allows a taxonomy to be set that gives an indication of the type of media content, and its particular contents.
-     * It has 2 optional attributes.  
    
-     * 
            <media:category scheme="http://search.yahoo.com/mrss/category_
+     * 
    
+     * Allows a taxonomy to be set that gives an indication of the type of media content, and its particular contents. It has 2 optional attributes.
+     * 
    
+     * 
+     * 
    +     * <media:category scheme="http://search.yahoo.com/mrss/category_
      *        schema">music/artist/album/song</media:category>
-     *
+     * 
      *        <media:category scheme="http://dmoz.org" label="Ace Ventura - Pet
      *        Detective">Arts/Movies/Titles/A/Ace_Ventura_Series/Ace_Ventura_
      *        -_Pet_Detective</media:category>
-     *
+     * 
      *        <media:category scheme="urn:flickr:tags">ycantpark
-     *        mobile</media:category>
    
-     *
-     * 
    scheme is the URI that identifies the categorization scheme. It is an optional attribute. If this attribute is not included, the default scheme is 'http://search.yahoo.com/mrss/category_schema'.
    
-     *
-     * 
    label is the human readable label that can be displayed in end user applications. It is an optional attribute.
    
+     *        mobile</media:category>
+     * 
    
+     * 
+     * 
    
+     * scheme is the URI that identifies the categorization scheme. It is an optional attribute. If this attribute is not included, the default scheme
+     * is 'http://search.yahoo.com/mrss/category_schema'.
+     * 
    
+     * 
+     * 
    
+     * label is the human readable label that can be displayed in end user applications. It is an optional attribute.
+     * 
    
+     * 
      * @param categories categories for the item
      */
-    public void setCategories(Category[] categories) {
-        this.categories = (categories == null) ? new Category[0] : categories;
+    public void setCategories(final Category[] categories) {
+        this.categories = categories == null ? new Category[0] : categories;
     }
-    
+
     /**
      * <media:category>
    
-     *        
     Allows a taxonomy to be set that gives an indication of the type of media content, and its particular contents.
-     * It has 2 optional attributes.  
    
-     * 
            <media:category scheme="http://search.yahoo.com/mrss/category_
+     * 
    
+     * Allows a taxonomy to be set that gives an indication of the type of media content, and its particular contents. It has 2 optional attributes.
+     * 
    
+     * 
+     * 
    +     * <media:category scheme="http://search.yahoo.com/mrss/category_
      *        schema">music/artist/album/song</media:category>
-     *
+     * 
      *        <media:category scheme="http://dmoz.org" label="Ace Ventura - Pet
      *        Detective">Arts/Movies/Titles/A/Ace_Ventura_Series/Ace_Ventura_
      *        -_Pet_Detective</media:category>
-     *
+     * 
      *        <media:category scheme="urn:flickr:tags">ycantpark
-     *        mobile</media:category>
    
-     *
-     * 
    scheme is the URI that identifies the categorization scheme. It is an optional attribute. If this attribute is not included, the default scheme is 'http://search.yahoo.com/mrss/category_schema'.
    
-     *
-     * 
    label is the human readable label that can be displayed in end user applications. It is an optional attribute.
    
+     *        mobile</media:category>
+     * 
    
+     * 
+     * 
    
+     * scheme is the URI that identifies the categorization scheme. It is an optional attribute. If this attribute is not included, the default scheme
+     * is 'http://search.yahoo.com/mrss/category_schema'.
+     * 
    
+     * 
+     * 
    
+     * label is the human readable label that can be displayed in end user applications. It is an optional attribute.
+     * 
    
+     * 
      * @return categories for the item.
      */
     public Category[] getCategories() {
         return categories;
     }
-    
+
     /**
      * <media:copyright>
    
-     * 
    Copyright information for media object.  It has 1 optional attribute.
    
-     *
-     * 
            <media:copyright url="http://blah.com/additional-info.html">2005 FooBar Media</media:copyright>
    
-     * 
    url is the url for a terms of use page or additional copyright information. If the media is operating under a Creative Commons license, the Creative Commons module should be used instead. It is an optional attribute.
    
+     * 
    
+     * Copyright information for media object. It has 1 optional attribute.
+     * 
    
+     * 
+     * 
    +     * <media:copyright url="http://blah.com/additional-info.html">2005 FooBar Media</media:copyright>
+     * 
    
+     * 
    
+     * url is the url for a terms of use page or additional copyright information. If the media is operating under a Creative Commons license, the
+     * Creative Commons module should be used instead. It is an optional attribute.
+     * 
    
+     * 
      * @param copyright copyright text
      */
-    public void setCopyright(String copyright) {
+    public void setCopyright(final String copyright) {
         this.copyright = copyright;
     }
-    
+
     /**
      * <media:copyright>
    
-     * 
    Copyright information for media object.  It has 1 optional attribute.
    
-     *
-     * 
            <media:copyright url="http://blah.com/additional-info.html">2005 FooBar Media</media:copyright>
    
-     * 
    url is the url for a terms of use page or additional copyright information. If the media is operating under a Creative Commons license, the Creative Commons module should be used instead. It is an optional attribute.
    
+     * 
    
+     * Copyright information for media object. It has 1 optional attribute.
+     * 
    
+     * 
+     * 
    +     * <media:copyright url="http://blah.com/additional-info.html">2005 FooBar Media</media:copyright>
+     * 
    
+     * 
    
+     * url is the url for a terms of use page or additional copyright information. If the media is operating under a Creative Commons license, the
+     * Creative Commons module should be used instead. It is an optional attribute.
+     * 
    
+     * 
      * @return Copyright text
      */
     public String getCopyright() {
         return copyright;
     }
-    
+
     /**
      * <media:copyright>
    
-     * 
    Copyright information for media object.  It has 1 optional attribute.
    
-     *
-     * 
            <media:copyright url="http://blah.com/additional-info.html">2005 FooBar Media</media:copyright>
    
-     * 
    url is the url for a terms of use page or additional copyright information. If the media is operating under a Creative Commons license, the Creative Commons module should be used instead. It is an optional attribute.
    
+     * 
    
+     * Copyright information for media object. It has 1 optional attribute.
+     * 
    
+     * 
+     * 
    +     * <media:copyright url="http://blah.com/additional-info.html">2005 FooBar Media</media:copyright>
+     * 
    
+     * 
    
+     * url is the url for a terms of use page or additional copyright information. If the media is operating under a Creative Commons license, the
+     * Creative Commons module should be used instead. It is an optional attribute.
+     * 
    
+     * 
      * @param copyrightUrl link to more copyright information.
      */
-    public void setCopyrightUrl(URI copyrightUrl) {
+    public void setCopyrightUrl(final URI copyrightUrl) {
         this.copyrightUrl = copyrightUrl;
     }
-    
+
     /**
      * <media:copyright>
    
-     * 
    Copyright information for media object.  It has 1 optional attribute.
    
-     *
-     * 
            <media:copyright url="http://blah.com/additional-info.html">2005 FooBar Media</media:copyright>
    
-     * 
    url is the url for a terms of use page or additional copyright information. If the media is operating under a Creative Commons license, the Creative Commons module should be used instead. It is an optional attribute.
    
+     * 
    
+     * Copyright information for media object. It has 1 optional attribute.
+     * 
    
+     * 
+     * 
    +     * <media:copyright url="http://blah.com/additional-info.html">2005 FooBar Media</media:copyright>
+     * 
    
+     * 
    
+     * url is the url for a terms of use page or additional copyright information. If the media is operating under a Creative Commons license, the
+     * Creative Commons module should be used instead. It is an optional attribute.
+     * 
    
+     * 
      * @return Link to more copyright information.
      */
     public URI getCopyrightUrl() {
         return copyrightUrl;
     }
-    
+
     /**
      * <media:credit>
    
-     *
-     * 
    Notable entity and the contribution to the creation of the media object. Current entities can include people, companies, locations, etc. Specific entities can have multiple roles, and several entities can have the same role.
-     * These should appear as distinct <media:credit> elements.
-     * It has 2 optional attributes.
    
-     * 
            <media:credit role="producer" scheme="urn:ebu">entity name</media:credit>
+     * 
+     * 
    
+     * Notable entity and the contribution to the creation of the media object. Current entities can include people, companies, locations, etc. Specific
+     * entities can have multiple roles, and several entities can have the same role. These should appear as distinct <media:credit> elements. It has 2
+     * optional attributes.
+     * 
    
+     * 
+     * 
    +     * <media:credit role="producer" scheme="urn:ebu">entity name</media:credit>
      * 
    
-     * 
    role specifies the role the entity played. Must be lowercase. It is an optional attribute.
    
-     *
-     * 
    scheme is the URI that identifies the role scheme. It is an optional attribute. If this attribute is not included, the default scheme is 'urn:ebu'. See: European Broadcasting Union Role Codes.
    
-     *
-     *
-     * 
    Example roles:
    
-     * 
            actor
+     * 
    
+     * role specifies the role the entity played. Must be lowercase. It is an optional attribute.
+     * 
    
+     * 
+     * 
    
+     * scheme is the URI that identifies the role scheme. It is an optional attribute. If this attribute is not included, the default scheme is
+     * 'urn:ebu'. See: European Broadcasting Union Role Codes.
+     * 
    
+     * 
+     * 
+     * 
    
+     * Example roles:
+     * 
    
+     * 
+     * 
    +     * actor
      *        anchor person
      *        author
      *        choreographer
@@ -203,28 +273,43 @@ public class Metadata implements Cloneable, Serializable {
      *        reporter
      *        vocalist
      * 
    
-     * 
    Additional roles: European Broadcasting Union Role Codes
+     * 
    
+     * Additional roles: European Broadcasting Union Role Codes
+     * 
      * @param credits credits for the item.
      */
-    public void setCredits(Credit[] credits) {
-        this.credits = (credits == null) ? new Credit[0] : credits;
+    public void setCredits(final Credit[] credits) {
+        this.credits = credits == null ? new Credit[0] : credits;
     }
-    
+
     /**
      * <media:credit>
    
-     *
-     * 
    Notable entity and the contribution to the creation of the media object. Current entities can include people, companies, locations, etc. Specific entities can have multiple roles, and several entities can have the same role.
-     * These should appear as distinct <media:credit> elements.
-     * It has 2 optional attributes.
    
-     * 
            <media:credit role="producer" scheme="urn:ebu">entity name</media:credit>
+     * 
+     * 
    
+     * Notable entity and the contribution to the creation of the media object. Current entities can include people, companies, locations, etc. Specific
+     * entities can have multiple roles, and several entities can have the same role. These should appear as distinct <media:credit> elements. It has 2
+     * optional attributes.
+     * 
    
+     * 
+     * 
    +     * <media:credit role="producer" scheme="urn:ebu">entity name</media:credit>
      * 
    
-     * 
    role specifies the role the entity played. Must be lowercase. It is an optional attribute.
    
-     *
-     * 
    scheme is the URI that identifies the role scheme. It is an optional attribute. If this attribute is not included, the default scheme is 'urn:ebu'. See: European Broadcasting Union Role Codes.
    
-     *
-     *
-     * 
    Example roles:
    
-     * 
            actor
+     * 
    
+     * role specifies the role the entity played. Must be lowercase. It is an optional attribute.
+     * 
    
+     * 
+     * 
    
+     * scheme is the URI that identifies the role scheme. It is an optional attribute. If this attribute is not included, the default scheme is
+     * 'urn:ebu'. See: European Broadcasting Union Role Codes.
+     * 
    
+     * 
+     * 
+     * 
    
+     * Example roles:
+     * 
    
+     * 
+     * 
    +     * actor
      *        anchor person
      *        author
      *        choreographer
@@ -246,342 +331,560 @@ public class Metadata implements Cloneable, Serializable {
      *        reporter
      *        vocalist
      * 
    
-     * 
    Additional roles: European Broadcasting Union Role Codes
+     * 
    
+     * Additional roles: European Broadcasting Union Role Codes
+     * 
      * @return credits for the time.
      */
     public Credit[] getCredits() {
         return credits;
     }
-    
+
     /**
      * <media:description>
    
-     * 
    Short description describing the media object typically a sentence in length. It has 1 optional attribute.
    
-     * 
            <media:description type="plain">This was some really bizarre band I listened to as a young lad.</media:description>
    
-     * 
    type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be entity-encoded. It is an optional attribute.
    
+     * 
    
+     * Short description describing the media object typically a sentence in length. It has 1 optional attribute.
+     * 
    
+     * 
+     * 
    +     * <media:description type="plain">This was some really bizarre band I listened to as a young lad.</media:description>
+     * 
    
+     * 
    
+     * type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be
+     * entity-encoded. It is an optional attribute.
+     * 
    
+     * 
      * @param description value of the description
      */
-    public void setDescription(String description) {
+    public void setDescription(final String description) {
         this.description = description;
     }
-    
+
     /**
      * <media:description>
    
-     * 
    Short description describing the media object typically a sentence in length. It has 1 optional attribute.
    
-     * 
            <media:description type="plain">This was some really bizarre band I listened to as a young lad.</media:description>
    
-     * 
    type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be entity-encoded. It is an optional attribute.
    
+     * 
    
+     * Short description describing the media object typically a sentence in length. It has 1 optional attribute.
+     * 
    
+     * 
+     * 
    +     * <media:description type="plain">This was some really bizarre band I listened to as a young lad.</media:description>
+     * 
    
+     * 
    
+     * type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be
+     * entity-encoded. It is an optional attribute.
+     * 
    
+     * 
      * @return value of the description
      */
     public String getDescription() {
         return description;
     }
-    
+
     /**
      * <media:description>
    
-     * 
    Short description describing the media object typically a sentence in length. It has 1 optional attribute.
    
-     * 
            <media:description type="plain">This was some really bizarre band I listened to as a young lad.</media:description>
    
-     * 
    type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be entity-encoded. It is an optional attribute.
    
+     * 
    
+     * Short description describing the media object typically a sentence in length. It has 1 optional attribute.
+     * 
    
+     * 
+     * 
    +     * <media:description type="plain">This was some really bizarre band I listened to as a young lad.</media:description>
+     * 
    
+     * 
    
+     * type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be
+     * entity-encoded. It is an optional attribute.
+     * 
    
+     * 
      * @param descriptionType type of the description.
      */
-    public void setDescriptionType(String descriptionType) {
+    public void setDescriptionType(final String descriptionType) {
         this.descriptionType = descriptionType;
     }
-    
+
     /**
      * <media:description>
    
-     * 
    Short description describing the media object typically a sentence in length. It has 1 optional attribute.
    
-     * 
            <media:description type="plain">This was some really bizarre band I listened to as a young lad.</media:description>
    
-     * 
    type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be entity-encoded. It is an optional attribute.
    
+     * 
    
+     * Short description describing the media object typically a sentence in length. It has 1 optional attribute.
+     * 
    
+     * 
+     * 
    +     * <media:description type="plain">This was some really bizarre band I listened to as a young lad.</media:description>
+     * 
    
+     * 
    
+     * type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be
+     * entity-encoded. It is an optional attribute.
+     * 
    
+     * 
      * @return type of the description
      */
     public String getDescriptionType() {
         return descriptionType;
     }
-    
+
     /**
      * <media:hash>
    
-     *
-     * 
    This is the hash of the binary media file. It can appear multiple times as long as each instance is a different algo. It has 1 optional attribute.
    
-     *
-     * 
            <media:hash algo="md5">dfdec888b72151965a34b4b59031290a</media:hash>
    
-     *
-     * 
    algo indicates the algorithm used to create the hash. Possible values are 'md5' and 'sha-1'. Default value is 'md5'. It is an optional attribute.
+     * 
+     * 
    
+     * This is the hash of the binary media file. It can appear multiple times as long as each instance is a different algo. It has 1 optional
+     * attribute.
+     * 
    
+     * 
    
+     * 
    
+     * 
+     * 
    +     * <media:hash algo="md5">dfdec888b72151965a34b4b59031290a</media:hash>
+     * 
    
+     * 
+     * 
    
+     * algo indicates the algorithm used to create the hash. Possible values are 'md5' and 'sha-1'. Default value is 'md5'. It is an optional
+     * attribute.
+     * 
      * @param hash sets the hash for the item.
      */
-    public void setHash(Hash hash) {
+    public void setHash(final Hash hash) {
         this.hash = hash;
     }
-    
+
     /**
      * <media:hash>
    
-     *
-     * 
    This is the hash of the binary media file. It can appear multiple times as long as each instance is a different algo. It has 1 optional attribute.
    
-     *
-     * 
            <media:hash algo="md5">dfdec888b72151965a34b4b59031290a</media:hash>
    
-     *
-     * 
    algo indicates the algorithm used to create the hash. Possible values are 'md5' and 'sha-1'. Default value is 'md5'. It is an optional attribute.
+     * 
+     * 
    
+     * This is the hash of the binary media file. It can appear multiple times as long as each instance is a different algo. It has 1 optional
+     * attribute.
+     * 
    
+     * 
    
+     * 
    
+     * 
+     * 
    +     * <media:hash algo="md5">dfdec888b72151965a34b4b59031290a</media:hash>
+     * 
    
+     * 
+     * 
    
+     * algo indicates the algorithm used to create the hash. Possible values are 'md5' and 'sha-1'. Default value is 'md5'. It is an optional
+     * attribute.
+     * 
      * @return returns a Hash object for the item.
      */
     public Hash getHash() {
         return hash;
     }
-    
+
     /**
      * <media:keywords>
    
-     * 
    Highly relevant keywords describing the media object with typically a maximum of ten words. The keywords and phrases should be comma delimited.
    
-     *
-     * 
            <media:keywords>kitty, cat, big dog, yarn, fluffy</media:keywords>
    
+     * 
    
+     * Highly relevant keywords describing the media object with typically a maximum of ten words. The keywords and phrases should be comma delimited.
+     * 
    
+     * 
+     * 
    +     * <media:keywords>kitty, cat, big dog, yarn, fluffy</media:keywords>
+     * 
    
+     * 
      * @param keywords Array of keywords
      */
-    public void setKeywords(String[] keywords) {
-        this.keywords = (keywords == null) ? new String[0] : keywords;
+    public void setKeywords(final String[] keywords) {
+        this.keywords = keywords == null ? new String[0] : keywords;
     }
-    
+
     /**
      * <media:keywords>
    
-     * 
    Highly relevant keywords describing the media object with typically a maximum of ten words. The keywords and phrases should be comma delimited.
    
-     *
-     * 
            <media:keywords>kitty, cat, big dog, yarn, fluffy</media:keywords>
    
+     * 
    
+     * Highly relevant keywords describing the media object with typically a maximum of ten words. The keywords and phrases should be comma delimited.
+     * 
    
+     * 
+     * 
    +     * <media:keywords>kitty, cat, big dog, yarn, fluffy</media:keywords>
+     * 
    
+     * 
      * @return Array of keywords
      */
     public String[] getKeywords() {
         return keywords;
     }
-    
+
     /**
      * <media:rating>
    
-     *
-     *
-     * 
    This allows the permissible audience to be declared. If this element is not included, it assumes that no restrictions are necessary. It has one optional attribute.
    
-     *
-     * 
                   <media:rating scheme="urn:simple">adult</media:rating>
+     * 
+     * 
+     * 
    
+     * This allows the permissible audience to be declared. If this element is not included, it assumes that no restrictions are necessary. It has one optional
+     * attribute.
+     * 
    
+     * 
+     * 
    +     * <media:rating scheme="urn:simple">adult</media:rating>
      *               <media:rating scheme="urn:icra">r (cz 1 lz 1 nz 1 oz 1 vz 1)</media:rating>
      *               <media:rating scheme="urn:mpaa">pg</media:rating>
-     *
-     *               <media:rating scheme="urn:v-chip">tv-y7-fv</media:rating>
    
-     *
-     *
-     * 
    scheme is the URI that identifies the rating scheme. It is an optional attribute. If this attribute is not included, the default scheme is urn:simple (adult | nonadult).
    
-     *
+     * 
+     *               <media:rating scheme="urn:v-chip">tv-y7-fv</media:rating>
+     * 
    
+     * 
+     * 
      * 
    
+     * scheme is the URI that identifies the rating scheme. It is an optional attribute. If this attribute is not included, the default scheme is
+     * urn:simple (adult | nonadult).
+     * 
    
+     * 
+     * 
    
+     * 
      * @param ratings Ratings objects
      */
-    public void setRatings(Rating[] ratings) {
-        this.ratings = (ratings == null) ? new Rating[0] : ratings;
+    public void setRatings(final Rating[] ratings) {
+        this.ratings = ratings == null ? new Rating[0] : ratings;
     }
-    
+
     /**
      * <media:rating>
    
-     *
-     *
-     * 
    This allows the permissible audience to be declared. If this element is not included, it assumes that no restrictions are necessary. It has one optional attribute.
    
-     *
-     * 
                   <media:rating scheme="urn:simple">adult</media:rating>
+     * 
+     * 
+     * 
    
+     * This allows the permissible audience to be declared. If this element is not included, it assumes that no restrictions are necessary. It has one optional
+     * attribute.
+     * 
    
+     * 
+     * 
    +     * <media:rating scheme="urn:simple">adult</media:rating>
      *               <media:rating scheme="urn:icra">r (cz 1 lz 1 nz 1 oz 1 vz 1)</media:rating>
      *               <media:rating scheme="urn:mpaa">pg</media:rating>
-     *
-     *               <media:rating scheme="urn:v-chip">tv-y7-fv</media:rating>
    
-     *
-     *
-     * 
    scheme is the URI that identifies the rating scheme. It is an optional attribute. If this attribute is not included, the default scheme is urn:simple (adult | nonadult).
    
-     *
+     * 
+     *               <media:rating scheme="urn:v-chip">tv-y7-fv</media:rating>
+     * 
    
+     * 
+     * 
      * 
    
+     * scheme is the URI that identifies the rating scheme. It is an optional attribute. If this attribute is not included, the default scheme is
+     * urn:simple (adult | nonadult).
+     * 
    
+     * 
+     * 
    
+     * 
      * @return Ratings objects
      */
     public Rating[] getRatings() {
         return ratings;
     }
-    
+
     /**
      * <media:restriction> 
    
-     *
-     * 
    Allows restrictions to be placed on the aggregator rendering the media in the feed. Currently, restrictions are based on distributor (uri) and country codes.  This element is purely informational and no obligation can be assumed or implied.
-     * Only one <media:restriction> element of the same type can be applied to a media object - all others will be ignored. Entities in this element should be space separated. To allow the producer to explicitly declare his/her intentions, two literals are reserved: 'all', 'none'. These literals can only be used once. This element has 1 required attribute, and 1 optional attribute (with strict requirements for its exclusion).
    
-     *
-     * 
            <media:restriction relationship="allow" type="country">au us</media:restriction>
    
-     *
-     * 
    relationship indicates the type of relationship that the restriction represents (allow | deny). In the example above, the media object should only be syndicated in Australia and the United States. It is a required attribute.
    
+     * 
+     * 
    
+     * Allows restrictions to be placed on the aggregator rendering the media in the feed. Currently, restrictions are based on distributor (uri) and country
+     * codes. This element is purely informational and no obligation can be assumed or implied. Only one <media:restriction> element of the same
+     * type can be applied to a media object - all others will be ignored. Entities in this element should be space separated. To allow the
+     * producer to explicitly declare his/her intentions, two literals are reserved: 'all', 'none'. These literals can only be used once. This element has 1
+     * required attribute, and 1 optional attribute (with strict requirements for its exclusion).
+     * 
    
+     * 
+     * 
    +     * <media:restriction relationship="allow" type="country">au us</media:restriction>
+     * 
    
+     * 
+     * 
    
+     * relationship indicates the type of relationship that the restriction represents (allow | deny). In the example above, the media object should
+     * only be syndicated in Australia and the United States. It is a required attribute.
+     * 
    
+     * 
      * @param restrictions restrictions for the item.
      */
-    public void setRestrictions(Restriction[] restrictions) {
-        this.restrictions = (restrictions == null) ? new Restriction[0]
-                : restrictions;
+    public void setRestrictions(final Restriction[] restrictions) {
+        this.restrictions = restrictions == null ? new Restriction[0] : restrictions;
     }
-    
+
     /**
      * <media:restriction> 
    
-     *
-     * 
    Allows restrictions to be placed on the aggregator rendering the media in the feed. Currently, restrictions are based on distributor (uri) and country codes.  This element is purely informational and no obligation can be assumed or implied.
-     * Only one <media:restriction> element of the same type can be applied to a media object - all others will be ignored. Entities in this element should be space separated. To allow the producer to explicitly declare his/her intentions, two literals are reserved: 'all', 'none'. These literals can only be used once. This element has 1 required attribute, and 1 optional attribute (with strict requirements for its exclusion).
    
-     *
-     * 
            <media:restriction relationship="allow" type="country">au us</media:restriction>
    
-     *
-     * 
    relationship indicates the type of relationship that the restriction represents (allow | deny). In the example above, the media object should only be syndicated in Australia and the United States. It is a required attribute.
    
+     * 
+     * 
    
+     * Allows restrictions to be placed on the aggregator rendering the media in the feed. Currently, restrictions are based on distributor (uri) and country
+     * codes. This element is purely informational and no obligation can be assumed or implied. Only one <media:restriction> element of the same
+     * type can be applied to a media object - all others will be ignored. Entities in this element should be space separated. To allow the
+     * producer to explicitly declare his/her intentions, two literals are reserved: 'all', 'none'. These literals can only be used once. This element has 1
+     * required attribute, and 1 optional attribute (with strict requirements for its exclusion).
+     * 
    
+     * 
+     * 
    +     * <media:restriction relationship="allow" type="country">au us</media:restriction>
+     * 
    
+     * 
+     * 
    
+     * relationship indicates the type of relationship that the restriction represents (allow | deny). In the example above, the media object should
+     * only be syndicated in Australia and the United States. It is a required attribute.
+     * 
    
+     * 
      * @return restrictions for the item.
      */
     public Restriction[] getRestrictions() {
         return restrictions;
     }
-    
+
     /**
      * <media:text>
    
-     * 
    Allows the inclusion of a text transcript, closed captioning, or lyrics of the media content. Many of these elements are permitted to provide a time series of text. In such cases, it is encouraged, but not required, that the elements be grouped by language and appear in time sequence order based on the start time. Elements can have overlapping start and end times. It has 4 optional attributes.
            <media:text type="plain" lang="en" start="00:00:03.000"
+     * 
    
+     * Allows the inclusion of a text transcript, closed captioning, or lyrics of the media content. Many of these elements are permitted to provide a time
+     * series of text. In such cases, it is encouraged, but not required, that the elements be grouped by language and appear in time sequence order based on
+     * the start time. Elements can have overlapping start and end times. It has 4 optional attributes.
+     * 
    
+     * 
+     * 
    +     * <media:text type="plain" lang="en" start="00:00:03.000"
      *        end="00:00:10.000"> Oh, say, can you see</media:text>
-     *
+     * 
      *        <media:text type="plain" lang="en" start="00:00:10.000"
      *        end="00:00:17.000">By the dawn's early light</media:text>
      * 
    
-     * 
    type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be entity-encoded. It is an optional attribute.
    
-     *
-     *
-     *
-     *
-     *
-     *
-     * 
    lang is the primary language encapsulated in the media object. Language codes possible are detailed in RFC 3066. This attribute is used similar to the xml:lang attribute detailed in the XML 1.0 Specification (Third Edition). It is an optional attribute.
    
-     *
-     * 
    start specifies the start time offset that the text starts being relevant to the media object. An example of this would be for closed captioning.
-     * It uses the NTP time code format (see: the time attribute used in <media:thumbnail>). It is an optional attribute.
    
-     *
-     * 
    end specifies the end time that the text is relevant.
-     * If this attribute is not provided, and a start time is used, it is expected that the end time is either the end of the clip or the start of the next <media:text> element.
+     * 
    
+     * type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be
+     * entity-encoded. It is an optional attribute.
+     * 
    
+     * 
+     * 
+     * 
+     * 
+     * 
+     * 
+     * 
    
+     * lang is the primary language encapsulated in the media object. Language codes possible are detailed in RFC 3066. This attribute is used similar
+     * to the xml:lang attribute detailed in the XML 1.0 Specification (Third Edition). It is an optional attribute.
+     * 
    
+     * 
+     * 
    
+     * start specifies the start time offset that the text starts being relevant to the media object. An example of this would be for closed
+     * captioning. It uses the NTP time code format (see: the time attribute used in <media:thumbnail>). It is an optional attribute.
+     * 
    
+     * 
+     * 
    
+     * end specifies the end time that the text is relevant. If this attribute is not provided, and a start time is used, it is expected that
+     * the end time is either the end of the clip or the start of the next <media:text> element.
+     * 
      * @param text text objects for the item.
      */
-    public void setText(Text[] text) {
-        this.text = (text == null) ? new Text[0] : text;
+    public void setText(final Text[] text) {
+        this.text = text == null ? new Text[0] : text;
     }
-    
+
     /**
      * <media:text>
    
-     * 
    Allows the inclusion of a text transcript, closed captioning, or lyrics of the media content. Many of these elements are permitted to provide a time series of text. In such cases, it is encouraged, but not required, that the elements be grouped by language and appear in time sequence order based on the start time. Elements can have overlapping start and end times. It has 4 optional attributes.
            <media:text type="plain" lang="en" start="00:00:03.000"
+     * 
    
+     * Allows the inclusion of a text transcript, closed captioning, or lyrics of the media content. Many of these elements are permitted to provide a time
+     * series of text. In such cases, it is encouraged, but not required, that the elements be grouped by language and appear in time sequence order based on
+     * the start time. Elements can have overlapping start and end times. It has 4 optional attributes.
+     * 
    
+     * 
+     * 
    +     * <media:text type="plain" lang="en" start="00:00:03.000"
      *        end="00:00:10.000"> Oh, say, can you see</media:text>
-     *
+     * 
      *        <media:text type="plain" lang="en" start="00:00:10.000"
      *        end="00:00:17.000">By the dawn's early light</media:text>
      * 
    
-     * 
    type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be entity-encoded. It is an optional attribute.
    
-     *
-     *
-     *
-     *
-     *
-     *
-     * 
    lang is the primary language encapsulated in the media object. Language codes possible are detailed in RFC 3066. This attribute is used similar to the xml:lang attribute detailed in the XML 1.0 Specification (Third Edition). It is an optional attribute.
    
-     *
-     * 
    start specifies the start time offset that the text starts being relevant to the media object. An example of this would be for closed captioning.
-     * It uses the NTP time code format (see: the time attribute used in <media:thumbnail>). It is an optional attribute.
    
-     *
-     * 
    end specifies the end time that the text is relevant.
-     * If this attribute is not provided, and a start time is used, it is expected that the end time is either the end of the clip or the start of the next <media:text> element.
+     * 
    
+     * type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be
+     * entity-encoded. It is an optional attribute.
+     * 
    
+     * 
+     * 
+     * 
+     * 
+     * 
+     * 
+     * 
    
+     * lang is the primary language encapsulated in the media object. Language codes possible are detailed in RFC 3066. This attribute is used similar
+     * to the xml:lang attribute detailed in the XML 1.0 Specification (Third Edition). It is an optional attribute.
+     * 
    
+     * 
+     * 
    
+     * start specifies the start time offset that the text starts being relevant to the media object. An example of this would be for closed
+     * captioning. It uses the NTP time code format (see: the time attribute used in <media:thumbnail>). It is an optional attribute.
+     * 
    
+     * 
+     * 
    
+     * end specifies the end time that the text is relevant. If this attribute is not provided, and a start time is used, it is expected that
+     * the end time is either the end of the clip or the start of the next <media:text> element.
+     * 
      * @return Text objects for the item.
      */
     public Text[] getText() {
         return text;
     }
-    
+
     /**
      * <media:thumbnail>
    
-     *
-     *
-     * 
    Allows particular images to be used as representative images for the media object. If multiple thumbnails are included, and time coding is not at play, it is assumed that the images are in order of importance. It has 1 required attribute and 3 optional attributes.
    
-     *
-     *
-     *
-     *
-     *
-     *         
            <media:thumbnail url="http://www.foo.com/keyframe.jpg" width="75" height="50" time="12:05:01.123" />
    
-     * 
    url specifies the url of the thumbnail. It is a required attribute.
            
     height specifies the height of the thumbnail. It is an optional attribute.
    
-     *        
     width specifies the width of the thumbnail. It is an optional attribute.
    
-     *
-     *
-     * 
    time
-     * specifies the time offset in relation to the media object. Typically this is used when creating multiple keyframes within a single video. The format for this attribute should be in the DSM-CC's Normal Play Time (NTP) as used in RTSP [RFC 2326 3.6 Normal Play Time]. It is an optional attribute.
    
+     * 
+     * 
+     * 
    
+     * Allows particular images to be used as representative images for the media object. If multiple thumbnails are included, and time coding is not at play,
+     * it is assumed that the images are in order of importance. It has 1 required attribute and 3 optional attributes.
+     * 
    
+     * 
+     * 
+     * 
+     * 
+     * 
+     * 
    +     * <media:thumbnail url="http://www.foo.com/keyframe.jpg" width="75" height="50" time="12:05:01.123" />
+     * 
    
+     * 
    
+     * url specifies the url of the thumbnail. It is a required attribute.
+     * 
    
+     * 
    
+     * height specifies the height of the thumbnail. It is an optional attribute.
+     * 
    
+     * 
    
+     * width specifies the width of the thumbnail. It is an optional attribute.
+     * 
    
+     * 
+     * 
+     * 
    
+     * time specifies the time offset in relation to the media object. Typically this is used when creating multiple keyframes within a single video.
+     * The format for this attribute should be in the DSM-CC's Normal Play Time (NTP) as used in RTSP [RFC 2326
+     * 3.6 Normal Play Time]. It is an optional attribute.
+     * 
    
+     * 
      * @param thumbnail thumbnails for the image
      */
-    public void setThumbnail(Thumbnail[] thumbnail) {
-        this.thumbnail = (thumbnail == null) ? new Thumbnail[0] : thumbnail;
+    public void setThumbnail(final Thumbnail[] thumbnail) {
+        this.thumbnail = thumbnail == null ? new Thumbnail[0] : thumbnail;
     }
-    
+
     /**
      * <media:thumbnail>
    
-     *
-     *
-     * 
    Allows particular images to be used as representative images for the media object. If multiple thumbnails are included, and time coding is not at play, it is assumed that the images are in order of importance. It has 1 required attribute and 3 optional attributes.
    
-     *
-     *
-     *
-     *
-     *
-     *         
            <media:thumbnail url="http://www.foo.com/keyframe.jpg" width="75" height="50" time="12:05:01.123" />
    
-     * 
    url specifies the url of the thumbnail. It is a required attribute.
            
     height specifies the height of the thumbnail. It is an optional attribute.
    
-     *        
     width specifies the width of the thumbnail. It is an optional attribute.
    
-     *
-     *
-     * 
    time
-     * specifies the time offset in relation to the media object. Typically this is used when creating multiple keyframes within a single video. The format for this attribute should be in the DSM-CC's Normal Play Time (NTP) as used in RTSP [RFC 2326 3.6 Normal Play Time]. It is an optional attribute.
    
+     * 
+     * 
+     * 
    
+     * Allows particular images to be used as representative images for the media object. If multiple thumbnails are included, and time coding is not at play,
+     * it is assumed that the images are in order of importance. It has 1 required attribute and 3 optional attributes.
+     * 
    
+     * 
+     * 
+     * 
+     * 
+     * 
+     * 
    +     * <media:thumbnail url="http://www.foo.com/keyframe.jpg" width="75" height="50" time="12:05:01.123" />
+     * 
    
+     * 
    
+     * url specifies the url of the thumbnail. It is a required attribute.
+     * 
    
+     * 
    
+     * height specifies the height of the thumbnail. It is an optional attribute.
+     * 
    
+     * 
    
+     * width specifies the width of the thumbnail. It is an optional attribute.
+     * 
    
+     * 
+     * 
+     * 
    
+     * time specifies the time offset in relation to the media object. Typically this is used when creating multiple keyframes within a single video.
+     * The format for this attribute should be in the DSM-CC's Normal Play Time (NTP) as used in RTSP [RFC 2326
+     * 3.6 Normal Play Time]. It is an optional attribute.
+     * 
    
+     * 
      * @return Thumbnails for the image
      */
     public Thumbnail[] getThumbnail() {
         return thumbnail;
     }
-    
+
     /**
      * <media:title>
    
-     * 
    The title of the particular media object.  It has 1 optional attribute.
    
-     * 
            <media:title type="plain">The Judy's - The Moo Song</media:title>
    
-     *
-     * 
    type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be entity-encoded. It is an optional attribute.
    
+     * 
    
+     * The title of the particular media object. It has 1 optional attribute.
+     * 
    
+     * 
+     * 
    +     * <media:title type="plain">The Judy's - The Moo Song</media:title>
+     * 
    
+     * 
+     * 
    
+     * type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be
+     * entity-encoded. It is an optional attribute.
+     * 
    
+     * 
      * @param title Value of the title
      */
-    public void setTitle(String title) {
+    public void setTitle(final String title) {
         this.title = title;
     }
-    
+
     /**
      * <media:title>
    
-     * 
    The title of the particular media object.  It has 1 optional attribute.
    
-     * 
            <media:title type="plain">The Judy's - The Moo Song</media:title>
    
-     *
-     * 
    type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be entity-encoded. It is an optional attribute.
    
+     * 
    
+     * The title of the particular media object. It has 1 optional attribute.
+     * 
    
+     * 
+     * 
    +     * <media:title type="plain">The Judy's - The Moo Song</media:title>
+     * 
    
+     * 
+     * 
    
+     * type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be
+     * entity-encoded. It is an optional attribute.
+     * 
    
+     * 
      * @return value of the title.
      */
     public String getTitle() {
         return title;
     }
-    
+
     /**
      * <media:title>
    
-     * 
    The title of the particular media object.  It has 1 optional attribute.
    
-     * 
            <media:title type="plain">The Judy's - The Moo Song</media:title>
    
-     *
-     * 
    type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be entity-encoded. It is an optional attribute.
    
+     * 
    
+     * The title of the particular media object. It has 1 optional attribute.
+     * 
    
+     * 
+     * 
    +     * <media:title type="plain">The Judy's - The Moo Song</media:title>
+     * 
    
+     * 
+     * 
    
+     * type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be
+     * entity-encoded. It is an optional attribute.
+     * 
    
+     * 
      * @param titleType type of the title.
      */
-    public void setTitleType(String titleType) {
+    public void setTitleType(final String titleType) {
         this.titleType = titleType;
     }
-    
+
     /**
      * <media:title>
    
-     * 
    The title of the particular media object.  It has 1 optional attribute.
    
-     * 
            <media:title type="plain">The Judy's - The Moo Song</media:title>
    
-     *
-     * 
    type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be entity-encoded. It is an optional attribute.
    
+     * 
    
+     * The title of the particular media object. It has 1 optional attribute.
+     * 
    
+     * 
+     * 
    +     * <media:title type="plain">The Judy's - The Moo Song</media:title>
+     * 
    
+     * 
+     * 
    
+     * type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be
+     * entity-encoded. It is an optional attribute.
+     * 
    
+     * 
      * @return type of the title
      */
     public String getTitleType() {
         return titleType;
     }
-    
+
     /**
      * <media:copyright>
    
-     * 
    Copyright information for media object.  It has 1 optional attribute.
    
-     *
-     * 
            <media:copyright url="http://blah.com/additional-info.html">2005 FooBar Media</media:copyright>
    
-     * 
    url is the url for a terms of use page or additional copyright information. If the media is operating under a Creative Commons license, the Creative Commons module should be used instead. It is an optional attribute.
    
+     * 
    
+     * Copyright information for media object. It has 1 optional attribute.
+     * 
    
+     * 
+     * 
    +     * <media:copyright url="http://blah.com/additional-info.html">2005 FooBar Media</media:copyright>
+     * 
    
+     * 
    
+     * url is the url for a terms of use page or additional copyright information. If the media is operating under a Creative Commons license, the
+     * Creative Commons module should be used instead. It is an optional attribute.
+     * 
    
+     * 
      * @return Link to more copyright information.
      */
+    @Override
     public Object clone() {
-        Metadata md = new Metadata();
+        final Metadata md = new Metadata();
         md.setCategories(getCategories());
         md.setCopyright(getCopyright());
         md.setCopyrightUrl(getCopyrightUrl());
@@ -596,25 +899,28 @@ public class Metadata implements Cloneable, Serializable {
         md.setTitle(getTitle());
         md.setTitleType(getTitleType());
         md.setRestrictions(getRestrictions());
-        
+
         return md;
     }
-    
-    public boolean equals(Object obj) {
-        EqualsBean eBean = new EqualsBean(Metadata.class, this);
-        
+
+    @Override
+    public boolean equals(final Object obj) {
+        final EqualsBean eBean = new EqualsBean(Metadata.class, this);
+
         return eBean.beanEquals(obj);
     }
-    
+
+    @Override
     public int hashCode() {
-        EqualsBean equals = new EqualsBean(Metadata.class, this);
-        
+        final EqualsBean equals = new EqualsBean(Metadata.class, this);
+
         return equals.beanHashCode();
     }
-    
+
+    @Override
     public String toString() {
-        ToStringBean tsBean = new ToStringBean(Metadata.class, this);
-        
+        final ToStringBean tsBean = new ToStringBean(Metadata.class, this);
+
         return tsBean.toString();
     }
 }
diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/PlayerReference.java b/src/main/java/org/rometools/feed/module/mediarss/types/PlayerReference.java
index 621c8a6..6dee0d3 100644
--- a/src/main/java/org/rometools/feed/module/mediarss/types/PlayerReference.java
+++ b/src/main/java/org/rometools/feed/module/mediarss/types/PlayerReference.java
@@ -22,39 +22,51 @@
  */
 package org.rometools.feed.module.mediarss.types;
 
-import com.sun.syndication.feed.impl.EqualsBean;
-import com.sun.syndication.feed.impl.ToStringBean;
-
 import java.io.Serializable;
 import java.net.URI;
 
+import com.sun.syndication.feed.impl.EqualsBean;
+import com.sun.syndication.feed.impl.ToStringBean;
 
 /**
- *
+ * 
  * <media:player>
    
- * 
    Allows the media object to be accessed through a web browser media player console.
- * This element is required only if a direct media url attribute is not specified in the <media:content> element. It has 1 required attribute, and 2 optional attributes.
    
- * 
            <media:player url="http://www.foo.com/player?id=1111" height="200" width="400" />
    
- * 
    url is the url of the player console that plays the media. It is a required attribute.
    
- *
- * 
    height is the height of the browser window that the url should be opened in. It is an optional attribute.
    
- * 
    width is the width of the browser window that the url should be opened in. It is an optional attribute.
    
+ * 
    
+ * Allows the media object to be accessed through a web browser media player console. This element is required only if a direct media url attribute is
+ * not specified in the <media:content> element. It has 1 required attribute, and 2 optional attributes.
+ * 
    
+ * 
+ * 
    + * <media:player url="http://www.foo.com/player?id=1111" height="200" width="400" />
+ * 
    
+ * 
    
+ * url is the url of the player console that plays the media. It is a required attribute.
+ * 
    
+ * 
+ * 
    
+ * height is the height of the browser window that the url should be opened in. It is an optional attribute.
+ * 
    
+ * 
    
+ * width is the width of the browser window that the url should be opened in. It is an optional attribute.
+ * 
    
+ * 
  * @author cooper
  */
 public class PlayerReference implements Reference, Serializable {
-	private static final long serialVersionUID = -2618211012392630834L;
-	
-	private Integer height;
-    private Integer width;
-    private URI url;
+    private static final long serialVersionUID = -2618211012392630834L;
+
+    private final Integer height;
+    private final Integer width;
+    private final URI url;
 
     /**
      * Creates a new instance of PlayerReference
+     * 
      * @param url url of the player
      * @param width width of the player
      * @param height height of the player
      */
-    public PlayerReference(URI url, Integer width, Integer height) {
+    public PlayerReference(final URI url, final Integer width, final Integer height) {
         super();
 
         if (url == null) {
@@ -68,14 +80,16 @@ public class PlayerReference implements Reference, Serializable {
 
     /**
      * Constructs a new PlayerReference
+     * 
      * @param url URL of the player
      */
-    public PlayerReference(URI url) {
+    public PlayerReference(final URI url) {
         this(url, null, null);
     }
 
     /**
      * Height of the player
+     * 
      * @return Height of the player
      */
     public Integer getHeight() {
@@ -84,6 +98,7 @@ public class PlayerReference implements Reference, Serializable {
 
     /**
      * URL of the player
+     * 
      * @return URL of the player
      */
     public URI getUrl() {
@@ -92,26 +107,30 @@ public class PlayerReference implements Reference, Serializable {
 
     /**
      * Width of the player
+     * 
      * @return Width of the player
      */
     public Integer getWidth() {
         return width;
     }
 
-    public boolean equals(Object obj) {
-        EqualsBean eBean = new EqualsBean(this.getClass(), this);
+    @Override
+    public boolean equals(final Object obj) {
+        final EqualsBean eBean = new EqualsBean(this.getClass(), this);
 
         return eBean.beanEquals(obj);
     }
 
+    @Override
     public int hashCode() {
-        EqualsBean equals = new EqualsBean(this.getClass(), this);
+        final EqualsBean equals = new EqualsBean(this.getClass(), this);
 
         return equals.beanHashCode();
     }
 
+    @Override
     public String toString() {
-        ToStringBean tsBean = new ToStringBean(this.getClass(), this);
+        final ToStringBean tsBean = new ToStringBean(this.getClass(), this);
 
         return tsBean.toString();
     }
diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Rating.java b/src/main/java/org/rometools/feed/module/mediarss/types/Rating.java
index 42285c0..f2c16e5 100644
--- a/src/main/java/org/rometools/feed/module/mediarss/types/Rating.java
+++ b/src/main/java/org/rometools/feed/module/mediarss/types/Rating.java
@@ -25,29 +25,37 @@ package org.rometools.feed.module.mediarss.types;
 import com.sun.syndication.feed.impl.EqualsBean;
 import com.sun.syndication.feed.impl.ToStringBean;
 
-
 /**
  * <media:rating>
    
- *
- *
- * 
    This allows the permissible audience to be declared. If this element is not included, it assumes that no restrictions are necessary. It has one optional attribute.
    
- *
- * 
                   <media:rating scheme="urn:simple">adult</media:rating>
+ * 
+ * 
+ * 
    
+ * This allows the permissible audience to be declared. If this element is not included, it assumes that no restrictions are necessary. It has one optional
+ * attribute.
+ * 
    
+ * 
+ * 
    + * <media:rating scheme="urn:simple">adult</media:rating>
  *               <media:rating scheme="urn:icra">r (cz 1 lz 1 nz 1 oz 1 vz 1)</media:rating>
  *               <media:rating scheme="urn:mpaa">pg</media:rating>
- *
- *               <media:rating scheme="urn:v-chip">tv-y7-fv</media:rating>
    
- *
- *
- * 
    scheme is the URI that identifies the rating scheme. It is an optional attribute. If this attribute is not included, the default scheme is urn:simple (adult | nonadult).
    
- *
+ * 
+ *               <media:rating scheme="urn:v-chip">tv-y7-fv</media:rating>
+ * 
    
+ * 
+ * 
+ * 
    
+ * scheme is the URI that identifies the rating scheme. It is an optional attribute. If this attribute is not included, the default scheme is
+ * urn:simple (adult | nonadult).
+ * 
    
+ * 
  * For compatibility, a medai:adult tag will appear in the ratings as a urn:simple equiv.
+ * 
  * @author cooper
  */
 public class Rating extends AbstractSchemeValue {
-	private static final long serialVersionUID = 429385772347911315L;
+    private static final long serialVersionUID = 429385772347911315L;
 
-	/**
+    /**
      * urn:simple adult. This will be populated on the deprecated media:adult tag as well,
      */
     public static final Rating ADULT = new Rating("urn:simple", "adult");
@@ -59,40 +67,44 @@ public class Rating extends AbstractSchemeValue {
 
     /**
      * Constructs a new Rating object.
+     * 
      * @param scheme scheme used for the rating
      * @param value value of the rating.
      */
-    public Rating(String scheme, String value) {
+    public Rating(final String scheme, final String value) {
         super(scheme, value);
     }
 
     /**
-     *
+     * 
      * @param obj
      * @return
      */
-    public boolean equals(Object obj) {
-        EqualsBean eBean = new EqualsBean(this.getClass(), this);
+    @Override
+    public boolean equals(final Object obj) {
+        final EqualsBean eBean = new EqualsBean(this.getClass(), this);
 
         return eBean.beanEquals(obj);
     }
 
     /**
-     *
+     * 
      * @return
      */
+    @Override
     public int hashCode() {
-        EqualsBean equals = new EqualsBean(this.getClass(), this);
+        final EqualsBean equals = new EqualsBean(this.getClass(), this);
 
         return equals.beanHashCode();
     }
 
     /**
-     *
+     * 
      * @return
      */
+    @Override
     public String toString() {
-        ToStringBean tsBean = new ToStringBean(this.getClass(), this);
+        final ToStringBean tsBean = new ToStringBean(this.getClass(), this);
 
         return tsBean.toString();
     }
diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Reference.java b/src/main/java/org/rometools/feed/module/mediarss/types/Reference.java
index 5c279f4..9039863 100644
--- a/src/main/java/org/rometools/feed/module/mediarss/types/Reference.java
+++ b/src/main/java/org/rometools/feed/module/mediarss/types/Reference.java
@@ -3,7 +3,7 @@
  *
  * Created on April 18, 2006, 7:18 PM
  *
-  * This code is currently released under the Mozilla Public License.
+ * This code is currently released under the Mozilla Public License.
  * http://www.mozilla.org/MPL/
  *
  * Alternately you may apply the terms of the Apache Software License
@@ -22,10 +22,9 @@
  */
 package org.rometools.feed.module.mediarss.types;
 
-
-/** This class is an idenfier for UrlReference and PlayerReference and
- * is required for constructing a MediaContent object.
- *
+/**
+ * This class is an idenfier for UrlReference and PlayerReference and is required for constructing a MediaContent object.
+ * 
  * @author cooper
  */
 public interface Reference {
diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Restriction.java b/src/main/java/org/rometools/feed/module/mediarss/types/Restriction.java
index 79a33de..f6cfc74 100644
--- a/src/main/java/org/rometools/feed/module/mediarss/types/Restriction.java
+++ b/src/main/java/org/rometools/feed/module/mediarss/types/Restriction.java
@@ -27,50 +27,72 @@ import java.io.Serializable;
 import com.sun.syndication.feed.impl.EqualsBean;
 import com.sun.syndication.feed.impl.ToStringBean;
 
-
 /**
  * <media:restriction> 
    
- *
- * 
    Allows restrictions to be placed on the aggregator rendering the media in the feed. Currently, restrictions are based on distributor (uri) and country codes.  This element is purely informational and no obligation can be assumed or implied.
- * Only one <media:restriction> element of the same type can be applied to a media object - all others will be ignored. Entities in this element should be space separated. To allow the producer to explicitly declare his/her intentions, two literals are reserved: 'all', 'none'. These literals can only be used once. This element has 1 required attribute, and 1 optional attribute (with strict requirements for its exclusion).
    
- *
- * 
            <media:restriction relationship="allow" type="country">au us</media:restriction>
    
- *
- * 
    relationship indicates the type of relationship that the restriction represents (allow | deny). In the example above, the media object should only be syndicated in Australia and the United States. It is a required attribute.
    
- *
- * 
    Note: If the "allow" element is empty and the type is relationship is "allow", it is assumed that the empty list means "allow nobody" and the media should not be syndicated.
    
- * 
    A more explicit method would be:
    
- *
- * 
            <media:restriction relationship="allow" type="country">au us</media:restriction>
    
- *
- * 
    type specifies the type of restriction (country | uri) that the media can be syndicated. It is an optional attribute; however can only be excluded when using one of the literal values "all" or "none". 
    
- *
- * 
    "country" allows restrictions to be placed based on country code. [ISO 3166]
    
- * 
    "uri" allows restrictions based on URI. Examples: urn:apple, http://images.google.com, urn:yahoo, etc.
+ * 
+ * 
    
+ * Allows restrictions to be placed on the aggregator rendering the media in the feed. Currently, restrictions are based on distributor (uri) and country codes.
+ * This element is purely informational and no obligation can be assumed or implied. Only one <media:restriction> element of the same type can be
+ * applied to a media object - all others will be ignored. Entities in this element should be space separated. To allow the producer to explicitly declare
+ * his/her intentions, two literals are reserved: 'all', 'none'. These literals can only be used once. This element has 1 required attribute, and 1 optional
+ * attribute (with strict requirements for its exclusion).
+ * 
    
+ * 
+ * 
    + * <media:restriction relationship="allow" type="country">au us</media:restriction>
+ * 
    
+ * 
+ * 
    
+ * relationship indicates the type of relationship that the restriction represents (allow | deny). In the example above, the media object should only
+ * be syndicated in Australia and the United States. It is a required attribute.
+ * 
    
+ * 
+ * 
    
+ * Note: If the "allow" element is empty and the type is relationship is "allow", it is assumed that the empty list means "allow nobody" and
+ * the media should not be syndicated.
+ * 
    
+ * 
    
+ * A more explicit method would be:
+ * 
    
+ * 
+ * 
    + * <media:restriction relationship="allow" type="country">au us</media:restriction>
+ * 
    
+ * 
+ * 
    
+ * type specifies the type of restriction (country | uri) that the media can be syndicated. It is an optional attribute; however can only be excluded
+ * when using one of the literal values "all" or "none".
+ * 
    
+ * 
+ * 
    
+ * "country" allows restrictions to be placed based on country code. [ISO 3166]
+ * 
    
+ * 
    
+ * "uri" allows restrictions based on URI. Examples: urn:apple, http://images.google.com, urn:yahoo, etc.
+ * 
  * @author cooper
  */
 public class Restriction implements Serializable {
-	private static final long serialVersionUID = 7944281267467298628L;
+    private static final long serialVersionUID = 7944281267467298628L;
 
-	private Relationship relationship;
-    private String value;
-    private Type type;
+    private final Relationship relationship;
+    private final String value;
+    private final Type type;
 
     /**
      * Creates a new instance of Restriction
+     * 
      * @param relationship a Restriction.Relationship object
      * @param type A Restriction.Type object
      * @param value a value for the restriction.
      */
-    public Restriction(Relationship relationship, Type type, String value) {
-        if ((value == null) || (relationship == null)) {
-            throw new NullPointerException(
-                "Value and Relationship cannot be null.");
+    public Restriction(final Relationship relationship, final Type type, final String value) {
+        if (value == null || relationship == null) {
+            throw new NullPointerException("Value and Relationship cannot be null.");
         }
 
-        if ((type == null) && !(value.equals("all") || value.equals("none"))) {
-            throw new NullPointerException(
-                "Type is required if the value is other than 'all' or 'none'.");
+        if (type == null && !(value.equals("all") || value.equals("none"))) {
+            throw new NullPointerException("Type is required if the value is other than 'all' or 'none'.");
         }
 
         this.relationship = relationship;
@@ -90,20 +112,23 @@ public class Restriction implements Serializable {
         return value;
     }
 
-    public boolean equals(Object obj) {
-        EqualsBean eBean = new EqualsBean(this.getClass(), this);
+    @Override
+    public boolean equals(final Object obj) {
+        final EqualsBean eBean = new EqualsBean(this.getClass(), this);
 
         return eBean.beanEquals(obj);
     }
 
+    @Override
     public int hashCode() {
-        EqualsBean equals = new EqualsBean(this.getClass(), this);
+        final EqualsBean equals = new EqualsBean(this.getClass(), this);
 
         return equals.beanHashCode();
     }
 
+    @Override
     public String toString() {
-        ToStringBean tsBean = new ToStringBean(this.getClass(), this);
+        final ToStringBean tsBean = new ToStringBean(this.getClass(), this);
 
         return tsBean.toString();
     }
@@ -121,14 +146,15 @@ public class Restriction implements Serializable {
          * A deny relationship.
          */
         public static final Relationship DENY = new Relationship("deny");
-        private String value;
+        private final String value;
 
-        private Relationship(String value) {
+        private Relationship(final String value) {
             this.value = value;
         }
 
+        @Override
         public String toString() {
-            return this.value;
+            return value;
         }
     }
 
@@ -145,14 +171,15 @@ public class Restriction implements Serializable {
          * Indicates a URI for a special restriction type.
          */
         public static final Type URI = new Type("uri");
-        private String value;
+        private final String value;
 
-        private Type(String value) {
+        private Type(final String value) {
             this.value = value;
         }
 
+        @Override
         public String toString() {
-            return this.value;
+            return value;
         }
     }
 }
diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Text.java b/src/main/java/org/rometools/feed/module/mediarss/types/Text.java
index 9e6395b..c557335 100644
--- a/src/main/java/org/rometools/feed/module/mediarss/types/Text.java
+++ b/src/main/java/org/rometools/feed/module/mediarss/types/Text.java
@@ -27,64 +27,84 @@ import java.io.Serializable;
 import com.sun.syndication.feed.impl.EqualsBean;
 import com.sun.syndication.feed.impl.ToStringBean;
 
-
 /**
  * <media:text>
    
- * 
    Allows the inclusion of a text transcript, closed captioning, or lyrics of the media content. Many of these elements are permitted to provide a time series of text. In such cases, it is encouraged, but not required, that the elements be grouped by language and appear in time sequence order based on the start time. Elements can have overlapping start and end times. It has 4 optional attributes.
            <media:text type="plain" lang="en" start="00:00:03.000"
+ * 
    
+ * Allows the inclusion of a text transcript, closed captioning, or lyrics of the media content. Many of these elements are permitted to provide a time series
+ * of text. In such cases, it is encouraged, but not required, that the elements be grouped by language and appear in time sequence order based on the
+ * start time. Elements can have overlapping start and end times. It has 4 optional attributes.
+ * 
    
+ * 
+ * 
    + * <media:text type="plain" lang="en" start="00:00:03.000"
  *        end="00:00:10.000"> Oh, say, can you see</media:text>
- *
+ * 
  *        <media:text type="plain" lang="en" start="00:00:10.000"
  *        end="00:00:17.000">By the dawn's early light</media:text>
  * 
    
- * 
    type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be entity-encoded. It is an optional attribute.
    
- *
- *
- *
- *
- *
- *
- * 
    lang is the primary language encapsulated in the media object. Language codes possible are detailed in RFC 3066. This attribute is used similar to the xml:lang attribute detailed in the XML 1.0 Specification (Third Edition). It is an optional attribute.
    
- *
- * 
    start specifies the start time offset that the text starts being relevant to the media object. An example of this would be for closed captioning.
- * It uses the NTP time code format (see: the time attribute used in <media:thumbnail>). It is an optional attribute.
    
- *
- * 
    end specifies the end time that the text is relevant.
- * If this attribute is not provided, and a start time is used, it is expected that the end time is either the end of the clip or the start of the next <media:text> element. 
    
+ * 
    
+ * type specifies the type of text embedded. Possible values are either 'plain' or 'html'. Default value is 'plain'. All html must be entity-encoded.
+ * It is an optional attribute.
+ * 
    
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
    
+ * lang is the primary language encapsulated in the media object. Language codes possible are detailed in RFC 3066. This attribute is used similar to
+ * the xml:lang attribute detailed in the XML 1.0 Specification (Third Edition). It is an optional attribute.
+ * 
    
+ * 
+ * 
    
+ * start specifies the start time offset that the text starts being relevant to the media object. An example of this would be for closed captioning. It
+ * uses the NTP time code format (see: the time attribute used in <media:thumbnail>). It is an optional attribute.
+ * 
    
+ * 
+ * 
    
+ * end specifies the end time that the text is relevant. If this attribute is not provided, and a start time is used, it is expected that the
+ * end time is either the end of the clip or the start of the next <media:text> element.
+ * 
    
+ * 
  * @author cooper
  */
 public class Text implements Serializable {
-	private static final long serialVersionUID = 9043514380583850045L;
-	private String type;
-    private String value;
+    private static final long serialVersionUID = 9043514380583850045L;
+    private String type;
+    private final String value;
     private Time end;
     private Time start;
 
     /**
      * Creates a text object.
+     * 
      * @param value value of the text
      */
-    public Text(String value) {
+    public Text(final String value) {
         this.value = value;
     }
 
     /**
      * Creates a new instance of Text
+     * 
      * @param type type of text
      * @param value value of text
      */
-    public Text(String type, String value) {
+    public Text(final String type, final String value) {
         this.type = type;
         this.value = value;
     }
 
     /**
      * Creates a text object with start and end times
+     * 
      * @param type type of text
      * @param value value of text
      * @param start start time
      * @param end end time
      */
-    public Text(String type, String value, Time start, Time end) {
+    public Text(final String type, final String value, final Time start, final Time end) {
         this(type, value);
         this.start = start;
         this.end = end;
@@ -92,6 +112,7 @@ public class Text implements Serializable {
 
     /**
      * End time of the text
+     * 
      * @return End time of the text
      */
     public Time getEnd() {
@@ -100,6 +121,7 @@ public class Text implements Serializable {
 
     /**
      * Start time of the text
+     * 
      * @return Start time of the text
      */
     public Time getStart() {
@@ -108,34 +130,39 @@ public class Text implements Serializable {
 
     /**
      * type of the text
+     * 
      * @return type of the text
      */
     public String getType() {
-        return this.type;
+        return type;
     }
 
     /**
      * Value of the text
+     * 
      * @return type of the text
      */
     public String getValue() {
-        return this.value;
+        return value;
     }
 
-    public boolean equals(Object obj) {
-        EqualsBean eBean = new EqualsBean(this.getClass(), this);
+    @Override
+    public boolean equals(final Object obj) {
+        final EqualsBean eBean = new EqualsBean(this.getClass(), this);
 
         return eBean.beanEquals(obj);
     }
 
+    @Override
     public int hashCode() {
-        EqualsBean equals = new EqualsBean(this.getClass(), this);
+        final EqualsBean equals = new EqualsBean(this.getClass(), this);
 
         return equals.beanHashCode();
     }
 
+    @Override
     public String toString() {
-        ToStringBean tsBean = new ToStringBean(this.getClass(), this);
+        final ToStringBean tsBean = new ToStringBean(this.getClass(), this);
 
         return tsBean.toString();
     }
diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Thumbnail.java b/src/main/java/org/rometools/feed/module/mediarss/types/Thumbnail.java
index 1a6f145..6b0393b 100644
--- a/src/main/java/org/rometools/feed/module/mediarss/types/Thumbnail.java
+++ b/src/main/java/org/rometools/feed/module/mediarss/types/Thumbnail.java
@@ -21,74 +21,92 @@
  */
 package org.rometools.feed.module.mediarss.types;
 
-import com.sun.syndication.feed.impl.EqualsBean;
-import com.sun.syndication.feed.impl.ToStringBean;
-
 import java.io.Serializable;
 import java.net.URI;
 
+import com.sun.syndication.feed.impl.EqualsBean;
+import com.sun.syndication.feed.impl.ToStringBean;
 
 /**
  * <media:thumbnail>
    
- *
- *
- * 
    Allows particular images to be used as representative images for the media object. If multiple thumbnails are included, and time coding is not at play, it is assumed that the images are in order of importance. It has 1 required attribute and 3 optional attributes.
    
- *
- *
- *
- *
- *
- *         
            <media:thumbnail url="http://www.foo.com/keyframe.jpg" width="75" height="50" time="12:05:01.123" />
    
- * 
    url specifies the url of the thumbnail. It is a required attribute.
            
     height specifies the height of the thumbnail. It is an optional attribute.
    
- *        
     width specifies the width of the thumbnail. It is an optional attribute.
    
- *
- *
- * 
    time
- * specifies the time offset in relation to the media object. Typically this is used when creating multiple keyframes within a single video. The format for this attribute should be in the DSM-CC's Normal Play Time (NTP) as used in RTSP [RFC 2326 3.6 Normal Play Time]. It is an optional attribute.
    
+ * 
+ * 
+ * 
    
+ * Allows particular images to be used as representative images for the media object. If multiple thumbnails are included, and time coding is not at play, it is
+ * assumed that the images are in order of importance. It has 1 required attribute and 3 optional attributes.
+ * 
    
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
    + * <media:thumbnail url="http://www.foo.com/keyframe.jpg" width="75" height="50" time="12:05:01.123" />
+ * 
    
+ * 
    
+ * url specifies the url of the thumbnail. It is a required attribute.
+ * 
    
+ * 
    
+ * height specifies the height of the thumbnail. It is an optional attribute.
+ * 
    
+ * 
    
+ * width specifies the width of the thumbnail. It is an optional attribute.
+ * 
    
+ * 
+ * 
+ * 
    
+ * time specifies the time offset in relation to the media object. Typically this is used when creating multiple keyframes within a single video. The
+ * format for this attribute should be in the DSM-CC's Normal Play Time (NTP) as used in RTSP [RFC 2326 3.6 Normal
+ * Play Time]. It is an optional attribute.
+ * 
    
  */
 public class Thumbnail implements Cloneable, Serializable {
-	private static final long serialVersionUID = 2035345549055202026L;
+    private static final long serialVersionUID = 2035345549055202026L;
 
-	private Integer thumbHeight = null;
+    private Integer thumbHeight = null;
     private Integer thumbWidth = null;
-    private Time time;
+    private final Time time;
     private URI thumbUrl = null;
 
     /**
      * Creates a new thumbnail
+     * 
      * @param url URL to thumbnail
      * @param width width in pixels
      * @param height height in pixels
      * @param time Timecode representing the thumbnails position in a source.
      */
-    public Thumbnail(URI url, Integer width, Integer height, Time time) {
-        this.thumbUrl = url;
-        this.thumbHeight = height;
-        this.thumbWidth = width;
+    public Thumbnail(final URI url, final Integer width, final Integer height, final Time time) {
+        thumbUrl = url;
+        thumbHeight = height;
+        thumbWidth = width;
         this.time = time;
     }
 
     /**
      * Creates a new thumbnail
+     * 
      * @param url URL
      * @param width width
      * @param height height
      */
-    public Thumbnail(URI url, Integer width, Integer height) {
+    public Thumbnail(final URI url, final Integer width, final Integer height) {
         this(url, width, height, null);
     }
 
     /**
      * Creates a new thumbnail
+     * 
      * @param url URL
      */
-    public Thumbnail(URI url) {
+    public Thumbnail(final URI url) {
         this(url, null, null, null);
     }
 
     /**
-     *
+     * 
      * Returns the thumbHeight.
+     * 
      * @return Returns the thumbHeight.
      */
     public Integer getHeight() {
@@ -97,6 +115,7 @@ public class Thumbnail implements Cloneable, Serializable {
 
     /**
      * returns the time that the thumbnail was captured from its source
+     * 
      * @return returns the time that the thumbnail was captured from its source
      */
     public Time getTime() {
@@ -104,8 +123,9 @@ public class Thumbnail implements Cloneable, Serializable {
     }
 
     /**
-     *
+     * 
      * Retursn the URL
+     * 
      * @return Returns the thumbUrl.
      */
     public URI getUrl() {
@@ -113,32 +133,37 @@ public class Thumbnail implements Cloneable, Serializable {
     }
 
     /**
-     *
+     * 
      * Returns width.
+     * 
      * @return Returns the thumbWidth.
      */
     public Integer getWidth() {
         return thumbWidth;
     }
 
+    @Override
     public Object clone() {
-        return new Thumbnail(this.thumbUrl, this.thumbWidth, this.thumbHeight);
+        return new Thumbnail(thumbUrl, thumbWidth, thumbHeight);
     }
 
-    public boolean equals(Object obj) {
-        EqualsBean eBean = new EqualsBean(this.getClass(), this);
+    @Override
+    public boolean equals(final Object obj) {
+        final EqualsBean eBean = new EqualsBean(this.getClass(), this);
 
         return eBean.beanEquals(obj);
     }
 
+    @Override
     public int hashCode() {
-        EqualsBean equals = new EqualsBean(this.getClass(), this);
+        final EqualsBean equals = new EqualsBean(this.getClass(), this);
 
         return equals.beanHashCode();
     }
 
+    @Override
     public String toString() {
-        ToStringBean tsBean = new ToStringBean(this.getClass(), this);
+        final ToStringBean tsBean = new ToStringBean(this.getClass(), this);
 
         return tsBean.toString();
     }
diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Time.java b/src/main/java/org/rometools/feed/module/mediarss/types/Time.java
index 854b176..3fd26b4 100644
--- a/src/main/java/org/rometools/feed/module/mediarss/types/Time.java
+++ b/src/main/java/org/rometools/feed/module/mediarss/types/Time.java
@@ -22,21 +22,20 @@
  */
 package org.rometools.feed.module.mediarss.types;
 
-import com.sun.syndication.feed.impl.EqualsBean;
-import com.sun.syndication.feed.impl.ToStringBean;
-
 import java.io.Serializable;
 import java.text.NumberFormat;
 
+import com.sun.syndication.feed.impl.EqualsBean;
 
 /**
  * Represents a RFC 2326 3.6 Normal Play Time timestamp.
+ * 
  * @author cooper
  */
 public class Time implements Serializable {
-	private static final long serialVersionUID = 4088522049885593073L;
+    private static final long serialVersionUID = 4088522049885593073L;
 
-	private static final long SECOND = 1000;
+    private static final long SECOND = 1000;
     private static final long MINUTE = 60 * SECOND;
     private static final long HOUR = 60 * MINUTE * SECOND;
     private static final NumberFormat nf = NumberFormat.getInstance();
@@ -49,29 +48,31 @@ public class Time implements Serializable {
 
     /**
      * Creates a new instance of Time
+     * 
      * @param milliseconds milliseconds in length or offset.
      */
-    public Time(long milliseconds) {
+    public Time(final long milliseconds) {
         this.milliseconds = milliseconds;
     }
 
     /**
      * Creates a new instance of Time
+     * 
      * @param value RFC 2326 3.6 Normal Play Time value
      */
-    public Time(String value) {
-        String[] values = value.split(":");
+    public Time(final String value) {
+        final String[] values = value.split(":");
         int count = values.length - 1;
-        this.milliseconds = (long) (Double.parseDouble(values[count]) * (double) SECOND);
+        milliseconds = (long) (Double.parseDouble(values[count]) * SECOND);
         count--;
 
         if (count >= 0) {
-            milliseconds += (Long.parseLong(values[count]) * MINUTE);
+            milliseconds += Long.parseLong(values[count]) * MINUTE;
             count--;
         }
 
         if (count >= 0) {
-            milliseconds += (Long.parseLong(values[count]) * HOUR);
+            milliseconds += Long.parseLong(values[count]) * HOUR;
         }
     }
 
@@ -79,27 +80,30 @@ public class Time implements Serializable {
         return milliseconds;
     }
 
-    public boolean equals(Object obj) {
-        EqualsBean eBean = new EqualsBean(this.getClass(), this);
+    @Override
+    public boolean equals(final Object obj) {
+        final EqualsBean eBean = new EqualsBean(this.getClass(), this);
 
         return eBean.beanEquals(obj);
     }
 
+    @Override
     public int hashCode() {
-        EqualsBean equals = new EqualsBean(this.getClass(), this);
+        final EqualsBean equals = new EqualsBean(this.getClass(), this);
 
         return equals.beanHashCode();
     }
 
+    @Override
     public String toString() {
-        long value = this.milliseconds;
-        long hours = value / HOUR;
-        value -= (hours * HOUR);
+        long value = milliseconds;
+        final long hours = value / HOUR;
+        value -= hours * HOUR;
 
-        long minutes = value / MINUTE;
-        value -= (minutes * MINUTE);
+        final long minutes = value / MINUTE;
+        value -= minutes * MINUTE;
 
-        double seconds = (double) value / (double) SECOND;
+        final double seconds = (double) value / (double) SECOND;
 
         return nf.format(hours) + ":" + nf.format(minutes) + ":" + seconds;
     }
diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/UrlReference.java b/src/main/java/org/rometools/feed/module/mediarss/types/UrlReference.java
index aeb6590..3240a85 100644
--- a/src/main/java/org/rometools/feed/module/mediarss/types/UrlReference.java
+++ b/src/main/java/org/rometools/feed/module/mediarss/types/UrlReference.java
@@ -23,69 +23,75 @@
  */
 package org.rometools.feed.module.mediarss.types;
 
-import com.sun.syndication.feed.impl.EqualsBean;
-
 import java.io.Serializable;
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import com.sun.syndication.feed.impl.EqualsBean;
 
 /**
  * Used to indicate a URL primary reference for a MediaContent object.
+ * 
  * @author cooper
  */
 public class UrlReference implements Reference, Serializable {
-	private static final long serialVersionUID = -178149736468242989L;
-	
-	private URI url;
-    
+    private static final long serialVersionUID = -178149736468242989L;
+
+    private final URI url;
+
     /**
      * Creates a new UrlReference.
+     * 
      * @param url URL to the media source
      */
-    public UrlReference(URI url) {
+    public UrlReference(final URI url) {
         if (url == null) {
             throw new NullPointerException("url cannot be null.");
         }
-        
+
         this.url = url;
     }
-    
+
     /**
      * Creates a new instance of UrlReference
+     * 
      * @param url String value of a URL
      * @throws java.net.MalformedURLException thrown on bad URLs
      */
-    public UrlReference(String url) throws URISyntaxException  {
+    public UrlReference(final String url) throws URISyntaxException {
         super();
-        
+
         if (url == null) {
             throw new NullPointerException("url cannot be null.");
         }
-        
+
         this.url = new URI(url);
     }
-    
+
     /**
      * Returns the URL value
+     * 
      * @return Returns the URL value
      */
     public URI getUrl() {
-        return this.url;
+        return url;
     }
-    
-    public boolean equals(Object obj) {
-        EqualsBean eBean = new EqualsBean(this.getClass(), this);
-        
+
+    @Override
+    public boolean equals(final Object obj) {
+        final EqualsBean eBean = new EqualsBean(this.getClass(), this);
+
         return eBean.beanEquals(obj);
     }
-    
+
+    @Override
     public int hashCode() {
-        EqualsBean equals = new EqualsBean(this.getClass(), this);
-        
+        final EqualsBean equals = new EqualsBean(this.getClass(), this);
+
         return equals.beanHashCode();
     }
-    
+
+    @Override
     public String toString() {
         return url.toString();
     }
diff --git a/src/main/java/org/rometools/feed/module/opensearch/OpenSearchModule.java b/src/main/java/org/rometools/feed/module/opensearch/OpenSearchModule.java
index 5c7424d..b02d925 100644
--- a/src/main/java/org/rometools/feed/module/opensearch/OpenSearchModule.java
+++ b/src/main/java/org/rometools/feed/module/opensearch/OpenSearchModule.java
@@ -17,11 +17,13 @@ package org.rometools.feed.module.opensearch;
 
 import com.sun.syndication.feed.module.Module;
 
-/** Provides access to A9 Open Search information.
+/**
+ * Provides access to A9 Open Search information.
+ * 
  * @author Michael W. Nassif (enrouteinc@gmail.com)
  */
-public interface OpenSearchModule extends Module, OpenSearchResponse{
+public interface OpenSearchModule extends Module, OpenSearchResponse {
+
+    public final static String URI = "http://a9.com/-/spec/opensearch/1.1/";
 
-	public final static String URI = "http://a9.com/-/spec/opensearch/1.1/";
-	
 }
diff --git a/src/main/java/org/rometools/feed/module/opensearch/OpenSearchResponse.java b/src/main/java/org/rometools/feed/module/opensearch/OpenSearchResponse.java
index 2ee1fcd..d6d1fce 100644
--- a/src/main/java/org/rometools/feed/module/opensearch/OpenSearchResponse.java
+++ b/src/main/java/org/rometools/feed/module/opensearch/OpenSearchResponse.java
@@ -17,123 +17,123 @@ package org.rometools.feed.module.opensearch;
 
 import java.util.List;
 
-import com.sun.syndication.feed.atom.Link;
 import org.rometools.feed.module.opensearch.entity.OSQuery;
 
-/** Provides access to A9 Open Search information.
+import com.sun.syndication.feed.atom.Link;
+
+/**
+ * Provides access to A9 Open Search information.
+ * 
  * @author Michael W. Nassif (enrouteinc@gmail.com)
  */
-public interface OpenSearchResponse{
+public interface OpenSearchResponse {
 
     /**
-     * #  totalResults – the maximum number of results available for these search terms
+     * # totalResults – the maximum number of results available for these search terms
+     * 
+     * * Restrictions: An integer greater than or equal to 0. * Default: The number of items that were returned in this set of results. * Requirements: May
+     * appear zero or one time.
      * 
-     *    * Restrictions: An integer greater than or equal to 0.
-     *    * Default: The number of items that were returned in this set of results.
-     *    * Requirements: May appear zero or one time.
      * @param totalResults A positive integer value.
      */
-	public void setTotalResults(int totalResults);
-	
+    public void setTotalResults(int totalResults);
+
     /**
-     * #  totalResults – the maximum number of results available for these search terms
+     * # totalResults – the maximum number of results available for these search terms
+     * 
+     * * Restrictions: An integer greater than or equal to 0. * Default: The number of items that were returned in this set of results. * Requirements: May
+     * appear zero or one time.
      * 
-     *    * Restrictions: An integer greater than or equal to 0.
-     *    * Default: The number of items that were returned in this set of results.
-     *    * Requirements: May appear zero or one time.
      * @return a positive integer value.
      */
-	public int getTotalResults();
-	
+    public int getTotalResults();
+
     /**
-     * #  startIndex – the index of the first item returned in the result.
+     * # startIndex – the index of the first item returned in the result.
+     * 
+     * * Restrictions: An integer greater than or equal to 1. * Note: The first result is 1. * Default: 1 * Requirements: May appear zero or one time.
      * 
-     *    * Restrictions: An integer greater than or equal to 1.
-     *    * Note: The first result is 1.
-     *    * Default: 1
-     *    * Requirements: May appear zero or one time.
      * @param startIndex int value >= 1.
      */
-	public void setStartIndex(int startIndex);
-	
+    public void setStartIndex(int startIndex);
+
     /**
-     * #  startIndex – the index of the first item returned in the result.
+     * # startIndex – the index of the first item returned in the result.
+     * 
+     * * Restrictions: An integer greater than or equal to 1. * Note: The first result is 1. * Default: 1 * Requirements: May appear zero or one time.
      * 
-     *    * Restrictions: An integer greater than or equal to 1.
-     *    * Note: The first result is 1.
-     *    * Default: 1
-     *    * Requirements: May appear zero or one time.
      * @return int value >= 1.
      */
-	public int getStartIndex();
-	
+    public int getStartIndex();
+
     /**
-     * #  itemsPerPage – the maximum number of items that can appear in one page of results.
+     * # itemsPerPage – the maximum number of items that can appear in one page of results.
+     * 
+     * * Restrictions: An integer greater than or equal to 1. * Default: The number of items that were returned in this set of results. * Requirements: May
+     * appear zero or one time.
      * 
-     *    * Restrictions: An integer greater than or equal to 1.
-     *    * Default: The number of items that were returned in this set of results.
-     *    * Requirements: May appear zero or one time.
      * @param itemsPerPage int value >= 1.
      */
-	public void setItemsPerPage(int itemsPerPage);
-	
+    public void setItemsPerPage(int itemsPerPage);
+
     /**
-     * #  itemsPerPage – the maximum number of items that can appear in one page of results.
+     * # itemsPerPage – the maximum number of items that can appear in one page of results.
+     * 
+     * * Restrictions: An integer greater than or equal to 1. * Default: The number of items that were returned in this set of results. * Requirements: May
+     * appear zero or one time.
      * 
-     *    * Restrictions: An integer greater than or equal to 1.
-     *    * Default: The number of items that were returned in this set of results.
-     *    * Requirements: May appear zero or one time.
      * @return int value >= 1
      */
-	public int getItemsPerPage();
-	
+    public int getItemsPerPage();
+
     /**
-     * #  link – a reference back to the OpenSearch Description file
+     * # link – a reference back to the OpenSearch Description file
+     * 
+     * * Attributes: This is a clone of the link element in Atom, including href, hreflang, rel, and type attributes. * Restrictions: The rel attribute must
+     * equal search. * Note: New in version 1.1. * Requirements: May appear zero or one time.
      * 
-     *    * Attributes: This is a clone of the link element in Atom, including href, hreflang, rel, and type attributes.
-     *    * Restrictions: The rel attribute must equal search.
-     *    * Note: New in version 1.1.
-     *    * Requirements: May appear zero or one time.
      * @param link link to the open search spec.
      */
-	public void setLink(Link link);
-	
+    public void setLink(Link link);
+
     /**
-     * #  link – a reference back to the OpenSearch Description file
+     * # link – a reference back to the OpenSearch Description file
+     * 
+     * * Attributes: This is a clone of the link element in Atom, including href, hreflang, rel, and type attributes. * Restrictions: The rel attribute must
+     * equal search. * Note: New in version 1.1. * Requirements: May appear zero or one time.
      * 
-     *    * Attributes: This is a clone of the link element in Atom, including href, hreflang, rel, and type attributes.
-     *    * Restrictions: The rel attribute must equal search.
-     *    * Note: New in version 1.1.
-     *    * Requirements: May appear zero or one time.
      * @return link to the opensearch spec.
      */
-	public Link getLink();
-	
-	// list of OSResponseQuery interfaces
+    public Link getLink();
+
+    // list of OSResponseQuery interfaces
     /**
-     * Query – in an OpenSearch Response, can be used both to echo back the original query and to suggest new searches.
-     * 	Please see the OpenSearch Query specification for more information.
-     *     
      
-     *        
    • Note: New in version 1.1.
      • 
-     *        
    • Requirements: May appear zero or more times. Note that the “Q” is capitalized.
      • 
+     * Query – in an OpenSearch Response, can be used both to echo back the original query and to suggest new searches. Please see the OpenSearch Query specification for more information.
+     * 
        
+     * 
      • Note: New in version 1.1.
        • 
+     * 
      • Requirements: May appear zero or more times. Note that the “Q” is capitalized.
        • 
+     * 
      * @param query List of OSQuery objects.
      */
-	public void setQueries(List query);
-	
+    public void setQueries(List query);
+
     /**
-     * Query – in an OpenSearch Response, can be used both to echo back the original query and to suggest new searches.
-     * 	Please see the OpenSearch Query specification for more information.
-     *     
          
-     *        
        • Note: New in version 1.1.
          • 
-     *        
        • Requirements: May appear zero or more times. Note that the “Q” is capitalized.
          • 
+     * Query – in an OpenSearch Response, can be used both to echo back the original query and to suggest new searches. Please see the OpenSearch Query specification for more information.
+     * 
            
+     * 
          • Note: New in version 1.1.
            • 
+     * 
          • Requirements: May appear zero or more times. Note that the “Q” is capitalized.
            • 
+     * 
      * @return A list of OSQuery objects.
      */
-	public List getQueries();
-	
-	// convenience method
+    public List getQueries();
+
+    // convenience method
     /**
      * Adds a query to the module.
+     * 
      * @param query OSQuery object to add.
      */
-	public void addQuery(OSQuery query);
+    public void addQuery(OSQuery query);
 }
diff --git a/src/main/java/org/rometools/feed/module/opensearch/RequiredAttributeMissingException.java b/src/main/java/org/rometools/feed/module/opensearch/RequiredAttributeMissingException.java
index b427a31..423025e 100644
--- a/src/main/java/org/rometools/feed/module/opensearch/RequiredAttributeMissingException.java
+++ b/src/main/java/org/rometools/feed/module/opensearch/RequiredAttributeMissingException.java
@@ -20,19 +20,19 @@ package org.rometools.feed.module.opensearch;
  */
 public class RequiredAttributeMissingException extends RuntimeException {
 
-	public RequiredAttributeMissingException(String arg0, Throwable arg1) {
-		super(arg0, arg1);
-		// TODO Auto-generated constructor stub
-	}
+    public RequiredAttributeMissingException(final String arg0, final Throwable arg1) {
+        super(arg0, arg1);
+        // TODO Auto-generated constructor stub
+    }
 
-	public RequiredAttributeMissingException(String arg0) {
-		super(arg0);
-		// TODO Auto-generated constructor stub
-	}
+    public RequiredAttributeMissingException(final String arg0) {
+        super(arg0);
+        // TODO Auto-generated constructor stub
+    }
 
-	public RequiredAttributeMissingException(Throwable arg0) {
-		super(arg0);
-		// TODO Auto-generated constructor stub
-	}
+    public RequiredAttributeMissingException(final Throwable arg0) {
+        super(arg0);
+        // TODO Auto-generated constructor stub
+    }
 
 }
diff --git a/src/main/java/org/rometools/feed/module/opensearch/entity/OSQuery.java b/src/main/java/org/rometools/feed/module/opensearch/entity/OSQuery.java
index 229e424..2a2adc2 100644
--- a/src/main/java/org/rometools/feed/module/opensearch/entity/OSQuery.java
+++ b/src/main/java/org/rometools/feed/module/opensearch/entity/OSQuery.java
@@ -20,36 +20,37 @@ import java.io.Serializable;
 import com.sun.syndication.feed.impl.ObjectBean;
 
 /**
- * @author Michael W. Nassif (enrouteinc@gmail.com)
- * Class representation of the Query object (Response portion so far)
+ * @author Michael W. Nassif (enrouteinc@gmail.com) Class representation of the Query object (Response portion so far)
  */
-public class OSQuery implements Cloneable, Serializable{
+public class OSQuery implements Cloneable, Serializable {
+
+    ObjectBean _objBean = null;
+
+    // role is required
+    private String role;
+    private int startPage = -1;
+    private int totalResults = -1;
+    private String osd;
+    private String title;
+    private String searchTerms;
 
-	ObjectBean _objBean = null;
-	
-	// role is required
-	private String role;
-	private int startPage = -1;
-	private int totalResults = -1;
-	private String osd;
-	private String title;
-	private String searchTerms;
-	
     /**
      * Default constructor. All properties are set to null.
      * 
            
      */
     public OSQuery() {
-        _objBean = new ObjectBean(this.getClass(),this);
+        _objBean = new ObjectBean(this.getClass(), this);
     }
 
     /**
      * Creates a deep 'bean' clone of the object.
      * 
            
+     * 
      * @return a clone of the object.
      * @throws CloneNotSupportedException thrown if an element of the object cannot be cloned.
-     *
+     * 
      */
+    @Override
     public Object clone() throws CloneNotSupportedException {
         return _objBean.clone();
     }
@@ -57,11 +58,13 @@ public class OSQuery implements Cloneable, Serializable{
     /**
      * Indicates whether some other object is "equal to" this one as defined by the Object equals() method.
      * 
            
+     * 
      * @param other he reference object with which to compare.
      * @return true if 'this' object is equal to the 'other' object.
-     *
+     * 
      */
-    public boolean equals(Object other) {
+    @Override
+    public boolean equals(final Object other) {
         return _objBean.equals(other);
     }
 
@@ -70,9 +73,11 @@ public class OSQuery implements Cloneable, Serializable{
      * 
            
      * It follows the contract defined by the Object hashCode() method.
      * 
            
+     * 
      * @return the hashcode of the bean object.
-     *
+     * 
      */
+    @Override
     public int hashCode() {
         return _objBean.hashCode();
     }
@@ -80,85 +85,99 @@ public class OSQuery implements Cloneable, Serializable{
     /**
      * Returns the String representation for the object.
      * 
            
+     * 
      * @return String representation for the object.
-     *
+     * 
      */
+    @Override
     public String toString() {
         return _objBean.toString();
     }
-	
-	/**
-	 * @return Returns the osd.
-	 */
-	public String getOsd() {
-		return osd;
-	}
-	/**
-	 * Typically represents a url link to the os description file
-	 * @param osd The osd to set.
-	 */
-	public void setOsd(String osd) {
-		this.osd = osd;
-	}
-	/**
-	 * @return Returns the role.
-	 */
-	public String getRole() {
-		return role;
-	}
-	/**
-	 * @param role The role to set.
-	 */
-	public void setRole(String role) {
-		this.role = role;
-	}
-	/**
-	 * @return Returns the searchTerms.
-	 */
-	public String getSearchTerms() {
-		return searchTerms;
-	}
-	/**
-	 * @param searchTerms The searchTerms to set.
-	 */
-	public void setSearchTerms(String searchTerms) {
-		this.searchTerms = searchTerms;
-	}
-	/**
-	 * @return Returns the startPage.
-	 */
-	public int getStartPage() {
-		return startPage;
-	}
-	/**
-	 * @param startPage The startPage to set.
-	 */
-	public void setStartPage(int startPage) {
-		this.startPage = startPage;
-	}
-	/**
-	 * @return Returns the title.
-	 */
-	public String getTitle() {
-		return title;
-	}
-	/**
-	 * @param title The title to set.
-	 */
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	/**
-	 * @return Returns the totalResults.
-	 */
-	public int getTotalResults() {
-		return totalResults;
-	}
-	/**
-	 * @param totalResults The totalResults to set.
-	 */
-	public void setTotalResults(int totalResults) {
-		this.totalResults = totalResults;
-	}
+
+    /**
+     * @return Returns the osd.
+     */
+    public String getOsd() {
+        return osd;
+    }
+
+    /**
+     * Typically represents a url link to the os description file
+     * 
+     * @param osd The osd to set.
+     */
+    public void setOsd(final String osd) {
+        this.osd = osd;
+    }
+
+    /**
+     * @return Returns the role.
+     */
+    public String getRole() {
+        return role;
+    }
+
+    /**
+     * @param role The role to set.
+     */
+    public void setRole(final String role) {
+        this.role = role;
+    }
+
+    /**
+     * @return Returns the searchTerms.
+     */
+    public String getSearchTerms() {
+        return searchTerms;
+    }
+
+    /**
+     * @param searchTerms The searchTerms to set.
+     */
+    public void setSearchTerms(final String searchTerms) {
+        this.searchTerms = searchTerms;
+    }
+
+    /**
+     * @return Returns the startPage.
+     */
+    public int getStartPage() {
+        return startPage;
+    }
+
+    /**
+     * @param startPage The startPage to set.
+     */
+    public void setStartPage(final int startPage) {
+        this.startPage = startPage;
+    }
+
+    /**
+     * @return Returns the title.
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * @param title The title to set.
+     */
+    public void setTitle(final String title) {
+        this.title = title;
+    }
+
+    /**
+     * @return Returns the totalResults.
+     */
+    public int getTotalResults() {
+        return totalResults;
+    }
+
+    /**
+     * @param totalResults The totalResults to set.
+     */
+    public void setTotalResults(final int totalResults) {
+        this.totalResults = totalResults;
+    }
 
 }
diff --git a/src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleGenerator.java b/src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleGenerator.java
index 6ab68b9..b1742b5 100644
--- a/src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleGenerator.java
+++ b/src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleGenerator.java
@@ -21,24 +21,23 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.jdom.Attribute;
-import org.jdom.Element;
-import org.jdom.Namespace;
-
-import com.sun.syndication.feed.atom.Link;
-import com.sun.syndication.feed.module.Module;
+import org.jdom2.Attribute;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 import org.rometools.feed.module.opensearch.OpenSearchModule;
 import org.rometools.feed.module.opensearch.RequiredAttributeMissingException;
 import org.rometools.feed.module.opensearch.entity.OSQuery;
+
+import com.sun.syndication.feed.atom.Link;
+import com.sun.syndication.feed.module.Module;
 import com.sun.syndication.io.ModuleGenerator;
 
 /**
- * @author Michael W. Nassif (enrouteinc@gmail.com)
- * OpenSearch implementation of ModuleGenerator
+ * @author Michael W. Nassif (enrouteinc@gmail.com) OpenSearch implementation of ModuleGenerator
  */
-public class OpenSearchModuleGenerator  implements ModuleGenerator {
-	
-	private static final Namespace OS_NS  = Namespace.getNamespace("opensearch", OpenSearchModule.URI);
+public class OpenSearchModuleGenerator implements ModuleGenerator {
+
+    private static final Namespace OS_NS = Namespace.getNamespace("opensearch", OpenSearchModule.URI);
 
     public String getNamespaceUri() {
         return OpenSearchModule.URI;
@@ -47,7 +46,7 @@ public class OpenSearchModuleGenerator  implements ModuleGenerator {
     private static final Set NAMESPACES;
 
     static {
-        Set nss = new HashSet();
+        final Set nss = new HashSet();
         nss.add(OS_NS);
         NAMESPACES = Collections.unmodifiableSet(nss);
     }
@@ -55,115 +54,114 @@ public class OpenSearchModuleGenerator  implements ModuleGenerator {
     /**
      * Returns a set with all the URIs (JDOM Namespace elements) this module generator uses.
      * 
            
-     * It is used by the the feed generators to add their namespace definition in
-     * the root element of the generated document (forward-missing of Java 5.0 Generics).
+     * It is used by the the feed generators to add their namespace definition in the root element of the generated document (forward-missing of Java 5.0
+     * Generics).
      * 
            
-     *
+     * 
      * @return a set with all the URIs (JDOM Namespace elements) this module generator uses.
      */
     public Set getNamespaces() {
         return NAMESPACES;
     }
 
-    public void generate(Module module, Element element) {
+    public void generate(final Module module, final Element element) {
 
-        OpenSearchModule osm = (OpenSearchModule)module;
+        final OpenSearchModule osm = (OpenSearchModule) module;
 
-        if(osm.getItemsPerPage() > -1){
-        	element.addContent(generateSimpleElement("itemsPerPage", Integer.toString(osm.getItemsPerPage())));
+        if (osm.getItemsPerPage() > -1) {
+            element.addContent(generateSimpleElement("itemsPerPage", Integer.toString(osm.getItemsPerPage())));
         }
 
-        if(osm.getTotalResults() > -1){
+        if (osm.getTotalResults() > -1) {
             element.addContent(generateSimpleElement("totalResults", Integer.toString(osm.getTotalResults())));
         }
-            
-        int startIndex = (osm.getStartIndex() > 0)?osm.getStartIndex():1;
-        element.addContent(generateSimpleElement("startIndex",Integer.toString(startIndex)));
 
-        if(osm.getQueries() != null){
-        	
-        	List queries = osm.getQueries();
-        	
-        	for (Iterator iter = queries.iterator(); iter.hasNext();) {
-				OSQuery query = (OSQuery) iter.next();
-				if(query != null){
-  				    element.addContent(generateQueryElement(query));
-				}
-			}
-        }        	
-        
-        if(osm.getLink() != null){
-        	element.addContent(generateLinkElement(osm.getLink()));
+        final int startIndex = osm.getStartIndex() > 0 ? osm.getStartIndex() : 1;
+        element.addContent(generateSimpleElement("startIndex", Integer.toString(startIndex)));
+
+        if (osm.getQueries() != null) {
+
+            final List queries = osm.getQueries();
+
+            for (final Iterator iter = queries.iterator(); iter.hasNext();) {
+                final OSQuery query = (OSQuery) iter.next();
+                if (query != null) {
+                    element.addContent(generateQueryElement(query));
+                }
+            }
+        }
+
+        if (osm.getLink() != null) {
+            element.addContent(generateLinkElement(osm.getLink()));
         }
     }
 
-    protected Element generateQueryElement(OSQuery query) {
-    	
-        Element qElement = new Element("Query", OS_NS);
-        
+    protected Element generateQueryElement(final OSQuery query) {
+
+        final Element qElement = new Element("Query", OS_NS);
+
         if (query.getRole() != null) {
-            Attribute roleAttribute = new Attribute("role", query.getRole());
+            final Attribute roleAttribute = new Attribute("role", query.getRole());
             qElement.setAttribute(roleAttribute);
-        }
-        else{
-        	throw new RequiredAttributeMissingException("If declaring a Query element, the field 'role' must be be specified");
+        } else {
+            throw new RequiredAttributeMissingException("If declaring a Query element, the field 'role' must be be specified");
         }
 
-        if(query.getOsd() != null){
-        	Attribute osd = new Attribute("osd", query.getOsd());
+        if (query.getOsd() != null) {
+            final Attribute osd = new Attribute("osd", query.getOsd());
             qElement.setAttribute(osd);
         }
-        
-        if(query.getSearchTerms() != null){
-        	Attribute searchTerms = new Attribute("searchTerms", query.getSearchTerms());
+
+        if (query.getSearchTerms() != null) {
+            final Attribute searchTerms = new Attribute("searchTerms", query.getSearchTerms());
             qElement.setAttribute(searchTerms);
         }
-        
-        if(query.getStartPage() > -1){
-        	int startPage = (query.getStartPage() != 0)?query.getStartPage():1;
-        	Attribute sp = new Attribute("startPage", Integer.toString(startPage));
+
+        if (query.getStartPage() > -1) {
+            final int startPage = query.getStartPage() != 0 ? query.getStartPage() : 1;
+            final Attribute sp = new Attribute("startPage", Integer.toString(startPage));
             qElement.setAttribute(sp);
         }
-        
-        if(query.getTitle() != null){
-        	qElement.setAttribute(new Attribute("title", query.getTitle()));
+
+        if (query.getTitle() != null) {
+            qElement.setAttribute(new Attribute("title", query.getTitle()));
         }
- 
-        if(query.getTotalResults() > -1){
-        	qElement.setAttribute(new Attribute("totalResults", Integer.toString(query.getTotalResults())));
+
+        if (query.getTotalResults() > -1) {
+            qElement.setAttribute(new Attribute("totalResults", Integer.toString(query.getTotalResults())));
         }
-        
+
         return qElement;
     }
-    
-    protected Element generateLinkElement(Link link) {
-        Element linkElement = new Element("link", OS_NS);
+
+    protected Element generateLinkElement(final Link link) {
+        final Element linkElement = new Element("link", OS_NS);
 
         if (link.getRel() != null) {
-            Attribute relAttribute = new Attribute("rel", "search");
+            final Attribute relAttribute = new Attribute("rel", "search");
             linkElement.setAttribute(relAttribute);
         }
 
         if (link.getType() != null) {
-            Attribute typeAttribute = new Attribute("type", link.getType());
+            final Attribute typeAttribute = new Attribute("type", link.getType());
             linkElement.setAttribute(typeAttribute);
         }
 
         if (link.getHref() != null) {
-            Attribute hrefAttribute = new Attribute("href", link.getHref());
+            final Attribute hrefAttribute = new Attribute("href", link.getHref());
             linkElement.setAttribute(hrefAttribute);
         }
-        
+
         if (link.getHreflang() != null) {
-            Attribute hreflangAttribute = new Attribute("hreflang", link.getHreflang());
+            final Attribute hreflangAttribute = new Attribute("hreflang", link.getHreflang());
             linkElement.setAttribute(hreflangAttribute);
         }
         return linkElement;
     }
 
-    protected Element generateSimpleElement(String name, String value)  {
+    protected Element generateSimpleElement(final String name, final String value) {
 
-        Element element = new Element(name, OS_NS);
+        final Element element = new Element(name, OS_NS);
         element.addContent(value);
 
         return element;
diff --git a/src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleImpl.java b/src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleImpl.java
index 7cddc92..ccd2d72 100644
--- a/src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleImpl.java
+++ b/src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleImpl.java
@@ -14,20 +14,19 @@
  */
 package org.rometools.feed.module.opensearch.impl;
 
-import com.sun.syndication.feed.CopyFrom;
-import com.sun.syndication.feed.atom.Link;
-import com.sun.syndication.feed.module.ModuleImpl;
-import org.rometools.feed.module.opensearch.OpenSearchModule;
-import org.rometools.feed.module.opensearch.entity.OSQuery;
-
 import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.rometools.feed.module.opensearch.OpenSearchModule;
+import org.rometools.feed.module.opensearch.entity.OSQuery;
+
+import com.sun.syndication.feed.CopyFrom;
+import com.sun.syndication.feed.atom.Link;
+import com.sun.syndication.feed.module.ModuleImpl;
 
 /**
- * @author Michael W. Nassif (enrouteinc@gmail.com)
- * OpenSearch Module implementation
+ * @author Michael W. Nassif (enrouteinc@gmail.com) OpenSearch Module implementation
  */
 public class OpenSearchModuleImpl extends ModuleImpl implements OpenSearchModule, Serializable {
     private int totalResults = -1;
@@ -37,7 +36,7 @@ public class OpenSearchModuleImpl extends ModuleImpl implements OpenSearchModule
     private List queries;
 
     public OpenSearchModuleImpl() {
-        super(OpenSearchModuleImpl.class, OpenSearchModuleImpl.URI);
+        super(OpenSearchModuleImpl.class, OpenSearchModule.URI);
     }
 
     /**
@@ -50,7 +49,7 @@ public class OpenSearchModuleImpl extends ModuleImpl implements OpenSearchModule
     /**
      * @param itemsPerPage The itemsPerPage to set.
      */
-    public void setItemsPerPage(int itemsPerPage) {
+    public void setItemsPerPage(final int itemsPerPage) {
         this.itemsPerPage = itemsPerPage;
     }
 
@@ -64,28 +63,27 @@ public class OpenSearchModuleImpl extends ModuleImpl implements OpenSearchModule
     /**
      * @param link The link to set.
      */
-    public void setLink(Link link) {
+    public void setLink(final Link link) {
         this.link = link;
     }
 
-    
     /**
      * @return Returns the queries.
      */
     public List getQueries() {
-        this.queries = (queries == null) ? new LinkedList() : queries;
+        queries = queries == null ? new LinkedList() : queries;
 
-        return this.queries;
+        return queries;
     }
 
     /**
      * @param queries The queries to set.
      */
-    public void setQueries(List queries) {
+    public void setQueries(final List queries) {
         this.queries = queries;
     }
 
-    public void addQuery(OSQuery query) {
+    public void addQuery(final OSQuery query) {
         if (queries != null) {
             queries.add(query);
         } else {
@@ -104,7 +102,7 @@ public class OpenSearchModuleImpl extends ModuleImpl implements OpenSearchModule
     /**
      * @param startIndex The startIndex to set.
      */
-    public void setStartIndex(int startIndex) {
+    public void setStartIndex(final int startIndex) {
         this.startIndex = startIndex;
     }
 
@@ -118,15 +116,17 @@ public class OpenSearchModuleImpl extends ModuleImpl implements OpenSearchModule
     /**
      * @param totalResults The totalResults to set.
      */
-    public void setTotalResults(int totalResults) {
+    public void setTotalResults(final int totalResults) {
         this.totalResults = totalResults;
     }
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see com.sun.syndication.feed.CopyFrom#copyFrom(java.lang.Object)
      */
-    public void copyFrom(CopyFrom obj) {
-        OpenSearchModule osm = (OpenSearchModuleImpl) obj;
+    public void copyFrom(final CopyFrom obj) {
+        final OpenSearchModule osm = (OpenSearchModuleImpl) obj;
 
         setTotalResults(osm.getTotalResults());
         setItemsPerPage(osm.getItemsPerPage());
@@ -136,7 +136,9 @@ public class OpenSearchModuleImpl extends ModuleImpl implements OpenSearchModule
         // setQueries(osm.getQueries());
     }
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see com.sun.syndication.feed.CopyFrom#getInterface()
      */
     public Class getInterface() {
diff --git a/src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleParser.java b/src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleParser.java
index 5d04501..b801fe5 100644
--- a/src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleParser.java
+++ b/src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleParser.java
@@ -21,184 +21,181 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.jdom.Attribute;
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.Parent;
+import org.jdom2.Attribute;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.Parent;
+import org.rometools.feed.module.opensearch.OpenSearchModule;
+import org.rometools.feed.module.opensearch.entity.OSQuery;
 
 import com.sun.syndication.feed.atom.Link;
 import com.sun.syndication.feed.module.Module;
-import org.rometools.feed.module.opensearch.OpenSearchModule;
-import org.rometools.feed.module.opensearch.entity.OSQuery;
 import com.sun.syndication.io.ModuleParser;
 
 /**
- * @author Michael W. Nassif (enrouteinc@gmail.com)
- * OpenSearch implementation of the ModuleParser class
+ * @author Michael W. Nassif (enrouteinc@gmail.com) OpenSearch implementation of the ModuleParser class
  */
-public class OpenSearchModuleParser implements ModuleParser{
-	
-	private static final Namespace OS_NS  = Namespace.getNamespace("opensearch", OpenSearchModule.URI);
-	
-	public String getNamespaceUri() {
-        return OpenSearchModule.URI;
-	}
+public class OpenSearchModuleParser implements ModuleParser {
 
-	public Module parse(Element dcRoot) {
-    	
-		URL baseURI = findBaseURI(dcRoot);
-		
-    	boolean foundSomething = false;
-        OpenSearchModule osm = new OpenSearchModuleImpl();
+    private static final Namespace OS_NS = Namespace.getNamespace("opensearch", OpenSearchModule.URI);
+
+    public String getNamespaceUri() {
+        return OpenSearchModule.URI;
+    }
+
+    public Module parse(final Element dcRoot) {
+
+        final URL baseURI = findBaseURI(dcRoot);
+
+        boolean foundSomething = false;
+        final OpenSearchModule osm = new OpenSearchModuleImpl();
 
         Element e = dcRoot.getChild("totalResults", OS_NS);
-        
+
         if (e != null) {
-            
-        	foundSomething = true;
-            
-            try{
-            	osm.setTotalResults(Integer.parseInt(e.getText()));
-            } catch(NumberFormatException ex){
-            	// Ignore setting the field and post a warning
-            	System.err.println("Warning: The element totalResults must be an integer value: " + ex.getMessage());
+
+            foundSomething = true;
+
+            try {
+                osm.setTotalResults(Integer.parseInt(e.getText()));
+            } catch (final NumberFormatException ex) {
+                // Ignore setting the field and post a warning
+                System.err.println("Warning: The element totalResults must be an integer value: " + ex.getMessage());
             }
         }
-        
+
         e = dcRoot.getChild("itemsPerPage", OS_NS);
-        
-        try{
-        	osm.setItemsPerPage(Integer.parseInt(e.getText()));
-        } catch(NumberFormatException ex){
-        	// Ignore setting the field and post a warning
-        	System.err.println("Warning: The element itemsPerPage must be an integer value: " + ex.getMessage());
+
+        try {
+            osm.setItemsPerPage(Integer.parseInt(e.getText()));
+        } catch (final NumberFormatException ex) {
+            // Ignore setting the field and post a warning
+            System.err.println("Warning: The element itemsPerPage must be an integer value: " + ex.getMessage());
         }
-        
+
         e = dcRoot.getChild("startIndex", OS_NS);
-        
-        try{
-        	osm.setStartIndex(Integer.parseInt(e.getText()));
-        } catch(NumberFormatException ex){
-        	// Ignore setting the field and post a warning
-        	System.err.println("Warning: The element startIndex must be an integer value: " + ex.getMessage());
+
+        try {
+            osm.setStartIndex(Integer.parseInt(e.getText()));
+        } catch (final NumberFormatException ex) {
+            // Ignore setting the field and post a warning
+            System.err.println("Warning: The element startIndex must be an integer value: " + ex.getMessage());
         }
-        
-        List queries = dcRoot.getChildren("Query", OS_NS);
-        
-        if(queries != null && queries.size() > 0){
-        	
-        	// Create the OSQuery list 
-        	List osqList = new LinkedList();
-        	
-        	for (Iterator iter = queries.iterator(); iter.hasNext();) {
-				e = (Element) iter.next();
-				osqList.add(parseQuery(e));
-			}
-        
+
+        final List queries = dcRoot.getChildren("Query", OS_NS);
+
+        if (queries != null && queries.size() > 0) {
+
+            // Create the OSQuery list
+            final List osqList = new LinkedList();
+
+            for (final Iterator iter = queries.iterator(); iter.hasNext();) {
+                e = (Element) iter.next();
+                osqList.add(parseQuery(e));
+            }
+
             osm.setQueries(osqList);
         }
-        
+
         e = dcRoot.getChild("link", OS_NS);
-        
-        if(e != null){
-        	osm.setLink(parseLink(e, baseURI));
+
+        if (e != null) {
+            osm.setLink(parseLink(e, baseURI));
         }
-        
-        return (foundSomething) ? osm : null;
+
+        return foundSomething ? osm : null;
     }
-	
-	private static OSQuery parseQuery(Element e){
-		
-		OSQuery query = new OSQuery();
-		
+
+    private static OSQuery parseQuery(final Element e) {
+
+        final OSQuery query = new OSQuery();
+
         String att = e.getAttributeValue("role");
         query.setRole(att);
-        
-        att = e.getAttributeValue("osd");
-		query.setOsd(att);
-        
-        att = e.getAttributeValue("searchTerms");
-		query.setSearchTerms(att);
-            
-        att = e.getAttributeValue("title");
-		query.setTitle(att);
-        
-		try{
 
-			// someones mistake should not cause the parser to fail, since these are only optional attributes
-			
-			att = e.getAttributeValue("totalResults");
-	        if(att != null){
-	        	query.setTotalResults(Integer.parseInt(att));
-	        }
-	        
-	        att = e.getAttributeValue("startPage");
-			if(att != null){
-	            query.setStartPage(Integer.parseInt(att));
-			}
-			
-		} catch(NumberFormatException ex){
-			System.err.println("Warning: Exception caught while trying to parse a non-numeric Query attribute " + ex.getMessage());
-		}
-		
-		return query;
-	}
-	
-    private static Link parseLink(Element e, URL baseURI) {
-    	
-    	Link link = new Link();
-    	
-    	String att = e.getAttributeValue("rel");//getAtomNamespace()); DONT KNOW WHY DOESN'T WORK
-    	
-        if (att!=null) {
+        att = e.getAttributeValue("osd");
+        query.setOsd(att);
+
+        att = e.getAttributeValue("searchTerms");
+        query.setSearchTerms(att);
+
+        att = e.getAttributeValue("title");
+        query.setTitle(att);
+
+        try {
+
+            // someones mistake should not cause the parser to fail, since these are only optional attributes
+
+            att = e.getAttributeValue("totalResults");
+            if (att != null) {
+                query.setTotalResults(Integer.parseInt(att));
+            }
+
+            att = e.getAttributeValue("startPage");
+            if (att != null) {
+                query.setStartPage(Integer.parseInt(att));
+            }
+
+        } catch (final NumberFormatException ex) {
+            System.err.println("Warning: Exception caught while trying to parse a non-numeric Query attribute " + ex.getMessage());
+        }
+
+        return query;
+    }
+
+    private static Link parseLink(final Element e, final URL baseURI) {
+
+        final Link link = new Link();
+
+        String att = e.getAttributeValue("rel");// getAtomNamespace()); DONT KNOW WHY DOESN'T WORK
+
+        if (att != null) {
             link.setRel(att);
         }
-        
-        att = e.getAttributeValue("type");//getAtomNamespace()); DONT KNOW WHY DOESN'T WORK
-        
-        if (att!=null) {
+
+        att = e.getAttributeValue("type");// getAtomNamespace()); DONT KNOW WHY DOESN'T WORK
+
+        if (att != null) {
             link.setType(att);
         }
-        
-        att = e.getAttributeValue("href");//getAtomNamespace()); DONT KNOW WHY DOESN'T WORK
-        
-        if (att!=null) {
-        	
+
+        att = e.getAttributeValue("href");// getAtomNamespace()); DONT KNOW WHY DOESN'T WORK
+
+        if (att != null) {
+
             if (isRelativeURI(att)) { //
                 link.setHref(resolveURI(baseURI, e, ""));
             } else {
                 link.setHref(att);
             }
         }
-        
-        att = e.getAttributeValue("hreflang");//getAtomNamespace()); DONT KNOW WHY DOESN'T WORK
-        
-        if (att!=null) {
+
+        att = e.getAttributeValue("hreflang");// getAtomNamespace()); DONT KNOW WHY DOESN'T WORK
+
+        if (att != null) {
             link.setHreflang(att);
         }
-        
-        att = e.getAttributeValue("length");//getAtomNamespace()); DONT KNOW WHY DOESN'T WORK
-        
+
+        att = e.getAttributeValue("length");// getAtomNamespace()); DONT KNOW WHY DOESN'T WORK
+
         return link;
     }
-	
-	private static boolean isRelativeURI(String uri) {
-        if (  uri.startsWith("http://")
-           || uri.startsWith("https://")
-           || uri.startsWith("/")) {
+
+    private static boolean isRelativeURI(final String uri) {
+        if (uri.startsWith("http://") || uri.startsWith("https://") || uri.startsWith("/")) {
             return false;
         }
         return true;
     }
-	
+
     /** Use xml:base attributes at feed and entry level to resolve relative links */
-    private static String resolveURI(URL baseURI, Parent parent, String url) {
-        url = (url.equals(".") || url.equals("./")) ? "" : url;
+    private static String resolveURI(final URL baseURI, final Parent parent, String url) {
+        url = url.equals(".") || url.equals("./") ? "" : url;
         if (isRelativeURI(url) && parent != null && parent instanceof Element) {
-            Attribute baseAtt = ((Element)parent).getAttribute("base", Namespace.XML_NAMESPACE);
-            String xmlBase = (baseAtt == null) ? "" : baseAtt.getValue();
+            final Attribute baseAtt = ((Element) parent).getAttribute("base", Namespace.XML_NAMESPACE);
+            String xmlBase = baseAtt == null ? "" : baseAtt.getValue();
             if (!isRelativeURI(xmlBase) && !xmlBase.endsWith("/")) {
-                xmlBase = xmlBase.substring(0, xmlBase.lastIndexOf("/")+1);
+                xmlBase = xmlBase.substring(0, xmlBase.lastIndexOf("/") + 1);
             }
             return resolveURI(baseURI, parent.getParent(), xmlBase + url);
         } else if (isRelativeURI(url) && parent == null) {
@@ -212,29 +209,29 @@ public class OpenSearchModuleParser implements ModuleParser{
         }
         return url;
     }
-	
+
     /** Use feed links and/or xml:base attribute to determine baseURI of feed */
-    private static URL findBaseURI(Element root) {
+    private static URL findBaseURI(final Element root) {
         URL baseURI = null;
-        List linksList = root.getChildren("link", OS_NS);
+        final List linksList = root.getChildren("link", OS_NS);
         if (linksList != null) {
-            for (Iterator links = linksList.iterator(); links.hasNext(); ) {
-                Element link = (Element)links.next();
-                if (!root.equals(link.getParent())) break;
+            for (final Iterator links = linksList.iterator(); links.hasNext();) {
+                final Element link = (Element) links.next();
+                if (!root.equals(link.getParent())) {
+                    break;
+                }
                 String href = link.getAttribute("href").getValue();
-                if (   link.getAttribute("rel", OS_NS) == null
-                    || link.getAttribute("rel", OS_NS).getValue().equals("alternate")) {
+                if (link.getAttribute("rel", OS_NS) == null || link.getAttribute("rel", OS_NS).getValue().equals("alternate")) {
                     href = resolveURI(null, link, href);
                     try {
                         baseURI = new URL(href);
                         break;
-                    } catch (MalformedURLException e) {
+                    } catch (final MalformedURLException e) {
                         System.err.println("Base URI is malformed: " + href);
                     }
                 }
             }
         }
         return baseURI;
-    } 
+    }
 }
-
diff --git a/src/main/java/org/rometools/feed/module/photocast/PhotocastModule.java b/src/main/java/org/rometools/feed/module/photocast/PhotocastModule.java
index cd5d8e8..6e7fc80 100644
--- a/src/main/java/org/rometools/feed/module/photocast/PhotocastModule.java
+++ b/src/main/java/org/rometools/feed/module/photocast/PhotocastModule.java
@@ -39,19 +39,18 @@
  */
 package org.rometools.feed.module.photocast;
 
-import com.sun.syndication.feed.module.Module;
-import org.rometools.feed.module.photocast.types.Metadata;
-
 import java.net.URL;
-
 import java.util.Date;
 
+import org.rometools.feed.module.photocast.types.Metadata;
+
+import com.sun.syndication.feed.module.Module;
 
 /**
- * This is a ROME module that provides support for the 
- * "http://www.apple.com/ilife/wallpapers" namespace.
+ * This is a ROME module that provides support for the "http://www.apple.com/ilife/wallpapers" namespace.
  * 
  * See the package information for example usage.
+ * 
  * @author Robert "kebernet" Cooper
  */
 public interface PhotocastModule extends Module {
@@ -62,60 +61,70 @@ public interface PhotocastModule extends Module {
 
     /**
      * Returns the Item level photoDate value.
-     * @return Returns the Item level photoDate value. 
+     * 
+     * @return Returns the Item level photoDate value.
      */
     public Date getPhotoDate();
 
     /**
      * Set the Item level photoDate value.
+     * 
      * @param photoDate Item level photoDate value
      */
     public void setPhotoDate(Date photoDate);
 
     /**
      * Returns the cropDate value from the item level.
+     * 
      * @return Item level cropDate value
      */
     public Date getCropDate();
 
     /**
      * Sets the cropDate value for the item level.
+     * 
      * @param cropDate cropDate value for the item level
      */
     public void setCropDate(Date cropDate);
 
     /**
      * The URL of the image.
+     * 
      * @return The URL of the image.
      */
     public URL getImageUrl();
 
     /**
      * The URL of the image.
+     * 
      * @param imageUrl The URL of the image.
      */
     public void setImageUrl(URL imageUrl);
 
     /**
      * The URL of the image thumbnail.
+     * 
      * @return The URL of the image thumbnail.
      */
     public URL getThumbnailUrl();
 
     /**
      * The URL of the image thumbnail.
+     * 
      * @param thumbnailUrl The URL of the image thumbnail.
      */
     public void setThumbnailUrl(URL thumbnailUrl);
 
     /**
      * The iPhoto metadata for the image.
+     * 
      * @return The iPhoto metadata for the image.
      */
     public Metadata getMetadata();
 
     /**
      * The iPhoto metadata for the image.
+     * 
      * @param metadata The iPhoto metadata for the image.
      */
     public void setMetadata(Metadata metadata);
diff --git a/src/main/java/org/rometools/feed/module/photocast/PhotocastModuleImpl.java b/src/main/java/org/rometools/feed/module/photocast/PhotocastModuleImpl.java
index 98c8ce3..127cd9e 100644
--- a/src/main/java/org/rometools/feed/module/photocast/PhotocastModuleImpl.java
+++ b/src/main/java/org/rometools/feed/module/photocast/PhotocastModuleImpl.java
@@ -1,11 +1,9 @@
-
-
 /*
  * PhotocastModuleImpl.java
  *
  * Created on March 30, 2006, 6:23 PM
  *
-  *
+ *
  * This library is provided under dual licenses.
  * You may choose the terms of the Lesser General Public License or the Apache
  * License at your discretion.
@@ -43,17 +41,17 @@
 
 package org.rometools.feed.module.photocast;
 
+import java.net.URL;
+import java.util.Date;
+
+import org.rometools.feed.module.photocast.types.Metadata;
+
 import com.sun.syndication.feed.CopyFrom;
 import com.sun.syndication.feed.impl.EqualsBean;
 import com.sun.syndication.feed.impl.ToStringBean;
-import org.rometools.feed.module.photocast.types.Metadata;
-
-import java.net.URL;
-
-import java.util.Date;
 
 /**
- *
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class PhotocastModuleImpl implements PhotocastModule {
@@ -71,7 +69,7 @@ public class PhotocastModuleImpl implements PhotocastModule {
         return photoDate;
     }
 
-    public void setPhotoDate(Date photoDate) {
+    public void setPhotoDate(final Date photoDate) {
         this.photoDate = photoDate;
     }
 
@@ -79,7 +77,7 @@ public class PhotocastModuleImpl implements PhotocastModule {
         return cropDate;
     }
 
-    public void setCropDate(Date cropDate) {
+    public void setCropDate(final Date cropDate) {
         this.cropDate = cropDate;
     }
 
@@ -87,7 +85,7 @@ public class PhotocastModuleImpl implements PhotocastModule {
         return imageUrl;
     }
 
-    public void setImageUrl(URL imageUrl) {
+    public void setImageUrl(final URL imageUrl) {
         this.imageUrl = imageUrl;
     }
 
@@ -95,7 +93,7 @@ public class PhotocastModuleImpl implements PhotocastModule {
         return thumbnailUrl;
     }
 
-    public void setThumbnailUrl(URL thumbnailUrl) {
+    public void setThumbnailUrl(final URL thumbnailUrl) {
         this.thumbnailUrl = thumbnailUrl;
     }
 
@@ -103,34 +101,27 @@ public class PhotocastModuleImpl implements PhotocastModule {
         return metadata;
     }
 
-    public void setMetadata(Metadata metadata) {
+    public void setMetadata(final Metadata metadata) {
         this.metadata = metadata;
     }
 
-    public void copyFrom(CopyFrom obj) {
-        PhotocastModule pm = (PhotocastModule) obj;
-        this.setPhotoDate((pm.getPhotoDate() == null) ? null
-                                                      : (Date) pm.getPhotoDate()
-                                                                 .clone());
-        this.setCropDate((pm.getCropDate() == null) ? null
-                                                    : (Date) pm.getCropDate()
-                                                               .clone());
-        this.setImageUrl(pm.getImageUrl());
-        this.setThumbnailUrl(pm.getThumbnailUrl());
-        this.setMetadata(pm.getMetadata());
+    public void copyFrom(final CopyFrom obj) {
+        final PhotocastModule pm = (PhotocastModule) obj;
+        setPhotoDate(pm.getPhotoDate() == null ? null : (Date) pm.getPhotoDate().clone());
+        setCropDate(pm.getCropDate() == null ? null : (Date) pm.getCropDate().clone());
+        setImageUrl(pm.getImageUrl());
+        setThumbnailUrl(pm.getThumbnailUrl());
+        setMetadata(pm.getMetadata());
     }
 
+    @Override
     public Object clone() {
-        PhotocastModuleImpl pm = new PhotocastModuleImpl();
-        pm.setPhotoDate((this.getPhotoDate() == null) ? null
-                                                      : (Date) this.getPhotoDate()
-                                                                   .clone());
-        pm.setCropDate((this.getCropDate() == null) ? null
-                                                    : (Date) this.getCropDate()
-                                                                 .clone());
-        pm.setImageUrl(this.getThumbnailUrl());
-        pm.setThumbnailUrl(this.getThumbnailUrl());
-        pm.setMetadata(this.getMetadata());
+        final PhotocastModuleImpl pm = new PhotocastModuleImpl();
+        pm.setPhotoDate(getPhotoDate() == null ? null : (Date) getPhotoDate().clone());
+        pm.setCropDate(getCropDate() == null ? null : (Date) getCropDate().clone());
+        pm.setImageUrl(getThumbnailUrl());
+        pm.setThumbnailUrl(getThumbnailUrl());
+        pm.setMetadata(getMetadata());
 
         return pm;
     }
@@ -143,20 +134,23 @@ public class PhotocastModuleImpl implements PhotocastModule {
         return PhotocastModule.class;
     }
 
+    @Override
     public String toString() {
-        ToStringBean tsBean = new ToStringBean(PhotocastModuleImpl.class, this);
+        final ToStringBean tsBean = new ToStringBean(PhotocastModuleImpl.class, this);
 
         return tsBean.toString();
     }
 
-    public boolean equals(Object obj) {
-        EqualsBean eBean = new EqualsBean(PhotocastModuleImpl.class, this);
+    @Override
+    public boolean equals(final Object obj) {
+        final EqualsBean eBean = new EqualsBean(PhotocastModuleImpl.class, this);
 
         return eBean.beanEquals(obj);
     }
 
+    @Override
     public int hashCode() {
-        EqualsBean equals = new EqualsBean(PhotocastModuleImpl.class, this);
+        final EqualsBean equals = new EqualsBean(PhotocastModuleImpl.class, this);
 
         return equals.beanHashCode();
     }
diff --git a/src/main/java/org/rometools/feed/module/photocast/io/Generator.java b/src/main/java/org/rometools/feed/module/photocast/io/Generator.java
index 587ae48..c49739a 100644
--- a/src/main/java/org/rometools/feed/module/photocast/io/Generator.java
+++ b/src/main/java/org/rometools/feed/module/photocast/io/Generator.java
@@ -3,7 +3,7 @@
  *
  * Created on March 30, 2006, 6:43 PM
  *
-  *
+ *
  * This library is provided under dual licenses.
  * You may choose the terms of the Lesser General Public License or the Apache
  * License at your discretion.
@@ -41,50 +41,54 @@
 
 package org.rometools.feed.module.photocast.io;
 
-import com.sun.syndication.feed.module.Module;
-import org.rometools.feed.module.photocast.PhotocastModule;
-import com.sun.syndication.io.ModuleGenerator;
 import java.util.HashSet;
 import java.util.Set;
-import org.jdom.Element;
-import org.jdom.Namespace;
+
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.rometools.feed.module.photocast.PhotocastModule;
+
+import com.sun.syndication.feed.module.Module;
+import com.sun.syndication.io.ModuleGenerator;
 
 /**
- *
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class Generator implements ModuleGenerator {
-    
-    private static final Namespace NS = Namespace.getNamespace( "apple-wallpapers", PhotocastModule.URI );
+
+    private static final Namespace NS = Namespace.getNamespace("apple-wallpapers", PhotocastModule.URI);
     private static final HashSet NAMESPACES = new HashSet();
     private static final String FEED_VERSION = "0.9";
-    static{
-        NAMESPACES.add( NS );
+    static {
+        NAMESPACES.add(NS);
     }
+
     /** Creates a new instance of Generator */
     public Generator() {
         super();
     }
 
-    public void generate(Module module, Element element) {
-        if( !(module instanceof PhotocastModule ) )
-            return;
-        PhotocastModule pm = (PhotocastModule) module;
-        if( element.getName().equals("channel") || element.getName().equals("feed") ){
-            element.addContent( generateSimpleElement( "feedVersion", FEED_VERSION) );
+    public void generate(final Module module, final Element element) {
+        if (!(module instanceof PhotocastModule)) {
             return;
         }
-        element.addContent( generateSimpleElement("photoDate", Parser.PHOTO_DATE_FORMAT.format(pm.getPhotoDate())));
-        element.addContent( generateSimpleElement("cropDate", Parser.CROP_DATE_FORMAT.format( pm.getCropDate() )));
-        element.addContent( generateSimpleElement("thumbnail", pm.getThumbnailUrl().toString() ) );
-        element.addContent( generateSimpleElement("image", pm.getImageUrl().toString() ) );
-        Element e = new Element( "metadata", NS );
-        Element pd = new Element( "PhotoDate", "" );
-        pd.addContent( pm.getMetadata().getPhotoDate().toString() );
-        e.addContent( pd );
-        Element com = new Element("Comments", "");
-        com.addContent( pm.getMetadata().getComments() );
-        e.addContent( com );
+        final PhotocastModule pm = (PhotocastModule) module;
+        if (element.getName().equals("channel") || element.getName().equals("feed")) {
+            element.addContent(generateSimpleElement("feedVersion", FEED_VERSION));
+            return;
+        }
+        element.addContent(generateSimpleElement("photoDate", Parser.PHOTO_DATE_FORMAT.format(pm.getPhotoDate())));
+        element.addContent(generateSimpleElement("cropDate", Parser.CROP_DATE_FORMAT.format(pm.getCropDate())));
+        element.addContent(generateSimpleElement("thumbnail", pm.getThumbnailUrl().toString()));
+        element.addContent(generateSimpleElement("image", pm.getImageUrl().toString()));
+        final Element e = new Element("metadata", NS);
+        final Element pd = new Element("PhotoDate", "");
+        pd.addContent(pm.getMetadata().getPhotoDate().toString());
+        e.addContent(pd);
+        final Element com = new Element("Comments", "");
+        com.addContent(pm.getMetadata().getComments());
+        e.addContent(com);
         element.addContent(e);
     }
 
@@ -95,11 +99,12 @@ public class Generator implements ModuleGenerator {
     public String getNamespaceUri() {
         return PhotocastModule.URI;
     }
-    protected Element generateSimpleElement(String name, String value) {
-        Element element = new Element(name, NS);
+
+    protected Element generateSimpleElement(final String name, final String value) {
+        final Element element = new Element(name, NS);
         element.addContent(value);
 
         return element;
     }
-   
+
 }
diff --git a/src/main/java/org/rometools/feed/module/photocast/io/Parser.java b/src/main/java/org/rometools/feed/module/photocast/io/Parser.java
index b993ebe..e374382 100644
--- a/src/main/java/org/rometools/feed/module/photocast/io/Parser.java
+++ b/src/main/java/org/rometools/feed/module/photocast/io/Parser.java
@@ -3,7 +3,7 @@
  *
  * Created on March 30, 2006, 6:43 PM
  *
-  *
+ *
  * This library is provided under dual licenses.
  * You may choose the terms of the Lesser General Public License or the Apache
  * License at your discretion.
@@ -41,88 +41,92 @@
 
 package org.rometools.feed.module.photocast.io;
 
-import com.sun.syndication.feed.module.Module;
-import org.rometools.feed.module.photocast.PhotocastModule;
-import org.rometools.feed.module.photocast.PhotocastModuleImpl;
-import org.rometools.feed.module.photocast.types.Metadata;
-import org.rometools.feed.module.photocast.types.PhotoDate;
-import com.sun.syndication.io.ModuleParser;
 import java.net.URL;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Logger;
-import org.jdom.Element;
-import org.jdom.Namespace;
+
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.rometools.feed.module.photocast.PhotocastModule;
+import org.rometools.feed.module.photocast.PhotocastModuleImpl;
+import org.rometools.feed.module.photocast.types.Metadata;
+import org.rometools.feed.module.photocast.types.PhotoDate;
+
+import com.sun.syndication.feed.module.Module;
+import com.sun.syndication.io.ModuleParser;
 
 /**
- *
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class Parser implements ModuleParser {
     private static final Logger LOG = Logger.getAnonymousLogger();
-    
-    private static final Namespace NS = Namespace.getNamespace( PhotocastModule.URI );
-    //2005-11-29T04:36:06
+
+    private static final Namespace NS = Namespace.getNamespace(PhotocastModule.URI);
+    // 2005-11-29T04:36:06
     static final DateFormat PHOTO_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-    //2006-01-11 16:42:26 -0800
+    // 2006-01-11 16:42:26 -0800
     static final DateFormat CROP_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
-    
+
     /** Creates a new instance of Parser */
     public Parser() {
     }
 
-    public Module parse(Element element) {
-        if( element.getName().equals("channel") || element.getName().equals("feed") ){
+    public Module parse(final Element element) {
+        if (element.getName().equals("channel") || element.getName().equals("feed")) {
             return new PhotocastModuleImpl();
-        } else if( element.getChild( "metadata", Parser.NS ) == null && element.getChild( "image", Parser.NS ) == null )
+        } else if (element.getChild("metadata", Parser.NS) == null && element.getChild("image", Parser.NS) == null) {
             return null;
-        PhotocastModule pm = new PhotocastModuleImpl();
-        List children = element.getChildren();
-        Iterator it = children.iterator();
-        while( it.hasNext() ){
-            Element e = (Element) it.next();
-            if( !e.getNamespace().equals( Parser.NS ) )
+        }
+        final PhotocastModule pm = new PhotocastModuleImpl();
+        final List children = element.getChildren();
+        final Iterator it = children.iterator();
+        while (it.hasNext()) {
+            final Element e = (Element) it.next();
+            if (!e.getNamespace().equals(Parser.NS)) {
                 continue;
-            if( e.getName().equals("photoDate") ){
-                try{
-                    pm.setPhotoDate( Parser.PHOTO_DATE_FORMAT.parse( e.getText() ) );
-                } catch( Exception ex ){
-                    LOG.warning( "Unable to parse photoDate: "+ e.getText() + " "+ ex.toString());
+            }
+            if (e.getName().equals("photoDate")) {
+                try {
+                    pm.setPhotoDate(Parser.PHOTO_DATE_FORMAT.parse(e.getText()));
+                } catch (final Exception ex) {
+                    LOG.warning("Unable to parse photoDate: " + e.getText() + " " + ex.toString());
                 }
-            } else if( e.getName().equals("cropDate") ) {
-                try{
-                    pm.setCropDate( Parser.CROP_DATE_FORMAT.parse( e.getText() ) );
-                } catch( Exception ex ){
-                    LOG.warning( "Unable to parse cropDate: "+ e.getText() + " "+ ex.toString());
+            } else if (e.getName().equals("cropDate")) {
+                try {
+                    pm.setCropDate(Parser.CROP_DATE_FORMAT.parse(e.getText()));
+                } catch (final Exception ex) {
+                    LOG.warning("Unable to parse cropDate: " + e.getText() + " " + ex.toString());
                 }
-            } else if( e.getName().equals("thumbnail") ) {
-                try{
-                    pm.setThumbnailUrl( new URL( e.getText() ) );
-                } catch( Exception ex ){
-                    LOG.warning( "Unable to parse thumnail: "+ e.getText() + " "+ ex.toString());
+            } else if (e.getName().equals("thumbnail")) {
+                try {
+                    pm.setThumbnailUrl(new URL(e.getText()));
+                } catch (final Exception ex) {
+                    LOG.warning("Unable to parse thumnail: " + e.getText() + " " + ex.toString());
                 }
-            } else if( e.getName().equals("image") ) {
-                try{
-                    pm.setImageUrl( new URL( e.getText() ) );
-                } catch( Exception ex ){
-                    LOG.warning( "Unable to parse image: "+ e.getText() + " "+ ex.toString());
+            } else if (e.getName().equals("image")) {
+                try {
+                    pm.setImageUrl(new URL(e.getText()));
+                } catch (final Exception ex) {
+                    LOG.warning("Unable to parse image: " + e.getText() + " " + ex.toString());
                 }
-            } else if( e.getName().equals("metadata") ) {
+            } else if (e.getName().equals("metadata")) {
                 String comments = "";
                 PhotoDate photoDate = null;
-                if( e.getChildText( "PhotoDate") != null ){
-                    try{
-                        photoDate = new PhotoDate( Double.parseDouble( e.getChildText("PhotoDate")));
-                    } catch( Exception ex ){
-                        LOG.warning( "Unable to parse PhotoDate: "+ e.getText() + " "+ ex.toString());
+                if (e.getChildText("PhotoDate") != null) {
+                    try {
+                        photoDate = new PhotoDate(Double.parseDouble(e.getChildText("PhotoDate")));
+                    } catch (final Exception ex) {
+                        LOG.warning("Unable to parse PhotoDate: " + e.getText() + " " + ex.toString());
                     }
                 }
-                if( e.getChildText("Comments") != null ){
+                if (e.getChildText("Comments") != null) {
                     comments = e.getChildText("Comments");
                 }
-                pm.setMetadata( new Metadata( photoDate, comments) );
+                pm.setMetadata(new Metadata(photoDate, comments));
             }
         }
         return pm;
@@ -131,5 +135,5 @@ public class Parser implements ModuleParser {
     public String getNamespaceUri() {
         return PhotocastModule.URI;
     }
-    
+
 }
diff --git a/src/main/java/org/rometools/feed/module/photocast/types/Metadata.java b/src/main/java/org/rometools/feed/module/photocast/types/Metadata.java
index 0542e97..81bef28 100644
--- a/src/main/java/org/rometools/feed/module/photocast/types/Metadata.java
+++ b/src/main/java/org/rometools/feed/module/photocast/types/Metadata.java
@@ -3,7 +3,7 @@
  *
  * Created on March 30, 2006, 6:16 PM
  *
-  *
+ *
  * This library is provided under dual licenses.
  * You may choose the terms of the Lesser General Public License or the Apache
  * License at your discretion.
@@ -45,27 +45,29 @@ import com.sun.syndication.feed.impl.EqualsBean;
 import com.sun.syndication.feed.impl.ToStringBean;
 
 /**
- * This is an immutable class representing
- * the apple-wallpapers:metadata tag in the photocast module.
+ * This is an immutable class representing the apple-wallpapers:metadata tag in the photocast module.
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class Metadata {
-    
-    private PhotoDate photoDate;
-    private String comments;
-    
+
+    private final PhotoDate photoDate;
+    private final String comments;
+
     /**
      * Creates a new instance of Metadata with a set photoDate and comments value.
+     * 
      * @param photoDate PhotoDate value to use
      * @param comments comments about this photo.
      */
-    public Metadata(PhotoDate photoDate, String comments) {
+    public Metadata(final PhotoDate photoDate, final String comments) {
         this.photoDate = photoDate == null ? new PhotoDate() : photoDate;
-        this.comments = comments == null ? "" : comments;        
+        this.comments = comments == null ? "" : comments;
     }
 
     /**
      * Returns the PhotoDate value.
+     * 
      * @return Returns the PhotoDate value.
      */
     public PhotoDate getPhotoDate() {
@@ -74,29 +76,35 @@ public class Metadata {
 
     /**
      * Returns comments about the photo.
+     * 
      * @return Returns comments about the photo.
      */
     public String getComments() {
         return comments;
     }
+
     /**
      * Returns a String representation of the metadata object.
+     * 
      * @return Returns a String representation of the metadata object.
      */
+    @Override
     public String toString() {
-        ToStringBean tsBean = new ToStringBean(Metadata.class, this);
+        final ToStringBean tsBean = new ToStringBean(Metadata.class, this);
 
         return tsBean.toString();
     }
 
-    public boolean equals(Object obj) {
-        EqualsBean eBean = new EqualsBean(Metadata.class, this);
+    @Override
+    public boolean equals(final Object obj) {
+        final EqualsBean eBean = new EqualsBean(Metadata.class, this);
 
         return eBean.beanEquals(obj);
     }
 
+    @Override
     public int hashCode() {
-        EqualsBean equals = new EqualsBean(Metadata.class, this);
+        final EqualsBean equals = new EqualsBean(Metadata.class, this);
 
         return equals.beanHashCode();
     }
diff --git a/src/main/java/org/rometools/feed/module/photocast/types/PhotoDate.java b/src/main/java/org/rometools/feed/module/photocast/types/PhotoDate.java
index 51b3773..0aef960 100644
--- a/src/main/java/org/rometools/feed/module/photocast/types/PhotoDate.java
+++ b/src/main/java/org/rometools/feed/module/photocast/types/PhotoDate.java
@@ -3,7 +3,7 @@
  *
  * Created on March 30, 2006, 5:53 PM
  *
-  *
+ *
  * This library is provided under dual licenses.
  * You may choose the terms of the Lesser General Public License or the Apache
  * License at your discretion.
@@ -45,60 +45,63 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * This is a specialized Date class for working with the apple PhotoDate format.
- * It provides a constructor taking a dobule value representing the fractional 
+ * This is a specialized Date class for working with the apple PhotoDate format. It provides a constructor taking a dobule value representing the fractional
  * number of days since 00:00:00 01/01/00.
+ * 
  * @author Robert "kebernet" Cooper
  */
-public class PhotoDate extends Date{
-    
-    private static final long Y2K =  946616400531l;
+public class PhotoDate extends Date {
+
+    private static final long Y2K = 946616400531l;
     private static final double DAY = 24 * 60 * 60 * 1000;
+
     /** Creates a new instance of PhotoDate */
     public PhotoDate() {
         super();
     }
-    
+
     /**
      * Creates a new instance of PhotoDate with the timestamp provided.
+     * 
      * @param time milliseconds time
      */
-    public PhotoDate( long time ){
-        super( time );
+    public PhotoDate(final long time) {
+        super(time);
     }
-    
+
     /**
-     * Creates a new instance of PhotoDate with the fractional 
-     * number of days since 00:00:00 01/01/00.
+     * Creates a new instance of PhotoDate with the fractional number of days since 00:00:00 01/01/00.
+     * 
      * @param photoDateValue fractional number of days since 00:00:00 01/01/00
      */
-    public PhotoDate( double photoDateValue ){
+    public PhotoDate(final double photoDateValue) {
         BigDecimal d = new BigDecimal(photoDateValue);
-        d = d.multiply( new BigDecimal( DAY ) );
-        d = d.add( new BigDecimal( Y2K) );
-        this.setTime( d.longValue() );
+        d = d.multiply(new BigDecimal(DAY));
+        d = d.add(new BigDecimal(Y2K));
+        setTime(d.longValue());
     }
-    
+
     /**
-     * Returns a string representing the fractional 
-     * number of days since 00:00:00 01/01/00.
-     * @return Returns a string representing the fractional 
-     * number of days since 00:00:00 01/01/00.
+     * Returns a string representing the fractional number of days since 00:00:00 01/01/00.
+     * 
+     * @return Returns a string representing the fractional number of days since 00:00:00 01/01/00.
      */
-    public String toString(){
-        BigDecimal d = new BigDecimal( this.getTime() );  
-        d = d.subtract( new BigDecimal( Y2K) );     
-        d = d.multiply( new BigDecimal( 1000000 ) );
-        d = d.divide( new BigDecimal(DAY) , BigDecimal.ROUND_HALF_UP);
-        return d.divide( new BigDecimal(1000000), 7, BigDecimal.ROUND_HALF_UP).toString();
+    @Override
+    public String toString() {
+        BigDecimal d = new BigDecimal(getTime());
+        d = d.subtract(new BigDecimal(Y2K));
+        d = d.multiply(new BigDecimal(1000000));
+        d = d.divide(new BigDecimal(DAY), BigDecimal.ROUND_HALF_UP);
+        return d.divide(new BigDecimal(1000000), 7, BigDecimal.ROUND_HALF_UP).toString();
     }
-    
-    public boolean equals( Object o ){
-        if( o instanceof Date || ((Date)o).getTime()/1000 == this.getTime()/1000 )
+
+    @Override
+    public boolean equals(final Object o) {
+        if (o instanceof Date || ((Date) o).getTime() / 1000 == getTime() / 1000) {
             return true;
-        else
+        } else {
             return false;
+        }
     }
-   
-    
+
 }
diff --git a/src/main/java/org/rometools/feed/module/portablecontacts/ContactModule.java b/src/main/java/org/rometools/feed/module/portablecontacts/ContactModule.java
index 934f6c9..b768510 100644
--- a/src/main/java/org/rometools/feed/module/portablecontacts/ContactModule.java
+++ b/src/main/java/org/rometools/feed/module/portablecontacts/ContactModule.java
@@ -18,7 +18,7 @@
 package org.rometools.feed.module.portablecontacts;
 
 /**
- *
+ * 
  * @author robert.cooper
  */
 public interface ContactModule {
diff --git a/src/main/java/org/rometools/feed/module/portablecontacts/types/Address.java b/src/main/java/org/rometools/feed/module/portablecontacts/types/Address.java
index 2ee2b90..8c331c5 100644
--- a/src/main/java/org/rometools/feed/module/portablecontacts/types/Address.java
+++ b/src/main/java/org/rometools/feed/module/portablecontacts/types/Address.java
@@ -18,7 +18,7 @@
 package org.rometools.feed.module.portablecontacts.types;
 
 /**
- *
+ * 
  * @author robert.cooper
  */
 public class Address {
diff --git a/src/main/java/org/rometools/feed/module/slash/Slash.java b/src/main/java/org/rometools/feed/module/slash/Slash.java
index 3b1e545..bbd5019 100644
--- a/src/main/java/org/rometools/feed/module/slash/Slash.java
+++ b/src/main/java/org/rometools/feed/module/slash/Slash.java
@@ -40,31 +40,34 @@
 
 package org.rometools.feed.module.slash;
 
-import com.sun.syndication.feed.module.Module;
 import java.io.Serializable;
 
-/** This interface represents the Slash RSS extension.
+import com.sun.syndication.feed.module.Module;
+
+/**
+ * This interface represents the Slash RSS extension.
+ * 
  * @version $Revision: 1.2 $
  * @author Robert "kebernet" Cooper
  */
 public interface Slash extends Module, Serializable {
-    
+
     public static final String URI = "http://purl.org/rss/1.0/modules/slash/";
-    
+
     public String getSection();
-    
+
     public void setSection(String section);
-    
+
     public String getDepartment();
-    
+
     public void setDepartment(String department);
-    
+
     public Integer getComments();
-    
-    public void setComments(Integer comments );
-    
+
+    public void setComments(Integer comments);
+
     public Integer[] getHitParade();
-    
-    public void setHitParade( Integer[] hitParade );
-    
+
+    public void setHitParade(Integer[] hitParade);
+
 }
diff --git a/src/main/java/org/rometools/feed/module/slash/SlashImpl.java b/src/main/java/org/rometools/feed/module/slash/SlashImpl.java
index 916669f..225501d 100644
--- a/src/main/java/org/rometools/feed/module/slash/SlashImpl.java
+++ b/src/main/java/org/rometools/feed/module/slash/SlashImpl.java
@@ -40,6 +40,7 @@
  */
 
 package org.rometools.feed.module.slash;
+
 import com.sun.syndication.feed.CopyFrom;
 import com.sun.syndication.feed.impl.EqualsBean;
 
@@ -48,15 +49,15 @@ import com.sun.syndication.feed.impl.EqualsBean;
  * @author Robert "kebernet" Cooper
  */
 public class SlashImpl implements Slash {
-    
+
     private String section;
-    
+
     private String department;
-    
+
     private Integer comments;
-    
+
     private Integer[] hitParade;
-    
+
     /** Creates a new instance of SlashImpl */
     public SlashImpl() {
     }
@@ -65,7 +66,7 @@ public class SlashImpl implements Slash {
         return section;
     }
 
-    public void setSection(String section) {
+    public void setSection(final String section) {
         this.section = section;
     }
 
@@ -73,7 +74,7 @@ public class SlashImpl implements Slash {
         return department;
     }
 
-    public void setDepartment(String department) {
+    public void setDepartment(final String department) {
         this.department = department;
     }
 
@@ -81,7 +82,7 @@ public class SlashImpl implements Slash {
         return comments;
     }
 
-    public void setComments(Integer comments) {
+    public void setComments(final Integer comments) {
         this.comments = comments;
     }
 
@@ -89,38 +90,36 @@ public class SlashImpl implements Slash {
         return hitParade == null ? new Integer[0] : hitParade;
     }
 
-    public void setHitParade(Integer[] hitParade) {
+    public void setHitParade(final Integer[] hitParade) {
         this.hitParade = hitParade;
     }
 
-
-    
-    public void copyFrom(CopyFrom object) {
-	Slash source =(Slash) object;
-	this.setHitParade( arrayCopy( source.getHitParade() ));
-	this.setComments( source.getComments() );
-	this.setDepartment( source.getDepartment() );
-	this.setSection( source.getSection() );	
+    public void copyFrom(final CopyFrom object) {
+        final Slash source = (Slash) object;
+        setHitParade(arrayCopy(source.getHitParade()));
+        setComments(source.getComments());
+        setDepartment(source.getDepartment());
+        setSection(source.getSection());
     }
 
+    @Override
     public Object clone() {
-	SlashImpl si = new SlashImpl();
-	si.copyFrom( this );
-	return si;
+        final SlashImpl si = new SlashImpl();
+        si.copyFrom(this);
+        return si;
     }
 
     public String getUri() {
-	return Slash.URI;
+        return Slash.URI;
     }
-    
-    
-    private Integer[] arrayCopy(Integer[] source) {
-        if(source == null) {
+
+    private Integer[] arrayCopy(final Integer[] source) {
+        if (source == null) {
             return null;
         }
 
-        Integer[] array = new Integer[ source.length ];
-        for(int i = 0; i < source.length; i++) {
+        final Integer[] array = new Integer[source.length];
+        for (int i = 0; i < source.length; i++) {
             array[i] = source[i];
         }
 
@@ -128,11 +127,12 @@ public class SlashImpl implements Slash {
     }
 
     public Class getInterface() {
-	return Slash.class;
+        return Slash.class;
     }
-    
-   public boolean equals(Object obj) {
-        EqualsBean eBean = new EqualsBean(this.getClass(),this);
+
+    @Override
+    public boolean equals(final Object obj) {
+        final EqualsBean eBean = new EqualsBean(this.getClass(), this);
 
         return eBean.beanEquals(obj);
     }
diff --git a/src/main/java/org/rometools/feed/module/slash/io/SlashModuleGenerator.java b/src/main/java/org/rometools/feed/module/slash/io/SlashModuleGenerator.java
index 5486401..bcb3e2a 100644
--- a/src/main/java/org/rometools/feed/module/slash/io/SlashModuleGenerator.java
+++ b/src/main/java/org/rometools/feed/module/slash/io/SlashModuleGenerator.java
@@ -40,64 +40,71 @@
 
 package org.rometools.feed.module.slash.io;
 
+import java.util.HashSet;
+
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.rometools.feed.module.slash.Slash;
+
 import com.sun.syndication.feed.module.Module;
 import com.sun.syndication.io.ModuleGenerator;
-import org.rometools.feed.module.slash.Slash;
-import java.util.HashSet;
-import org.jdom.Element;
-import org.jdom.Namespace;
 
-/** The ModuleGenerator implementation for the Slash plug in.
+/**
+ * The ModuleGenerator implementation for the Slash plug in.
+ * 
  * @version $Revision: 1.1 $
  * @author Robert "kebernet" Cooper
  */
 public class SlashModuleGenerator implements ModuleGenerator {
-    
+
     private static final Namespace NS = Namespace.getNamespace("slash", Slash.URI);
-    
+
     /** Creates a new instance of SlashModuleGenerator */
     public SlashModuleGenerator() {
     }
-    
-    public void generate(Module module, Element element) {
-	if( !( module instanceof Slash) )
-	    return;
-	Slash slash = (Slash) module;
-	if(slash.getComments() != null ){
-	    element.addContent( this.generateSimpleElement("comments", slash.getComments().toString()));	    
-	}
-	if(slash.getDepartment() != null){
-	    element.addContent( this.generateSimpleElement("department", slash.getDepartment()));	    
-	}
-	if(slash.getSection() != null){
-	    element.addContent( this.generateSimpleElement("section", slash.getSection()));	    
-	}
-	if(slash.getHitParade() != null && slash.getHitParade().length > 0 ){
-	    StringBuffer buff = new StringBuffer();
-	    Integer[] p = slash.getHitParade();
-	    for(int i=0; i < p.length; i++){
-		if(i!= 0)
-		    buff.append(",");
-		buff.append( p[i] );
-	    }
-	    element.addContent(this.generateSimpleElement("hit_parade", buff.toString()));
-	}
-	
+
+    public void generate(final Module module, final Element element) {
+        if (!(module instanceof Slash)) {
+            return;
+        }
+        final Slash slash = (Slash) module;
+        if (slash.getComments() != null) {
+            element.addContent(generateSimpleElement("comments", slash.getComments().toString()));
+        }
+        if (slash.getDepartment() != null) {
+            element.addContent(generateSimpleElement("department", slash.getDepartment()));
+        }
+        if (slash.getSection() != null) {
+            element.addContent(generateSimpleElement("section", slash.getSection()));
+        }
+        if (slash.getHitParade() != null && slash.getHitParade().length > 0) {
+            final StringBuffer buff = new StringBuffer();
+            final Integer[] p = slash.getHitParade();
+            for (int i = 0; i < p.length; i++) {
+                if (i != 0) {
+                    buff.append(",");
+                }
+                buff.append(p[i]);
+            }
+            element.addContent(generateSimpleElement("hit_parade", buff.toString()));
+        }
+
     }
-    
-    protected Element generateSimpleElement(String name,String value) {
-	Element element = new Element(name,SlashModuleGenerator.NS);
-	element.addContent(value);	
-	return element;
+
+    protected Element generateSimpleElement(final String name, final String value) {
+        final Element element = new Element(name, SlashModuleGenerator.NS);
+        element.addContent(value);
+        return element;
     }
+
     public java.util.Set getNamespaces() {
-	HashSet set = new HashSet();
-	set.add( SlashModuleGenerator.NS );
-	return set;
+        final HashSet set = new HashSet();
+        set.add(SlashModuleGenerator.NS);
+        return set;
     }
-    
+
     public String getNamespaceUri() {
-	return Slash.URI;
+        return Slash.URI;
     }
-    
+
 }
diff --git a/src/main/java/org/rometools/feed/module/slash/io/SlashModuleParser.java b/src/main/java/org/rometools/feed/module/slash/io/SlashModuleParser.java
index b18297f..88d80fd 100644
--- a/src/main/java/org/rometools/feed/module/slash/io/SlashModuleParser.java
+++ b/src/main/java/org/rometools/feed/module/slash/io/SlashModuleParser.java
@@ -40,64 +40,65 @@
 
 package org.rometools.feed.module.slash.io;
 
-import com.sun.syndication.feed.module.Module;
-import com.sun.syndication.io.ModuleParser;
-import com.sun.syndication.io.WireFeedParser;
+import java.util.StringTokenizer;
+
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 import org.rometools.feed.module.slash.Slash;
 import org.rometools.feed.module.slash.SlashImpl;
 
-import java.util.StringTokenizer;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import com.sun.syndication.feed.module.Module;
+import com.sun.syndication.io.ModuleParser;
 
-/** ModuleParser implementation for Slash RSS.
+/**
+ * ModuleParser implementation for Slash RSS.
+ * 
  * @version $Revision: 1.3 $
  * @author Robert "kebernet" Cooper
  */
 public class SlashModuleParser implements ModuleParser {
-    
-    private static final Namespace NS = Namespace.getNamespace( Slash.URI);
-    
+
+    private static final Namespace NS = Namespace.getNamespace(Slash.URI);
+
     /** Creates a new instance of SlashModuleParser */
     public SlashModuleParser() {
-	super();
+        super();
     }
 
     public String getNamespaceUri() {
-	return Slash.URI;
+        return Slash.URI;
     }
 
-    public Module parse(Element element) {
-	SlashImpl si = new SlashImpl();
-	Element tag = element.getChild( "hit_parade", SlashModuleParser.NS);
-	if( tag!= null ){
-	    StringTokenizer tok = new StringTokenizer( tag.getText() , ",");
-	    Integer[] hp = new Integer[tok.countTokens() ];
-	    for(int i=0; tok.hasMoreTokens(); i++ ){
-		hp[i] = new Integer( tok.nextToken() );
-	    }
-	    si.setHitParade( hp );
-	}
-	tag = null;
-	tag = element.getChild("comments", SlashModuleParser.NS);
-	if(tag != null ){
-	    si.setComments( new Integer( tag.getText() ));
-	}
-	tag = null;
-	tag = element.getChild("department", SlashModuleParser.NS);
-	if( tag != null ){
-	    si.setDepartment( tag.getText().trim() );
-	}
-	tag = null;
-	tag = element.getChild("section", SlashModuleParser.NS);
-	if( tag!= null ){
-	    si.setSection( tag.getText().trim());
-	}
-	if( si.getHitParade() != null || si.getComments() != null ||
-	    si.getDepartment() !=null || si.getSection() != null ){
-	    return si;
-	}
-	return null;
+    public Module parse(final Element element) {
+        final SlashImpl si = new SlashImpl();
+        Element tag = element.getChild("hit_parade", SlashModuleParser.NS);
+        if (tag != null) {
+            final StringTokenizer tok = new StringTokenizer(tag.getText(), ",");
+            final Integer[] hp = new Integer[tok.countTokens()];
+            for (int i = 0; tok.hasMoreTokens(); i++) {
+                hp[i] = new Integer(tok.nextToken());
+            }
+            si.setHitParade(hp);
+        }
+        tag = null;
+        tag = element.getChild("comments", SlashModuleParser.NS);
+        if (tag != null) {
+            si.setComments(new Integer(tag.getText()));
+        }
+        tag = null;
+        tag = element.getChild("department", SlashModuleParser.NS);
+        if (tag != null) {
+            si.setDepartment(tag.getText().trim());
+        }
+        tag = null;
+        tag = element.getChild("section", SlashModuleParser.NS);
+        if (tag != null) {
+            si.setSection(tag.getText().trim());
+        }
+        if (si.getHitParade() != null || si.getComments() != null || si.getDepartment() != null || si.getSection() != null) {
+            return si;
+        }
+        return null;
     }
-    
+
 }
diff --git a/src/main/java/org/rometools/feed/module/sle/SimpleListExtension.java b/src/main/java/org/rometools/feed/module/sle/SimpleListExtension.java
index b70dd98..dad5822 100644
--- a/src/main/java/org/rometools/feed/module/sle/SimpleListExtension.java
+++ b/src/main/java/org/rometools/feed/module/sle/SimpleListExtension.java
@@ -17,14 +17,14 @@
  */
 package org.rometools.feed.module.sle;
 
-import com.sun.syndication.feed.module.Module;
 import org.rometools.feed.module.sle.types.Group;
 import org.rometools.feed.module.sle.types.Sort;
 
+import com.sun.syndication.feed.module.Module;
 
-/** This is the primary module interface for the 
- * MS Simple List Extensions.
- *
+/**
+ * This is the primary module interface for the MS Simple List Extensions.
+ * 
  * @author Robert "kebernet" Cooper
  */
 public interface SimpleListExtension extends Module {
@@ -34,25 +34,35 @@ public interface SimpleListExtension extends Module {
     public static final String URI = "http://www.microsoft.com/schemas/rss/core/2005";
 
     /**
-     * The cf:group element is intended to inform the client that the property to which it refers is one that is “groupable” – that is, that the client should provide a user interface that allows the user to group or filter on the values of that property. Groupable properties should contain a small set of discrete values (e.g. book genres are perfect for groups).
+     * The cf:group element is intended to inform the client that the property to which it refers is one that is “groupable” – that is, that the client should
+     * provide a user interface that allows the user to group or filter on the values of that property. Groupable properties should contain a small set of
+     * discrete values (e.g. book genres are perfect for groups).
+     * 
      * @param groupFields Array of types.Group objects.
      */
     public void setGroupFields(Group[] groupFields);
 
     /**
-     * The cf:group element is intended to inform the client that the property to which it refers is one that is “groupable” – that is, that the client should provide a user interface that allows the user to group or filter on the values of that property. Groupable properties should contain a small set of discrete values (e.g. book genres are perfect for groups).
+     * The cf:group element is intended to inform the client that the property to which it refers is one that is “groupable” – that is, that the client should
+     * provide a user interface that allows the user to group or filter on the values of that property. Groupable properties should contain a small set of
+     * discrete values (e.g. book genres are perfect for groups).
+     * 
      * @return Array of types.Group objects.
      */
     public Group[] getGroupFields();
 
     /**
-     * The cf:sort element is intended to inform the client that the property to which it refers is one that is “sortable” – that is, that the client should provide a user interface that allows the user to sort on that property.
+     * The cf:sort element is intended to inform the client that the property to which it refers is one that is “sortable” – that is, that the client should
+     * provide a user interface that allows the user to sort on that property.
+     * 
      * @param sortFields Array of types.Sort objects
      */
     public void setSortFields(Sort[] sortFields);
 
     /**
-     * The cf:sort element is intended to inform the client that the property to which it refers is one that is “sortable” – that is, that the client should provide a user interface that allows the user to sort on that property.
+     * The cf:sort element is intended to inform the client that the property to which it refers is one that is “sortable” – that is, that the client should
+     * provide a user interface that allows the user to sort on that property.
+     * 
      * @return Array of types.Sort objects
      */
     public Sort[] getSortFields();
@@ -60,12 +70,14 @@ public interface SimpleListExtension extends Module {
     /**
      * This XML element allows the publisher of a feed document to indicate to the consumers of the feed that the feed is intended to be consumed as a list.
      * (defaults to "list" )
+     * 
      * @param value treatAs value
      */
     public void setTreatAs(String value);
 
     /**
      * This XML element allows the publisher of a feed document to indicate to the consumers of the feed that the feed is intended to be consumed as a list.
+     * 
      * @return treatAs value.
      */
     public String getTreatAs();
diff --git a/src/main/java/org/rometools/feed/module/sle/SimpleListExtensionImpl.java b/src/main/java/org/rometools/feed/module/sle/SimpleListExtensionImpl.java
index bb22956..f5f7428 100644
--- a/src/main/java/org/rometools/feed/module/sle/SimpleListExtensionImpl.java
+++ b/src/main/java/org/rometools/feed/module/sle/SimpleListExtensionImpl.java
@@ -17,11 +17,11 @@
  */
 package org.rometools.feed.module.sle;
 
-import com.sun.syndication.feed.CopyFrom;
-import com.sun.syndication.feed.module.ModuleImpl;
 import org.rometools.feed.module.sle.types.Group;
 import org.rometools.feed.module.sle.types.Sort;
 
+import com.sun.syndication.feed.CopyFrom;
+import com.sun.syndication.feed.module.ModuleImpl;
 
 /**
  * 
@@ -37,7 +37,7 @@ public class SimpleListExtensionImpl extends ModuleImpl implements SimpleListExt
         super(SimpleListExtensionImpl.class, SimpleListExtension.URI);
     }
 
-    public void setGroupFields(Group[] groupFields) {
+    public void setGroupFields(final Group[] groupFields) {
         this.groupFields = groupFields;
     }
 
@@ -48,17 +48,16 @@ public class SimpleListExtensionImpl extends ModuleImpl implements SimpleListExt
     /**
      * Returns the interface the copyFrom works on.
      * 
            
-     * This is useful when dealing with properties that may have multiple implementations.
-     * For example, Module.
+     * This is useful when dealing with properties that may have multiple implementations. For example, Module.
      * 
            
-     *
+     * 
      * @return the interface the copyFrom works on.
      */
     public Class getInterface() {
         return SimpleListExtension.class;
     }
 
-    public void setSortFields(Sort[] sortFields) {
+    public void setSortFields(final Sort[] sortFields) {
         this.sortFields = sortFields;
     }
 
@@ -66,7 +65,7 @@ public class SimpleListExtensionImpl extends ModuleImpl implements SimpleListExt
         return sortFields;
     }
 
-    public void setTreatAs(String treatAs) {
+    public void setTreatAs(final String treatAs) {
         this.treatAs = treatAs;
     }
 
@@ -77,9 +76,10 @@ public class SimpleListExtensionImpl extends ModuleImpl implements SimpleListExt
     /**
      * Returns the URI of the module.
      * 
            
-     *
+     * 
      * @return URI of the module.
      */
+    @Override
     public String getUri() {
         return SimpleListExtension.URI;
     }
@@ -89,16 +89,16 @@ public class SimpleListExtensionImpl extends ModuleImpl implements SimpleListExt
      * 
            
      * Any existing properties in this bean are lost.
      * 
            
-     * This method is useful for moving from one implementation of a bean interface to another.
-     * For example from the default SyndFeed bean implementation to a Hibernate ready implementation.
+     * This method is useful for moving from one implementation of a bean interface to another. For example from the default SyndFeed bean implementation to a
+     * Hibernate ready implementation.
      * 
            
-     *
+     * 
      * @param obj the instance to copy properties from.
      */
-    public void copyFrom(CopyFrom obj) {
-        SimpleListExtension sle = (SimpleListExtension) obj;
-        this.setGroupFields((Group[]) sle.getGroupFields().clone());
-        this.setSortFields((Sort[]) sle.getSortFields().clone());
-        this.setTreatAs(sle.getTreatAs());
+    public void copyFrom(final CopyFrom obj) {
+        final SimpleListExtension sle = (SimpleListExtension) obj;
+        setGroupFields(sle.getGroupFields().clone());
+        setSortFields(sle.getSortFields().clone());
+        setTreatAs(sle.getTreatAs());
     }
 }
diff --git a/src/main/java/org/rometools/feed/module/sle/SleEntry.java b/src/main/java/org/rometools/feed/module/sle/SleEntry.java
index 9604df3..0e630c0 100644
--- a/src/main/java/org/rometools/feed/module/sle/SleEntry.java
+++ b/src/main/java/org/rometools/feed/module/sle/SleEntry.java
@@ -17,17 +17,17 @@
  */
 package org.rometools.feed.module.sle;
 
-import com.sun.syndication.feed.module.Module;
-import org.rometools.feed.module.sle.io.*;
+import org.rometools.feed.module.sle.io.ModuleParser;
 import org.rometools.feed.module.sle.types.EntryValue;
 import org.rometools.feed.module.sle.types.Group;
 import org.rometools.feed.module.sle.types.Sort;
 
+import com.sun.syndication.feed.module.Module;
 
-/** This is a parse only module that holds the values of enternal fields declared in the SLE module.
- * These will not be persisted on an output() call, nor will changing a value here change a
- * value in another module or a foreign markup tag.
- *
+/**
+ * This is a parse only module that holds the values of enternal fields declared in the SLE module. These will not be persisted on an output()
+ * call, nor will changing a value here change a value in another module or a foreign markup tag.
+ * 
  * @author Robert "kebernet" Cooper
  */
 public interface SleEntry extends Module {
@@ -38,6 +38,7 @@ public interface SleEntry extends Module {
 
     /**
      * Returns an EntryValue for the given element name.
+     * 
      * @param element element name to look for
      * @return Returns an EntryValue for the given element name.
      */
@@ -45,12 +46,14 @@ public interface SleEntry extends Module {
 
     /**
      * An array of EntryValue objects that correspond to the grouping for the feed.
+     * 
      * @return An array of EntryValue objects that correspond to the grouping for the feed.
      */
     public EntryValue[] getGroupValues();
 
     /**
      * Returns an EntryValue for the given element name.
+     * 
      * @param element element name
      * @return Returns an EntryValue for the given element name.
      */
@@ -59,10 +62,10 @@ public interface SleEntry extends Module {
     /**
      * Returns an array of EntryValues for the fields declared in the heading.
      * 
-     * NB:
             
-     * Right now the parser will take any default=true field and change it to an 
-     * integer value representing the default order in the field. You should not
-     * rely on these values data display to a user!
+     * NB:
            
+     * Right now the parser will take any default=true field and change it to an integer value representing the default order in the field. You should not rely
+     * on these values data display to a user!
+     * 
      * @return Array of EntryValue implementations from this entry.
      */
     public EntryValue[] getSortValues();
diff --git a/src/main/java/org/rometools/feed/module/sle/SleEntryImpl.java b/src/main/java/org/rometools/feed/module/sle/SleEntryImpl.java
index 3195448..0e27011 100644
--- a/src/main/java/org/rometools/feed/module/sle/SleEntryImpl.java
+++ b/src/main/java/org/rometools/feed/module/sle/SleEntryImpl.java
@@ -17,126 +17,130 @@
  */
 package org.rometools.feed.module.sle;
 
-import com.sun.syndication.feed.CopyFrom;
-import com.sun.syndication.feed.impl.ObjectBean;
-import org.rometools.feed.module.sle.io.*;
 import org.rometools.feed.module.sle.io.LabelNamespaceElement;
+import org.rometools.feed.module.sle.io.ModuleParser;
 import org.rometools.feed.module.sle.types.EntryValue;
 import org.rometools.feed.module.sle.types.Group;
 import org.rometools.feed.module.sle.types.Sort;
 
-/**This is a parse only module that holds the values of enternal fields declared in the SLE module.
- * These will not be persisted on an output() call, nor will changing a value here change a
- * value in another module or a foreign markup tag.
- *
+import com.sun.syndication.feed.CopyFrom;
+import com.sun.syndication.feed.impl.ObjectBean;
+
+/**
+ * This is a parse only module that holds the values of enternal fields declared in the SLE module. These will not be persisted on an output()
+ * call, nor will changing a value here change a value in another module or a foreign markup tag.
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class SleEntryImpl implements SleEntry {
     private static final EntryValue[] EMPTY_VALUES = new EntryValue[0];
-    private ObjectBean obj = new ObjectBean(SleEntryImpl.class, this);
+    private final ObjectBean obj = new ObjectBean(SleEntryImpl.class, this);
     private EntryValue[] groupValues = EMPTY_VALUES;
     private EntryValue[] sortValues = EMPTY_VALUES;
-    
+
     /** Creates a new instance of SleEntryImpl */
     public SleEntryImpl() {
         super();
     }
-    
-    public EntryValue getGroupByElement(Group element) {
-        EntryValue[] values = this.getGroupValues();
-        LabelNamespaceElement compare = new LabelNamespaceElement( element.getLabel(), element.getNamespace(), element.getElement() );
-        for (int i = 0; i < values.length; i++) {
-            if( compare.equals( new LabelNamespaceElement( values[i].getLabel(), values[i].getNamespace(), values[i].getElement() )))
-                return values[i];
+
+    public EntryValue getGroupByElement(final Group element) {
+        final EntryValue[] values = getGroupValues();
+        final LabelNamespaceElement compare = new LabelNamespaceElement(element.getLabel(), element.getNamespace(), element.getElement());
+        for (final EntryValue value : values) {
+            if (compare.equals(new LabelNamespaceElement(value.getLabel(), value.getNamespace(), value.getElement()))) {
+                return value;
+            }
         }
-        
-        
+
         return null;
     }
-    
-    public void setGroupValues(EntryValue[] groupValues) {
-        this.groupValues = (groupValues == null) ? EMPTY_VALUES : groupValues;
+
+    public void setGroupValues(final EntryValue[] groupValues) {
+        this.groupValues = groupValues == null ? EMPTY_VALUES : groupValues;
     }
-    
+
     public EntryValue[] getGroupValues() {
         return groupValues;
     }
-    
+
     /**
      * Returns the interface the copyFrom works on.
      * 
            
-     * This is useful when dealing with properties that may have multiple implementations.
-     * For example, Module.
+     * This is useful when dealing with properties that may have multiple implementations. For example, Module.
      * 
            
-     *
+     * 
      * @return the interface the copyFrom works on.
      */
     public Class getInterface() {
         return SleEntry.class;
     }
-    
-    public EntryValue getSortByElement(Sort element) {
-        System.out.println("Looking for value for "+element.getLabel() + " from "+this.sortValues.length);
-        EntryValue[] values = this.getSortValues();
-        LabelNamespaceElement compare = new LabelNamespaceElement( element.getLabel(), element.getNamespace(), element.getElement() );
-        for (int i = 0; i < values.length; i++) {
-            System.out.println("Compare to value "+values[i].getLabel());
-            if( compare.equals( new LabelNamespaceElement( values[i].getLabel(), values[i].getNamespace(), values[i].getElement() ) ) ){
+
+    public EntryValue getSortByElement(final Sort element) {
+        System.out.println("Looking for value for " + element.getLabel() + " from " + sortValues.length);
+        final EntryValue[] values = getSortValues();
+        final LabelNamespaceElement compare = new LabelNamespaceElement(element.getLabel(), element.getNamespace(), element.getElement());
+        for (final EntryValue value : values) {
+            System.out.println("Compare to value " + value.getLabel());
+            if (compare.equals(new LabelNamespaceElement(value.getLabel(), value.getNamespace(), value.getElement()))) {
                 System.out.println("Match.");
-                return values[i];
+                return value;
             }
         }
-        
+
         return null;
     }
-    
-    public void setSortValues(EntryValue[] sortValues) {
+
+    public void setSortValues(final EntryValue[] sortValues) {
         this.sortValues = sortValues;
     }
-    
+
     public EntryValue[] getSortValues() {
         return sortValues;
     }
-    
+
     /**
      * Returns the URI of the module.
      * 
            
-     *
+     * 
      * @return URI of the module.
      */
     public String getUri() {
         return ModuleParser.TEMP.getURI();
     }
-    
+
+    @Override
     public Object clone() throws CloneNotSupportedException {
         return obj.clone();
     }
-    
+
     /**
      * Copies all the properties of the given bean into this one.
      * 
            
      * Any existing properties in this bean are lost.
      * 
            
-     * This method is useful for moving from one implementation of a bean interface to another.
-     * For example from the default SyndFeed bean implementation to a Hibernate ready implementation.
+     * This method is useful for moving from one implementation of a bean interface to another. For example from the default SyndFeed bean implementation to a
+     * Hibernate ready implementation.
      * 
            
-     *
+     * 
      * @param obj the instance to copy properties from.
      */
-    public void copyFrom(CopyFrom obj) {
-        SleEntry entry = (SleEntry) obj;
-        this.setGroupValues((EntryValue[]) entry.getGroupValues().clone());
-        this.setSortValues((EntryValue[]) entry.getSortValues().clone());
+    public void copyFrom(final CopyFrom obj) {
+        final SleEntry entry = (SleEntry) obj;
+        setGroupValues(entry.getGroupValues().clone());
+        setSortValues(entry.getSortValues().clone());
     }
-    
-    public boolean equals(Object o) {
+
+    @Override
+    public boolean equals(final Object o) {
         return obj.equals(o);
     }
-    
+
+    @Override
     public int hashCode() {
         return obj.hashCode();
     }
-    
+
+    @Override
     public String toString() {
         return obj.toString();
     }
diff --git a/src/main/java/org/rometools/feed/module/sle/SleUtility.java b/src/main/java/org/rometools/feed/module/sle/SleUtility.java
index fad2c3a..c7590d7 100644
--- a/src/main/java/org/rometools/feed/module/sle/SleUtility.java
+++ b/src/main/java/org/rometools/feed/module/sle/SleUtility.java
@@ -17,166 +17,165 @@
  */
 package org.rometools.feed.module.sle;
 
-import com.sun.syndication.feed.module.Extendable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.jdom2.Document;
 import org.rometools.feed.module.sle.io.ModuleParser;
 import org.rometools.feed.module.sle.types.Group;
 import org.rometools.feed.module.sle.types.Sort;
+
+import com.sun.syndication.feed.module.Extendable;
 import com.sun.syndication.feed.synd.SyndFeed;
 import com.sun.syndication.io.FeedException;
 import com.sun.syndication.io.SyndFeedInput;
 import com.sun.syndication.io.SyndFeedOutput;
 import com.sun.syndication.io.impl.ModuleGenerators;
-import org.jdom.Document;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 
 /**
  * This is a utiltiy class for grouping and sorting lists of entries based on the SLE.
- *
+ * 
  * 
            
- * Note, this class can ONLY be used on parsed feeds, unless you manually add
- * the appropriate SleEntry objects on the items.
+ * Note, this class can ONLY be used on parsed feeds, unless you manually add the appropriate SleEntry objects on the items.
  * 
            
+ * 
  * @author Robert "kebernet" Cooper
  * @see SleEntry
  */
 public class SleUtility {
     private static final String ITEM_MODULE_GENERATORS_POSFIX_KEY = ".item.ModuleGenerator.classes";
-    
+
     /** Creates a new instance of GroupAndSort */
     private SleUtility() {
         super();
     }
-    
+
     /**
      * Groups values by the groups from the SLE.
+     * 
      * @param values List of Extendable implementations to group.
      * @param groups Group fields (from the SimpleListExtension module)
      * @return Grouped list of entries.
      */
-    public static List group(List values, Group[] groups) {
-        SortableList list = (values instanceof SortableList) ? (SortableList) values : new SortableList(values);
-        GroupStrategy gs = new GroupStrategy();
-        
+    public static List group(final List values, final Group[] groups) {
+        final SortableList list = values instanceof SortableList ? (SortableList) values : new SortableList(values);
+        final GroupStrategy gs = new GroupStrategy();
+
         for (int i = groups.length - 1; i >= 0; i--) {
             list.sortOnProperty(groups[i], true, gs);
         }
-        
+
         return list;
     }
-    
+
     /**
      * Sorts a list of values based on a given sort field using a selection sort.
+     * 
      * @param values List of values (implements Extendable) to sort.
      * @param sort The sort field to sort on.
      * @param ascending Sort ascending/descending.
      * @return Sorted list of values
      */
-    public static List sort(List values, Sort sort, boolean ascending) {
-        SortableList list = (values instanceof SortableList) ? (SortableList) values : new SortableList(values);
+    public static List sort(final List values, final Sort sort, final boolean ascending) {
+        final SortableList list = values instanceof SortableList ? (SortableList) values : new SortableList(values);
         list.sortOnProperty(sort, ascending, new SortStrategy());
-        
+
         return list;
     }
-    
+
     /**
      * Sorts and groups a set of entries.
+     * 
      * @param values List of Extendable implementations.
      * @param groups Group items to group by.
      * @param sort Field to sort on.
      * @param ascending Sort ascending/descending
      * @return Grouped and sorted list of entries.
      */
-    public static List sortAndGroup(List values, Group[] groups, Sort sort, boolean ascending) {
+    public static List sortAndGroup(final List values, final Group[] groups, final Sort sort, final boolean ascending) {
         List list = sort(values, sort, ascending);
         list = group(list, groups);
-        
+
         return list;
     }
-    
-    /** This method will take a SyndFeed object with a SimpleListExtension on it and populate the entries
-     * with current SleEntry values for sorting and grouping.
-     * NB: This basically does this by re-generating the XML for all the entries then re-parsing them
-     * into the SLE data structures. It is a very heavy operation and should not be called frequently!
+
+    /**
+     * This method will take a SyndFeed object with a SimpleListExtension on it and populate the entries with current SleEntry values for sorting and grouping.
+     * NB: This basically does this by re-generating the XML for all the entries then re-parsing them into the SLE data structures. It is a very heavy
+     * operation and should not be called frequently!
      */
-    public static void initializeForSorting( SyndFeed feed )throws FeedException {
-        List syndEntries = feed.getEntries();
+    public static void initializeForSorting(final SyndFeed feed) throws FeedException {
+        final List syndEntries = feed.getEntries();
 
         // TODO: the null parameter below will break delegating parsers and generators
-        ModuleGenerators g =
-                new ModuleGenerators( feed.getFeedType() + ITEM_MODULE_GENERATORS_POSFIX_KEY,
-                        null);
-        SyndFeedOutput o = new SyndFeedOutput();
-        Document d = o.outputJDom( feed );
-        SyndFeed feed2 = new SyndFeedInput().build( d );
-        feed.copyFrom( feed2 );
+        final ModuleGenerators g = new ModuleGenerators(feed.getFeedType() + ITEM_MODULE_GENERATORS_POSFIX_KEY, null);
+        final SyndFeedOutput o = new SyndFeedOutput();
+        final Document d = o.outputJDom(feed);
+        final SyndFeed feed2 = new SyndFeedInput().build(d);
+        feed.copyFrom(feed2);
     }
-    
-    
-    
+
     private static interface ValueStrategy {
         public Comparable getValue(Extendable o, Object valueName);
     }
-    
+
     private static class GroupStrategy implements ValueStrategy {
-        public Comparable getValue(Extendable o, Object value) {
+        public Comparable getValue(final Extendable o, final Object value) {
             Comparable oc = null;
-            
+
             try {
-                oc = (Comparable) ((SleEntry) o.getModule(ModuleParser.TEMP.getURI())).getGroupByElement((Group)value).getValue();
-            } catch (NullPointerException npe) {
+                oc = ((SleEntry) o.getModule(ModuleParser.TEMP.getURI())).getGroupByElement((Group) value).getValue();
+            } catch (final NullPointerException npe) {
                 ; // watch it go by
             }
-            
+
             return oc;
         }
     }
-    
+
     private static class SortStrategy implements ValueStrategy {
-        public Comparable getValue(Extendable o, Object value) {
+        public Comparable getValue(final Extendable o, final Object value) {
             Comparable oc = null;
             try {
-                oc = (Comparable) ((SleEntry) o.getModule(ModuleParser.TEMP.getURI())).getSortByElement((Sort)value).getValue();
-            } catch (NullPointerException npe) {
+                oc = ((SleEntry) o.getModule(ModuleParser.TEMP.getURI())).getSortByElement((Sort) value).getValue();
+            } catch (final NullPointerException npe) {
                 ; // watch it go by
             }
-            
+
             return oc;
         }
     }
-    
+
     private static class SortableList extends ArrayList {
-        public SortableList(Collection c) {
+        public SortableList(final Collection c) {
             super(c);
         }
-        
+
         /**
          * performs a selection sort on all the beans in the List
          */
-        public synchronized void sortOnProperty(Object value, boolean ascending, ValueStrategy strat) {
-            Extendable temp = null;
-            
-            for (int i = 0; i < (this.size() - 1); i++) {
-                for (int j = i + 1; j < this.size(); j++) {
-                    Extendable o1 = (Extendable) this.get(i);
-                    Comparable oc1 = strat.getValue(o1, value);
-                    
-                    Extendable o2 = (Extendable) this.get(j);
-                    Comparable oc2 = strat.getValue(o2, value);
-                    System.out.println(oc1 +" < "+oc2);
+        public synchronized void sortOnProperty(final Object value, final boolean ascending, final ValueStrategy strat) {
+            final Extendable temp = null;
+
+            for (int i = 0; i < size() - 1; i++) {
+                for (int j = i + 1; j < size(); j++) {
+                    final Extendable o1 = (Extendable) get(i);
+                    final Comparable oc1 = strat.getValue(o1, value);
+
+                    final Extendable o2 = (Extendable) get(j);
+                    final Comparable oc2 = strat.getValue(o2, value);
+                    System.out.println(oc1 + " < " + oc2);
                     if (ascending) {
-                        if ((oc1 != oc2) && ((oc2 == null) || ((oc1 != null) && (oc2 != null) && (oc2.compareTo(oc1) < 0)))) { //swap
-                            this.set(i, o2);
-                            this.set(j, o1);
+                        if (oc1 != oc2 && (oc2 == null || oc1 != null && oc2 != null && oc2.compareTo(oc1) < 0)) { // swap
+                            set(i, o2);
+                            set(j, o1);
                         }
                     } else {
-                        if ((oc1 != oc2) && ((oc1 == null) || ((oc1 != null) && (oc2 != null) && (oc1.compareTo(oc2) < 0)))) { //swap
-                            
-                            this.set(i, o2);
-                            this.set(j, o1);
+                        if (oc1 != oc2 && (oc1 == null || oc1 != null && oc2 != null && oc1.compareTo(oc2) < 0)) { // swap
+
+                            set(i, o2);
+                            set(j, o1);
                         }
                     }
                 }
diff --git a/src/main/java/org/rometools/feed/module/sle/io/ItemParser.java b/src/main/java/org/rometools/feed/module/sle/io/ItemParser.java
index 5cd1578..34a6459 100644
--- a/src/main/java/org/rometools/feed/module/sle/io/ItemParser.java
+++ b/src/main/java/org/rometools/feed/module/sle/io/ItemParser.java
@@ -17,27 +17,25 @@
  */
 package org.rometools.feed.module.sle.io;
 
-import com.sun.syndication.feed.module.Module;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 import org.rometools.feed.module.sle.SleEntryImpl;
 import org.rometools.feed.module.sle.types.DateValue;
 import org.rometools.feed.module.sle.types.EntryValue;
 import org.rometools.feed.module.sle.types.NumberValue;
 import org.rometools.feed.module.sle.types.Sort;
 import org.rometools.feed.module.sle.types.StringValue;
+
+import com.sun.syndication.feed.module.Module;
 import com.sun.syndication.io.impl.DateParser;
 
-import org.jdom.Element;
-
-import java.math.BigDecimal;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import org.jdom.Namespace;
-
-
 /**
- *
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class ItemParser implements com.sun.syndication.io.ModuleParser {
@@ -49,7 +47,7 @@ public class ItemParser implements com.sun.syndication.io.ModuleParser {
     /**
      * Returns the namespace URI this parser handles.
      * 
            
-     *
+     * 
      * @return the namespace URI.
      */
     public String getNamespaceUri() {
@@ -59,66 +57,68 @@ public class ItemParser implements com.sun.syndication.io.ModuleParser {
     /**
      * Parses the XML node (JDOM element) extracting module information.
      * 
            
-     *
+     * 
      * @param element the XML node (JDOM element) to extract module information from.
      * @return a module instance, null if the element did not have module information.
      */
-    public Module parse(Element element) {
-        SleEntryImpl sle = new SleEntryImpl();
+    public Module parse(final Element element) {
+        final SleEntryImpl sle = new SleEntryImpl();
         ArrayList values = new ArrayList();
-        List groups = element.getChildren("group", ModuleParser.TEMP);
+        final List groups = element.getChildren("group", ModuleParser.TEMP);
 
-        for (int i = 0; (groups != null) && (i < groups.size()); i++) {
-            Element group = (Element) groups.get(i);
-            StringValue value = new StringValue();
+        for (int i = 0; groups != null && i < groups.size(); i++) {
+            final Element group = (Element) groups.get(i);
+            final StringValue value = new StringValue();
             value.setElement(group.getAttributeValue("element"));
             value.setLabel(group.getAttributeValue("label"));
             value.setValue(group.getAttributeValue("value"));
-            if( group.getAttributeValue("ns") != null )
-                value.setNamespace( Namespace.getNamespace(group.getAttributeValue("ns")));
-            else {
-                value.setNamespace( element.getDocument().getRootElement().getNamespace());
+            if (group.getAttributeValue("ns") != null) {
+                value.setNamespace(Namespace.getNamespace(group.getAttributeValue("ns")));
+            } else {
+                value.setNamespace(element.getDocument().getRootElement().getNamespace());
             }
             values.add(value);
             element.removeContent(group);
         }
 
         sle.setGroupValues((EntryValue[]) values.toArray(new EntryValue[values.size()]));
-        values = (values.size() == 0) ? values : new ArrayList();
+        values = values.size() == 0 ? values : new ArrayList();
 
-        List sorts = new ArrayList(element.getChildren("sort", ModuleParser.TEMP));
-        //System.out.println("]]] sorts on element"+sorts.size());
-        for (int i = 0; (sorts != null) && (i < sorts.size()); i++) {
-            Element sort = (Element) sorts.get(i);
-            String dataType = sort.getAttributeValue("data-type");
-            //System.out.println("Doing datatype "+dataType +" :: "+sorts.size());
-            if ((dataType == null) || dataType.equals(Sort.TEXT_TYPE)) {
-                StringValue value = new StringValue();
+        final List sorts = new ArrayList(element.getChildren("sort", ModuleParser.TEMP));
+        // System.out.println("]]] sorts on element"+sorts.size());
+        for (int i = 0; sorts != null && i < sorts.size(); i++) {
+            final Element sort = (Element) sorts.get(i);
+            final String dataType = sort.getAttributeValue("data-type");
+            // System.out.println("Doing datatype "+dataType +" :: "+sorts.size());
+            if (dataType == null || dataType.equals(Sort.TEXT_TYPE)) {
+                final StringValue value = new StringValue();
                 value.setElement(sort.getAttributeValue("element"));
                 value.setLabel(sort.getAttributeValue("label"));
                 value.setValue(sort.getAttributeValue("value"));
-                if( sort.getAttributeValue("ns") != null )
+                if (sort.getAttributeValue("ns") != null) {
                     value.setNamespace(Namespace.getNamespace(sort.getAttributeValue("ns")));
-                else
-                    value.setNamespace(element.getDocument().getRootElement().getNamespace() );
+                } else {
+                    value.setNamespace(element.getDocument().getRootElement().getNamespace());
+                }
                 values.add(value);
-                
+
                 element.removeContent(sort);
-                
+
             } else if (dataType.equals(Sort.DATE_TYPE)) {
-                DateValue value = new DateValue();
+                final DateValue value = new DateValue();
                 value.setElement(sort.getAttributeValue("element"));
                 value.setLabel(sort.getAttributeValue("label"));
-                if( sort.getAttributeValue("ns") != null )
+                if (sort.getAttributeValue("ns") != null) {
                     value.setNamespace(Namespace.getNamespace(sort.getAttributeValue("ns")));
-                else
-                    value.setNamespace(  element.getDocument().getRootElement().getNamespace() );
+                } else {
+                    value.setNamespace(element.getDocument().getRootElement().getNamespace());
+                }
                 Date dateValue = null;
 
                 try {
                     dateValue = DateParser.parseRFC822(sort.getAttributeValue("value"));
-                    dateValue = (dateValue == null) ? DateParser.parseW3CDateTime(sort.getAttributeValue("value")) : dateValue;
-                } catch (Exception e) {
+                    dateValue = dateValue == null ? DateParser.parseW3CDateTime(sort.getAttributeValue("value")) : dateValue;
+                } catch (final Exception e) {
                     ; // ignore parse exceptions
                 }
 
@@ -126,17 +126,18 @@ public class ItemParser implements com.sun.syndication.io.ModuleParser {
                 values.add(value);
                 element.removeContent(sort);
             } else if (dataType.equals(Sort.NUMBER_TYPE)) {
-                NumberValue value = new NumberValue();
+                final NumberValue value = new NumberValue();
                 value.setElement(sort.getAttributeValue("element"));
                 value.setLabel(sort.getAttributeValue("label"));
-                if( sort.getAttributeValue("ns") != null )
+                if (sort.getAttributeValue("ns") != null) {
                     value.setNamespace(Namespace.getNamespace(sort.getAttributeValue("ns")));
-                else
-                    value.setNamespace( element.getDocument().getRootElement().getNamespace() );
-                
+                } else {
+                    value.setNamespace(element.getDocument().getRootElement().getNamespace());
+                }
+
                 try {
                     value.setValue(new BigDecimal(sort.getAttributeValue("value")));
-                } catch (NumberFormatException nfe) {
+                } catch (final NumberFormatException nfe) {
                     ; // ignore
                     values.add(value);
                     element.removeContent(sort);
@@ -145,7 +146,7 @@ public class ItemParser implements com.sun.syndication.io.ModuleParser {
                 throw new RuntimeException("Unknown datatype");
             }
         }
-        //System.out.println("Values created "+values.size()+" from sorts" +sorts.size());
+        // System.out.println("Values created "+values.size()+" from sorts" +sorts.size());
         sle.setSortValues((EntryValue[]) values.toArray(new EntryValue[values.size()]));
 
         return sle;
diff --git a/src/main/java/org/rometools/feed/module/sle/io/LabelNamespaceElement.java b/src/main/java/org/rometools/feed/module/sle/io/LabelNamespaceElement.java
index e9dd244..83a7fe5 100644
--- a/src/main/java/org/rometools/feed/module/sle/io/LabelNamespaceElement.java
+++ b/src/main/java/org/rometools/feed/module/sle/io/LabelNamespaceElement.java
@@ -1,26 +1,23 @@
 package org.rometools.feed.module.sle.io;
 
-import com.sun.syndication.feed.impl.ObjectBean;
-import org.jdom.Namespace;
-
+import org.jdom2.Namespace;
 
 public class LabelNamespaceElement {
     private String element;
     private String label;
     private Namespace namespace;
-    
-    
-    public LabelNamespaceElement(String label, Namespace namespace, String element){
+
+    public LabelNamespaceElement(final String label, final Namespace namespace, final String element) {
         this.element = element;
         this.label = label;
         this.namespace = namespace;
     }
-    
+
     public String getElement() {
         return element;
     }
 
-    public void setElement(String element) {
+    public void setElement(final String element) {
         this.element = element;
     }
 
@@ -28,7 +25,7 @@ public class LabelNamespaceElement {
         return label;
     }
 
-    public void setLabel(String label) {
+    public void setLabel(final String label) {
         this.label = label;
     }
 
@@ -36,11 +33,12 @@ public class LabelNamespaceElement {
         return namespace;
     }
 
-    public void setNamespace(Namespace namespace) {
+    public void setNamespace(final Namespace namespace) {
         this.namespace = namespace;
     }
 
-    public boolean equals(Object obj) {
+    @Override
+    public boolean equals(final Object obj) {
         if (obj == null) {
             return false;
         }
@@ -48,31 +46,29 @@ public class LabelNamespaceElement {
             return false;
         }
         final LabelNamespaceElement other = (LabelNamespaceElement) obj;
-        if ((this.element == null) ? (other.element != null) : !this.element.equals(other.element)) {
-            System.out.println("E "+this.element+" != "+other.element);
+        if (element == null ? other.element != null : !element.equals(other.element)) {
+            System.out.println("E " + element + " != " + other.element);
             return false;
         }
-        if ((this.label == null) ? (other.label != null) : !this.label.equals(other.label)) {
+        if (label == null ? other.label != null : !label.equals(other.label)) {
             System.out.println("L");
             return false;
         }
-        if (this.namespace != other.namespace && (this.namespace == null || !this.namespace.equals(other.namespace))) {
+        if (namespace != other.namespace && (namespace == null || !namespace.equals(other.namespace))) {
             System.out.println("N");
             return false;
         }
-       
+
         return true;
     }
 
+    @Override
     public int hashCode() {
         int hash = 7;
-        hash = 61 * hash + (this.element != null ? this.element.hashCode() : 0);
-        hash = 61 * hash + (this.label != null ? this.label.hashCode() : 0);
-        hash = 61 * hash + (this.namespace != null ? this.namespace.hashCode() : 0);
+        hash = 61 * hash + (element != null ? element.hashCode() : 0);
+        hash = 61 * hash + (label != null ? label.hashCode() : 0);
+        hash = 61 * hash + (namespace != null ? namespace.hashCode() : 0);
         return hash;
     }
 
-
-    
-   
 }
\ No newline at end of file
diff --git a/src/main/java/org/rometools/feed/module/sle/io/ModuleGenerator.java b/src/main/java/org/rometools/feed/module/sle/io/ModuleGenerator.java
index 83ffbaa..5e60fcb 100644
--- a/src/main/java/org/rometools/feed/module/sle/io/ModuleGenerator.java
+++ b/src/main/java/org/rometools/feed/module/sle/io/ModuleGenerator.java
@@ -8,20 +8,19 @@
  */
 package org.rometools.feed.module.sle.io;
 
-import com.sun.syndication.feed.module.Module;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 import org.rometools.feed.module.sle.SimpleListExtension;
 import org.rometools.feed.module.sle.types.Group;
 import org.rometools.feed.module.sle.types.Sort;
 
-import org.jdom.Element;
-import org.jdom.Namespace;
-
-import java.util.HashSet;
-import java.util.Set;
-
+import com.sun.syndication.feed.module.Module;
 
 /**
- *
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class ModuleGenerator implements com.sun.syndication.io.ModuleGenerator {
@@ -39,7 +38,7 @@ public class ModuleGenerator implements com.sun.syndication.io.ModuleGenerator {
     /**
      * Returns the namespace URI this generator handles.
      * 
            
-     *
+     * 
      * @return the namespace URI.
      */
     public String getNamespaceUri() {
@@ -49,10 +48,10 @@ public class ModuleGenerator implements com.sun.syndication.io.ModuleGenerator {
     /**
      * Returns a set with all the URIs (JDOM Namespace elements) this module generator uses.
      * 
            
-     * It is used by the the feed generators to add their namespace definition in
-     * the root element of the generated document (forward-missing of Java 5.0 Generics).
+     * It is used by the the feed generators to add their namespace definition in the root element of the generated document (forward-missing of Java 5.0
+     * Generics).
      * 
            
-     *
+     * 
      * @return a set with all the URIs (JDOM Namespace elements) this module generator uses.
      */
     public Set getNamespaces() {
@@ -62,23 +61,23 @@ public class ModuleGenerator implements com.sun.syndication.io.ModuleGenerator {
     /**
      * Generates and injectts module metadata in a XML node (JDOM element).
      * 
            
-     *
+     * 
      * @param module the module to inject into the XML node (JDOM element).
      * @param element the XML node to inject the module metadata to.
      */
-    public void generate(Module module, Element element) {
+    public void generate(final Module module, final Element element) {
         if (!(module instanceof SimpleListExtension)) {
             return;
         }
 
-        SimpleListExtension sle = (SimpleListExtension) module;
+        final SimpleListExtension sle = (SimpleListExtension) module;
         addNotNullElement(element, "treatAs", sle.getTreatAs());
 
-        Group[] groups = sle.getGroupFields();
-        Element listInfo = new Element("listinfo", ModuleParser.NS);
+        final Group[] groups = sle.getGroupFields();
+        final Element listInfo = new Element("listinfo", ModuleParser.NS);
 
-        for (int i = 0; (groups != null) && (i < groups.length); i++) {
-            Element group = new Element("group", ModuleParser.NS);
+        for (int i = 0; groups != null && i < groups.length; i++) {
+            final Element group = new Element("group", ModuleParser.NS);
 
             if (groups[i].getNamespace() != Namespace.NO_NAMESPACE) {
                 addNotNullAttribute(group, "ns", groups[i].getNamespace().getURI());
@@ -89,10 +88,10 @@ public class ModuleGenerator implements com.sun.syndication.io.ModuleGenerator {
             listInfo.addContent(group);
         }
 
-        Sort[] sorts = sle.getSortFields();
+        final Sort[] sorts = sle.getSortFields();
 
-        for (int i = 0; (sorts != null) && (i < sorts.length); i++) {
-            Element sort = new Element("sort", ModuleParser.NS);
+        for (int i = 0; sorts != null && i < sorts.length; i++) {
+            final Element sort = new Element("sort", ModuleParser.NS);
 
             if (sorts[i].getNamespace() != Namespace.NO_NAMESPACE) {
                 addNotNullAttribute(sort, "ns", sorts[i].getNamespace().getURI());
@@ -114,27 +113,27 @@ public class ModuleGenerator implements com.sun.syndication.io.ModuleGenerator {
         }
     }
 
-    protected void addNotNullAttribute(Element target, String name, Object value) {
-        if ((target == null) || (value == null)) {
+    protected void addNotNullAttribute(final Element target, final String name, final Object value) {
+        if (target == null || value == null) {
             return;
         } else {
             target.setAttribute(name, value.toString());
         }
     }
 
-    protected Element addNotNullElement(Element target, String name, Object value) {
+    protected Element addNotNullElement(final Element target, final String name, final Object value) {
         if (value == null) {
             return null;
         } else {
-            Element e = generateSimpleElement(name, value.toString());
+            final Element e = generateSimpleElement(name, value.toString());
             target.addContent(e);
 
             return e;
         }
     }
 
-    protected Element generateSimpleElement(String name, String value) {
-        Element element = new Element(name, ModuleParser.NS);
+    protected Element generateSimpleElement(final String name, final String value) {
+        final Element element = new Element(name, ModuleParser.NS);
         element.addContent(value);
 
         return element;
diff --git a/src/main/java/org/rometools/feed/module/sle/io/ModuleParser.java b/src/main/java/org/rometools/feed/module/sle/io/ModuleParser.java
index cc8faee..bc5f39c 100644
--- a/src/main/java/org/rometools/feed/module/sle/io/ModuleParser.java
+++ b/src/main/java/org/rometools/feed/module/sle/io/ModuleParser.java
@@ -17,21 +17,20 @@
  */
 package org.rometools.feed.module.sle.io;
 
-import com.sun.syndication.feed.module.Module;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 import org.rometools.feed.module.sle.SimpleListExtension;
 import org.rometools.feed.module.sle.SimpleListExtensionImpl;
 import org.rometools.feed.module.sle.types.Group;
 import org.rometools.feed.module.sle.types.Sort;
 
-import org.jdom.Element;
-import org.jdom.Namespace;
-
-import java.util.ArrayList;
-import java.util.List;
-
+import com.sun.syndication.feed.module.Module;
 
 /**
- *
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class ModuleParser implements com.sun.syndication.io.ModuleParser {
@@ -46,7 +45,7 @@ public class ModuleParser implements com.sun.syndication.io.ModuleParser {
     /**
      * Returns the namespace URI this parser handles.
      * 
            
-     *
+     * 
      * @return the namespace URI.
      */
     public String getNamespaceUri() {
@@ -56,43 +55,43 @@ public class ModuleParser implements com.sun.syndication.io.ModuleParser {
     /**
      * Parses the XML node (JDOM element) extracting module information.
      * 
            
-     *
+     * 
      * @param element the XML node (JDOM element) to extract module information from.
      * @return a module instance, null if the element did not have module information.
      */
-    public Module parse(Element element) {
+    public Module parse(final Element element) {
         if (element.getChild("treatAs", NS) == null) {
             return null;
         }
 
-        SimpleListExtension sle = new SimpleListExtensionImpl();
+        final SimpleListExtension sle = new SimpleListExtensionImpl();
         sle.setTreatAs(element.getChildText("treatAs", NS));
 
-        Element listInfo = element.getChild("listinfo", NS);
-        List groups = listInfo.getChildren("group", NS);
+        final Element listInfo = element.getChild("listinfo", NS);
+        final List groups = listInfo.getChildren("group", NS);
         ArrayList values = new ArrayList();
 
-        for (int i = 0; (groups != null) && (i < groups.size()); i++) {
-            Element ge = (Element) groups.get(i);
-            Namespace ns = (ge.getAttribute("ns") == null) ? element.getNamespace() : Namespace.getNamespace(ge.getAttributeValue("ns"));
-            String elementName = ge.getAttributeValue("element");
-            String label = ge.getAttributeValue("label");
+        for (int i = 0; groups != null && i < groups.size(); i++) {
+            final Element ge = (Element) groups.get(i);
+            final Namespace ns = ge.getAttribute("ns") == null ? element.getNamespace() : Namespace.getNamespace(ge.getAttributeValue("ns"));
+            final String elementName = ge.getAttributeValue("element");
+            final String label = ge.getAttributeValue("label");
             values.add(new Group(ns, elementName, label));
         }
 
         sle.setGroupFields((Group[]) values.toArray(new Group[values.size()]));
-        values = (values.size() == 0) ? values : new ArrayList();
+        values = values.size() == 0 ? values : new ArrayList();
 
-        List sorts = listInfo.getChildren("sort", NS);
+        final List sorts = listInfo.getChildren("sort", NS);
 
-        for (int i = 0; (sorts != null) && (i < sorts.size()); i++) {
-            Element se = (Element) sorts.get(i);
-            System.out.println("Parse cf:sort "+se.getAttributeValue("element")+se.getAttributeValue("data-type"));
-            Namespace ns = (se.getAttributeValue("ns") == null) ? element.getNamespace() : Namespace.getNamespace(se.getAttributeValue("ns"));
-            String elementName = se.getAttributeValue("element");
-            String label = se.getAttributeValue("label");
-            String dataType = se.getAttributeValue("data-type");
-            boolean defaultOrder = (se.getAttributeValue("default") == null) ? false : new Boolean(se.getAttributeValue("default")).booleanValue();
+        for (int i = 0; sorts != null && i < sorts.size(); i++) {
+            final Element se = (Element) sorts.get(i);
+            System.out.println("Parse cf:sort " + se.getAttributeValue("element") + se.getAttributeValue("data-type"));
+            final Namespace ns = se.getAttributeValue("ns") == null ? element.getNamespace() : Namespace.getNamespace(se.getAttributeValue("ns"));
+            final String elementName = se.getAttributeValue("element");
+            final String label = se.getAttributeValue("label");
+            final String dataType = se.getAttributeValue("data-type");
+            final boolean defaultOrder = se.getAttributeValue("default") == null ? false : new Boolean(se.getAttributeValue("default")).booleanValue();
             values.add(new Sort(ns, elementName, dataType, label, defaultOrder));
         }
 
@@ -102,74 +101,74 @@ public class ModuleParser implements com.sun.syndication.io.ModuleParser {
         return sle;
     }
 
-    protected void addNotNullAttribute(Element target, String name, Object value) {
-        if ((target == null) || (value == null)) {
+    protected void addNotNullAttribute(final Element target, final String name, final Object value) {
+        if (target == null || value == null) {
             return;
         } else {
             target.setAttribute(name, value.toString());
         }
     }
 
-    public void insertValues(SimpleListExtension sle, List elements) {
-        for (int i = 0; (elements != null) && (i < elements.size()); i++) {
-            Element e = (Element) elements.get(i);
-            Group[] groups = sle.getGroupFields();
+    public void insertValues(final SimpleListExtension sle, final List elements) {
+        for (int i = 0; elements != null && i < elements.size(); i++) {
+            final Element e = (Element) elements.get(i);
+            final Group[] groups = sle.getGroupFields();
 
-            for (int g = 0; g < groups.length; g++) {
-                Element value = e.getChild(groups[g].getElement(), groups[g].getNamespace());
+            for (final Group group2 : groups) {
+                final Element value = e.getChild(group2.getElement(), group2.getNamespace());
 
                 if (value == null) {
                     continue;
                 }
 
-                Element group = new Element("group", TEMP);
-                addNotNullAttribute(group, "element", groups[g].getElement());
-                addNotNullAttribute(group, "label", groups[g].getLabel());
+                final Element group = new Element("group", TEMP);
+                addNotNullAttribute(group, "element", group2.getElement());
+                addNotNullAttribute(group, "label", group2.getLabel());
                 addNotNullAttribute(group, "value", value.getText());
-                addNotNullAttribute(group, "ns", groups[g].getNamespace().getURI() );
-                
+                addNotNullAttribute(group, "ns", group2.getNamespace().getURI());
+
                 e.addContent(group);
             }
 
-            Sort[] sorts = sle.getSortFields();
+            final Sort[] sorts = sle.getSortFields();
 
-            for (int s = 0; s < sorts.length; s++) {
-                System.out.println("Inserting for "+sorts[s].getElement()+" "+sorts[s].getDataType());
-                Element sort = new Element("sort", TEMP);
-                // this is the default sort order, so I am just going to ignore 
-                // the actual values and add a number type. It really shouldn't 
+            for (final Sort sort2 : sorts) {
+                System.out.println("Inserting for " + sort2.getElement() + " " + sort2.getDataType());
+                final Element sort = new Element("sort", TEMP);
+                // this is the default sort order, so I am just going to ignore
+                // the actual values and add a number type. It really shouldn't
                 // work this way. I should be checking to see if any of the elements
                 // defined have a value then use that value. This will preserve the
                 // sort order, however, if anyone is using the SleEntry to display
                 // the value of the field, it will not give the correct value.
-                // This, however, would require knowledge in the item parser that I don't 
+                // This, however, would require knowledge in the item parser that I don't
                 // have right now.
-                if (sorts[s].getDefaultOrder()) {
-                    sort.setAttribute("label", sorts[s].getLabel());
+                if (sort2.getDefaultOrder()) {
+                    sort.setAttribute("label", sort2.getLabel());
                     sort.setAttribute("value", Integer.toString(i));
                     sort.setAttribute("data-type", Sort.NUMBER_TYPE);
                     e.addContent(sort);
 
                     continue;
                 }
-                //System.out.println(e.getName());
-                Element value = e.getChild(sorts[s].getElement(), sorts[s].getNamespace());
-                if(value == null ){
-                    System.out.println("No value for "+sorts[s].getElement()+" : "+sorts[s].getNamespace());
+                // System.out.println(e.getName());
+                final Element value = e.getChild(sort2.getElement(), sort2.getNamespace());
+                if (value == null) {
+                    System.out.println("No value for " + sort2.getElement() + " : " + sort2.getNamespace());
                 } else {
-                    System.out.println(sorts[s].getElement() +" value: "+value.getText());
+                    System.out.println(sort2.getElement() + " value: " + value.getText());
                 }
                 if (value == null) {
                     continue;
                 }
 
-                addNotNullAttribute(sort, "label", sorts[s].getLabel());
-                addNotNullAttribute(sort, "element", sorts[s].getElement());
+                addNotNullAttribute(sort, "label", sort2.getLabel());
+                addNotNullAttribute(sort, "element", sort2.getElement());
                 addNotNullAttribute(sort, "value", value.getText());
-                addNotNullAttribute(sort, "data-type", sorts[s].getDataType());
-                addNotNullAttribute(sort, "ns", sorts[s].getNamespace().getURI() );
+                addNotNullAttribute(sort, "data-type", sort2.getDataType());
+                addNotNullAttribute(sort, "ns", sort2.getNamespace().getURI());
                 e.addContent(sort);
-                System.out.println("Added "+sort+" "+sorts[s].getLabel()+" = "+value.getText());
+                System.out.println("Added " + sort + " " + sort2.getLabel() + " = " + value.getText());
             }
         }
     }
diff --git a/src/main/java/org/rometools/feed/module/sle/types/DateValue.java b/src/main/java/org/rometools/feed/module/sle/types/DateValue.java
index 46b732e..8b4d726 100644
--- a/src/main/java/org/rometools/feed/module/sle/types/DateValue.java
+++ b/src/main/java/org/rometools/feed/module/sle/types/DateValue.java
@@ -17,22 +17,24 @@
  */
 package org.rometools.feed.module.sle.types;
 
-import com.sun.syndication.feed.impl.ObjectBean;
-
 import java.util.Date;
-import org.jdom.Namespace;
 
+import org.jdom2.Namespace;
+
+import com.sun.syndication.feed.impl.ObjectBean;
 
 /**
  * An EntryValue implementation representing a "date" data-type.
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class DateValue implements EntryValue {
     private Date value;
-    private ObjectBean obj = new ObjectBean(DateValue.class, this);
+    private final ObjectBean obj = new ObjectBean(DateValue.class, this);
     private String element;
     private String label;
     private Namespace namespace = Namespace.XML_NAMESPACE;
+
     /** Creates a new instance of DateValue */
     public DateValue() {
         super();
@@ -40,15 +42,15 @@ public class DateValue implements EntryValue {
 
     /**
      * 
-     * @param element 
+     * @param element
      */
-    public void setElement(String element) {
+    public void setElement(final String element) {
         this.element = element;
     }
 
     /**
      * 
-     * @return 
+     * @return
      */
     public String getElement() {
         return element;
@@ -56,15 +58,15 @@ public class DateValue implements EntryValue {
 
     /**
      * 
-     * @param label 
+     * @param label
      */
-    public void setLabel(String label) {
+    public void setLabel(final String label) {
         this.label = label;
     }
 
     /**
      * 
-     * @return 
+     * @return
      */
     public String getLabel() {
         return label;
@@ -72,46 +74,50 @@ public class DateValue implements EntryValue {
 
     /**
      * 
-     * @param value 
+     * @param value
      */
-    public void setValue(Date value) {
+    public void setValue(final Date value) {
         this.value = value;
     }
 
     /**
      * 
-     * @return 
+     * @return
      */
     public Comparable getValue() {
         return value;
     }
 
+    @Override
     public Object clone() {
-        DateValue clone = new DateValue();
-        clone.setElement(this.getElement());
-        clone.setLabel(this.getLabel());
-        clone.setValue(this.value);
-        clone.setNamespace( this.namespace );
+        final DateValue clone = new DateValue();
+        clone.setElement(getElement());
+        clone.setLabel(getLabel());
+        clone.setValue(value);
+        clone.setNamespace(namespace);
         return clone;
     }
 
-    public boolean equals(Object o) {
+    @Override
+    public boolean equals(final Object o) {
         return obj.equals(o);
     }
 
+    @Override
     public int hashCode() {
         return obj.hashCode();
     }
 
+    @Override
     public String toString() {
-        return "[Namespace: "+ namespace+ " Element:" + element + " Label:" + label + " Value:" + value + "]";
+        return "[Namespace: " + namespace + " Element:" + element + " Label:" + label + " Value:" + value + "]";
     }
 
     public Namespace getNamespace() {
         return namespace;
     }
 
-    public void setNamespace(Namespace namespace) {
-        this.namespace = namespace == null ? Namespace.XML_NAMESPACE : namespace ;
+    public void setNamespace(final Namespace namespace) {
+        this.namespace = namespace == null ? Namespace.XML_NAMESPACE : namespace;
     }
 }
diff --git a/src/main/java/org/rometools/feed/module/sle/types/EntryValue.java b/src/main/java/org/rometools/feed/module/sle/types/EntryValue.java
index b10152a..b76fbce 100644
--- a/src/main/java/org/rometools/feed/module/sle/types/EntryValue.java
+++ b/src/main/java/org/rometools/feed/module/sle/types/EntryValue.java
@@ -18,34 +18,39 @@
 package org.rometools.feed.module.sle.types;
 
 import java.io.Serializable;
-import org.jdom.Namespace;
 
+import org.jdom2.Namespace;
 
 /**
  * An interface that parents data types for sorting and grouping.
+ * 
  * @author Robert "kebernet" Cooper
  */
 public interface EntryValue extends Serializable, Cloneable {
     /**
      * Returns the name of the element.
+     * 
      * @return Returns the name of the element.
      */
     public String getElement();
 
     /**
      * Returns a label for the element.
+     * 
      * @return Returns a label for the element.
      */
     public String getLabel();
 
     /**
      * Returns the value of the element.
+     * 
      * @return Returns the value of the element.
      */
     public Comparable getValue();
-    
-    /** 
+
+    /**
      * Returns the namespace of the element.
+     * 
      * @return Returns the namespace of the element.
      */
     public Namespace getNamespace();
diff --git a/src/main/java/org/rometools/feed/module/sle/types/Group.java b/src/main/java/org/rometools/feed/module/sle/types/Group.java
index e52a5f6..e4f45c7 100644
--- a/src/main/java/org/rometools/feed/module/sle/types/Group.java
+++ b/src/main/java/org/rometools/feed/module/sle/types/Group.java
@@ -17,56 +17,54 @@
  */
 package org.rometools.feed.module.sle.types;
 
-import com.sun.syndication.feed.impl.ObjectBean;
-
-import org.jdom.Namespace;
-
 import java.io.Serializable;
 
+import org.jdom2.Namespace;
+
+import com.sun.syndication.feed.impl.ObjectBean;
 
 /**
- * The cf:group element is intended to inform the client that the property to which it 
+ * The cf:group element is intended to inform the client that the property to which it
  * 
- * refers is one that is “groupable” – that is, that the client should provide a user interface that 
+ * refers is one that is “groupable” – that is, that the client should provide a user interface that
  * 
- * allows the user to group or filter on the values of that property. Groupable properties should contain 
+ * allows the user to group or filter on the values of that property. Groupable properties should contain
  * 
  * a small set of discrete values (e.g. book genres are perfect for groups). 
            
  * 
- * 
            The cf:group element contains the following attributes:
            
+ * 
            
+ * The cf:group element contains the following attributes:
+ * 
            
  * 
  * 
              
- *  
            • ns - this attribute is the full namespace used in the property element. 
- *    If the attribute value is an empty string, it is assumed that the property 
- *    does not live in a namespace. If the ns attribute is omitted, the default 
- *    value is the empty string. In the example above, the ns attribute would contain 
- *    "http://www.example.com/book". It would not contain the namespace prefix. 
- *  
              • 
- *  
            • element - this attribute is the name of the property (without any 
- *    namespace). In the example above, the element attribute would contain "firstedition" 
- *    If this attribute is omitted, it is assumed that the label attribute is included 
- *    and that this cf:group element refers to the default sort order.
              • 
+ * 
            • ns - this attribute is the full namespace used in the property element. If the attribute value is an empty string, it is assumed that
+ * the property does not live in a namespace. If the ns attribute is omitted, the default value is the empty string. In the example above, the ns attribute
+ * would contain "http://www.example.com/book". It would not contain the namespace prefix.
              • 
+ * 
            • element - this attribute is the name of the property (without any namespace). In the example above, the element attribute would contain
+ * "firstedition" If this attribute is omitted, it is assumed that the label attribute is included and that this cf:group element refers to the
+ * default sort order.
              • 
  * 
- *  
            • label - this attribute contains a human-readable name for the property 
- *    to which this cf:group element refers. If it is omitted, the 
- *    client should use the value of the "element" attribute as the human-readable 
- *    name. The "label" attribute is required if the "element" attribute is omitted.  
              • 
+ * 
            • label - this attribute contains a human-readable name for the property to which this cf:group element refers. If it is omitted, the
+ * client should use the value of the "element" attribute as the human-readable name. The "label" attribute is required if the "element" attribute is
+ * omitted.  
              • 
  * 
            
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class Group implements Serializable, Cloneable {
     private Namespace namespace = Namespace.XML_NAMESPACE;
-    private ObjectBean obj = new ObjectBean(Group.class, this);
-    private String element;
-    private String label;
+    private final ObjectBean obj = new ObjectBean(Group.class, this);
+    private final String element;
+    private final String label;
 
     /**
      * Creates a new instance of Group
+     * 
      * @param namespace Namespace of the element
      * @param element Name of the element
      * @param label Label for the grouping.
      */
-    public Group(Namespace namespace, String element, String label) {
+    public Group(final Namespace namespace, final String element, final String label) {
         this.namespace = namespace == null ? Namespace.XML_NAMESPACE : namespace;
         this.element = element;
         this.label = label;
@@ -74,6 +72,7 @@ public class Group implements Serializable, Cloneable {
 
     /**
      * Returns the name of the element.
+     * 
      * @return Returns the name of the element.
      */
     public String getElement() {
@@ -82,6 +81,7 @@ public class Group implements Serializable, Cloneable {
 
     /**
      * Returns the label of the element.
+     * 
      * @return Returns the label of the element.
      */
     public String getLabel() {
@@ -90,24 +90,29 @@ public class Group implements Serializable, Cloneable {
 
     /**
      * Returns the namespace of the element.
+     * 
      * @return Returns the namespace of the element.
      */
     public Namespace getNamespace() {
-        return namespace ;
+        return namespace;
     }
 
+    @Override
     public Object clone() {
         return new Group(namespace, element, label);
     }
 
-    public boolean equals(Object o) {
+    @Override
+    public boolean equals(final Object o) {
         return obj.equals(o);
     }
 
+    @Override
     public int hashCode() {
         return obj.hashCode();
     }
 
+    @Override
     public String toString() {
         return obj.toString();
     }
diff --git a/src/main/java/org/rometools/feed/module/sle/types/NumberValue.java b/src/main/java/org/rometools/feed/module/sle/types/NumberValue.java
index 4f974ce..83046f5 100644
--- a/src/main/java/org/rometools/feed/module/sle/types/NumberValue.java
+++ b/src/main/java/org/rometools/feed/module/sle/types/NumberValue.java
@@ -17,28 +17,29 @@
  */
 package org.rometools.feed.module.sle.types;
 
-import com.sun.syndication.feed.impl.ObjectBean;
-
 import java.math.BigDecimal;
-import org.jdom.Namespace;
 
+import org.jdom2.Namespace;
+
+import com.sun.syndication.feed.impl.ObjectBean;
 
 /**
  * An EntryValue implementation for "number" data-type values.
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class NumberValue implements EntryValue {
     private BigDecimal value;
-    private ObjectBean obj = new ObjectBean(NumberValue.class, this);
+    private final ObjectBean obj = new ObjectBean(NumberValue.class, this);
     private String element;
     private String label;
     private Namespace namespace = Namespace.XML_NAMESPACE;
-    
+
     /** Creates a new instance of NumberValue */
     public NumberValue() {
     }
 
-    public void setElement(String element) {
+    public void setElement(final String element) {
         this.element = element;
     }
 
@@ -46,7 +47,7 @@ public class NumberValue implements EntryValue {
         return element;
     }
 
-    public void setLabel(String label) {
+    public void setLabel(final String label) {
         this.label = label;
     }
 
@@ -54,7 +55,7 @@ public class NumberValue implements EntryValue {
         return label;
     }
 
-    public void setValue(BigDecimal value) {
+    public void setValue(final BigDecimal value) {
         this.value = value;
     }
 
@@ -62,24 +63,28 @@ public class NumberValue implements EntryValue {
         return value;
     }
 
+    @Override
     public Object clone() {
-        NumberValue clone = new NumberValue();
-        clone.setElement(this.getElement());
-        clone.setLabel(this.getLabel());
-        clone.setValue(this.value);
-        clone.setNamespace( this.namespace );
-        
+        final NumberValue clone = new NumberValue();
+        clone.setElement(getElement());
+        clone.setLabel(getLabel());
+        clone.setValue(value);
+        clone.setNamespace(namespace);
+
         return clone;
     }
 
-    public boolean equals(Object o) {
+    @Override
+    public boolean equals(final Object o) {
         return obj.equals(o);
     }
 
+    @Override
     public int hashCode() {
         return obj.hashCode();
     }
 
+    @Override
     public String toString() {
         return "[Element:" + element + " Label:" + label + " Value:" + value + "]";
     }
@@ -88,7 +93,7 @@ public class NumberValue implements EntryValue {
         return namespace;
     }
 
-    public void setNamespace(Namespace namespace) {
+    public void setNamespace(final Namespace namespace) {
         this.namespace = namespace == null ? Namespace.XML_NAMESPACE : namespace;
     }
 }
diff --git a/src/main/java/org/rometools/feed/module/sle/types/Sort.java b/src/main/java/org/rometools/feed/module/sle/types/Sort.java
index 9258162..ceca119 100644
--- a/src/main/java/org/rometools/feed/module/sle/types/Sort.java
+++ b/src/main/java/org/rometools/feed/module/sle/types/Sort.java
@@ -17,55 +17,50 @@
  */
 package org.rometools.feed.module.sle.types;
 
-import com.sun.syndication.feed.impl.ObjectBean;
-
-import org.jdom.Namespace;
-
 import java.io.Serializable;
 
+import org.jdom2.Namespace;
+
+import com.sun.syndication.feed.impl.ObjectBean;
 
 /**
- * 
            The cf:sort element is intended to inform the client that the property to which it refers 
+ * 
            
+ * The cf:sort element is intended to inform the client that the property to which it refers
  * 
- * is one that is “sortable” – that is, that the client should provide a user interface that allows the 
+ * is one that is “sortable” – that is, that the client should provide a user interface that allows the
  * 
- * user to sort on that property. 
            
+ * user to sort on that property.
+ * 
            
  * 
- * 
            The cf:sort element can also be used to provide a label for the default sort that appears 
+ * 
            
+ * The cf:sort element can also be used to provide a label for the default sort that appears
  * 
- * in the list (in this case, only the label attribute should be included). 
            
+ * in the list (in this case, only the label attribute should be included).
+ * 
            
  * 
- * 
            The cf:sort element contains the following attributes:
            
+ * 
            
+ * The cf:sort element contains the following attributes:
+ * 
            
  * 
  * 
              
- *  
            • ns - this attribute is the full namespace used in the property element. 
- *    If the attribute value is an empty string, it is assumed that the property 
- *    does not live in a namespace. If the ns attribute is omitted, the default 
- *    value is the empty string. In the example above, the ns attribute would contain 
- *    "http://www.example.com/book". It would not contain the namespace prefix. 
- *  
              • 
- *  
            • element - this attribute is the name of the property (without any 
- *    namespace). In the example above, the element attribute would contain "firstedition" 
- *    If this attribute is omitted, it is assumed that the label attribute is included 
- *    and that this cf:sort element refers to the default sort order.
              • 
+ * 
            • ns - this attribute is the full namespace used in the property element. If the attribute value is an empty string, it is assumed that
+ * the property does not live in a namespace. If the ns attribute is omitted, the default value is the empty string. In the example above, the ns attribute
+ * would contain "http://www.example.com/book". It would not contain the namespace prefix.
              • 
+ * 
            • element - this attribute is the name of the property (without any namespace). In the example above, the element attribute would contain
+ * "firstedition" If this attribute is omitted, it is assumed that the label attribute is included and that this cf:sort element refers to the
+ * default sort order.
              • 
  * 
- *  
            • label - this attribute contains a human-readable name for the property 
- *    to which this cf:sort element refers. If it is omitted, the client 
- *    should use the value of the "element" attribute as the human-readable name. 
- *    The "label" attribute is required if the "element" attribute is omitted. 
              • 
- *  
            • data-type - this attribute informs the client about the data-type 
- *    of the property to which this cf:sort element refers.. It contains 
- *    one of the following values: date, number, text. If it is omitted, the default 
- *    value is text.
              • 
- *  
            • default - this attribute indicates whether the property to which 
- *    this cf:sort element refers is the default sort order in the 
- *    list. The allowed values are "true" and "false". If omitted, the default value 
- *    is "false". The items in the list must be already be sorted by the element 
- *    – this is, the client should not expect to have to resort by this field 
- *    if it displaying content directly from the list. The client should respect 
- *    only the first instance of default="true" that it encounters. 
              • 
+ * 
            • label - this attribute contains a human-readable name for the property to which this cf:sort element refers. If it is omitted, the
+ * client should use the value of the "element" attribute as the human-readable name. The "label" attribute is required if the "element" attribute is omitted.
              • 
+ * 
            • data-type - this attribute informs the client about the data-type of the property to which this cf:sort element refers.. It contains
+ * one of the following values: date, number, text. If it is omitted, the default value is text.
              • 
+ * 
            • default - this attribute indicates whether the property to which this cf:sort element refers is the default sort order in the list.
+ * The allowed values are "true" and "false". If omitted, the default value is "false". The items in the list must be already be sorted by the element –
+ * this is, the client should not expect to have to resort by this field if it displaying content directly from the list. The client should respect only the
+ * first instance of default="true" that it encounters.
              • 
  * 
  * 
            
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class Sort implements Serializable, Cloneable {
@@ -82,21 +77,22 @@ public class Sort implements Serializable, Cloneable {
      */
     public static final String NUMBER_TYPE = "number";
     private Namespace namespace = Namespace.XML_NAMESPACE;
-    private ObjectBean obj = new ObjectBean(Sort.class, this);
-    private String dataType;
-    private String element;
-    private String label;
-    private boolean defaultOrder;
+    private final ObjectBean obj = new ObjectBean(Sort.class, this);
+    private final String dataType;
+    private final String element;
+    private final String label;
+    private final boolean defaultOrder;
 
     /**
      * Creates a new instance of Sort
+     * 
      * @param namespace Namespace of the element
      * @param element Name of the element
      * @param dataType data-type of the element
      * @param label Label for the sort
      * @param defaultOrder indicates if this is the defaul order of the feed.
      */
-    public Sort(Namespace namespace, String element, String dataType, String label, boolean defaultOrder) {
+    public Sort(final Namespace namespace, final String element, final String dataType, final String label, final boolean defaultOrder) {
         super();
         this.namespace = namespace == null ? Namespace.XML_NAMESPACE : namespace;
         this.element = element;
@@ -107,6 +103,7 @@ public class Sort implements Serializable, Cloneable {
 
     /**
      * Returns the dataType of the sort
+     * 
      * @return Returns the dataType of the sort
      */
     public String getDataType() {
@@ -115,6 +112,7 @@ public class Sort implements Serializable, Cloneable {
 
     /**
      * Indicates this is the natural order of the feed.
+     * 
      * @return Indicates this is the natural order of the feed.
      */
     public boolean getDefaultOrder() {
@@ -123,6 +121,7 @@ public class Sort implements Serializable, Cloneable {
 
     /**
      * Name of the element.
+     * 
      * @return Name of the element.
      */
     public String getElement() {
@@ -131,6 +130,7 @@ public class Sort implements Serializable, Cloneable {
 
     /**
      * User label for sorting.
+     * 
      * @return User label for sorting.
      */
     public String getLabel() {
@@ -139,24 +139,29 @@ public class Sort implements Serializable, Cloneable {
 
     /**
      * Namespace of the element
+     * 
      * @return Namespace of the element
      */
     public Namespace getNamespace() {
         return namespace;
     }
 
+    @Override
     public Object clone() {
         return new Sort(namespace, element, dataType, label, defaultOrder);
     }
 
-    public boolean equals(Object o) {
+    @Override
+    public boolean equals(final Object o) {
         return obj.equals(o);
     }
 
+    @Override
     public int hashCode() {
         return obj.hashCode();
     }
 
+    @Override
     public String toString() {
         return obj.toString();
     }
diff --git a/src/main/java/org/rometools/feed/module/sle/types/StringValue.java b/src/main/java/org/rometools/feed/module/sle/types/StringValue.java
index 0781455..26b6c48 100644
--- a/src/main/java/org/rometools/feed/module/sle/types/StringValue.java
+++ b/src/main/java/org/rometools/feed/module/sle/types/StringValue.java
@@ -17,26 +17,27 @@
  */
 package org.rometools.feed.module.sle.types;
 
+import org.jdom2.Namespace;
+
 import com.sun.syndication.feed.impl.ObjectBean;
-import org.jdom.Namespace;
 
-
-/** An EntryValue implementation for "text" data-types.
- *
+/**
+ * An EntryValue implementation for "text" data-types.
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class StringValue implements EntryValue {
-    private ObjectBean obj = new ObjectBean(StringValue.class, this);
+    private final ObjectBean obj = new ObjectBean(StringValue.class, this);
     private String element;
     private String label;
     private String value;
     private Namespace namespace = Namespace.XML_NAMESPACE;
-    
+
     /** Creates a new instance of StringValue */
     public StringValue() {
     }
 
-    public void setElement(String element) {
+    public void setElement(final String element) {
         this.element = element;
     }
 
@@ -44,7 +45,7 @@ public class StringValue implements EntryValue {
         return element;
     }
 
-    public void setLabel(String label) {
+    public void setLabel(final String label) {
         this.label = label;
     }
 
@@ -52,7 +53,7 @@ public class StringValue implements EntryValue {
         return label;
     }
 
-    public void setValue(String value) {
+    public void setValue(final String value) {
         this.value = value;
     }
 
@@ -60,33 +61,37 @@ public class StringValue implements EntryValue {
         return value;
     }
 
+    @Override
     public Object clone() {
-        StringValue clone = new StringValue();
-        clone.setElement(this.getElement());
-        clone.setLabel(this.getLabel());
-        clone.setValue(this.value);
-        clone.setNamespace( this.namespace );
-        
+        final StringValue clone = new StringValue();
+        clone.setElement(getElement());
+        clone.setLabel(getLabel());
+        clone.setValue(value);
+        clone.setNamespace(namespace);
+
         return clone;
     }
 
-    public boolean equals(Object o) {
+    @Override
+    public boolean equals(final Object o) {
         return obj.equals(o);
     }
 
+    @Override
     public int hashCode() {
         return obj.hashCode();
     }
 
+    @Override
     public String toString() {
-        return "[Namespace: "+ namespace+ " Element:" + element + " Label:" + label + " Value:" + value + "]";
+        return "[Namespace: " + namespace + " Element:" + element + " Label:" + label + " Value:" + value + "]";
     }
 
     public Namespace getNamespace() {
         return namespace;
     }
 
-    public void setNamespace(Namespace namespace) {
+    public void setNamespace(final Namespace namespace) {
         this.namespace = namespace == null ? Namespace.XML_NAMESPACE : namespace;
     }
 }
diff --git a/src/main/java/org/rometools/feed/module/sse/SSE091Generator.java b/src/main/java/org/rometools/feed/module/sse/SSE091Generator.java
index 34e2e62..fce490b 100644
--- a/src/main/java/org/rometools/feed/module/sse/SSE091Generator.java
+++ b/src/main/java/org/rometools/feed/module/sse/SSE091Generator.java
@@ -1,22 +1,31 @@
 package org.rometools.feed.module.sse;
 
-import com.sun.syndication.feed.module.Module;
-import org.rometools.feed.module.sse.modules.*;
-import com.sun.syndication.feed.rss.Item;
-import com.sun.syndication.io.DelegatingModuleGenerator;
-import com.sun.syndication.io.WireFeedGenerator;
-import com.sun.syndication.io.impl.DateParser;
-import com.sun.syndication.io.impl.RSS20Generator;
-import org.jdom.Element;
-
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import org.jdom2.Element;
+import org.rometools.feed.module.sse.modules.Conflict;
+import org.rometools.feed.module.sse.modules.Conflicts;
+import org.rometools.feed.module.sse.modules.History;
+import org.rometools.feed.module.sse.modules.Related;
+import org.rometools.feed.module.sse.modules.SSEModule;
+import org.rometools.feed.module.sse.modules.Sharing;
+import org.rometools.feed.module.sse.modules.Sync;
+import org.rometools.feed.module.sse.modules.Update;
+
+import com.sun.syndication.feed.module.Module;
+import com.sun.syndication.feed.rss.Item;
+import com.sun.syndication.io.DelegatingModuleGenerator;
+import com.sun.syndication.io.WireFeedGenerator;
+import com.sun.syndication.io.impl.DateParser;
+import com.sun.syndication.io.impl.RSS20Generator;
+
 /**
  * Generator for the SSE Module.
  * 
            
+ * 
  * @author Laird Dornin
  */
 public class SSE091Generator implements DelegatingModuleGenerator {
@@ -25,8 +34,8 @@ public class SSE091Generator implements DelegatingModuleGenerator {
     public SSE091Generator() {
     }
 
-    public void setFeedGenerator(WireFeedGenerator feedGenerator) {
-        parentGenerator = (RSS20Generator)feedGenerator;
+    public void setFeedGenerator(final WireFeedGenerator feedGenerator) {
+        parentGenerator = (RSS20Generator) feedGenerator;
     }
 
     public String getNamespaceUri() {
@@ -36,40 +45,41 @@ public class SSE091Generator implements DelegatingModuleGenerator {
     /**
      * Returns a set with all the URIs (JDOM Namespace elements) this module generator uses.
      * 
            
-     * It is used by the the feed generators to add their namespace definition in
-     * the root element of the generated document (forward-missing of Java 5.0 Generics).
+     * It is used by the the feed generators to add their namespace definition in the root element of the generated document (forward-missing of Java 5.0
+     * Generics).
      * 
            
+     * 
      * @return a set with all the URIs (JDOM Namespace elements) this module generator uses.
      */
     public Set getNamespaces() {
         return SSEModule.NAMESPACES;
     }
 
-    public void generate(Module module, Element element) {
+    public void generate(final Module module, final Element element) {
         if (!(module instanceof SSEModule)) {
             return;
         }
 
-        SSEModule sseModule = (SSEModule)module;
+        final SSEModule sseModule = (SSEModule) module;
 
         if (sseModule instanceof Sharing) {
-            Sharing sharing = (Sharing)sseModule;
+            final Sharing sharing = (Sharing) sseModule;
             // add sse namespace
             Element root = element;
-            while ((root.getParent() != null) && root.getParent() instanceof Element) {
+            while (root.getParent() != null && root.getParent() instanceof Element) {
                 root = (Element) root.getParent();
             }
             root.addNamespaceDeclaration(SSEModule.SSE_NS);
 
             generateSharing(sharing, root);
         } else if (sseModule instanceof Sync) {
-            generateSync((Sync)sseModule, element);
+            generateSync((Sync) sseModule, element);
         }
     }
 
-    private void generateSharing(Sharing sharing, Element parent) {
+    private void generateSharing(final Sharing sharing, final Element parent) {
         // inject sse sharingModule element
-        Element sharingElement = new Element(Sharing.NAME, SSEModule.SSE_NS);
+        final Element sharingElement = new Element(Sharing.NAME, SSEModule.SSE_NS);
         generateAttribute(sharingElement, Sharing.UNTIL_ATTRIBUTE, sharing.getUntil());
         generateAttribute(sharingElement, Sharing.SINCE_ATTRIBUTE, sharing.getSince());
         generateAttribute(sharingElement, Sharing.ORDERED_ATTRIBUTE, sharing.getOrdered());
@@ -79,14 +89,14 @@ public class SSE091Generator implements DelegatingModuleGenerator {
         // add sharing as the first element of the rss root
         parent.addContent(0, sharingElement);
 
-        Related related = sharing.getRelated();
+        final Related related = sharing.getRelated();
         if (related != null) {
             generateRelated(related);
         }
     }
 
-    private void generateRelated(Related related) {
-        Element relatedElement = new Element(Related.NAME, SSEModule.SSE_NS);
+    private void generateRelated(final Related related) {
+        final Element relatedElement = new Element(Related.NAME, SSEModule.SSE_NS);
         generateAttribute(relatedElement, Related.SINCE_ATTRIBUTE, related.getSince());
         generateAttribute(relatedElement, Related.UNTIL_ATTRIBUTE, related.getUntil());
         generateAttribute(relatedElement, Related.LINK_ATTRIBUTE, related.getLink());
@@ -94,8 +104,8 @@ public class SSE091Generator implements DelegatingModuleGenerator {
         generateAttribute(relatedElement, Related.TYPE_ATTRIBUTE, related.getType());
     }
 
-    protected void generateSync(Sync sync, Element parent)  {
-        Element syncElement = new Element(Sync.NAME, SSEModule.SSE_NS);
+    protected void generateSync(final Sync sync, final Element parent) {
+        final Element syncElement = new Element(Sync.NAME, SSEModule.SSE_NS);
         generateAttribute(syncElement, Sync.DELETED_ATTRIBUTE, sync.isDeleted());
         generateAttribute(syncElement, Sync.VERSION_ATTRIBUTE, sync.getVersion());
         generateAttribute(syncElement, Sync.ID_ATTRIBUTE, sync.getId());
@@ -105,12 +115,12 @@ public class SSE091Generator implements DelegatingModuleGenerator {
         parent.addContent(syncElement);
     }
 
-    private void generateConflicts(Element syncElement, List conflicts) {
+    private void generateConflicts(final Element syncElement, final List conflicts) {
         if (conflicts != null) {
-            Element conflictsElement = new Element(Conflicts.NAME, SSEModule.SSE_NS);
-            for (Iterator confictIter = conflicts.iterator(); confictIter.hasNext();) {
-                Element conflictElement = new Element(Conflict.NAME, SSEModule.SSE_NS);
-                Conflict conflict = (Conflict) confictIter.next();
+            final Element conflictsElement = new Element(Conflicts.NAME, SSEModule.SSE_NS);
+            for (final Iterator confictIter = conflicts.iterator(); confictIter.hasNext();) {
+                final Element conflictElement = new Element(Conflict.NAME, SSEModule.SSE_NS);
+                final Conflict conflict = (Conflict) confictIter.next();
                 generateAttribute(conflictElement, Conflict.BY_ATTRIBUTE, conflict.getBy());
                 generateAttribute(conflictElement, Conflict.VERSION_ATTRIBUTE, conflict.getVersion());
                 generateAttribute(conflictElement, Conflict.WHEN_ATTRIBUTE, conflict.getWhen());
@@ -121,18 +131,18 @@ public class SSE091Generator implements DelegatingModuleGenerator {
         }
     }
 
-    private void generateItem(Element conflictElement, Item item) {
+    private void generateItem(final Element conflictElement, final Item item) {
         if (item != null) {
-            Element itemElement = new Element("item");
+            final Element itemElement = new Element("item");
             parentGenerator.populateItem(item, itemElement, 0);
             parentGenerator.generateItemModules(item.getModules(), itemElement);
             conflictElement.addContent(itemElement);
         }
     }
 
-    private void generateHistory(Element syncElement, History history) {
+    private void generateHistory(final Element syncElement, final History history) {
         if (history != null) {
-            Element historyElement = new Element(History.NAME, SSEModule.SSE_NS);
+            final Element historyElement = new Element(History.NAME, SSEModule.SSE_NS);
             generateAttribute(historyElement, History.BY_ATTRIBUTE, history.getBy());
             generateAttribute(historyElement, History.WHEN_ATTRIBUTE, history.getWhen());
             generateUpdates(historyElement, history.getUpdates());
@@ -140,11 +150,11 @@ public class SSE091Generator implements DelegatingModuleGenerator {
         }
     }
 
-    private void generateUpdates(Element historyElement, List updates) {
+    private void generateUpdates(final Element historyElement, final List updates) {
         if (updates != null) {
-            for (Iterator updateIter = updates.iterator(); updateIter.hasNext();) {
-                Element updateElement = new Element(Update.NAME, SSEModule.SSE_NS);
-                Update update = (Update) updateIter.next();
+            for (final Iterator updateIter = updates.iterator(); updateIter.hasNext();) {
+                final Element updateElement = new Element(Update.NAME, SSEModule.SSE_NS);
+                final Update update = (Update) updateIter.next();
                 generateAttribute(updateElement, Update.BY_ATTRIBUTE, update.getBy());
                 generateAttribute(updateElement, Update.WHEN_ATTRIBUTE, update.getWhen());
                 historyElement.addContent(updateElement);
@@ -152,16 +162,16 @@ public class SSE091Generator implements DelegatingModuleGenerator {
         }
     }
 
-    private void generateAttribute(Element syncElement, String attrName, Object attribute) {
+    private void generateAttribute(final Element syncElement, final String attrName, final Object attribute) {
         if (attribute != null) {
             syncElement.setAttribute(attrName, toString(attribute));
         }
     }
 
-    private String toString(Object o) {
+    private String toString(final Object o) {
         if (o != null) {
             if (o instanceof Date) {
-                return DateParser.formatRFC822((Date)o);
+                return DateParser.formatRFC822((Date) o);
             } else {
                 return o.toString();
             }
diff --git a/src/main/java/org/rometools/feed/module/sse/SSE091Parser.java b/src/main/java/org/rometools/feed/module/sse/SSE091Parser.java
index ff88ec9..8f37e29 100644
--- a/src/main/java/org/rometools/feed/module/sse/SSE091Parser.java
+++ b/src/main/java/org/rometools/feed/module/sse/SSE091Parser.java
@@ -1,26 +1,34 @@
 package org.rometools.feed.module.sse;
 
-import com.sun.syndication.feed.module.Module;
-import org.rometools.feed.module.sse.modules.*;
-import com.sun.syndication.feed.rss.Item;
-import com.sun.syndication.io.DelegatingModuleParser;
-import com.sun.syndication.io.WireFeedParser;
-import com.sun.syndication.io.impl.DateParser;
-import com.sun.syndication.io.impl.RSS20Parser;
-import org.jdom.Attribute;
-import org.jdom.DataConversionException;
-import org.jdom.Element;
-import org.jdom.filter.Filter;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Logger;
 
+import org.jdom2.Attribute;
+import org.jdom2.DataConversionException;
+import org.jdom2.Element;
+import org.jdom2.filter.AbstractFilter;
+import org.rometools.feed.module.sse.modules.Conflict;
+import org.rometools.feed.module.sse.modules.Conflicts;
+import org.rometools.feed.module.sse.modules.History;
+import org.rometools.feed.module.sse.modules.Related;
+import org.rometools.feed.module.sse.modules.SSEModule;
+import org.rometools.feed.module.sse.modules.Sharing;
+import org.rometools.feed.module.sse.modules.Sync;
+import org.rometools.feed.module.sse.modules.Update;
+
+import com.sun.syndication.feed.module.Module;
+import com.sun.syndication.feed.rss.Item;
+import com.sun.syndication.io.DelegatingModuleParser;
+import com.sun.syndication.io.WireFeedParser;
+import com.sun.syndication.io.impl.DateParser;
+import com.sun.syndication.io.impl.RSS20Parser;
+
 /**
  * Parses embedded SSE content from RSS channel and item content.
- *
+ * 
  * @author ldornin
  */
 public class SSE091Parser implements DelegatingModuleParser {
@@ -33,17 +41,17 @@ public class SSE091Parser implements DelegatingModuleParser {
     public SSE091Parser() {
     }
 
-    public void setFeedParser(WireFeedParser feedParser) {
-        this.rssParser = (RSS20Parser)feedParser;
+    public void setFeedParser(final WireFeedParser feedParser) {
+        rssParser = (RSS20Parser) feedParser;
     }
 
     public String getNamespaceUri() {
         return SSEModule.SSE_SCHEMA_URI;
     }
 
-    public Module parse(org.jdom.Element element) {
+    public Module parse(final org.jdom2.Element element) {
         SSEModule sseModule = null;
-        String name = element.getName();
+        final String name = element.getName();
 
         if (name.equals("rss")) {
             sseModule = parseSharing(element);
@@ -53,11 +61,11 @@ public class SSE091Parser implements DelegatingModuleParser {
         return sseModule;
     }
 
-    private Sharing parseSharing(Element element) {
-        Element root = getRoot(element);
+    private Sharing parseSharing(final Element element) {
+        final Element root = getRoot(element);
 
         Sharing sharing = null;
-        Element sharingChild = root.getChild(Sharing.NAME, SSEModule.SSE_NS);
+        final Element sharingChild = root.getChild(Sharing.NAME, SSEModule.SSE_NS);
         if (sharingChild != null) {
             sharing = new Sharing();
             sharing.setOrdered(parseBooleanAttr(sharingChild, Sharing.ORDERED_ATTRIBUTE));
@@ -71,9 +79,9 @@ public class SSE091Parser implements DelegatingModuleParser {
         return sharing;
     }
 
-    private void parseRelated(Element root, Sharing sharing) {
+    private void parseRelated(final Element root, final Sharing sharing) {
         Related related;
-        Element relatedChild = root.getChild(Related.NAME, SSEModule.SSE_NS);
+        final Element relatedChild = root.getChild(Related.NAME, SSEModule.SSE_NS);
         if (relatedChild != null) {
             related = new Related();
             // TODO; is this an attribute?
@@ -86,9 +94,9 @@ public class SSE091Parser implements DelegatingModuleParser {
         }
     }
 
-    private Sync parseSync(Element element) {
+    private Sync parseSync(final Element element) {
         // Now I am going to get the item specific tags
-        Element syncChild = element.getChild(Sync.NAME, SSEModule.SSE_NS);
+        final Element syncChild = element.getChild(Sync.NAME, SSEModule.SSE_NS);
         Sync sync = null;
 
         if (syncChild != null) {
@@ -103,35 +111,27 @@ public class SSE091Parser implements DelegatingModuleParser {
         return sync;
     }
 
-    private List parseConflicts(Element syncElement) {
+    private List parseConflicts(final Element syncElement) {
         List conflicts = null;
 
-        List conflictsContent = syncElement.getContent(new ContentFilter(Conflicts.NAME));
-        for (Iterator conflictsIter = conflictsContent.iterator();
-             conflictsIter.hasNext();)
-        {
-            Element conflictsElement = (Element) conflictsIter.next();
+        final List conflictsContent = syncElement.getContent(new ContentFilter(Conflicts.NAME));
+        for (final Iterator conflictsIter = conflictsContent.iterator(); conflictsIter.hasNext();) {
+            final Element conflictsElement = (Element) conflictsIter.next();
 
-            List conflictContent =
-                    conflictsElement.getContent(new ContentFilter(Conflict.NAME));
-            for (Iterator conflictIter = conflictContent.iterator();
-                 conflictIter.hasNext();)
-            {
-                Element conflictElement = (Element) conflictIter.next();
+            final List conflictContent = conflictsElement.getContent(new ContentFilter(Conflict.NAME));
+            for (final Iterator conflictIter = conflictContent.iterator(); conflictIter.hasNext();) {
+                final Element conflictElement = (Element) conflictIter.next();
 
-                Conflict conflict = new Conflict();
+                final Conflict conflict = new Conflict();
                 conflict.setBy(parseStringAttribute(conflictElement, Conflict.BY_ATTRIBUTE));
                 conflict.setWhen(parseDateAttribute(conflictElement, Conflict.WHEN_ATTRIBUTE));
                 conflict.setVersion(parseIntegerAttribute(conflictElement, Conflict.VERSION_ATTRIBUTE));
 
-                List conflictItemContent =
-                        conflictElement.getContent(new ContentFilter("item"));
-                for (Iterator conflictItemIter = conflictItemContent.iterator();
-                     conflictItemIter.hasNext();)
-                {
-                    Element conflictItemElement = (Element) conflictItemIter.next();
-                    Element root = getRoot(conflictItemElement);
-                    Item conflictItem = rssParser.parseItem(root, conflictItemElement);
+                final List conflictItemContent = conflictElement.getContent(new ContentFilter("item"));
+                for (final Iterator conflictItemIter = conflictItemContent.iterator(); conflictItemIter.hasNext();) {
+                    final Element conflictItemElement = (Element) conflictItemIter.next();
+                    final Element root = getRoot(conflictItemElement);
+                    final Item conflictItem = rssParser.parseItem(root, conflictItemElement);
                     conflict.setItem(conflictItem);
 
                     if (conflicts == null) {
@@ -145,18 +145,18 @@ public class SSE091Parser implements DelegatingModuleParser {
         return conflicts;
     }
 
-    private Element getRoot(Element start) {
+    private Element getRoot(final Element start) {
         // reach up to grab the sharing element out of the root
         Element root = start;
 
-        while ((root.getParent() != null) && root.getParent() instanceof Element) {
+        while (root.getParent() != null && root.getParent() instanceof Element) {
             root = (Element) root.getParent();
         }
         return root;
     }
 
-    private History parseHistory(Element historyElement) {
-        Element historyContent = getFirstContent(historyElement, History.NAME);
+    private History parseHistory(final Element historyElement) {
+        final Element historyContent = getFirstContent(historyElement, History.NAME);
 
         History history = null;
         if (historyContent != null) {
@@ -168,78 +168,81 @@ public class SSE091Parser implements DelegatingModuleParser {
         return history;
     }
 
-    private Element getFirstContent(Element element, String name) {
-        List filterList = element.getContent(new ContentFilter(name));
+    private Element getFirstContent(final Element element, final String name) {
+        final List filterList = element.getContent(new ContentFilter(name));
         Element firstContent = null;
-        if ((filterList != null) && (filterList.size() > 0)) {
+        if (filterList != null && filterList.size() > 0) {
             firstContent = (Element) filterList.get(0);
         }
         return firstContent;
     }
 
-    private void parseUpdates(Element historyChild, History history) {
-        List updatedChildren = historyChild.getContent(new ContentFilter(Update.NAME));
-        for (Iterator childIter = updatedChildren.iterator(); childIter.hasNext();) {
-            Element updateChild = (Element) childIter.next();
-            Update update = new Update();
+    private void parseUpdates(final Element historyChild, final History history) {
+        final List updatedChildren = historyChild.getContent(new ContentFilter(Update.NAME));
+        for (final Iterator childIter = updatedChildren.iterator(); childIter.hasNext();) {
+            final Element updateChild = (Element) childIter.next();
+            final Update update = new Update();
             update.setBy(parseStringAttribute(updateChild, Update.BY_ATTRIBUTE));
             update.setWhen(parseDateAttribute(updateChild, Update.WHEN_ATTRIBUTE));
             history.addUpdate(update);
         }
     }
 
-    private String parseStringAttribute(Element syncChild, String attrName) {
-        Attribute idAttribute = syncChild.getAttribute(attrName);
-        return (idAttribute != null ? idAttribute.getValue().trim() : null);
+    private String parseStringAttribute(final Element syncChild, final String attrName) {
+        final Attribute idAttribute = syncChild.getAttribute(attrName);
+        return idAttribute != null ? idAttribute.getValue().trim() : null;
     }
 
-    private Integer parseIntegerAttribute(Element sharingChild, String attrName) {
-        Attribute integerAttribute = sharingChild.getAttribute(attrName);
+    private Integer parseIntegerAttribute(final Element sharingChild, final String attrName) {
+        final Attribute integerAttribute = sharingChild.getAttribute(attrName);
         Integer integerAttr = null;
         if (integerAttribute != null) {
             try {
                 integerAttr = new Integer(integerAttribute.getIntValue());
-            } catch (DataConversionException e) {
+            } catch (final DataConversionException e) {
                 // dont use the data
             }
         }
         return integerAttr;
     }
 
-    private Boolean parseBooleanAttr(Element sharingChild, String attrName) {
-        Attribute attribute = sharingChild.getAttribute(attrName);
+    private Boolean parseBooleanAttr(final Element sharingChild, final String attrName) {
+        final Attribute attribute = sharingChild.getAttribute(attrName);
         Boolean attrValue = null;
         if (attribute != null) {
             try {
                 attrValue = Boolean.valueOf(attribute.getBooleanValue());
-            } catch (DataConversionException e) {
+            } catch (final DataConversionException e) {
                 // dont use the data
             }
         }
         return attrValue;
     }
 
-    private Date parseDateAttribute(Element childElement, String attrName) {
-        Attribute dateAttribute = childElement.getAttribute(attrName);
-        Date date = null;
+    private Date parseDateAttribute(final Element childElement, final String attrName) {
+        final Attribute dateAttribute = childElement.getAttribute(attrName);
+        final Date date = null;
         if (dateAttribute != null) {
             // SSE spec requires the timezone to be 'GMT'
             // admittedly, this is a bit heavy-handed
-            String dateAttr = dateAttribute.getValue().trim();
+            final String dateAttr = dateAttribute.getValue().trim();
             return DateParser.parseRFC822(dateAttr);
         }
         return date;
     }
 
-    private static class ContentFilter implements Filter {
-        private String name;
-        private ContentFilter(String name) {
+    private static class ContentFilter extends AbstractFilter {
+
+        private final String name;
+
+        private ContentFilter(final String name) {
             this.name = name;
         }
 
-        public boolean matches(Object object) {
-            return (object instanceof Element) &&
-                    name.equals(((Element)object).getName());
+        public Object filter(final Object object) {
+            return object instanceof Element && name.equals(((Element) object).getName());
         }
+
     }
+
 }
diff --git a/src/main/java/org/rometools/feed/module/sse/modules/Conflict.java b/src/main/java/org/rometools/feed/module/sse/modules/Conflict.java
index 73381bb..8e79a30 100644
--- a/src/main/java/org/rometools/feed/module/sse/modules/Conflict.java
+++ b/src/main/java/org/rometools/feed/module/sse/modules/Conflict.java
@@ -1,10 +1,10 @@
 package org.rometools.feed.module.sse.modules;
 
+import java.util.Date;
+
 import com.sun.syndication.feed.CopyFrom;
 import com.sun.syndication.feed.rss.Item;
 
-import java.util.Date;
-
 /**
  *  element within 
  */
@@ -14,27 +14,22 @@ public class Conflict extends SSEModule {
     public static final String NAME = "conflict";
 
     /**
-     * An optional, string attribute. This text attribute identifies the endpoint that
-     * made the conflicting modification. It is used and compared programmatically.
-     * See sx:update for format guidance.
+     * An optional, string attribute. This text attribute identifies the endpoint that made the conflicting modification. It is used and compared
+     * programmatically. See sx:update for format guidance.
      * 
            
-     * Note: Either or both of the when or by attributes MUST be present; it is
-     * invalid to have neither.
+     * Note: Either or both of the when or by attributes MUST be present; it is invalid to have neither.
      */
     public static final String BY_ATTRIBUTE = "by";
 
     /**
-     * A required, integer attribute. This is the version number of the conflicting
-     * modification.
+     * A required, integer attribute. This is the version number of the conflicting modification.
      */
     public static final String VERSION_ATTRIBUTE = "version";
 
     /**
-     * An optional, date-time attribute. This is the date-time when the conflicting
-     * modification took place. See sx:update for format guidance.
+     * An optional, date-time attribute. This is the date-time when the conflicting modification took place. See sx:update for format guidance.
      * 
            
-     * Note: Either or both of the when or by attributes MUST be present; it is
-     * invalid to have neither.
+     * Note: Either or both of the when or by attributes MUST be present; it is invalid to have neither.
      */
     public static final String WHEN_ATTRIBUTE = "when";
 
@@ -43,14 +38,15 @@ public class Conflict extends SSEModule {
     private String by;
     private Item conflictItem;
 
-    public void copyFrom(CopyFrom obj) {
-        Conflict conflict = (Conflict)obj;
+    @Override
+    public void copyFrom(final CopyFrom obj) {
+        final Conflict conflict = (Conflict) obj;
         conflict.when = when == null ? null : (Date) when.clone();
         conflict.by = by;
         conflict.version = version;
         try {
             conflict.conflictItem = (Item) conflictItem.clone();
-        } catch (CloneNotSupportedException e) {
+        } catch (final CloneNotSupportedException e) {
             // should not happen
             e.printStackTrace();
         }
@@ -60,7 +56,7 @@ public class Conflict extends SSEModule {
         return by;
     }
 
-    public void setBy(String by) {
+    public void setBy(final String by) {
         this.by = by;
     }
 
@@ -68,7 +64,7 @@ public class Conflict extends SSEModule {
         return version;
     }
 
-    public void setVersion(Integer version) {
+    public void setVersion(final Integer version) {
         this.version = version;
     }
 
@@ -76,11 +72,11 @@ public class Conflict extends SSEModule {
         return when;
     }
 
-    public void setWhen(Date when) {
+    public void setWhen(final Date when) {
         this.when = when;
     }
 
-    public void setItem(Item conflictItem) {
+    public void setItem(final Item conflictItem) {
         this.conflictItem = conflictItem;
     }
 
diff --git a/src/main/java/org/rometools/feed/module/sse/modules/Conflicts.java b/src/main/java/org/rometools/feed/module/sse/modules/Conflicts.java
index 14f08ec..c3dc7d6 100644
--- a/src/main/java/org/rometools/feed/module/sse/modules/Conflicts.java
+++ b/src/main/java/org/rometools/feed/module/sse/modules/Conflicts.java
@@ -10,7 +10,8 @@ import com.sun.syndication.feed.CopyFrom;
 public class Conflicts extends SSEModule {
     public static final String NAME = "conflicts";
 
-    public void copyFrom(CopyFrom obj) {
+    @Override
+    public void copyFrom(final CopyFrom obj) {
         // nothing to copy, just a place-holder
     }
 }
diff --git a/src/main/java/org/rometools/feed/module/sse/modules/History.java b/src/main/java/org/rometools/feed/module/sse/modules/History.java
index 6bd6c3d..3c609b2 100644
--- a/src/main/java/org/rometools/feed/module/sse/modules/History.java
+++ b/src/main/java/org/rometools/feed/module/sse/modules/History.java
@@ -1,12 +1,23 @@
 package org.rometools.feed.module.sse.modules;
 
-import com.sun.syndication.feed.CopyFrom;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import com.sun.syndication.feed.CopyFrom;
+
 /**
- * 
            Element within 
            .
+ * 
            + * 
+ * 
            
+ * 
+ * Element within
+ * 
+ * 
            + * 
+ * 
            
+ * 
+ * .
  */
 public class History extends SSEModule {
     // A date-time attribute.
@@ -25,8 +36,9 @@ public class History extends SSEModule {
     public History() {
     }
 
-    public void copyFrom(CopyFrom other) {
-        History otherHistory = (History)other;
+    @Override
+    public void copyFrom(final CopyFrom other) {
+        final History otherHistory = (History) other;
         when = otherHistory.when == null ? null : (Date) otherHistory.when.clone();
         // dont copy immutable
         by = otherHistory.by;
@@ -40,10 +52,10 @@ public class History extends SSEModule {
     /**
      * Get the date-time when the most recent modification took place.
      * 
            
-     * This is the date-time when the most recent modification took place. If this attribute is omitted the value
-     * defaults to the earliest time representable in RFC 822.
-     *
-     * @return the date-time when the most recent modification took place. 
+     * This is the date-time when the most recent modification took place. If this attribute is omitted the value defaults to the earliest time representable in
+     * RFC 822.
+     * 
+     * @return the date-time when the most recent modification took place.
      */
     public Date getWhen() {
         // TODO: convert to the earliest time in RFC 822 (which is what?)
@@ -54,24 +66,22 @@ public class History extends SSEModule {
      * Set the date-time when the most recent modification took place.
      * 
            
      * Either or both of the when or by attributes MUST be present; it is invalid to have neither.
-     *
+     * 
      * @param when the date-time when the most recent modification took place.
      */
-    public void setWhen(Date when) {
+    public void setWhen(final Date when) {
         this.when = when;
     }
 
     /**
-     * Provides access to a text attribute identifying the unique endpoint that made the most recent modification. This
-     * SHOULD be some combination of user and device (so that a given user can edit a feed on multiple devices). This
-     * attribute is used programmatically to break ties in case two changes happened at the same time (within the same
-     * second).
+     * Provides access to a text attribute identifying the unique endpoint that made the most recent modification. This SHOULD be some combination of user and
+     * device (so that a given user can edit a feed on multiple devices). This attribute is used programmatically to break ties in case two changes happened at
+     * the same time (within the same second).
      * 
            
      * Either or both of the when or by must be present; it is invalid to have neither.
      * 
            
-     * If this attribute is omitted the value defaults to the empty string (which must be less than all other values for
-     * purposes of collation).
-     *
+     * If this attribute is omitted the value defaults to the empty string (which must be less than all other values for purposes of collation).
+     * 
      * @return A text attribute identifying the unique endpoint that made the most recent modification.
      */
     public String getBy() {
@@ -82,19 +92,19 @@ public class History extends SSEModule {
      * Sets the endpoint that made the most recent modification.
      * 
            
      * Either or both of the when or by attributes MUST be present; it is invalid to have neither.
-     *
+     * 
      * @param by the endpoint that made the most recent modification.
      */
-    public void setBy(String by) {
+    public void setBy(final String by) {
         this.by = by;
     }
 
     /**
      * Add an update to this history
-     *
+     * 
      * @param update an update to add to the list of updates for this history.
      */
-    public void addUpdate(Update update) {
+    public void addUpdate(final Update update) {
         if (updates == null) {
             updates = new ArrayList();
         }
@@ -103,7 +113,7 @@ public class History extends SSEModule {
 
     /**
      * Return the list of updates for this history.
-     *
+     * 
      * @return the list of updates for this history.
      */
     public List getUpdates() {
diff --git a/src/main/java/org/rometools/feed/module/sse/modules/Related.java b/src/main/java/org/rometools/feed/module/sse/modules/Related.java
index 69f56df..8e9f41c 100644
--- a/src/main/java/org/rometools/feed/module/sse/modules/Related.java
+++ b/src/main/java/org/rometools/feed/module/sse/modules/Related.java
@@ -1,23 +1,32 @@
 package org.rometools.feed.module.sse.modules;
 
-import com.sun.syndication.feed.CopyFrom;
 import java.util.Date;
 
+import com.sun.syndication.feed.CopyFrom;
+
 /**
- * 
            Element within 
            .
+ * 
            + * 
+ * 
            
+ * 
+ * Element within
+ * 
+ * 
            + * 
+ * 
            
+ * 
+ * .
  */
 public class Related extends SSEModule {
     public static final String NAME = "related";
 
     /**
-     * Indicates whether the link points to a file containing the complete collection of items for
-     * this feed.
+     * Indicates whether the link points to a file containing the complete collection of items for this feed.
      */
     public static final int COMPLETE = 0;
 
     /**
-     * Indicates whether the link points to a feed whose contents are being incorporated into this
-     * feed by the publisher.
+     * Indicates whether the link points to a feed whose contents are being incorporated into this feed by the publisher.
      */
     public static final int AGGREGATED = 1;
 
@@ -38,8 +47,9 @@ public class Related extends SSEModule {
     public static final String TYPE_ATTRIBUTE = "type";
     public static final String UNTIL_ATTRIBUTE = "until";
 
-    public void copyFrom(CopyFrom obj) {
-        Related related = (Related)obj;
+    @Override
+    public void copyFrom(final CopyFrom obj) {
+        final Related related = (Related) obj;
         related.link = link;
         related.since = since == null ? null : (Date) since.clone();
         related.title = title;
@@ -49,7 +59,7 @@ public class Related extends SSEModule {
 
     /**
      * link A required, URL attribute. The URL for related feeds.
-     *
+     * 
      * @return the URL for related feeds
      */
     // TODO: use a java.net.URL?
@@ -59,17 +69,16 @@ public class Related extends SSEModule {
 
     /**
      * Set the URL for related feeds.
-     *
+     * 
      * @param link the URL for related feeds.
      */
-    public void setLink(String link) {
+    public void setLink(final String link) {
         this.link = link;
     }
 
-
     /**
      * title An optional, string attribute. The name or description of the related feed.
-     *
+     * 
      * @return The name or description of the related feed.
      */
     public String getTitle() {
@@ -78,10 +87,10 @@ public class Related extends SSEModule {
 
     /**
      * Set the name or description of the related feed.
-     *
+     * 
      * @param title the name or description of the related feed.
      */
-    public void setTitle(String title) {
+    public void setTitle(final String title) {
         this.title = title;
     }
 
@@ -90,9 +99,8 @@ public class Related extends SSEModule {
      * 
            
      * "complete" if the link points to file containing the complete collection of items for this feed.
      * 
            
-     * "aggregated" if the link points to a feed whose contents are being incorporated into this feed
-     * by the publisher.
-     *
+     * "aggregated" if the link points to a feed whose contents are being incorporated into this feed by the publisher.
+     * 
      * @return the type of the releated feed.
      */
     public Integer getType() {
@@ -101,17 +109,17 @@ public class Related extends SSEModule {
 
     /**
      * Set the type of relationship, complete or aggregated.
-     *
+     * 
      * @param type the type of relationship, complete or aggregated.
      */
-    public void setType(Integer type) {
+    public void setType(final Integer type) {
         this.type = type;
     }
 
     /**
-     * An optional, date-time attribute. This is the starting point of the related feed. If this attribute
-     * is omitted or blank, it is assumed that this is a complete feed.
-     *
+     * An optional, date-time attribute. This is the starting point of the related feed. If this attribute is omitted or blank, it is assumed that this is a
+     * complete feed.
+     * 
      * @return the starting point of the related feed.
      */
     public Date getSince() {
@@ -120,16 +128,16 @@ public class Related extends SSEModule {
 
     /**
      * Set the starting point of the related feed.
-     *
+     * 
      * @param since the starting point of the related feed.
      */
-    public void setSince(Date since) {
+    public void setSince(final Date since) {
         this.since = since;
     }
 
     /**
      * An optional, date-time attribute. This is the ending point of a feed.
-     *
+     * 
      * @return the ending point of the feed, until.
      */
     public Date getUntil() {
@@ -138,10 +146,10 @@ public class Related extends SSEModule {
 
     /**
      * Set the ending point of the feed, until. An optional, date-time attribute.
-     *
+     * 
      * @param until the ending point of the feed.
      */
-    public void setUntil(Date until) {
+    public void setUntil(final Date until) {
         this.until = until;
     }
 }
diff --git a/src/main/java/org/rometools/feed/module/sse/modules/SSEModule.java b/src/main/java/org/rometools/feed/module/sse/modules/SSEModule.java
index a7735eb..a7994d8 100644
--- a/src/main/java/org/rometools/feed/module/sse/modules/SSEModule.java
+++ b/src/main/java/org/rometools/feed/module/sse/modules/SSEModule.java
@@ -1,16 +1,16 @@
 package org.rometools.feed.module.sse.modules;
 
-import com.sun.syndication.feed.CopyFrom;
-import com.sun.syndication.feed.module.Module;
-import org.jdom.Namespace;
-
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.jdom2.Namespace;
+
+import com.sun.syndication.feed.CopyFrom;
+import com.sun.syndication.feed.module.Module;
+
 /**
- * The base module for SSE data synchronization.  Defines a namespace, uri, and basic
- * copying operations.
+ * The base module for SSE data synchronization. Defines a namespace, uri, and basic copying operations.
  */
 public abstract class SSEModule implements Module {
     public static final String SSE_SCHEMA_URI = "http://www.microsoft.com/schemas/rss/sse";
@@ -22,7 +22,7 @@ public abstract class SSEModule implements Module {
     public static final Set NAMESPACES;
 
     static {
-        Set nss = new HashSet();
+        final Set nss = new HashSet();
         nss.add(SSEModule.SSE_NS);
         NAMESPACES = Collections.unmodifiableSet(nss);
     }
@@ -35,15 +35,16 @@ public abstract class SSEModule implements Module {
         return getClass();
     }
 
+    @Override
     public Object clone() {
         SSEModule clone = null;
         try {
-            clone = (SSEModule) this.getClass().newInstance();
+            clone = this.getClass().newInstance();
             clone.copyFrom(this);
-        } catch (InstantiationException e) {
+        } catch (final InstantiationException e) {
             // TODO: use logging
             e.printStackTrace();
-        } catch (IllegalAccessException e) {
+        } catch (final IllegalAccessException e) {
             // TODO: use logging
             e.printStackTrace();
         }
diff --git a/src/main/java/org/rometools/feed/module/sse/modules/Sharing.java b/src/main/java/org/rometools/feed/module/sse/modules/Sharing.java
index ce11ab4..bbdb415 100644
--- a/src/main/java/org/rometools/feed/module/sse/modules/Sharing.java
+++ b/src/main/java/org/rometools/feed/module/sse/modules/Sharing.java
@@ -1,14 +1,31 @@
 package org.rometools.feed.module.sse.modules;
 
-import com.sun.syndication.feed.CopyFrom;
 import java.util.Date;
 
+import com.sun.syndication.feed.CopyFrom;
+
 /**
- * 
            Element within RSS 
             or OPML 
            .
+ * 
            + * 
+ * 
            
+ * 
+ * Element within RSS
+ * 
+ * 
            + * 
+ * 
            
+ * 
+ * or OPML
+ * 
+ * 
            + * 
+ * 
            
+ * 
+ * .
  */
 public class Sharing extends SSEModule {
     public static final String NAME = "sharing";
-    
+
     public static final String UNTIL_ATTRIBUTE = "until";
     public static final String SINCE_ATTRIBUTE = "since";
     public static final String ORDERED_ATTRIBUTE = "ordered";
@@ -31,8 +48,9 @@ public class Sharing extends SSEModule {
     private Date until;
     private Related related;
 
-    public void copyFrom(CopyFrom obj) {
-        Sharing sharing = (Sharing)obj;
+    @Override
+    public void copyFrom(final CopyFrom obj) {
+        final Sharing sharing = (Sharing) obj;
         ordered = sharing.ordered;
         since = sharing.since == null ? null : (Date) sharing.since.clone();
         window = sharing.window;
@@ -41,10 +59,9 @@ public class Sharing extends SSEModule {
     }
 
     /**
-     * ordered An optional, Boolean attribute. If present and its value is "true" (lower-case), subscribers MUST treat
-     * the item list as an ordered set (see section 3.2). If this attribute is omitted or blank, it is assumed that this
-     * is an unordered feed.
-     *
+     * ordered An optional, Boolean attribute. If present and its value is "true" (lower-case), subscribers MUST treat the item list as an ordered set (see
+     * section 3.2). If this attribute is omitted or blank, it is assumed that this is an unordered feed.
+     * 
      * @return a Boolean indicating if subscribers must treat the item list as an ordered set.
      */
     public Boolean getOrdered() {
@@ -53,17 +70,17 @@ public class Sharing extends SSEModule {
 
     /**
      * Set whether subscribers MUST tread the item list as an ordered set.
-     *
+     * 
      * @param ordered whether subscribers MUST tread the item list as an ordered set.
      */
-    public void setOrdered(Boolean ordered) {
+    public void setOrdered(final Boolean ordered) {
         this.ordered = ordered;
     }
 
     /**
-     * Provides an Integer that expresses the size of the window of change history kept by the publisher. Subscribers
-     * MAY use this value to determine the frequency with which they must read a feed.
-     *
+     * Provides an Integer that expresses the size of the window of change history kept by the publisher. Subscribers MAY use this value to determine the
+     * frequency with which they must read a feed.
+     * 
      * @return an Integer that expresses the size of the window of change history kept by the publisher.
      */
     public Integer getWindow() {
@@ -72,18 +89,17 @@ public class Sharing extends SSEModule {
 
     /**
      * Set an Integer that expresses the size of the window of change history kept by the publisher.
-     *
+     * 
      * @param window an Integer that expresses the size of the window of change history kept by the publisher.
      */
-    public void setWindow(Integer window) {
+    public void setWindow(final Integer window) {
         this.window = window;
     }
 
     /**
-     * since An optional date-time attribute. All items updated on or after this date-time are included in the feed. If
-     * not present or null, the "beginning of time" is assumed and the feed contains the node's complete item set as of
-     * the until date-time.
-     *
+     * since An optional date-time attribute. All items updated on or after this date-time are included in the feed. If not present or null, the
+     * "beginning of time" is assumed and the feed contains the node's complete item set as of the until date-time.
+     * 
      * @return An optional date-time attribute.
      */
     public Date getSince() {
@@ -91,20 +107,19 @@ public class Sharing extends SSEModule {
     }
 
     /**
-     * Sets the optional date-time attribute where all items updated on or after this date-time are included in the
-     * feed.
-     *
+     * Sets the optional date-time attribute where all items updated on or after this date-time are included in the feed.
+     * 
      * @param since An optional date-time attribute.
      */
-    public void setSince(Date since) {
+    public void setSince(final Date since) {
         this.since = since;
     }
 
     /**
-     * until An optional date-time attribute. Items updated after this date are not included in the feed. The publisher
-     * must guarantee that the value of until will increase if any items in the feed are updated. If this attribute is
-     * omitted or blank, the subscriber cannot make assumptions about when the feed was updated.
-     *
+     * until An optional date-time attribute. Items updated after this date are not included in the feed. The publisher must guarantee that the value of until
+     * will increase if any items in the feed are updated. If this attribute is omitted or blank, the subscriber cannot make assumptions about when the feed was
+     * updated.
+     * 
      * @return the date where items updated after this date are not included in the feed.
      */
     public Date getUntil() {
@@ -113,14 +128,14 @@ public class Sharing extends SSEModule {
 
     /**
      * Set the date where items updated after this date are not included in the feed.
-     *
+     * 
      * @param until the date where items updated after this date are not included in the feed.
      */
-    public void setUntil(Date until) {
+    public void setUntil(final Date until) {
         this.until = until;
     }
 
-    public void setRelated(Related related) {
+    public void setRelated(final Related related) {
         this.related = related;
     }
 
@@ -128,7 +143,7 @@ public class Sharing extends SSEModule {
         return related;
     }
 
-    public void setVersion(String version) {
+    public void setVersion(final String version) {
         this.version = version;
     }
 
diff --git a/src/main/java/org/rometools/feed/module/sse/modules/Sync.java b/src/main/java/org/rometools/feed/module/sse/modules/Sync.java
index e0db7de..c7ccb4e 100644
--- a/src/main/java/org/rometools/feed/module/sse/modules/Sync.java
+++ b/src/main/java/org/rometools/feed/module/sse/modules/Sync.java
@@ -1,11 +1,28 @@
 package org.rometools.feed.module.sse.modules;
 
-import com.sun.syndication.feed.CopyFrom;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.sun.syndication.feed.CopyFrom;
+
 /**
- * 
            Element within RSS 
             or OPML 
            .
+ * 
            + * 
+ * 
            
+ * 
+ * Element within RSS
+ * 
+ * 
            + * 
+ * 
            
+ * 
+ * or OPML
+ * 
+ * 
            + * 
+ * 
            
+ * 
+ * .
  */
 public class Sync extends SSEModule {
     public static final String NAME = "sync";
@@ -27,13 +44,14 @@ public class Sync extends SSEModule {
     private History history;
     private List conflicts;
 
-    public void copyFrom(CopyFrom obj) {
-        Sync sync = (Sync)obj;
+    @Override
+    public void copyFrom(final CopyFrom obj) {
+        final Sync sync = (Sync) obj;
         deleted = sync.deleted;
         version = sync.version;
         conflict = sync.conflict;
         id = sync.id;
-        history = (sync.history == null ? null : (History)sync.history.clone());
+        history = sync.history == null ? null : (History) sync.history.clone();
         if (sync.conflicts != null) {
             conflicts = new ArrayList();
             conflicts.addAll(sync.conflicts);
@@ -43,27 +61,26 @@ public class Sync extends SSEModule {
     /**
      * Provides access to the sync id, a required, string attribute. This is the identifier for the item.
      * 
            
-     * The ID is assigned by the creator of the item, and MUST NOT be changed by subsequent publishers. Applications
-     * will collate and compare these identifiers, therefore they MUST conform to the syntax for Namespace Specific
-     * Strings (the NSS portion of a URN) in RFC 2141.
+     * The ID is assigned by the creator of the item, and MUST NOT be changed by subsequent publishers. Applications will collate and compare these identifiers,
+     * therefore they MUST conform to the syntax for Namespace Specific Strings (the NSS portion of a URN) in RFC 2141.
      */
     public String getId() {
         return id;
     }
 
     /**
-     * Set the identifier for the item. The ID MUST be globally unique within the feed and it MUST be identical across
-     * feeds if an item is being shared or replicated as part of multiple distinct independent feeds.
-     *
+     * Set the identifier for the item. The ID MUST be globally unique within the feed and it MUST be identical across feeds if an item is being shared or
+     * replicated as part of multiple distinct independent feeds.
+     * 
      * @param id the identifier for the item.
      */
-    public void setId(String id) {
+    public void setId(final String id) {
         this.id = id;
     }
 
     /**
-     * Provides access to a required, integer attribute. This is the modification sequence number of the item, starting
-     * at 1 and incrementing by 1 indefinitely for each subsequent modification.
+     * Provides access to a required, integer attribute. This is the modification sequence number of the item, starting at 1 and incrementing by 1 indefinitely
+     * for each subsequent modification.
      */
     public Integer getVersion() {
         return version;
@@ -71,17 +88,16 @@ public class Sync extends SSEModule {
 
     /**
      * Set the modification sequence number of the item.
-     *
+     * 
      * @param version the modification sequence number of the item.
      */
-    public void setVersion(Integer version) {
+    public void setVersion(final Integer version) {
         this.version = version;
     }
 
     /**
-     * Provide access to an optional, Boolean attribute. If present and its value is "true" (lower-case), it indicates
-     * that the item has been deleted and this is a tombstone. If not present, or if present with value of "false" or
-     * "", then the item is not deleted. All other values are invalid.
+     * Provide access to an optional, Boolean attribute. If present and its value is "true" (lower-case), it indicates that the item has been deleted and this
+     * is a tombstone. If not present, or if present with value of "false" or "", then the item is not deleted. All other values are invalid.
      */
     public Boolean isDeleted() {
         return deleted;
@@ -89,19 +105,18 @@ public class Sync extends SSEModule {
 
     /**
      * Set an indication of whether this item has been deleted and is a tombstone.
-     *
+     * 
      * @param deleted an indication of whether this item has been deleted and is a tombstone.
      */
-    public void setDeleted(Boolean deleted) {
+    public void setDeleted(final Boolean deleted) {
         this.deleted = deleted;
     }
 
     /**
-     * Provides access to an optional, Boolean conflict attribute. If present and its value is "true" (lower-case), it
-     * indicates there was an update conflict detected when processing an update of this item, and it should potentially
-     * be examined by the user. If not present, or present with value of "false" or "", Then no conflict has been
-     * detected. All other values are invalid.
-     *
+     * Provides access to an optional, Boolean conflict attribute. If present and its value is "true" (lower-case), it indicates there was an update conflict
+     * detected when processing an update of this item, and it should potentially be examined by the user. If not present, or present with value of "false" or
+     * "", Then no conflict has been detected. All other values are invalid.
+     * 
      * @return indicates there was an update conflict detected when processing an update of this item.
      */
     public Boolean isConflict() {
@@ -110,11 +125,10 @@ public class Sync extends SSEModule {
 
     /**
      * Set an indication of whether there was an update conflict detected when processing an update of this item.
-     *
-     * @param conflict an indication of whether there was an update conflict detected when processing an update of this
-     *                 item.
+     * 
+     * @param conflict an indication of whether there was an update conflict detected when processing an update of this item.
      */
-    public void setConflict(Boolean conflict) {
+    public void setConflict(final Boolean conflict) {
         this.conflict = conflict;
     }
 
@@ -123,23 +137,23 @@ public class Sync extends SSEModule {
 
     /**
      * The history history for this sync object
-     *
+     * 
      * @param history the history for this sync object.
      */
-    public void setHistory(History history) {
+    public void setHistory(final History history) {
         this.history = history;
     }
 
     /**
      * Get the history for this sync object
-     *
+     * 
      * @return get the history for this sync object.
      */
     public History getHistory() {
         return history;
     }
 
-    public void addConflict(Conflict conflict) {
+    public void addConflict(final Conflict conflict) {
         if (conflicts == null) {
             conflicts = new ArrayList();
         }
@@ -150,7 +164,7 @@ public class Sync extends SSEModule {
         return conflicts;
     }
 
-    public void setConflicts(List conflicts) {
+    public void setConflicts(final List conflicts) {
         this.conflicts = conflicts;
     }
 }
diff --git a/src/main/java/org/rometools/feed/module/sse/modules/Update.java b/src/main/java/org/rometools/feed/module/sse/modules/Update.java
index 13d39d1..f9db47c 100644
--- a/src/main/java/org/rometools/feed/module/sse/modules/Update.java
+++ b/src/main/java/org/rometools/feed/module/sse/modules/Update.java
@@ -1,10 +1,21 @@
 package org.rometools.feed.module.sse.modules;
 
-import com.sun.syndication.feed.CopyFrom;
 import java.util.Date;
 
+import com.sun.syndication.feed.CopyFrom;
+
 /**
- * 
            Element within 
            .
+ * 
            + * 
+ * 
            
+ * 
+ * Element within
+ * 
+ * 
            + * 
+ * 
            
+ * 
+ * .
  */
 public class Update extends SSEModule {
     public static final String NAME = "update";
@@ -14,17 +25,17 @@ public class Update extends SSEModule {
     private Date when;
     private String by;
 
-    public void copyFrom(CopyFrom other) {
-        Update otherUpdate = (Update)other;
+    @Override
+    public void copyFrom(final CopyFrom other) {
+        final Update otherUpdate = (Update) other;
         otherUpdate.when = when == null ? null : (Date) when.clone();
         // dont copy immutable
         otherUpdate.by = by;
     }
 
     /**
-     * Provides access to the date-time when the modification took place. If this attribute is omitted
-     * the value defaults to the earliest time representable in RFC 822. Either or both of the when or by attributes
-     * MUST be present; it is invalid to have neither.
+     * Provides access to the date-time when the modification took place. If this attribute is omitted the value defaults to the earliest time representable in
+     * RFC 822. Either or both of the when or by attributes MUST be present; it is invalid to have neither.
      */
     public Date getWhen() {
         return when;
@@ -32,19 +43,18 @@ public class Update extends SSEModule {
 
     /**
      * Set the date-time when the modification took place.
-     *
+     * 
      * @param when the date-time when the modification took place.
      */
-    public void setWhen(Date when) {
+    public void setWhen(final Date when) {
         this.when = when;
     }
 
     /**
-     * Provides access to a text attribute identifying the unique endpoint that made a modification. This SHOULD be
-     * some combination of user and device (so that a given user can edit a feed on multiple devices). This attribute is
-     * used programmatically to break ties in case two changes happened at the same time (within the same second).
-     * Either or both of the when or by must be present; it is invalid to have neither.
-     *
+     * Provides access to a text attribute identifying the unique endpoint that made a modification. This SHOULD be some combination of user and device (so that
+     * a given user can edit a feed on multiple devices). This attribute is used programmatically to break ties in case two changes happened at the same time
+     * (within the same second). Either or both of the when or by must be present; it is invalid to have neither.
+     * 
      * @return access to a text attribute identifying the unique endpoint that made a modification.
      */
     public String getBy() {
@@ -53,10 +63,10 @@ public class Update extends SSEModule {
 
     /**
      * Sets a text attribute identifying the unique endpoint that made a modification.
-     *
-     * @param by a text attribute identifying the unique endpoint that made a modification. 
+     * 
+     * @param by a text attribute identifying the unique endpoint that made a modification.
      */
-    public void setBy(String by) {
+    public void setBy(final String by) {
         this.by = by;
     }
 }
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/YWeatherEntryModule.java b/src/main/java/org/rometools/feed/module/yahooweather/YWeatherEntryModule.java
index 941f4c5..cf5f13c 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/YWeatherEntryModule.java
+++ b/src/main/java/org/rometools/feed/module/yahooweather/YWeatherEntryModule.java
@@ -39,33 +39,37 @@ package org.rometools.feed.module.yahooweather;
 import org.rometools.feed.module.yahooweather.types.Condition;
 import org.rometools.feed.module.yahooweather.types.Forecast;
 
-
 /**
  * An interface describing the entry/item level data for Yahoo Weather.
+ * 
  * @version $Id: YWeatherEntryModule.java,v 1.2 2008/01/22 14:50:06 kebernet Exp $
  * @author Robert "kebernet" Cooper
  */
 public interface YWeatherEntryModule extends YWeatherModule {
     /**
      * The current conditions.
+     * 
      * @return The current conditions.
      */
     public Condition getCondition();
 
     /**
      * The current conditions.
+     * 
      * @param condition The current conditions.
      */
     public void setCondition(Condition condition);
 
     /**
      * Forecasts for this location.
+     * 
      * @return Forecasts for this location.
      */
     public Forecast[] getForecasts();
 
     /**
      * Forecasts for this location.
+     * 
      * @param forecasts Forecasts for this location.
      */
     public void setForecasts(Forecast[] forecasts);
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/YWeatherFeedModule.java b/src/main/java/org/rometools/feed/module/yahooweather/YWeatherFeedModule.java
index 1e3df6c..a5b1a01 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/YWeatherFeedModule.java
+++ b/src/main/java/org/rometools/feed/module/yahooweather/YWeatherFeedModule.java
@@ -41,69 +41,79 @@ import org.rometools.feed.module.yahooweather.types.Location;
 import org.rometools.feed.module.yahooweather.types.Units;
 import org.rometools.feed.module.yahooweather.types.Wind;
 
-
 /**
  * An interface describing feed/channel level data for Yahoo Weather.
+ * 
  * @version $Id: YWeatherFeedModule.java,v 1.3 2008/03/29 16:19:12 kebernet Exp $
  * @author Robert "kebernet" Cooper
  */
 public interface YWeatherFeedModule extends YWeatherModule {
     /**
      * The location the feed is for.
+     * 
      * @return The location the feed is for.
      */
     public Location getLocation();
 
     /**
      * The location the feed is for.
+     * 
      * @param location The location the feed is for.
      */
     public void setLocation(Location location);
 
     /**
      * Astronomical information for the location.
+     * 
      * @return Astronomical information for the location.
      */
     public Astronomy getAstronomy();
 
     /**
      * Astronomical information for the location.
+     * 
      * @param astronomy Astronomical information for the location.
      */
     public void setAstronomy(Astronomy astronomy);
 
     /**
      * Units that data in the feed is provided in.
+     * 
      * @return Units that data in the feed is provided in.
      */
     public Units getUnits();
 
     /**
      * Units that data in the feed is provided in.
+     * 
      * @param units Units that data in the feed is provided in.
      */
     public void setUnits(Units units);
 
     /**
      * Current wind conditions at the location.
+     * 
      * @return Current wind conditions at the location.
      */
     public Wind getWind();
 
     /**
      * Current wind conditions at the location.
+     * 
      * @param wind Current wind conditions at the location.
      */
     public void setWind(Wind wind);
 
     /**
      * The current atmospheric conditions.
+     * 
      * @return Atmosphere object.
      */
     public Atmosphere getAtmosphere();
 
     /**
      * Sets the current atmopheric condictions
+     * 
      * @param value Atmosphere object.
      */
     public void setAtmosphere(Atmosphere value);
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/YWeatherModule.java b/src/main/java/org/rometools/feed/module/yahooweather/YWeatherModule.java
index 59146f6..530345b 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/YWeatherModule.java
+++ b/src/main/java/org/rometools/feed/module/yahooweather/YWeatherModule.java
@@ -37,10 +37,9 @@ package org.rometools.feed.module.yahooweather;
 
 import com.sun.syndication.feed.module.Module;
 
-
 /**
  * A simple parent interface that defines the feed URI
- *
+ * 
  * @version $Id: YWeatherModule.java,v 1.2 2008/01/22 14:50:06 kebernet Exp $
  * @author Robert "kebernet" Cooper
  */
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/YWeatherModuleImpl.java b/src/main/java/org/rometools/feed/module/yahooweather/YWeatherModuleImpl.java
index 3dc2013..de9ee54 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/YWeatherModuleImpl.java
+++ b/src/main/java/org/rometools/feed/module/yahooweather/YWeatherModuleImpl.java
@@ -35,8 +35,6 @@
  */
 package org.rometools.feed.module.yahooweather;
 
-import com.sun.syndication.feed.CopyFrom;
-import com.sun.syndication.feed.module.ModuleImpl;
 import org.rometools.feed.module.yahooweather.types.Astronomy;
 import org.rometools.feed.module.yahooweather.types.Atmosphere;
 import org.rometools.feed.module.yahooweather.types.Condition;
@@ -45,14 +43,16 @@ import org.rometools.feed.module.yahooweather.types.Location;
 import org.rometools.feed.module.yahooweather.types.Units;
 import org.rometools.feed.module.yahooweather.types.Wind;
 
+import com.sun.syndication.feed.CopyFrom;
+import com.sun.syndication.feed.module.ModuleImpl;
 
 /**
  * A Module implementation for entry or feed level information.
+ * 
  * @version $Id: YWeatherModuleImpl.java,v 1.2 2008/01/22 14:50:06 kebernet Exp $
  * @author Robert "kebernet" Cooper
  */
-public class YWeatherModuleImpl extends ModuleImpl
-    implements YWeatherEntryModule, YWeatherFeedModule {
+public class YWeatherModuleImpl extends ModuleImpl implements YWeatherEntryModule, YWeatherFeedModule {
     private Location location;
     private Astronomy astronomy;
     private Atmosphere atmosphere;
@@ -69,31 +69,24 @@ public class YWeatherModuleImpl extends ModuleImpl
         return CopyFromInterface.class;
     }
 
-    public void copyFrom(CopyFrom o) {
-        YWeatherModuleImpl from = (YWeatherModuleImpl) o;
-        this.setAstronomy((from.getAstronomy() != null)
-            ? (Astronomy) from.getAstronomy().clone() : null);
-        this.setCondition((from.getCondition() != null)
-            ? (Condition) from.getCondition().clone() : null);
-        this.setLocation((from.getLocation() != null)
-            ? (Location) from.getLocation().clone() : null);
-        this.setUnits((from.getUnits() != null)
-            ? (Units) from.getUnits().clone() : null);
-        this.setWind((from.getWind() != null) ? (Wind) from.getWind().clone()
-                                              : null);
+    public void copyFrom(final CopyFrom o) {
+        final YWeatherModuleImpl from = (YWeatherModuleImpl) o;
+        setAstronomy(from.getAstronomy() != null ? (Astronomy) from.getAstronomy().clone() : null);
+        setCondition(from.getCondition() != null ? (Condition) from.getCondition().clone() : null);
+        setLocation(from.getLocation() != null ? (Location) from.getLocation().clone() : null);
+        setUnits(from.getUnits() != null ? (Units) from.getUnits().clone() : null);
+        setWind(from.getWind() != null ? (Wind) from.getWind().clone() : null);
 
-        this.setAtmosphere((from.getAtmosphere() != null)
-            ? (Atmosphere) from.getAtmosphere().clone() : null);
+        setAtmosphere(from.getAtmosphere() != null ? (Atmosphere) from.getAtmosphere().clone() : null);
 
-        if(from.getForecasts() != null) {
-            this.forecasts = new Forecast[from.forecasts.length];
+        if (from.getForecasts() != null) {
+            forecasts = new Forecast[from.forecasts.length];
 
-            for(int i = 0; i < from.forecasts.length; i++) {
-                this.forecasts[i] = (from.forecasts[i] != null)
-                    ? (Forecast) from.forecasts[i].clone() : null;
+            for (int i = 0; i < from.forecasts.length; i++) {
+                forecasts[i] = from.forecasts[i] != null ? (Forecast) from.forecasts[i].clone() : null;
             }
         } else {
-            this.forecasts = null;
+            forecasts = null;
         }
     }
 
@@ -101,7 +94,7 @@ public class YWeatherModuleImpl extends ModuleImpl
         return location;
     }
 
-    public void setLocation(Location location) {
+    public void setLocation(final Location location) {
         this.location = location;
     }
 
@@ -109,7 +102,7 @@ public class YWeatherModuleImpl extends ModuleImpl
         return astronomy;
     }
 
-    public void setAstronomy(Astronomy astronomy) {
+    public void setAstronomy(final Astronomy astronomy) {
         this.astronomy = astronomy;
     }
 
@@ -117,7 +110,7 @@ public class YWeatherModuleImpl extends ModuleImpl
         return units;
     }
 
-    public void setUnits(Units units) {
+    public void setUnits(final Units units) {
         this.units = units;
     }
 
@@ -125,7 +118,7 @@ public class YWeatherModuleImpl extends ModuleImpl
         return condition;
     }
 
-    public void setCondition(Condition condition) {
+    public void setCondition(final Condition condition) {
         this.condition = condition;
     }
 
@@ -133,7 +126,7 @@ public class YWeatherModuleImpl extends ModuleImpl
         return forecasts;
     }
 
-    public void setForecasts(Forecast[] forecasts) {
+    public void setForecasts(final Forecast[] forecasts) {
         this.forecasts = forecasts;
     }
 
@@ -141,7 +134,7 @@ public class YWeatherModuleImpl extends ModuleImpl
         return wind;
     }
 
-    public void setWind(Wind wind) {
+    public void setWind(final Wind wind) {
         this.wind = wind;
     }
 
@@ -149,11 +142,10 @@ public class YWeatherModuleImpl extends ModuleImpl
         return atmosphere;
     }
 
-    public void setAtmosphere(Atmosphere atmosphere) {
+    public void setAtmosphere(final Atmosphere atmosphere) {
         this.atmosphere = atmosphere;
     }
 
-    public static interface CopyFromInterface extends YWeatherFeedModule,
-        YWeatherEntryModule {
+    public static interface CopyFromInterface extends YWeatherFeedModule, YWeatherEntryModule {
     }
 }
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/io/WeatherModuleGenerator.java b/src/main/java/org/rometools/feed/module/yahooweather/io/WeatherModuleGenerator.java
index 309b9c9..c9d5a2f 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/io/WeatherModuleGenerator.java
+++ b/src/main/java/org/rometools/feed/module/yahooweather/io/WeatherModuleGenerator.java
@@ -38,179 +38,152 @@
 package org.rometools.feed.module.yahooweather.io;
 
 import java.text.SimpleDateFormat;
-
 import java.util.HashSet;
 
-import com.sun.syndication.feed.module.Module;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 import org.rometools.feed.module.yahooweather.YWeatherModule;
 import org.rometools.feed.module.yahooweather.YWeatherModuleImpl;
 import org.rometools.feed.module.yahooweather.types.Forecast;
+
+import com.sun.syndication.feed.module.Module;
 import com.sun.syndication.io.ModuleGenerator;
 
-import org.jdom.Element;
-import org.jdom.Namespace;
-
-
-/** The ModuleGenerator implementation for the Yahoo Weather plug in.
+/**
+ * The ModuleGenerator implementation for the Yahoo Weather plug in.
+ * 
  * @version $Revision: 1.3 $
  * @author Robert "kebernet" Cooper
  */
 public class WeatherModuleGenerator implements ModuleGenerator {
-    private static final Namespace NS = Namespace.getNamespace("yweather",
-            YWeatherModule.URI);
-    private static final SimpleDateFormat TIME_ONLY = new SimpleDateFormat(
-            "h:mm a");
-    private static final SimpleDateFormat LONG_DATE = new SimpleDateFormat(
-            "EEE, d MMM yyyy h:mm a zzz");
-    private static final SimpleDateFormat SHORT_DATE = new SimpleDateFormat(
-            "d MMM yyyy");
+    private static final Namespace NS = Namespace.getNamespace("yweather", YWeatherModule.URI);
+    private static final SimpleDateFormat TIME_ONLY = new SimpleDateFormat("h:mm a");
+    private static final SimpleDateFormat LONG_DATE = new SimpleDateFormat("EEE, d MMM yyyy h:mm a zzz");
+    private static final SimpleDateFormat SHORT_DATE = new SimpleDateFormat("d MMM yyyy");
 
     /** Creates a new instance of SlashModuleGenerator */
     public WeatherModuleGenerator() {
     }
 
-    public void generate(Module module, Element element) {
-        if(!(module instanceof YWeatherModuleImpl)) {
+    public void generate(final Module module, final Element element) {
+        if (!(module instanceof YWeatherModuleImpl)) {
             return;
         }
 
-        YWeatherModuleImpl weather = (YWeatherModuleImpl) module;
+        final YWeatherModuleImpl weather = (YWeatherModuleImpl) module;
 
-        if(weather.getAstronomy() != null) {
-            Element astro = new Element("astronomy", WeatherModuleGenerator.NS);
+        if (weather.getAstronomy() != null) {
+            final Element astro = new Element("astronomy", WeatherModuleGenerator.NS);
 
-            if(weather.getAstronomy().getSunrise() != null) {
-                astro.setAttribute("sunrise",
-                    TIME_ONLY.format(weather.getAstronomy().getSunrise())
-                             .toLowerCase());
+            if (weather.getAstronomy().getSunrise() != null) {
+                astro.setAttribute("sunrise", TIME_ONLY.format(weather.getAstronomy().getSunrise()).toLowerCase());
             }
 
-            if(weather.getAstronomy().getSunrise() != null) {
-                astro.setAttribute("sunset",
-                    TIME_ONLY.format(weather.getAstronomy().getSunset())
-                             .toLowerCase());
+            if (weather.getAstronomy().getSunrise() != null) {
+                astro.setAttribute("sunset", TIME_ONLY.format(weather.getAstronomy().getSunset()).toLowerCase());
             }
 
             element.addContent(astro);
         }
 
-        if(weather.getAtmosphere() != null) {
-            Element atmos = new Element("atmosphere", WeatherModuleGenerator.NS);
-            atmos.setAttribute("humidity",
-                Integer.toString(weather.getAtmosphere().getHumidity()));
-            atmos.setAttribute("visibility",
-                Integer.toString(
-                    (int) (weather.getAtmosphere().getVisibility() * 100d)));
-            atmos.setAttribute("pressure",
-                Double.toString(weather.getAtmosphere().getPressure()));
+        if (weather.getAtmosphere() != null) {
+            final Element atmos = new Element("atmosphere", WeatherModuleGenerator.NS);
+            atmos.setAttribute("humidity", Integer.toString(weather.getAtmosphere().getHumidity()));
+            atmos.setAttribute("visibility", Integer.toString((int) (weather.getAtmosphere().getVisibility() * 100d)));
+            atmos.setAttribute("pressure", Double.toString(weather.getAtmosphere().getPressure()));
 
-            if(weather.getAtmosphere().getChange() != null) {
-                atmos.setAttribute("rising",
-                    Integer.toString(weather.getAtmosphere().getChange()
-                                            .getCode()));
+            if (weather.getAtmosphere().getChange() != null) {
+                atmos.setAttribute("rising", Integer.toString(weather.getAtmosphere().getChange().getCode()));
             }
 
             element.addContent(atmos);
         }
 
-        if(weather.getCondition() != null) {
-            Element condition = new Element("condition",
-                    WeatherModuleGenerator.NS);
+        if (weather.getCondition() != null) {
+            final Element condition = new Element("condition", WeatherModuleGenerator.NS);
 
-            if(weather.getCondition().getText() != null) {
+            if (weather.getCondition().getText() != null) {
                 condition.setAttribute("text", weather.getCondition().getText());
             }
 
-            if(weather.getCondition().getCode() != null) {
-                condition.setAttribute("code",
-                    Integer.toString(weather.getCondition().getCode().getCode()));
+            if (weather.getCondition().getCode() != null) {
+                condition.setAttribute("code", Integer.toString(weather.getCondition().getCode().getCode()));
             }
 
-            if(weather.getCondition().getDate() != null) {
-                condition.setAttribute("date",
-                    LONG_DATE.format(weather.getCondition().getDate())
-                             .replaceAll("AM", "am").replaceAll("PM", "pm"));
+            if (weather.getCondition().getDate() != null) {
+                condition.setAttribute("date", LONG_DATE.format(weather.getCondition().getDate()).replaceAll("AM", "am").replaceAll("PM", "pm"));
             }
 
-            condition.setAttribute("temp",
-                Integer.toString(weather.getCondition().getTemperature()));
+            condition.setAttribute("temp", Integer.toString(weather.getCondition().getTemperature()));
             element.addContent(condition);
         }
 
-        if(weather.getLocation() != null) {
-            Element location = new Element("location", WeatherModuleGenerator.NS);
+        if (weather.getLocation() != null) {
+            final Element location = new Element("location", WeatherModuleGenerator.NS);
 
-            if(weather.getLocation().getCity() != null) {
+            if (weather.getLocation().getCity() != null) {
                 location.setAttribute("city", weather.getLocation().getCity());
             }
 
-            if(weather.getLocation().getRegion() != null) {
-                location.setAttribute("region",
-                    weather.getLocation().getRegion());
+            if (weather.getLocation().getRegion() != null) {
+                location.setAttribute("region", weather.getLocation().getRegion());
             }
 
-            if(weather.getLocation().getCountry() != null) {
-                location.setAttribute("country",
-                    weather.getLocation().getCountry());
+            if (weather.getLocation().getCountry() != null) {
+                location.setAttribute("country", weather.getLocation().getCountry());
             }
 
             element.addContent(location);
         }
 
-        if(weather.getUnits() != null) {
-            Element units = new Element("units", WeatherModuleGenerator.NS);
+        if (weather.getUnits() != null) {
+            final Element units = new Element("units", WeatherModuleGenerator.NS);
 
-            if(weather.getUnits().getDistance() != null) {
+            if (weather.getUnits().getDistance() != null) {
                 units.setAttribute("distance", weather.getUnits().getDistance());
             }
 
-            if(weather.getUnits().getPressure() != null) {
+            if (weather.getUnits().getPressure() != null) {
                 units.setAttribute("pressure", weather.getUnits().getPressure());
             }
 
-            if(weather.getUnits().getSpeed() != null) {
+            if (weather.getUnits().getSpeed() != null) {
                 units.setAttribute("speed", weather.getUnits().getSpeed());
             }
 
-            if(weather.getUnits().getTemperature() != null) {
-                units.setAttribute("temperature",
-                    weather.getUnits().getTemperature());
+            if (weather.getUnits().getTemperature() != null) {
+                units.setAttribute("temperature", weather.getUnits().getTemperature());
             }
 
             element.addContent(units);
         }
 
-        if(weather.getWind() != null) {
-            Element wind = new Element("wind", WeatherModuleGenerator.NS);
-            wind.setAttribute("chill",
-                Integer.toString(weather.getWind().getChill()));
-            wind.setAttribute("direction",
-                Integer.toString(weather.getWind().getDirection()));
-            wind.setAttribute("speed",
-                Integer.toString(weather.getWind().getSpeed()));
+        if (weather.getWind() != null) {
+            final Element wind = new Element("wind", WeatherModuleGenerator.NS);
+            wind.setAttribute("chill", Integer.toString(weather.getWind().getChill()));
+            wind.setAttribute("direction", Integer.toString(weather.getWind().getDirection()));
+            wind.setAttribute("speed", Integer.toString(weather.getWind().getSpeed()));
             element.addContent(wind);
         }
 
-        if(weather.getForecasts() != null) {
-            for(int i = 0; i < weather.getForecasts().length; i++) {
-                Element forecast = new Element("forecast",
-                        WeatherModuleGenerator.NS);
-                Forecast f = weather.getForecasts()[i];
+        if (weather.getForecasts() != null) {
+            for (int i = 0; i < weather.getForecasts().length; i++) {
+                final Element forecast = new Element("forecast", WeatherModuleGenerator.NS);
+                final Forecast f = weather.getForecasts()[i];
 
-                if(f.getCode() != null) {
-                    forecast.setAttribute("code",
-                        Integer.toString(f.getCode().getCode()));
+                if (f.getCode() != null) {
+                    forecast.setAttribute("code", Integer.toString(f.getCode().getCode()));
                 }
 
-                if(f.getDate() != null) {
+                if (f.getDate() != null) {
                     forecast.setAttribute("date", SHORT_DATE.format(f.getDate()));
                 }
 
-                if(f.getDay() != null) {
+                if (f.getDay() != null) {
                     forecast.setAttribute("day", f.getDay());
                 }
 
-                if(f.getText() != null) {
+                if (f.getText() != null) {
                     forecast.setAttribute("text", f.getText());
                 }
 
@@ -221,15 +194,15 @@ public class WeatherModuleGenerator implements ModuleGenerator {
         }
     }
 
-    protected Element generateSimpleElement(String name, String value) {
-        Element element = new Element(name, WeatherModuleGenerator.NS);
+    protected Element generateSimpleElement(final String name, final String value) {
+        final Element element = new Element(name, WeatherModuleGenerator.NS);
         element.addContent(value);
 
         return element;
     }
 
     public java.util.Set getNamespaces() {
-        HashSet set = new HashSet();
+        final HashSet set = new HashSet();
         set.add(WeatherModuleGenerator.NS);
 
         return set;
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/io/WeatherModuleParser.java b/src/main/java/org/rometools/feed/module/yahooweather/io/WeatherModuleParser.java
index 03075e3..cf07e20 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/io/WeatherModuleParser.java
+++ b/src/main/java/org/rometools/feed/module/yahooweather/io/WeatherModuleParser.java
@@ -40,12 +40,12 @@ package org.rometools.feed.module.yahooweather.io;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-
 import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Logger;
 
-import com.sun.syndication.feed.module.Module;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 import org.rometools.feed.module.yahooweather.YWeatherModule;
 import org.rometools.feed.module.yahooweather.YWeatherModuleImpl;
 import org.rometools.feed.module.yahooweather.types.Astronomy;
@@ -56,23 +56,20 @@ import org.rometools.feed.module.yahooweather.types.Forecast;
 import org.rometools.feed.module.yahooweather.types.Location;
 import org.rometools.feed.module.yahooweather.types.Units;
 import org.rometools.feed.module.yahooweather.types.Wind;
+
+import com.sun.syndication.feed.module.Module;
 import com.sun.syndication.io.ModuleParser;
 
-import org.jdom.Element;
-import org.jdom.Namespace;
-
-
-/** ModuleParser implementation for Slash RSS.
+/**
+ * ModuleParser implementation for Slash RSS.
+ * 
  * @version $Revision: 1.2 $
  * @author Robert "kebernet" Cooper
  */
 public class WeatherModuleParser implements ModuleParser {
-    private static final SimpleDateFormat TIME_ONLY = new SimpleDateFormat(
-            "h:mm a");
-    private static final SimpleDateFormat LONG_DATE = new SimpleDateFormat(
-            "EEE, d MMM yyyy h:mm a zzz");
-    private static final SimpleDateFormat SHORT_DATE = new SimpleDateFormat(
-            "d MMM yyyy");
+    private static final SimpleDateFormat TIME_ONLY = new SimpleDateFormat("h:mm a");
+    private static final SimpleDateFormat LONG_DATE = new SimpleDateFormat("EEE, d MMM yyyy h:mm a zzz");
+    private static final SimpleDateFormat SHORT_DATE = new SimpleDateFormat("d MMM yyyy");
     private static final Namespace NS = Namespace.getNamespace(YWeatherModule.URI);
 
     /** Creates a new instance of SlashModuleParser */
@@ -84,124 +81,92 @@ public class WeatherModuleParser implements ModuleParser {
         return YWeatherModule.URI;
     }
 
-    public Module parse(Element element) {
-        YWeatherModuleImpl module = new YWeatherModuleImpl();
-        Element location = element.getChild("location", WeatherModuleParser.NS);
+    public Module parse(final Element element) {
+        final YWeatherModuleImpl module = new YWeatherModuleImpl();
+        final Element location = element.getChild("location", WeatherModuleParser.NS);
 
-        if(location != null) {
-            Location l = new Location(location.getAttributeValue("city"),
-                    location.getAttributeValue("region"),
-                    location.getAttributeValue("country"));
+        if (location != null) {
+            final Location l = new Location(location.getAttributeValue("city"), location.getAttributeValue("region"), location.getAttributeValue("country"));
             module.setLocation(l);
         }
 
-        Element units = element.getChild("units", WeatherModuleParser.NS);
+        final Element units = element.getChild("units", WeatherModuleParser.NS);
 
-        if(units != null) {
-            Units u = new Units(units.getAttributeValue("temperature"),
-                    units.getAttributeValue("distance"),
-                    units.getAttributeValue("pressure"),
+        if (units != null) {
+            final Units u = new Units(units.getAttributeValue("temperature"), units.getAttributeValue("distance"), units.getAttributeValue("pressure"),
                     units.getAttributeValue("speed"));
             module.setUnits(u);
         }
 
-        Element wind = element.getChild("wind", WeatherModuleParser.NS);
+        final Element wind = element.getChild("wind", WeatherModuleParser.NS);
 
-        if(wind != null) {
+        if (wind != null) {
             try {
-                Wind w = new Wind(Integer.parseInt(wind.getAttributeValue(
-                                "chill")),
-                        Integer.parseInt(wind.getAttributeValue("direction")),
+                final Wind w = new Wind(Integer.parseInt(wind.getAttributeValue("chill")), Integer.parseInt(wind.getAttributeValue("direction")),
                         Integer.parseInt(wind.getAttributeValue("speed")));
                 module.setWind(w);
-            } catch(NumberFormatException nfe) {
-                Logger.getAnonymousLogger()
-                      .warning("NumberFormatException processing  tag.");
+            } catch (final NumberFormatException nfe) {
+                Logger.getAnonymousLogger().warning("NumberFormatException processing  tag.");
             }
         }
 
-        Element atmosphere = element.getChild("atmosphere",
-                WeatherModuleParser.NS);
+        final Element atmosphere = element.getChild("atmosphere", WeatherModuleParser.NS);
 
-        if(atmosphere != null) {
+        if (atmosphere != null) {
             try {
-                Atmosphere a = new Atmosphere(Integer.parseInt(
-                            atmosphere.getAttributeValue("humidity")),
-                        Double.parseDouble(atmosphere.getAttributeValue(
-                                "visibility")) / 100,
-                        Double.parseDouble(atmosphere.getAttributeValue(
-                                "pressure")),
-                        Atmosphere.PressureChange.fromCode(Integer.parseInt(
-                                atmosphere.getAttributeValue("rising"))));
+                final Atmosphere a = new Atmosphere(Integer.parseInt(atmosphere.getAttributeValue("humidity")), Double.parseDouble(atmosphere
+                        .getAttributeValue("visibility")) / 100, Double.parseDouble(atmosphere.getAttributeValue("pressure")),
+                        Atmosphere.PressureChange.fromCode(Integer.parseInt(atmosphere.getAttributeValue("rising"))));
                 module.setAtmosphere(a);
-            } catch(NumberFormatException nfe) {
-                Logger.getAnonymousLogger()
-                      .warning("NumberFormatException processing  tag.");
+            } catch (final NumberFormatException nfe) {
+                Logger.getAnonymousLogger().warning("NumberFormatException processing  tag.");
             }
         }
 
-        Element astronomy = element.getChild("astronomy", WeatherModuleParser.NS);
+        final Element astronomy = element.getChild("astronomy", WeatherModuleParser.NS);
 
-        if(astronomy != null) {
+        if (astronomy != null) {
             try {
-                Astronomy a = new Astronomy(TIME_ONLY.parse(
-                            astronomy.getAttributeValue("sunrise")
-                                     .replaceAll("am", "AM")
-                                     .replaceAll("pm", "PM")),
-                        TIME_ONLY.parse(astronomy.getAttributeValue("sunset")
-                                                 .replaceAll("am", "AM")
-                                                 .replaceAll("pm", "PM")));
+                final Astronomy a = new Astronomy(TIME_ONLY.parse(astronomy.getAttributeValue("sunrise").replaceAll("am", "AM").replaceAll("pm", "PM")),
+                        TIME_ONLY.parse(astronomy.getAttributeValue("sunset").replaceAll("am", "AM").replaceAll("pm", "PM")));
                 module.setAstronomy(a);
-            } catch(ParseException pe) {
-                Logger.getAnonymousLogger()
-                      .warning("ParseException processing  tag.");
+            } catch (final ParseException pe) {
+                Logger.getAnonymousLogger().warning("ParseException processing  tag.");
             }
         }
 
-        Element condition = element.getChild("condition", WeatherModuleParser.NS);
+        final Element condition = element.getChild("condition", WeatherModuleParser.NS);
 
-        if(condition != null) {
+        if (condition != null) {
             try {
-                Condition c = new Condition(condition.getAttributeValue("text"),
-                        ConditionCode.fromCode(Integer.parseInt(
-                                condition.getAttributeValue("code"))),
-                        Integer.parseInt(condition.getAttributeValue("temp")),
-                        LONG_DATE.parse(condition.getAttributeValue("date")
-                                                 .replaceAll("pm", "PM")
-                                                 .replaceAll("am", "AM")));
+                final Condition c = new Condition(condition.getAttributeValue("text"), ConditionCode.fromCode(Integer.parseInt(condition
+                        .getAttributeValue("code"))), Integer.parseInt(condition.getAttributeValue("temp")), LONG_DATE.parse(condition
+                        .getAttributeValue("date").replaceAll("pm", "PM").replaceAll("am", "AM")));
                 module.setCondition(c);
-            } catch(NumberFormatException nfe) {
-                Logger.getAnonymousLogger()
-                      .warning("NumberFormatException processing  tag.");
-            } catch(ParseException pe) {
-                Logger.getAnonymousLogger()
-                      .warning("ParseException processing  tag.");
+            } catch (final NumberFormatException nfe) {
+                Logger.getAnonymousLogger().warning("NumberFormatException processing  tag.");
+            } catch (final ParseException pe) {
+                Logger.getAnonymousLogger().warning("ParseException processing  tag.");
             }
         }
 
-        List forecasts = element.getChildren("forecast", WeatherModuleParser.NS);
+        final List forecasts = element.getChildren("forecast", WeatherModuleParser.NS);
 
-        if(forecasts != null) {
-            Forecast[] f = new Forecast[forecasts.size()];
+        if (forecasts != null) {
+            final Forecast[] f = new Forecast[forecasts.size()];
             int i = 0;
 
-            for(Iterator it = forecasts.iterator(); it.hasNext(); i++) {
-                Element forecast = (Element) it.next();
+            for (final Iterator it = forecasts.iterator(); it.hasNext(); i++) {
+                final Element forecast = (Element) it.next();
 
                 try {
-                    f[i] = new Forecast(forecast.getAttributeValue("day"),
-                            SHORT_DATE.parse(forecast.getAttributeValue("date")),
-                            Integer.parseInt(forecast.getAttributeValue("low")),
-                            Integer.parseInt(forecast.getAttributeValue("high")),
-                            forecast.getAttributeValue("text"),
-                            ConditionCode.fromCode(Integer.parseInt(
-                                    forecast.getAttributeValue("code"))));
-                } catch(NumberFormatException nfe) {
-                    Logger.getAnonymousLogger()
-                          .warning("NumberFormatException processing  tag.");
-                } catch(ParseException pe) {
-                    Logger.getAnonymousLogger()
-                          .warning("ParseException processing  tag.");
+                    f[i] = new Forecast(forecast.getAttributeValue("day"), SHORT_DATE.parse(forecast.getAttributeValue("date")), Integer.parseInt(forecast
+                            .getAttributeValue("low")), Integer.parseInt(forecast.getAttributeValue("high")), forecast.getAttributeValue("text"),
+                            ConditionCode.fromCode(Integer.parseInt(forecast.getAttributeValue("code"))));
+                } catch (final NumberFormatException nfe) {
+                    Logger.getAnonymousLogger().warning("NumberFormatException processing  tag.");
+                } catch (final ParseException pe) {
+                    Logger.getAnonymousLogger().warning("ParseException processing  tag.");
                 }
             }
 
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/types/Astronomy.java b/src/main/java/org/rometools/feed/module/yahooweather/types/Astronomy.java
index 2f0fe0e..26c0b18 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/types/Astronomy.java
+++ b/src/main/java/org/rometools/feed/module/yahooweather/types/Astronomy.java
@@ -38,27 +38,24 @@
 package org.rometools.feed.module.yahooweather.types;
 
 import java.io.Serializable;
-
 import java.util.Date;
 
 import com.sun.syndication.feed.impl.EqualsBean;
 import com.sun.syndication.feed.impl.ToStringBean;
 
-
 /**
  * Forecast information about current astronomical conditions. Attributes:
- *       
              
- *         
            • sunrise: today's sunrise time. The time is a string in a local
- *           time format of "h:mm am/pm", for example "7:02 am" (string)
              • 
- *         
            • sunset today's sunset time. The time is a string in a local time
- *           format of "h:mm am/pm", for example "4:51 pm" (string)
              • 
- *       
            
+ * 
              
+ * 
            • sunrise: today's sunrise time. The time is a string in a local time format of "h:mm am/pm", for example "7:02 am" (string)
              • 
+ * 
            • sunset today's sunset time. The time is a string in a local time format of "h:mm am/pm", for example "4:51 pm" (string)
              • 
+ * 
            
+ * 
  * @version $Id: Astronomy.java,v 1.2 2008/01/22 14:50:05 kebernet Exp $
  * @author Robert "kebernet" Cooper
  */
 public class Astronomy implements Serializable, Cloneable {
-    private EqualsBean equals = new EqualsBean(Astronomy.class, this);
-    private ToStringBean toString = new ToStringBean(Astronomy.class, this);
+    private final EqualsBean equals = new EqualsBean(Astronomy.class, this);
+    private final ToStringBean toString = new ToStringBean(Astronomy.class, this);
     private Date sunrise;
     private Date sunset;
 
@@ -71,35 +68,38 @@ public class Astronomy implements Serializable, Cloneable {
 
     /**
      * Constructs a new Astronomy object
+     * 
      * @param sunrise time of sunrise (from 0ms)
      * @param sunset time of sunset (from 0ms)
      */
-    public Astronomy(Date sunrise, Date sunset) {
+    public Astronomy(final Date sunrise, final Date sunset) {
         this.sunrise = sunrise;
         this.sunset = sunset;
     }
 
+    @Override
     public Object clone() {
-        return new Astronomy((this.getSunrise() != null)
-            ? new Date(this.getSunrise().getTime()) : null,
-            (this.getSunset() != null) ? new Date(this.getSunset().getTime())
-                                       : null);
+        return new Astronomy(getSunrise() != null ? new Date(getSunrise().getTime()) : null, getSunset() != null ? new Date(getSunset().getTime()) : null);
     }
 
-    public boolean equals(Object o) {
-        return this.equals.equals(o);
+    @Override
+    public boolean equals(final Object o) {
+        return equals.equals(o);
     }
 
+    @Override
     public int hashCode() {
-        return this.equals.hashCode();
+        return equals.hashCode();
     }
 
+    @Override
     public String toString() {
-        return this.toString.toString();
+        return toString.toString();
     }
 
     /**
      * Time of sunrise
+     * 
      * @return ime of sunrise (from 0ms)
      */
     public Date getSunrise() {
@@ -108,14 +108,16 @@ public class Astronomy implements Serializable, Cloneable {
 
     /**
      * Time of sunrise
+     * 
      * @param sunrise ime of sunrise (from 0ms)
      */
-    public void setSunrise(Date sunrise) {
+    public void setSunrise(final Date sunrise) {
         this.sunrise = sunrise;
     }
 
     /**
      * Time of sunset
+     * 
      * @return time of sunset (from 0ms)
      */
     public Date getSunset() {
@@ -124,9 +126,10 @@ public class Astronomy implements Serializable, Cloneable {
 
     /**
      * Time of sunset
+     * 
      * @param sunset time of sunset (from 0ms)
      */
-    public void setSunset(Date sunset) {
+    public void setSunset(final Date sunset) {
         this.sunset = sunset;
     }
 }
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/types/Atmosphere.java b/src/main/java/org/rometools/feed/module/yahooweather/types/Atmosphere.java
index c09900a..92d8865 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/types/Atmosphere.java
+++ b/src/main/java/org/rometools/feed/module/yahooweather/types/Atmosphere.java
@@ -42,28 +42,23 @@ import java.io.Serializable;
 import com.sun.syndication.feed.impl.EqualsBean;
 import com.sun.syndication.feed.impl.ToStringBean;
 
-
 /**
- * Forecast information about current atmospheric pressure, humidity,
- *       and visibility. Attributes:
- *       
              
- *         
            • humidity: humidity, in percent (integer)
              • 
- *         
            • visibility, in the units specified by the distance attribute of
- *           the yweather:units element (mi or km). Note that the visibility is
- *           specified as the actual value * 100. For example, a visibility of
- *           16.5 miles will be specified as 1650. A visibility of 14 kilometers
- *           will appear as 1400. (integer) [A double here, and adjusted accordingly]
              • 
- *         
            • pressure: barometric pressure, in the units specified by the pressure
- *           attribute of the yweather:units element (in or mb). (float).
              • 
- *         
            • rising: state of the barometric pressure: steady (0), rising (1),
- *           or falling (2). (integer: 0, 1, 2)
              • 
- *       
            
+ * Forecast information about current atmospheric pressure, humidity, and visibility. Attributes:
+ * 
              
+ * 
            • humidity: humidity, in percent (integer)
              • 
+ * 
            • visibility, in the units specified by the distance attribute of the yweather:units element (mi or km). Note that the visibility is specified as the
+ * actual value * 100. For example, a visibility of 16.5 miles will be specified as 1650. A visibility of 14 kilometers will appear as 1400. (integer) [
+ * A double here, and adjusted accordingly]
              • 
+ * 
            • pressure: barometric pressure, in the units specified by the pressure attribute of the yweather:units element (in or mb). (float).
              • 
+ * 
            • rising: state of the barometric pressure: steady (0), rising (1), or falling (2). (integer: 0, 1, 2)
              • 
+ * 
            
+ * 
  * @version $Id: Atmosphere.java,v 1.2 2008/01/22 14:50:05 kebernet Exp $
  * @author Robert "kebernet" Cooper
  */
 public class Atmosphere implements Serializable, Cloneable {
-    private EqualsBean equals = new EqualsBean(Atmosphere.class, this);
-    private ToStringBean toString = new ToStringBean(Atmosphere.class, this);
+    private final EqualsBean equals = new EqualsBean(Atmosphere.class, this);
+    private final ToStringBean toString = new ToStringBean(Atmosphere.class, this);
     private int humidity;
     private double visibility;
     private double pressure;
@@ -78,13 +73,13 @@ public class Atmosphere implements Serializable, Cloneable {
 
     /**
      * Constructs a new Atmosphere object
+     * 
      * @param humidity humidity, in percent
      * @param visibility visibility distance (value beyond 1/100ths of a unit will be truncated)
      * @param pressure barometric pressure
      * @param change state of the barometric pressure
      */
-    public Atmosphere(int humidity, double visibility, double pressure,
-        PressureChange change) {
+    public Atmosphere(final int humidity, final double visibility, final double pressure, final PressureChange change) {
         super();
         this.humidity = humidity;
         this.visibility = visibility;
@@ -92,20 +87,24 @@ public class Atmosphere implements Serializable, Cloneable {
         this.change = change;
     }
 
-    public boolean equals(Object o) {
-        return this.equals.equals(o);
+    @Override
+    public boolean equals(final Object o) {
+        return equals.equals(o);
     }
 
+    @Override
     public int hashCode() {
-        return this.equals.hashCode();
+        return equals.hashCode();
     }
 
+    @Override
     public String toString() {
-        return this.toString.toString();
+        return toString.toString();
     }
 
     /**
      * Relative humidity
+     * 
      * @return humidity, in percent
      */
     public int getHumidity() {
@@ -114,14 +113,16 @@ public class Atmosphere implements Serializable, Cloneable {
 
     /**
      * Relative humidity
+     * 
      * @param humidity humidity, in percent
      */
-    public void setHumidity(int humidity) {
+    public void setHumidity(final int humidity) {
         this.humidity = humidity;
     }
 
     /**
      * Visibility distance
+     * 
      * @return distance
      */
     public double getVisibility() {
@@ -130,14 +131,16 @@ public class Atmosphere implements Serializable, Cloneable {
 
     /**
      * Visibility distance
+     * 
      * @param visibility distance (value beyond 1/100ths of a unit will be truncated)
      */
-    public void setVisibility(double visibility) {
+    public void setVisibility(final double visibility) {
         this.visibility = visibility;
     }
 
     /**
      * Barometric pressure
+     * 
      * @return pressure
      */
     public double getPressure() {
@@ -146,15 +149,16 @@ public class Atmosphere implements Serializable, Cloneable {
 
     /**
      * Barometric pressure
-     *
+     * 
      * @param pressure pressure
      */
-    public void setPressure(double pressure) {
+    public void setPressure(final double pressure) {
         this.pressure = pressure;
     }
 
     /**
      * Change in pressure
+     * 
      * @return Atmosphere.PressureChange object
      */
     public PressureChange getChange() {
@@ -163,52 +167,53 @@ public class Atmosphere implements Serializable, Cloneable {
 
     /**
      * Change in pressure
+     * 
      * @param change PressureChange object
      */
-    public void setChange(PressureChange change) {
+    public void setChange(final PressureChange change) {
         this.change = change;
     }
 
+    @Override
     public Object clone() {
-        return new Atmosphere(this.humidity, this.visibility, this.pressure,
-            this.change);
+        return new Atmosphere(humidity, visibility, pressure, change);
     }
 
     public static class PressureChange implements Serializable {
-        public static final PressureChange RISING = new PressureChange(1,
-                "rising");
-        public static final PressureChange STEADY = new PressureChange(0,
-                "steady");
-        public static final PressureChange FALLING = new PressureChange(2,
-                "falling");
-        private int code;
-        private String text;
+        public static final PressureChange RISING = new PressureChange(1, "rising");
+        public static final PressureChange STEADY = new PressureChange(0, "steady");
+        public static final PressureChange FALLING = new PressureChange(2, "falling");
+        private final int code;
+        private final String text;
 
-        private PressureChange(int code, String text) {
+        private PressureChange(final int code, final String text) {
             this.code = code;
             this.text = text;
         }
 
+        @Override
         public String toString() {
-            return "[ code: " + this.code + " (" + this.text + ")]";
+            return "[ code: " + code + " (" + text + ")]";
         }
 
         /**
          * The integer code for this chage state
+         * 
          * @return int code
          */
         public int getCode() {
-            return this.code;
+            return code;
         }
 
         /**
          * Gets a PressureChange instance for this int code.
+         * 
          * @param code int code value
          * @return PressureChange instance
          * @throws RuntimeException if no 0, 1, or 2.
          */
-        public static PressureChange fromCode(int code) {
-            switch(code) {
+        public static PressureChange fromCode(final int code) {
+            switch (code) {
             case 0:
                 return STEADY;
 
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/types/Condition.java b/src/main/java/org/rometools/feed/module/yahooweather/types/Condition.java
index e919f89..8b6e0a9 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/types/Condition.java
+++ b/src/main/java/org/rometools/feed/module/yahooweather/types/Condition.java
@@ -38,36 +38,28 @@
 package org.rometools.feed.module.yahooweather.types;
 
 import java.io.Serializable;
-
 import java.util.Date;
 
 import com.sun.syndication.feed.impl.EqualsBean;
 import com.sun.syndication.feed.impl.ToStringBean;
 
-
 /**
  * The current weather conditions. Attributes:
- *       
              
- *         
            • text: a textual description of conditions, for example, "Partly
- *           Cloudy" (string)
              • 
- *         
            • code: the condition code for this forecast. You could use this
- *           code to choose a text description or image for the forecast. The
- *           possible values for this element are described in Condition
- *           Codes (integer)
              • 
- *         
            • temp: the current temperature, in the units specified by the yweather:units
- *           element (integer)
              • 
- *         
            • date: the current date and time for which this forecast applies.
- *           [I believe this should be the time this condition information was captured]
- *           The date is in RFC822
- *           Section 5 format, for example "Wed, 30 Nov 2005 1:56 pm
- *           PST" (string)
              • 
- *       
            
+ * 
              
+ * 
            • text: a textual description of conditions, for example, "Partly Cloudy" (string)
              • 
+ * 
            • code: the condition code for this forecast. You could use this code to choose a text description or image for the forecast. The possible values for this
+ * element are described in Condition Codes (integer)
              • 
+ * 
            • temp: the current temperature, in the units specified by the yweather:units element (integer)
              • 
+ * 
            • date: the current date and time for which this forecast applies. [I believe this should be the time this condition information was captured] The
+ * date is in RFC822 Section 5 format, for example "Wed, 30 Nov 2005 1:56 pm PST" (string)
              • 
+ * 
            
+ * 
  * @version $Id: Condition.java,v 1.2 2008/01/22 14:50:05 kebernet Exp $
  * @author Robert "kebernet" Cooper
  */
 public class Condition implements Serializable, Cloneable {
-    private EqualsBean equals = new EqualsBean(Condition.class, this);
-    private ToStringBean toString = new ToStringBean(Condition.class, this);
+    private final EqualsBean equals = new EqualsBean(Condition.class, this);
+    private final ToStringBean toString = new ToStringBean(Condition.class, this);
     private String text;
     private ConditionCode code;
     private int temperature;
@@ -82,13 +74,13 @@ public class Condition implements Serializable, Cloneable {
 
     /**
      * Constructs a new Condition.
-     * @param text a textual description of conditions, for example, "Partly
-     *             Cloudy"
+     * 
+     * @param text a textual description of conditions, for example, "Partly Cloudy"
      * @param code the condition code for this forecast.
      * @param temperature the current temperature
      * @param date the current date and time
      */
-    public Condition(String text, ConditionCode code, int temperature, Date date) {
+    public Condition(final String text, final ConditionCode code, final int temperature, final Date date) {
         super();
         this.text = text;
         this.code = code;
@@ -98,8 +90,8 @@ public class Condition implements Serializable, Cloneable {
 
     /**
      * Description of condition
-     * @return a textual description of conditions, for example, "Partly
-     *             Cloudy"
+     * 
+     * @return a textual description of conditions, for example, "Partly Cloudy"
      */
     public String getText() {
         return text;
@@ -107,15 +99,16 @@ public class Condition implements Serializable, Cloneable {
 
     /**
      * Description of condition
-     * @param text a textual description of conditions, for example, "Partly
-     *             Cloudy"
+     * 
+     * @param text a textual description of conditions, for example, "Partly Cloudy"
      */
-    public void setText(String text) {
+    public void setText(final String text) {
         this.text = text;
     }
 
     /**
      * Condition code
+     * 
      * @return condition code
      */
     public ConditionCode getCode() {
@@ -124,14 +117,16 @@ public class Condition implements Serializable, Cloneable {
 
     /**
      * Condition code
+     * 
      * @param code Condition code
      */
-    public void setCode(ConditionCode code) {
+    public void setCode(final ConditionCode code) {
         this.code = code;
     }
 
     /**
      * Current Temperature
+     * 
      * @return the current temperature
      * @see Units
      */
@@ -141,15 +136,17 @@ public class Condition implements Serializable, Cloneable {
 
     /**
      * Current Temperature
+     * 
      * @param temperature the current temperature
      * @see Units
      */
-    public void setTemperature(int temperature) {
+    public void setTemperature(final int temperature) {
         this.temperature = temperature;
     }
 
     /**
      * Date recorded
+     * 
      * @return the current date and time
      */
     public Date getDate() {
@@ -158,26 +155,30 @@ public class Condition implements Serializable, Cloneable {
 
     /**
      * Date recorded
+     * 
      * @param date the current date and time
      */
-    public void setDate(Date date) {
+    public void setDate(final Date date) {
         this.date = date;
     }
 
-    public boolean equals(Object o) {
-        return this.equals.equals(o);
+    @Override
+    public boolean equals(final Object o) {
+        return equals.equals(o);
     }
 
+    @Override
     public int hashCode() {
-        return this.equals.hashCode();
+        return equals.hashCode();
     }
 
+    @Override
     public String toString() {
-        return this.toString.toString();
+        return toString.toString();
     }
 
+    @Override
     public Object clone() {
-        return new Condition(this.text, this.code, this.temperature,
-            (this.date != null) ? new Date(this.date.getTime()) : null);
+        return new Condition(text, code, temperature, date != null ? new Date(date.getTime()) : null);
     }
 }
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/types/ConditionCode.java b/src/main/java/org/rometools/feed/module/yahooweather/types/ConditionCode.java
index 5f09bd1..18d723a 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/types/ConditionCode.java
+++ b/src/main/java/org/rometools/feed/module/yahooweather/types/ConditionCode.java
@@ -38,283 +38,271 @@
 package org.rometools.feed.module.yahooweather.types;
 
 import java.io.Serializable;
-
 import java.util.HashMap;
 import java.util.Map;
 
 import com.sun.syndication.feed.impl.EqualsBean;
 
-
 /**
  * 
            Condition Codes
            
- *
- *
            Condition codes are used in the yweather:forecast element to describe the
- *current conditions.
            
- *
- *   
- *     
- *     
- *   
- *   
- *
- *     
- *     
- *   
- *   
- *     
- *     
- *   
- *
- *   
- *     
- *     
- *   
- *   
- *     
- *     
- *
- *   
- *   
- *     
- *     
- *   
- *   
- *     
- *
- *     
- *  
- *   
- *     
- *     
- *   
- *   
- *
- *     
- *     
- *   
- *   
- *     
- *     
- *   
- *
- *   
- *     
- *     
- *   
- *   
- *     
- *     
- *
- *   
- *   
- *     
- *     
- *   
- *   
- *     
- *
- *     
- *   
- *   
- *     
- *     
- *   
- *   
- *
- *     
- *     
- *   
- *   
- *     
- *     
- *   
- *
- *   
- *     
- *     
- *   
- *   
- *     
- *     
- *
- *   
- *   
- *     
- *     
- *   
- *   
- *     
- *
- *     
- *   
- *   
- *     
- *     
- *   
- *   
- *
- *     
- *     
- *   
- *   
- *     
- *     
- *   
- *
- *   
- *     
- *     
- *   
- *   
- *     
- *     
- *
- *   
- *   
- *     
- *     
- *   
- *   
- *     
- *
- *     
- *   
- *   
- *     
- *     
- *   
- *   
- *
- *     
- *     
- *   
- *   
- *     
- *     
- *   
- *
- *   
- *     
- *     
- *   
- *   
- *     
- *     
- *
- *   
- *   
- *     
- *     
- *   
- *   
- *     
- *
- *     
- *   
- *   
- *     
- *     
- *   
- *   
- *
- *     
- *     
- *   
- *   
- *     
- *     
- *   
- *
- *   
- *     
- *     
- *   
- *   
- *     
- *     
- *
- *   
- *   
- *     
- *     
- *   
- *   
- *     
- *
- *     
- *   
- *   
- *     
- *     
- *   
- *   
- *
- *     
- *     
- *   
- *   
- *     
- *     
- *   
- *
- *   
- *     
- *     
- *   
- *   
- *     
- *     
- *
- *   
- *   
- *     
- *     
- *   
- *   
- *     
- *
- *     
- *   
- *   
- *     
- *     
- *   
- * 
            CodeDescription
            0tornado
            1tropical storm
            2hurricane
            3severe thunderstorms
            4thunderstorms
            5mixed rain and snow
            6mixed rain and sleet
            7mixed snow and sleet
            8freezing drizzle
            9drizzle
            10freezing rain
            11showers
            12showers
            13snow flurries
            14light snow showers
            15blowing snow
            16snow
            17hail
            18sleet
            19dust
            20foggy
            21haze
            22smoky
            23blustery
            24windy
            25cold
            26cloudy
            27mostly cloudy (night)
            28mostly cloudy (day)
            29partly cloudy (night)
            30partly cloudy (day)
            31clear (night)
            32sunny
            33fair (night)
            34fair (day)
            35mixed rain and hail
            36hot
            37isolated thunderstorms
            38scattered thunderstorms
            39scattered thunderstorms
            40scattered showers
            41heavy snow
            42scattered snow showers
            43heavy snow
            44partly cloudy
            45thundershowers
            46snow showers
            47isolated thundershowers
            3200not available
            
+ * 
+ * 
            
+ * Condition codes are used in the yweather:forecast element to describe the current conditions.
+ * 
            
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
            CodeDescription
            0tornado
            1tropical storm
            2hurricane
            3severe thunderstorms
            4thunderstorms
            5mixed rain and snow
            6mixed rain and sleet
            7mixed snow and sleet
            8freezing drizzle
            9drizzle
            10freezing rain
            11showers
            12showers
            13snow flurries
            14light snow showers
            15blowing snow
            16snow
            17hail
            18sleet
            19dust
            20foggy
            21haze
            22smoky
            23blustery
            24windy
            25cold
            26cloudy
            27mostly cloudy (night)
            28mostly cloudy (day)
            29partly cloudy (night)
            30partly cloudy (day)
            31clear (night)
            32sunny
            33fair (night)
            34fair (day)
            35mixed rain and hail
            36hot
            37isolated thunderstorms
            38scattered thunderstorms
            39scattered thunderstorms
            40scattered showers
            41heavy snow
            42scattered snow showers
            43heavy snow
            44partly cloudy
            45thundershowers
            46snow showers
            47isolated thundershowers
            3200not available
            
+ * 
  * @version $Id: ConditionCode.java,v 1.2 2008/01/22 14:50:05 kebernet Exp $
  * @author Robert "kebernet" Cooper
  */
 public class ConditionCode implements Serializable {
-    private transient static Map LOOKUP = new HashMap(); /**/
+    private transient static Map LOOKUP = new HashMap(); /*  */
     public static final ConditionCode TORNADO = new ConditionCode(0, "tornado");
-    public static final ConditionCode TROPICAL_STORM = new ConditionCode(1,
-            "tropical storm");
-    public static final ConditionCode HURRICANE = new ConditionCode(2,
-            "hurricane");
-    public static final ConditionCode SEVERE_THUNDERSTORMS = new ConditionCode(3,
-            "severe thunderstorms");
-    public static final ConditionCode THUNDERSTORMS = new ConditionCode(4,
-            "thunderstorms");
-    public static final ConditionCode MIXED_RAIN_AND_SNOW = new ConditionCode(5,
-            "mixed rain and snow");
-    public static final ConditionCode MIXED_RAIN_AND_SLEET = new ConditionCode(6,
-            "mixed rain and sleet");
-    public static final ConditionCode MIXED_SNOW_AND_SLEET = new ConditionCode(7,
-            "mixed snow and sleet");
-    public static final ConditionCode FREEZING_DRIZZLE = new ConditionCode(8,
-            "freezing drizzle");
+    public static final ConditionCode TROPICAL_STORM = new ConditionCode(1, "tropical storm");
+    public static final ConditionCode HURRICANE = new ConditionCode(2, "hurricane");
+    public static final ConditionCode SEVERE_THUNDERSTORMS = new ConditionCode(3, "severe thunderstorms");
+    public static final ConditionCode THUNDERSTORMS = new ConditionCode(4, "thunderstorms");
+    public static final ConditionCode MIXED_RAIN_AND_SNOW = new ConditionCode(5, "mixed rain and snow");
+    public static final ConditionCode MIXED_RAIN_AND_SLEET = new ConditionCode(6, "mixed rain and sleet");
+    public static final ConditionCode MIXED_SNOW_AND_SLEET = new ConditionCode(7, "mixed snow and sleet");
+    public static final ConditionCode FREEZING_DRIZZLE = new ConditionCode(8, "freezing drizzle");
     public static final ConditionCode DRIZZLE = new ConditionCode(9, "drizzle");
-    public static final ConditionCode FREEZING_RAIN = new ConditionCode(10,
-            "freezing rain");
-    public static final ConditionCode SHOWERS_LIGHT = new ConditionCode(11,
-            "showers");
-    public static final ConditionCode SHOWERS_HEAVY = new ConditionCode(12,
-            "showers");
-    public static final ConditionCode FLURRIES = new ConditionCode(13,
-            "snow flurries");
-    public static final ConditionCode LIGHT_SNOW_SHOWERS = new ConditionCode(14,
-            "light snow showers");
-    public static final ConditionCode BLOWING_SNOW = new ConditionCode(15,
-            "blowing snow");
+    public static final ConditionCode FREEZING_RAIN = new ConditionCode(10, "freezing rain");
+    public static final ConditionCode SHOWERS_LIGHT = new ConditionCode(11, "showers");
+    public static final ConditionCode SHOWERS_HEAVY = new ConditionCode(12, "showers");
+    public static final ConditionCode FLURRIES = new ConditionCode(13, "snow flurries");
+    public static final ConditionCode LIGHT_SNOW_SHOWERS = new ConditionCode(14, "light snow showers");
+    public static final ConditionCode BLOWING_SNOW = new ConditionCode(15, "blowing snow");
     public static final ConditionCode SNOW = new ConditionCode(16, "snow");
     public static final ConditionCode HAIL = new ConditionCode(17, "hail");
     public static final ConditionCode SLEET = new ConditionCode(18, "sleet");
@@ -322,71 +310,50 @@ public class ConditionCode implements Serializable {
     public static final ConditionCode FOGGY = new ConditionCode(20, "foggy");
     public static final ConditionCode HAZE = new ConditionCode(21, "haze");
     public static final ConditionCode SMOKY = new ConditionCode(22, "smoky");
-    public static final ConditionCode BLUSTERY = new ConditionCode(23,
-            "blustery");
+    public static final ConditionCode BLUSTERY = new ConditionCode(23, "blustery");
     public static final ConditionCode WINDY = new ConditionCode(24, "windy");
     public static final ConditionCode COLD = new ConditionCode(25, "cold");
     public static final ConditionCode CLOUDY = new ConditionCode(26, "cloudy");
-    public static final ConditionCode MOSTLY_CLOUDY_NIGHT = new ConditionCode(27,
-            "mostly cloudy (night)");
-    public static final ConditionCode MOSTLY_CLOUDY_DAY = new ConditionCode(28,
-            "mostly cloudy (day)");
-    public static final ConditionCode PARTLY_CLOUDY_NIGHT = new ConditionCode(29,
-            "partly cloudy (night)");
-    public static final ConditionCode PARTLY_CLOUDY_DAY = new ConditionCode(30,
-            "partly couldy (day)");
-    public static final ConditionCode CLEAR_NIGHT = new ConditionCode(31,
-            "clear (night)");
+    public static final ConditionCode MOSTLY_CLOUDY_NIGHT = new ConditionCode(27, "mostly cloudy (night)");
+    public static final ConditionCode MOSTLY_CLOUDY_DAY = new ConditionCode(28, "mostly cloudy (day)");
+    public static final ConditionCode PARTLY_CLOUDY_NIGHT = new ConditionCode(29, "partly cloudy (night)");
+    public static final ConditionCode PARTLY_CLOUDY_DAY = new ConditionCode(30, "partly couldy (day)");
+    public static final ConditionCode CLEAR_NIGHT = new ConditionCode(31, "clear (night)");
     public static final ConditionCode SUNNY = new ConditionCode(32, "sunny");
-    public static final ConditionCode FAIR_NIGHT = new ConditionCode(33,
-            "fair (night)");
-    public static final ConditionCode FAIR_DAY = new ConditionCode(34,
-            "fair (day)");
-    public static final ConditionCode MIXED_RAIN_AND_HAIL = new ConditionCode(35,
-            "mixed rain and hail");
+    public static final ConditionCode FAIR_NIGHT = new ConditionCode(33, "fair (night)");
+    public static final ConditionCode FAIR_DAY = new ConditionCode(34, "fair (day)");
+    public static final ConditionCode MIXED_RAIN_AND_HAIL = new ConditionCode(35, "mixed rain and hail");
     public static final ConditionCode HOT = new ConditionCode(36, "hot");
-    public static final ConditionCode ISOLATED_THUNDERSTORMS = new ConditionCode(37,
-            "isolated thunderstorms");
-    public static final ConditionCode SCATTERED_THUNDERSTORMS_HEAVY = new ConditionCode(38,
-            "scattered thunderstorms");
-    public static final ConditionCode SCATTERED_THUNDERSTORMS_LIGHT = new ConditionCode(39,
-            "scattered thunderstorms");
-    public static final ConditionCode SCATTERED_SHOWERS = new ConditionCode(40,
-            "scattered showers");
-    public static final ConditionCode HEAVY_SNOW = new ConditionCode(41,
-            "heavy snow");
-    public static final ConditionCode SCATTERED_SNOW_SHOWERS = new ConditionCode(42,
-            "scattered snow showers");
-    public static final ConditionCode HEAVY_SNOW_WINDY = new ConditionCode(43,
-            "heavy snow");
-    public static final ConditionCode PARTLY_CLOUDY = new ConditionCode(44,
-            "partly cloudy");
-    public static final ConditionCode THUNDERSHOWERS = new ConditionCode(45,
-            "thundershowers");
-    public static final ConditionCode SHOW_SHOWERS = new ConditionCode(46,
-            "snow showers");
-    public static final ConditionCode ISLOATED_THUNDERSHOWERS = new ConditionCode(47,
-            "isolated thundershowers");
-    public static final ConditionCode NOT_AVAILABLE = new ConditionCode(3200,
-            "not available");
-    private int code;
-    private String description;
-    private transient EqualsBean equals = new EqualsBean(ConditionCode.class,
-            this);
+    public static final ConditionCode ISOLATED_THUNDERSTORMS = new ConditionCode(37, "isolated thunderstorms");
+    public static final ConditionCode SCATTERED_THUNDERSTORMS_HEAVY = new ConditionCode(38, "scattered thunderstorms");
+    public static final ConditionCode SCATTERED_THUNDERSTORMS_LIGHT = new ConditionCode(39, "scattered thunderstorms");
+    public static final ConditionCode SCATTERED_SHOWERS = new ConditionCode(40, "scattered showers");
+    public static final ConditionCode HEAVY_SNOW = new ConditionCode(41, "heavy snow");
+    public static final ConditionCode SCATTERED_SNOW_SHOWERS = new ConditionCode(42, "scattered snow showers");
+    public static final ConditionCode HEAVY_SNOW_WINDY = new ConditionCode(43, "heavy snow");
+    public static final ConditionCode PARTLY_CLOUDY = new ConditionCode(44, "partly cloudy");
+    public static final ConditionCode THUNDERSHOWERS = new ConditionCode(45, "thundershowers");
+    public static final ConditionCode SHOW_SHOWERS = new ConditionCode(46, "snow showers");
+    public static final ConditionCode ISLOATED_THUNDERSHOWERS = new ConditionCode(47, "isolated thundershowers");
+    public static final ConditionCode NOT_AVAILABLE = new ConditionCode(3200, "not available");
+    private final int code;
+    private final String description;
+    private transient EqualsBean equals = new EqualsBean(ConditionCode.class, this);
 
-    private ConditionCode(int code, String description) {
+    private ConditionCode(final int code, final String description) {
         this.code = code;
         this.description = description;
 
-        Object old = ConditionCode.LOOKUP.put(new Integer(code), this);
+        final Object old = ConditionCode.LOOKUP.put(new Integer(code), this);
 
-        if(old != null) {
+        if (old != null) {
             throw new RuntimeException("Duplicate condition code!");
         }
     }
 
     /**
      * The integer code for this condition
+     * 
      * @return int code value
      */
     public int getCode() {
@@ -395,6 +362,7 @@ public class ConditionCode implements Serializable {
 
     /**
      * Text description of condition (from the table at top of class)
+     * 
      * @return
      */
     public String getDescription() {
@@ -403,23 +371,26 @@ public class ConditionCode implements Serializable {
 
     /**
      * Returns a condition code instance for a given integer
+     * 
      * @param code integer code to search for
      * @return a ConditionCode instance or null
      */
-    public static ConditionCode fromCode(int code) {
+    public static ConditionCode fromCode(final int code) {
         return (ConditionCode) ConditionCode.LOOKUP.get(new Integer(code));
     }
 
-    public boolean equals(Object o) {
+    @Override
+    public boolean equals(final Object o) {
         return equals.equals(o);
     }
 
+    @Override
     public int hashCode() {
         return equals.hashCode();
     }
 
+    @Override
     public String toString() {
-        return "[Condition code:" + this.code + " description:" +
-        this.description + "]";
+        return "[Condition code:" + code + " description:" + description + "]";
     }
 }
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/types/Forecast.java b/src/main/java/org/rometools/feed/module/yahooweather/types/Forecast.java
index 52e6368..e58976a 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/types/Forecast.java
+++ b/src/main/java/org/rometools/feed/module/yahooweather/types/Forecast.java
@@ -38,40 +38,30 @@
 package org.rometools.feed.module.yahooweather.types;
 
 import java.io.Serializable;
-
 import java.util.Date;
 
 import com.sun.syndication.feed.impl.EqualsBean;
 import com.sun.syndication.feed.impl.ToStringBean;
 
-
 /**
- * The weather forecast for a specific day. The item element contains
- *       multiple forecast elements for today and tomorrow. Attributes:
- *       
              
- *         
            • day: day of the week to which this forecast applies. Possible values
- *           are Mon Tue Wed Thu Fri Sat Sun (string)
              • 
- *         
            • date: the date to which this forecast applies. The date is in "dd
- *           Mmm yyyy" format, for example "30 Nov 2005" (string)
              • 
- *         
            • low: the forecasted low temperature for this day, in the units
- *           specified by the yweather:units element (integer)
              • 
- *         
            • high: the forecasted high temperature for this day, in the units
- *           specified by the yweather:units element (integer)
              • 
- *         
            • text: a textual description of conditions, for example, "Partly
- *           Cloudy" (string)
              • 
- *
- *         
            • code: the condition code for this forecast. You could use this
- *           code to choose a text description or image for the forecast. The
- *           possible values for this element are described in Condition
- *           Codes (integer)
              • 
- *       
            
+ * The weather forecast for a specific day. The item element contains multiple forecast elements for today and tomorrow. Attributes:
+ * 
              
+ * 
            • day: day of the week to which this forecast applies. Possible values are Mon Tue Wed Thu Fri Sat Sun (string)
              • 
+ * 
            • date: the date to which this forecast applies. The date is in "dd Mmm yyyy" format, for example "30 Nov 2005" (string)
              • 
+ * 
            • low: the forecasted low temperature for this day, in the units specified by the yweather:units element (integer)
              • 
+ * 
            • high: the forecasted high temperature for this day, in the units specified by the yweather:units element (integer)
              • 
+ * 
            • text: a textual description of conditions, for example, "Partly Cloudy" (string)
              • 
+ * 
+ * 
            • code: the condition code for this forecast. You could use this code to choose a text description or image for the forecast. The possible values for this
+ * element are described in Condition Codes (integer)
              • 
+ * 
            
+ * 
  * @see ConditionCode
  * @version $Id: Forecast.java,v 1.2 2008/01/22 14:50:05 kebernet Exp $
  * @author Robert "kebernet" Cooper
  */
 public class Forecast implements Serializable, Cloneable {
-    private transient ToStringBean toString = new ToStringBean(Forecast.class,
-            this);
+    private transient ToStringBean toString = new ToStringBean(Forecast.class, this);
     private transient EqualsBean equals = new EqualsBean(Forecast.class, this);
     private String day;
     private Date date;
@@ -89,17 +79,15 @@ public class Forecast implements Serializable, Cloneable {
 
     /**
      * Constructs a new Forecast object.
-     * @param day  day of the week to which this forecast applies. Possible values
-     *             are Mon Tue Wed Thu Fri Sat Sun (string)
+     * 
+     * @param day day of the week to which this forecast applies. Possible values are Mon Tue Wed Thu Fri Sat Sun (string)
      * @param date the date to which this forecast applies
-     * @param low  the forecasted low temperature for this day
+     * @param low the forecasted low temperature for this day
      * @param high the forecasted high temperature for this day
-     * @param text a textual description of conditions, for example, "Partly
-     *              Cloudy"
+     * @param text a textual description of conditions, for example, "Partly Cloudy"
      * @param code ConditionCode instance for this forcast.
      */
-    public Forecast(String day, Date date, int low, int high, String text,
-        ConditionCode code) {
+    public Forecast(final String day, final Date date, final int low, final int high, final String text, final ConditionCode code) {
         super();
         this.day = day;
         this.date = date;
@@ -110,25 +98,26 @@ public class Forecast implements Serializable, Cloneable {
     }
 
     /**
-     *  Day of week
-     * @return day of the week to which this forecast applies. Possible values
-     *             are Mon Tue Wed Thu Fri Sat Sun (string)
+     * Day of week
+     * 
+     * @return day of the week to which this forecast applies. Possible values are Mon Tue Wed Thu Fri Sat Sun (string)
      */
     public String getDay() {
         return day;
     }
 
     /**
-     *  Day of week
-     * @param day day of the week to which this forecast applies. Possible values
-     *             are Mon Tue Wed Thu Fri Sat Sun (string)
+     * Day of week
+     * 
+     * @param day day of the week to which this forecast applies. Possible values are Mon Tue Wed Thu Fri Sat Sun (string)
      */
-    public void setDay(String day) {
+    public void setDay(final String day) {
         this.day = day;
     }
 
     /**
      * For date.
+     * 
      * @return the date to which this forecast applies
      */
     public Date getDate() {
@@ -137,14 +126,16 @@ public class Forecast implements Serializable, Cloneable {
 
     /**
      * For date.
+     * 
      * @param date the date to which this forecast applies
      */
-    public void setDate(Date date) {
+    public void setDate(final Date date) {
         this.date = date;
     }
 
     /**
      * Low temperature.
+     * 
      * @return the forecasted low temperature for this day
      * @see Units
      */
@@ -154,15 +145,17 @@ public class Forecast implements Serializable, Cloneable {
 
     /**
      * Low temperature
+     * 
      * @param low the forecasted low temperature for this day
      * @see Units
      */
-    public void setLow(int low) {
+    public void setLow(final int low) {
         this.low = low;
     }
 
     /**
      * High temperature
+     * 
      * @return the forecasted high temperature for this day
      * @see Units
      */
@@ -172,17 +165,18 @@ public class Forecast implements Serializable, Cloneable {
 
     /**
      * High temperature
+     * 
      * @param high the forecasted high temperature for this day
      * @see Units
      */
-    public void setHigh(int high) {
+    public void setHigh(final int high) {
         this.high = high;
     }
 
     /**
      * Text summary
-     * @return a textual description of conditions, for example, "Partly
-     *              Cloudy"
+     * 
+     * @return a textual description of conditions, for example, "Partly Cloudy"
      */
     public String getText() {
         return text;
@@ -190,15 +184,16 @@ public class Forecast implements Serializable, Cloneable {
 
     /**
      * Text summary
-     * @param text a textual description of conditions, for example, "Partly
-     *              Cloudy"
+     * 
+     * @param text a textual description of conditions, for example, "Partly Cloudy"
      */
-    public void setText(String text) {
+    public void setText(final String text) {
         this.text = text;
     }
 
     /**
      * Condition code
+     * 
      * @return the condition code for this forecast
      */
     public ConditionCode getCode() {
@@ -207,27 +202,30 @@ public class Forecast implements Serializable, Cloneable {
 
     /**
      * Condition code
+     * 
      * @param code the condition code for this forecast
      */
-    public void setCode(ConditionCode code) {
+    public void setCode(final ConditionCode code) {
         this.code = code;
     }
 
-    public boolean equals(Object o) {
-        return this.equals.equals(o);
+    @Override
+    public boolean equals(final Object o) {
+        return equals.equals(o);
     }
 
+    @Override
     public int hashCode() {
-        return this.equals.hashCode();
+        return equals.hashCode();
     }
 
+    @Override
     public String toString() {
-        return this.toString.toString();
+        return toString.toString();
     }
 
+    @Override
     public Object clone() {
-        return new Forecast(this.day,
-            (this.date != null) ? new Date(this.date.getTime()) : null,
-            this.low, this.high, this.text, this.code);
+        return new Forecast(day, date != null ? new Date(date.getTime()) : null, low, high, text, code);
     }
 }
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/types/Location.java b/src/main/java/org/rometools/feed/module/yahooweather/types/Location.java
index 30cf7b6..8adbada 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/types/Location.java
+++ b/src/main/java/org/rometools/feed/module/yahooweather/types/Location.java
@@ -42,19 +42,19 @@ import java.io.Serializable;
 import com.sun.syndication.feed.impl.EqualsBean;
 import com.sun.syndication.feed.impl.ToStringBean;
 
-
 /**
  * The location of this forecast. Attributes:
- *      
              
- *        
            • city: city name (string)
              • 
- *        
            • region: state, territory, or region, if given (string)
              • 
- *        
            • country: two-character country code. (string)
            
+ * 
              
+ * 
            • city: city name (string)
              • 
+ * 
            • region: state, territory, or region, if given (string)
              • 
+ * 
            • country: two-character country code. (string)
              • 
+ * 
            
+ * 
  * @version $Id: Location.java,v 1.2 2008/01/22 14:50:05 kebernet Exp $
  * @author Robert "kebernet" Cooper
  */
 public class Location implements Serializable, Cloneable {
-    private transient ToStringBean toString = new ToStringBean(Location.class,
-            this);
+    private transient ToStringBean toString = new ToStringBean(Location.class, this);
     private transient EqualsBean equals = new EqualsBean(Location.class, this);
     private String city;
     private String region;
@@ -69,11 +69,12 @@ public class Location implements Serializable, Cloneable {
 
     /**
      * Constructs a new Location object.
+     * 
      * @param city city name
      * @param region state, territory, or region, if given
      * @param country two-character country code.
      */
-    public Location(String city, String region, String country) {
+    public Location(final String city, final String region, final String country) {
         super();
         this.city = city;
         this.region = region;
@@ -82,6 +83,7 @@ public class Location implements Serializable, Cloneable {
 
     /**
      * City name
+     * 
      * @return city name.
      */
     public String getCity() {
@@ -90,14 +92,16 @@ public class Location implements Serializable, Cloneable {
 
     /**
      * City name
+     * 
      * @param city city name
      */
-    public void setCity(String city) {
+    public void setCity(final String city) {
         this.city = city;
     }
 
     /**
      * state, territory, or region, if given
+     * 
      * @return state, territory, or region, if given
      */
     public String getRegion() {
@@ -106,14 +110,16 @@ public class Location implements Serializable, Cloneable {
 
     /**
      * state, territory, or region, if given
+     * 
      * @param region state, territory, or region, if given
      */
-    public void setRegion(String region) {
+    public void setRegion(final String region) {
         this.region = region;
     }
 
     /**
      * country two-character country code.
+     * 
      * @return country two-character country code.
      */
     public String getCountry() {
@@ -122,25 +128,30 @@ public class Location implements Serializable, Cloneable {
 
     /**
      * country two-character country code.
+     * 
      * @param country country two-character country code.
      */
-    public void setCountry(String country) {
+    public void setCountry(final String country) {
         this.country = country;
     }
 
-    public boolean equals(Object o) {
-        return this.equals.equals(o);
+    @Override
+    public boolean equals(final Object o) {
+        return equals.equals(o);
     }
 
+    @Override
     public int hashCode() {
-        return this.equals.hashCode();
+        return equals.hashCode();
     }
 
+    @Override
     public String toString() {
-        return this.toString.toString();
+        return toString.toString();
     }
 
+    @Override
     public Object clone() {
-        return new Location(this.city, this.region, this.country);
+        return new Location(city, region, country);
     }
 }
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/types/Units.java b/src/main/java/org/rometools/feed/module/yahooweather/types/Units.java
index 70557f0..bdfb230 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/types/Units.java
+++ b/src/main/java/org/rometools/feed/module/yahooweather/types/Units.java
@@ -42,24 +42,19 @@ import java.io.Serializable;
 import com.sun.syndication.feed.impl.EqualsBean;
 import com.sun.syndication.feed.impl.ToStringBean;
 
-
 /**
  * Units for various aspects of the forecast. Attributes:
- *      
              
- *        
            • temperature: degree units, f for Fahrenheit or c for Celsius (character)
              • 
- *        
            • distance: units for distance, mi for miles or km for kilometers
- *          (string)
              • 
- *         
            • pressure: units of barometric pressure, in for pounds per square
- *           inch or mb for millibars (string) [I am pretty sure this is wrong.
+ * 
                
+ * 
              • temperature: degree units, f for Fahrenheit or c for Celsius (character)
                • 
+ * 
              • distance: units for distance, mi for miles or km for kilometers (string)
                • 
+ * 
              • pressure: units of barometric pressure, in for pounds per square inch or mb for millibars (string) [I am pretty sure this is wrong.
  *           I believe this number of be inches of Mercury, not PSI.]
                • 
- *         
              • speed: units of speed, mph for miles per hour or kph for kilometers
- *           per hour (string)
                • 
- *       
              
- *      Note that the default RSS feed uses Fahrenheit degree units and English
- *      units for all other attributes (miles, pounds per square inch, miles
- *      per hour). If Celsius has been specified as the degree units for the
- *      feed (using the u request parameter), all the units are in metric format
- *      (Celsius, kilometers, millibars, kilometers per hour).
+ * 
            • speed: units of speed, mph for miles per hour or kph for kilometers per hour (string)
              • 
+ * 
            
+ * Note that the default RSS feed uses Fahrenheit degree units and English units for all other attributes (miles, pounds per square inch, miles per hour). If
+ * Celsius has been specified as the degree units for the feed (using the u request parameter), all the units are in metric format (Celsius, kilometers,
+ * millibars, kilometers per hour).
+ * 
  * @version $Id: Units.java,v 1.2 2008/01/22 14:50:05 kebernet Exp $
  * @author Robert "kebernet" Cooper
  */
@@ -80,13 +75,13 @@ public class Units implements Serializable, Cloneable {
 
     /**
      * Constructs a new Units object
+     * 
      * @param temperature units of temp ("f" or "c");
      * @param distance units of distance ("mi" or "km")
      * @param pressure units of pressure ("in" or "mb")
      * @param speed units of speed ("mph" or "kph")
      */
-    public Units(String temperature, String distance, String pressure,
-        String speed) {
+    public Units(final String temperature, final String distance, final String pressure, final String speed) {
         super();
         this.temperature = temperature;
         this.distance = distance;
@@ -96,6 +91,7 @@ public class Units implements Serializable, Cloneable {
 
     /**
      * Units of Temperature.
+     * 
      * @return temperature units of temp ("f" or "c");
      */
     public String getTemperature() {
@@ -104,14 +100,16 @@ public class Units implements Serializable, Cloneable {
 
     /**
      * Units of Temperature.
+     * 
      * @param temperature units of temp ("f" or "c");
      */
-    public void setTemperature(String temperature) {
+    public void setTemperature(final String temperature) {
         this.temperature = temperature;
     }
 
-    /** Units of distance
-     *
+    /**
+     * Units of distance
+     * 
      * @return distance units of distance ("mi" or "km")
      */
     public String getDistance() {
@@ -120,14 +118,16 @@ public class Units implements Serializable, Cloneable {
 
     /**
      * Units of distance
+     * 
      * @param distance units of distance ("mi" or "km")
      */
-    public void setDistance(String distance) {
+    public void setDistance(final String distance) {
         this.distance = distance;
     }
 
     /**
      * Units of pressure
+     * 
      * @return units of pressure ("in" or "mb")
      */
     public String getPressure() {
@@ -136,14 +136,16 @@ public class Units implements Serializable, Cloneable {
 
     /**
      * Units of pressure
+     * 
      * @param pressure units of pressure ("in" or "mb")
      */
-    public void setPressure(String pressure) {
+    public void setPressure(final String pressure) {
         this.pressure = pressure;
     }
 
     /**
      * Units of speed
+     * 
      * @return units of speed ("mph" or "kph")
      */
     public String getSpeed() {
@@ -152,26 +154,30 @@ public class Units implements Serializable, Cloneable {
 
     /**
      * Units of speed
+     * 
      * @param speed units of speed ("mph" or "kph")
      */
-    public void setSpeed(String speed) {
+    public void setSpeed(final String speed) {
         this.speed = speed;
     }
 
-    public boolean equals(Object o) {
-        return this.equals.equals(o);
+    @Override
+    public boolean equals(final Object o) {
+        return equals.equals(o);
     }
 
+    @Override
     public int hashCode() {
-        return this.equals.hashCode();
+        return equals.hashCode();
     }
 
+    @Override
     public String toString() {
-        return this.toString.toString();
+        return toString.toString();
     }
 
+    @Override
     public Object clone() {
-        return new Units(this.temperature, this.distance, this.pressure,
-            this.speed);
+        return new Units(temperature, distance, pressure, speed);
     }
 }
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/types/Wind.java b/src/main/java/org/rometools/feed/module/yahooweather/types/Wind.java
index 9075755..78c1c85 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/types/Wind.java
+++ b/src/main/java/org/rometools/feed/module/yahooweather/types/Wind.java
@@ -42,23 +42,18 @@ import java.io.Serializable;
 import com.sun.syndication.feed.impl.EqualsBean;
 import com.sun.syndication.feed.impl.ToStringBean;
 
-
 /**
- *  Units for various aspects of the forecast. Attributes:
- *       
              
- *         
            • temperature: degree units, f for Fahrenheit or c for Celsius (character)
              • 
- *         
            • distance: units for distance, mi for miles or km for kilometers
- *           (string)
              • 
- *         
            • pressure: units of barometric pressure, in for pounds per square
- *           inch or mb for millibars (string)
              • 
- *         
            • speed: units of speed, mph for miles per hour or kph for kilometers
- *           per hour (string)
              • 
- *       
            
- *       Note that the default RSS feed uses Fahrenheit degree units and English
- *       units for all other attributes (miles, pounds per square inch, miles
- *       per hour). If Celsius has been specified as the degree units for the
- *       feed (using the u request parameter), all the units are in metric format
- *       (Celsius, kilometers, millibars, kilometers per hour).
+ * Units for various aspects of the forecast. Attributes:
+ * 
              
+ * 
            • temperature: degree units, f for Fahrenheit or c for Celsius (character)
              • 
+ * 
            • distance: units for distance, mi for miles or km for kilometers (string)
              • 
+ * 
            • pressure: units of barometric pressure, in for pounds per square inch or mb for millibars (string)
              • 
+ * 
            • speed: units of speed, mph for miles per hour or kph for kilometers per hour (string)
              • 
+ * 
            
+ * Note that the default RSS feed uses Fahrenheit degree units and English units for all other attributes (miles, pounds per square inch, miles per hour). If
+ * Celsius has been specified as the degree units for the feed (using the u request parameter), all the units are in metric format (Celsius, kilometers,
+ * millibars, kilometers per hour).
+ * 
  * @version $Id: Wind.java,v 1.2 2008/01/22 14:50:05 kebernet Exp $
  * @author Robert "kebernet" Cooper
  */
@@ -70,7 +65,7 @@ public class Wind implements Serializable, Cloneable {
     private int speed;
 
     /**
-     *  Simple Constructor
+     * Simple Constructor
      */
     public Wind() {
         super();
@@ -78,31 +73,36 @@ public class Wind implements Serializable, Cloneable {
 
     /**
      * Constructs a new Wind object
+     * 
      * @param chill wind chill adjusted temperature
      * @param direction direction of wind in degrees
      * @param speed speed of wind
      */
-    public Wind(int chill, int direction, int speed) {
+    public Wind(final int chill, final int direction, final int speed) {
         super();
         this.chill = chill;
         this.direction = direction;
         this.speed = speed;
     }
 
-    public boolean equals(Object o) {
-        return this.equals.equals(o);
+    @Override
+    public boolean equals(final Object o) {
+        return equals.equals(o);
     }
 
+    @Override
     public int hashCode() {
-        return this.equals.hashCode();
+        return equals.hashCode();
     }
 
+    @Override
     public String toString() {
-        return this.toString.toString();
+        return toString.toString();
     }
 
     /**
      * Wind chill adjusted temperature.
+     * 
      * @return int temperature value
      * @see Units
      */
@@ -112,15 +112,17 @@ public class Wind implements Serializable, Cloneable {
 
     /**
      * Wind chill adjusted temperature.
+     * 
      * @param chill int temperature value
      * @see Units
      */
-    public void setChill(int chill) {
+    public void setChill(final int chill) {
         this.chill = chill;
     }
 
     /**
      * Direction of wind in degrees
+     * 
      * @return int direction of wind.
      */
     public int getDirection() {
@@ -129,14 +131,16 @@ public class Wind implements Serializable, Cloneable {
 
     /**
      * Direction of wind in degrees
+     * 
      * @param direction int direction of wind.
      */
-    public void setDirection(int direction) {
+    public void setDirection(final int direction) {
         this.direction = direction;
     }
 
     /**
      * Speed of wind
+     * 
      * @return int speed of wind
      * @see Units
      */
@@ -146,14 +150,16 @@ public class Wind implements Serializable, Cloneable {
 
     /**
      * Speed of wind
+     * 
      * @param speed int speed of wind
      * @see Units
      */
-    public void setSpeed(int speed) {
+    public void setSpeed(final int speed) {
         this.speed = speed;
     }
 
+    @Override
     public Object clone() {
-        return new Wind(this.chill, this.direction, this.speed);
+        return new Wind(chill, direction, speed);
     }
 }
diff --git a/src/test/java/org/rometools/feed/module/AbstractTestCase.java b/src/test/java/org/rometools/feed/module/AbstractTestCase.java
index 93d3dc2..04d94ed 100644
--- a/src/test/java/org/rometools/feed/module/AbstractTestCase.java
+++ b/src/test/java/org/rometools/feed/module/AbstractTestCase.java
@@ -3,48 +3,51 @@ package org.rometools.feed.module;
 import java.beans.IntrospectionException;
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
-
 import java.io.File;
-
 import java.lang.reflect.InvocationTargetException;
+import java.net.URISyntaxException;
 
 import junit.framework.TestCase;
 
-
 /**
  * Abstract base class for test cases.
- *
+ * 
  * @author Jason van Zyl
  */
 public abstract class AbstractTestCase extends TestCase {
     /**
-     * Basedir for all file I/O. Important when running tests from
-     * the reactor.
+     * Basedir for all file I/O. Important when running tests from the reactor.
      */
-    public String basedir = System.getProperty("basedir") +"/src/test/resources";
+    public String basedir = System.getProperty("basedir") + "/src/test/resources";
 
     /**
      * Constructor.
      */
-    public AbstractTestCase(String testName) {
+    public AbstractTestCase(final String testName) {
         super(testName);
     }
 
     /**
      * Get test input file.
-     *
+     * 
      * @param path Path to test input file.
      */
-    public String getTestFile(String path) {
-        return new File(basedir, path).getAbsolutePath();
+    public String getTestFile(final String path) {
+        try {
+            return new File(this.getClass().getResource("/" + path).toURI()).getAbsolutePath();
+        } catch (final URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
     }
 
-    /** This method takes a JavaBean and generates a standard toString() type result for it.
+    /**
+     * This method takes a JavaBean and generates a standard toString() type result for it.
+     * 
      * @param o JavaBean object to stringinate
      * @return STRINGIATION! Stringingating the countryside. Stringinating all the peasants.
      */
-    public static String beanToString(Object o, boolean showNulls) {
-        StringBuffer result = new StringBuffer();
+    public static String beanToString(final Object o, final boolean showNulls) {
+        final StringBuffer result = new StringBuffer();
 
         if (o == null) {
             return "--- null";
@@ -57,40 +60,40 @@ public abstract class AbstractTestCase extends TestCase {
         result.append("\r\n");
 
         try {
-            PropertyDescriptor[] pds = Introspector.getBeanInfo(o.getClass()).getPropertyDescriptors();
+            final PropertyDescriptor[] pds = Introspector.getBeanInfo(o.getClass()).getPropertyDescriptors();
 
-            for (int pdi = 0; pdi < pds.length; pdi++) {
+            for (final PropertyDescriptor pd : pds) {
                 String out = "";
 
                 try {
-                    Object value = pds[pdi].getReadMethod().invoke(o, (Object[]) null);
+                    final Object value = pd.getReadMethod().invoke(o, (Object[]) null);
 
-                    if ((value != null) && value.getClass().isArray()) {
-                        Object[] values = (Object[]) value;
+                    if (value != null && value.getClass().isArray()) {
+                        final Object[] values = (Object[]) value;
 
-                        for (int i = 0; i < values.length; i++) {
-                            out += (values[i] + " ");
+                        for (final Object value2 : values) {
+                            out += value2 + " ";
                         }
                     } else {
                         out += value;
                     }
 
                     if (!out.equals("null") || showNulls) {
-                        result.append("Property: " + pds[pdi].getName() + " Value: " + out);
+                        result.append("Property: " + pd.getName() + " Value: " + out);
                     }
-                } catch (IllegalAccessException iae) {
-                    result.append("Property: " + pds[pdi].getName() + " (Illegal Access to Value) ");
-                } catch (InvocationTargetException iae) {
-                    result.append("Property: " + pds[pdi].getName() + " (InvocationTargetException) " + iae.toString());
-                } catch (Exception e) {
-                    result.append("Property: " + pds[pdi].getName() + " (Other Exception )" + e.toString());
+                } catch (final IllegalAccessException iae) {
+                    result.append("Property: " + pd.getName() + " (Illegal Access to Value) ");
+                } catch (final InvocationTargetException iae) {
+                    result.append("Property: " + pd.getName() + " (InvocationTargetException) " + iae.toString());
+                } catch (final Exception e) {
+                    result.append("Property: " + pd.getName() + " (Other Exception )" + e.toString());
                 }
 
                 if (!out.equals("null") || showNulls) {
                     result.append("\r\n");
                 }
             }
-        } catch (IntrospectionException ie) {
+        } catch (final IntrospectionException ie) {
             result.append("Introspection Exception: " + ie.toString());
             result.append("\r\n");
         }
@@ -103,16 +106,16 @@ public abstract class AbstractTestCase extends TestCase {
 
         return result.toString();
     }
-    
-    public boolean assertEquals( String message, Object[] control , Object[] test){
-	if( control == null && test == null ){
-	    return true;
-	}
-	assertTrue( message+" Nulls", ( control != null && test != null));
-	assertEquals( message+" [size]", control.length, test.length );
-	for( int i=0; i < control.length; i++ ){
-	    assertEquals( message +"["+i+"]", control[i], test[i]);
-	}
-	return true;
+
+    public boolean assertEquals(final String message, final Object[] control, final Object[] test) {
+        if (control == null && test == null) {
+            return true;
+        }
+        assertTrue(message + " Nulls", control != null && test != null);
+        assertEquals(message + " [size]", control.length, test.length);
+        for (int i = 0; i < control.length; i++) {
+            assertEquals(message + "[" + i + "]", control[i], test[i]);
+        }
+        return true;
     }
 }
diff --git a/src/test/java/org/rometools/feed/module/ITunesGeneratorTest.java b/src/test/java/org/rometools/feed/module/ITunesGeneratorTest.java
index ec516fb..6b397e8 100644
--- a/src/test/java/org/rometools/feed/module/ITunesGeneratorTest.java
+++ b/src/test/java/org/rometools/feed/module/ITunesGeneratorTest.java
@@ -6,33 +6,32 @@
  */
 package org.rometools.feed.module;
 
-import org.rometools.feed.module.itunes.ITunes;
+import java.io.File;
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.rometools.feed.module.itunes.AbstractITunesObject;
+
 import com.sun.syndication.feed.synd.SyndEntry;
 import com.sun.syndication.feed.synd.SyndFeed;
 import com.sun.syndication.io.SyndFeedInput;
 import com.sun.syndication.io.SyndFeedOutput;
 import com.sun.syndication.io.XmlReader;
-import org.rometools.feed.module.itunes.AbstractITunesObject;
-import junit.framework.*;
-
-import java.io.File;
-
-import java.util.List;
-
 
 /**
- *
+ * 
  * @author cooper
  */
 public class ITunesGeneratorTest extends AbstractTestCase {
-    
 
-    public ITunesGeneratorTest(String testName) {
+    public ITunesGeneratorTest(final String testName) {
         super(testName);
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite(ITunesGeneratorTest.class);
+        final TestSuite suite = new TestSuite(ITunesGeneratorTest.class);
 
         return suite;
     }
@@ -44,29 +43,29 @@ public class ITunesGeneratorTest extends AbstractTestCase {
         System.out.println("testEndToEnd");
         testFile("xml/leshow.xml");
 
-        //testFile( "/test/xml/apple.xml" );
-        //testFile( "/test/xml/lr.xml" );
+        // testFile( "/test/xml/apple.xml" );
+        // testFile( "/test/xml/lr.xml" );
     }
 
-    private void testFile(String filename) throws Exception {
-        File feed = new File(this.getTestFile(filename));
-        SyndFeedInput input = new SyndFeedInput();
-        SyndFeed syndfeed = input.build(new XmlReader(feed.toURL()));
+    private void testFile(final String filename) throws Exception {
+        final File feed = new File(getTestFile(filename));
+        final SyndFeedInput input = new SyndFeedInput();
+        final SyndFeed syndfeed = input.build(new XmlReader(feed.toURL()));
 
-        SyndFeedOutput output = new SyndFeedOutput();
-        File outfeed = new File("target/"+ feed.getName());
+        final SyndFeedOutput output = new SyndFeedOutput();
+        final File outfeed = new File("target/" + feed.getName());
         output.output(syndfeed, outfeed);
 
-        SyndFeed syndCheck = input.build(new XmlReader(outfeed.toURL()));
+        final SyndFeed syndCheck = input.build(new XmlReader(outfeed.toURL()));
         System.out.println(syndCheck.getModule(AbstractITunesObject.URI).toString());
         assertEquals("Feed Level: ", syndfeed.getModule(AbstractITunesObject.URI).toString(), syndCheck.getModule(AbstractITunesObject.URI).toString());
 
-        List syndEntries = syndfeed.getEntries();
-        List syndChecks = syndCheck.getEntries();
+        final List syndEntries = syndfeed.getEntries();
+        final List syndChecks = syndCheck.getEntries();
 
         for (int i = 0; i < syndEntries.size(); i++) {
-            SyndEntry entry = (SyndEntry) syndEntries.get(i);
-            SyndEntry check = (SyndEntry) syndChecks.get(i);
+            final SyndEntry entry = (SyndEntry) syndEntries.get(i);
+            final SyndEntry check = (SyndEntry) syndChecks.get(i);
             System.out.println("Original: " + entry.getModule(AbstractITunesObject.URI));
             System.out.println("Check:    " + check.getModule(AbstractITunesObject.URI));
             assertEquals("Entry Level: ", entry.getModule(AbstractITunesObject.URI).toString(), check.getModule(AbstractITunesObject.URI).toString());
diff --git a/src/test/java/org/rometools/feed/module/MediaModuleTest.java b/src/test/java/org/rometools/feed/module/MediaModuleTest.java
index 4f3380d..c7269e4 100644
--- a/src/test/java/org/rometools/feed/module/MediaModuleTest.java
+++ b/src/test/java/org/rometools/feed/module/MediaModuleTest.java
@@ -7,139 +7,116 @@
 
 package org.rometools.feed.module;
 
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.rometools.feed.module.mediarss.MediaModule;
-import junit.framework.*;
+
 import com.sun.syndication.feed.synd.SyndEntry;
 import com.sun.syndication.feed.synd.SyndFeed;
 import com.sun.syndication.io.SyndFeedInput;
 import com.sun.syndication.io.SyndFeedOutput;
-import java.io.File;
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-import java.util.List;
 
 /**
- *
+ * 
  * @author cooper
  */
 public class MediaModuleTest extends AbstractTestCase {
-    
-    public MediaModuleTest(String testName) {
+
+    public MediaModuleTest(final String testName) {
         super(testName);
     }
-    
+
     public static Test suite() {
-        TestSuite suite = new TestSuite(MediaModuleTest.class);
-        
+        final TestSuite suite = new TestSuite(MediaModuleTest.class);
+
         return suite;
     }
-    
+
     public void testParse() throws Exception {
-        SyndFeedInput input = new SyndFeedInput();
-        File test = new File( super.getTestFile( "xml") );
-        File[] files = test.listFiles();
-        for( int j=0; j < files.length; j++ ){
-            if( !files[j].getName().endsWith(".xml") )
+        final SyndFeedInput input = new SyndFeedInput();
+        final File test = new File(super.getTestFile("xml"));
+        final File[] files = test.listFiles();
+        for (int j = 0; j < files.length; j++) {
+            if (!files[j].getName().endsWith(".xml")) {
                 continue;
-            SyndFeed feed =  input.build( files[j] );
-            List entries = feed.getEntries();
-            for( int i = 0; i < entries.size(); i++ ){
-                System.out.println( ((SyndEntry) entries.get(i)).getModule( MediaModule.URI ) );
             }
-            SyndFeedOutput output = new SyndFeedOutput();
-            output.output( feed, new File( "target/"+j+"media.xml") );
-            SyndFeed feed2 = input.build( new File( "target/"+j+"media.xml") ) ;
-            for( int i=0; i < entries.size(); i++ ){
-                BufferedWriter b = new BufferedWriter( new FileWriter( "target/"+j+"a.txt") );
-                b.write( ""+((SyndEntry) entries.get(i)).getModule( MediaModule.URI ) );
+            final SyndFeed feed = input.build(files[j]);
+            final List entries = feed.getEntries();
+            for (int i = 0; i < entries.size(); i++) {
+                System.out.println(((SyndEntry) entries.get(i)).getModule(MediaModule.URI));
+            }
+            final SyndFeedOutput output = new SyndFeedOutput();
+            output.output(feed, new File("target/" + j + "media.xml"));
+            final SyndFeed feed2 = input.build(new File("target/" + j + "media.xml"));
+            for (int i = 0; i < entries.size(); i++) {
+                BufferedWriter b = new BufferedWriter(new FileWriter("target/" + j + "a.txt"));
+                b.write("" + ((SyndEntry) entries.get(i)).getModule(MediaModule.URI));
                 b.close();
-                b = new BufferedWriter( new FileWriter( "target/"+j+"b.txt") );
-                b.write( ""+((SyndEntry) feed2.getEntries().get(i)).getModule( MediaModule.URI ) );
+                b = new BufferedWriter(new FileWriter("target/" + j + "b.txt"));
+                b.write("" + feed2.getEntries().get(i).getModule(MediaModule.URI));
                 b.close();
-                assertEquals( ((SyndEntry) entries.get(i)).getModule( MediaModule.URI ), ((SyndEntry) feed2.getEntries().get(i)).getModule( MediaModule.URI ));
+                assertEquals(((SyndEntry) entries.get(i)).getModule(MediaModule.URI), feed2.getEntries().get(i).getModule(MediaModule.URI));
             }
         }
     }
-    
-    
-    /** This code represents the original MediaModuleTest main class from openvision.tv
+
+    /**
+     * This code represents the original MediaModuleTest main class from openvision.tv
      */
-    public void xtestOriginal() throws Exception{
+    public void xtestOriginal() throws Exception {
         //
         /*
-        //You can test with blip tv or broadcast machine
-         
-        String rss = "http://blip.tv/?1=1&&skin=rss";//
-        //	String rss = "http://openvision.tv/bm/rss.php?i=4";
-        //	String rss = "http://api.search.yahoo.com/VideoSearchService/rss/videoSearch.xml?appid=yahoosearchvideorss&query=surfing&adult_ok=0";
-         
-         
-        URLConnection uc = new URL(rss).openConnection();
-        String contentType = uc.getContentEncoding();
-         
-        WireFeedInput input = new WireFeedInput();
-         
-        XmlReader xmlReader = new XmlReader(uc.getInputStream(), contentType, true);
-         
-        Channel chnl = (Channel)input.build(xmlReader);
-         
-        String feedTitle = chnl.getTitle();
-        String feedDesc = chnl.getDescription();
-         
-         
-        List items = chnl.getItems();
-         
-        ListIterator li = items.listIterator();
-        Item item = null;
-        Enclosure enc = null;
-        MediaModule mModule = null;
-         
-        while (li.hasNext()) {
-         
-            item = (Item)li.next();
-            enc = (Enclosure)item.getEnclosures().get(0);
-         
-            mModule = (MediaModule)item.getModule(MediaModule.URI);
-         
-            List modules = item.getModules();
-            System.out.println("title: " + item.getTitle());
-            System.out.println("module count: " + modules.size());
-         
-            if (mModule != null) {
-                Thumbnail[] mThumbs = mModule.getMediaThumbnails();
-         
-                if (mThumbs != null) {
-                    for (int i = 0; i < mThumbs.length; i++) {
-                        String imgUrl = mThumbs[i].getUrl();
-                        System.out.println("got MediaModule img " + i + ": " + imgUrl);
-                    }
-                }
-         
-                System.out.println("MediaModule title: " + mModule.getTitle());
-                System.out.println("MediaModule isAdult: " + mModule.isAdult());
-                /*
-                if (mModule.getMediaContent() != null) {
-                    for (int i = 0; i < mModule.getMediaContent().length; i++) {
-                        MediaContent mc = mModule.getMediaContent()[i];
-                        mThumbs = mc.getMediaThumbnails();
-                        if (mThumbs != null) {
-                            for (int n = 0; n < mThumbs.length; n++) {
-                                String imgUrl = 	mThumbs[n].getUrl();
-                                System.out.println("got MediaContentImage " + n + " img: " + imgUrl);
-                            }
-                        }
-                        System.out.println("MediaContent title:" + mc.getTitle());
-                        System.out.println("MediaContent text:" + mc.getText());
-         
-                    }
-         
-                }
-         
-            } else {
-                System.out.println("no MediaModule!");
-            }
-        }
+         * //You can test with blip tv or broadcast machine
+         * 
+         * String rss = "http://blip.tv/?1=1&&skin=rss";// // String rss = "http://openvision.tv/bm/rss.php?i=4"; // String rss =
+         * "http://api.search.yahoo.com/VideoSearchService/rss/videoSearch.xml?appid=yahoosearchvideorss&query=surfing&adult_ok=0";
+         * 
+         * 
+         * URLConnection uc = new URL(rss).openConnection(); String contentType = uc.getContentEncoding();
+         * 
+         * WireFeedInput input = new WireFeedInput();
+         * 
+         * XmlReader xmlReader = new XmlReader(uc.getInputStream(), contentType, true);
+         * 
+         * Channel chnl = (Channel)input.build(xmlReader);
+         * 
+         * String feedTitle = chnl.getTitle(); String feedDesc = chnl.getDescription();
+         * 
+         * 
+         * List items = chnl.getItems();
+         * 
+         * ListIterator li = items.listIterator(); Item item = null; Enclosure enc = null; MediaModule mModule = null;
+         * 
+         * while (li.hasNext()) {
+         * 
+         * item = (Item)li.next(); enc = (Enclosure)item.getEnclosures().get(0);
+         * 
+         * mModule = (MediaModule)item.getModule(MediaModule.URI);
+         * 
+         * List modules = item.getModules(); System.out.println("title: " + item.getTitle()); System.out.println("module count: " + modules.size());
+         * 
+         * if (mModule != null) { Thumbnail[] mThumbs = mModule.getMediaThumbnails();
+         * 
+         * if (mThumbs != null) { for (int i = 0; i < mThumbs.length; i++) { String imgUrl = mThumbs[i].getUrl(); System.out.println("got MediaModule img " + i
+         * + ": " + imgUrl); } }
+         * 
+         * System.out.println("MediaModule title: " + mModule.getTitle()); System.out.println("MediaModule isAdult: " + mModule.isAdult()); /* if
+         * (mModule.getMediaContent() != null) { for (int i = 0; i < mModule.getMediaContent().length; i++) { MediaContent mc = mModule.getMediaContent()[i];
+         * mThumbs = mc.getMediaThumbnails(); if (mThumbs != null) { for (int n = 0; n < mThumbs.length; n++) { String imgUrl = mThumbs[n].getUrl();
+         * System.out.println("got MediaContentImage " + n + " img: " + imgUrl); } } System.out.println("MediaContent title:" + mc.getTitle());
+         * System.out.println("MediaContent text:" + mc.getText());
+         * 
+         * }
+         * 
+         * }
+         * 
+         * } else { System.out.println("no MediaModule!"); } }
          */
     }
 }
-
diff --git a/src/test/java/org/rometools/feed/module/activitystreams/types/VerbTest.java b/src/test/java/org/rometools/feed/module/activitystreams/types/VerbTest.java
index 5eb4b0c..c2ecf12 100644
--- a/src/test/java/org/rometools/feed/module/activitystreams/types/VerbTest.java
+++ b/src/test/java/org/rometools/feed/module/activitystreams/types/VerbTest.java
@@ -20,12 +20,12 @@ package org.rometools.feed.module.activitystreams.types;
 import junit.framework.TestCase;
 
 /**
- *
+ * 
  * @author robert.cooper
  */
 public class VerbTest extends TestCase {
-    
-    public VerbTest(String testName) {
+
+    public VerbTest(final String testName) {
         super(testName);
     }
 
@@ -39,18 +39,14 @@ public class VerbTest extends TestCase {
         super.tearDown();
     }
 
-    
-
     /**
      * Test of valueOf method, of class Verb.
      */
     public void testValueOf() {
         System.out.println("valueOf");
-        String fav = Verb.MARK_AS_FAVORITE.toString();
+        final String fav = Verb.MARK_AS_FAVORITE.toString();
         assertEquals("http://activitystrea.ms/schema/1.0/favorite", fav);
         assertEquals(Verb.MARK_AS_FAVORITE, Verb.fromIRI(fav));
     }
 
-    
-
 }
diff --git a/src/test/java/org/rometools/feed/module/base/io/CustomTagGeneratorTest.java b/src/test/java/org/rometools/feed/module/base/io/CustomTagGeneratorTest.java
index 674269b..c9c6497 100644
--- a/src/test/java/org/rometools/feed/module/base/io/CustomTagGeneratorTest.java
+++ b/src/test/java/org/rometools/feed/module/base/io/CustomTagGeneratorTest.java
@@ -7,61 +7,64 @@
 
 package org.rometools.feed.module.base.io;
 
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.base.CustomTag;
-import junit.framework.*;
-import org.rometools.feed.module.base.CustomTags;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.SyndFeedOutput;
 import java.io.File;
 import java.util.Iterator;
 import java.util.List;
 
+import junit.framework.Assert;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.rometools.feed.module.AbstractTestCase;
+import org.rometools.feed.module.base.CustomTag;
+import org.rometools.feed.module.base.CustomTags;
+
+import com.sun.syndication.feed.synd.SyndEntry;
+import com.sun.syndication.feed.synd.SyndFeed;
+import com.sun.syndication.io.SyndFeedInput;
+import com.sun.syndication.io.SyndFeedOutput;
+
 /**
- *
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class CustomTagGeneratorTest extends AbstractTestCase {
-    
-    public CustomTagGeneratorTest(String testName) {
-	super(testName);
+
+    public CustomTagGeneratorTest(final String testName) {
+        super(testName);
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite(CustomTagGeneratorTest.class);
-        
+        final TestSuite suite = new TestSuite(CustomTagGeneratorTest.class);
+
         return suite;
     }
 
-    
-
     public void testGenerate() throws Exception {
-        SyndFeedInput input = new SyndFeedInput();
-	
-	SyndFeed feed = input.build(  new File(super.getTestFile( "xml/custom-tags-example.xml")) );
-	SyndFeedOutput output = new SyndFeedOutput();
-	output.output( feed, new File( "target/custom-tags-example.xml") );
-	SyndFeed feed2 = input.build( new File("target/custom-tags-example.xml") );
-	    
-	List entries = feed.getEntries();
-	SyndEntry entry = (SyndEntry) entries.get(0);
-	CustomTags customTags = (CustomTags) entry.getModule( CustomTags.URI );
-	
-	List entries2 = feed2.getEntries();
-	SyndEntry entry2 = (SyndEntry) entries2.get(0);
-	CustomTags customTags2 = (CustomTags) entry2.getModule( CustomTags.URI );
-	
-	Iterator it = customTags.getValues().iterator();
-	Iterator it2 = customTags2.getValues().iterator();
-	while( it.hasNext() ){
-	    CustomTag tag = (CustomTag) it.next();
-	    CustomTag tag2 = (CustomTag) it2.next();
-	    System.out.println( "tag1:" + tag );
-	    System.out.println( "tag2:" + tag2 );
-	    this.assertEquals( tag, tag2);
-	}
+        final SyndFeedInput input = new SyndFeedInput();
+
+        final SyndFeed feed = input.build(new File(super.getTestFile("xml/custom-tags-example.xml")));
+        final SyndFeedOutput output = new SyndFeedOutput();
+        output.output(feed, new File("target/custom-tags-example.xml"));
+        final SyndFeed feed2 = input.build(new File("target/custom-tags-example.xml"));
+
+        final List entries = feed.getEntries();
+        final SyndEntry entry = (SyndEntry) entries.get(0);
+        final CustomTags customTags = (CustomTags) entry.getModule(CustomTags.URI);
+
+        final List entries2 = feed2.getEntries();
+        final SyndEntry entry2 = (SyndEntry) entries2.get(0);
+        final CustomTags customTags2 = (CustomTags) entry2.getModule(CustomTags.URI);
+
+        final Iterator it = customTags.getValues().iterator();
+        final Iterator it2 = customTags2.getValues().iterator();
+        while (it.hasNext()) {
+            final CustomTag tag = (CustomTag) it.next();
+            final CustomTag tag2 = (CustomTag) it2.next();
+            System.out.println("tag1:" + tag);
+            System.out.println("tag2:" + tag2);
+            Assert.assertEquals(tag, tag2);
+        }
     }
-    
+
 }
diff --git a/src/test/java/org/rometools/feed/module/base/io/CustomTagParserTest.java b/src/test/java/org/rometools/feed/module/base/io/CustomTagParserTest.java
index 31bb3b3..1bab1a6 100644
--- a/src/test/java/org/rometools/feed/module/base/io/CustomTagParserTest.java
+++ b/src/test/java/org/rometools/feed/module/base/io/CustomTagParserTest.java
@@ -7,17 +7,6 @@
 
 package org.rometools.feed.module.base.io;
 
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.base.CustomTag;
-import org.rometools.feed.module.base.CustomTagImpl;
-import junit.framework.*;
-import org.rometools.feed.module.base.CustomTags;
-import org.rometools.feed.module.base.types.DateTimeRange;
-import org.rometools.feed.module.base.types.FloatUnit;
-import org.rometools.feed.module.base.types.IntUnit;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
 import java.io.File;
 import java.net.URL;
 import java.util.Calendar;
@@ -25,65 +14,79 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+import junit.framework.Assert;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.rometools.feed.module.AbstractTestCase;
+import org.rometools.feed.module.base.CustomTag;
+import org.rometools.feed.module.base.CustomTagImpl;
+import org.rometools.feed.module.base.CustomTags;
+import org.rometools.feed.module.base.types.DateTimeRange;
+import org.rometools.feed.module.base.types.FloatUnit;
+import org.rometools.feed.module.base.types.IntUnit;
+
+import com.sun.syndication.feed.synd.SyndEntry;
+import com.sun.syndication.feed.synd.SyndFeed;
+import com.sun.syndication.io.SyndFeedInput;
+
 /**
- *
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class CustomTagParserTest extends AbstractTestCase {
-    
-    public CustomTagParserTest(String testName) {
-	super(testName);
+
+    public CustomTagParserTest(final String testName) {
+        super(testName);
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite(CustomTagParserTest.class);
-        
+        final TestSuite suite = new TestSuite(CustomTagParserTest.class);
+
         return suite;
     }
 
-    public void testParse() throws Exception{
-        SyndFeedInput input = new SyndFeedInput();
-	
-	SyndFeed feed = input.build(  new File(super.getTestFile( "xml/custom-tags-example.xml")) );
-	List entries = feed.getEntries();
-	SyndEntry entry = (SyndEntry) entries.get(0);
-	CustomTags customTags = (CustomTags) entry.getModule( CustomTags.URI );
-	Iterator it = customTags.getValues().iterator();
-	while( it.hasNext() ){
-	    CustomTag tag = (CustomTag) it.next();
-	    System.out.println( tag );
-	    if( tag.getName().equals("language_skills") ){
-		this.assertEquals( "Fluent in English and German", tag.getValue() );
-	    }
-	    if( tag.getName().equals( "prior_experience_years") ){
-		this.assertEquals( new Integer( 5 ), tag.getValue() );
-	    } else if( tag.getName().equals( "start_date") ){
-		Calendar cal = Calendar.getInstance();
-		cal.setTimeInMillis( 0 );
-		cal.set( 2005, 10, 15, 0, 0, 0 );
-		this.assertEquals( cal.getTime(), tag.getValue() );
-	    } else if( tag.getName().equals( "test_url") ){
-		this.assertEquals( new URL( "http://www.screaming-penguin.com"), tag.getValue() );
-	    } else if( tag.getName().equals( "test_boolean") ){
-		this.assertEquals( new Boolean(true), tag.getValue());
-	    } else if( tag.getName().equals("test_intUnit") ){
-		this.assertEquals( new IntUnit( 25, "horses"), tag.getValue() );
-	    } else if( tag.getName().equals("test_floatUnit") ){
-		this.assertEquals( new FloatUnit( (float)2.5, "cows"), tag.getValue() );
-	    } else if( tag.getName().equals("test_location" ) ){
-		this.assertEquals( new CustomTagImpl.Location( "125 Main St, Sometown, GA"), tag.getValue() );
-	    } else if( tag.getName().equals("test_dateRange") ){
-		Calendar cal = Calendar.getInstance();
-		cal.setTimeInMillis( 0 );
-		cal.set( 2005, 06, 04, 20, 0, 0 );
-		Date start = cal.getTime();
-		cal.set( 2005, 06, 04, 23, 0, 0 );
-		DateTimeRange dtr = new DateTimeRange( start, cal.getTime() );
-		this.assertEquals( dtr, tag.getValue() );
-	    }
-	}
+    public void testParse() throws Exception {
+        final SyndFeedInput input = new SyndFeedInput();
+
+        final SyndFeed feed = input.build(new File(super.getTestFile("xml/custom-tags-example.xml")));
+        final List entries = feed.getEntries();
+        final SyndEntry entry = (SyndEntry) entries.get(0);
+        final CustomTags customTags = (CustomTags) entry.getModule(CustomTags.URI);
+        final Iterator it = customTags.getValues().iterator();
+        while (it.hasNext()) {
+            final CustomTag tag = (CustomTag) it.next();
+            System.out.println(tag);
+            if (tag.getName().equals("language_skills")) {
+                Assert.assertEquals("Fluent in English and German", tag.getValue());
+            }
+            if (tag.getName().equals("prior_experience_years")) {
+                Assert.assertEquals(new Integer(5), tag.getValue());
+            } else if (tag.getName().equals("start_date")) {
+                final Calendar cal = Calendar.getInstance();
+                cal.setTimeInMillis(0);
+                cal.set(2005, 10, 15, 0, 0, 0);
+                Assert.assertEquals(cal.getTime(), tag.getValue());
+            } else if (tag.getName().equals("test_url")) {
+                Assert.assertEquals(new URL("http://www.screaming-penguin.com"), tag.getValue());
+            } else if (tag.getName().equals("test_boolean")) {
+                Assert.assertEquals(new Boolean(true), tag.getValue());
+            } else if (tag.getName().equals("test_intUnit")) {
+                Assert.assertEquals(new IntUnit(25, "horses"), tag.getValue());
+            } else if (tag.getName().equals("test_floatUnit")) {
+                Assert.assertEquals(new FloatUnit((float) 2.5, "cows"), tag.getValue());
+            } else if (tag.getName().equals("test_location")) {
+                Assert.assertEquals(new CustomTagImpl.Location("125 Main St, Sometown, GA"), tag.getValue());
+            } else if (tag.getName().equals("test_dateRange")) {
+                final Calendar cal = Calendar.getInstance();
+                cal.setTimeInMillis(0);
+                cal.set(2005, 06, 04, 20, 0, 0);
+                final Date start = cal.getTime();
+                cal.set(2005, 06, 04, 23, 0, 0);
+                final DateTimeRange dtr = new DateTimeRange(start, cal.getTime());
+                Assert.assertEquals(dtr, tag.getValue());
+            }
+        }
     }
 
-   
-    
 }
diff --git a/src/test/java/org/rometools/feed/module/base/io/GoogleBaseGeneratorTest.java b/src/test/java/org/rometools/feed/module/base/io/GoogleBaseGeneratorTest.java
index 98d2921..771cf28 100644
--- a/src/test/java/org/rometools/feed/module/base/io/GoogleBaseGeneratorTest.java
+++ b/src/test/java/org/rometools/feed/module/base/io/GoogleBaseGeneratorTest.java
@@ -6,36 +6,41 @@
  */
 package org.rometools.feed.module.base.io;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Assert;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.rometools.feed.module.AbstractTestCase;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.SyndFeedOutput;
 import org.rometools.feed.module.base.GoogleBase;
 import org.rometools.feed.module.base.GoogleBaseImpl;
 import org.rometools.feed.module.base.Product;
 import org.rometools.feed.module.base.Vehicle;
+
 import com.sun.syndication.feed.synd.SyndContent;
 import com.sun.syndication.feed.synd.SyndContentImpl;
+import com.sun.syndication.feed.synd.SyndEntry;
 import com.sun.syndication.feed.synd.SyndEntryImpl;
+import com.sun.syndication.feed.synd.SyndFeed;
 import com.sun.syndication.feed.synd.SyndFeedImpl;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import junit.framework.*;
+import com.sun.syndication.io.SyndFeedInput;
+import com.sun.syndication.io.SyndFeedOutput;
 
 /**
- *
+ * 
  * @author rcooper
  */
 public class GoogleBaseGeneratorTest extends AbstractTestCase {
 
-    public GoogleBaseGeneratorTest(String testName) {
+    public GoogleBaseGeneratorTest(final String testName) {
         super(testName);
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite(GoogleBaseGeneratorTest.class);
+        final TestSuite suite = new TestSuite(GoogleBaseGeneratorTest.class);
 
         return suite;
     }
@@ -45,42 +50,42 @@ public class GoogleBaseGeneratorTest extends AbstractTestCase {
      */
     public void testGenerate() throws Exception {
         System.out.println("testGenerate");
-        SyndFeedInput input = new SyndFeedInput();
-        SyndFeedOutput output = new SyndFeedOutput();
-        File testDir = new File(super.getTestFile("xml"));
-        File[] testFiles = testDir.listFiles();
+        final SyndFeedInput input = new SyndFeedInput();
+        final SyndFeedOutput output = new SyndFeedOutput();
+        final File testDir = new File(super.getTestFile("xml"));
+        final File[] testFiles = testDir.listFiles();
         for (int h = 0; h < testFiles.length; h++) {
             if (!testFiles[h].getName().endsWith(".xml")) {
                 continue;
             }
             System.out.println(testFiles[h].getName());
-            SyndFeed feed = input.build(testFiles[h]);
+            final SyndFeed feed = input.build(testFiles[h]);
             try {
                 output.output(feed, new File("target/" + testFiles[h].getName()));
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 throw new RuntimeException(testFiles[h].getAbsolutePath(), e);
             }
-            SyndFeed feed2 = input.build(new File("target/" + testFiles[h].getName()));
+            final SyndFeed feed2 = input.build(new File("target/" + testFiles[h].getName()));
             for (int i = 0; i < feed.getEntries().size(); i++) {
-                SyndEntry entry = (SyndEntry) feed.getEntries().get(i);
-                SyndEntry entry2 = (SyndEntry) feed2.getEntries().get(i);
-                GoogleBase base = (GoogleBase) entry.getModule(GoogleBase.URI);
-                GoogleBase base2 = (GoogleBase) entry2.getModule(GoogleBase.URI);
-                this.assertEquals(testFiles[h].getName(), base, base2);
+                final SyndEntry entry = feed.getEntries().get(i);
+                final SyndEntry entry2 = feed2.getEntries().get(i);
+                final GoogleBase base = (GoogleBase) entry.getModule(GoogleBase.URI);
+                final GoogleBase base2 = (GoogleBase) entry2.getModule(GoogleBase.URI);
+                Assert.assertEquals(testFiles[h].getName(), base, base2);
             }
         }
 
     }
 
     public void testMehta() throws Exception {
-        SyndFeed feed = new SyndFeedImpl();
+        final SyndFeed feed = new SyndFeedImpl();
         feed.setFeedType("atom_1.0");
 
         feed.setTitle("Sample Feed (created with Rome)");
         feed.setLink("http://rome.dev.java.net");
         feed.setDescription("This feed has been created using Rome (Java syndication utilities");
 
-        List entries = new ArrayList();
+        final List entries = new ArrayList();
         SyndEntry entry;
         SyndContent description;
 
@@ -91,30 +96,26 @@ public class GoogleBaseGeneratorTest extends AbstractTestCase {
         description.setType("text/plain");
         description.setValue("Initial release of Rome");
         entry.setDescription(description);
-        Vehicle vehicle = new GoogleBaseImpl();
+        final Vehicle vehicle = new GoogleBaseImpl();
         vehicle.setMake("Honda");
         vehicle.setModel("Insight");
 
-        Product product = new GoogleBaseImpl();
+        final Product product = new GoogleBaseImpl();
         product.setCondition("New");
         product.setDeliveryNotes("Insight");
 
-        List modules = new ArrayList();
+        final List modules = new ArrayList();
         modules.add(vehicle);
         modules.add(product);
 
-
         entry.setModules(modules);
 
-
         entries.add(entry);
 
         feed.setEntries(entries);
 
-        SyndFeedOutput output = new SyndFeedOutput();
+        final SyndFeedOutput output = new SyndFeedOutput();
         System.out.println(output.outputString(feed));
 
-
-
     }
 }
diff --git a/src/test/java/org/rometools/feed/module/base/io/GoogleBaseParserTest.java b/src/test/java/org/rometools/feed/module/base/io/GoogleBaseParserTest.java
index 62697d4..6e6a631 100644
--- a/src/test/java/org/rometools/feed/module/base/io/GoogleBaseParserTest.java
+++ b/src/test/java/org/rometools/feed/module/base/io/GoogleBaseParserTest.java
@@ -6,11 +6,16 @@
  */
 package org.rometools.feed.module.base.io;
 
-import org.rometools.feed.module.base.io.GoogleBaseParser;
+import java.io.File;
+import java.net.URL;
+import java.util.Calendar;
+import java.util.List;
+
+import junit.framework.Assert;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.rometools.feed.module.AbstractTestCase;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
 import org.rometools.feed.module.base.Article;
 import org.rometools.feed.module.base.Course;
 import org.rometools.feed.module.base.Event;
@@ -31,24 +36,23 @@ import org.rometools.feed.module.base.types.GenderEnumeration;
 import org.rometools.feed.module.base.types.PaymentTypeEnumeration;
 import org.rometools.feed.module.base.types.PriceTypeEnumeration;
 import org.rometools.feed.module.base.types.ShippingType;
-import java.io.File;
-import java.net.URL;
-import java.util.Calendar;
-import junit.framework.*;
-import java.util.List;
+
+import com.sun.syndication.feed.synd.SyndEntry;
+import com.sun.syndication.feed.synd.SyndFeed;
+import com.sun.syndication.io.SyndFeedInput;
 
 /**
- *
+ * 
  * @author rcooper
  */
 public class GoogleBaseParserTest extends AbstractTestCase {
 
-    public GoogleBaseParserTest(String testName) {
+    public GoogleBaseParserTest(final String testName) {
         super(testName);
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite(GoogleBaseParserTest.class);
+        final TestSuite suite = new TestSuite(GoogleBaseParserTest.class);
 
         return suite;
     }
@@ -59,34 +63,34 @@ public class GoogleBaseParserTest extends AbstractTestCase {
     public void testQuickParse() throws Exception {
         try {
             System.out.println("testParse");
-            SyndFeedInput input = new SyndFeedInput();
-            File testDir = new File(super.getTestFile("xml"));
-            File[] testFiles = testDir.listFiles();
+            final SyndFeedInput input = new SyndFeedInput();
+            final File testDir = new File(super.getTestFile("xml"));
+            final File[] testFiles = testDir.listFiles();
             for (int h = 0; h < testFiles.length; h++) {
                 if (!testFiles[h].getName().endsWith(".xml")) {
                     continue;
                 }
                 SyndFeed feed = null;
                 try {
-                     feed = input.build(testFiles[h]);
-                } catch (Exception e) {
+                    feed = input.build(testFiles[h]);
+                } catch (final Exception e) {
                     throw new RuntimeException(testFiles[h].getAbsolutePath(), e);
                 }
-                List entries = feed.getEntries();
+                final List entries = feed.getEntries();
                 for (int i = 0; i < entries.size(); i++) {
-                    SyndEntry entry = (SyndEntry) entries.get(i);
+                    final SyndEntry entry = (SyndEntry) entries.get(i);
                     System.out.println(entry.getModules().size());
                     for (int j = 0; j < entry.getModules().size(); j++) {
                         System.out.println(entry.getModules().get(j).getClass());
                         if (entry.getModules().get(j) instanceof GoogleBase) {
-                            GoogleBase base = (GoogleBase) entry.getModules().get(j);
+                            final GoogleBase base = (GoogleBase) entry.getModules().get(j);
                             System.out.println(testFiles[h].getName());
                             System.out.println(super.beanToString(base, false));
                         }
                     }
                 }
             }
-        } catch (Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
             throw e;
         }
@@ -97,45 +101,45 @@ public class GoogleBaseParserTest extends AbstractTestCase {
      */
     public void testCourse2Parse() throws Exception {
         System.out.println("testCourse2Parse");
-        SyndFeedInput input = new SyndFeedInput();
+        final SyndFeedInput input = new SyndFeedInput();
 
-        SyndFeed feed = input.build(new File(super.getTestFile("xml/courses2.xml")));
-        List entries = feed.getEntries();
+        final SyndFeed feed = input.build(new File(super.getTestFile("xml/courses2.xml")));
+        final List entries = feed.getEntries();
         SyndEntry entry = (SyndEntry) entries.get(0);
         Course course = (Course) entry.getModule(GoogleBase.URI);
-        this.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", course.getImageLinks()[0].toString());
+        Assert.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", course.getImageLinks()[0].toString());
         Calendar cal = Calendar.getInstance();
         cal.setTimeInMillis(0);
         cal.set(2005, 10, 30, 0, 0, 0);
-        this.assertEquals("Course Date", cal.getTime(), course.getExpirationDate());
-        String[] labels = new String[]{"robots", "society", "computers"};
+        Assert.assertEquals("Course Date", cal.getTime(), course.getExpirationDate());
+        String[] labels = new String[] { "robots", "society", "computers" };
         this.assertEquals("Labels", labels, course.getLabels());
         cal.set(2005, 7, 19, 8, 30, 00);
-        this.assertEquals("Start Time", cal.getTime(), course.getCourseDateRange().getStart());
+        Assert.assertEquals("Start Time", cal.getTime(), course.getCourseDateRange().getStart());
         cal.set(2005, 11, 20, 9, 45, 00);
-        this.assertEquals("End Time", cal.getTime(), course.getCourseDateRange().getEnd());
-        this.assertEquals("Course Number", "CS 230", course.getCourseNumber());
-        this.assertEquals("Coutse Times", "MWF 08:30-09:00", course.getCourseTimes());
-        this.assertEquals("Subject", new String[]{"computer science"}, course.getSubjects());
-        this.assertEquals("University", "Johnson State", course.getUniversity());
+        Assert.assertEquals("End Time", cal.getTime(), course.getCourseDateRange().getEnd());
+        Assert.assertEquals("Course Number", "CS 230", course.getCourseNumber());
+        Assert.assertEquals("Coutse Times", "MWF 08:30-09:00", course.getCourseTimes());
+        this.assertEquals("Subject", new String[] { "computer science" }, course.getSubjects());
+        Assert.assertEquals("University", "Johnson State", course.getUniversity());
 
         entry = (SyndEntry) entries.get(1);
         course = (Course) entry.getModule(GoogleBase.URI);
-        this.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", course.getImageLinks()[0].toString());
+        Assert.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", course.getImageLinks()[0].toString());
         cal = Calendar.getInstance();
         cal.setTimeInMillis(0);
         cal.set(2005, 10, 30, 0, 0, 0);
-        this.assertEquals("Course Date", cal.getTime(), course.getExpirationDate());
-        labels = new String[]{"film", "video", "documentary"};
+        Assert.assertEquals("Course Date", cal.getTime(), course.getExpirationDate());
+        labels = new String[] { "film", "video", "documentary" };
         this.assertEquals("Labels", labels, course.getLabels());
         cal.set(2005, 7, 19, 8, 30, 00);
-        this.assertEquals("Start Time", cal.getTime(), course.getCourseDateRange().getStart());
+        Assert.assertEquals("Start Time", cal.getTime(), course.getCourseDateRange().getStart());
         cal.set(2005, 11, 20, 9, 45, 00);
-        this.assertEquals("End Time", cal.getTime(), course.getCourseDateRange().getEnd());
-        this.assertEquals("Course Number", "FS 192", course.getCourseNumber());
-        this.assertEquals("Coutse Times", "TTh 14:00-16:00", course.getCourseTimes());
-        this.assertEquals("Subject", "film", course.getSubjects()[0]);
-        this.assertEquals("University", "Johnson State", course.getUniversity());
+        Assert.assertEquals("End Time", cal.getTime(), course.getCourseDateRange().getEnd());
+        Assert.assertEquals("Course Number", "FS 192", course.getCourseNumber());
+        Assert.assertEquals("Coutse Times", "TTh 14:00-16:00", course.getCourseTimes());
+        Assert.assertEquals("Subject", "film", course.getSubjects()[0]);
+        Assert.assertEquals("University", "Johnson State", course.getUniversity());
     }
 
     /**
@@ -143,70 +147,66 @@ public class GoogleBaseParserTest extends AbstractTestCase {
      */
     public void testEvent2Parse() throws Exception {
         System.out.println("testEvent2Parse");
-        SyndFeedInput input = new SyndFeedInput();
+        final SyndFeedInput input = new SyndFeedInput();
 
-        SyndFeed feed = input.build(new File(super.getTestFile("xml/events2.xml")));
-        List entries = feed.getEntries();
+        final SyndFeed feed = input.build(new File(super.getTestFile("xml/events2.xml")));
+        final List entries = feed.getEntries();
         SyndEntry entry = (SyndEntry) entries.get(0);
         Event event = (Event) entry.getModule(GoogleBase.URI);
-        this.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", event.getImageLinks()[0].toString());
-        Calendar cal = Calendar.getInstance();
+        Assert.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", event.getImageLinks()[0].toString());
+        final Calendar cal = Calendar.getInstance();
         cal.setTimeInMillis(0);
         cal.set(2005, 11, 20, 0, 0, 0);
-        this.assertEquals("Expiration Date", cal.getTime(), event.getExpirationDate());
-        this.assertEquals("Labels", new String[]{"Festival", "Halloween", "Party", "Costumes"}, event.getLabels());
-        this.assertEquals("Currency", CurrencyEnumeration.USD, event.getCurrency());
-        this.assertEquals("Price", (float) 10, event.getPrice().getValue(), 0);
-        this.assertEquals("PriceUnit", null, event.getPrice().getUnits());
-        this.assertEquals("PriceType", PriceTypeEnumeration.STARTING, event.getPriceType());
-        this.assertEquals("Payment Accepted", new PaymentTypeEnumeration[]{PaymentTypeEnumeration.CASH, PaymentTypeEnumeration.CHECK, PaymentTypeEnumeration.VISA}, event.getPaymentAccepted());
-        this.assertEquals("Payment Notes", "Cash only for local orders", event.getPaymentNotes());
+        Assert.assertEquals("Expiration Date", cal.getTime(), event.getExpirationDate());
+        this.assertEquals("Labels", new String[] { "Festival", "Halloween", "Party", "Costumes" }, event.getLabels());
+        Assert.assertEquals("Currency", CurrencyEnumeration.USD, event.getCurrency());
+        Assert.assertEquals("Price", 10, event.getPrice().getValue(), 0);
+        Assert.assertEquals("PriceUnit", null, event.getPrice().getUnits());
+        Assert.assertEquals("PriceType", PriceTypeEnumeration.STARTING, event.getPriceType());
+        this.assertEquals("Payment Accepted", new PaymentTypeEnumeration[] { PaymentTypeEnumeration.CASH, PaymentTypeEnumeration.CHECK,
+                PaymentTypeEnumeration.VISA }, event.getPaymentAccepted());
+        Assert.assertEquals("Payment Notes", "Cash only for local orders", event.getPaymentNotes());
         /*
-        
-        2005-07-04T20:00:00
-        2005-07-04T23:00:00
-        
+         *  2005-07-04T20:00:00 2005-07-04T23:00:00 
          */
         cal.set(2005, 06, 04, 20, 00, 00);
-        this.assertEquals("Start Time", cal.getTime(), event.getEventDateRange().getStart());
+        Assert.assertEquals("Start Time", cal.getTime(), event.getEventDateRange().getStart());
         cal.set(2005, 06, 04, 23, 00, 00);
-        this.assertEquals("End Time", cal.getTime(), event.getEventDateRange().getEnd());
-        this.assertEquals("Location", "1600 Amphitheatre Parkway, Mountain View, CA, 94043", event.getLocation());
-        this.assertEquals("Shipping Price", (float) 32.95, event.getShipping()[0].getPrice().getValue(), 0);
-        //TODO: Determine what to do about the bogus services.
-        this.assertEquals("Shipping Country", "US", event.getShipping()[0].getCountry());
-        this.assertEquals("Tax Region", "California", event.getTaxRegion());
-        this.assertEquals("Tax Percentage", new Float(8.25), event.getTaxPercent());
+        Assert.assertEquals("End Time", cal.getTime(), event.getEventDateRange().getEnd());
+        Assert.assertEquals("Location", "1600 Amphitheatre Parkway, Mountain View, CA, 94043", event.getLocation());
+        Assert.assertEquals("Shipping Price", (float) 32.95, event.getShipping()[0].getPrice().getValue(), 0);
+        // TODO: Determine what to do about the bogus services.
+        Assert.assertEquals("Shipping Country", "US", event.getShipping()[0].getCountry());
+        Assert.assertEquals("Tax Region", "California", event.getTaxRegion());
+        Assert.assertEquals("Tax Percentage", new Float(8.25), event.getTaxPercent());
 
         entry = (SyndEntry) entries.get(1);
         event = (Event) entry.getModule(GoogleBase.URI);
-        this.assertEquals("Image Link", "http://www.providers-website.com/image2.jpg", event.getImageLinks()[0].toString());
+        Assert.assertEquals("Image Link", "http://www.providers-website.com/image2.jpg", event.getImageLinks()[0].toString());
         cal.setTimeInMillis(0);
         cal.set(2005, 11, 20, 0, 0, 0);
-        this.assertEquals("Expiration Date", cal.getTime(), event.getExpirationDate());
-        this.assertEquals("Labels", new String[]{"Concert", "festival", "music"}, event.getLabels());
-        this.assertEquals("Currency", CurrencyEnumeration.USD, event.getCurrency());
-        this.assertEquals("Price", (float) 50, event.getPrice().getValue(), 0);
-        this.assertEquals("PriceUnit", null, event.getPrice().getUnits());
-        this.assertEquals("PriceType", PriceTypeEnumeration.STARTING, event.getPriceType());
-        this.assertEquals("Payment Accepted", new PaymentTypeEnumeration[]{PaymentTypeEnumeration.CASH, PaymentTypeEnumeration.CHECK, PaymentTypeEnumeration.VISA}, event.getPaymentAccepted());
-        this.assertEquals("Payment Notes", "Cash only for local orders", event.getPaymentNotes());
+        Assert.assertEquals("Expiration Date", cal.getTime(), event.getExpirationDate());
+        this.assertEquals("Labels", new String[] { "Concert", "festival", "music" }, event.getLabels());
+        Assert.assertEquals("Currency", CurrencyEnumeration.USD, event.getCurrency());
+        Assert.assertEquals("Price", 50, event.getPrice().getValue(), 0);
+        Assert.assertEquals("PriceUnit", null, event.getPrice().getUnits());
+        Assert.assertEquals("PriceType", PriceTypeEnumeration.STARTING, event.getPriceType());
+        this.assertEquals("Payment Accepted", new PaymentTypeEnumeration[] { PaymentTypeEnumeration.CASH, PaymentTypeEnumeration.CHECK,
+                PaymentTypeEnumeration.VISA }, event.getPaymentAccepted());
+        Assert.assertEquals("Payment Notes", "Cash only for local orders", event.getPaymentNotes());
         /*
-        
-        2005-08-23T20:00:00
-        2005-08-23T23:00:00
-        
+         *  2005-08-23T20:00:00 2005-08-23T23:00:00 
          */
         cal.set(2005, 07, 23, 20, 00, 00);
-        this.assertEquals("Start Time", cal.getTime(), event.getEventDateRange().getStart());
+        Assert.assertEquals("Start Time", cal.getTime(), event.getEventDateRange().getStart());
         cal.set(2005, 07, 23, 23, 00, 00);
-        this.assertEquals("End Time", cal.getTime(), event.getEventDateRange().getEnd());
-        this.assertEquals("Location", "123 Main St, Anytown, CA, 12345, USA", event.getLocation());
-        this.assertEquals("Shipping Price", (float) 32.95, event.getShipping()[0].getPrice().getValue(), 0);
-        //TODO: Determine what to do about the bogus services.
-        this.assertEquals("Shipping Country", "US", event.getShipping()[0].getCountry());
-        this.assertEquals("Tax Region", "California", event.getTaxRegion());
-        this.assertEquals("Tax Percentage", new Float(8.25), event.getTaxPercent());
+        Assert.assertEquals("End Time", cal.getTime(), event.getEventDateRange().getEnd());
+        Assert.assertEquals("Location", "123 Main St, Anytown, CA, 12345, USA", event.getLocation());
+        Assert.assertEquals("Shipping Price", (float) 32.95, event.getShipping()[0].getPrice().getValue(), 0);
+        // TODO: Determine what to do about the bogus services.
+        Assert.assertEquals("Shipping Country", "US", event.getShipping()[0].getCountry());
+        Assert.assertEquals("Tax Region", "California", event.getTaxRegion());
+        Assert.assertEquals("Tax Percentage", new Float(8.25), event.getTaxPercent());
 
     }
 
@@ -215,62 +215,63 @@ public class GoogleBaseParserTest extends AbstractTestCase {
      */
     public void testHousing2Parse() throws Exception {
         System.out.println("testHousing2Parse");
-        SyndFeedInput input = new SyndFeedInput();
-        Calendar cal = Calendar.getInstance();
+        final SyndFeedInput input = new SyndFeedInput();
+        final Calendar cal = Calendar.getInstance();
         cal.setTimeInMillis(0);
-        SyndFeed feed = input.build(new File(super.getTestFile("xml/housing2.xml")));
-        List entries = feed.getEntries();
+        final SyndFeed feed = input.build(new File(super.getTestFile("xml/housing2.xml")));
+        final List entries = feed.getEntries();
         SyndEntry entry = (SyndEntry) entries.get(0);
         Housing module = (Housing) entry.getModule(GoogleBase.URI);
-        this.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
+        Assert.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
         cal.set(2007, 11, 20, 0, 0, 0);
-        this.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
-        this.assertEquals("Labels", new String[]{"Housing", "New House", "Sale"}, module.getLabels());
-        this.assertEquals("Currency", CurrencyEnumeration.USD, module.getCurrency());
-        this.assertEquals("Price", (float) 350000, module.getPrice().getValue(), 0);
-        this.assertEquals("PriceUnit", null, module.getPrice().getUnits());
-        this.assertEquals("PriceType", PriceTypeEnumeration.STARTING, module.getPriceType());
-        this.assertEquals("Payment Accepted", new PaymentTypeEnumeration[]{PaymentTypeEnumeration.CASH, PaymentTypeEnumeration.CHECK, PaymentTypeEnumeration.VISA}, module.getPaymentAccepted());
-        this.assertEquals("Payment Notes", "1000 deposit", module.getPaymentNotes());
-        this.assertEquals("Listing Type", new Boolean(true), module.getListingType());
-        this.assertEquals("PropertyTypes", new String[]{"Townhouse"}, module.getPropertyTypes());
-        this.assertEquals("Location", "123 Main St, Anytown, CA, 12345, USA", module.getLocation());
-        this.assertEquals("Bedrooms", new Integer(3), module.getBedrooms());
-        this.assertEquals("Bathrooms", new Float(3), module.getBathrooms());
-        this.assertEquals("Area", 1300, module.getArea().getValue());
-        this.assertEquals("Area Units", null, module.getArea().getUnits());
-        this.assertEquals("School District", "Union School District", module.getSchoolDistrict());
-        this.assertEquals("HOA Dues", new Float(120), module.getHoaDues());
-        this.assertEquals("Year", "2005", module.getYear().toString());
-        this.assertEquals("Agents", new String[]{"Sue Smith"}, module.getAgents());
-        this.assertEquals("Tax Region", "California", module.getTaxRegion());
-        this.assertEquals("Tax Percentage", new Float(8.25), module.getTaxPercent());
+        Assert.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
+        this.assertEquals("Labels", new String[] { "Housing", "New House", "Sale" }, module.getLabels());
+        Assert.assertEquals("Currency", CurrencyEnumeration.USD, module.getCurrency());
+        Assert.assertEquals("Price", 350000, module.getPrice().getValue(), 0);
+        Assert.assertEquals("PriceUnit", null, module.getPrice().getUnits());
+        Assert.assertEquals("PriceType", PriceTypeEnumeration.STARTING, module.getPriceType());
+        this.assertEquals("Payment Accepted", new PaymentTypeEnumeration[] { PaymentTypeEnumeration.CASH, PaymentTypeEnumeration.CHECK,
+                PaymentTypeEnumeration.VISA }, module.getPaymentAccepted());
+        Assert.assertEquals("Payment Notes", "1000 deposit", module.getPaymentNotes());
+        Assert.assertEquals("Listing Type", new Boolean(true), module.getListingType());
+        this.assertEquals("PropertyTypes", new String[] { "Townhouse" }, module.getPropertyTypes());
+        Assert.assertEquals("Location", "123 Main St, Anytown, CA, 12345, USA", module.getLocation());
+        Assert.assertEquals("Bedrooms", new Integer(3), module.getBedrooms());
+        Assert.assertEquals("Bathrooms", new Float(3), module.getBathrooms());
+        Assert.assertEquals("Area", 1300, module.getArea().getValue());
+        Assert.assertEquals("Area Units", null, module.getArea().getUnits());
+        Assert.assertEquals("School District", "Union School District", module.getSchoolDistrict());
+        Assert.assertEquals("HOA Dues", new Float(120), module.getHoaDues());
+        Assert.assertEquals("Year", "2005", module.getYear().toString());
+        this.assertEquals("Agents", new String[] { "Sue Smith" }, module.getAgents());
+        Assert.assertEquals("Tax Region", "California", module.getTaxRegion());
+        Assert.assertEquals("Tax Percentage", new Float(8.25), module.getTaxPercent());
 
         entry = (SyndEntry) entries.get(1);
         module = (Housing) entry.getModule(GoogleBase.URI);
-        this.assertEquals("Image Link", "http://www.providers-website.com/image2.jpg", module.getImageLinks()[0].toString());
+        Assert.assertEquals("Image Link", "http://www.providers-website.com/image2.jpg", module.getImageLinks()[0].toString());
         cal.set(2008, 11, 20, 0, 0, 0);
-        this.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
-        this.assertEquals("Labels", new String[]{"Housing", "rent", "lease"}, module.getLabels());
-        this.assertEquals("Currency", CurrencyEnumeration.USD, module.getCurrency());
-        this.assertEquals("Price", (float) 1400, module.getPrice().getValue(), 0);
-        this.assertEquals("PriceUnit", null, module.getPrice().getUnits());
-        this.assertEquals("PriceType", PriceTypeEnumeration.STARTING, module.getPriceType());
-        this.assertEquals("Payment Accepted", new PaymentTypeEnumeration[]{PaymentTypeEnumeration.CHECK}, module.getPaymentAccepted());
-        this.assertEquals("Payment Notes", "1000 deposit", module.getPaymentNotes());
-        this.assertEquals("Listing Type", new Boolean(false), module.getListingType());
-        this.assertEquals("PropertyTypes", new String[]{"apartment"}, module.getPropertyTypes());
-        this.assertEquals("Location", "123 Main St, Anytown, CA, 12345, USA", module.getLocation());
-        this.assertEquals("Bedrooms", new Integer(2), module.getBedrooms());
-        this.assertEquals("Bathrooms", new Float(2), module.getBathrooms());
-        this.assertEquals("Area", 1100, module.getArea().getValue());
-        this.assertEquals("Area Units", null, module.getArea().getUnits());
-        this.assertEquals("School District", "Union School District", module.getSchoolDistrict());
-        this.assertEquals("HOA Dues", null, module.getHoaDues());
-        this.assertEquals("Year", "2004", module.getYear().toString());
-        this.assertEquals("Agents", new String[]{"Sue Smith"}, module.getAgents());
-        this.assertEquals("Tax Region", null, module.getTaxRegion());
-        this.assertEquals("Tax Percentage", null, module.getTaxPercent());
+        Assert.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
+        this.assertEquals("Labels", new String[] { "Housing", "rent", "lease" }, module.getLabels());
+        Assert.assertEquals("Currency", CurrencyEnumeration.USD, module.getCurrency());
+        Assert.assertEquals("Price", 1400, module.getPrice().getValue(), 0);
+        Assert.assertEquals("PriceUnit", null, module.getPrice().getUnits());
+        Assert.assertEquals("PriceType", PriceTypeEnumeration.STARTING, module.getPriceType());
+        this.assertEquals("Payment Accepted", new PaymentTypeEnumeration[] { PaymentTypeEnumeration.CHECK }, module.getPaymentAccepted());
+        Assert.assertEquals("Payment Notes", "1000 deposit", module.getPaymentNotes());
+        Assert.assertEquals("Listing Type", new Boolean(false), module.getListingType());
+        this.assertEquals("PropertyTypes", new String[] { "apartment" }, module.getPropertyTypes());
+        Assert.assertEquals("Location", "123 Main St, Anytown, CA, 12345, USA", module.getLocation());
+        Assert.assertEquals("Bedrooms", new Integer(2), module.getBedrooms());
+        Assert.assertEquals("Bathrooms", new Float(2), module.getBathrooms());
+        Assert.assertEquals("Area", 1100, module.getArea().getValue());
+        Assert.assertEquals("Area Units", null, module.getArea().getUnits());
+        Assert.assertEquals("School District", "Union School District", module.getSchoolDistrict());
+        Assert.assertEquals("HOA Dues", null, module.getHoaDues());
+        Assert.assertEquals("Year", "2004", module.getYear().toString());
+        this.assertEquals("Agents", new String[] { "Sue Smith" }, module.getAgents());
+        Assert.assertEquals("Tax Region", null, module.getTaxRegion());
+        Assert.assertEquals("Tax Percentage", null, module.getTaxPercent());
     }
 
     /**
@@ -278,28 +279,28 @@ public class GoogleBaseParserTest extends AbstractTestCase {
      */
     public void testJobs2Parse() throws Exception {
         System.out.println("testJobs2Parse");
-        SyndFeedInput input = new SyndFeedInput();
-        Calendar cal = Calendar.getInstance();
+        final SyndFeedInput input = new SyndFeedInput();
+        final Calendar cal = Calendar.getInstance();
         cal.setTimeInMillis(0);
-        SyndFeed feed = input.build(new File(super.getTestFile("xml/jobs2.xml")));
-        List entries = feed.getEntries();
-        SyndEntry entry = (SyndEntry) entries.get(0);
-        Job module = (Job) entry.getModule(GoogleBase.URI);
-        this.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
+        final SyndFeed feed = input.build(new File(super.getTestFile("xml/jobs2.xml")));
+        final List entries = feed.getEntries();
+        final SyndEntry entry = (SyndEntry) entries.get(0);
+        final Job module = (Job) entry.getModule(GoogleBase.URI);
+        Assert.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
         cal.set(2005, 11, 20, 0, 0, 0);
-        this.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
-        this.assertEquals("Labels", new String[]{"Coordinator", "Google", "Online Support"}, module.getLabels());
-        this.assertEquals("Industriy", new String[]{"Internet"}, module.getJobIndustries());
-        this.assertEquals("Employer", "Google, Inc", module.getEmployer());
-        this.assertEquals("Job Function", new String[]{"Google Coordinator"}, module.getJobFunctions());
+        Assert.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
+        this.assertEquals("Labels", new String[] { "Coordinator", "Google", "Online Support" }, module.getLabels());
+        this.assertEquals("Industriy", new String[] { "Internet" }, module.getJobIndustries());
+        Assert.assertEquals("Employer", "Google, Inc", module.getEmployer());
+        this.assertEquals("Job Function", new String[] { "Google Coordinator" }, module.getJobFunctions());
         System.out.println(module.getJobTypes());
-        this.assertEquals("Job Type", new String[]{"full-time"}, module.getJobTypes());
-        this.assertEquals("Currency", CurrencyEnumeration.USD, module.getCurrency());
-        this.assertEquals("Salary", new Float(40000), module.getSalary());
-        this.assertEquals("Salary Type", PriceTypeEnumeration.STARTING, module.getSalaryType());
-        this.assertEquals("Education", "BS", module.getEducation());
-        this.assertEquals("Immigration", "Permanent Resident", module.getImmigrationStatus());
-        this.assertEquals("Location", "1600 Amphitheatre Parkway, Mountain View, CA, 94043, USA", module.getLocation());
+        this.assertEquals("Job Type", new String[] { "full-time" }, module.getJobTypes());
+        Assert.assertEquals("Currency", CurrencyEnumeration.USD, module.getCurrency());
+        Assert.assertEquals("Salary", new Float(40000), module.getSalary());
+        Assert.assertEquals("Salary Type", PriceTypeEnumeration.STARTING, module.getSalaryType());
+        Assert.assertEquals("Education", "BS", module.getEducation());
+        Assert.assertEquals("Immigration", "Permanent Resident", module.getImmigrationStatus());
+        Assert.assertEquals("Location", "1600 Amphitheatre Parkway, Mountain View, CA, 94043, USA", module.getLocation());
 
     }
 
@@ -308,23 +309,22 @@ public class GoogleBaseParserTest extends AbstractTestCase {
      */
     public void testNews2Parse() throws Exception {
         System.out.println("testNews2Parse");
-        SyndFeedInput input = new SyndFeedInput();
-        Calendar cal = Calendar.getInstance();
+        final SyndFeedInput input = new SyndFeedInput();
+        final Calendar cal = Calendar.getInstance();
         cal.setTimeInMillis(0);
-        SyndFeed feed = input.build(new File(super.getTestFile("xml/news2.xml")));
-        List entries = feed.getEntries();
-        SyndEntry entry = (SyndEntry) entries.get(0);
-        Article module = (Article) entry.getModule(GoogleBase.URI);
-        this.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
+        final SyndFeed feed = input.build(new File(super.getTestFile("xml/news2.xml")));
+        final List entries = feed.getEntries();
+        final SyndEntry entry = (SyndEntry) entries.get(0);
+        final Article module = (Article) entry.getModule(GoogleBase.URI);
+        Assert.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
         cal.set(2007, 2, 20, 0, 0, 0);
-        this.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
-        this.assertEquals("Labels", new String[]{"news", "old"}, module.getLabels());
-        this.assertEquals("Source", "Journal", module.getNewsSource());
+        Assert.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
+        this.assertEquals("Labels", new String[] { "news", "old" }, module.getLabels());
+        Assert.assertEquals("Source", "Journal", module.getNewsSource());
         cal.set(1961, 3, 12, 0, 0, 0);
-        this.assertEquals("Pub Date", cal.getTime(), module.getPublishDate());
-        this.assertEquals("Authors", new String[]{"James Smith"}, module.getAuthors());
-        this.assertEquals("Pages", new Integer(1), module.getPages());
-
+        Assert.assertEquals("Pub Date", cal.getTime(), module.getPublishDate());
+        this.assertEquals("Authors", new String[] { "James Smith" }, module.getAuthors());
+        Assert.assertEquals("Pages", new Integer(1), module.getPages());
 
     }
 
@@ -333,34 +333,36 @@ public class GoogleBaseParserTest extends AbstractTestCase {
      */
     public void testTravel2Parse() throws Exception {
         System.out.println("testTravel2Parse");
-        SyndFeedInput input = new SyndFeedInput();
-        Calendar cal = Calendar.getInstance();
+        final SyndFeedInput input = new SyndFeedInput();
+        final Calendar cal = Calendar.getInstance();
         cal.setTimeInMillis(0);
-        SyndFeed feed = input.build(new File(super.getTestFile("xml/travel2.xml")));
-        List entries = feed.getEntries();
-        SyndEntry entry = (SyndEntry) entries.get(0);
-        Travel module = (Travel) entry.getModule(GoogleBase.URI);
-        this.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
+        final SyndFeed feed = input.build(new File(super.getTestFile("xml/travel2.xml")));
+        final List entries = feed.getEntries();
+        final SyndEntry entry = (SyndEntry) entries.get(0);
+        final Travel module = (Travel) entry.getModule(GoogleBase.URI);
+        Assert.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
         cal.set(2005, 11, 20, 0, 0, 0);
-        this.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
-        this.assertEquals("Labels", new String[]{"Vacation", "Train"}, module.getLabels());
-        this.assertEquals("Currency", CurrencyEnumeration.USD, module.getCurrency());
-        this.assertEquals("Price", (float) 250, module.getPrice().getValue(), 0);
-        this.assertEquals("PriceUnit", null, module.getPrice().getUnits());
-        this.assertEquals("PriceType", PriceTypeEnumeration.STARTING, module.getPriceType());
-        this.assertEquals("Payment Accepted", new PaymentTypeEnumeration[]{PaymentTypeEnumeration.CHECK, PaymentTypeEnumeration.VISA}, module.getPaymentAccepted());
-        this.assertEquals("Payment notes", "minimum payment on credit cards:45", module.getPaymentNotes());
-        this.assertEquals("Quantity", new Integer(204), module.getQuantity());
-        this.assertEquals("From", "Mytown, USA", module.getFromLocation());
-        this.assertEquals("To", "Anytown, USA", module.getToLocation());
+        Assert.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
+        this.assertEquals("Labels", new String[] { "Vacation", "Train" }, module.getLabels());
+        Assert.assertEquals("Currency", CurrencyEnumeration.USD, module.getCurrency());
+        Assert.assertEquals("Price", 250, module.getPrice().getValue(), 0);
+        Assert.assertEquals("PriceUnit", null, module.getPrice().getUnits());
+        Assert.assertEquals("PriceType", PriceTypeEnumeration.STARTING, module.getPriceType());
+        this.assertEquals("Payment Accepted", new PaymentTypeEnumeration[] { PaymentTypeEnumeration.CHECK, PaymentTypeEnumeration.VISA },
+                module.getPaymentAccepted());
+        Assert.assertEquals("Payment notes", "minimum payment on credit cards:45", module.getPaymentNotes());
+        Assert.assertEquals("Quantity", new Integer(204), module.getQuantity());
+        Assert.assertEquals("From", "Mytown, USA", module.getFromLocation());
+        Assert.assertEquals("To", "Anytown, USA", module.getToLocation());
         cal.set(2005, 11, 20, 18, 0, 0);
-        this.assertEquals("Start Date", cal.getTime(), module.getTravelDateRange().getStart());
+        Assert.assertEquals("Start Date", cal.getTime(), module.getTravelDateRange().getStart());
         cal.set(2005, 11, 22, 18, 0, 0);
-        this.assertEquals("End Date", cal.getTime(), module.getTravelDateRange().getEnd());
-        this.assertEquals("Location", "123 Main St, Mytown, CA, 12345, USA", module.getLocation());
-        this.assertEquals("Shipping", new ShippingType[]{new ShippingType(new FloatUnit("32.95"), ShippingType.ServiceEnumeration.OVERNIGHT, "US")}, module.getShipping());
-        this.assertEquals("Tax Region", "California", module.getTaxRegion());
-        this.assertEquals("Tax Percentage", new Float(8.25), module.getTaxPercent());
+        Assert.assertEquals("End Date", cal.getTime(), module.getTravelDateRange().getEnd());
+        Assert.assertEquals("Location", "123 Main St, Mytown, CA, 12345, USA", module.getLocation());
+        this.assertEquals("Shipping", new ShippingType[] { new ShippingType(new FloatUnit("32.95"), ShippingType.ServiceEnumeration.OVERNIGHT, "US") },
+                module.getShipping());
+        Assert.assertEquals("Tax Region", "California", module.getTaxRegion());
+        Assert.assertEquals("Tax Percentage", new Float(8.25), module.getTaxPercent());
 
     }
 
@@ -369,26 +371,26 @@ public class GoogleBaseParserTest extends AbstractTestCase {
      */
     public void testPersona2Parse() throws Exception {
         System.out.println("testPerson2Parse");
-        SyndFeedInput input = new SyndFeedInput();
-        Calendar cal = Calendar.getInstance();
+        final SyndFeedInput input = new SyndFeedInput();
+        final Calendar cal = Calendar.getInstance();
         cal.setTimeInMillis(0);
-        SyndFeed feed = input.build(new File(super.getTestFile("xml/personals2.xml")));
-        List entries = feed.getEntries();
-        SyndEntry entry = (SyndEntry) entries.get(0);
-        Person module = (Person) entry.getModule(GoogleBase.URI);
-        this.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
+        final SyndFeed feed = input.build(new File(super.getTestFile("xml/personals2.xml")));
+        final List entries = feed.getEntries();
+        final SyndEntry entry = (SyndEntry) entries.get(0);
+        final Person module = (Person) entry.getModule(GoogleBase.URI);
+        Assert.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
         cal.set(2005, 11, 20, 0, 0, 0);
-        this.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
-        this.assertEquals("Labels", new String[]{"Personals", "m4w"}, module.getLabels());
-        this.assertEquals("Ethnicity", new String[]{"South Asian"}, module.getEthnicities());
-        this.assertEquals("Gender", GenderEnumeration.MALE, module.getGender());
-        this.assertEquals("Sexual Orientation", "straight", module.getSexualOrientation());
-        this.assertEquals("Interested In", new String[]{"Single Women"}, module.getInterestedIn());
-        this.assertEquals("Marital Status", "single", module.getMaritalStatus());
-        this.assertEquals("Occupation", "Sales", module.getOccupation());
-        this.assertEquals("Employer", "Google, Inc.", module.getEmployer());
-        this.assertEquals("Age", new Integer(23), module.getAge());
-        this.assertEquals("Location", "Anytown, 12345, USA", module.getLocation());
+        Assert.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
+        this.assertEquals("Labels", new String[] { "Personals", "m4w" }, module.getLabels());
+        this.assertEquals("Ethnicity", new String[] { "South Asian" }, module.getEthnicities());
+        Assert.assertEquals("Gender", GenderEnumeration.MALE, module.getGender());
+        Assert.assertEquals("Sexual Orientation", "straight", module.getSexualOrientation());
+        this.assertEquals("Interested In", new String[] { "Single Women" }, module.getInterestedIn());
+        Assert.assertEquals("Marital Status", "single", module.getMaritalStatus());
+        Assert.assertEquals("Occupation", "Sales", module.getOccupation());
+        Assert.assertEquals("Employer", "Google, Inc.", module.getEmployer());
+        Assert.assertEquals("Age", new Integer(23), module.getAge());
+        Assert.assertEquals("Location", "Anytown, 12345, USA", module.getLocation());
 
     }
 
@@ -397,36 +399,37 @@ public class GoogleBaseParserTest extends AbstractTestCase {
      */
     public void testProduct2Parse() throws Exception {
         System.out.println("testProduct2Parse");
-        SyndFeedInput input = new SyndFeedInput();
-        Calendar cal = Calendar.getInstance();
+        final SyndFeedInput input = new SyndFeedInput();
+        final Calendar cal = Calendar.getInstance();
         cal.setTimeInMillis(0);
-        SyndFeed feed = input.build(new File(super.getTestFile("xml/products2.xml")));
-        List entries = feed.getEntries();
-        SyndEntry entry = (SyndEntry) entries.get(0);
-        Product module = (Product) entry.getModule(GoogleBase.URI);
-        this.assertEquals("Image Link", "http://www.googlestore.com/appliance/images/products/GO0144E.jpg", module.getImageLinks()[0].toString());
+        final SyndFeed feed = input.build(new File(super.getTestFile("xml/products2.xml")));
+        final List entries = feed.getEntries();
+        final SyndEntry entry = (SyndEntry) entries.get(0);
+        final Product module = (Product) entry.getModule(GoogleBase.URI);
+        Assert.assertEquals("Image Link", "http://www.googlestore.com/appliance/images/products/GO0144E.jpg", module.getImageLinks()[0].toString());
         cal.set(2005, 11, 20, 0, 0, 0);
-        this.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
-        this.assertEquals("Labels", new String[]{"web search", "appliance"}, module.getLabels());
-        this.assertEquals("Currency", CurrencyEnumeration.USD, module.getCurrency());
-        this.assertEquals("Price", (float) 2995, module.getPrice().getValue(), 0);
-        this.assertEquals("PriceType", PriceTypeEnumeration.STARTING, module.getPriceType());
-        this.assertEquals("Payment Accepted", new PaymentTypeEnumeration[]{PaymentTypeEnumeration.CHECK, PaymentTypeEnumeration.MASTERCARD}, module.getPaymentAccepted());
-        this.assertEquals("Payment Notes", "financing available", module.getPaymentNotes());
-        this.assertEquals("Brand", "Google", module.getBrand());
-        this.assertEquals("UPC", "12348573", module.getUpc());
-        this.assertEquals("Manufacturer", "Google", module.getManufacturer());
-        this.assertEquals("ManufacturerId", "2325", module.getManufacturerId());
-        this.assertEquals("Model number", "234", module.getModelNumber());
+        Assert.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
+        this.assertEquals("Labels", new String[] { "web search", "appliance" }, module.getLabels());
+        Assert.assertEquals("Currency", CurrencyEnumeration.USD, module.getCurrency());
+        Assert.assertEquals("Price", 2995, module.getPrice().getValue(), 0);
+        Assert.assertEquals("PriceType", PriceTypeEnumeration.STARTING, module.getPriceType());
+        this.assertEquals("Payment Accepted", new PaymentTypeEnumeration[] { PaymentTypeEnumeration.CHECK, PaymentTypeEnumeration.MASTERCARD },
+                module.getPaymentAccepted());
+        Assert.assertEquals("Payment Notes", "financing available", module.getPaymentNotes());
+        Assert.assertEquals("Brand", "Google", module.getBrand());
+        Assert.assertEquals("UPC", "12348573", module.getUpc());
+        Assert.assertEquals("Manufacturer", "Google", module.getManufacturer());
+        Assert.assertEquals("ManufacturerId", "2325", module.getManufacturerId());
+        Assert.assertEquals("Model number", "234", module.getModelNumber());
         System.out.println(module.getSize());
-        this.assertEquals("Size", (float) 10, module.getSize().getLength().getValue(), 0);
-        this.assertEquals("Size", (float) 50, module.getSize().getWidth().getValue(), 0);
-        this.assertEquals("Size", (float) 20, module.getSize().getHeight().getValue(), 0);
-        this.assertEquals("Weight", (float) 2, module.getWeight().getValue(), 0);
-        this.assertEquals("Quantity", new Integer(300), module.getQuantity());
-        this.assertEquals("Condition", "new", module.getCondition());
-        this.assertEquals("Colors", new String[]{"blue"}, module.getColors());
-        this.assertEquals("Location", "1600 Amphitheatre Pkwy Mountain View, CA 94043-1351, US", module.getLocation());
+        Assert.assertEquals("Size", 10, module.getSize().getLength().getValue(), 0);
+        Assert.assertEquals("Size", 50, module.getSize().getWidth().getValue(), 0);
+        Assert.assertEquals("Size", 20, module.getSize().getHeight().getValue(), 0);
+        Assert.assertEquals("Weight", 2, module.getWeight().getValue(), 0);
+        Assert.assertEquals("Quantity", new Integer(300), module.getQuantity());
+        Assert.assertEquals("Condition", "new", module.getCondition());
+        this.assertEquals("Colors", new String[] { "blue" }, module.getColors());
+        Assert.assertEquals("Location", "1600 Amphitheatre Pkwy Mountain View, CA 94043-1351, US", module.getLocation());
 
     }
 
@@ -435,23 +438,23 @@ public class GoogleBaseParserTest extends AbstractTestCase {
      */
     public void testResearch2Parse() throws Exception {
         System.out.println("testResearch2Parse");
-        SyndFeedInput input = new SyndFeedInput();
-        Calendar cal = Calendar.getInstance();
+        final SyndFeedInput input = new SyndFeedInput();
+        final Calendar cal = Calendar.getInstance();
         cal.setTimeInMillis(0);
-        SyndFeed feed = input.build(new File(super.getTestFile("xml/research2.xml")));
-        List entries = feed.getEntries();
-        SyndEntry entry = (SyndEntry) entries.get(0);
-        ScholarlyArticle module = (ScholarlyArticle) entry.getModule(GoogleBase.URI);
-        this.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
+        final SyndFeed feed = input.build(new File(super.getTestFile("xml/research2.xml")));
+        final List entries = feed.getEntries();
+        final SyndEntry entry = (SyndEntry) entries.get(0);
+        final ScholarlyArticle module = (ScholarlyArticle) entry.getModule(GoogleBase.URI);
+        Assert.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
         cal.set(2005, 11, 20, 0, 0, 0);
-        this.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
-        this.assertEquals("Labels", new String[]{"Economy", "Tsunami"}, module.getLabels());
+        Assert.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
+        this.assertEquals("Labels", new String[] { "Economy", "Tsunami" }, module.getLabels());
         cal.set(2005, 1, 25);
-        this.assertEquals("PubDate", cal.getTime(), module.getPublishDate());
-        this.assertEquals("Authors", new String[]{"James Smith"}, module.getAuthors());
-        this.assertEquals("Pub Name", "Tsunami and the Economy", module.getPublicationName());
-        this.assertEquals("Pub Vol", "III", module.getPublicationVolume());
-        this.assertEquals("Pages", new Integer(5), module.getPages());
+        Assert.assertEquals("PubDate", cal.getTime(), module.getPublishDate());
+        this.assertEquals("Authors", new String[] { "James Smith" }, module.getAuthors());
+        Assert.assertEquals("Pub Name", "Tsunami and the Economy", module.getPublicationName());
+        Assert.assertEquals("Pub Vol", "III", module.getPublicationVolume());
+        Assert.assertEquals("Pages", new Integer(5), module.getPages());
     }
 
     /**
@@ -459,25 +462,25 @@ public class GoogleBaseParserTest extends AbstractTestCase {
      */
     public void testReview2Parse() throws Exception {
         System.out.println("testReview2Parse");
-        SyndFeedInput input = new SyndFeedInput();
-        Calendar cal = Calendar.getInstance();
+        final SyndFeedInput input = new SyndFeedInput();
+        final Calendar cal = Calendar.getInstance();
         cal.setTimeInMillis(0);
-        SyndFeed feed = input.build(new File(super.getTestFile("xml/reviews2.xml")));
-        List entries = feed.getEntries();
-        SyndEntry entry = (SyndEntry) entries.get(0);
-        Review module = (Review) entry.getModule(GoogleBase.URI);
-        this.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
+        final SyndFeed feed = input.build(new File(super.getTestFile("xml/reviews2.xml")));
+        final List entries = feed.getEntries();
+        final SyndEntry entry = (SyndEntry) entries.get(0);
+        final Review module = (Review) entry.getModule(GoogleBase.URI);
+        Assert.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
         cal.set(2005, 11, 20, 0, 0, 0);
-        this.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
-        this.assertEquals("Labels", new String[]{"Review", "Earth", "Google"}, module.getLabels());
+        Assert.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
+        this.assertEquals("Labels", new String[] { "Review", "Earth", "Google" }, module.getLabels());
         cal.set(2005, 2, 24);
-        this.assertEquals("PubDate", cal.getTime(), module.getPublishDate());
-        this.assertEquals("Authors", new String[]{"Jimmy Smith"}, module.getAuthors());
-        this.assertEquals("Name of Item Rev", "Google Earth", module.getNameOfItemBeingReviewed());
-        this.assertEquals("Type", "Product", module.getReviewType());
-        this.assertEquals("Rever Type", "editorial", module.getReviewerType());
-        this.assertEquals("Rating", new Float(5), module.getRating());
-        this.assertEquals("URL of Item", new URL("http://earth.google.com/"), module.getUrlOfItemBeingReviewed());
+        Assert.assertEquals("PubDate", cal.getTime(), module.getPublishDate());
+        this.assertEquals("Authors", new String[] { "Jimmy Smith" }, module.getAuthors());
+        Assert.assertEquals("Name of Item Rev", "Google Earth", module.getNameOfItemBeingReviewed());
+        Assert.assertEquals("Type", "Product", module.getReviewType());
+        Assert.assertEquals("Rever Type", "editorial", module.getReviewerType());
+        Assert.assertEquals("Rating", new Float(5), module.getRating());
+        Assert.assertEquals("URL of Item", new URL("http://earth.google.com/"), module.getUrlOfItemBeingReviewed());
 
     }
 
@@ -486,27 +489,28 @@ public class GoogleBaseParserTest extends AbstractTestCase {
      */
     public void testService2Parse() throws Exception {
         System.out.println("testService2Parse");
-        SyndFeedInput input = new SyndFeedInput();
-        Calendar cal = Calendar.getInstance();
+        final SyndFeedInput input = new SyndFeedInput();
+        final Calendar cal = Calendar.getInstance();
         cal.setTimeInMillis(0);
-        SyndFeed feed = input.build(new File(super.getTestFile("xml/services2.xml")));
-        List entries = feed.getEntries();
-        SyndEntry entry = (SyndEntry) entries.get(0);
-        Service module = (Service) entry.getModule(GoogleBase.URI);
-        this.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
+        final SyndFeed feed = input.build(new File(super.getTestFile("xml/services2.xml")));
+        final List entries = feed.getEntries();
+        final SyndEntry entry = (SyndEntry) entries.get(0);
+        final Service module = (Service) entry.getModule(GoogleBase.URI);
+        Assert.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
         cal.set(2005, 11, 20, 0, 0, 0);
-        this.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
-        this.assertEquals("Labels", new String[]{"Food delivery"}, module.getLabels());
+        Assert.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
+        this.assertEquals("Labels", new String[] { "Food delivery" }, module.getLabels());
         cal.set(2005, 2, 24);
-        this.assertEquals("Currency", CurrencyEnumeration.USD, module.getCurrency());
-        this.assertEquals("Price", (float) 15, module.getPrice().getValue(), 0);
-        this.assertEquals("PriceType", PriceTypeEnumeration.STARTING, module.getPriceType());
-        this.assertEquals("Payment Accepted", new PaymentTypeEnumeration[]{PaymentTypeEnumeration.VISA, PaymentTypeEnumeration.MASTERCARD}, module.getPaymentAccepted());
-        this.assertEquals("Payment Notes", "minimum payment on credit cards:45", module.getPaymentNotes());
-        this.assertEquals("Service Type", "delivery", module.getServiceType());
-        this.assertEquals("Location", "Anytown, CA, USA", module.getLocation());
-        this.assertEquals("DeliveryRad", (float) 20, module.getDeliveryRadius().getValue(), 0);
-        this.assertEquals("Delivery Notes", "will deliver between 9am -5pm", module.getDeliveryNotes());
+        Assert.assertEquals("Currency", CurrencyEnumeration.USD, module.getCurrency());
+        Assert.assertEquals("Price", 15, module.getPrice().getValue(), 0);
+        Assert.assertEquals("PriceType", PriceTypeEnumeration.STARTING, module.getPriceType());
+        this.assertEquals("Payment Accepted", new PaymentTypeEnumeration[] { PaymentTypeEnumeration.VISA, PaymentTypeEnumeration.MASTERCARD },
+                module.getPaymentAccepted());
+        Assert.assertEquals("Payment Notes", "minimum payment on credit cards:45", module.getPaymentNotes());
+        Assert.assertEquals("Service Type", "delivery", module.getServiceType());
+        Assert.assertEquals("Location", "Anytown, CA, USA", module.getLocation());
+        Assert.assertEquals("DeliveryRad", 20, module.getDeliveryRadius().getValue(), 0);
+        Assert.assertEquals("Delivery Notes", "will deliver between 9am -5pm", module.getDeliveryNotes());
 
     }
 
@@ -515,32 +519,32 @@ public class GoogleBaseParserTest extends AbstractTestCase {
      */
     public void testVehicle2Parse() throws Exception {
         System.out.println("testVehicle2Parse");
-        SyndFeedInput input = new SyndFeedInput();
-        Calendar cal = Calendar.getInstance();
+        final SyndFeedInput input = new SyndFeedInput();
+        final Calendar cal = Calendar.getInstance();
         cal.setTimeInMillis(0);
-        SyndFeed feed = input.build(new File(super.getTestFile("xml/vehicles2.xml")));
-        List entries = feed.getEntries();
-        SyndEntry entry = (SyndEntry) entries.get(0);
-        Vehicle module = (Vehicle) entry.getModule(GoogleBase.URI);
-        this.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
+        final SyndFeed feed = input.build(new File(super.getTestFile("xml/vehicles2.xml")));
+        final List entries = feed.getEntries();
+        final SyndEntry entry = (SyndEntry) entries.get(0);
+        final Vehicle module = (Vehicle) entry.getModule(GoogleBase.URI);
+        Assert.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
         cal.set(2005, 11, 20, 0, 0, 0);
-        this.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
-        this.assertEquals("Labels", new String[]{"car", "mini"}, module.getLabels());
+        Assert.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
+        this.assertEquals("Labels", new String[] { "car", "mini" }, module.getLabels());
         cal.set(2005, 2, 24);
-        this.assertEquals("Currency", CurrencyEnumeration.USD, module.getCurrency());
-        this.assertEquals("Price", (float) 24000, module.getPrice().getValue(), 0);
-        this.assertEquals("PriceType", PriceTypeEnumeration.STARTING, module.getPriceType());
-        this.assertEquals("Payment Accepted", new PaymentTypeEnumeration[]{PaymentTypeEnumeration.CHECK, PaymentTypeEnumeration.VISA, PaymentTypeEnumeration.MASTERCARD}, module.getPaymentAccepted());
-        this.assertEquals("Payment Notes", "financing available", module.getPaymentNotes());
-        this.assertEquals("Vehicle Type", "car", module.getVehicleType());
-        this.assertEquals("Make", "Mini", module.getMake());
-        this.assertEquals("Model", "Cooper S", module.getModel());
-        this.assertEquals("Year", "2006", module.getYear().toString());
-        this.assertEquals("Mileage", new Integer(0), module.getMileage());
-        this.assertEquals("Colors", new String[]{"red"}, module.getColors());
-        this.assertEquals("Vin", "1M8GDM9AXKP042788", module.getVin());
-        this.assertEquals("Location", "123 Main Street, Anytown, CA, 12345, USA", module.getLocation());
-
+        Assert.assertEquals("Currency", CurrencyEnumeration.USD, module.getCurrency());
+        Assert.assertEquals("Price", 24000, module.getPrice().getValue(), 0);
+        Assert.assertEquals("PriceType", PriceTypeEnumeration.STARTING, module.getPriceType());
+        this.assertEquals("Payment Accepted", new PaymentTypeEnumeration[] { PaymentTypeEnumeration.CHECK, PaymentTypeEnumeration.VISA,
+                PaymentTypeEnumeration.MASTERCARD }, module.getPaymentAccepted());
+        Assert.assertEquals("Payment Notes", "financing available", module.getPaymentNotes());
+        Assert.assertEquals("Vehicle Type", "car", module.getVehicleType());
+        Assert.assertEquals("Make", "Mini", module.getMake());
+        Assert.assertEquals("Model", "Cooper S", module.getModel());
+        Assert.assertEquals("Year", "2006", module.getYear().toString());
+        Assert.assertEquals("Mileage", new Integer(0), module.getMileage());
+        this.assertEquals("Colors", new String[] { "red" }, module.getColors());
+        Assert.assertEquals("Vin", "1M8GDM9AXKP042788", module.getVin());
+        Assert.assertEquals("Location", "123 Main Street, Anytown, CA, 12345, USA", module.getLocation());
 
     }
 
@@ -549,18 +553,18 @@ public class GoogleBaseParserTest extends AbstractTestCase {
      */
     public void testWanted2Parse() throws Exception {
         System.out.println("testVehicle2Parse");
-        SyndFeedInput input = new SyndFeedInput();
-        Calendar cal = Calendar.getInstance();
+        final SyndFeedInput input = new SyndFeedInput();
+        final Calendar cal = Calendar.getInstance();
         cal.setTimeInMillis(0);
-        SyndFeed feed = input.build(new File(super.getTestFile("xml/wanted2.xml")));
-        List entries = feed.getEntries();
-        SyndEntry entry = (SyndEntry) entries.get(0);
-        Wanted module = (Wanted) entry.getModule(GoogleBase.URI);
-        this.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
+        final SyndFeed feed = input.build(new File(super.getTestFile("xml/wanted2.xml")));
+        final List entries = feed.getEntries();
+        final SyndEntry entry = (SyndEntry) entries.get(0);
+        final Wanted module = (Wanted) entry.getModule(GoogleBase.URI);
+        Assert.assertEquals("Image Link", "http://www.providers-website.com/image1.jpg", module.getImageLinks()[0].toString());
         cal.set(2005, 11, 20, 0, 0, 0);
-        this.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
-        this.assertEquals("Labels", new String[]{"Wanted", "Truck"}, module.getLabels());
-        this.assertEquals("Location", "123 Main Street, Anytown, CA, 12345, USA", module.getLocation());
+        Assert.assertEquals("Expiration Date", cal.getTime(), module.getExpirationDate());
+        this.assertEquals("Labels", new String[] { "Wanted", "Truck" }, module.getLabels());
+        Assert.assertEquals("Location", "123 Main Street, Anytown, CA, 12345, USA", module.getLocation());
     }
 
     /**
diff --git a/src/test/java/org/rometools/feed/module/base/types/FloatUnitTest.java b/src/test/java/org/rometools/feed/module/base/types/FloatUnitTest.java
index ff86ea9..acccf7e 100644
--- a/src/test/java/org/rometools/feed/module/base/types/FloatUnitTest.java
+++ b/src/test/java/org/rometools/feed/module/base/types/FloatUnitTest.java
@@ -6,42 +6,42 @@
  */
 
 package org.rometools.feed.module.base.types;
-import org.rometools.feed.module.base.types.FloatUnit;
-import junit.framework.*;
-import org.rometools.feed.module.base.io.GoogleBaseParser;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 /**
- *
+ * 
  * @author rcooper
  */
 public class FloatUnitTest extends TestCase {
-    
-    public FloatUnitTest(String testName) {
+
+    public FloatUnitTest(final String testName) {
         super(testName);
     }
-    
+
     public static Test suite() {
-        TestSuite suite = new TestSuite(FloatUnitTest.class);
-        
+        final TestSuite suite = new TestSuite(FloatUnitTest.class);
+
         return suite;
     }
-    
+
     /**
      * Test of getUnits method, of class com.totsp.xml.syndication.base.types.FloatUnit.
      */
     public void testFloatUnit() {
         System.out.println("testFloatUnit");
-        FloatUnit fu = new FloatUnit( "1.22km" );
-        
-        assertEquals( (float) 1.22, fu.getValue(), 0 );
-        assertEquals( "km", fu.getUnits() );
-        fu = new FloatUnit( "1 gb" );
-        assertEquals( (float) 1, fu.getValue(), 0);
-        assertEquals( "gb", fu.getUnits() );
-        fu = new FloatUnit( "-3.1" );
-        assertEquals( (float)-3.1, fu.getValue() ,0);
-        assertEquals( null, fu.getUnits() );
+        FloatUnit fu = new FloatUnit("1.22km");
+
+        assertEquals((float) 1.22, fu.getValue(), 0);
+        assertEquals("km", fu.getUnits());
+        fu = new FloatUnit("1 gb");
+        assertEquals(1, fu.getValue(), 0);
+        assertEquals("gb", fu.getUnits());
+        fu = new FloatUnit("-3.1");
+        assertEquals((float) -3.1, fu.getValue(), 0);
+        assertEquals(null, fu.getUnits());
     }
-    
-    
-    
+
 }
diff --git a/src/test/java/org/rometools/feed/module/base/types/IntUnitTest.java b/src/test/java/org/rometools/feed/module/base/types/IntUnitTest.java
index d53c987..9af430c 100644
--- a/src/test/java/org/rometools/feed/module/base/types/IntUnitTest.java
+++ b/src/test/java/org/rometools/feed/module/base/types/IntUnitTest.java
@@ -6,42 +6,42 @@
  */
 
 package org.rometools.feed.module.base.types;
-import org.rometools.feed.module.base.types.IntUnit;
-import junit.framework.*;
-import org.rometools.feed.module.base.io.GoogleBaseParser;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 /**
- *
+ * 
  * @author rcooper
  */
 public class IntUnitTest extends TestCase {
-    
-    public IntUnitTest(String testName) {
+
+    public IntUnitTest(final String testName) {
         super(testName);
     }
-    
+
     public static Test suite() {
-        TestSuite suite = new TestSuite(IntUnitTest.class);
-        
+        final TestSuite suite = new TestSuite(IntUnitTest.class);
+
         return suite;
     }
-    
+
     /**
      * Test of getUnits method, of class com.totsp.xml.syndication.base.types.IntUnit.
      */
     public void testIntUnit() {
         System.out.println("testIntUnit");
-        IntUnit fu = new IntUnit( "1km" );
-        
-        assertEquals( (int) 1, fu.getValue());
-        assertEquals( "km", fu.getUnits() );
-        fu = new IntUnit( "1 gb" );
-        assertEquals( (int) 1, fu.getValue());
-        assertEquals( "gb", fu.getUnits() );
-        fu = new IntUnit( "-3" );
-        assertEquals( -3, fu.getValue() );
-        assertEquals( null, fu.getUnits() );
+        IntUnit fu = new IntUnit("1km");
+
+        assertEquals(1, fu.getValue());
+        assertEquals("km", fu.getUnits());
+        fu = new IntUnit("1 gb");
+        assertEquals(1, fu.getValue());
+        assertEquals("gb", fu.getUnits());
+        fu = new IntUnit("-3");
+        assertEquals(-3, fu.getValue());
+        assertEquals(null, fu.getUnits());
     }
-    
-    
-    
+
 }
diff --git a/src/test/java/org/rometools/feed/module/cc/io/CCModuleGeneratorTest.java b/src/test/java/org/rometools/feed/module/cc/io/CCModuleGeneratorTest.java
index a8bfd81..19aa56a 100644
--- a/src/test/java/org/rometools/feed/module/cc/io/CCModuleGeneratorTest.java
+++ b/src/test/java/org/rometools/feed/module/cc/io/CCModuleGeneratorTest.java
@@ -7,63 +7,67 @@
 
 package org.rometools.feed.module.cc.io;
 
+import java.io.File;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.rometools.feed.module.AbstractTestCase;
+import org.rometools.feed.module.cc.CreativeCommons;
+
 import com.sun.syndication.feed.synd.SyndEntry;
 import com.sun.syndication.feed.synd.SyndFeed;
 import com.sun.syndication.io.SyndFeedInput;
 import com.sun.syndication.io.SyndFeedOutput;
-import junit.framework.*;
-import org.rometools.feed.module.cc.CreativeCommons;
-import java.io.File;
 
 /**
- *
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class CCModuleGeneratorTest extends AbstractTestCase {
-    
-    public CCModuleGeneratorTest(String testName) {
-	super(testName);
+
+    public CCModuleGeneratorTest(final String testName) {
+        super(testName);
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite(CCModuleGeneratorTest.class);
-        
+        final TestSuite suite = new TestSuite(CCModuleGeneratorTest.class);
+
         return suite;
     }
 
     public void testGenerate() throws Exception {
-       System.out.println("testGenerate");
-	SyndFeedInput input = new SyndFeedInput();
-	SyndFeedOutput output = new SyndFeedOutput();
-	File testDir = new File(super.getTestFile( "xml"));
-	File[] testFiles = testDir.listFiles();
-	for( int h=0; h < testFiles.length; h++){
-	    if( !testFiles[h].getName().endsWith(".xml"))
-		continue;
-	    System.out.println(testFiles[h].getName());
-	    SyndFeed feed = input.build(  testFiles[h] );
-	    //if( !feed.getFeedType().equals("rss_1.0"))
-	    {
-		feed.setFeedType( "rss_2.0");
-                if(feed.getDescription() == null)
-                     feed.setDescription("test file");
-                output.output( feed, new File( "target/"+testFiles[h].getName())  );
-                SyndFeed feed2 = input.build( new File("target/"+testFiles[h].getName()) );
-	    for( int i= 0; i < feed.getEntries().size() ; i++ ){
-		SyndEntry entry = (SyndEntry) feed.getEntries().get(i);
-		SyndEntry entry2 = (SyndEntry) feed2.getEntries().get(i);
-		CreativeCommons base = (CreativeCommons) entry.getModule( CreativeCommons.URI );
-		CreativeCommons base2 = (CreativeCommons) entry2.getModule( CreativeCommons.URI );
-		System.out.println(base2);
-		//if( base != null)
-		//this.assertEquals( testFiles[h].getName(), base.getLicenses(), base2.getLicenses() );
-	    }
-	    }
-	}	
-	
+        System.out.println("testGenerate");
+        final SyndFeedInput input = new SyndFeedInput();
+        final SyndFeedOutput output = new SyndFeedOutput();
+        final File testDir = new File(super.getTestFile("xml"));
+        final File[] testFiles = testDir.listFiles();
+        for (int h = 0; h < testFiles.length; h++) {
+            if (!testFiles[h].getName().endsWith(".xml")) {
+                continue;
+            }
+            System.out.println(testFiles[h].getName());
+            final SyndFeed feed = input.build(testFiles[h]);
+            // if( !feed.getFeedType().equals("rss_1.0"))
+            {
+                feed.setFeedType("rss_2.0");
+                if (feed.getDescription() == null) {
+                    feed.setDescription("test file");
+                }
+                output.output(feed, new File("target/" + testFiles[h].getName()));
+                final SyndFeed feed2 = input.build(new File("target/" + testFiles[h].getName()));
+                for (int i = 0; i < feed.getEntries().size(); i++) {
+                    final SyndEntry entry = feed.getEntries().get(i);
+                    final SyndEntry entry2 = feed2.getEntries().get(i);
+                    final CreativeCommons base = (CreativeCommons) entry.getModule(CreativeCommons.URI);
+                    final CreativeCommons base2 = (CreativeCommons) entry2.getModule(CreativeCommons.URI);
+                    System.out.println(base2);
+                    // if( base != null)
+                    // this.assertEquals( testFiles[h].getName(), base.getLicenses(), base2.getLicenses() );
+                }
+            }
+        }
+
     }
 
-    
-    
 }
diff --git a/src/test/java/org/rometools/feed/module/cc/io/ModuleParserTest.java b/src/test/java/org/rometools/feed/module/cc/io/ModuleParserTest.java
index 6311276..7a8e0f6 100644
--- a/src/test/java/org/rometools/feed/module/cc/io/ModuleParserTest.java
+++ b/src/test/java/org/rometools/feed/module/cc/io/ModuleParserTest.java
@@ -7,54 +7,60 @@
 
 package org.rometools.feed.module.cc.io;
 
-import org.rometools.feed.module.AbstractTestCase;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
-import junit.framework.*;
-import org.rometools.feed.module.cc.CreativeCommons;
 import java.io.File;
 import java.util.List;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.rometools.feed.module.AbstractTestCase;
+import org.rometools.feed.module.cc.CreativeCommons;
+
+import com.sun.syndication.feed.synd.SyndEntry;
+import com.sun.syndication.feed.synd.SyndFeed;
+import com.sun.syndication.io.SyndFeedInput;
+
 /**
- *
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class ModuleParserTest extends AbstractTestCase {
-    
-    public ModuleParserTest(String testName) {
-	super(testName);
+
+    public ModuleParserTest(final String testName) {
+        super(testName);
     }
-    
+
     public static Test suite() {
-	TestSuite suite = new TestSuite(ModuleParserTest.class);
-	
-	return suite;
+        final TestSuite suite = new TestSuite(ModuleParserTest.class);
+
+        return suite;
     }
-    public void testNull(){
-	return;
+
+    public void testNull() {
+        return;
     }
+
     public void atestParse() throws Exception {
-	
-	
-	SyndFeedInput input = new SyndFeedInput();
-	File testDir = new File(super.getTestFile( "test/xml"));
-	File[] testFiles = testDir.listFiles();
-	for( int h=0; h < testFiles.length; h++){
-	    if( !testFiles[h].getName().endsWith(".xml"))
-		continue;
-	    System.out.println(testFiles[h].getName());
-	    SyndFeed feed = input.build(  testFiles[h] );
-	    List entries = feed.getEntries();
-	    CreativeCommons fMod = (CreativeCommons) feed.getModule( CreativeCommons.URI );
-	    System.out.println( fMod );
-	    for( int i=0 ; i< entries.size(); i++ ){
-		SyndEntry entry = (SyndEntry) entries.get(i);
-		CreativeCommons eMod = (CreativeCommons) entry.getModule( CreativeCommons.URI );
-		System.out.println("\nEntry:");
-		System.out.println( eMod );
-	    }
-	}
+
+        final SyndFeedInput input = new SyndFeedInput();
+        final File testDir = new File(super.getTestFile("test/xml"));
+        final File[] testFiles = testDir.listFiles();
+        for (int h = 0; h < testFiles.length; h++) {
+            if (!testFiles[h].getName().endsWith(".xml")) {
+                continue;
+            }
+            System.out.println(testFiles[h].getName());
+            final SyndFeed feed = input.build(testFiles[h]);
+            final List entries = feed.getEntries();
+            final CreativeCommons fMod = (CreativeCommons) feed.getModule(CreativeCommons.URI);
+            System.out.println(fMod);
+            for (int i = 0; i < entries.size(); i++) {
+                final SyndEntry entry = (SyndEntry) entries.get(i);
+                final CreativeCommons eMod = (CreativeCommons) entry.getModule(CreativeCommons.URI);
+                System.out.println("\nEntry:");
+                System.out.println(eMod);
+            }
+        }
     }
 
 }
diff --git a/src/test/java/org/rometools/feed/module/content/ContentItemTest.java b/src/test/java/org/rometools/feed/module/content/ContentItemTest.java
index 13db56e..41cfb9a 100644
--- a/src/test/java/org/rometools/feed/module/content/ContentItemTest.java
+++ b/src/test/java/org/rometools/feed/module/content/ContentItemTest.java
@@ -7,30 +7,32 @@
 
 package org.rometools.feed.module.content;
 
-import org.rometools.feed.module.content.ContentItem;
 import junit.framework.TestCase;
 
 /**
  * This is all standard property storage testing.
+ * 
  * @author Robert Cooper
  */
 public class ContentItemTest extends TestCase {
-    
-    private ContentItem item = new ContentItem();
-    
-    public ContentItemTest(String testName) {
+
+    private final ContentItem item = new ContentItem();
+
+    public ContentItemTest(final String testName) {
         super(testName);
     }
 
+    @Override
     protected void setUp() throws java.lang.Exception {
     }
 
+    @Override
     protected void tearDown() throws java.lang.Exception {
     }
 
     public static junit.framework.Test suite() {
-        junit.framework.TestSuite suite = new junit.framework.TestSuite(ContentItemTest.class);
-        
+        final junit.framework.TestSuite suite = new junit.framework.TestSuite(ContentItemTest.class);
+
         return suite;
     }
 
@@ -38,71 +40,65 @@ public class ContentItemTest extends TestCase {
      * Test of ContentFormat method, of class com.totsp.xml.syndication.content.ContentItem.
      */
     public void testContentFormat() {
-        System.out.println("testContentFormat");        
-        String test = "application/xhtml";                        
+        System.out.println("testContentFormat");
+        final String test = "application/xhtml";
         item.setContentFormat(test);
-        assertTrue( item.getContentFormat().equals( test ));
+        assertTrue(item.getContentFormat().equals(test));
     }
 
-
     /**
      * Test of ContentEncoding method, of class com.totsp.xml.syndication.content.ContentItem.
      */
     public void testContentEncoding() {
-        System.out.println("testContentEncoding");        
-        String test = "http://www.w3.org/TR/REC-xml#dt-wellformed";
-                        
-        item.setContentFormat(test);
-        assertTrue( item.getContentFormat().equals( test ));
-    }
+        System.out.println("testContentEncoding");
+        final String test = "http://www.w3.org/TR/REC-xml#dt-wellformed";
 
+        item.setContentFormat(test);
+        assertTrue(item.getContentFormat().equals(test));
+    }
 
     /**
      * Test of ContentValue method, of class com.totsp.xml.syndication.content.ContentItem.
      */
     public void testContentValue() {
         System.out.println("testContentValue");
-        String test = "This isvery cool.";
-                        
+        final String test = "This isvery cool.";
+
         item.setContentFormat(test);
-        assertTrue( item.getContentFormat().equals( test ));
+        assertTrue(item.getContentFormat().equals(test));
     }
 
-    
     /**
      * Test of ContentAbout method, of class com.totsp.xml.syndication.content.ContentItem.
      */
     public void testContentAbout() {
         System.out.println("testContentAbout");
-        String test = "http://example.org/item/content.svg";
-                        
+        final String test = "http://example.org/item/content.svg";
+
         item.setContentFormat(test);
-        assertTrue( item.getContentFormat().equals( test ));
+        assertTrue(item.getContentFormat().equals(test));
     }
 
-    
     /**
      * Test of ContentValueParseType method, of class com.totsp.xml.syndication.content.ContentItem.
      */
     public void testContentValueParseType() {
         System.out.println("testContentValueParseType");
-        String test = "Literal";
-                        
-        item.setContentFormat(test);
-        assertTrue( item.getContentFormat().equals( test ));
-    }
+        final String test = "Literal";
 
-    
+        item.setContentFormat(test);
+        assertTrue(item.getContentFormat().equals(test));
+    }
 
     /**
      * Test of ContentValueNamespace method, of class com.totsp.xml.syndication.content.ContentItem.
      */
     public void testContentValueNamespace() {
         System.out.println("testContentValueNamespace");
-        String test = "http://www.w3.org/1999/xhtml";
-                        
+        final String test = "http://www.w3.org/1999/xhtml";
+
         item.setContentFormat(test);
-        assertTrue( item.getContentFormat().equals( test ));
+        assertTrue(item.getContentFormat().equals(test));
     }
 
     /**
@@ -110,34 +106,33 @@ public class ContentItemTest extends TestCase {
      */
     public void testContentResource() {
         System.out.println("testContentResource");
-        String test = "http://www.w3.org/2000/svg";
-                        
+        final String test = "http://www.w3.org/2000/svg";
+
         item.setContentResource(test);
-        assertTrue( item.getContentResource().equals( test ));
+        assertTrue(item.getContentResource().equals(test));
     }
-   
-    
-    /** this is a stupid test.
-     * @todo make better
-     * Test of ContentResource method, of class com.totsp.xml.syndication.content.ContentItem.
+
+    /**
+     * this is a stupid test.
+     * 
+     * @todo make better Test of ContentResource method, of class com.totsp.xml.syndication.content.ContentItem.
      */
     public void testEquals() {
         System.out.println("testEquals");
-        String test = "http://www.w3.org/2000/svg";
-                        
-        
-        assertTrue( test.equals( test ) );
-        ContentItem test2 = (ContentItem) ContentModuleImplTest.contentItems.get(0);
-        assertTrue( !test.equals( test2) );
-        ContentItem test3 = new ContentItem();
+        final String test = "http://www.w3.org/2000/svg";
+
+        assertTrue(test.equals(test));
+        final ContentItem test2 = (ContentItem) ContentModuleImplTest.contentItems.get(0);
+        assertTrue(!test.equals(test2));
+        final ContentItem test3 = new ContentItem();
         test3.setContentFormat(new String("http://www.w3.org/1999/xhtml"));
-        test3.setContentEncoding( new String("http://www.w3.org/TR/REC-xml#dt-wellformed"));
+        test3.setContentEncoding(new String("http://www.w3.org/TR/REC-xml#dt-wellformed"));
         test3.setContentEncoding(new String("Literal"));
-        //test3.setContentValueNamespace(new String("http://www.w3.org/1999/xhtml"));
+        // test3.setContentValueNamespace(new String("http://www.w3.org/1999/xhtml"));
         test3.setContentValue(new String("This is very cool."));
-        //assertEquals( test2, test3 );
+        // assertEquals( test2, test3 );
     }
     // TODO add test methods here. The name must begin with 'test'. For example:
     // public void testHello() {}
-    
+
 }
diff --git a/src/test/java/org/rometools/feed/module/content/ContentModuleGeneratorTest.java b/src/test/java/org/rometools/feed/module/content/ContentModuleGeneratorTest.java
index 181a065..891e1fc 100644
--- a/src/test/java/org/rometools/feed/module/content/ContentModuleGeneratorTest.java
+++ b/src/test/java/org/rometools/feed/module/content/ContentModuleGeneratorTest.java
@@ -5,29 +5,36 @@
  * Created on February 2, 2005, 4:15 PM
  */
 package org.rometools.feed.module.content;
-import org.rometools.feed.module.content.ContentModule;
-import org.rometools.feed.module.AbstractTestCase;
-import com.sun.syndication.feed.synd.*;
-import com.sun.syndication.io.*;
+
 import java.io.File;
 
+import org.rometools.feed.module.AbstractTestCase;
+
+import com.sun.syndication.feed.synd.SyndEntry;
+import com.sun.syndication.feed.synd.SyndFeed;
+import com.sun.syndication.io.SyndFeedInput;
+import com.sun.syndication.io.SyndFeedOutput;
+import com.sun.syndication.io.XmlReader;
+
 /**
- *
+ * 
  * @author Robert Cooper
  */
 public class ContentModuleGeneratorTest extends AbstractTestCase {
-    public ContentModuleGeneratorTest(String testName) {
+    public ContentModuleGeneratorTest(final String testName) {
         super(testName);
     }
 
+    @Override
     protected void setUp() throws java.lang.Exception {
     }
 
+    @Override
     protected void tearDown() throws java.lang.Exception {
     }
 
     public static junit.framework.Test suite() {
-        junit.framework.TestSuite suite = new junit.framework.TestSuite(ContentModuleGeneratorTest.class);
+        final junit.framework.TestSuite suite = new junit.framework.TestSuite(ContentModuleGeneratorTest.class);
 
         return suite;
     }
@@ -38,11 +45,11 @@ public class ContentModuleGeneratorTest extends AbstractTestCase {
     public void testGenerate() throws Exception {
         System.out.println("testGenerate");
 
-        SyndFeedInput input = new SyndFeedInput();
-        SyndFeed feed = input.build(new XmlReader( new File( this.getTestFile("xml/test-rdf.xml" ) ).toURL() ) );
-        SyndEntry entry = (SyndEntry) feed.getEntries().get(0);
-        ContentModule module = (ContentModule) entry.getModule(ContentModule.URI);
-        SyndFeedOutput output = new SyndFeedOutput();
+        final SyndFeedInput input = new SyndFeedInput();
+        final SyndFeed feed = input.build(new XmlReader(new File(getTestFile("xml/test-rdf.xml")).toURL()));
+        final SyndEntry entry = feed.getEntries().get(0);
+        final ContentModule module = (ContentModule) entry.getModule(ContentModule.URI);
+        final SyndFeedOutput output = new SyndFeedOutput();
         output.output(feed, new java.io.PrintWriter(System.out));
     }
 }
diff --git a/src/test/java/org/rometools/feed/module/content/ContentModuleImplTest.java b/src/test/java/org/rometools/feed/module/content/ContentModuleImplTest.java
index 17e1a4a..afef2dd 100644
--- a/src/test/java/org/rometools/feed/module/content/ContentModuleImplTest.java
+++ b/src/test/java/org/rometools/feed/module/content/ContentModuleImplTest.java
@@ -6,64 +6,66 @@
  */
 
 package org.rometools.feed.module.content;
-import org.rometools.feed.module.content.ContentModule;
-import org.rometools.feed.module.content.ContentItem;
-import org.rometools.feed.module.content.ContentModuleImpl;
-import junit.framework.*;
-import java.util.List;
+
 import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+
 /**
- *
+ * 
  * @author Robert Cooper
  */
 public class ContentModuleImplTest extends TestCase {
-    
-    private ContentModuleImpl module = new ContentModuleImpl();
+
+    private final ContentModuleImpl module = new ContentModuleImpl();
     public static ArrayList contentItems = new ArrayList();
-    static{
+    static {
         ContentItem item = new ContentItem();
         item.setContentFormat("http://www.w3.org/1999/xhtml");
-        item.setContentEncoding( "http://www.w3.org/TR/REC-xml#dt-wellformed");
-        //item.setContentValueNamespaces("http://www.w3.org/1999/xhtml");
+        item.setContentEncoding("http://www.w3.org/TR/REC-xml#dt-wellformed");
+        // item.setContentValueNamespaces("http://www.w3.org/1999/xhtml");
         item.setContentValue("This is very cool.");
-        item.setContentValueParseType( "Literal");
-        
-        contentItems.add( item );
-        
+        item.setContentValueParseType("Literal");
+
+        contentItems.add(item);
+
         item = new ContentItem();
         item.setContentFormat("http://www.w3.org/TR/html4/");
         item.setContentValue("This isvery cool.");
-        
-        contentItems.add( item );
-        
+
+        contentItems.add(item);
+
         item = new ContentItem();
         item.setContentAbout("http://example.org/item/content-here.txt");
         item.setContentFormat("http://www.isi.edu/in-notes/iana/assignments/media-types/text/plain");
         item.setContentValue("This is >very cool<.");
-        
-        contentItems.add( item );
-        
+
+        contentItems.add(item);
+
         item = new ContentItem();
         item.setContentAbout("http://example.org/item/content.svg");
         item.setContentResource("http://www.w3.org/2000/svg");
-        
-        contentItems.add( item );
+
+        contentItems.add(item);
     }
-    
-    public ContentModuleImplTest(String testName) {
+
+    public ContentModuleImplTest(final String testName) {
         super(testName);
     }
 
+    @Override
     protected void setUp() throws java.lang.Exception {
-        
+
     }
 
+    @Override
     protected void tearDown() throws java.lang.Exception {
     }
 
     public static junit.framework.Test suite() {
-        junit.framework.TestSuite suite = new junit.framework.TestSuite(ContentModuleImplTest.class);
-        
+        final junit.framework.TestSuite suite = new junit.framework.TestSuite(ContentModuleImplTest.class);
+
         return suite;
     }
 
@@ -71,23 +73,22 @@ public class ContentModuleImplTest extends TestCase {
      * Test of getEncodeds method, of class com.totsp.xml.syndication.content.ContentModuleImpl.
      */
     public void testEncodeds() {
-        ArrayList encodeds = new ArrayList();
-        encodeds.add( "Foo" );
-        encodeds.add( "Bar" );
-        encodeds.add( "Baz" );
-        module.setEncodeds( encodeds );
-        List check = module.getEncodeds();
-        assertTrue( check.equals( encodeds ));
-        
+        final ArrayList encodeds = new ArrayList();
+        encodeds.add("Foo");
+        encodeds.add("Bar");
+        encodeds.add("Baz");
+        module.setEncodeds(encodeds);
+        final List check = module.getEncodeds();
+        assertTrue(check.equals(encodeds));
+
     }
-   
-    
+
     /**
      * Test of getInterface method, of class com.totsp.xml.syndication.content.ContentModuleImpl.
      */
     public void testInterface() {
         System.out.println("testInterface");
-        assertTrue( module.getInterface().equals( ContentModule.class));
+        assertTrue(module.getInterface().equals(ContentModule.class));
     }
 
     /**
@@ -95,24 +96,22 @@ public class ContentModuleImplTest extends TestCase {
      */
     public void testContentItems() {
         System.out.println("testContentItems");
-        module.setContentItems( contentItems );
-        assertTrue( module.getContentItems().equals( contentItems ) );
+        module.setContentItems(contentItems);
+        assertTrue(module.getContentItems().equals(contentItems));
     }
 
- 
-
     /**
      * Test of getContents method, of class com.totsp.xml.syndication.content.ContentModuleImpl.
      */
     public void testContents() {
         System.out.println("testContents");
-        ArrayList contents = new ArrayList();
-        contents.add( "Foo" );
-        contents.add( "Bar" );
-        contents.add( "Baz" );
-        module.setContents( contents );
-        List check = module.getContents();
-        assertTrue( check.equals( contents ));
+        final ArrayList contents = new ArrayList();
+        contents.add("Foo");
+        contents.add("Bar");
+        contents.add("Baz");
+        module.setContents(contents);
+        final List check = module.getContents();
+        assertTrue(check.equals(contents));
     }
 
     /**
@@ -120,15 +119,13 @@ public class ContentModuleImplTest extends TestCase {
      */
     public void testCopyFrom() {
         System.out.println("testCopyFrom");
-        ContentModule test = new ContentModuleImpl();
-        test.copyFrom( module );
-        assertTrue( test.getContentItems().equals( module.getContentItems() ) &
-                test.getContents().equals( module.getContents() ) &
-                test.getEncodeds().equals( module.getEncodeds() ) );
+        final ContentModule test = new ContentModuleImpl();
+        test.copyFrom(module);
+        assertTrue(test.getContentItems().equals(module.getContentItems()) & test.getContents().equals(module.getContents())
+                & test.getEncodeds().equals(module.getEncodeds()));
     }
-   
-    
+
     // TODO add test methods here. The name must begin with 'test'. For example:
     // public void testHello() {}
-    
+
 }
diff --git a/src/test/java/org/rometools/feed/module/content/ContentModuleParserTest.java b/src/test/java/org/rometools/feed/module/content/ContentModuleParserTest.java
index 15f815d..0d2efdc 100644
--- a/src/test/java/org/rometools/feed/module/content/ContentModuleParserTest.java
+++ b/src/test/java/org/rometools/feed/module/content/ContentModuleParserTest.java
@@ -5,51 +5,54 @@
  * Created on February 2, 2005, 3:35 PM
  */
 package org.rometools.feed.module.content;
-import org.rometools.feed.module.content.ContentModule;
-import org.rometools.feed.module.content.ContentItem;
-import org.rometools.feed.module.AbstractTestCase;
-import com.sun.syndication.feed.synd.*;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.XmlReader;
+
 import java.io.File;
 import java.util.List;
 
+import org.rometools.feed.module.AbstractTestCase;
+
+import com.sun.syndication.feed.synd.SyndEntry;
+import com.sun.syndication.feed.synd.SyndFeed;
+import com.sun.syndication.io.SyndFeedInput;
+import com.sun.syndication.io.XmlReader;
+
 /**
- *
+ * 
  * @author Robert Cooper
  */
 public class ContentModuleParserTest extends AbstractTestCase {
-    public ContentModuleParserTest(String testName) {
+    public ContentModuleParserTest(final String testName) {
         super(testName);
     }
 
+    @Override
     protected void setUp() throws java.lang.Exception {
     }
 
+    @Override
     protected void tearDown() throws java.lang.Exception {
     }
 
     public static junit.framework.Test suite() {
-        junit.framework.TestSuite suite = new junit.framework.TestSuite(ContentModuleParserTest.class);
+        final junit.framework.TestSuite suite = new junit.framework.TestSuite(ContentModuleParserTest.class);
 
         return suite;
     }
 
     /**
-     * Test of parse method, of class com.sun.syndication.feed.module.content.ContentModuleParser.
-     * It will test through the whole ROME framework.
+     * Test of parse method, of class com.sun.syndication.feed.module.content.ContentModuleParser. It will test through the whole ROME framework.
      */
     public void testParse() throws Exception {
-        SyndFeedInput input = new SyndFeedInput();
-        SyndFeed feed = input.build(new XmlReader(new File( this.getTestFile("xml/test-rdf.xml" ) ).toURL() ));
-        SyndEntry entry = (SyndEntry) feed.getEntries().get(0);
-        ContentModule module = (ContentModule) entry.getModule(ContentModule.URI);
-        List items = module.getContentItems();
+        final SyndFeedInput input = new SyndFeedInput();
+        final SyndFeed feed = input.build(new XmlReader(new File(getTestFile("xml/test-rdf.xml")).toURL()));
+        final SyndEntry entry = feed.getEntries().get(0);
+        final ContentModule module = (ContentModule) entry.getModule(ContentModule.URI);
+        final List items = module.getContentItems();
 
         for (int i = 0; i < items.size(); i++) {
-            ContentItem item = (ContentItem) ContentModuleImplTest.contentItems.get(i);
-            //TODO fix this.
-            //assertEquals (item , items.get(i));
+            final ContentItem item = (ContentItem) ContentModuleImplTest.contentItems.get(i);
+            // TODO fix this.
+            // assertEquals (item , items.get(i));
         }
     }
 
diff --git a/src/test/java/org/rometools/feed/module/georss/RssTest.java b/src/test/java/org/rometools/feed/module/georss/RssTest.java
index c092957..4ca5ca4 100644
--- a/src/test/java/org/rometools/feed/module/georss/RssTest.java
+++ b/src/test/java/org/rometools/feed/module/georss/RssTest.java
@@ -16,10 +16,6 @@
  */
 package org.rometools.feed.module.georss;
 
-import org.rometools.feed.module.georss.GeoRSSUtils;
-import org.rometools.feed.module.georss.GeoRSSModule;
-import org.rometools.feed.module.georss.GMLModuleImpl;
-import org.rometools.feed.module.georss.SimpleModuleImpl;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -34,6 +30,7 @@ import junit.framework.TestCase;
 import org.rometools.feed.module.georss.geometries.LineString;
 import org.rometools.feed.module.georss.geometries.Position;
 import org.rometools.feed.module.georss.geometries.PositionList;
+
 import com.sun.syndication.feed.synd.SyndContent;
 import com.sun.syndication.feed.synd.SyndContentImpl;
 import com.sun.syndication.feed.synd.SyndEntry;
@@ -46,182 +43,170 @@ import com.sun.syndication.io.XmlReader;
 
 public class RssTest extends TestCase {
 
-	private static double DELTA = 0.00001;
+    private static double DELTA = 0.00001;
 
-	/**
-	 * compares expected lat/lng values with acutal values read from feed
-	 * 
-	 * @param fileName
-	 *            a file in the src/data directory
-	 * @param expectedLat
-	 *            array of expected latitude values
-	 * @param expectedLng
-	 *            array of expected longitude values
-	 * @throws Exception
-	 */
-	private void assertTestFile(String fileName, double[] expectedLat,
-			double[] expectedLng) throws Exception {
-		assertTestInputStream(new FileInputStream(new File("src/test/resources/data/",
-				fileName)), expectedLat, expectedLng);
-	}
+    /**
+     * compares expected lat/lng values with acutal values read from feed
+     * 
+     * @param fileName a file in the src/data directory
+     * @param expectedLat array of expected latitude values
+     * @param expectedLng array of expected longitude values
+     * @throws Exception
+     */
+    private void assertTestFile(final String fileName, final double[] expectedLat, final double[] expectedLng) throws Exception {
+        assertTestInputStream(new FileInputStream(new File("src/test/resources/data/", fileName)), expectedLat, expectedLng);
+    }
 
-	private void assertTestInputStream(InputStream in, double[] expectedLat,
-			double[] expectedLng) throws Exception {
-		SyndFeedInput input = new SyndFeedInput();
+    private void assertTestInputStream(final InputStream in, final double[] expectedLat, final double[] expectedLng) throws Exception {
+        final SyndFeedInput input = new SyndFeedInput();
 
-		SyndFeed feed = input.build(new XmlReader(in));
+        final SyndFeed feed = input.build(new XmlReader(in));
 
-		List entries = feed.getEntries();
-		for (int i = 0; i < entries.size(); i++) {
-			SyndEntry entry = (SyndEntry) entries.get(i);
-			GeoRSSModule geoRSSModule = GeoRSSUtils.getGeoRSS(entry);
-			Position position = geoRSSModule.getPosition();
-			assertEquals("lat " + i, expectedLat[i], position.getLatitude(),
-					DELTA);
-			assertEquals("lng " + i, expectedLng[i], position.getLongitude(),
-					DELTA);
-		}
-	}
+        final List entries = feed.getEntries();
+        for (int i = 0; i < entries.size(); i++) {
+            final SyndEntry entry = (SyndEntry) entries.get(i);
+            final GeoRSSModule geoRSSModule = GeoRSSUtils.getGeoRSS(entry);
+            final Position position = geoRSSModule.getPosition();
+            assertEquals("lat " + i, expectedLat[i], position.getLatitude(), DELTA);
+            assertEquals("lng " + i, expectedLng[i], position.getLongitude(), DELTA);
+        }
+    }
 
-	private SyndFeed createFeed() {
-		SyndFeed feed = new SyndFeedImpl();
-		feed.setFeedType("rss_2.0");
+    private SyndFeed createFeed() {
+        final SyndFeed feed = new SyndFeedImpl();
+        feed.setFeedType("rss_2.0");
 
-		feed.setTitle("Sample Feed (created with ROME)");
-		feed.setLink("http://rome.dev.java.net");
-		feed
-				.setDescription("This feed has been created using ROME (Java syndication utilities");
+        feed.setTitle("Sample Feed (created with ROME)");
+        feed.setLink("http://rome.dev.java.net");
+        feed.setDescription("This feed has been created using ROME (Java syndication utilities");
 
-		List entries = new ArrayList();
-		SyndEntry entry;
-		SyndContent description;
+        final List entries = new ArrayList();
+        SyndEntry entry;
+        SyndContent description;
 
-		entry = new SyndEntryImpl();
-		entry.setTitle("ROME v1.0");
-		entry.setLink("http://wiki.java.net/bin/view/Javawsxml/Rome01");
-		entry.setPublishedDate(new Date());
-		description = new SyndContentImpl();
-		description.setType("text/plain");
-		description.setValue("Initial release of ROME");
-		entry.setDescription(description);
-		entries.add(entry);
+        entry = new SyndEntryImpl();
+        entry.setTitle("ROME v1.0");
+        entry.setLink("http://wiki.java.net/bin/view/Javawsxml/Rome01");
+        entry.setPublishedDate(new Date());
+        description = new SyndContentImpl();
+        description.setType("text/plain");
+        description.setValue("Initial release of ROME");
+        entry.setDescription(description);
+        entries.add(entry);
 
-		feed.setEntries(entries);
-		return feed;
-	}
+        feed.setEntries(entries);
+        return feed;
+    }
 
-	public void testReadRss2Simple() throws Exception {
-		double[] lat = { 31.7666667, 31.7666667, 31.7666667 };
-		double[] lng = { 35.2333333, 35.2333333, 35.2333333 };
-		assertTestFile("rss2.0-simple.xml", lat, lng);
-	}
+    public void testReadRss2Simple() throws Exception {
+        final double[] lat = { 31.7666667, 31.7666667, 31.7666667 };
+        final double[] lng = { 35.2333333, 35.2333333, 35.2333333 };
+        assertTestFile("rss2.0-simple.xml", lat, lng);
+    }
 
-	public void testReadRss2W3CGeo() throws Exception {
-		double[] lat = { 42.986284, 41.492491, 39.901893, 40.750598 };
-		double[] lng = { -71.45156, -72.095783, -75.171998, -73.993392 };
-		assertTestFile("rss2.0-w3cgeo.xml", lat, lng);
-	}
+    public void testReadRss2W3CGeo() throws Exception {
+        final double[] lat = { 42.986284, 41.492491, 39.901893, 40.750598 };
+        final double[] lng = { -71.45156, -72.095783, -75.171998, -73.993392 };
+        assertTestFile("rss2.0-w3cgeo.xml", lat, lng);
+    }
 
-	public void xtestReadRss1W3CGeo() throws Exception {
-		double[] lat = { 45.9774, 45.9707, 46.0087 };
-		double[] lng = { 8.9781, 8.97055, 8.98579 };
-		assertTestFile("rss1.0-w3cgeo.xml", lat, lng);
-	}
+    public void xtestReadRss1W3CGeo() throws Exception {
+        final double[] lat = { 45.9774, 45.9707, 46.0087 };
+        final double[] lng = { 8.9781, 8.97055, 8.98579 };
+        assertTestFile("rss1.0-w3cgeo.xml", lat, lng);
+    }
 
-	public void testReadGML() throws Exception {
-		double[] lat = { 45.256, 45.256, 45.256, 45.256 };
-		double[] lng = { -71.92, -71.92, -71.92, -71.92 };
-		assertTestFile("rss2.0-gml.xml", lat, lng);
-	}
+    public void testReadGML() throws Exception {
+        final double[] lat = { 45.256, 45.256, 45.256, 45.256 };
+        final double[] lng = { -71.92, -71.92, -71.92, -71.92 };
+        assertTestFile("rss2.0-gml.xml", lat, lng);
+    }
 
-	public void xtestProduceAndReadGML() throws Exception {
-		SyndFeed feed = createFeed();
-		GeoRSSModule geoRSSModule = new GMLModuleImpl();
-		double latitude = 47.0;
-		double longitude = 9.0;
-		Position position = new Position();
-		position.setLatitude(latitude);
-		position.setLongitude(longitude);
-		geoRSSModule.setPosition(position);
+    public void xtestProduceAndReadGML() throws Exception {
+        final SyndFeed feed = createFeed();
+        final GeoRSSModule geoRSSModule = new GMLModuleImpl();
+        final double latitude = 47.0;
+        final double longitude = 9.0;
+        final Position position = new Position();
+        position.setLatitude(latitude);
+        position.setLongitude(longitude);
+        geoRSSModule.setPosition(position);
 
-		SyndEntry entry = (SyndEntry) feed.getEntries().get(0);
-		entry.getModules().add(geoRSSModule);
+        final SyndEntry entry = feed.getEntries().get(0);
+        entry.getModules().add(geoRSSModule);
 
-		SyndFeedOutput output = new SyndFeedOutput();
+        final SyndFeedOutput output = new SyndFeedOutput();
 
-		StringWriter stringWriter = new StringWriter();
-		output.output(feed, stringWriter);
+        final StringWriter stringWriter = new StringWriter();
+        output.output(feed, stringWriter);
 
-		InputStream in = new ByteArrayInputStream(stringWriter.toString()
-				.getBytes("UTF8"));
-		double[] lat = { latitude };
-		double[] lng = { longitude };
-		assertTestInputStream(in, lat, lng);
-	}
+        final InputStream in = new ByteArrayInputStream(stringWriter.toString().getBytes("UTF8"));
+        final double[] lat = { latitude };
+        final double[] lng = { longitude };
+        assertTestInputStream(in, lat, lng);
+    }
 
-	public void testProduceAndReadSimple() throws Exception {
-		SyndFeed feed = createFeed();
-		GeoRSSModule geoRSSModule = new SimpleModuleImpl();
-		double latitude = 47.0;
-		double longitude = 9.0;
-		Position position = new Position();
-		position.setLatitude(latitude);
-		position.setLongitude(longitude);
-		geoRSSModule.setPosition(position);
+    public void testProduceAndReadSimple() throws Exception {
+        final SyndFeed feed = createFeed();
+        final GeoRSSModule geoRSSModule = new SimpleModuleImpl();
+        final double latitude = 47.0;
+        final double longitude = 9.0;
+        final Position position = new Position();
+        position.setLatitude(latitude);
+        position.setLongitude(longitude);
+        geoRSSModule.setPosition(position);
 
-		SyndEntry entry = (SyndEntry) feed.getEntries().get(0);
-		entry.getModules().add(geoRSSModule);
+        final SyndEntry entry = feed.getEntries().get(0);
+        entry.getModules().add(geoRSSModule);
 
-		SyndFeedOutput output = new SyndFeedOutput();
+        final SyndFeedOutput output = new SyndFeedOutput();
 
-		StringWriter stringWriter = new StringWriter();
-		output.output(feed, stringWriter);
+        final StringWriter stringWriter = new StringWriter();
+        output.output(feed, stringWriter);
 
-		InputStream in = new ByteArrayInputStream(stringWriter.toString()
-				.getBytes("UTF8"));
-		double[] lat = { latitude };
-		double[] lng = { longitude };
-		assertTestInputStream(in, lat, lng);
-	}
+        final InputStream in = new ByteArrayInputStream(stringWriter.toString().getBytes("UTF8"));
+        final double[] lat = { latitude };
+        final double[] lng = { longitude };
+        assertTestInputStream(in, lat, lng);
+    }
 
-	public void testProduceAndReadSimpleLine() throws Exception {
-		SyndFeed feed = createFeed();
+    public void testProduceAndReadSimpleLine() throws Exception {
+        SyndFeed feed = createFeed();
 
-		double[] latitudes = new double[] { 45.256, 46.46, 43.84 };
-		double[] longitudes = new double[] { -110.45, -109.48, -109.86 };
-		// 45.256 -110.45 46.46 -109.48 43.84 -109.86
-		PositionList positionList = new PositionList();
-		positionList.add(latitudes[0], longitudes[0]);
-		positionList.add(latitudes[1], longitudes[1]);
-		positionList.add(latitudes[2], longitudes[2]);
+        final double[] latitudes = new double[] { 45.256, 46.46, 43.84 };
+        final double[] longitudes = new double[] { -110.45, -109.48, -109.86 };
+        // 45.256 -110.45 46.46 -109.48 43.84 -109.86
+        PositionList positionList = new PositionList();
+        positionList.add(latitudes[0], longitudes[0]);
+        positionList.add(latitudes[1], longitudes[1]);
+        positionList.add(latitudes[2], longitudes[2]);
 
-		SimpleModuleImpl geoRSSModule = new SimpleModuleImpl();
-		geoRSSModule.setGeometry(new LineString(positionList));
+        SimpleModuleImpl geoRSSModule = new SimpleModuleImpl();
+        geoRSSModule.setGeometry(new LineString(positionList));
 
-		SyndEntry entry = (SyndEntry) feed.getEntries().get(0);
-		entry.getModules().add(geoRSSModule);
+        SyndEntry entry = feed.getEntries().get(0);
+        entry.getModules().add(geoRSSModule);
 
-		SyndFeedOutput output = new SyndFeedOutput();
+        final SyndFeedOutput output = new SyndFeedOutput();
 
-		StringWriter stringWriter = new StringWriter();
-		output.output(feed, stringWriter);
+        final StringWriter stringWriter = new StringWriter();
+        output.output(feed, stringWriter);
 
-		InputStream in = new ByteArrayInputStream(stringWriter.toString()
-				.getBytes("UTF8"));
-		SyndFeedInput input = new SyndFeedInput();
+        final InputStream in = new ByteArrayInputStream(stringWriter.toString().getBytes("UTF8"));
+        final SyndFeedInput input = new SyndFeedInput();
 
-		feed = input.build(new XmlReader(in));
+        feed = input.build(new XmlReader(in));
 
-		List entries = feed.getEntries();
-		for (int i = 0; i < entries.size(); i++) {
-			entry = (SyndEntry) entries.get(i);
-			geoRSSModule = (SimpleModuleImpl) GeoRSSUtils.getGeoRSS(entry);
-			LineString lineString = (LineString) geoRSSModule.getGeometry();
-			positionList = lineString.getPositionList();
+        final List entries = feed.getEntries();
+        for (int i = 0; i < entries.size(); i++) {
+            entry = (SyndEntry) entries.get(i);
+            geoRSSModule = (SimpleModuleImpl) GeoRSSUtils.getGeoRSS(entry);
+            final LineString lineString = (LineString) geoRSSModule.getGeometry();
+            positionList = lineString.getPositionList();
 
-			assertEquals(latitudes[i], positionList.getLatitude(i), 0.0001);
-			assertEquals(longitudes[i], positionList.getLongitude(i), 0.0001);
-		}
-	}
+            assertEquals(latitudes[i], positionList.getLatitude(i), 0.0001);
+            assertEquals(longitudes[i], positionList.getLongitude(i), 0.0001);
+        }
+    }
 
 }
diff --git a/src/test/java/org/rometools/feed/module/itunes/ITunesGeneratorTest.java b/src/test/java/org/rometools/feed/module/itunes/ITunesGeneratorTest.java
index 353ffe7..a1acc78 100644
--- a/src/test/java/org/rometools/feed/module/itunes/ITunesGeneratorTest.java
+++ b/src/test/java/org/rometools/feed/module/itunes/ITunesGeneratorTest.java
@@ -6,11 +6,16 @@
  */
 package org.rometools.feed.module.itunes;
 
-import org.rometools.feed.module.itunes.FeedInformationImpl;
-import org.rometools.feed.module.itunes.AbstractITunesObject;
-import org.rometools.feed.module.itunes.FeedInformation;
+import java.io.File;
+import java.io.OutputStreamWriter;
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.rometools.feed.module.AbstractTestCase;
 import org.rometools.feed.module.itunes.types.Category;
+
 import com.sun.syndication.feed.synd.SyndEntry;
 import com.sun.syndication.feed.synd.SyndFeed;
 import com.sun.syndication.feed.synd.SyndFeedImpl;
@@ -18,86 +23,78 @@ import com.sun.syndication.io.SyndFeedInput;
 import com.sun.syndication.io.SyndFeedOutput;
 import com.sun.syndication.io.XmlReader;
 
-import junit.framework.*;
-
-import java.io.File;
-import java.io.OutputStreamWriter;
-
-import java.util.List;
-
-
 /**
- *
+ * 
  * @author cooper
  */
 public class ITunesGeneratorTest extends AbstractTestCase {
     static final String URI = AbstractITunesObject.URI;
-    
-    public ITunesGeneratorTest(String testName) {
+
+    public ITunesGeneratorTest(final String testName) {
         super(testName);
     }
-    
+
     public static Test suite() {
-        TestSuite suite = new TestSuite(ITunesGeneratorTest.class);
-        
+        final TestSuite suite = new TestSuite(ITunesGeneratorTest.class);
+
         return suite;
     }
-    
+
     /**
      * Test of generate method, of class com.totsp.xml.syndication.itunes.ITunesGenerator.
      */
     public void testEndToEnd() throws Exception {
         System.out.println("testEndToEnd");
         testFile("xml/leshow.xml");
-        
-        //testFile( "/test/xml/apple.xml" );
-        testFile( "xml/lr.xml" );
+
+        // testFile( "/test/xml/apple.xml" );
+        testFile("xml/lr.xml");
     }
-    
-    private void testFile(String filename) throws Exception {
-        File feed = new File(this.getTestFile(filename));
-        SyndFeedInput input = new SyndFeedInput();
-        SyndFeed syndfeed = input.build(new XmlReader(feed.toURL()));
-        
-        SyndFeedOutput output = new SyndFeedOutput();
-        File outfeed = new File(feed.getAbsolutePath() + ".output");
+
+    private void testFile(final String filename) throws Exception {
+        final File feed = new File(getTestFile(filename));
+        final SyndFeedInput input = new SyndFeedInput();
+        final SyndFeed syndfeed = input.build(new XmlReader(feed.toURL()));
+
+        final SyndFeedOutput output = new SyndFeedOutput();
+        final File outfeed = new File(feed.getAbsolutePath() + ".output");
         output.output(syndfeed, outfeed);
-        
-        SyndFeed syndCheck = input.build(new XmlReader(outfeed.toURL()));
+
+        final SyndFeed syndCheck = input.build(new XmlReader(outfeed.toURL()));
         System.out.println(syndCheck.getModule(AbstractITunesObject.URI).toString());
         assertEquals("Feed Level: ", syndfeed.getModule(AbstractITunesObject.URI).toString(), syndCheck.getModule(AbstractITunesObject.URI).toString());
-        
-        List syndEntries = syndfeed.getEntries();
-        List syndChecks = syndCheck.getEntries();
-        
+
+        final List syndEntries = syndfeed.getEntries();
+        final List syndChecks = syndCheck.getEntries();
+
         for (int i = 0; i < syndEntries.size(); i++) {
-            SyndEntry entry = (SyndEntry) syndEntries.get(i);
-            SyndEntry check = (SyndEntry) syndChecks.get(i);
+            final SyndEntry entry = (SyndEntry) syndEntries.get(i);
+            final SyndEntry check = (SyndEntry) syndChecks.get(i);
             System.out.println("Original: " + entry.getModule(AbstractITunesObject.URI));
             System.out.println("Check:    " + check.getModule(AbstractITunesObject.URI));
-            System.out.println( entry.getModule(AbstractITunesObject.URI).toString() );
-            System.out.println( "-----------------------------------------");
-            System.out.println(  check.getModule(AbstractITunesObject.URI).toString());
+            System.out.println(entry.getModule(AbstractITunesObject.URI).toString());
+            System.out.println("-----------------------------------------");
+            System.out.println(check.getModule(AbstractITunesObject.URI).toString());
             assertEquals("Entry Level: ", entry.getModule(AbstractITunesObject.URI).toString(), check.getModule(AbstractITunesObject.URI).toString());
         }
     }
-    
+
     public void testCreate() throws Exception {
-        SyndFeed feed = new SyndFeedImpl();
-        String feedType = "rss_2.0";
+        final SyndFeed feed = new SyndFeedImpl();
+        final String feedType = "rss_2.0";
         feed.setFeedType(feedType);
         feed.setLanguage("en-us");
         feed.setTitle("sales.com on the Radio!");
         feed.setDescription("sales.com radio shows in MP3 format");
         feed.setLink("http://foo/rss/podcasts.rss");
-        
-        FeedInformation fi = new FeedInformationImpl();
+
+        final FeedInformation fi = new FeedInformationImpl();
         fi.setOwnerName("sales.com");
         fi.getCategories().add(new Category("Shopping"));
         fi.setOwnerEmailAddress("patti@sales.com");
-        feed.getModules().add( fi );
-        
-        SyndFeedOutput output = new SyndFeedOutput();
-        output.output( feed, new OutputStreamWriter( System.out) );
+        feed.getModules().add(fi);
+
+        final SyndFeedOutput output = new SyndFeedOutput();
+        output.output(feed, new OutputStreamWriter(System.out));
     }
 }
diff --git a/src/test/java/org/rometools/feed/module/itunes/ITunesParserTest.java b/src/test/java/org/rometools/feed/module/itunes/ITunesParserTest.java
index 13432a8..7b5b729 100644
--- a/src/test/java/org/rometools/feed/module/itunes/ITunesParserTest.java
+++ b/src/test/java/org/rometools/feed/module/itunes/ITunesParserTest.java
@@ -6,41 +6,42 @@
  */
 package org.rometools.feed.module.itunes;
 
-import org.rometools.feed.module.itunes.EntryInformationImpl;
-import org.rometools.feed.module.itunes.FeedInformationImpl;
-import org.rometools.feed.module.itunes.AbstractITunesObject;
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.rometools.feed.module.AbstractTestCase;
+import org.rometools.feed.module.itunes.io.ITunesGenerator;
+import org.rometools.feed.module.itunes.types.Category;
+
 import com.sun.syndication.feed.module.Module;
 import com.sun.syndication.feed.synd.SyndEntry;
 import com.sun.syndication.feed.synd.SyndFeed;
 import com.sun.syndication.io.SyndFeedInput;
 import com.sun.syndication.io.XmlReader;
-import org.rometools.feed.module.itunes.io.ITunesGenerator;
-import org.rometools.feed.module.itunes.types.Category;
-
-import junit.framework.*;
-
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
 
 /**
- *
+ * 
  * @author cooper
  */
 public class ITunesParserTest extends AbstractTestCase {
-    public ITunesParserTest(String testName) {
+    public ITunesParserTest(final String testName) {
         super(testName);
     }
 
+    @Override
     protected void setUp() throws Exception {
     }
 
+    @Override
     protected void tearDown() throws Exception {
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite(ITunesParserTest.class);
+        final TestSuite suite = new TestSuite(ITunesParserTest.class);
 
         return suite;
     }
@@ -58,36 +59,39 @@ public class ITunesParserTest extends AbstractTestCase {
      * Test of parse method, of class com.totsp.xml.syndication.itunes.ITunesParser.
      */
     public void testParse() throws Exception {
-        File feed = new File(this.getTestFile("xml/leshow.xml"));
-        SyndFeedInput input = new SyndFeedInput();
+        File feed = new File(getTestFile("xml/leshow.xml"));
+        final SyndFeedInput input = new SyndFeedInput();
         SyndFeed syndfeed = input.build(new XmlReader(feed.toURL()));
 
-        Module module = syndfeed.getModule(AbstractITunesObject.URI);
-        FeedInformationImpl feedInfo = (FeedInformationImpl) module;
+        final Module module = syndfeed.getModule(AbstractITunesObject.URI);
+        final FeedInformationImpl feedInfo = (FeedInformationImpl) module;
 
         assertEquals("owner", "Harry Shearer", feedInfo.getOwnerName());
         assertEquals("email", "", feedInfo.getOwnerEmailAddress());
         assertEquals("image", "http://a1.phobos.apple.com/Music/y2005/m06/d26/h21/mcdrrifv.jpg", feedInfo.getImage().toExternalForm());
-        assertEquals("category", "Comedy", ((Category)feedInfo.getCategories().get(0)).getName());
-        assertEquals("summary", "A weekly, hour-long romp through the worlds of media, politics, sports and show business, leavened with an eclectic mix of mysterious music, hosted by Harry Shearer.", feedInfo.getSummary());
-        
+        assertEquals("category", "Comedy", ((Category) feedInfo.getCategories().get(0)).getName());
+        assertEquals(
+                "summary",
+                "A weekly, hour-long romp through the worlds of media, politics, sports and show business, leavened with an eclectic mix of mysterious music, hosted by Harry Shearer.",
+                feedInfo.getSummary());
+
         List entries = syndfeed.getEntries();
         Iterator it = entries.iterator();
 
         while (it.hasNext()) {
-            SyndEntry entry = (SyndEntry) it.next();
-            EntryInformationImpl entryInfo = (EntryInformationImpl) entry.getModule(AbstractITunesObject.URI);
-            System.out.println( entryInfo);
+            final SyndEntry entry = (SyndEntry) it.next();
+            final EntryInformationImpl entryInfo = (EntryInformationImpl) entry.getModule(AbstractITunesObject.URI);
+            System.out.println(entryInfo);
         }
-        
-        feed = new File(this.getTestFile("xml/rsr.xml"));
+
+        feed = new File(getTestFile("xml/rsr.xml"));
         syndfeed = input.build(new XmlReader(feed.toURL()));
-         entries = syndfeed.getEntries();
-         it = entries.iterator();
+        entries = syndfeed.getEntries();
+        it = entries.iterator();
 
         while (it.hasNext()) {
-            SyndEntry entry = (SyndEntry) it.next();
-            EntryInformationImpl entryInfo = (EntryInformationImpl) entry.getModule(AbstractITunesObject.URI);
+            final SyndEntry entry = (SyndEntry) it.next();
+            final EntryInformationImpl entryInfo = (EntryInformationImpl) entry.getModule(AbstractITunesObject.URI);
             System.out.println(entryInfo.getDuration());
         }
     }
diff --git a/src/test/java/org/rometools/feed/module/itunes/types/DurationTest.java b/src/test/java/org/rometools/feed/module/itunes/types/DurationTest.java
index dbaca33..253ed21 100644
--- a/src/test/java/org/rometools/feed/module/itunes/types/DurationTest.java
+++ b/src/test/java/org/rometools/feed/module/itunes/types/DurationTest.java
@@ -20,38 +20,38 @@
  *
  */
 package org.rometools.feed.module.itunes.types;
-import org.rometools.feed.module.itunes.types.Duration;
-import junit.framework.*;
 
-import java.text.NumberFormat;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 /**
- *
+ * 
  * @author cooper
  */
 public class DurationTest extends TestCase {
-    private Duration duration = new Duration((2 * Duration.HOUR) +
-            (3 * Duration.MINUTE) + (20 * Duration.SECOND));
-    private Duration duration2 = new Duration((12000 * Duration.HOUR) +
-            (61 * Duration.MINUTE) + (61 * Duration.SECOND));
-    private Duration duration3 = new Duration("1:20:01");
-    private long duration3ms = Duration.HOUR * 1 + Duration.MINUTE * 20 + Duration.SECOND * 1;
+    private final Duration duration = new Duration(2 * Duration.HOUR + 3 * Duration.MINUTE + 20 * Duration.SECOND);
+    private final Duration duration2 = new Duration(12000 * Duration.HOUR + 61 * Duration.MINUTE + 61 * Duration.SECOND);
+    private final Duration duration3 = new Duration("1:20:01");
+    private final long duration3ms = Duration.HOUR * 1 + Duration.MINUTE * 20 + Duration.SECOND * 1;
 
-    private Duration duration4 = new Duration("1:02");
-    private long duration4ms = Duration.MINUTE * 1 + Duration.SECOND * 2;
-    
-    
-    public DurationTest(String testName) {
+    private final Duration duration4 = new Duration("1:02");
+    private final long duration4ms = Duration.MINUTE * 1 + Duration.SECOND * 2;
+
+    public DurationTest(final String testName) {
         super(testName);
     }
 
+    @Override
     protected void setUp() throws Exception {
     }
 
+    @Override
     protected void tearDown() throws Exception {
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite(DurationTest.class);
+        final TestSuite suite = new TestSuite(DurationTest.class);
 
         return suite;
     }
@@ -66,10 +66,10 @@ public class DurationTest extends TestCase {
         System.out.println(duration2.toString());
         assertEquals("Long time failed", "12001:02:01", duration2.toString());
     }
-    
-    public void testGetMilliseconds(){
-        System.out.println("testGetMilliseconds" );
-        assertEquals("Milliseconds from 3 string constructor", this.duration3ms, this.duration3.getMilliseconds() );
-        assertEquals("Milliseconds from 2 string constructor", this.duration4ms, this.duration4.getMilliseconds() );
+
+    public void testGetMilliseconds() {
+        System.out.println("testGetMilliseconds");
+        assertEquals("Milliseconds from 3 string constructor", duration3ms, duration3.getMilliseconds());
+        assertEquals("Milliseconds from 2 string constructor", duration4ms, duration4.getMilliseconds());
     }
 }
diff --git a/src/test/java/org/rometools/feed/module/mediarss/GoogleTest.java b/src/test/java/org/rometools/feed/module/mediarss/GoogleTest.java
index 01fe220..7cc14cb 100644
--- a/src/test/java/org/rometools/feed/module/mediarss/GoogleTest.java
+++ b/src/test/java/org/rometools/feed/module/mediarss/GoogleTest.java
@@ -7,42 +7,42 @@
 
 package org.rometools.feed.module.mediarss;
 
-import org.rometools.feed.module.mediarss.MediaEntryModule;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.rometools.feed.module.AbstractTestCase;
-import junit.framework.*;
+
 import com.sun.syndication.feed.synd.SyndEntry;
 import com.sun.syndication.feed.synd.SyndFeed;
 import com.sun.syndication.io.SyndFeedInput;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.Iterator;
 
 /**
- *
+ * 
  * @author cooper
  */
 public class GoogleTest extends AbstractTestCase {
-    
-    public GoogleTest(String testName) {
+
+    public GoogleTest(final String testName) {
         super(testName);
     }
-    
+
     public static Test suite() {
-        TestSuite suite = new TestSuite(MediaModuleTest.class);
-        
+        final TestSuite suite = new TestSuite(MediaModuleTest.class);
+
         return suite;
     }
-    
+
     public static void testGoogleVideo() throws Exception {
-        SyndFeedInput input = new SyndFeedInput();
-        SyndFeed feed = input.build( new InputStreamReader( new URL( "http://video.google.com/videofeed?type=top100new&num=20&output=rss").openStream()));
-        for( Iterator it = feed.getEntries().iterator(); it.hasNext();  ){
-            SyndEntry entry = (SyndEntry) it.next();
-            MediaEntryModule m = (MediaEntryModule) entry.getModule( MediaEntryModule.URI );
-            System.out.print( m );
+        final SyndFeedInput input = new SyndFeedInput();
+        final SyndFeed feed = input.build(new InputStreamReader(new URL("http://video.google.com/videofeed?type=top100new&num=20&output=rss").openStream()));
+        for (final Object element : feed.getEntries()) {
+            final SyndEntry entry = (SyndEntry) element;
+            final MediaEntryModule m = (MediaEntryModule) entry.getModule(MediaModule.URI);
+            System.out.print(m);
         }
     }
-    
-    
-}
 
+}
diff --git a/src/test/java/org/rometools/feed/module/mediarss/MediaModuleTest.java b/src/test/java/org/rometools/feed/module/mediarss/MediaModuleTest.java
index 76138e0..b6de878 100644
--- a/src/test/java/org/rometools/feed/module/mediarss/MediaModuleTest.java
+++ b/src/test/java/org/rometools/feed/module/mediarss/MediaModuleTest.java
@@ -7,155 +7,129 @@
 
 package org.rometools.feed.module.mediarss;
 
-import org.rometools.feed.module.mediarss.MediaModule;
-import org.rometools.feed.module.mediarss.MediaEntryModule;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.rometools.feed.module.AbstractTestCase;
-import junit.framework.*;
+
 import com.sun.syndication.feed.synd.SyndEntry;
 import com.sun.syndication.feed.synd.SyndFeed;
 import com.sun.syndication.io.SyndFeedInput;
 import com.sun.syndication.io.SyndFeedOutput;
-import java.io.File;
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
 
 /**
- *
+ * 
  * @author cooper
  */
 public class MediaModuleTest extends AbstractTestCase {
-    
-    public MediaModuleTest(String testName) {
+
+    public MediaModuleTest(final String testName) {
         super(testName);
     }
-    
+
     public static Test suite() {
-        TestSuite suite = new TestSuite(MediaModuleTest.class);
-        
+        final TestSuite suite = new TestSuite(MediaModuleTest.class);
+
         return suite;
     }
-    
+
     public void testGoogleVideo() throws Exception {
-        SyndFeedInput input = new SyndFeedInput();
-        SyndFeed feed = input.build( new InputStreamReader( new URL( "http://video.google.com/videofeed?type=top100new&num=20&output=rss").openStream()));
-        for( Iterator it = feed.getEntries().iterator(); it.hasNext();  ){
-            SyndEntry entry = (SyndEntry) it.next();
-            MediaEntryModule m = (MediaEntryModule) entry.getModule( MediaEntryModule.URI );
-            System.out.print( m );
+        final SyndFeedInput input = new SyndFeedInput();
+        final SyndFeed feed = input.build(new InputStreamReader(new URL("http://video.google.com/videofeed?type=top100new&num=20&output=rss").openStream()));
+        for (final Object element : feed.getEntries()) {
+            final SyndEntry entry = (SyndEntry) element;
+            final MediaEntryModule m = (MediaEntryModule) entry.getModule(MediaModule.URI);
+            System.out.print(m);
         }
     }
-    
+
     public void testParse() throws Exception {
-        SyndFeedInput input = new SyndFeedInput();
-        File test = new File( super.getTestFile( "xml") );
-        File[] files = test.listFiles();
-        for( int j=0; j < files.length; j++ ){
-            if( !files[j].getName().endsWith(".xml") )
+        final SyndFeedInput input = new SyndFeedInput();
+        final File test = new File(super.getTestFile("xml"));
+        final File[] files = test.listFiles();
+        for (int j = 0; j < files.length; j++) {
+            if (!files[j].getName().endsWith(".xml")) {
                 continue;
-            SyndFeed feed =  input.build( files[j] );
-            //System.out.println( feed );
-            List entries = feed.getEntries();
-            for( int i = 0; i < entries.size(); i++ ){
-                //System.out.println( ((SyndEntry) entries.get(i)).getModule( MediaModule.URI ) );
             }
-            SyndFeedOutput output = new SyndFeedOutput();
-            output.output( feed, new File( "target/"+j+".xml") );
-            SyndFeed feed2 = input.build( new File("target/"+j+".xml")  );
-            for( int i=0; i < entries.size(); i++ ){
-                BufferedWriter b = new BufferedWriter( new FileWriter( "target/"+j+"a.txt") );
-                b.write( ""+((SyndEntry) entries.get(i)).getModule( MediaModule.URI ) );
+            final SyndFeed feed = input.build(files[j]);
+            // System.out.println( feed );
+            final List entries = feed.getEntries();
+            for (int i = 0; i < entries.size(); i++) {
+                // System.out.println( ((SyndEntry) entries.get(i)).getModule( MediaModule.URI ) );
+            }
+            final SyndFeedOutput output = new SyndFeedOutput();
+            output.output(feed, new File("target/" + j + ".xml"));
+            final SyndFeed feed2 = input.build(new File("target/" + j + ".xml"));
+            for (int i = 0; i < entries.size(); i++) {
+                BufferedWriter b = new BufferedWriter(new FileWriter("target/" + j + "a.txt"));
+                b.write("" + ((SyndEntry) entries.get(i)).getModule(MediaModule.URI));
                 b.close();
-                b = new BufferedWriter( new FileWriter( "target/"+j+"b.txt") );
-                b.write( ""+ ((SyndEntry) feed2.getEntries().get(i)).getModule( MediaModule.URI ) );
+                b = new BufferedWriter(new FileWriter("target/" + j + "b.txt"));
+                b.write("" + feed2.getEntries().get(i).getModule(MediaModule.URI));
                 b.close();
-                assertEquals( ((SyndEntry) entries.get(i)).getModule( MediaModule.URI ), ((SyndEntry) feed2.getEntries().get(i)).getModule( MediaModule.URI ));
+                assertEquals(((SyndEntry) entries.get(i)).getModule(MediaModule.URI), feed2.getEntries().get(i).getModule(MediaModule.URI));
             }
         }
     }
-    
-    
-    /** This code represents the original MediaModuleTest main class from openvision.tv
+
+    /**
+     * This code represents the original MediaModuleTest main class from openvision.tv
      */
-    public void xtestOriginal() throws Exception{
+    public void xtestOriginal() throws Exception {
         //
         /*
-        //You can test with blip tv or broadcast machine
-         
-        String rss = "http://blip.tv/?1=1&&skin=rss";//
-        //	String rss = "http://openvision.tv/bm/rss.php?i=4";
-        //	String rss = "http://api.search.yahoo.com/VideoSearchService/rss/videoSearch.xml?appid=yahoosearchvideorss&query=surfing&adult_ok=0";
-         
-         
-        URLConnection uc = new URL(rss).openConnection();
-        String contentType = uc.getContentEncoding();
-         
-        WireFeedInput input = new WireFeedInput();
-         
-        XmlReader xmlReader = new XmlReader(uc.getInputStream(), contentType, true);
-         
-        Channel chnl = (Channel)input.build(xmlReader);
-         
-        String feedTitle = chnl.getTitle();
-        String feedDesc = chnl.getDescription();
-         
-         
-        List items = chnl.getItems();
-         
-        ListIterator li = items.listIterator();
-        Item item = null;
-        Enclosure enc = null;
-        MediaModule mModule = null;
-         
-        while (li.hasNext()) {
-         
-            item = (Item)li.next();
-            enc = (Enclosure)item.getEnclosures().get(0);
-         
-            mModule = (MediaModule)item.getModule(MediaModule.URI);
-         
-            List modules = item.getModules();
-            System.out.println("title: " + item.getTitle());
-            System.out.println("module count: " + modules.size());
-         
-            if (mModule != null) {
-                Thumbnail[] mThumbs = mModule.getMediaThumbnails();
-         
-                if (mThumbs != null) {
-                    for (int i = 0; i < mThumbs.length; i++) {
-                        String imgUrl = mThumbs[i].getUrl();
-                        System.out.println("got MediaModule img " + i + ": " + imgUrl);
-                    }
-                }
-         
-                System.out.println("MediaModule title: " + mModule.getTitle());
-                System.out.println("MediaModule isAdult: " + mModule.isAdult());
-                /*
-                if (mModule.getMediaContent() != null) {
-                    for (int i = 0; i < mModule.getMediaContent().length; i++) {
-                        MediaContent mc = mModule.getMediaContent()[i];
-                        mThumbs = mc.getMediaThumbnails();
-                        if (mThumbs != null) {
-                            for (int n = 0; n < mThumbs.length; n++) {
-                                String imgUrl = 	mThumbs[n].getUrl();
-                                System.out.println("got MediaContentImage " + n + " img: " + imgUrl);
-                            }
-                        }
-                        System.out.println("MediaContent title:" + mc.getTitle());
-                        System.out.println("MediaContent text:" + mc.getText());
-         
-                    }
-         
-                }
-         
-            } else {
-                System.out.println("no MediaModule!");
-            }
-        }
+         * //You can test with blip tv or broadcast machine
+         * 
+         * String rss = "http://blip.tv/?1=1&&skin=rss";// // String rss = "http://openvision.tv/bm/rss.php?i=4"; // String rss =
+         * "http://api.search.yahoo.com/VideoSearchService/rss/videoSearch.xml?appid=yahoosearchvideorss&query=surfing&adult_ok=0";
+         * 
+         * 
+         * URLConnection uc = new URL(rss).openConnection(); String contentType = uc.getContentEncoding();
+         * 
+         * WireFeedInput input = new WireFeedInput();
+         * 
+         * XmlReader xmlReader = new XmlReader(uc.getInputStream(), contentType, true);
+         * 
+         * Channel chnl = (Channel)input.build(xmlReader);
+         * 
+         * String feedTitle = chnl.getTitle(); String feedDesc = chnl.getDescription();
+         * 
+         * 
+         * List items = chnl.getItems();
+         * 
+         * ListIterator li = items.listIterator(); Item item = null; Enclosure enc = null; MediaModule mModule = null;
+         * 
+         * while (li.hasNext()) {
+         * 
+         * item = (Item)li.next(); enc = (Enclosure)item.getEnclosures().get(0);
+         * 
+         * mModule = (MediaModule)item.getModule(MediaModule.URI);
+         * 
+         * List modules = item.getModules(); System.out.println("title: " + item.getTitle()); System.out.println("module count: " + modules.size());
+         * 
+         * if (mModule != null) { Thumbnail[] mThumbs = mModule.getMediaThumbnails();
+         * 
+         * if (mThumbs != null) { for (int i = 0; i < mThumbs.length; i++) { String imgUrl = mThumbs[i].getUrl(); System.out.println("got MediaModule img " + i
+         * + ": " + imgUrl); } }
+         * 
+         * System.out.println("MediaModule title: " + mModule.getTitle()); System.out.println("MediaModule isAdult: " + mModule.isAdult()); /* if
+         * (mModule.getMediaContent() != null) { for (int i = 0; i < mModule.getMediaContent().length; i++) { MediaContent mc = mModule.getMediaContent()[i];
+         * mThumbs = mc.getMediaThumbnails(); if (mThumbs != null) { for (int n = 0; n < mThumbs.length; n++) { String imgUrl = mThumbs[n].getUrl();
+         * System.out.println("got MediaContentImage " + n + " img: " + imgUrl); } } System.out.println("MediaContent title:" + mc.getTitle());
+         * System.out.println("MediaContent text:" + mc.getText());
+         * 
+         * }
+         * 
+         * }
+         * 
+         * } else { System.out.println("no MediaModule!"); } }
          */
     }
 }
-
diff --git a/src/test/java/org/rometools/feed/module/mediarss/types/TimeTest.java b/src/test/java/org/rometools/feed/module/mediarss/types/TimeTest.java
index d95d3df..c08e2dd 100644
--- a/src/test/java/org/rometools/feed/module/mediarss/types/TimeTest.java
+++ b/src/test/java/org/rometools/feed/module/mediarss/types/TimeTest.java
@@ -7,23 +7,24 @@
 
 package org.rometools.feed.module.mediarss.types;
 
-import org.rometools.feed.module.mediarss.types.Time;
-import junit.framework.*;
-import java.text.NumberFormat;
+import junit.framework.Assert;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 
 /**
- *
+ * 
  * @author cooper
  */
 public class TimeTest extends TestCase {
-    
-    public TimeTest(String testName) {
+
+    public TimeTest(final String testName) {
         super(testName);
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite(TimeTest.class);
-        
+        final TestSuite suite = new TestSuite(TimeTest.class);
+
         return suite;
     }
 
@@ -31,12 +32,12 @@ public class TimeTest extends TestCase {
      * Test of toString method, of class com.sun.syndication.feed.module.mediarss.types.Time.
      */
     public void testToString() {
-        Time t = new Time( "12:05:35.3");
-        System.out.println( t );
-        Time t2 = new Time( t.toString() );
-        this.assertEquals( t.toString(), t2.toString() );
-        System.out.println( t2 );
-        System.out.println( new Time( "3:54.00001").toString() );
+        final Time t = new Time("12:05:35.3");
+        System.out.println(t);
+        final Time t2 = new Time(t.toString());
+        Assert.assertEquals(t.toString(), t2.toString());
+        System.out.println(t2);
+        System.out.println(new Time("3:54.00001").toString());
     }
-    
+
 }
diff --git a/src/test/java/org/rometools/feed/module/opensearch/OpenSearchModuleTest.java b/src/test/java/org/rometools/feed/module/opensearch/OpenSearchModuleTest.java
index 42ea573..e6021bf 100644
--- a/src/test/java/org/rometools/feed/module/opensearch/OpenSearchModuleTest.java
+++ b/src/test/java/org/rometools/feed/module/opensearch/OpenSearchModuleTest.java
@@ -7,46 +7,50 @@
 
 package org.rometools.feed.module.opensearch;
 
-import org.rometools.feed.module.opensearch.OpenSearchModule;
+import java.io.File;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.rometools.feed.module.AbstractTestCase;
-import junit.framework.*;
+
 import com.sun.syndication.feed.module.Module;
 import com.sun.syndication.feed.synd.SyndFeed;
 import com.sun.syndication.io.SyndFeedInput;
 import com.sun.syndication.io.SyndFeedOutput;
-import java.io.File;
 
 /**
- *
+ * 
  * @author cooper
  */
 public class OpenSearchModuleTest extends AbstractTestCase {
-    
-    public OpenSearchModuleTest(String testName) {
+
+    public OpenSearchModuleTest(final String testName) {
         super(testName);
     }
-    
+
     public static Test suite() {
-        TestSuite suite = new TestSuite(OpenSearchModuleTest.class);
-        
+        final TestSuite suite = new TestSuite(OpenSearchModuleTest.class);
+
         return suite;
     }
-    
+
     public void testEndToEnd() throws Exception {
-        SyndFeedInput input = new SyndFeedInput();
-        File test = new File( super.getTestFile( "os") );
-        File[] files = test.listFiles();
-        for( int j=0; j < files.length; j++ ){
-            if( !files[j].getName().endsWith(".xml") )
+        final SyndFeedInput input = new SyndFeedInput();
+        final File test = new File(super.getTestFile("os"));
+        final File[] files = test.listFiles();
+        for (int j = 0; j < files.length; j++) {
+            if (!files[j].getName().endsWith(".xml")) {
                 continue;
-            SyndFeed feed =  input.build( files[j] );
-            Module m = feed.getModule( OpenSearchModule.URI );
-            SyndFeedOutput output = new SyndFeedOutput();
-            File outfile = new File( "target/" + files[j].getName() ) ;
-            output.output( feed, outfile );
-            SyndFeed feed2 = input.build( outfile );
-            assertEquals( m, feed2.getModule(OpenSearchModule.URI));
+            }
+            final SyndFeed feed = input.build(files[j]);
+            final Module m = feed.getModule(OpenSearchModule.URI);
+            final SyndFeedOutput output = new SyndFeedOutput();
+            final File outfile = new File("target/" + files[j].getName());
+            output.output(feed, outfile);
+            final SyndFeed feed2 = input.build(outfile);
+            assertEquals(m, feed2.getModule(OpenSearchModule.URI));
         }
     }
-    
+
 }
diff --git a/src/test/java/org/rometools/feed/module/photocast/io/GeneratorTest.java b/src/test/java/org/rometools/feed/module/photocast/io/GeneratorTest.java
index 7d42b67..f5ecc17 100644
--- a/src/test/java/org/rometools/feed/module/photocast/io/GeneratorTest.java
+++ b/src/test/java/org/rometools/feed/module/photocast/io/GeneratorTest.java
@@ -7,49 +7,54 @@
 
 package org.rometools.feed.module.photocast.io;
 
+import java.io.File;
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.rometools.feed.module.AbstractTestCase;
 import org.rometools.feed.module.photocast.PhotocastModule;
+
 import com.sun.syndication.feed.synd.SyndEntry;
 import com.sun.syndication.feed.synd.SyndFeed;
 import com.sun.syndication.io.SyndFeedInput;
 import com.sun.syndication.io.SyndFeedOutput;
-import java.io.File;
-import java.util.List;
-import junit.framework.*;
 
 /**
- *
+ * 
  * @author cooper
  */
 public class GeneratorTest extends AbstractTestCase {
-    
-    public GeneratorTest(String testName) {
+
+    public GeneratorTest(final String testName) {
         super(testName);
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite(GeneratorTest.class);
-        
+        final TestSuite suite = new TestSuite(GeneratorTest.class);
+
         return suite;
     }
 
     /**
      * Test of generate method, of class com.sun.syndication.feed.module.photocast.io.Generator.
      */
-    public void testGenerate() throws Exception{
-        SyndFeedInput input = new SyndFeedInput();
-	
-	SyndFeed feed = input.build(  new File(super.getTestFile( "index.rss" ) ) );
-        List entries = feed.getEntries();
-        for( int i =0; i < entries.size() ; i++ ){
-            System.out.println( ((SyndEntry)entries.get(i)).getModule( PhotocastModule.URI ) );
+    public void testGenerate() throws Exception {
+        final SyndFeedInput input = new SyndFeedInput();
+
+        final SyndFeed feed = input.build(new File(super.getTestFile("index.rss")));
+        final List entries = feed.getEntries();
+        for (int i = 0; i < entries.size(); i++) {
+            System.out.println(((SyndEntry) entries.get(i)).getModule(PhotocastModule.URI));
         }
-        SyndFeedOutput output = new SyndFeedOutput();
-	output.output( feed, new File( "target/index.rss" ) );
-        SyndFeed feed2 =input.build(  new File("target/index.rss" ) );
-        List entries2 = feed2.getEntries();
-        for( int i=0; i < entries.size(); i++ ){
-            assertEquals( "Module test", ((SyndEntry)entries.get(i)).getModule( PhotocastModule.URI ), ((SyndEntry)entries2.get(i)).getModule( PhotocastModule.URI ) );
+        final SyndFeedOutput output = new SyndFeedOutput();
+        output.output(feed, new File("target/index.rss"));
+        final SyndFeed feed2 = input.build(new File("target/index.rss"));
+        final List entries2 = feed2.getEntries();
+        for (int i = 0; i < entries.size(); i++) {
+            assertEquals("Module test", ((SyndEntry) entries.get(i)).getModule(PhotocastModule.URI),
+                    ((SyndEntry) entries2.get(i)).getModule(PhotocastModule.URI));
         }
     }
 
@@ -66,5 +71,5 @@ public class GeneratorTest extends AbstractTestCase {
     public void testGetNamespaceUri() {
         // TODO add your test code.
     }
-    
+
 }
diff --git a/src/test/java/org/rometools/feed/module/sle/GroupAndSortTest.java b/src/test/java/org/rometools/feed/module/sle/GroupAndSortTest.java
index c9f3bbb..9dcaf8b 100644
--- a/src/test/java/org/rometools/feed/module/sle/GroupAndSortTest.java
+++ b/src/test/java/org/rometools/feed/module/sle/GroupAndSortTest.java
@@ -7,30 +7,31 @@
 
 package org.rometools.feed.module.sle;
 
-import org.rometools.feed.module.sle.SleUtility;
-import org.rometools.feed.module.sle.SimpleListExtension;
-import org.rometools.feed.module.sle.SleEntry;
+import java.io.File;
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.rometools.feed.module.AbstractTestCase;
+
 import com.sun.syndication.feed.synd.SyndEntry;
 import com.sun.syndication.feed.synd.SyndFeed;
 import com.sun.syndication.io.SyndFeedInput;
-import java.io.File;
-import java.util.List;
-import junit.framework.*;
 
 /**
- *
+ * 
  * @author cooper
  */
 public class GroupAndSortTest extends AbstractTestCase {
-    
-    public GroupAndSortTest(String testName) {
+
+    public GroupAndSortTest(final String testName) {
         super(testName);
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite(GroupAndSortTest.class);
-        
+        final TestSuite suite = new TestSuite(GroupAndSortTest.class);
+
         return suite;
     }
 
@@ -38,73 +39,70 @@ public class GroupAndSortTest extends AbstractTestCase {
      * Test of sort method, of class com.sun.syndication.feed.module.sle.GroupAndSort.
      */
     public void testSort() throws Exception {
-        SyndFeedInput input = new SyndFeedInput();
-        SyndFeed feed = input.build( new File(super.getTestFile("data/bookexample.xml")));
-        SimpleListExtension sle = (SimpleListExtension) feed.getModule( SimpleListExtension.URI );
+        final SyndFeedInput input = new SyndFeedInput();
+        final SyndFeed feed = input.build(new File(super.getTestFile("data/bookexample.xml")));
+        final SimpleListExtension sle = (SimpleListExtension) feed.getModule(SimpleListExtension.URI);
 
+        List sortedEntries = SleUtility.sort(feed.getEntries(), sle.getSortFields()[1], true);
+        SyndEntry entry = (SyndEntry) sortedEntries.get(0);
+        assertEquals("Great Journeys of the Past", entry.getTitle());
+        sortedEntries = SleUtility.sort(feed.getEntries(), sle.getSortFields()[1], false);
+        entry = (SyndEntry) sortedEntries.get(0);
+        assertEquals("Horror Stories, vol 16", entry.getTitle());
+
+        sortedEntries = SleUtility.sort(feed.getEntries(), sle.getSortFields()[1], true);
+        entry = (SyndEntry) sortedEntries.get(0);
 
-        
-        List sortedEntries = SleUtility.sort( feed.getEntries(), sle.getSortFields()[1], true );
-        SyndEntry entry = (SyndEntry) sortedEntries.get( 0 );
-        assertEquals( "Great Journeys of the Past", entry.getTitle() );
-        sortedEntries = SleUtility.sort( feed.getEntries(), sle.getSortFields()[1], false );
-        entry = (SyndEntry) sortedEntries.get( 0 );
-        assertEquals( "Horror Stories, vol 16", entry.getTitle() );
-        
-        sortedEntries = SleUtility.sort( feed.getEntries(),  sle.getSortFields()[1], true );
-        entry = (SyndEntry) sortedEntries.get( 0 );
-        
         entry.setTitle("ZZZZZ");
-        SleUtility.initializeForSorting( feed );
-        System.out.println( feed.getEntries().size()+ " **Sorting on "+ sle.getSortFields()[2]);
-        
-        sortedEntries = SleUtility.sort( feed.getEntries(),  sle.getSortFields()[2], false );
-        System.out.println("Sorted: "+sortedEntries.size());
-        for(int i=0; i < sortedEntries.size(); i++){
+        SleUtility.initializeForSorting(feed);
+        System.out.println(feed.getEntries().size() + " **Sorting on " + sle.getSortFields()[2]);
+
+        sortedEntries = SleUtility.sort(feed.getEntries(), sle.getSortFields()[2], false);
+        System.out.println("Sorted: " + sortedEntries.size());
+        for (int i = 0; i < sortedEntries.size(); i++) {
             entry = (SyndEntry) sortedEntries.get(i);
-            System.out.println(i+" -- "+entry.getTitle());
-            SleEntry slent = (SleEntry) entry.getModule(SleEntry.URI);
-            for(int j = 0; j < slent.getSortValues().length; j++){
-                System.out.println(slent.getSortValues()[j].getElement()+" == "+slent.getSortValues()[j].getValue());
+            System.out.println(i + " -- " + entry.getTitle());
+            final SleEntry slent = (SleEntry) entry.getModule(SleEntry.URI);
+            for (int j = 0; j < slent.getSortValues().length; j++) {
+                System.out.println(slent.getSortValues()[j].getElement() + " == " + slent.getSortValues()[j].getValue());
             }
-            
+
         }
-        entry = (SyndEntry) sortedEntries.get( 0 );
-        System.out.println( entry.getTitle() );
-        assertEquals( "ZZZZZ", entry.getTitle() );
-        entry = (SyndEntry) sortedEntries.get( 1 );
-        System.out.println( entry.getTitle() );
-    
-        sortedEntries = SleUtility.sort( feed.getEntries(),  sle.getSortFields()[2], true );
-        entry = (SyndEntry) sortedEntries.get( 0 );
-        System.out.println( entry.getTitle() );
-        assertEquals( "Horror Stories, vol 16", entry.getTitle() );
-        entry = (SyndEntry) sortedEntries.get( 1 );
-        System.out.println( entry.getTitle() );
-        
-        sortedEntries = SleUtility.sortAndGroup( feed.getEntries(), sle.getGroupFields(), sle.getSortFields()[2], true );
-        entry = (SyndEntry) sortedEntries.get( 0 );
-        System.out.println( entry.getTitle() );
-        assertEquals( "Horror Stories, vol 16", entry.getTitle() );
-    
+        entry = (SyndEntry) sortedEntries.get(0);
+        System.out.println(entry.getTitle());
+        assertEquals("ZZZZZ", entry.getTitle());
+        entry = (SyndEntry) sortedEntries.get(1);
+        System.out.println(entry.getTitle());
+
+        sortedEntries = SleUtility.sort(feed.getEntries(), sle.getSortFields()[2], true);
+        entry = (SyndEntry) sortedEntries.get(0);
+        System.out.println(entry.getTitle());
+        assertEquals("Horror Stories, vol 16", entry.getTitle());
+        entry = (SyndEntry) sortedEntries.get(1);
+        System.out.println(entry.getTitle());
+
+        sortedEntries = SleUtility.sortAndGroup(feed.getEntries(), sle.getGroupFields(), sle.getSortFields()[2], true);
+        entry = (SyndEntry) sortedEntries.get(0);
+        System.out.println(entry.getTitle());
+        assertEquals("Horror Stories, vol 16", entry.getTitle());
+
     }
-    
 
     /**
      * Test of sort method, of class com.sun.syndication.feed.module.sle.GroupAndSort.
      */
     public void testSort2() throws Exception {
-        SyndFeedInput input = new SyndFeedInput();
-        SyndFeed feed = input.build( new File(super.getTestFile("data/YahooTopSongs.xml")));
-        SimpleListExtension sle = (SimpleListExtension) feed.getModule( SimpleListExtension.URI );
-        System.out.println( "Sorting on "+ sle.getSortFields()[0]);
-        List sortedEntries = SleUtility.sort( feed.getEntries(),  sle.getSortFields()[0], true );
-        for( int i=0; i < sortedEntries.size(); i++ ){
-            SyndEntry entry = (SyndEntry) sortedEntries.get(i);
-            System.out.println( entry.getTitle() );
+        final SyndFeedInput input = new SyndFeedInput();
+        final SyndFeed feed = input.build(new File(super.getTestFile("data/YahooTopSongs.xml")));
+        final SimpleListExtension sle = (SimpleListExtension) feed.getModule(SimpleListExtension.URI);
+        System.out.println("Sorting on " + sle.getSortFields()[0]);
+        final List sortedEntries = SleUtility.sort(feed.getEntries(), sle.getSortFields()[0], true);
+        for (int i = 0; i < sortedEntries.size(); i++) {
+            final SyndEntry entry = (SyndEntry) sortedEntries.get(i);
+            System.out.println(entry.getTitle());
         }
     }
-    
+
     /**
      * Test of group method, of class com.sun.syndication.feed.module.sle.GroupAndSort.
      */
@@ -118,5 +116,5 @@ public class GroupAndSortTest extends AbstractTestCase {
     public void testSortAndGroup() {
         // TODO add your test code.
     }
-    
+
 }
diff --git a/src/test/java/org/rometools/feed/module/sle/io/ModuleGeneratorTest.java b/src/test/java/org/rometools/feed/module/sle/io/ModuleGeneratorTest.java
index 2b16c01..1512f77 100644
--- a/src/test/java/org/rometools/feed/module/sle/io/ModuleGeneratorTest.java
+++ b/src/test/java/org/rometools/feed/module/sle/io/ModuleGeneratorTest.java
@@ -7,29 +7,23 @@
 
 package org.rometools.feed.module.sle.io;
 
-import junit.framework.*;
-import com.sun.syndication.feed.module.Module;
-import org.rometools.feed.module.sle.SimpleListExtension;
-import org.rometools.feed.module.sle.types.Group;
-import org.rometools.feed.module.sle.types.Sort;
-import java.util.HashSet;
-import java.util.Set;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 
 /**
- *
+ * 
  * @author cooper
  */
 public class ModuleGeneratorTest extends TestCase {
-    
-    public ModuleGeneratorTest(String testName) {
+
+    public ModuleGeneratorTest(final String testName) {
         super(testName);
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite(ModuleGeneratorTest.class);
-        
+        final TestSuite suite = new TestSuite(ModuleGeneratorTest.class);
+
         return suite;
     }
 
@@ -40,6 +34,4 @@ public class ModuleGeneratorTest extends TestCase {
         // TODO add your test code.
     }
 
-    
-    
 }
diff --git a/src/test/java/org/rometools/feed/module/sle/io/ModuleParserTest.java b/src/test/java/org/rometools/feed/module/sle/io/ModuleParserTest.java
index a07f4f2..1eabbd9 100644
--- a/src/test/java/org/rometools/feed/module/sle/io/ModuleParserTest.java
+++ b/src/test/java/org/rometools/feed/module/sle/io/ModuleParserTest.java
@@ -7,61 +7,63 @@
 
 package org.rometools.feed.module.sle.io;
 
+import java.io.File;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jdom2.Namespace;
 import org.rometools.feed.module.AbstractTestCase;
 import org.rometools.feed.module.sle.SimpleListExtension;
 import org.rometools.feed.module.sle.SleEntry;
 import org.rometools.feed.module.sle.types.Group;
 import org.rometools.feed.module.sle.types.Sort;
+
 import com.sun.syndication.feed.synd.SyndEntry;
 import com.sun.syndication.feed.synd.SyndFeed;
 import com.sun.syndication.io.SyndFeedInput;
-import java.io.File;
-import junit.framework.*;
-import org.jdom.Namespace;
 
 /**
- *
+ * 
  * @author cooper
  */
 public class ModuleParserTest extends AbstractTestCase {
-    
-    public ModuleParserTest(String testName) {
+
+    public ModuleParserTest(final String testName) {
         super(testName);
     }
-    
+
     public static Test suite() {
-        TestSuite suite = new TestSuite(ModuleParserTest.class);
-        
+        final TestSuite suite = new TestSuite(ModuleParserTest.class);
+
         return suite;
     }
-    
+
     /**
      * Test of parse method, of class com.sun.syndication.feed.module.sle.io.ModuleParser.
      */
     public void testParse() throws Exception {
-        SyndFeedInput input = new SyndFeedInput();
-        SyndFeed feed = input.build(new File(super.getTestFile("data/bookexample.xml")));
-        SimpleListExtension sle = (SimpleListExtension) feed.getModule( SimpleListExtension.URI );
-        //System.out.println( sle );
-        assertEquals( "list", sle.getTreatAs() );
-        Group[] groups = sle.getGroupFields();
-        assertEquals( "genre", groups[0].getElement() );
-        assertEquals( "Genre", groups[0].getLabel() );
-        Sort[] sorts = sle.getSortFields();
-        assertEquals( "Relevance", sorts[0].getLabel() );
-        assertTrue( sorts[0].getDefaultOrder() );
-        assertEquals ( sorts[1].getNamespace() , Namespace.getNamespace("http://www.example.com/book"));
-        assertEquals( sorts[1].getDataType() , Sort.DATE_TYPE );
-        assertEquals( sorts[1].getElement() , "firstedition" );
-        SyndEntry entry = (SyndEntry) feed.getEntries().get(0);
-        SleEntry sleEntry = (SleEntry) entry.getModule( SleEntry.URI );
-        System.out.println( sleEntry );
-        System.out.println( "getGroupByElement");
-        System.out.println( sleEntry.getGroupByElement( groups[0]));
-        System.out.println( "getSortByElement" );
-        System.out.println( sleEntry.getSortByElement( sorts[0] ) );
+        final SyndFeedInput input = new SyndFeedInput();
+        final SyndFeed feed = input.build(new File(super.getTestFile("data/bookexample.xml")));
+        final SimpleListExtension sle = (SimpleListExtension) feed.getModule(SimpleListExtension.URI);
+        // System.out.println( sle );
+        assertEquals("list", sle.getTreatAs());
+        final Group[] groups = sle.getGroupFields();
+        assertEquals("genre", groups[0].getElement());
+        assertEquals("Genre", groups[0].getLabel());
+        final Sort[] sorts = sle.getSortFields();
+        assertEquals("Relevance", sorts[0].getLabel());
+        assertTrue(sorts[0].getDefaultOrder());
+        assertEquals(sorts[1].getNamespace(), Namespace.getNamespace("http://www.example.com/book"));
+        assertEquals(sorts[1].getDataType(), Sort.DATE_TYPE);
+        assertEquals(sorts[1].getElement(), "firstedition");
+        final SyndEntry entry = feed.getEntries().get(0);
+        final SleEntry sleEntry = (SleEntry) entry.getModule(SleEntry.URI);
+        System.out.println(sleEntry);
+        System.out.println("getGroupByElement");
+        System.out.println(sleEntry.getGroupByElement(groups[0]));
+        System.out.println("getSortByElement");
+        System.out.println(sleEntry.getSortByElement(sorts[0]));
     }
-    
-    
-    
+
 }
diff --git a/src/test/java/org/rometools/feed/module/sse/SSEParserTest.java b/src/test/java/org/rometools/feed/module/sse/SSEParserTest.java
index 3cc742a..cd0bb9e 100644
--- a/src/test/java/org/rometools/feed/module/sse/SSEParserTest.java
+++ b/src/test/java/org/rometools/feed/module/sse/SSEParserTest.java
@@ -6,26 +6,6 @@
  */
 package org.rometools.feed.module.sse;
 
-import org.rometools.feed.module.sse.SSE091Generator;
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.sse.modules.Conflict;
-import org.rometools.feed.module.sse.modules.History;
-import org.rometools.feed.module.sse.modules.SSEModule;
-import org.rometools.feed.module.sse.modules.Sync;
-import com.sun.syndication.feed.rss.Item;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.SyndFeedOutput;
-import com.sun.syndication.io.XmlReader;
-import com.sun.syndication.io.impl.DateParser;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.jdom.Attribute;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
-
 import java.io.File;
 import java.net.URL;
 import java.util.ArrayList;
@@ -33,17 +13,40 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jdom2.Attribute;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+import org.rometools.feed.module.AbstractTestCase;
+import org.rometools.feed.module.sse.modules.Conflict;
+import org.rometools.feed.module.sse.modules.History;
+import org.rometools.feed.module.sse.modules.SSEModule;
+import org.rometools.feed.module.sse.modules.Sync;
+
+import com.sun.syndication.feed.rss.Item;
+import com.sun.syndication.feed.synd.SyndEntry;
+import com.sun.syndication.feed.synd.SyndFeed;
+import com.sun.syndication.io.SyndFeedInput;
+import com.sun.syndication.io.SyndFeedOutput;
+import com.sun.syndication.io.XmlReader;
+import com.sun.syndication.io.impl.DateParser;
+
 /**
  * Test to verify correctness of SSE subproject.
  */
 public class SSEParserTest extends AbstractTestCase {
-    public SSEParserTest(String testName) {
+    public SSEParserTest(final String testName) {
         super(testName);
     }
 
+    @Override
     protected void setUp() throws Exception {
     }
 
+    @Override
     protected void tearDown() throws Exception {
     }
 
@@ -59,33 +62,33 @@ public class SSEParserTest extends AbstractTestCase {
     }
 
     public void xtestParseGenerateV5() throws Exception {
-        URL feedURL = new File(getTestFile("xml/v/v5.xml")).toURL();
+        final URL feedURL = new File(getTestFile("xml/v/v5.xml")).toURL();
         // parse the document for comparison
-        SAXBuilder builder = new SAXBuilder();
-        Document directlyBuilt = builder.build(feedURL);
+        final SAXBuilder builder = new SAXBuilder();
+        final Document directlyBuilt = builder.build(feedURL);
 
         // generate the feed back into a document
-        SyndFeedInput input = new SyndFeedInput();
-        SyndFeed inputFeed = input.build(new XmlReader(feedURL));
-                                
-        SyndFeedOutput output = new SyndFeedOutput();
-        Document parsedAndGenerated = output.outputJDom(inputFeed);
+        final SyndFeedInput input = new SyndFeedInput();
+        final SyndFeed inputFeed = input.build(new XmlReader(feedURL));
 
-//        XMLOutputter outputter = new XMLOutputter();
-//        outputter.setFormat(Format.getPrettyFormat());
-//        outputter.output(directlyBuilt, new FileOutputStream("c:\\cygwin\\tmp\\sync-direct.xml"));
-//        outputter.output(parsedAndGenerated, new FileOutputStream("c:\\cygwin\\tmp\\sync-pg.xml"));
+        final SyndFeedOutput output = new SyndFeedOutput();
+        final Document parsedAndGenerated = output.outputJDom(inputFeed);
+
+        // XMLOutputter outputter = new XMLOutputter();
+        // outputter.setFormat(Format.getPrettyFormat());
+        // outputter.output(directlyBuilt, new FileOutputStream("c:\\cygwin\\tmp\\sync-direct.xml"));
+        // outputter.output(parsedAndGenerated, new FileOutputStream("c:\\cygwin\\tmp\\sync-pg.xml"));
 
         assertDocumentsEqual(directlyBuilt, parsedAndGenerated);
     }
 
     // TODO: probably should rip this out and use xunit instead
-    private void assertDocumentsEqual(Document one, Document two) {
+    private void assertDocumentsEqual(final Document one, final Document two) {
         assertEqualElements(one.getRootElement(), two.getRootElement());
     }
 
-    private void assertEqualElements(Element one, Element two) {
-        if ((one == two) || bothNull(one, two)) {
+    private void assertEqualElements(final Element one, final Element two) {
+        if (one == two || bothNull(one, two)) {
             return;
         }
 
@@ -94,26 +97,25 @@ public class SSEParserTest extends AbstractTestCase {
         asserEqualContent(one, two);
     }
 
-    private void assertNullEqual(String mesg, Object one, Object two) {
+    private void assertNullEqual(final String mesg, final Object one, final Object two) {
         assertTrue(mesg, nullEqual(one, two));
     }
 
-    private boolean nullEqual(Object one, Object two) {
-        return ((one == null) && (two == null)) ||
-                ((one != null) && (two != null));
+    private boolean nullEqual(final Object one, final Object two) {
+        return one == null && two == null || one != null && two != null;
     }
 
-    private boolean bothNull(Object one, Object two) {
+    private boolean bothNull(final Object one, final Object two) {
         return one == null && two == null;
     }
 
-    private void assertEqualAttributes(Element one, Element two) {
+    private void assertEqualAttributes(final Element one, final Element two) {
         assertTrue(equalAttributes(one, two, true));
     }
 
-    private boolean equalAttributes(Element one, Element two, boolean doAssert) {
-        List attrs1 = one.getAttributes();
-        List attrs2 = two.getAttributes();
+    private boolean equalAttributes(final Element one, final Element two, final boolean doAssert) {
+        final List attrs1 = one.getAttributes();
+        final List attrs2 = two.getAttributes();
 
         boolean equal = nullEqual(attrs1, attrs2);
         if (doAssert) {
@@ -125,16 +127,15 @@ public class SSEParserTest extends AbstractTestCase {
         }
 
         if (equal) {
-            for (Iterator oneIter = attrs1.iterator(); oneIter.hasNext();) {
+            for (final Iterator oneIter = attrs1.iterator(); oneIter.hasNext();) {
                 // compare the attributes in an order insensitive way
-                Attribute a1 = (Attribute) oneIter.next();
-                Attribute a2 = findAttribute(a1.getName(), attrs2);
+                final Attribute a1 = (Attribute) oneIter.next();
+                final Attribute a2 = findAttribute(a1.getName(), attrs2);
 
                 equal = a2 != null;
                 if (!equal) {
                     if (doAssert) {
-                        assertNotNull("no matching attribute for: " +
-                                one.getName() + "." + a1.getName() + "=" + a1.getValue(), a2);
+                        assertNotNull("no matching attribute for: " + one.getName() + "." + a1.getName() + "=" + a1.getValue(), a2);
                     }
                     break;
                 }
@@ -144,33 +145,28 @@ public class SSEParserTest extends AbstractTestCase {
 
                 equal = nullEqual(av1, av2);
                 if (!equal && doAssert) {
-                    assertNullEqual("attribute values not null equal: " +
-                            av1 + " != " + av2, av1, av2);
+                    assertNullEqual("attribute values not null equal: " + av1 + " != " + av2, av1, av2);
                 }
 
                 if (!bothNull(av1, av2)) {
-                    String a1Name = a1.getName();
+                    final String a1Name = a1.getName();
 
                     // this test is brittle, but its comprehensive
-                    if ("until".equals(a1Name) ||
-                            "since".equals(a1Name) ||
-                            "when".equals(a1Name)) {
-                        av1 = DateParser.parseRFC822((String)av1);
-                        av2 = DateParser.parseRFC822((String)av2);
+                    if ("until".equals(a1Name) || "since".equals(a1Name) || "when".equals(a1Name)) {
+                        av1 = DateParser.parseRFC822((String) av1);
+                        av2 = DateParser.parseRFC822((String) av2);
                     }
 
-                    assertTrue("unequal attributes:" +
-                            one.getName() + "." + a1.getName() + ": " +
-                            av1 + " != " + av2, av1.equals(av2));
+                    assertTrue("unequal attributes:" + one.getName() + "." + a1.getName() + ": " + av1 + " != " + av2, av1.equals(av2));
                 }
             }
         }
         return equal;
     }
 
-    private Attribute findAttribute(String name, List attrs) {
-        for (Iterator attrIter = attrs.iterator(); attrIter.hasNext();) {
-            Attribute a = (Attribute) attrIter.next();
+    private Attribute findAttribute(final String name, final List attrs) {
+        for (final Iterator attrIter = attrs.iterator(); attrIter.hasNext();) {
+            final Attribute a = (Attribute) attrIter.next();
             if (a.getName().equalsIgnoreCase(name)) {
                 return a;
             }
@@ -178,9 +174,9 @@ public class SSEParserTest extends AbstractTestCase {
         return null;
     }
 
-    private void asserEqualContent(Element one, Element two) {
-        List oneContent = one.getContent();
-        List twoContent = two.getContent();
+    private void asserEqualContent(final Element one, final Element two) {
+        final List oneContent = one.getContent();
+        final List twoContent = two.getContent();
         if (bothNull(oneContent, twoContent)) {
             return;
         }
@@ -189,40 +185,38 @@ public class SSEParserTest extends AbstractTestCase {
         assertEqualAttributes(one, two);
 
         // scan through the content to make sure each element is equal
-        for (Iterator oneIter = oneContent.iterator(); oneIter.hasNext();) {
-            Object content1 = oneIter.next();
+        for (final Iterator oneIter = oneContent.iterator(); oneIter.hasNext();) {
+            final Object content1 = oneIter.next();
             if (content1 instanceof Element) {
-                Element e1 = (Element)content1;
+                final Element e1 = (Element) content1;
 
                 boolean foundEqual = false;
-                List messages = new ArrayList();
-                for (Iterator twoIter = twoContent.iterator(); twoIter.hasNext();) {
-                    Object o = twoIter.next();
+                final List messages = new ArrayList();
+                for (final Iterator twoIter = twoContent.iterator(); twoIter.hasNext();) {
+                    final Object o = twoIter.next();
                     if (o instanceof Element) {
-                        Element e2 = (Element)o;
+                        final Element e2 = (Element) o;
 
                         try {
                             // have to check all elements to be order insensitive
-                            if (e1.getName().equals(e2.getName())
-                                    && equalAttributes(e1, e2, false))
-                            {
+                            if (e1.getName().equals(e2.getName()) && equalAttributes(e1, e2, false)) {
                                 assertEqualElements(e1, e2);
                                 foundEqual = true;
                                 messages.clear();
                                 break;
                             }
-                        } catch (Error e) {
+                        } catch (final Error e) {
                             messages.add(e.getMessage());
                         }
                     }
                 }
 
-//                if (!foundEqual) {
-//                    // show accumulated error messages
-//                    for (Iterator mesgIter = messages.iterator(); mesgIter.hasNext();) {
-//                        System.out.println((String) mesgIter.next());
-//                        }
-//                }
+                // if (!foundEqual) {
+                // // show accumulated error messages
+                // for (Iterator mesgIter = messages.iterator(); mesgIter.hasNext();) {
+                // System.out.println((String) mesgIter.next());
+                // }
+                // }
 
                 // look for the content in the other tree
                 assertTrue("could not find matching element for: " + one.getName(), foundEqual);
@@ -232,43 +226,44 @@ public class SSEParserTest extends AbstractTestCase {
 
     /**
      * Assure v5 file parsed correctly.
+     * 
      * @throws Exception
      */
     public void xtestV5() throws Exception {
-        File feed = new File(getTestFile("xml/v/v5.xml"));
-        SyndFeedInput input = new SyndFeedInput();
-        SyndFeed syndfeed = input.build(new XmlReader(feed.toURL()));
+        final File feed = new File(getTestFile("xml/v/v5.xml"));
+        final SyndFeedInput input = new SyndFeedInput();
+        final SyndFeed syndfeed = input.build(new XmlReader(feed.toURL()));
 
-        List entries = syndfeed.getEntries();
-        Iterator it = entries.iterator();
+        final List entries = syndfeed.getEntries();
+        final Iterator it = entries.iterator();
 
         for (int id = 101; it.hasNext() && id <= 113; id++) {
-            SyndEntry entry = (SyndEntry) it.next();
-            Sync sync = (Sync) entry.getModule(SSEModule.SSE_SCHEMA_URI);
+            final SyndEntry entry = (SyndEntry) it.next();
+            final Sync sync = (Sync) entry.getModule(SSEModule.SSE_SCHEMA_URI);
             assertEquals(String.valueOf(id), sync.getId());
 
-            History history = sync.getHistory();
+            final History history = sync.getHistory();
             assertNotNull(history);
 
-            Date when = history.getWhen();
+            final Date when = history.getWhen();
             assertNotNull(when);
-            Date testDate = DateParser.parseRFC822("Fri, 6 Jan 2006 19:24:09 GMT");
+            final Date testDate = DateParser.parseRFC822("Fri, 6 Jan 2006 19:24:09 GMT");
             assertEquals(testDate, when);
         }
 
         for (int ep = 1; ep <= 2; ep++) {
             for (int i = 100; i < 102; i++) {
-                SyndEntry entry = (SyndEntry) it.next();
-                Sync sync = (Sync) entry.getModule(SSEModule.SSE_SCHEMA_URI);
-                String id = sync.getId();
+                final SyndEntry entry = (SyndEntry) it.next();
+                final Sync sync = (Sync) entry.getModule(SSEModule.SSE_SCHEMA_URI);
+                final String id = sync.getId();
                 assertEquals("ep" + ep + "." + i, id);
 
                 if (id.equals("ep1.100")) {
-                    List conflicts = sync.getConflicts();
+                    final List conflicts = sync.getConflicts();
                     assertNotNull(conflicts);
 
-                    Conflict conflict = (Conflict) conflicts.get(0);
-                    Item conflictItem = conflict.getItem();
+                    final Conflict conflict = (Conflict) conflicts.get(0);
+                    final Item conflictItem = conflict.getItem();
 
                     assertEquals(conflictItem.getTitle(), "Phish - Coventry Live (the last *good* concert)");
                     assertEquals(conflictItem.getDescription().getValue(), "All songs");
diff --git a/src/test/java/org/rometools/feed/module/yahooweather/io/WeahterGeneratorTest.java b/src/test/java/org/rometools/feed/module/yahooweather/io/WeahterGeneratorTest.java
index 36c77c2..cefcfeb 100644
--- a/src/test/java/org/rometools/feed/module/yahooweather/io/WeahterGeneratorTest.java
+++ b/src/test/java/org/rometools/feed/module/yahooweather/io/WeahterGeneratorTest.java
@@ -7,64 +7,68 @@
 
 package org.rometools.feed.module.yahooweather.io;
 
+import java.io.File;
+
+import junit.framework.Assert;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.rometools.feed.module.AbstractTestCase;
+import org.rometools.feed.module.yahooweather.YWeatherModule;
+
 import com.sun.syndication.feed.synd.SyndEntry;
 import com.sun.syndication.feed.synd.SyndFeed;
 import com.sun.syndication.io.SyndFeedInput;
 import com.sun.syndication.io.SyndFeedOutput;
-import junit.framework.*;
-import org.rometools.feed.module.yahooweather.YWeatherModule;
-import java.io.File;
 
 /**
- *
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class WeahterGeneratorTest extends AbstractTestCase {
-    
-    public WeahterGeneratorTest(String testName) {
-	super(testName);
+
+    public WeahterGeneratorTest(final String testName) {
+        super(testName);
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite(WeahterGeneratorTest.class);
-        
+        final TestSuite suite = new TestSuite(WeahterGeneratorTest.class);
+
         return suite;
     }
 
-        /**
+    /**
      * Test of generate method, of class com.totsp.xml.syndication.base.io.SlashGenerator.
      */
     public void testGenerate() throws Exception {
-	System.out.println("testGenerate");
-	SyndFeedInput input = new SyndFeedInput();
-	SyndFeedOutput output = new SyndFeedOutput();
-	File testDir = new File(super.getTestFile( "xml"));
-	File[] testFiles = testDir.listFiles();
-	for( int h=0; h < testFiles.length; h++){
-	    if( !testFiles[h].getName().endsWith(".xml"))
-		continue;
-	    System.out.println("processing"+ testFiles[h]);
-	    SyndFeed feed = input.build(  testFiles[h] );	    
-	    output.output( feed, new File( "target/"+testFiles[h].getName())  );
-	    SyndFeed feed2 = input.build( new File("target/"+testFiles[h].getName()) );
-            {
-                YWeatherModule weather = (YWeatherModule) feed.getModule( YWeatherModule.URI );
-		YWeatherModule weather2 = (YWeatherModule) feed2.getModule( YWeatherModule.URI );
-		this.assertEquals( testFiles[h].getName(), weather, weather2 );
-            
+        System.out.println("testGenerate");
+        final SyndFeedInput input = new SyndFeedInput();
+        final SyndFeedOutput output = new SyndFeedOutput();
+        final File testDir = new File(super.getTestFile("xml"));
+        final File[] testFiles = testDir.listFiles();
+        for (int h = 0; h < testFiles.length; h++) {
+            if (!testFiles[h].getName().endsWith(".xml")) {
+                continue;
             }
-	    for( int i= 0; i < feed.getEntries().size() ; i++ ){
-		SyndEntry entry = (SyndEntry) feed.getEntries().get(i);
-		SyndEntry entry2 = (SyndEntry) feed2.getEntries().get(i);
-		YWeatherModule weather = (YWeatherModule) entry.getModule( YWeatherModule.URI );
-		YWeatherModule weather2 = (YWeatherModule) entry2.getModule( YWeatherModule.URI );
-		this.assertEquals( testFiles[h].getName(), weather, weather2 );
-	    }
-	}	
-	
+            System.out.println("processing" + testFiles[h]);
+            final SyndFeed feed = input.build(testFiles[h]);
+            output.output(feed, new File("target/" + testFiles[h].getName()));
+            final SyndFeed feed2 = input.build(new File("target/" + testFiles[h].getName()));
+            {
+                final YWeatherModule weather = (YWeatherModule) feed.getModule(YWeatherModule.URI);
+                final YWeatherModule weather2 = (YWeatherModule) feed2.getModule(YWeatherModule.URI);
+                Assert.assertEquals(testFiles[h].getName(), weather, weather2);
+
+            }
+            for (int i = 0; i < feed.getEntries().size(); i++) {
+                final SyndEntry entry = feed.getEntries().get(i);
+                final SyndEntry entry2 = feed2.getEntries().get(i);
+                final YWeatherModule weather = (YWeatherModule) entry.getModule(YWeatherModule.URI);
+                final YWeatherModule weather2 = (YWeatherModule) entry2.getModule(YWeatherModule.URI);
+                Assert.assertEquals(testFiles[h].getName(), weather, weather2);
+            }
+        }
+
     }
 
-   
-    
 }
diff --git a/src/test/java/org/rometools/feed/module/yahooweather/io/WeatherModuleParserTest.java b/src/test/java/org/rometools/feed/module/yahooweather/io/WeatherModuleParserTest.java
index 974fe9e..4b81cda 100644
--- a/src/test/java/org/rometools/feed/module/yahooweather/io/WeatherModuleParserTest.java
+++ b/src/test/java/org/rometools/feed/module/yahooweather/io/WeatherModuleParserTest.java
@@ -6,72 +6,75 @@
  */
 
 package org.rometools.feed.module.yahooweather.io;
-import org.rometools.feed.module.yahooweather.io.WeatherModuleParser;
+
+import java.io.File;
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.rometools.feed.module.AbstractTestCase;
+import org.rometools.feed.module.yahooweather.YWeatherEntryModule;
+import org.rometools.feed.module.yahooweather.YWeatherModule;
+import org.rometools.feed.module.yahooweather.YWeatherModuleImpl;
+
 import com.sun.syndication.feed.synd.SyndEntry;
 import com.sun.syndication.feed.synd.SyndFeed;
 import com.sun.syndication.io.SyndFeedInput;
-import junit.framework.*;
-import org.rometools.feed.module.yahooweather.YWeatherModule;
-import org.rometools.feed.module.yahooweather.YWeatherEntryModule;
-import org.rometools.feed.module.yahooweather.YWeatherModuleImpl;
-import java.io.File;
-import java.util.List;
+
 /**
- *
+ * 
  * @author Robert "kebernet" Cooper
  */
 public class WeatherModuleParserTest extends AbstractTestCase {
-    
-    public WeatherModuleParserTest(String testName) {
-	super(testName);
+
+    public WeatherModuleParserTest(final String testName) {
+        super(testName);
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite(WeatherModuleParserTest.class);
-        
+        final TestSuite suite = new TestSuite(WeatherModuleParserTest.class);
+
         return suite;
     }
 
     public void testGetNamespaceUri() {
-        WeatherModuleParser instance = new WeatherModuleParser();        
-        String result = instance.getNamespaceUri();
+        final WeatherModuleParser instance = new WeatherModuleParser();
+        final String result = instance.getNamespaceUri();
         assertEquals(YWeatherModule.URI, result);
     }
 
     public void testQuickParse() throws Exception {
         System.out.println("testParse");
-	    SyndFeedInput input = new SyndFeedInput();
-	    File testDir = new File(super.getTestFile( "xml"));
-	    File[] testFiles = testDir.listFiles();
-	    for( int h=0; h < testFiles.length; h++){
-		if( !testFiles[h].getName().endsWith(".xml"))
-		    continue;
-		
-		SyndFeed feed = input.build(  testFiles[h] );
-		List entries = feed.getEntries();
-		for( int i=0 ; i< entries.size(); i++ ){
-		    SyndEntry entry = (SyndEntry) entries.get(i);
-		    System.out.println( entry.getModules().size() );
-		    for( int j=0; j < entry.getModules().size() ; j++ ){
-			System.out.println( entry.getModules().get(j).getClass() );
-			if( entry.getModules().get(j) instanceof YWeatherModule ){
-			    YWeatherModule base = (YWeatherModule) entry.getModules().get(j);
-                            assertTrue( ((YWeatherEntryModule) base).getForecasts().length > 0);
-			    System.out.println( testFiles[h].getName());
-			    System.out.println( super.beanToString( base , false ));
-                            
-                            YWeatherEntryModule module2 = new YWeatherModuleImpl();
-                            module2.copyFrom( base );
-                            assertEquals( ((YWeatherEntryModule) base).getForecasts().length, 
-                                    module2.getForecasts().length );
-                            
-			}
-		    }
-		}
-	    }
+        final SyndFeedInput input = new SyndFeedInput();
+        final File testDir = new File(super.getTestFile("xml"));
+        final File[] testFiles = testDir.listFiles();
+        for (int h = 0; h < testFiles.length; h++) {
+            if (!testFiles[h].getName().endsWith(".xml")) {
+                continue;
+            }
+
+            final SyndFeed feed = input.build(testFiles[h]);
+            final List entries = feed.getEntries();
+            for (int i = 0; i < entries.size(); i++) {
+                final SyndEntry entry = (SyndEntry) entries.get(i);
+                System.out.println(entry.getModules().size());
+                for (int j = 0; j < entry.getModules().size(); j++) {
+                    System.out.println(entry.getModules().get(j).getClass());
+                    if (entry.getModules().get(j) instanceof YWeatherModule) {
+                        final YWeatherModule base = (YWeatherModule) entry.getModules().get(j);
+                        assertTrue(((YWeatherEntryModule) base).getForecasts().length > 0);
+                        System.out.println(testFiles[h].getName());
+                        System.out.println(super.beanToString(base, false));
+
+                        final YWeatherEntryModule module2 = new YWeatherModuleImpl();
+                        module2.copyFrom(base);
+                        assertEquals(((YWeatherEntryModule) base).getForecasts().length, module2.getForecasts().length);
+
+                    }
+                }
+            }
+        }
     }
-    
-    
-	
+
 }