You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jw...@apache.org on 2010/12/28 02:06:56 UTC
svn commit: r1053235 - in
/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin:
StyleSheetEntry.java StyleSheetNameResolver.java
Author: jwaldman
Date: Tue Dec 28 01:06:56 2010
New Revision: 1053235
URL: http://svn.apache.org/viewvc?rev=1053235&view=rev
Log:
TRINIDAD-1988 do not show the entire stack when the trinidad-skin's stylesheet file cannot be found
StyleSheetEntry: changed from severe to warning. don't show the entire FileNotFoundException, just the message
StyleSheetNameResolver: remove unused imports
Modified:
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java?rev=1053235&r1=1053234&r2=1053235&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java Tue Dec 28 01:06:56 2010
@@ -351,9 +351,9 @@ class StyleSheetEntry
}
catch (IOException e)
{
- if (_LOG.isSevere())
- _LOG.severe("CANNOT_LOAD_STYLESHEET", styleSheetName);
- _LOG.severe(e);
+ if (_LOG.isWarning())
+ _LOG.warning("CANNOT_LOAD_STYLESHEET", styleSheetName);
+ _LOG.warning(e.getMessage());
}
if (resolver == null)
{
@@ -388,7 +388,7 @@ class StyleSheetEntry
* @return NameResolver - either a StyleSheetNameResolver or the META-INF/services NameResolver
* implementation. The META-INF/services NameResolver implementation is the way a third party
* can customize the way they find and load files.
- * @throws IOException when the file could not be found in all of the ways we tried to find it.
+ * @throws FileNotFoundException when the file could not be found in all of the ways we tried to find it.
*/
private static NameResolver _getNameResolverForStyleSheetFile(
StyleContext context,
@@ -549,7 +549,7 @@ class StyleSheetEntry
private static String _getFileNotFoundMessage(File localStylesDir, String name)
{
StringBuffer buffer = new StringBuffer();
- buffer.append("Unable to locate style sheet \"");
+ buffer.append("Unable to locate the skin's style sheet \"");
buffer.append(name);
buffer.append("\" in ");
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java?rev=1053235&r1=1053234&r2=1053235&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java Tue Dec 28 01:06:56 2010
@@ -19,23 +19,14 @@
package org.apache.myfaces.trinidadinternal.skin;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.net.URL;
-import javax.faces.context.FacesContext;
-
-import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
-
-import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.share.io.InputStreamProvider;
import org.apache.myfaces.trinidad.share.io.NameResolver;
import org.apache.myfaces.trinidadinternal.share.io.DefaultNameResolver;
-import org.apache.myfaces.trinidadinternal.share.io.FileInputStreamProvider;
-import org.apache.myfaces.trinidadinternal.share.io.URLInputStreamProvider;
import org.apache.myfaces.trinidadinternal.style.StyleContext;
@@ -133,8 +124,6 @@ class StyleSheetNameResolver implements
private File _localStylesDir;
private InputStreamProvider _provider;
- private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(StyleSheetNameResolver.class);
- private static final String _SERVICES_PROVIDER_KEY =
- "org.apache.myfaces.trinidadinternal.skin.SERVICES_PROVIDER_KEY";
+
}