[jboss-svn-commits] JBL Code SVN: r31383 - in labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src: test/java/org/drools/guvnor/client/modeldriven and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Feb 3 10:23:18 EST 2010
Author: baunax
Date: 2010-02-03 10:23:17 -0500 (Wed, 03 Feb 2010)
New Revision: 31383
Added:
labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/brl/
labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/brl/CopyExpressionVisitorTest.java
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/ExpressionCollection.java
labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionField.java
labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionMethod.java
labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionText.java
labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionVariable.java
Log:
Fixed copy mechanism
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 15:13:24 UTC (rev 31382)
+++ labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/CopyExpressionVisitor.java 2010-02-03 15:23:17 UTC (rev 31383)
@@ -21,36 +21,36 @@
public void visit(ExpressionField part) {
add(new ExpressionField(part.getName(), part.getClassType(), part.getGenericType(), part.getParametricType()));
- moveNext();
+ moveNext(part);
}
public void visit(ExpressionMethod part) {
ExpressionMethod method = new ExpressionMethod(part.getName(), part.getClassType(), part.getGenericType(), part.getParametricType());
copyMethodParams(part, method);
add(method);
- moveNext();
+ moveNext(part);
}
public void visit(ExpressionVariable part) {
add(new ExpressionVariable(part.getFact()));
- moveNext();
+ moveNext(part);
}
public void visit(ExpressionCollection part) {
add(new ExpressionCollection(part.getName(), part.getClassType(), part.getGenericType(), part.getParametricType()));
- moveNext();
+ moveNext(part);
}
public void visit(ExpressionCollectionIndex part) {
ExpressionCollectionIndex method = new ExpressionCollectionIndex(part.getName(), part.getClassType(), part.getGenericType(), part.getParametricType());
copyMethodParams(part, method);
add(method);
- moveNext();
+ moveNext(part);
}
public void visit(ExpressionText part) {
add(new ExpressionText(part.getName()));
- moveNext();
+ moveNext(part);
}
private void copyMethodParams(ExpressionMethod part, ExpressionMethod method) {
@@ -61,9 +61,9 @@
method.setParams(params);
}
- private void moveNext() {
- if (curr.getNext() != null) {
- curr.getNext().accept(this);
+ private void moveNext(ExpressionPart ep) {
+ if (ep.getNext() != null) {
+ ep.getNext().accept(this);
}
}
Modified: labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionCollection.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionCollection.java 2010-02-03 15:13:24 UTC (rev 31382)
+++ labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionCollection.java 2010-02-03 15:23:17 UTC (rev 31383)
@@ -18,7 +18,7 @@
@Override
public void accept(ExpressionVisitor visitor) {
- super.accept(visitor);
+ visitor.visit(this);
}
}
Modified: labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionField.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionField.java 2010-02-03 15:13:24 UTC (rev 31382)
+++ labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionField.java 2010-02-03 15:23:17 UTC (rev 31383)
@@ -20,6 +20,6 @@
@Override
public void accept(ExpressionVisitor visitor) {
- super.accept(visitor);
+ visitor.visit(this);
}
}
Modified: labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionMethod.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionMethod.java 2010-02-03 15:13:24 UTC (rev 31382)
+++ labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionMethod.java 2010-02-03 15:23:17 UTC (rev 31383)
@@ -50,6 +50,6 @@
@Override
public void accept(ExpressionVisitor visitor) {
- super.accept(visitor);
+ visitor.visit(this);
}
}
Modified: labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionText.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionText.java 2010-02-03 15:13:24 UTC (rev 31382)
+++ labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionText.java 2010-02-03 15:23:17 UTC (rev 31383)
@@ -14,5 +14,10 @@
public String getText() {
return getName() + (getNext() == null ? "" : getNext().getClass());
}
+
+ @Override
+ public void accept(ExpressionVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionVariable.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionVariable.java 2010-02-03 15:13:24 UTC (rev 31382)
+++ labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionVariable.java 2010-02-03 15:23:17 UTC (rev 31383)
@@ -26,6 +26,6 @@
@Override
public void accept(ExpressionVisitor visitor) {
- super.accept(visitor);
+ visitor.visit(this);
}
}
Added: 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 (rev 0)
+++ labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/brl/CopyExpressionVisitorTest.java 2010-02-03 15:23:17 UTC (rev 31383)
@@ -0,0 +1,24 @@
+package org.drools.guvnor.client.modeldriven.brl;
+
+import static org.junit.Assert.*;
+
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.junit.Test;
+
+public class CopyExpressionVisitorTest {
+
+ @Test
+ public void testCopy() {
+ ExpressionFormLine efl = new ExpressionFormLine();
+ FactPattern fp = new FactPattern(SuggestionCompletionEngine.TYPE_OBJECT);
+ fp.boundName = "$o";
+ efl.appendPart(new ExpressionVariable(fp));
+ ExpressionMethod em = new ExpressionMethod("aMethod", "aClass", "aType");
+ efl.appendPart(em);
+ System.out.println(efl.getText());
+ ExpressionFormLine copy = new ExpressionFormLine(efl);
+ assertNotSame(efl, copy);
+ assertEquals(efl.getText(), copy.getText());
+ }
+
+}
Property changes on: labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/brl/CopyExpressionVisitorTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
More information about the jboss-svn-commits
mailing list