Author: gmazza
Date: Tue Jul 22 20:04:54 2014
New Revision: 1612677
URL: http://svn.apache.org/r1612677
Log:
Fixed problem with Atom feeds not rendering.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java?rev=1612677&r1=1612676&r2=1612677&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
Tue Jul 22 20:04:54 2014
@@ -264,15 +264,14 @@ public class SharedThemeFromDir extends
WeblogTemplate.ACTION_CUSTOM, stylesheetTmpl.getName(),
stylesheetTmpl.getDescription(), contents,
stylesheetTmpl.getLink(), new Date(
- templateFile.lastModified()),
- standardTemplateCode.getTemplateLang(), false, false);
+ templateFile.lastModified()), false, false);
for (RenditionType type : availableTypesList) {
SharedThemeTemplateRendition rendition =
createTemplateCode(
themeTemplate.getId(),
stylesheetTmpl.getTemplateRendition(type));
- themeTemplate.addTemplateRendition(type, rendition);
+ themeTemplate.addTemplateRendition(rendition);
// Set Last Modified
Date lstModified = rendition.getLastModified();
@@ -363,7 +362,6 @@ public class SharedThemeFromDir extends
templateMetadata.getDescription(), contents,
templateMetadata.getLink(), new Date(
templateFile.lastModified()),
- standardTemplateCode.getTemplateLang(),
templateMetadata.isHidden(), templateMetadata.isNavbar());
for (RenditionType type : availableTypesList) {
@@ -371,7 +369,7 @@ public class SharedThemeFromDir extends
themeTemplate.getId(),
templateMetadata.getTemplateRendition(type));
- themeTemplate.addTemplateRendition(type, templateCode);
+ themeTemplate.addTemplateRendition(templateCode);
// Set Last Modified
Date lstModified = templateCode.getLastModified();
@@ -439,7 +437,7 @@ public class SharedThemeFromDir extends
private SharedThemeTemplateRendition createTemplateCode(String templateId,
ThemeMetadataTemplateRendition templateCodeMetadata) {
- SharedThemeTemplateRendition templateCode = new
SharedThemeTemplateRendition();
+ SharedThemeTemplateRendition templateRendition = new
SharedThemeTemplateRendition();
// construct File object from path
File templateFile = new File(this.themeDir + File.separator
@@ -454,13 +452,13 @@ public class SharedThemeFromDir extends
+ "] template file [" + templateFile + "]");
}
- templateCode.setTemplateId(templateId);
- templateCode.setTemplate(contents);
-
templateCode.setTemplateLanguage(templateCodeMetadata.getTemplateLang());
- templateCode.setType(templateCodeMetadata.getType());
- templateCode.setLastModified(new Date(templateFile.lastModified()));
+ templateRendition.setTemplateId(templateId);
+ templateRendition.setTemplate(contents);
+
templateRendition.setTemplateLanguage(templateCodeMetadata.getTemplateLang());
+ templateRendition.setType(templateCodeMetadata.getType());
+ templateRendition.setLastModified(new
Date(templateFile.lastModified()));
- return templateCode;
+ return templateRendition;
}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java?rev=1612677&r1=1612676&r2=1612677&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
Tue Jul 22 20:04:54 2014
@@ -43,7 +43,6 @@ public class SharedThemeTemplate impleme
private String contents = null;
private String link = null;
private Date lastModified = null;
- private TemplateLanguage templateLanguage = null;
private boolean hidden = false;
private boolean navbar = false;
private String outputContentType = null;
@@ -52,12 +51,11 @@ public class SharedThemeTemplate impleme
//hash map to cache template Code objects parsed
private Map<RenditionType, TemplateRendition> templateRenditionHashMap =
new HashMap<RenditionType, TemplateRendition>();
-
public SharedThemeTemplate() {}
public SharedThemeTemplate(String id, String action, String name,
String desc, String contents, String link, Date date,
- TemplateLanguage tempLang, boolean hid, boolean navbar) {
+ boolean hidden, boolean navbar) {
this.id = id;
this.action = action;
@@ -66,8 +64,7 @@ public class SharedThemeTemplate impleme
this.contents = contents;
this.link = link;
this.lastModified = date;
- this.templateLanguage = tempLang;
- this.hidden = hid;
+ this.hidden = hidden;
this.navbar = navbar;
}
@@ -119,14 +116,6 @@ public class SharedThemeTemplate impleme
this.link = link;
}
- public TemplateLanguage getTemplateLanguage() {
- return templateLanguage;
- }
-
- public void setTemplateLanguage(TemplateLanguage templateLanguage) {
- this.templateLanguage = templateLanguage;
- }
-
public boolean isHidden() {
return hidden;
}
@@ -176,7 +165,7 @@ public class SharedThemeTemplate impleme
this.type = type;
}
- public void addTemplateRendition(RenditionType type, TemplateRendition
templateCode){
- this.templateRenditionHashMap.put(type, templateCode);
+ public void addTemplateRendition(TemplateRendition rendition){
+ this.templateRenditionHashMap.put(rendition.getType(), rendition);
}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java?rev=1612677&r1=1612676&r2=1612677&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java
Tue Jul 22 20:04:54 2014
@@ -20,6 +20,7 @@ package org.apache.roller.weblogger.pojo
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WebloggerFactory;
+import
org.apache.roller.weblogger.business.themes.SharedThemeTemplateRendition;
import org.apache.roller.weblogger.pojos.TemplateRendition.RenditionType;
import org.apache.roller.weblogger.pojos.TemplateRendition.TemplateLanguage;
@@ -40,16 +41,16 @@ public class StaticTemplate implements T
private String name = null;
private String description = null;
private Date lastModified = new Date();
- private TemplateLanguage templateLanguage = null;
private String outputContentType = null;
- private RenditionType type = RenditionType.STANDARD;
-
-
+ private TemplateRendition templateRendition;
+
public StaticTemplate(String id, TemplateLanguage lang) {
this.id = id;
this.name = id;
this.description = id;
- this.templateLanguage = lang;
+ templateRendition = new SharedThemeTemplateRendition();
+ templateRendition.setTemplateLanguage(lang);
+ templateRendition.setType(RenditionType.STANDARD);
}
@@ -85,29 +86,13 @@ public class StaticTemplate implements T
this.lastModified = lastModified;
}
- public TemplateLanguage getTemplateLanguage() {
- return templateLanguage;
- }
-
- public void setTemplateLanguage(TemplateLanguage templateLanguage) {
- this.templateLanguage = templateLanguage;
- }
-
public String getOutputContentType() {
return outputContentType;
}
- public RenditionType getType() {
- return type;
- }
-
public TemplateRendition getTemplateRendition(RenditionType type) throws
WebloggerException {
- return WebloggerFactory.getWeblogger()
-
.getWeblogManager().getTemplateRenditionByType(this.getId(),type);
- }
-
- public void setType(RenditionType type){
- this.type = type;
+ // only one rendition for now
+ return templateRendition;
}
public void setOutputContentType(String outputContentType) {
