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

[Christian Bauer]

  User: cbauer  
  Date: 07/05/04 14:25:51

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/action 
                        NodeHome.java
  Log:
  Fixed jQuery/RichFaces conflicts (except tree)
  
  Revision  Changes    Path
  1.16      +23 -23    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.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- NodeHome.java	4 May 2007 12:53:20 -0000	1.15
  +++ NodeHome.java	4 May 2007 18:25:51 -0000	1.16
  @@ -204,29 +204,6 @@
           return super.remove();
       }
   
  -    public void parentDirectorySelected(NodeSelectedEvent nodeSelectedEvent) {
  -        // TODO: There is really no API in RichFaces to get the selection! Already shouted at devs...
  -        TreeRowKey rowkey = (TreeRowKey)((HtmlTree)nodeSelectedEvent.getSource()).getRowKey();
  -        Iterator pathIterator = rowkey.iterator();
  -        Long dirId = null;
  -        while (pathIterator.hasNext()) dirId = (Long)pathIterator.next();
  -        parentDirectory = nodeDAO.findDirectory(dirId);
  -        Directory oldParentDirectory = (Directory)getInstance().getParent();
  -
  -        // Move node to different directory
  -        if (parentDirectory.getId() != oldParentDirectory.getId()) {
  -
  -            // Null out default document of old parent
  -            removeAsDefaultDocument(oldParentDirectory);
  -
  -            // Attach to new parent
  -            parentDirectory.addChild(getInstance()); // Disconnects from old parent
  -            getInstance().setAreaNumber(parentDirectory.getAreaNumber());
  -
  -            afterNodeMoved(oldParentDirectory, parentDirectory);
  -        }
  -    }
  -
       protected boolean isValidModel() {
           if (getParentDirectory() == null) return true; // Special case, editing the wiki root
   
  @@ -319,6 +296,29 @@
   
       /* -------------------------- Public Features ------------------------------ */
   
  +    public void parentDirectorySelected(NodeSelectedEvent nodeSelectedEvent) {
  +        // TODO: There is really no API in RichFaces to get the selection! Already shouted at devs...
  +        TreeRowKey rowkey = (TreeRowKey)((HtmlTree)nodeSelectedEvent.getSource()).getRowKey();
  +        Iterator pathIterator = rowkey.iterator();
  +        Long dirId = null;
  +        while (pathIterator.hasNext()) dirId = (Long)pathIterator.next();
  +        parentDirectory = nodeDAO.findDirectory(dirId);
  +        Directory oldParentDirectory = (Directory)getInstance().getParent();
  +
  +        // Move node to different directory
  +        if (parentDirectory.getId() != oldParentDirectory.getId()) {
  +
  +            // Null out default document of old parent
  +            removeAsDefaultDocument(oldParentDirectory);
  +
  +            // Attach to new parent
  +            parentDirectory.addChild(getInstance()); // Disconnects from old parent
  +            getInstance().setAreaNumber(parentDirectory.getAreaNumber());
  +
  +            afterNodeMoved(oldParentDirectory, parentDirectory);
  +        }
  +    }
  +
       @Restrict("#{s:hasPermission('User', 'isAdmin', currentUser)}")
       public void selectOwner(Long creatorId) {
           User newCreator = userDAO.findUser(creatorId);