[jboss-svn-commits] JBL Code SVN: r26537 - in labs/jbossrules/trunk: drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/completion and 1 other directories.

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

Author: KrisVerlaenen
Date: 2009-05-14 10:23:47 -0400 (Thu, 14 May 2009)
New Revision: 26537

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/AbstractDSLMappingEntry.java
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/completion/DSLRuleCompletionProcessor.java
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/completion/DSLTree.java
Log:
JBRULES-1959: Code completion in DSL in when-part does not work properly anymore
 - fixed so that code completion in LHS also works after first character
 - also fixed an issue where a DSL mapping file was not written correctly on save

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/AbstractDSLMappingEntry.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/AbstractDSLMappingEntry.java	2009-05-14 13:28:32 UTC (rev 26536)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/AbstractDSLMappingEntry.java	2009-05-14 14:23:47 UTC (rev 26537)
@@ -106,11 +106,11 @@
     }
 
     public String toPatternString() {
-        return this.section + "[" + this.metadata + "]" + this.keyPattern.pattern() + "=" + this.valuePattern;
+        return this.section.getSymbol() + "[" + this.metadata + "]" + this.keyPattern.pattern() + "=" + this.valuePattern;
     }
 
     public String toString() {
-        return this.section + "[" + this.metadata + "]" + this.key + "=" + this.value;
+        return this.section.getSymbol() + "[" + this.metadata + "]" + this.key + "=" + this.value;
     }
 
     public int hashCode() {

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/completion/DSLRuleCompletionProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/completion/DSLRuleCompletionProcessor.java	2009-05-14 13:28:32 UTC (rev 26536)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/completion/DSLRuleCompletionProcessor.java	2009-05-14 14:23:47 UTC (rev 26537)
@@ -59,6 +59,7 @@
 				last = "";
 				lastobj = "*";
 			}
+			last = last.trim();
 			// pass the last string in the backText to getProposals
 			List dslConditions = this.getProposals(adapter, lastobj, last, firstLine);
 			// if we couldn't find any matches, we add the list from
@@ -66,7 +67,7 @@
 //			if (dslConditions.size() == 0) {
 //				dslConditions.addAll(adapter.listConditionItems());
 //			}
-			addDSLProposals(list, documentOffset, prefix, dslConditions);
+			addDSLProposals(list, documentOffset, last, dslConditions);
 		}
 	}
 	

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/completion/DSLTree.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/completion/DSLTree.java	2009-05-14 13:28:32 UTC (rev 26536)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/completion/DSLTree.java	2009-05-14 14:23:47 UTC (rev 26537)
@@ -414,8 +414,8 @@
 	    		}
 	    	}
     	}
-    	if (text.trim().length() == 0) {
-	    	// in the event the line is zero length after it is trimmed, we also add
+    	if (text.trim().length() == 0 || this.suggestions.isEmpty()) {
+	    	// in the event the list is empty, we also add
 	    	// the top level nodes
     		Iterator top = this.rootCond.getChildren().iterator();
         	while (top.hasNext()) {