Author: snoopdave
Date: Fri Nov 25 21:15:40 2011
New Revision: 1206329
URL: http://svn.apache.org/viewvc?rev=1206329&view=rev
Log:
Introducing a new TemplateCode interface to allow the new template code classes
fit into better to the Roller template system design.
Added:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplateCode.java
- copied, changed from r1175172,
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplateCode.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TemplateCode.java
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Template.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Theme.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplateCode.java
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java?rev=1206329&r1=1206328&r2=1206329&view=diff
==============================================================================
---
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
(original)
+++
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
Fri Nov 25 21:15:40 2011
@@ -18,6 +18,7 @@
package org.apache.roller.weblogger.business.themes;
+import org.apache.roller.weblogger.pojos.TemplateCode;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -269,7 +270,7 @@ public class SharedThemeFromDir extends
for (String type : availableTypesList) {
- WeblogTemplateCode templateCode =
createTemplateCode(theme_template.getId(),
stylesheetTmpl.getTemplateCode(type));
+ TemplateCode templateCode =
createTemplateCode(theme_template.getId(),
stylesheetTmpl.getTemplateCode(type));
theme_template.addTemplateCode(type,
templateCode);
}
@@ -361,7 +362,7 @@ public class SharedThemeFromDir extends
templateMetadata.isNavbar());
for (String type : availableTypesList) {
- WeblogTemplateCode templateCode =
createTemplateCode(theme_template.getId(),
+ TemplateCode templateCode =
createTemplateCode(theme_template.getId(),
templateMetadata.getTemplateCode(type));
theme_template.addTemplateCode(type,
templateCode);
@@ -428,28 +429,28 @@ public class SharedThemeFromDir extends
this.resources.put(normalizedPath, resource);
}
- private WeblogTemplateCode createTemplateCode(String templateId,
ThemeMetadataTemplateCode templateCodeMetadata){
- WeblogTemplateCode templateCode = new WeblogTemplateCode();
+ private TemplateCode createTemplateCode(String templateId,
ThemeMetadataTemplateCode templateCodeMetadata) {
+ TemplateCode templateCode = new SharedThemeTemplateCode();
- // construct File object from path
- File templateFile = new File(this.themeDir + File.separator +
- templateCodeMetadata.getContentsFile());
-
- // read stylesheet contents
- String contents = loadTemplateFile(templateFile);
- if(contents == null) {
- // if we don't have any contents then load no string
- contents ="";
- log.error("Couldn't load stylesheet theme [" + this.getName()
+ "] template file ["+templateFile+"]");
- }
-
- templateCode.setTemplateId(templateId);
- templateCode.setTemplate(contents);
-
templateCode.setTemplateLanguage(templateCodeMetadata.getTemplateLang());
- templateCode.setType(templateCodeMetadata.getType());
- templateCode.setContentType(templateCodeMetadata.getContentType());
+ // construct File object from path
+ File templateFile = new File(this.themeDir + File.separator
+ + templateCodeMetadata.getContentsFile());
+
+ // read stylesheet contents
+ String contents = loadTemplateFile(templateFile);
+ if (contents == null) {
+ // if we don't have any contents then load no string
+ contents = "";
+ log.error("Couldn't load stylesheet theme [" +
this.getName() + "] template file [" + templateFile + "]");
+ }
- return templateCode;
- }
+ templateCode.setTemplateId(templateId);
+ templateCode.setTemplate(contents);
+
templateCode.setTemplateLanguage(templateCodeMetadata.getTemplateLang());
+ templateCode.setType(templateCodeMetadata.getType());
+
templateCode.setContentType(templateCodeMetadata.getContentType());
+
+ return templateCode;
+ }
}
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java?rev=1206329&r1=1206328&r2=1206329&view=diff
==============================================================================
---
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
(original)
+++
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
Fri Nov 25 21:15:40 2011
@@ -18,11 +18,9 @@
package org.apache.roller.weblogger.business.themes;
+import org.apache.roller.weblogger.pojos.TemplateCode;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.ThemeTemplate;
-import org.apache.roller.weblogger.pojos.WeblogTemplate;
-import org.apache.roller.weblogger.pojos.WeblogTemplateCode;
import java.io.Serializable;
import java.util.Date;
@@ -51,7 +49,7 @@ public class SharedThemeTemplate impleme
private SharedTheme myTheme = null;
//hash map to cache template Code objects parsed
- private HashMap<String,WeblogTemplateCode> templateCodeHashMap = new
HashMap<String, WeblogTemplateCode>();
+ private HashMap<String, TemplateCode> templateCodeHashMap = new
HashMap<String, TemplateCode>();
public SharedThemeTemplate() {}
@@ -185,7 +183,7 @@ public class SharedThemeTemplate impleme
return type;
}
- public WeblogTemplateCode getTemplateCode(String type) throws
WebloggerException {
+ public TemplateCode getTemplateCode(String type) throws WebloggerException
{
return templateCodeHashMap.get(type);
}
@@ -193,7 +191,7 @@ public class SharedThemeTemplate impleme
this.type = type;
}
- public void addTemplateCode(String type , WeblogTemplateCode templateCode){
+ public void addTemplateCode(String type , TemplateCode templateCode){
this.templateCodeHashMap.put(type ,templateCode);
}
}
Copied:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplateCode.java
(from r1175172,
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplateCode.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplateCode.java?p2=roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplateCode.java&p1=roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplateCode.java&r1=1175172&r2=1206329&rev=1206329&view=diff
==============================================================================
---
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplateCode.java
(original)
+++
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplateCode.java
Fri Nov 25 21:15:40 2011
@@ -16,86 +16,58 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.pojos;
+package org.apache.roller.weblogger.business.themes;
+import org.apache.roller.weblogger.pojos.TemplateCode;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.openjpa.jdbc.kernel.exps.Null;
-import org.apache.roller.util.UUIDGenerator;
-
-import javax.mail.internet.ContentType;
-import javax.persistence.*;
import java.io.Serializable;
/**
* A pojo that will maintain different template codes for one template
*/
+public class SharedThemeTemplateCode implements Serializable, TemplateCode {
-@Entity
-@Table(name = "rol_templatecode")
-@NamedQueries({
-@NamedQuery(name = "WeblogThemplateCode.getTemplateCodeByType",
- query = "SELECT c FROM WeblogTemplateCode c WHERE c.templateId = ?1
AND c.type =?2"),
-
- @NamedQuery(name = "WeblogThemplateCode.getTemplateCodesByTemplateId",
- query = "SELECT c FROM WeblogTemplateCode c WHERE c.templateId = ?1 ")
-})
-public class WeblogTemplateCode implements Serializable {
-
-
- private static final long serialVersionUID = -1497618963802805151L;
- private String id = UUIDGenerator.generateUUID();
private String templateId = null;
- //template contents
private String template = null;
private String type = null;
private String ContentType = null;
private String templateLanguage = null;
- public WeblogTemplateCode(String templateId, String type){
+ public SharedThemeTemplateCode(String templateId, String type){
this.templateId = templateId;
this.type = type;
}
- public WeblogTemplateCode() {
- }
-
- @Id
- @Column(nullable = false, updatable = false)
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
+ public SharedThemeTemplateCode() {
}
- @Basic
- @Column(nullable = false, updatable = true, insertable = true)
+ @Override
public String getTemplate() {
return template;
}
+ @Override
public void setTemplate(String template) {
this.template = template;
}
- @Basic
- @Column(nullable = false, updatable = true, insertable = true)
+ @Override
public String getTemplateId() {
return templateId;
}
+ @Override
public void setTemplateId(String templateId) {
this.templateId = templateId;
}
- @Basic
- @Column(nullable = false, updatable = true, insertable = true)
+ @Override
public String getType() {
return type;
}
+ @Override
public void setType(String type) {
this.type = type;
}
@@ -105,8 +77,7 @@ public class WeblogTemplateCode implemen
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.templateId);
+ buf.append(this.templateId);
buf.append(", [ ").append(this.template);
buf.append("] , ").append(this.type);
buf.append("}");
@@ -115,8 +86,8 @@ public class WeblogTemplateCode implemen
public boolean equals(Object other) {
if (other == this) return true;
- if (other instanceof WeblogTemplateCode != true) return false;
- WeblogTemplateCode o = (WeblogTemplateCode)other;
+ if (other instanceof SharedThemeTemplateCode != true) return false;
+ SharedThemeTemplateCode o = (SharedThemeTemplateCode)other;
return new EqualsBuilder()
.append(templateId, o.getTemplateId())
.append(template, o.getTemplate())
@@ -130,22 +101,22 @@ public class WeblogTemplateCode implemen
.toHashCode();
}
- @Basic
- @Column(name ="templatelang",unique = false, updatable = true, insertable
= true)
+ @Override
public String getTemplateLanguage() {
return templateLanguage;
}
+ @Override
public void setTemplateLanguage(String templateLanguage) {
this.templateLanguage = templateLanguage;
}
- @Basic
- @Column(name= "contenttype", unique = false, updatable = true, insertable
= true)
+ @Override
public String getContentType() {
return ContentType;
}
+ @Override
public void setContentType(String contentType) {
ContentType = contentType;
}
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java?rev=1206329&r1=1206328&r2=1206329&view=diff
==============================================================================
---
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
(original)
+++
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
Fri Nov 25 21:15:40 2011
@@ -17,6 +17,7 @@
*/
package org.apache.roller.weblogger.business.themes;
+import org.apache.roller.weblogger.pojos.TemplateCode;
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
@@ -241,25 +242,19 @@ public class ThemeManagerImpl implements
// save it
wmgr.savePage(template);
}
- // creating template codes
- for (String type : ThemeManagerImpl.getTypesList()) {
- WeblogTemplateCode templateCode =
template.getTemplateCode(type);
- // if there are no template codes create it
- if (templateCode == null) {
- WeblogTemplateCode themeTemplateCode =
themeTemplate.getTemplateCode(type);
-
- if(themeTemplateCode== null){
- throw new WebloggerException("No templateCode found
for template :"+themeTemplate.getId()+
- " of type :" +type);
- }
- templateCode = new WeblogTemplateCode(template.getId(),
type);
- templateCode.setTemplate(themeTemplateCode.getTemplate());
-
templateCode.setTemplateLanguage(themeTemplateCode.getTemplateLanguage());
-
WebloggerFactory.getWeblogger().getWeblogManager().saveTemplateCode(templateCode);
+ // create weblog template code objects and save them
+ for (String type : ThemeManagerImpl.getTypesList()) {
+ TemplateCode templateCode = template.getTemplateCode(type);
+ if (templateCode != null) {
+ WeblogTemplateCode weblogTemplateCode = new
WeblogTemplateCode(template.getId(), type);
+ weblogTemplateCode.setType(type);
+ weblogTemplateCode.setTemplate(templateCode.getTemplate());
+
weblogTemplateCode.setTemplateLanguage(templateCode.getTemplateLanguage());
+
weblogTemplateCode.setContentType(templateCode.getContentType());
+
WebloggerFactory.getWeblogger().getWeblogManager().saveTemplateCode(weblogTemplateCode);
}
}
-
}
// now, see if the weblog has left over action templates that
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java?rev=1206329&r1=1206328&r2=1206329&view=diff
==============================================================================
---
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java
(original)
+++
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java
Fri Nov 25 21:15:40 2011
@@ -99,8 +99,9 @@ public class StaticTemplate implements T
return type;
}
- public WeblogTemplateCode getTemplateCode(String type) throws
WebloggerException {
- return
WebloggerFactory.getWeblogger().getWeblogManager().getTemplateCodeByType(this.getId(),type);
+ public TemplateCode getTemplateCode(String type) throws WebloggerException
{
+ return (TemplateCode)WebloggerFactory.getWeblogger()
+
.getWeblogManager().getTemplateCodeByType(this.getId(),type);
}
public void setType(String type){
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java?rev=1206329&r1=1206328&r2=1206329&view=diff
==============================================================================
---
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
(original)
+++
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
Fri Nov 25 21:15:40 2011
@@ -107,7 +107,7 @@ public class StaticThemeTemplate impleme
return type;
}
- public WeblogTemplateCode getTemplateCode(String type) throws
WebloggerException {
+ public TemplateCode getTemplateCode(String type) throws WebloggerException
{
return
WebloggerFactory.getWeblogger().getWeblogManager().getTemplateCodeByType(this.id,
type);
}
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Template.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Template.java?rev=1206329&r1=1206328&r2=1206329&view=diff
==============================================================================
---
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Template.java
(original)
+++
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Template.java
Fri Nov 25 21:15:40 2011
@@ -87,6 +87,6 @@ public interface Template {
*
* get the Template code object for the given type.
*/
- public WeblogTemplateCode getTemplateCode(String type) throws
WebloggerException;
+ public TemplateCode getTemplateCode(String type) throws WebloggerException;
}
Added:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TemplateCode.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TemplateCode.java?rev=1206329&view=auto
==============================================================================
---
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TemplateCode.java
(added)
+++
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TemplateCode.java
Fri Nov 25 21:15:40 2011
@@ -0,0 +1,46 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. The ASF licenses this file to You
+* under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License. For additional information regarding
+* copyright in this work, please see the NOTICE file in the top level
+* directory of this distribution.
+*/
+
+package org.apache.roller.weblogger.pojos;
+
+/**
+ * Template code for one type of device.
+ */
+public interface TemplateCode {
+
+ String getContentType();
+
+ String getTemplate();
+
+ String getTemplateId();
+
+ String getTemplateLanguage();
+
+ String getType();
+
+ void setContentType(String contentType);
+
+ void setTemplate(String template);
+
+ void setTemplateId(String templateId);
+
+ void setTemplateLanguage(String templateLanguage);
+
+ void setType(String type);
+
+}
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Theme.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Theme.java?rev=1206329&r1=1206328&r2=1206329&view=diff
==============================================================================
---
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Theme.java
(original)
+++
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Theme.java
Fri Nov 25 21:15:40 2011
@@ -42,11 +42,6 @@ public interface Theme {
public String getName();
/**
- * Metadata to identify a theme Type eg: standard , mobile etc.
- */
- public String getType();
-
- /**
* A description of the Theme.
*/
public String getDescription();
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplateCode.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplateCode.java?rev=1206329&r1=1206328&r2=1206329&view=diff
==============================================================================
---
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplateCode.java
(original)
+++
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplateCode.java
Fri Nov 25 21:15:40 2011
@@ -20,12 +20,16 @@ package org.apache.roller.weblogger.pojo
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.openjpa.jdbc.kernel.exps.Null;
import org.apache.roller.util.UUIDGenerator;
-import javax.mail.internet.ContentType;
-import javax.persistence.*;
import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
/**
* A pojo that will maintain different template codes for one template
@@ -40,7 +44,7 @@ import java.io.Serializable;
@NamedQuery(name = "WeblogThemplateCode.getTemplateCodesByTemplateId",
query = "SELECT c FROM WeblogTemplateCode c WHERE c.templateId = ?1 ")
})
-public class WeblogTemplateCode implements Serializable {
+public class WeblogTemplateCode implements Serializable, TemplateCode {
private static final long serialVersionUID = -1497618963802805151L;
@@ -72,30 +76,36 @@ public class WeblogTemplateCode implemen
@Basic
@Column(nullable = false, updatable = true, insertable = true)
+ @Override
public String getTemplate() {
return template;
}
+ @Override
public void setTemplate(String template) {
this.template = template;
}
@Basic
@Column(nullable = false, updatable = true, insertable = true)
+ @Override
public String getTemplateId() {
return templateId;
}
+ @Override
public void setTemplateId(String templateId) {
this.templateId = templateId;
}
@Basic
@Column(nullable = false, updatable = true, insertable = true)
+ @Override
public String getType() {
return type;
}
+ @Override
public void setType(String type) {
this.type = type;
}
@@ -132,20 +142,24 @@ public class WeblogTemplateCode implemen
@Basic
@Column(name ="templatelang",unique = false, updatable = true, insertable
= true)
+ @Override
public String getTemplateLanguage() {
return templateLanguage;
}
+ @Override
public void setTemplateLanguage(String templateLanguage) {
this.templateLanguage = templateLanguage;
}
@Basic
@Column(name= "contenttype", unique = false, updatable = true, insertable
= true)
+ @Override
public String getContentType() {
return ContentType;
}
+ @Override
public void setContentType(String contentType) {
ContentType = contentType;
}
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java?rev=1206329&r1=1206328&r2=1206329&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
(original)
+++
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
Fri Nov 25 21:15:40 2011
@@ -28,8 +28,8 @@ import org.apache.velocity.runtime.resou
import org.apache.velocity.runtime.resource.loader.ResourceLoader;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.pojos.TemplateCode;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
-import org.apache.roller.weblogger.pojos.WeblogTemplateCode;
/**
@@ -96,7 +96,7 @@ public class RollerResourceLoader extend
name + "\" not found");
}
String contents;
- WeblogTemplateCode templateCode =
page.getTemplateCode(deviceType);
+ TemplateCode templateCode =
page.getTemplateCode(deviceType);
if (templateCode != null) {
contents = templateCode.getTemplate();
} else {
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java?rev=1206329&r1=1206328&r2=1206329&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
(original)
+++
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
Fri Nov 25 21:15:40 2011
@@ -30,6 +30,7 @@ import org.apache.roller.weblogger.util.
import java.util.Collections;
import java.util.Date;
import java.util.List;
+import org.apache.roller.weblogger.pojos.TemplateCode;
/**
@@ -213,7 +214,7 @@ public class StylesheetEdit extends UIAc
Theme theme = tmgr.getTheme(getActionWeblog().getEditorTheme());
//get weblogTemplateCode
- WeblogTemplateCode templateCode =
theme.getStylesheet().getTemplateCode(type);
+ TemplateCode templateCode =
theme.getStylesheet().getTemplateCode(type);
stylesheet.setContents(templateCode.getTemplate());
// lookup
