Author: jwaldman
Date: Fri Feb 9 17:34:43 2007
New Revision: 505606
URL: http://svn.apache.org/viewvc?view=rev&rev=505606
Log:
Allow style-sheet-names that are urls,
<style-sheet-name>http://myServer/skins/uni/uniSkin.css</style-sheet-name>
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java?view=diff&rev=505606&r1=505605&r2=505606
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java
Fri Feb 9 17:34:43 2007
@@ -168,15 +168,27 @@
// Gets an URL for the specified name
private URL _resolveURL(String name)
{
+ if (name == null)
+ return null;
+
FacesContext fContext = FacesContext.getCurrentInstance();
if (fContext != null)
{
try
{
- String rootName = _getRootName(name);
- URL url = fContext.getExternalContext().getResource(rootName);
- if (url != null)
- return url;
+ if (name.startsWith("http:"))
+ {
+ URL url = new URL(name);
+ if (url != null)
+ return url;
+ }
+ else
+ {
+ String rootName = _getRootName(name);
+ URL url = fContext.getExternalContext().getResource(rootName);
+ if (url != null)
+ return url;
+ }
}
catch (MalformedURLException e)
{
