[jboss-cvs] jboss-seam/src/main/org/jboss/seam/navigation ...

[Gavin King]

  User: gavin   
  Date: 07/06/21 00:07:15

  Modified:    src/main/org/jboss/seam/navigation  Pages.java
  Log:
  yay, seam finally not dependent upon JSF jar :)
  
  Revision  Changes    Path
  1.5       +3 -3      jboss-seam/src/main/org/jboss/seam/navigation/Pages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Pages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/navigation/Pages.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- Pages.java	20 Jun 2007 17:45:57 -0000	1.4
  +++ Pages.java	21 Jun 2007 04:07:15 -0000	1.5
  @@ -41,6 +41,7 @@
   import org.jboss.seam.core.Expressions;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
  +import org.jboss.seam.core.ResourceLoader;
   import org.jboss.seam.core.Expressions.MethodExpression;
   import org.jboss.seam.core.Expressions.ValueExpression;
   import org.jboss.seam.faces.FacesMessages;
  @@ -50,7 +51,6 @@
   import org.jboss.seam.pageflow.Pageflow;
   import org.jboss.seam.security.Identity;
   import org.jboss.seam.security.NotLoggedInException;
  -import org.jboss.seam.util.Resources;
   import org.jboss.seam.util.Strings;
   import org.jboss.seam.util.XML;
   import org.jboss.seam.web.Parameters;
  @@ -97,7 +97,7 @@
      {
         for (String resource: resources)
         {
  -         InputStream stream = Resources.getResourceAsStream(resource);      
  +         InputStream stream = ResourceLoader.instance().getResourceAsStream(resource);      
            if (stream==null)
            {
               log.info("no pages.xml file found: " + resource);
  @@ -170,7 +170,7 @@
      {
         String resourceName = replaceExtension(viewId, ".page.xml");
         InputStream stream = resourceName==null ? 
  -            null : Resources.getResourceAsStream( resourceName.substring(1) );
  +            null : ResourceLoader.instance().getResourceAsStream( resourceName.substring(1) );
         if ( stream==null ) 
         {
            Page result = new Page(viewId);