roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r494698 - in /incubator/roller/trunk/src/org/apache/roller/pojos: FolderData.java WeblogCategoryData.java
Date Wed, 10 Jan 2007 03:29:37 GMT
Author: clr
Date: Tue Jan  9 19:29:37 2007
New Revision: 494698

URL: http://svn.apache.org/viewvc?view=rev&rev=494698
Log:
Roll back managed relationship changes from revision 492013

Modified:
    incubator/roller/trunk/src/org/apache/roller/pojos/FolderData.java
    incubator/roller/trunk/src/org/apache/roller/pojos/WeblogCategoryData.java

Modified: incubator/roller/trunk/src/org/apache/roller/pojos/FolderData.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/FolderData.java?view=diff&rev=494698&r1=494697&r2=494698
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/pojos/FolderData.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/pojos/FolderData.java Tue Jan  9 19:29:37
2007
@@ -84,16 +84,6 @@
         } else {
             this.path = parent.getPath() + "/" + name;
         }
-
-        this.parentFolder = parent;
-        // Relationships need to be maintained from both sides
-        if(parent != null) {
-            // The following triggers this.hashCode(), which is calculated 
-            // based on this.path
-            // It needs to happen after this.path is initialized
-            parent.childFolders.add(this);
-        }
-
     }
     
     

Modified: incubator/roller/trunk/src/org/apache/roller/pojos/WeblogCategoryData.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/WeblogCategoryData.java?view=diff&rev=494698&r1=494697&r2=494698
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/pojos/WeblogCategoryData.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/pojos/WeblogCategoryData.java Tue Jan  9
19:29:37 2007
@@ -71,6 +71,7 @@
         this.image = image;
         
         this.website = website;
+        this.parentCategory = parent;
 
         // calculate path
         if(parent == null) {
@@ -80,16 +81,6 @@
         } else {
             this.path = parent.getPath() + "/" + name;
         }
-
-        this.parentCategory = parent;
-        // Relationship needs to be maintained from both sides
-        if(parent != null) {
-            // Following triggers this.hashCode(), which is calculated 
-            // based on this.path
-            // It needs to happen after this.path is initialized
-            parent.childCategories.add(this);
-        }
-
     }
     
     



Mime
View raw message