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

[Christian Bauer]

  User: cbauer  
  Date: 07/11/16 00:47:25

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/dao 
                        FeedDAO.java
  Log:
  Fixed [<=endTeaser]
  
  Revision  Changes    Path
  1.25      +8 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/FeedDAO.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FeedDAO.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/FeedDAO.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -b -r1.24 -r1.25
  --- FeedDAO.java	15 Nov 2007 06:22:52 -0000	1.24
  +++ FeedDAO.java	16 Nov 2007 05:47:25 -0000	1.25
  @@ -44,6 +44,13 @@
   
       /* ############################# FINDERS ################################ */
   
  +    public List<Feed> findFeeds() {
  +        return restrictedEntityManager
  +                .createQuery("select f from Feed f join fetch f.directory d order by d.createdOn asc")
  +                .getResultList();
  +
  +    }
  +
       public Feed findFeed(Long feedId) {
           try {
               return (Feed) restrictedEntityManager
  @@ -332,7 +339,7 @@
                   if (macroName.equals(FeedEntry.END_TEASER_MACRO)) {
                       return FeedEntry.END_TEASER_MARKER;
                   } else {
  -                    return "[Macro]";
  +                    return "";
                   }
               }
           }