roller/src/org/roller/business ExportWebsiteData.java,1.4,1.5

Update of /cvsroot/roller/roller/src/org/roller/business
In directory sc8-pr-cvs1:/tmp/cvs-serv8886/src/org/roller/business

Modified Files:
        ExportWebsiteData.java 
Log Message:
Oops, hierarchical cats didn't work with Castor. Now they do.

Index: ExportWebsiteData.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/business/ExportWebsiteData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ExportWebsiteData.java      1 Dec 2003 01:18:49 -0000       1.4
--- ExportWebsiteData.java      14 Jan 2004 04:10:38 -0000      1.5
***************
*** 25,29 ****
     protected java.util.Vector weblogCategories;
     protected java.util.Vector weblogEntries;
-    protected java.util.Vector newsfeeds;
     protected java.lang.String editorPage;
  
--- 25,28 ----
***************
*** 44,48 ****
        this.weblogCategories = weblogCategories;
        this.weblogEntries = weblogEntries;
-       this.newsfeeds = newsfeeds;
        this.editorPage = editorPage;
     }
--- 43,46 ----
***************
*** 60,64 ****
        this.weblogCategories = otherData.weblogCategories;
        this.weblogEntries = otherData.weblogEntries;
-       this.newsfeeds = otherData.newsfeeds;
        this.editorPage = otherData.editorPage;
  
--- 58,61 ----
***************
*** 201,218 ****
     }
  
-    /** @castor:field type="org.roller.pojos.NewsfeedData" 
-      *   collection="vector" set-method="setNewsfeeds" 
-      * @castor:field-xml name="newsfeed"
-      * @castor:field-sql many-key="websiteid" 
-      */
-    public java.util.Vector getNewsfeeds()
-    {
-       return this.newsfeeds;
-    }
-    public void setNewsfeeds( java.util.Vector newsfeeds )
-    {
-       this.newsfeeds = newsfeeds;
-    }
- 
     /** @castor:field set-method="setEditorPage"
       * @castor:field-sql name="editorpage" sql-dirty="check" dirty="check" 
--- 198,201 ----
***************
*** 232,236 ****
        StringBuffer str = new StringBuffer("{");
  
!       str.append("id=" + id + " " + "userId=" + userId + " " + 
"defaultPageId=" + defaultPageId + " " + "weblogDayPageId=" + weblogDayPageId + 
" " + "name=" + name + " " + "description=" + description + " " + "pages=" + 
pages + " " + "folders=" + folders + " " + "weblogCategories=" + 
weblogCategories + " " + "weblogEntries=" + weblogEntries + " " + "newsfeeds=" 
+ newsfeeds + " " + "editorPage=" + editorPage);
        str.append('}');
  
--- 215,219 ----
        StringBuffer str = new StringBuffer("{");
  
!       str.append("id=" + id + " " + "userId=" + userId + " " + 
"defaultPageId=" + defaultPageId + " " + "weblogDayPageId=" + weblogDayPageId + 
" " + "name=" + name + " " + "description=" + description + " " + "pages=" + 
pages + " " + "folders=" + folders + " " + "weblogCategories=" + 
weblogCategories + " " + "weblogEntries=" + weblogEntries + " "  + " " + 
"editorPage=" + editorPage);
        str.append('}');
  
***************
*** 325,336 ****
              lEquals = lEquals && this.weblogEntries.equals( 
lTest.weblogEntries );
           }
-          if( this.newsfeeds == null )
-          {
-             lEquals = lEquals && ( lTest.newsfeeds == null );
-          }
-          else
-          {
-             lEquals = lEquals && this.newsfeeds.equals( lTest.newsfeeds );
-          }
           if( this.editorPage == null )
           {
--- 308,311 ----
***************
*** 363,367 ****
        result = 37*result + ((this.weblogCategories != null) ? 
this.weblogCategories.hashCode() : 0);
        result = 37*result + ((this.weblogEntries != null) ? 
this.weblogEntries.hashCode() : 0);
-       result = 37*result + ((this.newsfeeds != null) ? 
this.newsfeeds.hashCode() : 0);
        result = 37*result + ((this.editorPage != null) ? 
this.editorPage.hashCode() : 0);
        return result;
--- 338,341 ----
***************
*** 394,399 ****
        this.weblogEntries = ((ExportWebsiteData)otherData).weblogEntries;
  
-       this.newsfeeds = ((ExportWebsiteData)otherData).newsfeeds;
- 
        this.editorPage = ((ExportWebsiteData)otherData).editorPage;
     }
--- 368,371 ----




-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html