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

[Christian Bauer]

  User: cbauer  
  Date: 07/08/25 13:59:27

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/util 
                        WikiUtil.java
  Log:
  Major refactoring of navigation
  
  Revision  Changes    Path
  1.12      +17 -12    jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WikiUtil.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- WikiUtil.java	17 Aug 2007 13:00:31 -0000	1.11
  +++ WikiUtil.java	25 Aug 2007 17:59:27 -0000	1.12
  @@ -95,29 +95,29 @@
           if (node == null || node.getId() == null) return "";
           if (isFile(node)) return renderFileLink((File)node);
           WikiPreferences wikiPrefs = (WikiPreferences) Component.getInstance("wikiPreferences");
  -        String contextPath = FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath();
  -        return contextPath + "/" + node.getId() + wikiPrefs.getPermlinkSuffix();
  +        WikiPreferences prefs = (WikiPreferences)Component.getInstance("wikiPreferences");
  +        return prefs.getBaseUrl() + "/" + node.getId() + wikiPrefs.getPermlinkSuffix();
       }
   
       public  static String renderWikiLink(Node node) {
           if (node == null || node.getId() == null) return "";
  -        String contextPath = FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath();
  +        WikiPreferences prefs = (WikiPreferences)Component.getInstance("wikiPreferences");
           if (node.getArea().getWikiname().equals(node.getWikiname()))
  -            return contextPath + "/" + node.getArea().getWikiname();
  -        return contextPath + "/" + node.getArea().getWikiname()  + "/" + node.getWikiname();
  +            return prefs.getBaseUrl() + "/" + node.getArea().getWikiname();
  +        return prefs.getBaseUrl() + "/" + node.getArea().getWikiname()  + "/" + node.getWikiname();
       }
   
       private static String renderFileLink(File file) {
           if (file == null || file.getId() == null) return "";
  -        String contextPath = FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath();
  -        return contextPath + "/servlets/files/download.seam?fileId=" + file.getId();
  +        WikiPreferences prefs = (WikiPreferences)Component.getInstance("wikiPreferences");
  +        return prefs.getBaseUrl() + "/servlets/files/download.seam?fileId=" + file.getId();
       }
   
       public static String renderHomeURL(User user) {
           if (user == null) return "";
           if (user.getMemberHome() == null) throw new IllegalArgumentException("User does not have a home directory");
  -        String contextPath = FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath();
  -        return contextPath + "/" + user.getMemberHome().getParent().getWikiname() + "/" + user.getMemberHome().getWikiname();
  +        WikiPreferences prefs = (WikiPreferences)Component.getInstance("wikiPreferences");
  +        return prefs.getBaseUrl() + "/" + user.getMemberHome().getParent().getWikiname() + "/" + user.getMemberHome().getWikiname();
   
       }
   
  @@ -134,16 +134,21 @@
           }
       }
   
  -    public static String escapeEmailAddress(String string) {
  +    public static String escapeEmailURL(String string) {
           WikiPreferences wikiPrefs = (WikiPreferences) Component.getInstance("wikiPreferences");
           return string.length() >= 7 && string.substring(0, 7).equals("mailto:")
                   ? string.replaceAll("@", wikiPrefs.getAtSymbolReplacement()) 
                   : string;
       }
   
  +    public static String escapeAtSymbol(String string) {
  +        WikiPreferences wikiPrefs = (WikiPreferences) Component.getInstance("wikiPreferences");
  +        return string.replaceAll("@", wikiPrefs.getAtSymbolReplacement());
  +    }
  +
       public static String escapeHtml(String string) {
           if (string == null) return null;
  -        StringBuffer sb = new StringBuffer();
  +        StringBuilder sb = new StringBuilder();
           String htmlEntity;
           char c;
           for (int i = 0; i < string.length(); ++i) {