You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2008/01/16 00:03:07 UTC

svn commit: r612287 - in /myfaces/tobago/branches/tobago-1.0.x: ./ core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java

Author: bommel
Date: Tue Jan 15 15:03:05 2008
New Revision: 612287

URL: http://svn.apache.org/viewvc?rev=612287&view=rev
Log:
Merged revisions 612282 via svnmerge from 
https://svn.apache.org/repos/asf/myfaces/tobago/trunk

........
  r612282 | bommel | 2008-01-15 23:56:16 +0100 (Di, 15 Jan 2008) | 1 line
  
  (TOBAGO-596) Duplicate component Id exception with tc:date and tx:date with facelets
........

Modified:
    myfaces/tobago/branches/tobago-1.0.x/   (props changed)
    myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java

Propchange: myfaces/tobago/branches/tobago-1.0.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 15 15:03:05 2008
@@ -1 +1 @@
-/myfaces/tobago/trunk:1-603371,609568-609629,612250-612251
+/myfaces/tobago/trunk:1-603371,609568-609629,612250-612251,612282

Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java?rev=612287&r1=612286&r2=612287&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java Tue Jan 15 15:03:05 2008
@@ -206,6 +206,7 @@
     buttonPanel.setId("buttonPanel");
     layout = ComponentUtil.createComponent(
         facesContext, UIGridLayout.COMPONENT_TYPE, RENDERER_TYPE_GRID_LAYOUT);
+    layout.setId("buttonPanelLayout");
     buttonPanel.getFacets().put(FACET_LAYOUT, layout);
     layout.getAttributes().put(ATTR_COLUMNS, "*;*");
 //    layout.getAttributes().put(TobagoConstants.ATTR_BORDER, "1");