Update to work with ROME 1.1

pom.xml

@@ -45,9 +45,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>rome</groupId>
+            <groupId>org.rometools</groupId>
             <artifactId>rome</artifactId>
-            <version>1.0</version>
+            <version>1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
@@ -66,8 +66,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.0.2</version>
                 <configuration>
-                    <source>1.4</source>
+                    <source>1.5</source>
-                    <target>1.4</target>
+                    <target>1.5</target>
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>

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  <a href="mailto:cooper@screaming-penguin.com">Robert "kebernet" Cooper</a>
  */
-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);

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());

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 {

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());
+    }
 }

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());

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() );

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;

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;
+
 /**
  * <sx:conflicts> element within <sx:sync>
  * <p>
@@ -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
     }
 }

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

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();

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);
 }

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();

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;

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

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);