roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r416470 - in /incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model: FeedRenderModel.java PageRenderModel.java
Date Thu, 22 Jun 2006 20:56:26 GMT
Author: snoopdave
Date: Thu Jun 22 13:56:25 2006
New Revision: 416470

URL: http://svn.apache.org/viewvc?rev=416470&view=rev
Log:
Oops, didn't mean for the feed model to extend the page model

Modified:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedRenderModel.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageRenderModel.java

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedRenderModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedRenderModel.java?rev=416470&r1=416469&r2=416470&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedRenderModel.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedRenderModel.java
Thu Jun 22 13:56:25 2006
@@ -23,6 +23,8 @@
 import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
 import org.apache.roller.model.Roller;
 import org.apache.roller.model.RollerFactory;
@@ -37,13 +39,16 @@
 import org.apache.roller.ui.rendering.util.WeblogFeedRequest;
 
 /**
- * Model provide information needed to render a feed.
+ * Model provides information needed to render a feed.
  */
-public class FeedRenderModel extends PageRenderModel {
+public class FeedRenderModel implements RenderModel {
     private HttpServletRequest request = null;
     private WebsiteData        weblog = null;
     private String             categoryPath = null;
-   
+    
+    protected static Log log =
+            LogFactory.getFactory().getInstance(FeedRenderModel.class); 
+    
     public FeedRenderModel() {
     }
     
@@ -55,6 +60,11 @@
         Roller roller = RollerFactory.getRoller();
         UserManager umgr = roller.getUserManager();
         weblog = umgr.getWebsiteByHandle(parsed.getWeblogHandle(), Boolean.TRUE);
+    }
+    
+    /** Template context name to be used for model */
+    public String getModelName() {
+        return "model";
     }
     
     /**

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageRenderModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageRenderModel.java?rev=416470&r1=416469&r2=416470&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageRenderModel.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageRenderModel.java
Thu Jun 22 13:56:25 2006
@@ -50,7 +50,7 @@
 import org.apache.roller.util.DateUtil;
 
 /**
- * Model provide information needed to render a weblog page.
+ * Model provides information needed to render a weblog page.
  */
 public class PageRenderModel implements RenderModel {
     private HttpServletRequest     request = null;



Mime
View raw message