You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by aw...@apache.org on 2006/07/18 00:44:20 UTC
svn commit: r422931 -
/incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/skin/SkinFactoryImpl.java
Author: awiner
Date: Mon Jul 17 17:44:20 2006
New Revision: 422931
URL: http://svn.apache.org/viewvc?rev=422931&view=rev
Log:
Fix broken implementation of SkinFactoryImpl.addFactory()
Modified:
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/skin/SkinFactoryImpl.java
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/skin/SkinFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/skin/SkinFactoryImpl.java?rev=422931&r1=422930&r2=422931&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/skin/SkinFactoryImpl.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/skin/SkinFactoryImpl.java Mon Jul 17 17:44:20 2006
@@ -46,15 +46,14 @@
{
if (skinId == null || skin == null)
{
- if (_LOG.isWarning())
- _LOG.warning("Can't add Skin with null skinId or null skin");
- return;
- }
+ _LOG.warning("Can't add Skin with null skinId or null skin");
+ return;
+ }
- synchronized (_skins)
- {
- _skins.put(skinId, skin);
- }
+ synchronized (_skins)
+ {
+ _skins.put(skinId, skin);
+ }
}
@@ -71,13 +70,11 @@
if (skinId == null)
{
- if (_LOG.isWarning())
- _LOG.warning("Can't get Skin with null skinId");
+ _LOG.warning("Can't get Skin with null skinId");
return null;
}
Skin skin = null;
-
synchronized (_skins)
{
if (_skins.containsKey(skinId))
@@ -136,7 +133,11 @@
// family/renderKitId match, so return the simple skin
// that matches the renderkitid.
if (_LOG.isWarning())
- _LOG.warning("Can't find a skin that matches, so we will use the simple skin");
+ {
+ _LOG.warning("Can't find a skin that matches family " + family +
+ " and renderkit " + renderKitId + ", so we will" +
+ " use the simple skin");
+ }
if (renderKitId.equals(_RENDER_KIT_ID_PDA))
{