You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2012/08/24 18:54:00 UTC
svn commit: r1376990 -
/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
Author: sobryan
Date: Fri Aug 24 16:54:00 2012
New Revision: 1376990
URL: http://svn.apache.org/viewvc?rev=1376990&view=rev
Log:
TRINIDAD-2301 - avoid exceptions in design time when wrong style sheet name is specified in trinidad-skins.xml
Modified:
myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java?rev=1376990&r1=1376989&r2=1376990&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java Fri Aug 24 16:54:00 2012
@@ -30,6 +30,7 @@ import java.util.Map;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.share.io.InputStreamProvider;
import org.apache.myfaces.trinidad.share.io.NameResolver;
@@ -278,9 +279,15 @@ class StyleSheetEntry
}
catch (Exception e)
{
- if (_LOG.isSevere())
+ if (RenderingContext.getCurrentInstance().isDesignTime())
+ {
+ _LOG.warning("CANNOT_LOAD_STYLESHEET", styleSheetName);
+ }
+ else
+ {
_LOG.severe("CANNOT_LOAD_STYLESHEET", styleSheetName);
_LOG.severe(e);
+ }
}
return null;