Return-Path: X-Original-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8F6CC7138 for ; Tue, 23 Aug 2011 23:20:55 +0000 (UTC) Received: (qmail 40014 invoked by uid 500); 23 Aug 2011 23:20:55 -0000 Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org Received: (qmail 39981 invoked by uid 500); 23 Aug 2011 23:20:55 -0000 Mailing-List: contact connectors-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: connectors-dev@incubator.apache.org Delivered-To: mailing list connectors-commits@incubator.apache.org Received: (qmail 39974 invoked by uid 99); 23 Aug 2011 23:20:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Aug 2011 23:20:54 +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; Tue, 23 Aug 2011 23:20:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D0ED82388A56; Tue, 23 Aug 2011 23:20:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1160930 - in /incubator/lcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine: VariableConfiguration.java VariableConfigurationNode.java Date: Tue, 23 Aug 2011 23:20:30 -0000 To: connectors-commits@incubator.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110823232030.D0ED82388A56@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kwright Date: Tue Aug 23 23:20:30 2011 New Revision: 1160930 URL: http://svn.apache.org/viewvc?rev=1160930&view=rev Log: Add '+' operator for configuration and configurationnode objects Modified: incubator/lcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfiguration.java incubator/lcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfigurationNode.java Modified: incubator/lcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfiguration.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfiguration.java?rev=1160930&r1=1160929&r2=1160930&view=diff ============================================================================== --- incubator/lcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfiguration.java (original) +++ incubator/lcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfiguration.java Tue Aug 23 23:20:30 2011 @@ -85,6 +85,8 @@ public class VariableConfiguration exten { if (index > configuration.getChildCount()) throw new ScriptException("Insert out of bounds"); + if (v == null) + throw new ScriptException("Can't insert a null object"); configuration.addChild(index,v.getConfigurationNodeValue()); } @@ -92,9 +94,18 @@ public class VariableConfiguration exten public void insert(Variable v) throws ScriptException { + if (v == null) + throw new ScriptException("Can't insert a null object"); configuration.addChild(configuration.getChildCount(),v.getConfigurationNodeValue()); } + public VariableReference plus(Variable v) + throws ScriptException + { + insert(v); + return this; + } + /** Delete an object from this variable at a position. */ public void removeAt(int index) throws ScriptException Modified: incubator/lcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfigurationNode.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfigurationNode.java?rev=1160930&r1=1160929&r2=1160930&view=diff ============================================================================== --- incubator/lcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfigurationNode.java (original) +++ incubator/lcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfigurationNode.java Tue Aug 23 23:20:30 2011 @@ -83,6 +83,8 @@ public class VariableConfigurationNode e public void insertAt(Variable v, int index) throws ScriptException { + if (v == null) + throw new ScriptException("Can't insert a null object"); if (index > configurationNode.getChildCount()) throw new ScriptException("Insert out of bounds"); ConfigurationNode insertObject = v.getConfigurationNodeValue(); @@ -93,9 +95,18 @@ public class VariableConfigurationNode e public void insert(Variable v) throws ScriptException { + if (v == null) + throw new ScriptException("Can't insert a null object"); configurationNode.addChild(configurationNode.getChildCount(),v.getConfigurationNodeValue()); } + public VariableReference plus(Variable v) + throws ScriptException + { + insert(v); + return this; + } + /** Delete an object from this variable at a position. */ public void removeAt(int index) throws ScriptException