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

[Christian Bauer]

  User: cbauer  
  Date: 08/01/14 20:00:01

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/action    
                        TagQuery.java DocumentNodeRemover.java
                        CommentHome.java DirectoryHome.java
  Log:
  Make ORDER BY in queries more typesafe
  
  Revision  Changes    Path
  1.2       +2 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/TagQuery.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TagQuery.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/TagQuery.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- TagQuery.java	19 Dec 2007 04:29:25 -0000	1.1
  +++ TagQuery.java	15 Jan 2008 01:00:01 -0000	1.2
  @@ -7,6 +7,7 @@
   import org.jboss.seam.wiki.core.dao.TagDAO;
   import org.jboss.seam.wiki.core.model.WikiDirectory;
   import org.jboss.seam.wiki.core.model.WikiFile;
  +import org.jboss.seam.wiki.core.model.WikiNode;
   
   import java.io.Serializable;
   import java.util.List;
  @@ -35,6 +36,6 @@
       }
   
       public void loadTaggedFiles() {
  -        taggedFiles = tagDAO.findWikFiles(wikiRoot, null, tag);
  +        taggedFiles = tagDAO.findWikFiles(wikiRoot, null, tag, WikiNode.SortableProperty.createdOn, false);
       }
   }
  
  
  
  1.4       +2 -2      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentNodeRemover.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DocumentNodeRemover.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentNodeRemover.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- DocumentNodeRemover.java	10 Jan 2008 08:37:45 -0000	1.3
  +++ DocumentNodeRemover.java	15 Jan 2008 01:00:01 -0000	1.4
  @@ -35,7 +35,7 @@
               feedDAO.findFeedEntry(doc)
           );
   
  -        List<WikiNode> children = getWikiNodeDAO().findChildren(doc, "createdOn", false, 0, Integer.MAX_VALUE);
  +        List<WikiNode> children = getWikiNodeDAO().findChildren(doc, WikiNode.SortableProperty.createdOn, false, 0, Integer.MAX_VALUE);
           for (WikiNode child : children) {
               if (child.isInstance(WikiComment.class)) {
                   getLog().debug("deleting dependent comment: " + child);
  @@ -49,7 +49,7 @@
       public void removeDependencies(WikiDocument doc) {
           getLog().debug("removing dependencies of: " + doc);
   
  -        List<WikiNode> children = getWikiNodeDAO().findChildren(doc, "createdOn", false, 0, Integer.MAX_VALUE);
  +        List<WikiNode> children = getWikiNodeDAO().findChildren(doc, WikiNode.SortableProperty.createdOn, false, 0, Integer.MAX_VALUE);
           for (WikiNode child : children) {
               if (child.isInstance(WikiComment.class)) {
                   getLog().debug("deleting dependent comment: " + child);
  
  
  
  1.17      +1 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/CommentHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CommentHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/CommentHome.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- CommentHome.java	9 Jan 2008 15:59:24 -0000	1.16
  +++ CommentHome.java	15 Jan 2008 01:00:01 -0000	1.17
  @@ -81,7 +81,7 @@
   
           comment.setAreaNumber(documentHome.getInstance().getAreaNumber());
           comment.setDerivedName(documentHome.getInstance());
  -        comment.setWikiname(comment.getName());
  +        comment.setWikiname(WikiUtil.convertToWikiName(comment.getName()));
           comment.setCreatedBy(getCurrentUser());
   
           // TODO: This means that when a user is deleted, his name will still be preserved. However, it's an old name.
  
  
  
  1.28      +3 -3      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DirectoryHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DirectoryHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DirectoryHome.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -b -r1.27 -r1.28
  --- DirectoryHome.java	9 Jan 2008 18:12:01 -0000	1.27
  +++ DirectoryHome.java	15 Jan 2008 01:00:01 -0000	1.28
  @@ -93,7 +93,7 @@
   
           hasFeed = dir.getFeed()!=null;
   
  -        childDocuments = getWikiNodeDAO().findWikiDocuments(dir);
  +        childDocuments = getWikiNodeDAO().findWikiDocuments(dir, WikiNode.SortableProperty.name, true);
   
           menuItems = getWikiNodeDAO().findMenuItems(dir);
           alreadyUsedMenuItems = new TreeSet<WikiDirectory>();
  @@ -204,7 +204,7 @@
               getLog().debug("loading children page from: " + pager.getNextRecord() + " size: " + pager.getPageSize());
               childNodes =
                       getWikiNodeDAO().findChildren(
  -                            dir, "createdOn", false,
  +                            dir, WikiNode.SortableProperty.name, false,
                               new Long(pager.getNextRecord()).intValue(),
                               new Long(pager.getPageSize()).intValue()
                       );
  @@ -492,7 +492,7 @@
           if (!isManaged() || !trashArea.getId().equals(getInstance().getId())) return;
   
           getLog().debug("emptying trash");
  -        List<WikiNode> children = getWikiNodeDAO().findChildren(getInstance(), "createdOn", false, 0, Integer.MAX_VALUE);
  +        List<WikiNode> children = getWikiNodeDAO().findChildren(getInstance(), WikiNode.SortableProperty.name, false, 0, Integer.MAX_VALUE);
   
           // TODO: This should be batched with a database cursor!
           for (WikiNode child : children) {