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

[Christian Bauer]

  User: cbauer  
  Date: 07/12/29 21:33:22

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/feeds  
                        FeedDAO.java FeedEntryManager.java
  Log:
  Complete overhaul of the preferences system
  
  Revision  Changes    Path
  1.2       +0 -2      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/feeds/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/feeds/FeedDAO.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- FeedDAO.java	19 Dec 2007 04:29:22 -0000	1.1
  +++ FeedDAO.java	30 Dec 2007 02:33:22 -0000	1.2
  @@ -54,7 +54,6 @@
               return (Feed) restrictedEntityManager
                   .createQuery("select f from Feed f where f.id = :id")
                   .setParameter("id", feedId)
  -                .setHint("org.hibernate.cacheable", true)
                   .getSingleResult();
           } catch (EntityNotFoundException ex) {
           } catch (NoResultException ex) {}
  @@ -135,7 +134,6 @@
           return (List<FeedEntry>) restrictedEntityManager
                   .createQuery("select fe from Feed f join f.feedEntries fe where f.id = :feedId order by fe.publishedDate desc")
                   .setParameter("feedId", feedId)
  -                .setHint("org.hibernate.cacheable", true)
                   .setMaxResults(maxResults)
                   .getResultList();
       }
  
  
  
  1.2       +3 -6      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/feeds/FeedEntryManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FeedEntryManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/feeds/FeedEntryManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- FeedEntryManager.java	19 Dec 2007 04:29:22 -0000	1.1
  +++ FeedEntryManager.java	30 Dec 2007 02:33:22 -0000	1.2
  @@ -1,10 +1,7 @@
   package org.jboss.seam.wiki.core.feeds;
   
   import org.jboss.seam.wiki.core.model.FeedEntry;
  -import org.jboss.seam.wiki.core.engine.DefaultWikiTextRenderer;
  -import org.jboss.seam.wiki.core.engine.WikiTextParser;
  -import org.jboss.seam.wiki.core.engine.WikiLink;
  -import org.jboss.seam.wiki.core.engine.WikiLinkResolver;
  +import org.jboss.seam.wiki.core.engine.*;
   import org.jboss.seam.wiki.util.WikiUtil;
   import org.jboss.seam.ui.validator.FormattedTextValidator;
   import org.jboss.seam.Component;
  @@ -42,8 +39,8 @@
               }
   
               // Preserve the macro that marks the end of the teaser
  -            public String renderMacro(String macroName) {
  -                if (macroName.equals(FeedEntry.END_TEASER_MACRO)) {
  +            public String renderMacro(WikiMacro macro) {
  +                if (macro.getName().equals(FeedEntry.END_TEASER_MACRO)) {
                       return FeedEntry.END_TEASER_MARKER;
                   } else {
                       return "";