Author: nbelaevski Date: 2007-07-19 12:28:21 -0400 (Thu, 19 Jul 2007) New Revision: 1704 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/ElementBase.java Log: http://jira.jboss.com/jira/browse/RF-269 - baseSkin parameter handling added Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/ElementBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/ElementBase.java 2007-07-19 16:19:50 UTC (rev 1703) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/ElementBase.java 2007-07-19 16:28:21 UTC (rev 1704) @@ -439,14 +439,19 @@ Object getValue(TemplateContext context) { FacesContext facesContext = context.getFacesContext(); SkinFactory skinFactory = SkinFactory.getInstance(); - Object result = skinFactory.getSkin(facesContext).getParameter(facesContext,_skin,_default); - if (_baseSkin != null && (result == null || result.toString().length()==0)) { - if ("inherit".equals(_baseSkin)) { - result = skinFactory.getBaseSkin(facesContext).getParameter(facesContext,_skin,_default); - } else { - result = skinFactory.getBaseSkin(facesContext).getParameter(facesContext,_baseSkin,_default); + Object result = null; + + if (_skin != null) { + result = skinFactory.getSkin(facesContext).getParameter(facesContext,_skin,_default); + } else { + if (_baseSkin != null) { + result = skinFactory.getSkin(facesContext).getParameter(facesContext,_baseSkin,_default); } } + + if (_baseSkin != null && (result == null || result.toString().length()==0)) { + result = skinFactory.getBaseSkin(facesContext).getParameter(facesContext,_baseSkin,_default); + } return result; } }