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

[Peter Muir]

  User: pmuir   
  Date: 07/06/20 05:54:37

  Modified:    ui/src/main/java/org/jboss/seam/ui/renderkit  
                        LinkRendererBase.java ButtonRendererBase.java
  Log:
  JBSEAM-1509
  
  Revision  Changes    Path
  1.3       +3 -2      jboss-seam/ui/src/main/java/org/jboss/seam/ui/renderkit/LinkRendererBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LinkRendererBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/renderkit/LinkRendererBase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- LinkRendererBase.java	19 Jun 2007 21:57:43 -0000	1.2
  +++ LinkRendererBase.java	20 Jun 2007 09:54:37 -0000	1.3
  @@ -23,10 +23,11 @@
      protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException
      {
         UILink link = (UILink) component;
  +      String url = link.getUrl();
         writer.startElement(HTML.ANCHOR_ELEM, link);
  -      if (link.getUrl() != null && !link.isDisabled())
  +      if (url != null && !link.isDisabled())
         {
  -         writer.writeAttribute(HTML.HREF_ATTR, link.getUrl(), HTML.HREF_ATTR);
  +         writer.writeAttribute(HTML.HREF_ATTR, url, HTML.HREF_ATTR);
         }
         HTML.renderHTMLAttributes(writer, link, HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES);
         if (link.getValue() != null)
  
  
  
  1.4       +10 -2     jboss-seam/ui/src/main/java/org/jboss/seam/ui/renderkit/ButtonRendererBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ButtonRendererBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/renderkit/ButtonRendererBase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- ButtonRendererBase.java	20 Jun 2007 02:46:17 -0000	1.3
  +++ ButtonRendererBase.java	20 Jun 2007 09:54:37 -0000	1.4
  @@ -34,6 +34,7 @@
      private String getOnClick(UIButton button) throws IOException
      {
         String onclick = button.getOnclick();
  +      String url = button.getUrl();
         if (onclick == null)
         {
            onclick = "";
  @@ -42,12 +43,19 @@
         {
            onclick += ";";
         }
  -      if (!button.isDisabled())
  +      if (url != null)
         {
  -         onclick += "location.href='" + button.getUrl() + "'";
  +         onclick += "location.href='" + url + "'";
         }
  +      if (!button.isDisabled())
  +      {
         return onclick;
      }
  +      else
  +      {
  +         return null;
  +      }
  +   }
      
      @Override
      public boolean getRendersChildren()