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 2006/11/29 18:27:36 UTC
svn commit: r480636 -
/incubator/roller/trunk/src/org/apache/roller/business/ThemeManagerImpl.java
Author: agilliland
Date: Wed Nov 29 09:27:35 2006
New Revision: 480636
URL: http://svn.apache.org/viewvc?view=rev&rev=480636
Log:
fix bug in ThemeManagerImpl which was causing the weblog theme to not get updated to CUSTOM after a theme import.
Modified:
incubator/roller/trunk/src/org/apache/roller/business/ThemeManagerImpl.java
Modified: incubator/roller/trunk/src/org/apache/roller/business/ThemeManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/ThemeManagerImpl.java?view=diff&rev=480636&r1=480635&r2=480636
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/ThemeManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/ThemeManagerImpl.java Wed Nov 29 09:27:35 2006
@@ -20,7 +20,6 @@
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.FilenameFilter;
import java.io.InputStreamReader;
import java.util.ArrayList;
@@ -34,14 +33,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.business.ThemeNotFoundException;
import org.apache.roller.config.RollerConfig;
-import org.apache.roller.business.FileIOException;
-import org.apache.roller.business.FileManager;
-import org.apache.roller.business.FilePathException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.ThemeManager;
-import org.apache.roller.business.UserManager;
import org.apache.roller.pojos.Theme;
import org.apache.roller.pojos.ThemeTemplate;
import org.apache.roller.pojos.WeblogTemplate;
@@ -145,8 +137,7 @@
try {
UserManager userMgr = RollerFactory.getRoller().getUserManager();
- Collection templates = theme.getTemplates();
- Iterator iter = templates.iterator();
+ Iterator iter = theme.getTemplates().iterator();
ThemeTemplate theme_template = null;
while ( iter.hasNext() ) {
theme_template = (ThemeTemplate) iter.next();
@@ -189,25 +180,22 @@
userMgr.savePage( template );
// we just created and saved the default page for the first
- // time then we need to set website.defaultpageid
+ // time so we need to set website.defaultpageid
if(theme_template.getName().equals(WeblogTemplate.DEFAULT_PAGE)) {
website.setDefaultPageId(template.getId());
-
- // update this website's theme to custom
- website.setEditorTheme(Theme.CUSTOM);
-
- // save our updated website
- userMgr.saveWebsite(website);
}
}
}
+ // always update this weblog's theme to custom and then save
+ website.setEditorTheme(Theme.CUSTOM);
+ userMgr.saveWebsite(website);
+
// now lets import all the theme resources
FileManager fileMgr = RollerFactory.getRoller().getFileManager();
- List resources = theme.getResources();
- Iterator iterat = resources.iterator();
+ Iterator iterat = theme.getResources().iterator();
File resourceFile = null;
while ( iterat.hasNext() ) {
resourceFile = (File) iterat.next();
@@ -235,7 +223,7 @@
}
} catch (Exception e) {
- log.error("ERROR in action",e);
+ log.error("ERROR importing theme", e);
throw new RollerException( e );
}
}