[jboss-svn-commits] JBL Code SVN: r5773 - labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr

[jboss-svn-commits at lists.jboss.org]

Author: michael.neale at jboss.com
Date: 2006-08-11 11:19:33 -0400 (Fri, 11 Aug 2006)
New Revision: 5773

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FromDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionCallDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/MethodAccessDescr.java
Log:
JBRULES-341 - updated descrs

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FromDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FromDescr.java	2006-08-11 15:17:15 UTC (rev 5772)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FromDescr.java	2006-08-11 15:19:33 UTC (rev 5773)
@@ -1,12 +1,12 @@
 package org.drools.lang.descr;
 
-public class FromDescr {
+public class FromDescr extends PatternDescr {
 
 	private ColumnDescr column;
 	private DeclarativeInvokerDescr dataSource;
 	
-	public ColumnDescr getColumn() {
-		return column;
+	public int getLine() {
+		return column.getLine();
 	}
 	public void setColumn(ColumnDescr column) {
 		this.column = column;

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionCallDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionCallDescr.java	2006-08-11 15:17:15 UTC (rev 5772)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionCallDescr.java	2006-08-11 15:19:33 UTC (rev 5773)
@@ -9,21 +9,18 @@
 public class FunctionCallDescr extends DeclarativeInvokerDescr {
 
 	private String name;
-	private List args = new ArrayList();
+	private List args;
 
 	public FunctionCallDescr(String name) {
 		this.name = name;
 	}
 	
-	public void addArgument(String arg) {
-		args.add(arg);
-	}
 
-	public List getArgs() {
+	public List getArguments() {
 		return args;
 	}
 
-	public void setArgs(List args) {
+	public void setArguments(List args) {
 		this.args = args;
 	}
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/MethodAccessDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/MethodAccessDescr.java	2006-08-11 15:17:15 UTC (rev 5772)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/MethodAccessDescr.java	2006-08-11 15:19:33 UTC (rev 5773)
@@ -14,17 +14,13 @@
 public class MethodAccessDescr extends DeclarativeInvokerDescr {
 
 	private String methodName;
-	private List arguments = new ArrayList();
+	private List arguments;
 	private String variableName;
 	
 	public MethodAccessDescr(String variableName, String methodName) {
 		this.methodName = methodName;
 		this.variableName = variableName;
 	}
-	
-	public void addArgument(String arg) {
-		this.arguments.add(arg);
-	}
 
 	public List getArguments() {
 		return arguments;