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

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

Author: mic...@jb...
Date: 2006-05-15 02:35:36 -0400 (Mon, 15 May 2006)
New Revision: 4219

Modified:
   labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/DRLRuleEditor2.java
   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/keywords.properties
Log:
added assertLogical, javadocs

Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/DRLRuleEditor2.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/DRLRuleEditor2.java	2006-05-15 03:02:15 UTC (rev 4218)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/DRLRuleEditor2.java	2006-05-15 06:35:36 UTC (rev 4219)
@@ -8,8 +8,9 @@
 import org.eclipse.ui.forms.editor.FormEditor;
 
 /**
- * Generic rule editor for drools.
- * @author Michael Neale
+ * This is a multi table editor wrapper for both the text editor and the RETE
+ * viewer.
+ * @author Kris.
  */
 public class DRLRuleEditor2 extends FormEditor {
 

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-05-15 03:02:15 UTC (rev 4218)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/RuleCompletionProcessor.java	2006-05-15 06:35:36 UTC (rev 4219)
@@ -66,31 +66,18 @@
 	            list.addAll(adapter.listConditionItems());
 	        } else if (consequence.matcher(backText).matches()) {
 	        	List dslConsequences = adapter.listConsequenceItems();
-	        	Iterator iterator;
                 addDSLProposals( list,
                                  prefix,
                                  dslConsequences );
 	            if (!adapter.hasConsequences()) {
 
-	            	RuleCompletionProposal prop = new RuleCompletionProposal(prefix.length(), "modify", "modify();", 7);
-	            	prop.setImage(droolsIcon);
-            		list.add(prop);
-            		prop = new RuleCompletionProposal(prefix.length(), "retract", "retract();", 8);
-	            	prop.setImage(droolsIcon);
-            		list.add(prop);
-            		prop = new RuleCompletionProposal(prefix.length(), "assert", "assert();", 7);
-	            	prop.setImage(droolsIcon);
-        			list.add(prop);
+	            	
+                    addRHSCompletionProposals( list,
+                                               prefix );                    
         			
-        			List functions = getFunctions(viewer);
-		            iterator = functions.iterator();
-		            while (iterator.hasNext()) {
-			            String name = (String) iterator.next() + "()";
-		            	prop = new RuleCompletionProposal(prefix.length(), name, name + ";", name.length() - 1);
-		            	prop.setPriority(-1);
-		            	prop.setImage(methodIcon);
-		            	list.add(prop);
-		            }
+        			addRHSFunctionCompletionProposals( viewer,
+                                                       list,
+                                                       prefix );
 	            }
 	        } else if (condition.matcher(backText).matches()) {
 	        	List dslConditions = adapter.listConditionItems();
@@ -142,6 +129,39 @@
         return null;
     }
 
+    private void addRHSFunctionCompletionProposals(ITextViewer viewer,
+                                                   final List list,
+                                                   final String prefix) throws CoreException,
+                                                                       DroolsParserException {
+        Iterator iterator;
+        RuleCompletionProposal prop;
+        List functions = getFunctions(viewer);
+        iterator = functions.iterator();
+        while (iterator.hasNext()) {
+            String name = (String) iterator.next() + "()";
+        	prop = new RuleCompletionProposal(prefix.length(), name, name + ";", name.length() - 1);
+        	prop.setPriority(-1);
+        	prop.setImage(methodIcon);
+        	list.add(prop);
+        }
+    }
+
+    private void addRHSCompletionProposals(final List list,
+                                           final String prefix) {
+        RuleCompletionProposal prop = new RuleCompletionProposal(prefix.length(), "modify", "modify();", 7);
+        prop.setImage(droolsIcon);
+        list.add(prop);
+        prop = new RuleCompletionProposal(prefix.length(), "retract", "retract();", 8);
+        prop.setImage(droolsIcon);
+        list.add(prop);
+        prop = new RuleCompletionProposal(prefix.length(), "assert", "assert();", 7);
+        prop.setImage(droolsIcon);
+        list.add(prop);
+        prop = new RuleCompletionProposal(prefix.length(), "assertLogical", "assertLogical();", 14);
+        prop.setImage(droolsIcon);
+        list.add(prop);
+    }
+
     private void addRuleHeaderItems(final List list,
                                     final String prefix) {
         list.add(new RuleCompletionProposal(prefix.length(), "salience", "salience ", droolsIcon));

Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/keywords.properties
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/keywords.properties	2006-05-15 03:02:15 UTC (rev 4218)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/keywords.properties	2006-05-15 06:35:36 UTC (rev 4219)
@@ -6,6 +6,7 @@
 modify
 retract
 assert
+assertLogical
 salience
 import
 expander