You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gh...@apache.org on 2012/01/31 22:37:50 UTC
svn commit: r1238820 - in
/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor:
StylesheetEdit.java TemplateEdit.java Templates.java
Author: ghuber
Date: Tue Jan 31 21:37:49 2012
New Revision: 1238820
URL: http://svn.apache.org/viewvc?rev=1238820&view=rev
Log:
Text cleanup only.....
Modified:
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/TemplateEdit.java
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
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=1238820&r1=1238819&r2=1238820&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 Tue Jan 31 21:37:49 2012
@@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
@@ -130,18 +129,23 @@ public class StylesheetEdit extends UIAc
setTemplate(stylesheetTmpl);
}
-
- if (!WeblogTheme.CUSTOM.equals(getActionWeblog()
- .getEditorTheme())) {
- ThemeTemplate override =WebloggerFactory.getWeblogger()
- .getWeblogManager().getPageByLink(getActionWeblog(), getActionWeblog().getTheme().getStylesheet().getLink());
+ if (!WeblogTheme.CUSTOM.equals(getActionWeblog()
+ .getEditorTheme())) {
- if(override != null) {
- customStylesheet = true;
- }
+ ThemeTemplate override = WebloggerFactory
+ .getWeblogger()
+ .getWeblogManager()
+ .getPageByLink(
+ getActionWeblog(),
+ getActionWeblog().getTheme()
+ .getStylesheet().getLink());
+
+ if (override != null) {
+ customStylesheet = true;
+ }
}
-
+
} catch (WebloggerException ex) {
log.error(
"Error finding/adding stylesheet tempalate from weblog - "
@@ -230,7 +234,7 @@ public class StylesheetEdit extends UIAc
.saveTemplateCode(tc);
}
- // TODO do we want to set the contents on the here?
+ // TODO do we still want to set the contents here?
stylesheet.setContents(getContentsStandard());
// save template and flush
@@ -296,7 +300,7 @@ public class StylesheetEdit extends UIAc
WebloggerFactory.getWeblogger().getWeblogManager()
.saveTemplateCode(existingTemplateCode);
- // TODO do we want to set the contents on the here?
+ // TODO do we still want to set the contents here?
stylesheet.setContents(templateCode.getTemplate());
}
if (stylesheet.getTemplateCode("mobile") != null) {
Modified: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java?rev=1238820&r1=1238819&r2=1238820&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java (original)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java Tue Jan 31 21:37:49 2012
@@ -142,8 +142,6 @@ public class TemplateEdit extends UIActi
// notify caches
CacheManager.invalidate(template);
- // synchronizeThemes();
-
// success message
addMessage("pageForm.save.success", template.getName());
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=1238820&r1=1238819&r2=1238820&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 Tue Jan 31 21:37:49 2012
@@ -168,9 +168,6 @@ public class Templates extends UIAction
// flush results to db
WebloggerFactory.getWeblogger().flush();
-
- // add roller generated mobile template
- //addMobileTemplate();
} catch (WebloggerException ex) {
log.error("Error adding new template for weblog - "+getActionWeblog().getHandle(), ex);