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/07/06 06:06:15 UTC
svn commit: r553721 - in
/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger:
business/themes/SharedThemeFromDir.java
business/themes/SharedThemeTemplate.java
business/themes/ThemeManagerImpl.java pojos/WeblogTemplate.java
Author: agilliland
Date: Thu Jul 5 21:06:15 2007
New Revision: 553721
URL: http://svn.apache.org/viewvc?view=rev&rev=553721
Log:
officially deprecating the use of decorators in the rendering process. old templates which specify a decorator will continue to function as usual, but starting in 4.0 themes are no longer allowed to define decorators for templates so they can gradually phase themselves out.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java?view=diff&rev=553721&r1=553720&r2=553721
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java Thu Jul 5 21:06:15 2007
@@ -234,8 +234,6 @@
} else {
// construct ThemeTemplate representing this file
- // a few restrictions for now:
- // - decorator is always "_decorator" or null
SharedThemeTemplate theme_template = new SharedThemeTemplate(
this,
themeMetadata.getId()+":"+stylesheetTmpl.getName(),
@@ -247,8 +245,7 @@
new Date(templateFile.lastModified()),
stylesheetTmpl.getTemplateLanguage(),
false,
- false,
- null);
+ false);
// store it
this.stylesheet = theme_template;
@@ -295,14 +292,7 @@
continue;
}
- String decorator = "_decorator";
- if("_decorator".equals(templateMetadata.getName())) {
- decorator = null;
- }
-
// construct ThemeTemplate representing this file
- // a few restrictions for now:
- // - decorator is always "_decorator" or null
theme_template = new SharedThemeTemplate(
this,
themeMetadata.getId()+":"+templateMetadata.getName(),
@@ -314,8 +304,7 @@
new Date(templateFile.lastModified()),
templateMetadata.getTemplateLanguage(),
templateMetadata.isHidden(),
- templateMetadata.isNavbar(),
- decorator);
+ templateMetadata.isNavbar());
// add it to the theme
addTemplate(theme_template);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java?view=diff&rev=553721&r1=553720&r2=553721
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java Thu Jul 5 21:06:15 2007
@@ -40,7 +40,6 @@
private String templateLanguage = null;
private boolean hidden = false;
private boolean navbar = false;
- private String decoratorName = null;
private String outputContentType = null;
private SharedTheme myTheme = null;
@@ -50,7 +49,7 @@
public SharedThemeTemplate(SharedTheme theme, String id, String action, String name,
String desc, String contents, String link, Date date,
- String tempLang, boolean hid, boolean navbar, String decor) {
+ String tempLang, boolean hid, boolean navbar) {
this.myTheme = theme;
this.id = id;
@@ -63,18 +62,12 @@
this.templateLanguage = tempLang;
this.hidden = hid;
this.navbar = navbar;
- this.decoratorName = decor;
}
+ // NOTE: decorators are deprecated as of 4.0 but we leave this here because
+ // they need to be left in place for backwards compatability
public ThemeTemplate getDecorator() {
- if(decoratorName != null && !id.equals(decoratorName)) {
- try {
- return myTheme.getTemplateByName(decoratorName);
- } catch (WebloggerException ex) {
- // some kind of error getting decorator
- }
- }
return null;
}
@@ -151,11 +144,11 @@
}
public String getDecoratorName() {
- return decoratorName;
+ return null;
}
public void setDecoratorName(String decorator) {
- this.decoratorName = decorator;
+ // no-op
}
public String getOutputContentType() {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java?view=diff&rev=553721&r1=553720&r2=553721
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java Thu Jul 5 21:06:15 2007
@@ -229,7 +229,8 @@
template.setHidden(themeTemplate.isHidden());
template.setNavbar(themeTemplate.isNavbar());
template.setTemplateLanguage(themeTemplate.getTemplateLanguage());
- template.setDecoratorName(themeTemplate.getDecoratorName());
+ // NOTE: decorators are deprecated starting in 4.0
+ template.setDecoratorName(null);
template.setLastModified(new Date());
// save it
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java?view=diff&rev=553721&r1=553720&r2=553721
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java Thu Jul 5 21:06:15 2007
@@ -67,7 +67,6 @@
requiredTemplates.add("Weblog");
requiredTemplates.add("_day");
requiredTemplates.add("_css");
- requiredTemplates.add("_decorator");
}