[jboss-cvs] JBossBlog SVN: r147 - in trunk: resources/WEB-INF and 10 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Dec 3 08:29:10 EST 2007


Author: adamw
Date: 2007-12-03 08:29:10 -0500 (Mon, 03 Dec 2007)
New Revision: 147

Modified:
   trunk/resources/WEB-INF/pages.xml
   trunk/resources/messages_en.properties
   trunk/src/action/org/jboss/blog/session/feed/FeedModBean.java
   trunk/src/action/org/jboss/blog/session/feed/aggregated/AggregatedFeedModBean.java
   trunk/src/action/org/jboss/blog/session/feed/remote/RemoteFeedModBean.java
   trunk/src/action/org/jboss/blog/session/template/TemplateModBean.java
   trunk/src/action/org/jboss/blog/session/validator/UniqueFeedNameValidator.java
   trunk/src/action/org/jboss/blog/session/validator/UniqueTemplateNameValidator.java
   trunk/src/action/org/jboss/blog/session/view/FeedViewBean.java
   trunk/src/model/org/jboss/blog/model/AggregatedFeed.java
   trunk/src/model/org/jboss/blog/model/Feed.java
   trunk/src/model/org/jboss/blog/model/RemoteFeed.java
   trunk/view/manage/index.xhtml
   trunk/view/manage/remote/remote_mod.xhtml
   trunk/view/view/feed.xhtml
Log:


Modified: trunk/resources/WEB-INF/pages.xml
===================================================================
--- trunk/resources/WEB-INF/pages.xml	2007-11-30 11:56:27 UTC (rev 146)
+++ trunk/resources/WEB-INF/pages.xml	2007-12-03 13:29:10 UTC (rev 147)
@@ -30,7 +30,6 @@
     <page view-id="/manage/add.xhtml" />
 
     <page view-id="/manage/feed_add.xhtml" conversation-required="true">
-        <begin-conversation flush-mode="manual" join="true" />
         <navigation from-action="#{feedMod.saveNew}">
             <end-conversation />
             <redirect view-id="/manage/index.xhtml" />
@@ -47,17 +46,15 @@
     </page>
 
     <page view-id="/manage/feed_delete.xhtml">
-        <begin-conversation flush-mode="manual" join="true" />
         <param name="name" converterId="feedConverter" value="#{feedMod.feed}" />
         <navigation from-action="#{feedMod.delete}">
-            <end-conversation />
             <redirect view-id="/manage/index.xhtml" />
         </navigation>
     </page>
 
     <!-- Manage remote feeds -->
 
-    <page view-id="/manage/remote/remote_add.xhtml" conversation-required="true">
+    <page view-id="/manage/remote/remote_add.xhtml">
         <begin-conversation flush-mode="manual" join="true" />
         <navigation from-action="#{remoteFeedMod.saveNew}">
             <redirect view-id="/manage/feed_add.xhtml" />
@@ -75,7 +72,8 @@
 
     <!-- Manage aggregated feeds -->
 
-    <page view-id="/manage/aggregated/aggregated_add.xhtml" conversation-required="true">
+    <page view-id="/manage/aggregated/aggregated_add.xhtml">
+        <begin-conversation flush-mode="manual" join="true" />
         <navigation from-action="#{aggregatedFeedMod.saveNew}">
             <redirect view-id="/manage/feed_add.xhtml" />
         </navigation>

Modified: trunk/resources/messages_en.properties
===================================================================
--- trunk/resources/messages_en.properties	2007-11-30 11:56:27 UTC (rev 146)
+++ trunk/resources/messages_en.properties	2007-12-03 13:29:10 UTC (rev 147)
@@ -1,35 +1,35 @@
 up=\u2191
 down=\u2193
 left=\u2039
-right=\u203A
+right=\u203a
 
 validator.assertFalse=validation failed
 validator.assertTrue=validation failed
 validator.future=must be a future date
-validator.length=length must be between {min} and {max}
-validator.max=must be less than or equal to {value}
-validator.min=must be greater than or equal to {value}
+validator.length=Length must be between {min} and {max}.
+validator.max=Must be less than or equal to {value}.
+validator.min=Must be greater than or equal to {value}.
 validator.notNull=may not be null
 validator.past=must be a past date
-validator.pattern=must match "{regex}"
-validator.range=must be between {min} and {max}
-validator.size=size must be between {min} and {max}
-validator.email=must be a well-formed email address
+validator.pattern=Must match "{regex}".
+validator.range=Must be between {min} and {max}.
+validator.size=Size must be between {min} and {max}.
+validator.email=Must be a well-formed email address.
 
-org.jboss.seam.loginFailed=Login failed
-org.jboss.seam.loginSuccessful=Welcome, #0
+org.jboss.seam.loginFailed=Login failed.
+org.jboss.seam.loginSuccessful=Welcome, #0!
 
-org.jboss.seam.TransactionFailed=Transaction failed
-org.jboss.seam.NoConversation=The conversation ended, timed out or was processing another request
-org.jboss.seam.IllegalNavigation=Illegal navigation
-org.jboss.seam.ProcessEnded=Process #0 already ended
-org.jboss.seam.ProcessNotFound=Process #0 not found
-org.jboss.seam.TaskEnded=Task #0 already ended
-org.jboss.seam.TaskNotFound=Task #0 not found
-org.jboss.seam.NotLoggedIn=Please log in first
+org.jboss.seam.TransactionFailed=Transaction failed.
+org.jboss.seam.NoConversation=The conversation ended, timed out or was processing another request.
+org.jboss.seam.IllegalNavigation=Illegal navigation.
+org.jboss.seam.ProcessEnded=Process #0 already ended.
+org.jboss.seam.ProcessNotFound=Process #0 not found.
+org.jboss.seam.TaskEnded=Task #0 already ended.
+org.jboss.seam.TaskNotFound=Task #0 not found.
+org.jboss.seam.NotLoggedIn=Please log in first.
 
 javax.faces.component.UIInput.CONVERSION=value could not be converted to the expected type
-javax.faces.component.UIInput.REQUIRED=value is required
+javax.faces.component.UIInput.REQUIRED=This field cannot be empty.
 javax.faces.component.UIInput.UPDATE=an error occurred when processing your submitted information
 javax.faces.component.UISelectOne.INVALID=value is not valid
 javax.faces.component.UISelectMany.INVALID=value is not valid
@@ -88,3 +88,19 @@
 javax.faces.validator.NOT_IN_RANGE=value must be between {0} and {1}
 javax.faces.converter.STRING=value could not be converted to a string
 
+blog.feed.deleted=Feed {0} deleted.
+blog.feed.updated=Feed {0} updated.
+blog.feed.added=Feed {0} added.
+
+blog.template.deleted=Template {0} of type {1} deleted.
+blog.template.updated=Template {0} of type {1} updated.
+blog.template.added=Template {0} of type {1} added.
+
+blog.feed.remote.updated=Remote feed's {0} address changed.
+
+blog.feed.aggregated.updated=Aggregated feed {0} changed.
+
+blog.feed.new.invalidname=Feed name may only contain small latin letters, numbers, _ and /.
+blog.feed.new.existingname=A feed with that name already exists.
+
+blog.template.new.existingname=A template with that name already exists.
\ No newline at end of file

Modified: trunk/src/action/org/jboss/blog/session/feed/FeedModBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/FeedModBean.java	2007-11-30 11:56:27 UTC (rev 146)
+++ trunk/src/action/org/jboss/blog/session/feed/FeedModBean.java	2007-12-03 13:29:10 UTC (rev 147)
@@ -2,15 +2,16 @@
 
 import org.jboss.blog.model.Feed;
 import org.jboss.blog.model.Post;
+import org.jboss.blog.model.Template;
 import org.jboss.blog.model.TemplateType;
-import org.jboss.blog.model.Template;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.AutoCreate;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.core.Events;
+import org.jboss.seam.faces.FacesMessages;
 
+import javax.faces.application.FacesMessage;
 import javax.persistence.EntityManager;
 import java.io.Serializable;
 import java.util.HashMap;
@@ -27,6 +28,9 @@
     @In
     private EntityManager entityManager;
 
+    @In
+    private FacesMessages facesMessages;
+
     public void initNewFeed(Feed feed) {
         this.feed = feed;
         feed.setMaxPostsInFeed(10);
@@ -56,16 +60,18 @@
 
         entityManager.flush();
 
-        Events.instance().raiseEvent("org.jboss.blog.feed.new");
+        facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "blog.feed.added", getFeed().getName());
     }
 
     public void saveExisting() {
         entityManager.flush();
+
+        facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "blog.feed.updated", getFeed().getName());
     }
 
     public void delete() {
         entityManager.remove(getFeed());
 
-        Events.instance().raiseEvent("org.jboss.blog.feed.deleted");
+        facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "blog.feed.deleted", getFeed().getName());
     }
 }

Modified: trunk/src/action/org/jboss/blog/session/feed/aggregated/AggregatedFeedModBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/aggregated/AggregatedFeedModBean.java	2007-11-30 11:56:27 UTC (rev 146)
+++ trunk/src/action/org/jboss/blog/session/feed/aggregated/AggregatedFeedModBean.java	2007-12-03 13:29:10 UTC (rev 147)
@@ -8,12 +8,14 @@
 import org.jboss.blog.session.feed.InvalidFeedTypeException;
 import org.jboss.blog.tools.GeneralTools;
 import org.jboss.seam.ScopeType;
+import org.jboss.seam.faces.FacesMessages;
 import org.jboss.seam.annotations.Create;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
 
 import javax.faces.model.SelectItem;
+import javax.faces.application.FacesMessage;
 import javax.persistence.EntityManager;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -33,6 +35,9 @@
 
     @In
     private FeedsService feedsService;
+    
+    @In
+    private FacesMessages facesMessages;
 
     private AggregatedFeed aggregatedFeed;
 
@@ -103,5 +108,8 @@
     public void saveExisting() {
         save();
         entityManager.flush();
+
+        facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "blog.feed.aggregated.updated",
+                getAggregatedFeed().getName());
     }
 }

Modified: trunk/src/action/org/jboss/blog/session/feed/remote/RemoteFeedModBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/remote/RemoteFeedModBean.java	2007-11-30 11:56:27 UTC (rev 146)
+++ trunk/src/action/org/jboss/blog/session/feed/remote/RemoteFeedModBean.java	2007-12-03 13:29:10 UTC (rev 147)
@@ -7,11 +7,13 @@
 import org.jboss.blog.session.parser.ParserException;
 import org.jboss.blog.session.parser.ParserService;
 import org.jboss.seam.ScopeType;
+import org.jboss.seam.faces.FacesMessages;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
 
 import javax.persistence.EntityManager;
+import javax.faces.application.FacesMessage;
 import java.io.Serializable;
 
 /**
@@ -29,6 +31,9 @@
     @In
     private EntityManager entityManager;
 
+    @In
+    private FacesMessages facesMessages;
+
     private RemoteFeed remoteFeed;
 
     private Feed parsedFeed;
@@ -91,5 +96,8 @@
         getRemoteFeed().setLink(parsedFeed.getLink());
 
         entityManager.flush();
+
+        facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "blog.feed.remote.updated",
+                getRemoteFeed().getName());
     }
 }

Modified: trunk/src/action/org/jboss/blog/session/template/TemplateModBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/template/TemplateModBean.java	2007-11-30 11:56:27 UTC (rev 146)
+++ trunk/src/action/org/jboss/blog/session/template/TemplateModBean.java	2007-12-03 13:29:10 UTC (rev 147)
@@ -3,8 +3,10 @@
 import org.jboss.blog.model.Template;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
+import org.jboss.seam.faces.FacesMessages;
 
 import javax.persistence.EntityManager;
+import javax.faces.application.FacesMessage;
 
 /**
  * @author <a href="mailto:adam at warski.org">Adam Warski</a>
@@ -14,6 +16,9 @@
     @In
     private EntityManager entityManager;
 
+    @In
+    private FacesMessages facesMessages;
+
     private Template template;
 
     public Template getTemplate() {
@@ -31,13 +36,22 @@
     public void saveNew() {
         entityManager.persist(template);
         entityManager.flush();
+
+        facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "blog.template.added", template.getName(),
+                template.getType());
     }
 
     public void saveExisting() {
         entityManager.flush();
+
+        facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "blog.template.updated", template.getName(),
+                template.getType());
     }
 
     public void delete() {
         entityManager.remove(template);
+
+        facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "blog.template.deleted", template.getName(),
+                template.getType());
     }
 }

Modified: trunk/src/action/org/jboss/blog/session/validator/UniqueFeedNameValidator.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/validator/UniqueFeedNameValidator.java	2007-11-30 11:56:27 UTC (rev 146)
+++ trunk/src/action/org/jboss/blog/session/validator/UniqueFeedNameValidator.java	2007-12-03 13:29:10 UTC (rev 147)
@@ -4,6 +4,7 @@
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.faces.Validator;
+import org.jboss.seam.international.Messages;
 
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
@@ -55,7 +56,7 @@
         }
 
         if (query.getResultList().size() != 0) {
-            throw new ValidatorException(new FacesMessage("A feed with that name already exists."));
+            throw new ValidatorException(new FacesMessage(Messages.instance().get("blog.feed.new.existingname")));
         }
     }
 }

Modified: trunk/src/action/org/jboss/blog/session/validator/UniqueTemplateNameValidator.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/validator/UniqueTemplateNameValidator.java	2007-11-30 11:56:27 UTC (rev 146)
+++ trunk/src/action/org/jboss/blog/session/validator/UniqueTemplateNameValidator.java	2007-12-03 13:29:10 UTC (rev 147)
@@ -4,6 +4,7 @@
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.faces.Validator;
+import org.jboss.seam.international.Messages;
 
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
@@ -55,7 +56,7 @@
         }
 
         if (query.getResultList().size() != 0) {
-            throw new ValidatorException(new FacesMessage("A template with that name already exists."));
+            throw new ValidatorException(new FacesMessage(Messages.instance().get("blog.template.new.existingname")));
         }
     }
 }

Modified: trunk/src/action/org/jboss/blog/session/view/FeedViewBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/view/FeedViewBean.java	2007-11-30 11:56:27 UTC (rev 146)
+++ trunk/src/action/org/jboss/blog/session/view/FeedViewBean.java	2007-12-03 13:29:10 UTC (rev 147)
@@ -50,18 +50,18 @@
     }
 
     public boolean getShowNext() {
-        return getPosts().size() == feed.getMaxPostsOnPage()+1;
+        return from != 0;
     }
 
     public boolean getShowPrevious() {
-        return from != 0;
+        return getPosts().size() == feed.getMaxPostsOnPage()+1;
     }
 
     public int getNextFrom() {
-        return from + feed.getMaxPostsOnPage();
+        return Math.max(0, from - feed.getMaxPostsOnPage());
     }
 
     public int getPreviousFrom() {
-        return Math.max(0, from - feed.getMaxPostsOnPage());
+        return from + feed.getMaxPostsOnPage();
     }
 }

Modified: trunk/src/model/org/jboss/blog/model/AggregatedFeed.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/AggregatedFeed.java	2007-11-30 11:56:27 UTC (rev 146)
+++ trunk/src/model/org/jboss/blog/model/AggregatedFeed.java	2007-12-03 13:29:10 UTC (rev 147)
@@ -20,10 +20,4 @@
     public void setFeeds(List<Feed> feeds) {
         this.feeds = feeds;
     }
-
-    @Transient
-    @Override
-    public String getType() {
-        return "aggregated";
-    }
 }

Modified: trunk/src/model/org/jboss/blog/model/Feed.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/Feed.java	2007-11-30 11:56:27 UTC (rev 146)
+++ trunk/src/model/org/jboss/blog/model/Feed.java	2007-12-03 13:29:10 UTC (rev 147)
@@ -22,7 +22,7 @@
     @NotEmpty
     @Length(max = 16)
     @Column(unique = true)
-    @Pattern(regex = "^[a-z0-9_/]*$", message = "Feed name may only contain small latin letters, number, _ and /.")
+    @Pattern(regex = "^[a-z0-9_/]*$", message = "#{messages['blog.feed.new.invalidname']}")
     private String name;
 
     @NotEmpty
@@ -54,11 +54,6 @@
     @Column
     private int maxPostsOnPage;
 
-    @Transient
-    public String getType() {
-        return "none";
-    }
-
     public Integer getId() {
         return id;
     }

Modified: trunk/src/model/org/jboss/blog/model/RemoteFeed.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/RemoteFeed.java	2007-11-30 11:56:27 UTC (rev 146)
+++ trunk/src/model/org/jboss/blog/model/RemoteFeed.java	2007-12-03 13:29:10 UTC (rev 147)
@@ -22,10 +22,4 @@
     public void setRemoteLink(String remoteLink) {
         this.remoteLink = remoteLink;
     }
-
-    @Transient
-    @Override
-    public String getType() {
-        return "remote";
-    }
 }

Modified: trunk/view/manage/index.xhtml
===================================================================
--- trunk/view/manage/index.xhtml	2007-11-30 11:56:27 UTC (rev 146)
+++ trunk/view/manage/index.xhtml	2007-12-03 13:29:10 UTC (rev 147)
@@ -10,14 +10,15 @@
     <ui:define name="body">
         <h1>Manage feeds</h1>
 
-        <s:link value="Add new feed" view="/manage/add.xhtml" propagation="begin" /> <br />
-        <s:link value="Manage templates" view="/manage/template/template_list.xhtml" />
+        <s:link value="Manage templates" view="/manage/template/template_list.xhtml" /> <br /> <br />
 
+        <s:link value="Add new feed" view="/manage/add.xhtml" />
+        
         <h3>Current feeds:</h3>
 
         <ui:repeat var="feed" value="#{feedsService.allFeeds}">
             <p>
-                #{feed.title} (#{feed.type}) <br />
+                #{feed.title} (#{feed.name}, #{feedTypes.getFeedType(feed.class).name}) <br />
                 <s:link view="/manage/feed_edit.xhtml" value="Edit common">
                     <f:param name="name" value="#{feed.name}" />
                 </s:link>

Modified: trunk/view/manage/remote/remote_mod.xhtml
===================================================================
--- trunk/view/manage/remote/remote_mod.xhtml	2007-11-30 11:56:27 UTC (rev 146)
+++ trunk/view/manage/remote/remote_mod.xhtml	2007-12-03 13:29:10 UTC (rev 147)
@@ -43,6 +43,7 @@
                           action="#{remoteFeedMod.saveNew}" />
                 <h:commandButton rendered="#{remoteFeedMod.parseOk and !new}" value="Save"
                           action="#{remoteFeedMod.saveExisting}" />
+                <s:button value="Cancel" view="/manage/index.html" propagation="end" />
             </h:panelGroup>
         </h:panelGrid>
     </h:form>

Modified: trunk/view/view/feed.xhtml
===================================================================
--- trunk/view/view/feed.xhtml	2007-11-30 11:56:27 UTC (rev 146)
+++ trunk/view/view/feed.xhtml	2007-12-03 13:29:10 UTC (rev 147)
@@ -12,16 +12,16 @@
         <h1>View feed: #{feedView.feed.title}</h1>
 
         <p>
-            <s:link view="/view/feed.xhtml" value="&#171; Previous" rendered="#{feedView.showPrevious}"
+            <s:link view="/view/feed.xhtml" value="&#171; Next" rendered="#{feedView.showNext}"
                     propagation="none">
-                <f:param name="from" value="#{feedView.previousFrom}" />
+                <f:param name="from" value="#{feedView.nextFrom}" />
             </s:link>
         </p>
 
         <p>
-            <s:link view="/view/feed.xhtml" value="Next &#187;" rendered="#{feedView.showNext}"
+            <s:link view="/view/feed.xhtml" value="Previous &#187;" rendered="#{feedView.showPrevious}"
                     propagation="none">
-                <f:param name="from" value="#{feedView.nextFrom}" />
+                <f:param name="from" value="#{feedView.previousFrom}" />
             </s:link>
         </p>
 




More information about the jboss-cvs-commits mailing list