[Jboss-svn-commits] JBL Code SVN: r3794 - labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion

[<jbo...@li...>]

Author: KrisVerlaenen
Date: 2006-04-19 08:01:53 -0400 (Wed, 19 Apr 2006)
New Revision: 3794

Modified:
   labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/RuleCompletionProcessor.java
Log:
Fixed some errors with dsl completion

Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/RuleCompletionProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/RuleCompletionProcessor.java	2006-04-19 10:32:21 UTC (rev 3793)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/RuleCompletionProcessor.java	2006-04-19 12:01:53 UTC (rev 3794)
@@ -60,7 +60,14 @@
 	        if (query.matcher(backText).matches()) {
 	            list.addAll(adapter.listConditionItems());
 	        } else if (consequence.matcher(backText).matches()) {
-	            list.addAll(adapter.listConsequenceItems());
+	        	List dslConsequences = adapter.listConsequenceItems();
+	        	Iterator iterator = dslConsequences.iterator();
+	        	while (iterator.hasNext()) {
+	        		String consequence = (String) iterator.next();
+		            list.add(new RuleCompletionProposal(prefix.length(), consequence));
+	                // TODO prefix should be from beginning of line, not just last word ?
+		            filterProposalsOnPrefix(prefix, list);
+	        	}
 	            if (!adapter.hasConsequences()) {
 	                list.add(new RuleCompletionProposal(prefix.length(), "modify", "modify();", 7));
 	                list.add(new RuleCompletionProposal(prefix.length(), "retract", "retract();", 8));
@@ -92,7 +99,14 @@
 //	        		}
 	            }
 	        } else if (condition.matcher(backText).matches()) {
-	            list.addAll(adapter.listConditionItems());
+	        	List dslConditions = adapter.listConditionItems();
+	        	Iterator iterator = dslConditions.iterator();
+	        	while (iterator.hasNext()) {
+	        		String condition = (String) iterator.next();
+		            list.add(new RuleCompletionProposal(prefix.length(), condition));
+	                // TODO prefix should be from beginning of line, not just last word ?
+		            filterProposalsOnPrefix(prefix, list);
+	        	}
 	            Image image = DroolsPluginImages.getImage(DroolsPluginImages.DROOLS);
 	            if (!adapter.hasConditions()) {
 	            	RuleCompletionProposal prop = new RuleCompletionProposal(prefix.length(), "exists", "exists ");
@@ -116,7 +130,7 @@
 		            DrlParser parser = new DrlParser();
 		            PackageDescr descr = DroolsBuilder.parsePackage(content, parser, dslReader);
 		            List imports = descr.getImports();
-		            Iterator iterator = imports.iterator();
+		            iterator = imports.iterator();
 		            while (iterator.hasNext()) {
 			            String name = (String) iterator.next();
 			            int index = name.lastIndexOf(".");