[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action ...
Christian Bauer
christian at hibernate.org
Wed Jan 9 13:12:01 EST 2008
User: cbauer
Date: 08/01/09 13:12:01
Modified: examples/wiki/src/main/org/jboss/seam/wiki/core/action
NodeRemover.java DirectoryNodeRemover.java
CommentNodeRemover.java DocumentNodeRemover.java
DirectoryHome.java NodeHome.java
UploadNodeRemover.java
Log:
If you write new code, actually call it at some point...
Revision Changes Path
1.2 +2 -2 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeRemover.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NodeRemover.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeRemover.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NodeRemover.java 9 Jan 2008 15:59:24 -0000 1.1
+++ NodeRemover.java 9 Jan 2008 18:12:01 -0000 1.2
@@ -48,7 +48,7 @@
public abstract boolean isRemovable(N node);
- public void trashWikiNode(N node) {
+ public void trash(N node) {
// Check if the cut item was a default file for its parent
if (node.getParent().isInstance(WikiDirectory.class)) {
@@ -71,7 +71,7 @@
}
- public abstract void removeWikiNode(N node);
+ public abstract void removeDependencies(N node);
protected Log getLog() {
return log;
1.2 +4 -4 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DirectoryNodeRemover.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DirectoryNodeRemover.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DirectoryNodeRemover.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- DirectoryNodeRemover.java 9 Jan 2008 15:59:24 -0000 1.1
+++ DirectoryNodeRemover.java 9 Jan 2008 18:12:01 -0000 1.2
@@ -37,11 +37,11 @@
}
- public void trashWikiNode(WikiDirectory node) {
+ public void trash(WikiDirectory node) {
throw new IllegalStateException("Can't trash WikiDirectory instance");
}
- public void removeWikiNode(WikiDirectory dir) {
+ public void removeDependencies(WikiDirectory dir) {
getLog().debug("removing dependencies of: " + dir);
// Feed
@@ -51,8 +51,8 @@
}
// WikiMenuItem
- List<WikiMenuItem> persistentMenuItems = getWikiNodeDAO().findMenuItems(dir);
- for (WikiMenuItem menuItem : persistentMenuItems) {
+ WikiMenuItem menuItem = getWikiNodeDAO().findMenuItem(dir);
+ if (menuItem != null) {
getLog().debug("removing menu item of directory: " + menuItem);
getEntityManager().remove(menuItem);
}
1.2 +2 -2 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/CommentNodeRemover.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CommentNodeRemover.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/CommentNodeRemover.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CommentNodeRemover.java 9 Jan 2008 15:59:24 -0000 1.1
+++ CommentNodeRemover.java 9 Jan 2008 18:12:01 -0000 1.2
@@ -23,14 +23,14 @@
return true;
}
- public void trashWikiNode(WikiComment comment) {
+ public void trash(WikiComment comment) {
feedDAO.removeFeedEntry(
feedDAO.findFeeds(comment),
feedDAO.findFeedEntry(comment)
);
}
- public void removeWikiNode(WikiComment comment) {
+ public void removeDependencies(WikiComment comment) {
getLog().debug("removing dependencies of: " + comment);
List<WikiComment> children = getWikiNodeDAO().findWikiCommentSubtree(comment, true);
1.2 +6 -5 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentNodeRemover.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DocumentNodeRemover.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentNodeRemover.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- DocumentNodeRemover.java 9 Jan 2008 15:59:24 -0000 1.1
+++ DocumentNodeRemover.java 9 Jan 2008 18:12:01 -0000 1.2
@@ -27,7 +27,7 @@
return !doc.getId().equals(wikiStart.getId());
}
- public void trashWikiNode(WikiDocument doc) {
+ public void trash(WikiDocument doc) {
feedDAO.removeFeedEntry(
feedDAO.findFeeds(doc),
@@ -38,22 +38,23 @@
for (WikiNode child : children) {
if (child.isInstance(WikiComment.class)) {
getLog().debug("deleting dependent comment: " + child);
- commentNodeRemover.trashWikiNode( (WikiComment)child );
+ commentNodeRemover.trash( (WikiComment)child );
}
}
- super.trashWikiNode(doc);
+ super.trash(doc);
}
- public void removeWikiNode(WikiDocument doc) {
+ public void removeDependencies(WikiDocument doc) {
getLog().debug("removing dependencies of: " + doc);
List<WikiNode> children = getWikiNodeDAO().findChildren(doc, "createdOn", false, 0, Integer.MAX_VALUE);
for (WikiNode child : children) {
if (child.isInstance(WikiComment.class)) {
getLog().debug("deleting dependent comment: " + child);
- commentNodeRemover.removeWikiNode( (WikiComment)child );
+ commentNodeRemover.removeDependencies( (WikiComment)child );
}
+ getEntityManager().remove(child);
}
}
1.27 +5 -7 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DirectoryHome.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DirectoryHome.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DirectoryHome.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- DirectoryHome.java 9 Jan 2008 15:59:24 -0000 1.26
+++ DirectoryHome.java 9 Jan 2008 18:12:01 -0000 1.27
@@ -497,14 +497,12 @@
// TODO: This should be batched with a database cursor!
for (WikiNode child : children) {
getLog().debug("trashing item: " + child);
-
- // TODO: Make this polymorphic and connect it somehow to the stuff that happens in DocumentHome/UploadHome
if (child.isInstance(WikiDocument.class)) {
- List<WikiComment> comments = getWikiNodeDAO().findWikiCommentsFlat((WikiDocument)child, true);
- for (WikiComment comment : comments) {
- getLog().debug("trashing sub-item: " + comment);
- getEntityManager().remove(comment);
- }
+ NodeRemover documentRemover = (NodeRemover)Component.getInstance(DocumentNodeRemover.class);
+ documentRemover.removeDependencies(child);
+ } else if (child.isInstance(WikiUpload.class)) {
+ NodeRemover uploadRemover = (NodeRemover)Component.getInstance(UploadNodeRemover.class);
+ uploadRemover.removeDependencies(child);
}
getEntityManager().remove(child);
}
1.33 +2 -3 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHome.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NodeHome.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHome.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- NodeHome.java 9 Jan 2008 15:59:24 -0000 1.32
+++ NodeHome.java 9 Jan 2008 18:12:01 -0000 1.33
@@ -6,7 +6,6 @@
*/
package org.jboss.seam.wiki.core.action;
-import org.jboss.seam.Component;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.contexts.Contexts;
@@ -257,7 +256,7 @@
checkRemovePermissions();
getLog().debug("removing node: " + getInstance());
- getNodeRemover().removeWikiNode(getInstance());
+ getNodeRemover().removeDependencies(getInstance());
String outcome = super.remove();
if (outcome != null) {
Events.instance().raiseEvent("Nodes.menuStructureModified");
@@ -271,7 +270,7 @@
checkRemovePermissions();
getLog().debug("trashing node : " + getInstance());
- getNodeRemover().trashWikiNode(getInstance());
+ getNodeRemover().trash(getInstance());
setLastModifiedMetadata();
getEntityManager().flush();
trashedMessage();
1.2 +1 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UploadNodeRemover.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UploadNodeRemover.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UploadNodeRemover.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UploadNodeRemover.java 9 Jan 2008 15:59:24 -0000 1.1
+++ UploadNodeRemover.java 9 Jan 2008 18:12:01 -0000 1.2
@@ -22,7 +22,7 @@
return true;
}
- public void removeWikiNode(WikiUpload upload) {
+ public void removeDependencies(WikiUpload upload) {
getLog().debug("removing dependencies of: " + upload);
}
More information about the jboss-cvs-commits
mailing list