From adffaces-commits-return-2315-apmail-incubator-adffaces-commits-archive=incubator.apache.org@incubator.apache.org Fri Apr 13 02:02:57 2007 Return-Path: Delivered-To: apmail-incubator-adffaces-commits-archive@locus.apache.org Received: (qmail 43834 invoked from network); 13 Apr 2007 02:02:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Apr 2007 02:02:57 -0000 Received: (qmail 37906 invoked by uid 500); 13 Apr 2007 02:03:03 -0000 Delivered-To: apmail-incubator-adffaces-commits-archive@incubator.apache.org Received: (qmail 37892 invoked by uid 500); 13 Apr 2007 02:03:03 -0000 Mailing-List: contact adffaces-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: adffaces-dev@incubator.apache.org Delivered-To: mailing list adffaces-commits@incubator.apache.org Received: (qmail 37874 invoked by uid 99); 13 Apr 2007 02:03:03 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Apr 2007 19:03:03 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Apr 2007 19:02:56 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 296181A9838; Thu, 12 Apr 2007 19:02:36 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r528316 - in /incubator/adffaces/trunk/trinidad/trinidad-impl/src: main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/ test/java/org/apache/myfaces/tr... Date: Fri, 13 Apr 2007 02:02:35 -0000 To: adffaces-commits@incubator.apache.org From: awiner@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070413020236.296181A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: awiner Date: Thu Apr 12 19:02:34 2007 New Revision: 528316 URL: http://svn.apache.org/viewvc?view=rev&rev=528316 Log: ADFFACES-444: Autosubmit not working on CoreTreeTable - The TableSelectOneRenderer and TableSelectManyRenderer were always using the CoreTable's FacesBean.Type, when they needed to use the Type of whatever component was using them Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SelectionColumnRenderer.java incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRendererTest.java Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java?view=diff&rev=528316&r1=528315&r2=528316 ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java Thu Apr 12 19:02:34 2007 @@ -75,9 +75,12 @@ protected void findTypeConstants(FacesBean.Type type) { super.findTypeConstants(type); - _navBarRenderer = new NavBar(type); _widthKey = type.findKey("width"); _emptyTextKey = type.findKey("emptyText"); + _navBarRenderer = new NavBar(type); + _selectRenderer = new SelectionColumnRenderer(type); + _selectOne = new TableSelectOneRenderer(type); + _selectMany = new TableSelectManyRenderer(type); } @Override @@ -924,12 +927,12 @@ private static final String _VALUE_FIELD_NAME = "_value"; - private CoreRenderer _navBarRenderer; - - private final SpecialColumnRenderer _selectRenderer = new SelectionColumnRenderer(); private final SpecialColumnRenderer _detailRenderer = new DetailColumnRenderer(); - private final CoreRenderer _selectOne = new TableSelectOneRenderer(); - private final CoreRenderer _selectMany = new TableSelectManyRenderer(); + + private SpecialColumnRenderer _selectRenderer; + private CoreRenderer _navBarRenderer; + private CoreRenderer _selectOne; + private CoreRenderer _selectMany; private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(TableRenderer.class); } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SelectionColumnRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SelectionColumnRenderer.java?view=diff&rev=528316&r1=528315&r2=528316 ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SelectionColumnRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SelectionColumnRenderer.java Thu Apr 12 19:02:34 2007 @@ -32,6 +32,11 @@ public class SelectionColumnRenderer extends SpecialColumnRenderer { + public SelectionColumnRenderer(FacesBean.Type tableType) + { + _singleRenderer = new TableSelectOneRenderer(tableType); + _multiRenderer = new TableSelectManyRenderer(tableType); + } @Override protected void renderKids(FacesContext context, @@ -84,6 +89,6 @@ return tContext.hasSelectAll(); } - private CoreRenderer _singleRenderer = new TableSelectOneRenderer(); - private CoreRenderer _multiRenderer = new TableSelectManyRenderer(); + private final CoreRenderer _singleRenderer; + private final CoreRenderer _multiRenderer; } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java?view=diff&rev=528316&r1=528315&r2=528316 ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java Thu Apr 12 19:02:34 2007 @@ -48,8 +48,9 @@ public static final String SELECTED_KEY = "_s"; public static final String SELECTED_MODE_KEY = "_sm"; - public TableSelectManyRenderer() + public TableSelectManyRenderer(FacesBean.Type type) { + super(type); } // Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java?view=diff&rev=528316&r1=528315&r2=528316 ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java Thu Apr 12 19:02:34 2007 @@ -47,9 +47,9 @@ public class TableSelectOneRenderer extends XhtmlRenderer { - public TableSelectOneRenderer() + public TableSelectOneRenderer(FacesBean.Type type) { - super(CoreTable.TYPE); + super(type); } @Override Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRendererTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRendererTest.java?view=diff&rev=528316&r1=528315&r2=528316 ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRendererTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRendererTest.java Thu Apr 12 19:02:34 2007 @@ -138,7 +138,7 @@ { //this.facesContext.setViewRoot(new UIViewRoot()); Mock mockRenderKit = getMockRenderKitWrapper().getMock(); - TableSelectOneRenderer renderer = new TableSelectOneRenderer(); + TableSelectOneRenderer renderer = new TableSelectOneRenderer(CoreTable.TYPE); mockRenderKit.expects(atLeastOnce()).method("getRenderer").will(returnValue(renderer));