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 D46DC192F2 for ; Mon, 21 Mar 2016 13:07:55 +0000 (UTC) Received: (qmail 19272 invoked by uid 500); 21 Mar 2016 13:07:55 -0000 Delivered-To: apmail-empire-db-commits-archive@empire-db.apache.org Received: (qmail 19257 invoked by uid 500); 21 Mar 2016 13:07:55 -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 19246 invoked by uid 99); 21 Mar 2016 13:07:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Mar 2016 13:07:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 85DE6DFBC8; Mon, 21 Mar 2016 13:07:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: doebele@apache.org To: commits@empire-db.apache.org Message-Id: <195d6c2338964aedb02d23ea73dc2c97@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: empire-db git commit: EMPIREDB-232 fixed empty select option problem Date: Mon, 21 Mar 2016 13:07:55 +0000 (UTC) Repository: empire-db Updated Branches: refs/heads/master 911dc38c1 -> 6580f386e EMPIREDB-232 fixed empty select option problem Project: http://git-wip-us.apache.org/repos/asf/empire-db/repo Commit: http://git-wip-us.apache.org/repos/asf/empire-db/commit/6580f386 Tree: http://git-wip-us.apache.org/repos/asf/empire-db/tree/6580f386 Diff: http://git-wip-us.apache.org/repos/asf/empire-db/diff/6580f386 Branch: refs/heads/master Commit: 6580f386e640c8d86a4d427ca6ac8aea1eef3634 Parents: 911dc38 Author: Rainer Döbele Authored: Mon Mar 21 14:07:48 2016 +0100 Committer: Rainer Döbele Committed: Mon Mar 21 14:07:48 2016 +0100 ---------------------------------------------------------------------- .../empire/jsf2/controls/SelectInputControl.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/empire-db/blob/6580f386/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java ---------------------------------------------------------------------- diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java index 425cdc7..9d3e818 100644 --- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java +++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java @@ -113,9 +113,19 @@ public class SelectInputControl extends InputControl input.setDisabled(disabled); // Options (sync) Options options = ii.getOptions(); - boolean addEmpty = getEmptyEntryRequired(ii, disabled) && !options.contains(""); - String nullText = (addEmpty) ? getNullText(ii) : ""; - syncOptions(input, ii.getTextResolver(), options, addEmpty, nullText, ii.isInsideUIData()); + if (options!=null) + { // syncOptions + boolean addEmpty = getEmptyEntryRequired(ii, disabled) && !options.contains(""); + String nullText = (addEmpty) ? getNullText(ii) : ""; + syncOptions(input, ii.getTextResolver(), options, addEmpty, nullText, ii.isInsideUIData()); + } + else + { // clear or not? + if (ii.getValue(false)!=null) + log.warn("No options have been set for column {}", ii.getColumn().getName()); + else + input.getChildren().clear(); + } // set value if (setValue) { // style