You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2006/06/30 13:10:08 UTC

svn commit: r418236 - /myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java

Author: weber
Date: Fri Jun 30 04:10:08 2006
New Revision: 418236

URL: http://svn.apache.org/viewvc?rev=418236&view=rev
Log:
fix for TOBAGO-86 (resource dirs needs defined order)

Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java?rev=418236&r1=418235&r2=418236&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java Fri Jun 30 04:10:08 2006
@@ -39,7 +39,7 @@
   private List<String> supportedThemeNames;
   private Theme defaultTheme;
   private String defaultThemeName;
-  private Set<String> resourceDirs;
+  private List<String> resourceDirs;
   private List<MappingRule> mappingRules;
   private boolean ajaxEnabled;
   private Map<String, Theme> availableTheme;
@@ -48,7 +48,7 @@
   public TobagoConfig() {
     supportedThemeNames = new ArrayList<String>();
     supportedThemes = new ArrayList<Theme>();
-    resourceDirs = new HashSet<String>();
+    resourceDirs = new ArrayList<String>();
   }
 
   public void addMappingRule(MappingRule mappingRule) {
@@ -148,13 +148,20 @@
   }
 
   public void addResourceDir(String resourceDir) {
-    if (LOG.isInfoEnabled()) {
-      LOG.info("adding resourceDir = '" + resourceDir + "'");
-    }
-    resourceDirs.add(resourceDir);
+      if (! resourceDirs.contains(resourceDir)) {
+          if (LOG.isInfoEnabled()) {
+            LOG.info("adding resourceDir = '" + resourceDir + "'");
+          }
+          resourceDirs.add(resourceDir);
+      } else {
+          if (LOG.isInfoEnabled()) {
+            LOG.info("resourceDirs already contains = '" + resourceDir + "'");
+          }
+      }
+
   }
 
-  public Set<String> getResourceDirs() {
+  public List<String> getResourceDirs() {
     return resourceDirs;
   }