[jboss-cvs] jboss-seam/ui/src/main/java/org/jboss/seam/ui/util ...

[Peter Muir]

  User: pmuir   
  Date: 07/08/01 10:30:15

  Modified:    ui/src/main/java/org/jboss/seam/ui/util   UrlBuilder.java
                        ViewUrlBuilder.java
  Log:
  JBSEAM-1719
  
  Revision  Changes    Path
  1.3       +14 -10    jboss-seam/ui/src/main/java/org/jboss/seam/ui/util/UrlBuilder.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UrlBuilder.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/util/UrlBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UrlBuilder.java	19 Jun 2007 21:57:44 -0000	1.2
  +++ UrlBuilder.java	1 Aug 2007 14:30:15 -0000	1.3
  @@ -17,22 +17,25 @@
      
      private Map<String, String> parameters;
   
  -   protected UrlBuilder(String fragment)
  +   protected UrlBuilder(String fragment, String characterEncoding)
      {
         this.fragment = fragment;
         parameters = new HashMap<String, String>();
  -      FacesContext facesContext = FacesContext.getCurrentInstance();
  -      characterEncoding = facesContext.getResponseWriter().getCharacterEncoding();
  +      this.characterEncoding = characterEncoding;
      }
      
  -   public UrlBuilder(String url, String fragment)
  +   public UrlBuilder(String url, String fragment, String characterEncoding)
      {
  -      this(fragment);
  +      this(fragment, characterEncoding);
         setUrl(url);
      }
      
      protected void setUrl(String url)
      {
  +      if (url == null)
  +      {
  +         throw new NullPointerException("url must not be null");
  +      }
         this.url = url;
      }
      
  @@ -56,7 +59,12 @@
   
      public String getEncodedUrl()
      {
  -      return url + getParametersAsString() + getFragment();
  +      String params = getParametersAsString();
  +      if (!"".equals(params) && !url.contains("?")) 
  +      {
  +         params = "?" + params.substring(1);
  +      }
  +      return url + params + getFragment();
      }
      
      protected String getParametersAsString()
  @@ -66,10 +74,6 @@
         {
            params += "&" + key + "=" + parameters.get(key);
         }
  -      if (!"".equals(params))
  -      {
  -         params = "?" + params.substring(1);
  -      }
         return params;
      }
      
  
  
  
  1.5       +5 -1      jboss-seam/ui/src/main/java/org/jboss/seam/ui/util/ViewUrlBuilder.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ViewUrlBuilder.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/util/ViewUrlBuilder.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ViewUrlBuilder.java	20 Jun 2007 09:36:54 -0000	1.4
  +++ ViewUrlBuilder.java	1 Aug 2007 14:30:15 -0000	1.5
  @@ -16,7 +16,11 @@
   
      public ViewUrlBuilder(String viewId, String fragment)
      {
  -      super(fragment);
  +      super(fragment, FacesContext.getCurrentInstance().getResponseWriter().getCharacterEncoding());
  +      if (viewId == null)
  +      {
  +         throw new NullPointerException("viewId must not be null");
  +      }
         FacesContext facesContext = FacesContext.getCurrentInstance();
         String url = facesContext.getApplication().getViewHandler().getActionURL(facesContext,
                  viewId);