[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action ...

[Christian Bauer]

  User: cbauer  
  Date: 07/06/12 09:04:04

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/action 
                        NodeBrowser.java
  Log:
  Improved JBSEAM-952
  
  Revision  Changes    Path
  1.15      +15 -11    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.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- NodeBrowser.java	12 Jun 2007 12:50:38 -0000	1.14
  +++ NodeBrowser.java	12 Jun 2007 13:04:04 -0000	1.15
  @@ -226,19 +226,23 @@
               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) {
  +            boolean foundMatches = false;
  +            if (areaName != null && areaName.length() > 0) {
               log.debug("searching for unknown area name: " + areaName);
               WikiSearch wikiSearch = (WikiSearch)Component.getInstance("wikiSearch");
               wikiSearch.setSimpleQuery(areaName);
  +                wikiSearch.search();
  +                foundMatches = wikiSearch.getTotalCount() > 0;
  +            }
  +            if (foundMatches) {
               return "search";
  +            } else {
  +                // Fall back to default document
  +                currentDocument = (Document)Component.getInstance("wikiStart");
  +                currentDirectory = currentDocument.getParent();
  +            }
           }
   
           // Set the id for later