[jboss-svn-commits] JBL Code SVN: r31390 - in labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src: test/java/org/drools/guvnor/client/modeldriven/brl and 1 other directory.

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

Author: baunax
Date: 2010-02-03 13:14:09 -0500 (Wed, 03 Feb 2010)
New Revision: 31390

Modified:
   labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/CopyExpressionVisitor.java
   labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/brl/CopyExpressionVisitorTest.java
Log:
fixed to properly copy and expression

Modified: labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/CopyExpressionVisitor.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/CopyExpressionVisitor.java	2010-02-03 18:13:31 UTC (rev 31389)
+++ labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/CopyExpressionVisitor.java	2010-02-03 18:14:09 UTC (rev 31390)
@@ -49,7 +49,7 @@
 	}
 
 	public void visit(ExpressionText part) {
-		add(new ExpressionText(part.getName()));
+		add(new ExpressionText(part.getName(), part.getClassType(), part.getGenericType()));
 		moveNext(part);
 	}
 

Modified: labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/brl/CopyExpressionVisitorTest.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/brl/CopyExpressionVisitorTest.java	2010-02-03 18:13:31 UTC (rev 31389)
+++ labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/brl/CopyExpressionVisitorTest.java	2010-02-03 18:14:09 UTC (rev 31390)
@@ -14,11 +14,20 @@
 		fp.boundName = "$o";
 		efl.appendPart(new ExpressionVariable(fp));
 		ExpressionMethod em = new ExpressionMethod("aMethod", "aClass", "aType");
+		
+		ExpressionFormLine param = new ExpressionFormLine();
+		param.appendPart(new ExpressionText("\"hello world\""));
+		em.putParam("hi", param);
+		
 		efl.appendPart(em);
 		System.out.println(efl.getText());
 		ExpressionFormLine copy = new ExpressionFormLine(efl);
 		assertNotSame(efl, copy);
 		assertEquals(efl.getText(), copy.getText());
+		for (ExpressionPart e1 = efl.getRootExpression(), e2 = copy.getRootExpression(); e1 != null; e1 = e1.getNext(), e2 = e2.getNext()) {
+			assertNotSame(e1, e2);
+			assertEquals(e1.getClass(), e2.getClass());
+		}
 	}
 
 }