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

[Christian Bauer]

  User: cbauer  
  Date: 07/03/09 03:02:09

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/action   
                        NodeHome.java FileHome.java NodeBrowser.java
  Log:
  Fixed file uploading
  
  Revision  Changes    Path
  1.2       +8 -8      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.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- NodeHome.java	8 Mar 2007 17:50:58 -0000	1.1
  +++ NodeHome.java	9 Mar 2007 08:02:09 -0000	1.2
  @@ -101,9 +101,8 @@
       @Override
       public String persist() {
   
  -        // Validate
  -        if (!isUniqueWikinameInDirectory() ||
  -            !isUniqueWikinameInArea()) return null;
  +        // Set the wikiname
  +        getInstance().setWikiname(WikiUtil.convertToWikiName(getInstance().getName()));
   
           // Link the document with a directory
           parentDirectory.addChild(getInstance());
  @@ -115,8 +114,9 @@
           if (getInstance().getAreaNumber() == null)
               getInstance().setAreaNumber(parentDirectory.getAreaNumber());
   
  -        // Set the wikiname
  -        getInstance().setWikiname(WikiUtil.convertToWikiName(getInstance().getName()));
  +        // Validate
  +        if (!isUniqueWikinameInDirectory() ||
  +            !isUniqueWikinameInArea()) return null;
   
           return super.persist();
       }
  @@ -124,13 +124,13 @@
       @Override
       public String update() {
   
  +        // Set last modified by user
  +        getInstance().setLastModifiedBy(authenticatedUser);
  +
           // Validate
           if (!isUniqueWikinameInDirectory() ||
               !isUniqueWikinameInArea()) return null;
   
  -        // Set last modified by user
  -        getInstance().setLastModifiedBy(authenticatedUser);
  -
           // Refresh UI
           Events.instance().raiseEvent("Nodes.menuStructureModified");
   
  
  
  
  1.3       +2 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/FileHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FileHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/FileHome.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- FileHome.java	8 Mar 2007 17:50:58 -0000	1.2
  +++ FileHome.java	9 Mar 2007 08:02:09 -0000	1.3
  @@ -59,7 +59,8 @@
               getInstance().setContentType(contentType);
   
               // Handle image/picture meta info
  -            if (fileMetaMap.get(getInstance().getContentType()).image) {
  +            if (fileMetaMap.get(getInstance().getContentType()) != null &&
  +                fileMetaMap.get(getInstance().getContentType()).image) {
   
                   ImageMetaInfo imageMetaInfo =
                           getInstance().getImageMetaInfo() != null
  
  
  
  1.2       +0 -1      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.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- NodeBrowser.java	7 Mar 2007 18:37:37 -0000	1.1
  +++ NodeBrowser.java	9 Mar 2007 08:02:09 -0000	1.2
  @@ -102,7 +102,6 @@
           // If the last browsed page had a conversation identifier (we assume of a temporary conversation), remove it
           redirect.getParameters().remove("cid");
   
  -        System.out.println("############# REDIRECTING WITH CONVERSATION TO : " +redirect.getViewId());
           redirect.returnToCapturedView();
       }