[jboss-svn-commits] JBL Code SVN: r31218 - in labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban: drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui and 1 other directory.

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

Author: baunax
Date: 2010-01-25 20:59:28 -0500 (Mon, 25 Jan 2010)
New Revision: 31218

Modified:
   labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionField.java
   labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionMethod.java
   labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionVariable.java
   labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ExpressionBuilder.java
Log:
fixed reloading

Modified: labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionField.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionField.java	2010-01-26 01:37:28 UTC (rev 31217)
+++ labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionField.java	2010-01-26 01:59:28 UTC (rev 31218)
@@ -16,7 +16,7 @@
 
 	@Override
 	public String getText() {
-		return fieldName + (getNext() == null ? "" : getNext().getText());
+		return "." + fieldName + (getNext() == null ? "" : getNext().getText());
 	}
 
 	@Override

Modified: labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionMethod.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionMethod.java	2010-01-26 01:37:28 UTC (rev 31217)
+++ labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionMethod.java	2010-01-26 01:59:28 UTC (rev 31218)
@@ -45,7 +45,7 @@
 
 	@Override
 	public String getText() {
-		return methodName + paramsToString()
+		return "." + methodName + paramsToString()
 				+ (getNext() == null ? "" : getNext().getText());
 	}
 

Modified: labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionVariable.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionVariable.java	2010-01-26 01:37:28 UTC (rev 31217)
+++ labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ExpressionVariable.java	2010-01-26 01:59:28 UTC (rev 31218)
@@ -16,7 +16,7 @@
 
 	@Override
 	public String getText() {
-		return fact.boundName + (getNext() != null ? "." + getNext().getText() : "");
+		return fact.boundName + (getNext() != null ? getNext().getText() : "");
 	}
 
 	public FactPattern getFact() {

Modified: labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ExpressionBuilder.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ExpressionBuilder.java	2010-01-26 01:37:28 UTC (rev 31217)
+++ labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ExpressionBuilder.java	2010-01-26 01:59:28 UTC (rev 31218)
@@ -39,10 +39,11 @@
 	public ExpressionBuilder(RuleModeller modeller, ExpressionFormLine expression) {
 		super();
 		this.expression = expression;
+		this.modeller = modeller;
 		if (expression == null || expression.getText().isEmpty()) {
 			final ListBox startPoint = new ListBox();
 			panel.add(startPoint);
-			this.modeller = modeller;
+			
 			startPoint.addItem(constants.ChooseDotDotDot(), "");
 			for (String gc : getCompletionEngine().getGlobalCollections()) {
 				startPoint.addItem(gc, GLOBAL_COLLECTION_VALUE_PREFIX + "." + gc);
@@ -66,10 +67,11 @@
 					}
 				}
 			});
-			initWidget(panel);
 		} else {
-			parseExpression(expression);
+			panel.add(new Label(expression.getText()));
+			panel.add(getWidgetForCurrentType());
 		}
+		initWidget(panel);
 	}
 
 	private void startPointChange(String value) {
@@ -83,7 +85,6 @@
 			
 			panel.add(new Label(expression.getText()));
 			if (w != null) {
-				panel.add(new Label("."));
 				panel.add(w);
 			}
 		}
@@ -158,10 +159,6 @@
 		}
 		return completions;
 	}
-	
-	private void parseExpression(ExpressionFormLine expression) {
-		
-	}
 
 	/*
 	protected Widget getWidgetFor(String value) {