[jboss-svn-commits] JBL Code SVN: r19855 - labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion.

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

Author: KrisVerlaenen
Date: 2008-05-05 06:11:21 -0400 (Mon, 05 May 2008)
New Revision: 19855

Modified:
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/DefaultCompletionProcessor.java
Log:
JBRULES-1570: Global variables suggested in functions in context assist
 - functions no longer suggest globals or the drools variable

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/DefaultCompletionProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/DefaultCompletionProcessor.java	2008-05-04 16:15:01 UTC (rev 19854)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/DefaultCompletionProcessor.java	2008-05-05 10:11:21 UTC (rev 19855)
@@ -92,19 +92,20 @@
                     // extract function parameters
                     Map params = extractParams( matcher.group( 3 ) );
                     // add global parameters
-                    List globals = getGlobals();
-                    if ( globals != null ) {
-                        for ( Iterator iterator = globals.iterator(); iterator.hasNext(); ) {
-                            GlobalDescr global = (GlobalDescr) iterator.next();
-                            params.put( global.getIdentifier(),
-                                        global.getType() );
-                        }
-                    }
+//                    List globals = getGlobals();
+//                    if ( globals != null ) {
+//                        for ( Iterator iterator = globals.iterator(); iterator.hasNext(); ) {
+//                            GlobalDescr global = (GlobalDescr) iterator.next();
+//                            params.put( global.getIdentifier(),
+//                                        global.getType() );
+//                        }
+//                    }
                     String functionText = matcher.group( 4 );
                     props = getJavaCompletionProposals( documentOffset,
                                                         functionText,
                                                         prefix,
-                                                        params );
+                                                        params,
+                                                        false );
                     filterProposalsOnPrefix( prefix,
                                              props );
                 } else {
@@ -249,12 +250,21 @@
                                               final String javaText,
                                               final String prefix,
                                               Map params) {
+        return getJavaCompletionProposals(documentOffset, javaText, prefix, params, true);
+    }
+    
+    protected List getJavaCompletionProposals(final int documentOffset,
+                                              final String javaText,
+                                              final String prefix,
+                                              Map params,
+                                              boolean useDrools) {
         final List list = new ArrayList();
         requestJavaCompletionProposals( javaText,
                                         prefix,
                                         documentOffset,
                                         params,
-                                        list );
+                                        list,
+                                        useDrools );
         return list;
     }
 
@@ -287,8 +297,17 @@
                                                   final int documentOffset,
                                                   Map params,
                                                   Collection results) {
+        requestJavaCompletionProposals(javaText, prefix, documentOffset, params, results, true);
+    }
 
+    protected void requestJavaCompletionProposals(final String javaText,
+                                                  final String prefix,
+                                                  final int documentOffset,
+                                                  Map params,
+                                                  Collection results,
+                                                  boolean useDrools) {
 
+
         String javaTextWithoutPrefix = CompletionUtil.getTextWithoutPrefix( javaText,
                                                                             prefix );
         // boolean to filter default Object methods produced by code completion when in the beginning of a statement
@@ -318,7 +337,9 @@
                 // evalContext.newVariable((String) entry.getValue(), (String) entry.getKey(), null);
                 javaTextWithParams.append( entry.getValue() + " " + entry.getKey() + ";\n" );
             }
-            javaTextWithParams.append( "org.drools.spi.KnowledgeHelper drools;" );
+            if (useDrools) {
+                javaTextWithParams.append( "org.drools.spi.KnowledgeHelper drools;" );
+            }
             javaTextWithParams.append( javaText );
             String jtext = javaTextWithParams.toString();
             String fixedText = new KnowledgeHelperFixer().fix( jtext );