[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui ...

[Christian Bauer]

  User: cbauer  
  Date: 07/06/21 07:05:48

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/ui  
                        WikiFormattedTextHandler.java
                        UIWikiFormattedText.java
  Log:
  Make it deploy and run on latest Seam CVS, still some bugs
  
  Revision  Changes    Path
  1.8       +6 -4      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WikiFormattedTextHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- WikiFormattedTextHandler.java	26 Apr 2007 05:29:17 -0000	1.7
  +++ WikiFormattedTextHandler.java	21 Jun 2007 11:05:48 -0000	1.8
  @@ -14,8 +14,9 @@
   import javax.faces.component.UIComponent;
   
   import org.jboss.seam.Component;
  +import org.jboss.seam.faces.ResourceLoader;
   import org.jboss.seam.contexts.Contexts;
  -import org.jboss.seam.ui.UILoadStyle;
  +import org.jboss.seam.ui.component.UILoadStyle;
   import org.jboss.seam.util.Resources;
   import org.jboss.seam.wiki.core.action.PluginPreferenceEditor;
   import org.jboss.seam.wiki.core.action.prefs.WikiPreferences;
  @@ -164,7 +165,7 @@
           if (currentViewId.equals(includeView)) return null;
   
           // Try to get the XHTML document
  -        return Resources.getResource(includeView);
  +        return ResourceLoader.instance().getResource(includeView);
       }
   
       private void includePluginFacelet(URL faceletURL, FaceletContext ctx, UIComponent parent) {
  @@ -188,8 +189,9 @@
           // Try to get the CSS for it
           WikiPreferences wikiPrefs = (WikiPreferences) Component.getInstance("wikiPreferences");
           String css = "/themes/" + wikiPrefs.getThemeName() + "/css/" + macroName + ".css";
  -        if (Resources.getResource(css) != null) {
  -            UILoadStyle style = new UILoadStyle();
  +        if (ResourceLoader.instance().getResource(css) != null) {
  +            // TODO: For Pete to fix, UILoadStyle doesn't load the CSS anymore
  +            UILoadStyle style = UILoadStyle.newInstance();
               style.setSrc(css);
               cmp.getChildren().add(style);
               // Clear these out in the next build phase
  
  
  
  1.24      +1 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIWikiFormattedText.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -b -r1.23 -r1.24
  --- UIWikiFormattedText.java	12 Jun 2007 17:51:00 -0000	1.23
  +++ UIWikiFormattedText.java	21 Jun 2007 11:05:48 -0000	1.24
  @@ -11,9 +11,9 @@
   import javax.faces.context.ResponseWriter;
   
   import org.jboss.seam.Component;
  +import org.jboss.seam.ui.util.JSF;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.core.Conversation;
  -import org.jboss.seam.ui.JSF;
   import org.jboss.seam.wiki.core.engine.WikiLink;
   import org.jboss.seam.wiki.core.engine.WikiTextParser;
   import org.jboss.seam.wiki.core.engine.WikiTextRenderer;