[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action ...
Christian Bauer
christian at hibernate.org
Tue Jun 12 08:50:38 EDT 2007
User: cbauer
Date: 07/06/12 08:50:38
Modified: examples/wiki/src/main/org/jboss/seam/wiki/core/action
NodeBrowser.java
Log:
JBSEAM-952
Revision Changes Path
1.14 +10 -0 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeBrowser.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NodeBrowser.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeBrowser.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- NodeBrowser.java 12 Jun 2007 12:30:02 -0000 1.13
+++ NodeBrowser.java 12 Jun 2007 12:50:38 -0000 1.14
@@ -10,6 +10,7 @@
import org.jboss.seam.security.Identity;
import org.jboss.seam.wiki.core.dao.NodeDAO;
import org.jboss.seam.wiki.core.model.*;
+import org.jboss.seam.wiki.core.search.WikiSearch;
import org.jboss.seam.wiki.util.WikiUtil;
import java.util.*;
@@ -225,11 +226,20 @@
currentDocument = nodeDAO.findDefaultDocument(currentDirectory);
}
+ /*
// Fall back to default document
if (currentDirectory == null) {
currentDocument = (Document)Component.getInstance("wikiStart");
currentDirectory = currentDocument.getParent();
}
+ */
+ // Fall back, take the area name as a search query
+ if (currentDirectory == null) {
+ log.debug("searching for unknown area name: " + areaName);
+ WikiSearch wikiSearch = (WikiSearch)Component.getInstance("wikiSearch");
+ wikiSearch.setSimpleQuery(areaName);
+ return "search";
+ }
// Set the id for later
nodeId = currentDocument != null ? currentDocument.getId() : currentDirectory.getId();
More information about the jboss-cvs-commits
mailing list