svn commit: r1617538 - in /roller/trunk/app/src/main/java/org/apache/roller/weblogger: business/themes/ThemeMetadataParser.java ui/struts2/editor/StylesheetEdit.java

[gmazza]

Author: gmazza
Date: Tue Aug 12 17:35:52 2014
New Revision: 1617538

URL: http://svn.apache.org/r1617538
Log:
Fix component type of custom stylesheets.

Modified:
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java?rev=1617538&r1=1617537&r2=1617538&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
 Tue Aug 12 17:35:52 2014
@@ -147,7 +147,7 @@ public class ThemeMetadataParser {
                     throw new ThemeParsingException("Invalid rendition type " 
+ renditionValue + " found.");
                 }
             } else {
-                // default to standard if type not provided (most templates 
don't have multiple renditions anyway)
+                // default to standard if type not provided, as most templates 
are single-rendition
                 rendition.setType(RenditionType.STANDARD);
             }
             String templateString = 
renditionElement.getChildText("templateLanguage");
@@ -209,7 +209,7 @@ public class ThemeMetadataParser {
                     throw new ThemeParsingException("Invalid rendition type " 
+ renditionValue + " found.");
                 }
             } else {
-                // default to standard if type not provided (most templates 
don't have multiple renditions anyway)
+                // default to standard if type not provided, as most templates 
are single-rendition
                 rendition.setType(RenditionType.STANDARD);
             }
             String templateString = 
renditionElement.getChildText("templateLanguage");

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java?rev=1617538&r1=1617537&r2=1617538&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
 Tue Aug 12 17:35:52 2014
@@ -86,7 +86,7 @@ public class StylesheetEdit extends UIAc
                     // template doesn't exist yet, so create it
                     WeblogTemplate stylesheetTmpl = new WeblogTemplate();
                     stylesheetTmpl.setWeblog(getActionWeblog());
-                    
stylesheetTmpl.setAction(ThemeTemplate.ComponentType.CUSTOM);
+                    
stylesheetTmpl.setAction(ThemeTemplate.ComponentType.STYLESHEET);
                     stylesheetTmpl.setName(stylesheet.getName());
                     stylesheetTmpl.setDescription(stylesheet.getDescription());
                     stylesheetTmpl.setLink(stylesheet.getLink());