svn commit: r1534684 - /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/provider/SkinProviderRegistry.java

[jw...@apache.org]

Author: jwaldman
Date: Tue Oct 22 16:06:25 2013
New Revision: 1534684

URL: http://svn.apache.org/r1534684
Log:
TRINIDAD-2406 externalize skin repositories by using SkinProvider SPI
Anand found and fixed a bug. The family and renderkit comparisons should ignore case.
Also removed unwanted code which added a duplicate skin object into the matching list
Thanks to Anand V Nath for the patch

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/provider/SkinProviderRegistry.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/provider/SkinProviderRegistry.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/provider/SkinProviderRegistry.java?rev=1534684&r1=1534683&r2=1534684&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/provider/SkinProviderRegistry.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/provider/SkinProviderRegistry.java Tue Oct 22 16:06:25 2013
@@ -124,14 +124,6 @@ public class SkinProviderRegistry extend
       }
     }
 
-    if (matchingSkin != null)
-    {
-      if (_LOG.isFine())
-        _LOG.fine("Skin obtained for metadata: " + skinMetadata + " from Skinfactory");
-
-      matchingSkins.add(matchingSkin);
-    }
-
     if (_LOG.isFine())
       _LOG.fine("Matches obtained for " + skinMetadata + ": " + matchingSkins.size());
 
@@ -243,7 +235,7 @@ public class SkinProviderRegistry extend
     List<Skin> filterList = new ArrayList<Skin>(skins.size());
 
     for (Skin skin : skins)
-      if (family.equals(skin.getFamily()))
+      if (family.equalsIgnoreCase(skin.getFamily()))
         filterList.add(skin);
 
     return filterList;
@@ -263,7 +255,7 @@ public class SkinProviderRegistry extend
     List<Skin> filterList = new ArrayList<Skin>(skins.size());
 
     for (Skin skin : skins)
-      if (renderKitId.equals(skin.getRenderKitId()))
+      if (renderKitId.equalsIgnoreCase(skin.getRenderKitId()))
         filterList.add(skin);
 
     return filterList;