[jboss-cvs] jboss-seam/src/ui/org/jboss/seam/ui ...

[Gavin King]

  User: gavin   
  Date: 06/10/05 22:34:49

  Modified:    src/ui/org/jboss/seam/ui  HtmlLink.java
  Log:
  fix bug
  
  Revision  Changes    Path
  1.16      +17 -4     jboss-seam/src/ui/org/jboss/seam/ui/HtmlLink.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HtmlLink.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/HtmlLink.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- HtmlLink.java	2 Oct 2006 18:29:22 -0000	1.15
  +++ HtmlLink.java	6 Oct 2006 02:34:49 -0000	1.16
  @@ -91,7 +91,22 @@
            writer.startElement("a", this);
         }
         writer.writeAttribute("id", getClientId(context), null);
  -      String viewId = view==null ? context.getViewRoot().getViewId() : view;
  +
  +      String viewId;
  +      ValueBinding viewBinding = getValueBinding("view");
  +      if (viewBinding!=null)
  +      {
  +         viewId = (String) viewBinding.getValue(context);
  +      }
  +      else if (view!=null)
  +      {
  +         viewId = view;
  +      }
  +      else
  +      {
  +         viewId = context.getViewRoot().getViewId();
  +      }
  +      
         String url = context.getApplication().getViewHandler().getActionURL(context, viewId);
         String encodedUrl = context.getExternalContext().encodeActionURL(url);
         
  @@ -110,9 +125,7 @@
            }
         }
         
  -      ValueBinding viewBinding = getValueBinding("view");
  -      String view = viewBinding==null ? this.view : (String) viewBinding.getValue(context);
  -      if (view!=null)
  +      if (viewId!=null)
         {
            Map<String, Object> pageParameters = Pages.instance().getParameters(view, usedParameters);
            for ( Map.Entry<String, Object> me: pageParameters.entrySet() )