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

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

Author: KrisVerlaenen
Date: 2006-04-18 21:22:48 -0400 (Tue, 18 Apr 2006)
New Revision: 3778

Modified:
   labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/RuleCompletionProcessor.java
Log:
only do class proposals if no dsl

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 00:49:46 UTC (rev 3777)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/RuleCompletionProcessor.java	2006-04-19 01:22:48 UTC (rev 3778)
@@ -110,41 +110,42 @@
 	                prop = new RuleCompletionProposal(prefix.length(), "eval", "eval()", 5);
 	            	prop.setImage(image);
 	                list.add(prop);
+
+		            String content = viewer.getDocument().get();
+		            Reader dslReader = DSLAdapter.getDSLContent(content, ((FileEditorInput) getEditor().getEditorInput()).getFile());
+		            DrlParser parser = new DrlParser();
+		            PackageDescr descr = DroolsBuilder.parsePackage(content, parser, dslReader);
+		            List imports = descr.getImports();
+		            Iterator iterator = imports.iterator();
+		            while (iterator.hasNext()) {
+			            String name = (String) iterator.next();
+			            int index = name.lastIndexOf(".");
+			            if (index != -1) {
+			            	String className = name.substring(index + 1);
+			            	prop = new RuleCompletionProposal(prefix.length(), className, className + "()", className.length() + 1);
+			            	prop.setPriority(-1);
+			            	prop.setImage(DroolsPluginImages.getImage(DroolsPluginImages.CLASS));
+			            	list.add(prop);
+			            }
+		            }
+//		            if (true) {
+//		            	String className = "";
+//		            	ClassTypeResolver resolver = new ClassTypeResolver(imports);
+//		            	Class conditionClass = resolver.resolveType(className);
+//		            	ClassFieldInspector inspector = new ClassFieldInspector(conditionClass);
+//		            	Map fields = inspector.getFieldNames();
+//		            	Iterator iterator2 = fields.keySet().iterator();
+//		            	while (iterator2.hasNext()) {
+//		            		String varName = (String) iterator2.next();
+//		            		list.add(new RuleCompletionProposal(prefix.length(), varName, varName + " "));
+//		            	}
+//		            }
+		            
 	            }
 	            RuleCompletionProposal prop = new RuleCompletionProposal(prefix.length(), "then", "then\n\t");
             	prop.setImage(image);
 	            list.add(prop);
 	            
-	            String content = viewer.getDocument().get();
-	            Reader dslReader = DSLAdapter.getDSLContent(content, ((FileEditorInput) getEditor().getEditorInput()).getFile());
-	            DrlParser parser = new DrlParser();
-	            PackageDescr descr = DroolsBuilder.parsePackage(content, parser, dslReader);
-	            List imports = descr.getImports();
-	            Iterator iterator = imports.iterator();
-	            while (iterator.hasNext()) {
-		            String name = (String) iterator.next();
-		            int index = name.lastIndexOf(".");
-		            if (index != -1) {
-		            	String className = name.substring(index + 1);
-		            	prop = new RuleCompletionProposal(prefix.length(), className, className + "()", className.length() + 1);
-		            	prop.setPriority(-1);
-		            	prop.setImage(DroolsPluginImages.getImage(DroolsPluginImages.CLASS));
-		            	list.add(prop);
-		            }
-	            }
-//	            if (true) {
-//	            	String className = "";
-//	            	ClassTypeResolver resolver = new ClassTypeResolver(imports);
-//	            	Class conditionClass = resolver.resolveType(className);
-//	            	ClassFieldInspector inspector = new ClassFieldInspector(conditionClass);
-//	            	Map fields = inspector.getFieldNames();
-//	            	Iterator iterator2 = fields.keySet().iterator();
-//	            	while (iterator2.hasNext()) {
-//	            		String varName = (String) iterator2.next();
-//	            		list.add(new RuleCompletionProposal(prefix.length(), varName, varName + " "));
-//	            	}
-//	            }
-	            
 	            filterProposalsOnPrefix(prefix, list);
 	        } else {             
 	            //we are in rule header