Return-Path: X-Original-To: apmail-empire-db-commits-archive@www.apache.org Delivered-To: apmail-empire-db-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5563210090 for ; Thu, 29 Aug 2013 09:07:31 +0000 (UTC) Received: (qmail 40540 invoked by uid 500); 29 Aug 2013 09:07:30 -0000 Delivered-To: apmail-empire-db-commits-archive@empire-db.apache.org Received: (qmail 40520 invoked by uid 500); 29 Aug 2013 09:07:27 -0000 Mailing-List: contact commits-help@empire-db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: empire-db-dev@empire-db.apache.org Delivered-To: mailing list commits@empire-db.apache.org Received: (qmail 40470 invoked by uid 99); 29 Aug 2013 09:07:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Aug 2013 09:07:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Aug 2013 09:07:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2557D238890D for ; Thu, 29 Aug 2013 09:07:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1518543 - in /empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components: ControlTag.java InputTag.java Date: Thu, 29 Aug 2013 09:07:00 -0000 To: commits@empire-db.apache.org From: doebele@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130829090700.2557D238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: doebele Date: Thu Aug 29 09:06:59 2013 New Revision: 1518543 URL: http://svn.apache.org/r1518543 Log: EMPIREDB-180 allow change of readOnly state on input control Modified: empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java Modified: empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java?rev=1518543&r1=1518542&r2=1518543&view=diff ============================================================================== --- empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java (original) +++ empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java Thu Aug 29 09:06:59 2013 @@ -386,18 +386,28 @@ public class ControlTag extends UIInput throws IOException { // render components - if (helper.isRecordReadOnly() && allowValueComponent(parent)) + if (this.helper.isRecordReadOnly()) // && allowValueComponent(parent)) { - ValueOutputComponent valueComp = null; - if (parent.getChildCount()>0) - valueComp = (ValueOutputComponent)parent.getChildren().get(0); - if (valueComp==null) - { valueComp = new ValueOutputComponent(); + UIComponent valueComp = (parent.getChildCount()>0 ? parent.getChildren().get(0) : null); + if (valueComp != null && !(valueComp instanceof ValueOutputComponent)) + { // remove InputComponent + parent.getChildren().clear(); + valueComp = null; + } + if (valueComp == null) + { + valueComp = new ValueOutputComponent(); parent.getChildren().add(valueComp); } } else - { + { // check for ValueOutputComponent + UIComponent valueComp = (parent.getChildCount()>0 ? parent.getChildren().get(0) : null); + if (valueComp instanceof ValueOutputComponent) + { // remove ValueOutputComponent + parent.getChildren().clear(); + } + // continue inpInfo = helper.getInputInfo(context); // set required if (hasRequiredFlagSet==false) @@ -424,7 +434,7 @@ public class ControlTag extends UIInput @Override public Object getSubmittedValue() { // Check state - if (control==null || inpInfo==null) + if (control==null || inpInfo==null || helper.isReadOnly()) return null; // Get Input Tag if (getChildCount()<=1) @@ -530,9 +540,9 @@ public class ControlTag extends UIInput * This method should never return false. If it does, the method "helper.isRecordReadOnly()" does not return the same value for subsequent calls as when the component was first encoded. * @param parent the parent tag * @return true on success or false if the parent's first child is not a instance of ValueOutputComponent - */ private boolean allowValueComponent(UIComponentBase parent) { return (parent.getChildCount()>0 ? (parent.getChildren().get(0) instanceof ValueOutputComponent) : true); } + */ } Modified: empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java?rev=1518543&r1=1518542&r2=1518543&view=diff ============================================================================== --- empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java (original) +++ empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java Thu Aug 29 09:06:59 2013 @@ -160,7 +160,7 @@ public class InputTag extends UIInput im @Override public Object getSubmittedValue() { // Check state - if (control==null || inpInfo==null) + if (control==null || inpInfo==null || helper.isReadOnly()) return null; // get Input Value return control.getInputValue(this, inpInfo, true);