You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2011/11/25 22:23:44 UTC
svn commit: r1206334 - in /roller/trunk:
weblogger-business/src/main/java/org/apache/roller/weblogger/business/
weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/
weblogger-business/src/main/java/org/apache/roller/weblogger/busi...
Author: snoopdave
Date: Fri Nov 25 21:23:42 2011
New Revision: 1206334
URL: http://svn.apache.org/viewvc?rev=1206334&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/pojos/WeblogThemeTemplateCode.java
- copied, changed from r1206329, roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplateCode.java
Removed:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplateCode.java
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.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/WeblogTemplate.java
roller/trunk/weblogger-business/src/main/resources/META-INF/persistence.xml
roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/business/WeblogTemplateCodeTest.java
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java?rev=1206334&r1=1206333&r2=1206334&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java Fri Nov 25 21:23:42 2011
@@ -185,13 +185,13 @@ public interface WeblogManager {
/**
* Get template code by Type.
*/
- public WeblogTemplateCode getTemplateCodeByType(String templateName, String type)
+ public WeblogThemeTemplateCode getTemplateCodeByType(String templateName, String type)
throws WebloggerException ;
/**
* Save template code
*/
- public void saveTemplateCode(WeblogTemplateCode templateCode) throws WebloggerException;
+ public void saveTemplateCode(WeblogThemeTemplateCode templateCode) throws WebloggerException;
/**
* Get website's pages
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?rev=1206334&r1=1206333&r2=1206334&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java Fri Nov 25 21:23:42 2011
@@ -257,7 +257,7 @@ public class JPAWeblogManagerImpl implem
roller.getWeblogManager().saveWeblog(page.getWebsite());
}
- public void saveTemplateCode(WeblogTemplateCode templateCode) throws WebloggerException {
+ public void saveTemplateCode(WeblogThemeTemplateCode templateCode) throws WebloggerException {
this.strategy.store(templateCode);
// update of the template should happen by saving template page.
}
@@ -610,7 +610,7 @@ public class JPAWeblogManagerImpl implem
}
}
- public WeblogTemplateCode getTemplateCodeByType(String templateId, String type) throws WebloggerException{
+ public WeblogThemeTemplateCode getTemplateCodeByType(String templateId, String type) throws WebloggerException{
if(templateId == null)
throw new WebloggerException("Template Name is null");
@@ -622,7 +622,7 @@ public class JPAWeblogManagerImpl implem
query.setParameter(1, templateId);
query.setParameter(2, type);
try {
- return (WeblogTemplateCode)query.getSingleResult();
+ return (WeblogThemeTemplateCode)query.getSingleResult();
} catch (NoResultException e) {
return null;
}
@@ -736,7 +736,7 @@ public class JPAWeblogManagerImpl implem
List codeList = codeQuery.getResultList();
for (Iterator itr = codeList.iterator(); itr.hasNext(); ) {
- WeblogTemplateCode templateCode = (WeblogTemplateCode) itr.next();
+ WeblogThemeTemplateCode templateCode = (WeblogThemeTemplateCode) itr.next();
this.strategy.remove(templateCode);
}
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=1206334&r1=1206333&r2=1206334&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:23:42 2011
@@ -247,7 +247,7 @@ public class ThemeManagerImpl implements
for (String type : ThemeManagerImpl.getTypesList()) {
TemplateCode templateCode = template.getTemplateCode(type);
if (templateCode != null) {
- WeblogTemplateCode weblogTemplateCode = new WeblogTemplateCode(template.getId(), type);
+ WeblogThemeTemplateCode weblogTemplateCode = new WeblogThemeTemplateCode(template.getId(), type);
weblogTemplateCode.setType(type);
weblogTemplateCode.setTemplate(templateCode.getTemplate());
weblogTemplateCode.setTemplateLanguage(templateCode.getTemplateLanguage());
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java?rev=1206334&r1=1206333&r2=1206334&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java Fri Nov 25 21:23:42 2011
@@ -233,7 +233,7 @@ public class WeblogTemplate implements T
return ACTION_CUSTOM.equals(getAction()) && !isRequired();
}
- public WeblogTemplateCode getTemplateCode(String type) throws WebloggerException {
+ public WeblogThemeTemplateCode getTemplateCode(String type) throws WebloggerException {
return WebloggerFactory.getWeblogger().getWeblogManager().getTemplateCodeByType(this.id, type);
}
Copied: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.java (from r1206329, 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/WeblogThemeTemplateCode.java?p2=roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.java&p1=roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplateCode.java&r1=1206329&r2=1206334&rev=1206334&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/WeblogThemeTemplateCode.java Fri Nov 25 21:23:42 2011
@@ -44,7 +44,7 @@ import javax.persistence.Table;
@NamedQuery(name = "WeblogThemplateCode.getTemplateCodesByTemplateId",
query = "SELECT c FROM WeblogTemplateCode c WHERE c.templateId = ?1 ")
})
-public class WeblogTemplateCode implements Serializable, TemplateCode {
+public class WeblogThemeTemplateCode implements Serializable, TemplateCode {
private static final long serialVersionUID = -1497618963802805151L;
@@ -56,12 +56,12 @@ public class WeblogTemplateCode implemen
private String ContentType = null;
private String templateLanguage = null;
- public WeblogTemplateCode(String templateId, String type){
+ public WeblogThemeTemplateCode(String templateId, String type){
this.templateId = templateId;
this.type = type;
}
- public WeblogTemplateCode() {
+ public WeblogThemeTemplateCode() {
}
@Id
@@ -125,8 +125,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 WeblogThemeTemplateCode != true) return false;
+ WeblogThemeTemplateCode o = (WeblogThemeTemplateCode)other;
return new EqualsBuilder()
.append(templateId, o.getTemplateId())
.append(template, o.getTemplate())
Modified: roller/trunk/weblogger-business/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/META-INF/persistence.xml?rev=1206334&r1=1206333&r2=1206334&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/META-INF/persistence.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/META-INF/persistence.xml Fri Nov 25 21:23:42 2011
@@ -1,34 +1,35 @@
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
- <persistence-unit name ="RollerPU" transaction-type="RESOURCE_LOCAL">
- <non-jta-data-source>${datasourceName}</non-jta-data-source>
- <mapping-file>org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/PingTarget.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/UserRole.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/TaskLock.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/User.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/Weblog.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/UserAttribute.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/MediaFile.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml </mapping-file>
- <class>org.apache.roller.weblogger.pojos.AutoPing</class>
- <class>org.apache.roller.weblogger.pojos.WeblogThemeAssoc</class>
- <class>org.apache.roller.weblogger.pojos.WeblogTemplateCode</class>
- </persistence-unit>
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence">
+ <persistence-unit name="RollerPU" transaction-type="RESOURCE_LOCAL">
+ <non-jta-data-source>${datasourceName}</non-jta-data-source>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/PingTarget.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/UserRole.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/TaskLock.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/User.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/Weblog.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/UserAttribute.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/MediaFile.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml </mapping-file>
+ <class>org.apache.roller.weblogger.pojos.AutoPing</class>
+ <class>org.apache.roller.weblogger.pojos.WeblogThemeAssoc</class>
+ <class>org.apache.roller.weblogger.pojos.WeblogThemeTemplateCode</class>
+ </persistence-unit>
</persistence>
Modified: roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/business/WeblogTemplateCodeTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/business/WeblogTemplateCodeTest.java?rev=1206334&r1=1206333&r2=1206334&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/business/WeblogTemplateCodeTest.java (original)
+++ roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/business/WeblogTemplateCodeTest.java Fri Nov 25 21:23:42 2011
@@ -27,7 +27,7 @@ import org.apache.roller.weblogger.TestU
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
-import org.apache.roller.weblogger.pojos.WeblogTemplateCode;
+import org.apache.roller.weblogger.pojos.WeblogThemeTemplateCode;
public class WeblogTemplateCodeTest extends TestCase{
public static Log log = LogFactory.getLog(WeblogPageTest.class);
@@ -35,8 +35,8 @@ public class WeblogTemplateCodeTest exte
User testUser = null;
Weblog testWeblog = null;
WeblogTemplate testPage = null;
- WeblogTemplateCode standardCode = null;
- WeblogTemplateCode mobileCode = null;
+ WeblogThemeTemplateCode standardCode = null;
+ WeblogThemeTemplateCode mobileCode = null;
public WeblogTemplateCodeTest(String name) {
@@ -110,13 +110,13 @@ public class WeblogTemplateCodeTest exte
//create standard template coce
- WeblogTemplateCode standardTemplateCode = new WeblogTemplateCode(testPage.getId(),"standard");
+ WeblogThemeTemplateCode standardTemplateCode = new WeblogThemeTemplateCode(testPage.getId(),"standard");
standardTemplateCode.setTemplate("standard.template.code");
standardTemplateCode.setTemplateLanguage("velocity");
mgr.saveTemplateCode(standardTemplateCode);
//TestUtils.endSession(true);
//create mobile code
- WeblogTemplateCode mobileTemplateCode = new WeblogTemplateCode(testPage.getId(),"mobile");
+ WeblogThemeTemplateCode mobileTemplateCode = new WeblogThemeTemplateCode(testPage.getId(),"mobile");
mobileTemplateCode.setTemplate("mobile.template.code");
mobileTemplateCode.setTemplateLanguage("velocity");
mgr.saveTemplateCode(mobileTemplateCode);
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=1206334&r1=1206333&r2=1206334&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:23:42 2011
@@ -96,11 +96,11 @@ public class StylesheetEdit extends UIAc
stylesheetTmpl.setTemplateLanguage(stylesheet.getTemplateLanguage());
// create template codes for available template code Types
- WeblogTemplateCode standardTemplateCode = new WeblogTemplateCode(stylesheetTmpl.getId(),"standard");
+ WeblogThemeTemplateCode standardTemplateCode = new WeblogThemeTemplateCode(stylesheetTmpl.getId(),"standard");
standardTemplateCode.setTemplate(stylesheetTmpl.getContents());
standardTemplateCode.setTemplateLanguage(stylesheetTmpl.getTemplateLanguage());
- WeblogTemplateCode mobileTemplateCode = new WeblogTemplateCode(stylesheetTmpl.getId(),"mobile");
+ WeblogThemeTemplateCode mobileTemplateCode = new WeblogThemeTemplateCode(stylesheetTmpl.getId(),"mobile");
mobileTemplateCode.setTemplate(stylesheetTmpl.getContents());
mobileTemplateCode.setTemplateLanguage(stylesheetTmpl.getTemplateLanguage());
@@ -127,7 +127,7 @@ public class StylesheetEdit extends UIAc
if(getTemplate() == null) {
return ERROR;
}
- WeblogTemplateCode templateCode = null;
+ WeblogThemeTemplateCode templateCode = null;
try {
templateCode = getTemplate().getTemplateCode(getType());
} catch (WebloggerException e) {
@@ -162,7 +162,7 @@ public class StylesheetEdit extends UIAc
WeblogTemplate stylesheet = getTemplate();
stylesheet.setLastModified(new Date());
- WeblogTemplateCode templateCode = stylesheet.getTemplateCode(getType());
+ WeblogThemeTemplateCode templateCode = stylesheet.getTemplateCode(getType());
templateCode.setTemplate(getContents());
// stylesheet.setContents(getContents());
@@ -222,7 +222,7 @@ public class StylesheetEdit extends UIAc
//stylesheet.setContents(theme.getStylesheet().getContents());
//save template code which was persisted in DB
- WeblogTemplateCode existingTemplateCode = stylesheet.getTemplateCode(getType());
+ WeblogThemeTemplateCode existingTemplateCode = stylesheet.getTemplateCode(getType());
existingTemplateCode.setTemplate(templateCode.getTemplate());
WebloggerFactory.getWeblogger().getWeblogManager().saveTemplateCode(existingTemplateCode);
// save template and flush
Modified: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java?rev=1206334&r1=1206333&r2=1206334&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java (original)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java Fri Nov 25 21:23:42 2011
@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFac
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
-import org.apache.roller.weblogger.pojos.WeblogTemplateCode;
+import org.apache.roller.weblogger.pojos.WeblogThemeTemplateCode;
/**
@@ -154,21 +154,21 @@ public class TemplateEditBean {
if (dataHolder.getTemplateCode("standard") != null) {
// if we have a template, then set it
- WeblogTemplateCode tc = dataHolder.getTemplateCode("standard");
+ WeblogThemeTemplateCode tc = dataHolder.getTemplateCode("standard");
tc.setTemplate(contentsStandard);
WebloggerFactory.getWeblogger().getWeblogManager().saveTemplateCode(tc);
} else {
// otherwise create it, then set it
- WeblogTemplateCode tc = new WeblogTemplateCode(dataHolder.getId(), "standard");
+ WeblogThemeTemplateCode tc = new WeblogThemeTemplateCode(dataHolder.getId(), "standard");
tc.setTemplate(dataHolder.getContents());
WebloggerFactory.getWeblogger().getWeblogManager().saveTemplateCode(tc);
}
if (dataHolder.getTemplateCode("mobile") != null) {
- WeblogTemplateCode tc = dataHolder.getTemplateCode("mobile");
+ WeblogThemeTemplateCode tc = dataHolder.getTemplateCode("mobile");
tc.setTemplate(contentsMobile);
} else {
- WeblogTemplateCode tc = new WeblogTemplateCode(dataHolder.getId(), "mobile");
+ WeblogThemeTemplateCode tc = new WeblogThemeTemplateCode(dataHolder.getId(), "mobile");
tc.setTemplate(""); // empty, we've got no default mobile template
WebloggerFactory.getWeblogger().getWeblogManager().saveTemplateCode(tc);
}
Modified: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java?rev=1206334&r1=1206333&r2=1206334&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java (original)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java Fri Nov 25 21:23:42 2011
@@ -25,7 +25,7 @@ import org.apache.roller.weblogger.Weblo
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
-import org.apache.roller.weblogger.pojos.WeblogTemplateCode;
+import org.apache.roller.weblogger.pojos.WeblogThemeTemplateCode;
import org.apache.roller.weblogger.pojos.WeblogTheme;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -147,8 +147,8 @@ public class Templates extends UIAction
WebloggerFactory.getWeblogger().getWeblogManager().savePage( newTemplate );
//Create weblog template codes for available types.
- WeblogTemplateCode standardTemplCode = new WeblogTemplateCode(newTemplate.getId(),"standard");
- WeblogTemplateCode mobileTemplCode = new WeblogTemplateCode(newTemplate.getId(),"mobile");
+ WeblogThemeTemplateCode standardTemplCode = new WeblogThemeTemplateCode(newTemplate.getId(),"standard");
+ WeblogThemeTemplateCode mobileTemplCode = new WeblogThemeTemplateCode(newTemplate.getId(),"mobile");
standardTemplCode.setTemplate(newTemplate.getContents());
standardTemplCode.setTemplateLanguage("velocity");