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 DEEAFCDA1 for ; Thu, 17 May 2012 08:38:43 +0000 (UTC) Received: (qmail 43334 invoked by uid 500); 17 May 2012 08:38:43 -0000 Delivered-To: apmail-empire-db-commits-archive@empire-db.apache.org Received: (qmail 43283 invoked by uid 500); 17 May 2012 08:38:42 -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 43242 invoked by uid 99); 17 May 2012 08:38:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 May 2012 08:38:40 +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, 17 May 2012 08:38:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 82BF323889B3 for ; Thu, 17 May 2012 08:38:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1339516 - /empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java Date: Thu, 17 May 2012 08:38:19 -0000 To: commits@empire-db.apache.org From: doebele@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120517083819.82BF323889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: doebele Date: Thu May 17 08:38:18 2012 New Revision: 1339516 URL: http://svn.apache.org/viewvc?rev=1339516&view=rev Log: EMPIREDB-140 add el-resolver for RecordData Modified: empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java Modified: empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java?rev=1339516&r1=1339515&r2=1339516&view=diff ============================================================================== --- empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java (original) +++ empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java Thu May 17 08:38:18 2012 @@ -27,6 +27,8 @@ import javax.el.ELResolver; import javax.faces.context.FacesContext; import org.apache.empire.commons.StringUtils; +import org.apache.empire.data.Record; +import org.apache.empire.data.RecordData; import org.apache.empire.db.DBColumnExpr; import org.apache.empire.db.DBDatabase; import org.apache.empire.db.DBRowSet; @@ -91,6 +93,21 @@ public class DBELResolver extends ELReso // done return rset; } + else if (base instanceof RecordData) + { // Lookup RowSet + String field= StringUtils.toString(property); + int index = ((Record)base).getFieldIndex(field); + if (index<0) + { // not a field, it may be a property + if (log.isDebugEnabled()) + log.debug("ELResolver warning: field '{}' not found in record .", field); + // not resolved, continue search + return null; + } + // Found! Return field value. + context.setPropertyResolved(true); + return ((Record)base).getValue(index); + } else if (base==null) { // LookupDatabase String name = StringUtils.toString(property);