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

[Christian Bauer]

  User: cbauer  
  Date: 07/12/20 13:35:56

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/action 
                        Help.java
  Log:
  Simplifed and fixed help popup
  
  Revision  Changes    Path
  1.5       +12 -53    jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Help.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Help.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Help.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- Help.java	19 Dec 2007 04:29:25 -0000	1.4
  +++ Help.java	20 Dec 2007 18:35:56 -0000	1.5
  @@ -8,7 +8,6 @@
   import org.jboss.seam.wiki.core.dao.WikiNodeDAO;
   import org.jboss.seam.wiki.core.model.WikiDirectory;
   import org.jboss.seam.wiki.core.model.WikiDocument;
  -import org.jboss.seam.wiki.core.nestedset.query.NestedSetNodeWrapper;
   import org.jboss.seam.wiki.util.WikiUtil;
   
   import java.io.Serializable;
  @@ -26,70 +25,30 @@
       @In
       WikiPreferences wikiPreferences;
   
  -    NestedSetNodeWrapper<WikiDirectory> root;
  +    WikiDirectory helpAreaRoot;
   
  -    public NestedSetNodeWrapper<WikiDirectory> getRoot() {
  -        if (root == null) refreshRoot();
  -        return root;
  +    @Create
  +    public void create() {
  +        helpAreaRoot = wikiNodeDAO.findArea(WikiUtil.convertToWikiName(wikiPreferences.getHelpArea()));
       }
   
  -    // TODO: Find event that triggers help document updates... difficult
  -    //@Observer(value = "Nodes.menuStructureModified", create = false)
  -    public void refreshRoot() {
  -        log.debug("Loading help documents tree");
  -         WikiDirectory helpAreaRoot = wikiNodeDAO.findArea(WikiUtil.convertToWikiName(wikiPreferences.getHelpArea()));
  -        if (helpAreaRoot != null) {
  -            root = wikiNodeDAO.findWikiDirectoryTree(helpAreaRoot, 99l, 1l, false);
  -        } else {
  -            throw new EntityNotFoundException("Help Area: '" + wikiPreferences.getHelpArea() + "'", WikiDirectory.class);
  -        }
  -    }
  -
  -    // Needed for the tree dropdown
  -    NestedSetNodeWrapper<WikiDirectory> selectedNode;
  -    public NestedSetNodeWrapper<WikiDirectory> getSelectedNode() {
  -        return selectedNode;
  -    }
  -    public void setSelectedNode(NestedSetNodeWrapper<WikiDirectory> selectedNode) {
  -        this.selectedNode = selectedNode;
  -        setSelectedDirectory(selectedNode.getWrappedNode());
  -        setSelectedDocument(null);
  -    }
  -    WikiDocument selectedDocument;
  -    WikiDirectory selectedDirectory;
  -
  -    public WikiDocument getSelectedDocument() {
  -        return selectedDocument;
  -    }
  -
  -    public void setSelectedDocument(WikiDocument selectedDocument) {
  -        this.selectedDocument = selectedDocument;
  -    }
  -
  -    public WikiDirectory getSelectedDirectory() {
  -        return selectedDirectory;
  -    }
  +    WikiDocument selectedHelpDoc;
   
  -    public void setSelectedDirectory(WikiDirectory selectedDirectory) {
  -        this.selectedDirectory = selectedDirectory;
  +    public WikiDocument getSelectedHelpDoc() {
  +        return selectedHelpDoc;
       }
   
       public void selectDocumentByName(String documentName) {
  -        log.debug("Searching for help document with wiki name in area: " + getRoot().getWrappedNode().getAreaNumber() + ", " + WikiUtil.convertToWikiName(documentName));
  -        WikiDocument helpDoc =
  +        log.debug("Searching for help document with wiki name in area: " + helpAreaRoot.getAreaNumber() + ", " + WikiUtil.convertToWikiName(documentName));
  +        selectedHelpDoc =
                   wikiNodeDAO.findWikiDocumentInArea(
  -                        getRoot().getWrappedNode().getAreaNumber(),
  +                        helpAreaRoot.getAreaNumber(),
                           WikiUtil.convertToWikiName(documentName)
                   );
  -        if (helpDoc == null)
  +        if (selectedHelpDoc == null)
               throw new EntityNotFoundException("Help document: "+documentName, WikiDocument.class);
   
  -        log.debug("Found help document: " + helpDoc);
  -        // TODO: Avoid cast
  -        setSelectedNode(new NestedSetNodeWrapper<WikiDirectory>( (WikiDirectory)helpDoc.getParent()) );
  -        setSelectedDocument(helpDoc);
  -        // TODO: Avoid cast
  -        setSelectedDirectory( (WikiDirectory)helpDoc.getParent() );
  +        log.debug("Found help document: " + selectedHelpDoc);
       }
   
   }