diff --git a/pom.xml b/pom.xml index db45570..4e79063 100644 --- a/pom.xml +++ b/pom.xml @@ -45,9 +45,9 @@ test - rome + org.rometools rome - 1.0 + 1.1-SNAPSHOT compile @@ -66,8 +66,8 @@ maven-compiler-plugin 2.0.2 - 1.4 - 1.4 + 1.5 + 1.5 ${project.build.sourceEncoding} 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 f0a62d5..15b4b6d 100644 --- a/src/main/java/org/rometools/feed/module/content/ContentModule.java +++ b/src/main/java/org/rometools/feed/module/content/ContentModule.java @@ -40,6 +40,7 @@ */ package org.rometools.feed.module.content; +import com.sun.syndication.feed.module.Module; import java.util.List; @@ -47,7 +48,7 @@ import java.util.List; * @version $Revision: 1.1 $ * @author Robert "kebernet" Cooper */ -public interface ContentModule extends com.sun.syndication.feed.module.Module { +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#"; @@ -63,10 +64,6 @@ public interface ContentModule extends com.sun.syndication.feed.module.Module { */ public void setEncodeds(List encodeds); - public void copyFrom(Object obj); - - public Class getInterface(); - public String getUri(); public String toString(String str); 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 c37f211..d0f1e74 100644 --- a/src/main/java/org/rometools/feed/module/content/ContentModuleImpl.java +++ b/src/main/java/org/rometools/feed/module/content/ContentModuleImpl.java @@ -43,6 +43,7 @@ */ package org.rometools.feed.module.content; +import com.sun.syndication.feed.CopyFrom; import java.util.ArrayList; import java.util.List; @@ -73,7 +74,7 @@ public class ContentModuleImpl extends com.sun.syndication.feed.module.ModuleImp this.encodeds = encodeds; } - public void copyFrom(Object obj) { + public void copyFrom(CopyFrom obj) { ContentModule cm = (ContentModule) obj; this.setEncodeds(cm.getEncodeds()); this.setContentItems(cm.getContentItems()); diff --git a/src/main/java/org/rometools/feed/module/georss/GeoRSSModule.java b/src/main/java/org/rometools/feed/module/georss/GeoRSSModule.java index bab2a15..679e5f8 100644 --- a/src/main/java/org/rometools/feed/module/georss/GeoRSSModule.java +++ b/src/main/java/org/rometools/feed/module/georss/GeoRSSModule.java @@ -16,6 +16,7 @@ */ package org.rometools.feed.module.georss; +import com.sun.syndication.feed.CopyFrom; import org.jdom.Namespace; import com.sun.syndication.feed.module.ModuleImpl; @@ -124,7 +125,7 @@ public abstract class GeoRSSModule extends ModuleImpl implements Cloneable { * * @see com.sun.syndication.feed.CopyFrom#copyFrom(java.lang.Object) */ - public void copyFrom(Object obj) { + public void copyFrom(CopyFrom obj) { GeoRSSModule geoRSSModule = (GeoRSSModule) obj; geometry = geoRSSModule.getGeometry(); try { 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 e01dc2a..eb26c06 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/MediaEntryModuleImpl.java +++ b/src/main/java/org/rometools/feed/module/mediarss/MediaEntryModuleImpl.java @@ -21,6 +21,7 @@ */ package org.rometools.feed.module.mediarss; +import com.sun.syndication.feed.CopyFrom; import java.io.Serializable; import com.sun.syndication.feed.impl.EqualsBean; @@ -85,6 +86,7 @@ public class MediaEntryModuleImpl extends MediaModuleImpl return mediaGroups; } + @Override public Object clone() { MediaEntryModuleImpl m = new MediaEntryModuleImpl(); m.setMediaContents((MediaContent[]) mediaContents.clone()); @@ -96,21 +98,33 @@ public class MediaEntryModuleImpl extends MediaModuleImpl return m; } + @Override public boolean equals(Object obj) { EqualsBean eBean = new EqualsBean(MediaEntryModuleImpl.class, this); return eBean.beanEquals(obj); } + @Override public int hashCode() { EqualsBean equals = new EqualsBean(MediaEntryModuleImpl.class, this); return equals.beanHashCode(); } + @Override public String toString() { ToStringBean tsBean = new ToStringBean(MediaEntryModuleImpl.class, this); return tsBean.toString(); } + + public void copyFrom(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()); + } } 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 f8035aa..7cddc92 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,6 +14,7 @@ */ 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; @@ -124,7 +125,7 @@ public class OpenSearchModuleImpl extends ModuleImpl implements OpenSearchModule /* (non-Javadoc) * @see com.sun.syndication.feed.CopyFrom#copyFrom(java.lang.Object) */ - public void copyFrom(Object obj) { + public void copyFrom(CopyFrom obj) { OpenSearchModule osm = (OpenSearchModuleImpl) obj; setTotalResults(osm.getTotalResults()); 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 7c0772b..916669f 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; /** @@ -94,7 +95,7 @@ public class SlashImpl implements Slash { - public void copyFrom(Object object) { + public void copyFrom(CopyFrom object) { Slash source =(Slash) object; this.setHitParade( arrayCopy( source.getHitParade() )); this.setComments( source.getComments() ); 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 2386a2f..73381bb 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,5 +1,6 @@ package org.rometools.feed.module.sse.modules; +import com.sun.syndication.feed.CopyFrom; import com.sun.syndication.feed.rss.Item; import java.util.Date; @@ -42,7 +43,7 @@ public class Conflict extends SSEModule { private String by; private Item conflictItem; - public void copyFrom(Object obj) { + public void copyFrom(CopyFrom obj) { Conflict conflict = (Conflict)obj; conflict.when = when == null ? null : (Date) when.clone(); conflict.by = by; 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 d316da6..14f08ec 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 @@ -1,5 +1,7 @@ package org.rometools.feed.module.sse.modules; +import com.sun.syndication.feed.CopyFrom; + /** * element within *

@@ -8,7 +10,7 @@ package org.rometools.feed.module.sse.modules; public class Conflicts extends SSEModule { public static final String NAME = "conflicts"; - public void copyFrom(Object obj) { + public void copyFrom(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 a0366a6..6bd6c3d 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,5 +1,6 @@ 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; @@ -24,7 +25,7 @@ public class History extends SSEModule { public History() { } - public void copyFrom(Object other) { + public void copyFrom(CopyFrom other) { History otherHistory = (History)other; when = otherHistory.when == null ? null : (Date) otherHistory.when.clone(); // dont copy immutable 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 448e3b5..69f56df 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,5 +1,6 @@ package org.rometools.feed.module.sse.modules; +import com.sun.syndication.feed.CopyFrom; import java.util.Date; /** @@ -37,7 +38,7 @@ public class Related extends SSEModule { public static final String TYPE_ATTRIBUTE = "type"; public static final String UNTIL_ATTRIBUTE = "until"; - public void copyFrom(Object obj) { + public void copyFrom(CopyFrom obj) { Related related = (Related)obj; related.link = link; related.since = since == null ? null : (Date) since.clone(); 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 b1d1f7a..a7735eb 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,5 +1,6 @@ package org.rometools.feed.module.sse.modules; +import com.sun.syndication.feed.CopyFrom; import com.sun.syndication.feed.module.Module; import org.jdom.Namespace; @@ -49,5 +50,5 @@ public abstract class SSEModule implements Module { return clone; } - public abstract void copyFrom(Object obj); + public abstract void copyFrom(CopyFrom obj); } 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 b640f22..ce11ab4 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,5 +1,6 @@ package org.rometools.feed.module.sse.modules; +import com.sun.syndication.feed.CopyFrom; import java.util.Date; /** @@ -30,7 +31,7 @@ public class Sharing extends SSEModule { private Date until; private Related related; - public void copyFrom(Object obj) { + public void copyFrom(CopyFrom obj) { Sharing sharing = (Sharing)obj; ordered = sharing.ordered; since = sharing.since == null ? null : (Date) sharing.since.clone(); 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 d9055d1..e0db7de 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,5 +1,6 @@ package org.rometools.feed.module.sse.modules; +import com.sun.syndication.feed.CopyFrom; import java.util.ArrayList; import java.util.List; @@ -26,7 +27,7 @@ public class Sync extends SSEModule { private History history; private List conflicts; - public void copyFrom(Object obj) { + public void copyFrom(CopyFrom obj) { Sync sync = (Sync)obj; deleted = sync.deleted; version = sync.version; 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 e0a7132..13d39d1 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,5 +1,6 @@ package org.rometools.feed.module.sse.modules; +import com.sun.syndication.feed.CopyFrom; import java.util.Date; /** @@ -13,7 +14,7 @@ public class Update extends SSEModule { private Date when; private String by; - public void copyFrom(Object other) { + public void copyFrom(CopyFrom other) { Update otherUpdate = (Update)other; otherUpdate.when = when == null ? null : (Date) when.clone(); // dont copy immutable 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 fb4fabd..3dc2013 100644 --- a/src/main/java/org/rometools/feed/module/yahooweather/YWeatherModuleImpl.java +++ b/src/main/java/org/rometools/feed/module/yahooweather/YWeatherModuleImpl.java @@ -35,6 +35,7 @@ */ 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; @@ -68,7 +69,7 @@ public class YWeatherModuleImpl extends ModuleImpl return CopyFromInterface.class; } - public void copyFrom(Object o) { + public void copyFrom(CopyFrom o) { YWeatherModuleImpl from = (YWeatherModuleImpl) o; this.setAstronomy((from.getAstronomy() != null) ? (Astronomy) from.getAstronomy().clone() : null);