Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-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 4E30786DF for ; Fri, 12 Aug 2011 18:09:03 +0000 (UTC) Received: (qmail 21798 invoked by uid 500); 12 Aug 2011 18:09:03 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 21703 invoked by uid 500); 12 Aug 2011 18:09:02 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 21695 invoked by uid 99); 12 Aug 2011 18:09:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Aug 2011 18:09:02 +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; Fri, 12 Aug 2011 18:08:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7F05C2388897; Fri, 12 Aug 2011 18:08:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1157200 - /jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/qom/OperandEvaluator.java Date: Fri, 12 Aug 2011 18:08:39 -0000 To: commits@jackrabbit.apache.org From: alexparvulescu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110812180839.7F05C2388897@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: alexparvulescu Date: Fri Aug 12 18:08:39 2011 New Revision: 1157200 URL: http://svn.apache.org/viewvc?rev=1157200&view=rev Log: JCR-3047 OperandEvaluator should be able to handle Nodes as well, not just Rows - removed getAffectedPropertyName Modified: jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/qom/OperandEvaluator.java Modified: jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/qom/OperandEvaluator.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/qom/OperandEvaluator.java?rev=1157200&r1=1157199&r2=1157200&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/qom/OperandEvaluator.java (original) +++ jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/qom/OperandEvaluator.java Fri Aug 12 18:08:39 2011 @@ -251,43 +251,6 @@ public class OperandEvaluator { } /** - * Evaluates the operand and extracts the node property that is supposed to - * be used for evaluation. - * - * Can be null if there is no possible value - * - * @param operand - * @return the node's property name - */ - public String getAffectedPropertyName(Operand operand) { - if (operand instanceof StaticOperand) { - return null; - } - if (operand instanceof FullTextSearchScore) { - return null; - } - if (operand instanceof NodeName) { - return null; - } - if (operand instanceof Length) { - return ((Length) operand).getPropertyValue().getPropertyName(); - } - if (operand instanceof LowerCase) { - return getAffectedPropertyName(((LowerCase) operand).getOperand()); - } - if (operand instanceof UpperCase) { - return getAffectedPropertyName(((UpperCase) operand).getOperand()); - } - if (operand instanceof NodeLocalName) { - return null; - } - if (operand instanceof PropertyValue) { - return ((PropertyValue) operand).getPropertyName(); - } - return null; - } - - /** * Returns the values of the given value length operand at the given row. * * @see #getProperty(PropertyValue, Row)