Index: lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java,v
diff -u -r1.7.4.1 -r1.7.4.2
--- lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java	31 Jan 2007 01:30:24 -0000	1.7.4.1
+++ lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java	31 Jan 2007 03:30:53 -0000	1.7.4.2
@@ -23,37 +23,38 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.util;
 
-import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpSession;
+
 import org.lamsfoundation.lams.themes.dto.CSSThemeBriefDTO;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
-import org.lamsfoundation.lams.util.Configuration;
-import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
-import javax.servlet.http.HttpSession;
-import java.util.ArrayList;
-import java.util.List;
 
 public class CSSThemeUtil {
 	
-	private static Logger log = Logger.getLogger(CSSThemeUtil.class);
+	// private static Logger log = Logger.getLogger(CSSThemeUtil.class);
 	public static String DEFAULT_HTML_THEME = "defaultHTML";
+	
 	/**
 	 * Will return a list of stylesheets for the current user.
 	 * If the user does not have a specific stylesheet, then 
 	 * the default stylesheet will be included in this list.
 	 * The default stylesheet will always be included in this list.
 	 * @return
 	 */
-	public static List getAllUserThemes()
+	public static List<String> getAllUserThemes()
 	{
 		CSSThemeBriefDTO theme = null;
 
-		boolean userThemeIsDefault = false;
+		List<String> themeList = new ArrayList<String>();
 		
-		List themeList = new ArrayList();
-		
+		// Always have default as that defines everything. Other themes
+		// define changes.
+   		themeList.add(DEFAULT_HTML_THEME); 	   	
+
 	   	HttpSession ss = SessionManager.getSession();
 	   	if ( ss != null ) {
 	   		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
@@ -62,21 +63,14 @@
 	   			
 	   			if (theme != null ) {
 	   				String themeName = theme.getName();
-	   				if ( themeName != null) {
+	   				if ( themeName != null && ! themeName.equals(DEFAULT_HTML_THEME) ) {
 	   					themeList.add(theme.getName());
-	   					if ( themeName.equals(DEFAULT_HTML_THEME) ) {
-	   						userThemeIsDefault = true;
-	   					}
 	   				}
 	   			}
 	   		}
 	   		
 	   	}
 	 
-	   	if ( ! userThemeIsDefault ) {
-	   		themeList.add(DEFAULT_HTML_THEME);
-	   	}
-	   	
 	   	return themeList;
 	}