You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/01/19 21:28:58 UTC

svn commit: r497942 - /incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/model/URLModel.java

Author: agilliland
Date: Fri Jan 19 12:28:57 2007
New Revision: 497942

URL: http://svn.apache.org/viewvc?view=rev&rev=497942
Log:
change url model feed methods for tags from atom()/rss() to atomByTags()/rssByTags() to prevent an issue in velocity with conflicting method singatures.


Modified:
    incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/model/URLModel.java

Modified: incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/model/URLModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/model/URLModel.java?view=diff&rev=497942&r1=497941&r2=497942
==============================================================================
--- incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/model/URLModel.java (original)
+++ incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/model/URLModel.java Fri Jan 19 12:28:57 2007
@@ -333,7 +333,7 @@
             return URLUtilities.getWeblogFeedURL(weblog, locale, "entries", "rss", catPath, null, excerpts, true);
         }
         
-        public String rss(List tags, boolean excerpts) {
+        public String rssByTags(List tags, boolean excerpts) {
             return URLUtilities.getWeblogFeedURL(weblog, locale, "entries", "rss", null, tags, excerpts, true);
         }
         
@@ -345,7 +345,7 @@
             return URLUtilities.getWeblogFeedURL(weblog, locale, "entries", "atom", catPath, null, excerpts, true);
         }
         
-        public String atom(List tags, boolean excerpts) {
+        public String atomByTags(List tags, boolean excerpts) {
             return URLUtilities.getWeblogFeedURL(weblog, locale, "entries", "atom", null, tags, excerpts, true);
         }
     }