[jboss-svn-commits] JBL Code SVN: r23469 - in labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse: editors/completion and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 16 01:34:28 EDT 2008
Author: KrisVerlaenen
Date: 2008-10-16 01:34:28 -0400 (Thu, 16 Oct 2008)
New Revision: 23469
Modified:
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLRuleEditor.java
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/flow/ruleflow/core/HumanTaskNodeWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCompletionProcessor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java
Log:
- fixed issue where globals where not handled correctly in code completion of ruleflow
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLRuleEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLRuleEditor.java 2008-10-16 05:32:57 UTC (rev 23468)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLRuleEditor.java 2008-10-16 05:34:28 UTC (rev 23469)
@@ -41,7 +41,7 @@
protected List imports;
protected List functions;
protected Map templates;
- protected List globals;
+ protected List<GlobalDescr> globals;
protected String packageName;
protected List classesInPackage;
protected Map attributes;
@@ -77,7 +77,6 @@
return attributes;
}
-
public FactTemplateDescr getTemplate(String name) {
if (templates == null) {
loadImportsAndFunctions();
@@ -85,7 +84,7 @@
return (FactTemplateDescr) templates.get(name);
}
- public List getGlobals() {
+ public List<GlobalDescr> getGlobals() {
if (globals == null ) {
loadImportsAndFunctions();
}
@@ -220,7 +219,7 @@
}
// globals
List globalDescrs = descr.getGlobals();
- globals = new ArrayList();
+ globals = new ArrayList<GlobalDescr>();
iterator = globalDescrs.iterator();
while (iterator.hasNext()) {
GlobalDescr global = (GlobalDescr) iterator.next();
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-10-16 05:32:57 UTC (rev 23468)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/DefaultCompletionProcessor.java 2008-10-16 05:34:28 UTC (rev 23469)
@@ -419,7 +419,7 @@
return null;
}
- protected List getGlobals() {
+ protected List<GlobalDescr> getGlobals() {
if ( getEditor() instanceof DRLRuleEditor ) {
return ((DRLRuleEditor) getEditor()).getGlobals();
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/HumanTaskNodeWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/HumanTaskNodeWrapper.java 2008-10-16 05:32:57 UTC (rev 23468)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/HumanTaskNodeWrapper.java 2008-10-16 05:34:28 UTC (rev 23469)
@@ -49,6 +49,7 @@
parameterDefinitions.add(new ParameterDefinitionImpl("ActorId", new StringDataType()));
parameterDefinitions.add(new ParameterDefinitionImpl("Priority", new StringDataType()));
parameterDefinitions.add(new ParameterDefinitionImpl("Comment", new StringDataType()));
+ parameterDefinitions.add(new ParameterDefinitionImpl("Skippable", new StringDataType()));
((WorkDefinitionExtensionImpl) WORK_DEFINITION).setParameters(parameterDefinitions);
((WorkDefinitionExtensionImpl) WORK_DEFINITION).setIcon("icons/human_task.gif");
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCompletionProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCompletionProcessor.java 2008-10-16 05:32:57 UTC (rev 23468)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCompletionProcessor.java 2008-10-16 05:34:28 UTC (rev 23469)
@@ -26,6 +26,7 @@
import org.drools.eclipse.editors.DRLRuleEditor;
import org.drools.eclipse.editors.completion.RuleCompletionProcessor;
+import org.drools.lang.descr.GlobalDescr;
import org.drools.workflow.core.WorkflowProcess;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
@@ -49,7 +50,7 @@
private WorkflowProcess process;
private List imports;
- private List globals;
+ private List<GlobalDescr> globals;
private Map attributes;
private String dialect;
@@ -80,7 +81,7 @@
protected String readBackwards(int documentOffset, IDocument doc) throws BadLocationException {
int startPart = doc.getPartition(documentOffset).getOffset();
String prefix = doc.get(startPart, documentOffset - startPart);
- return "package dummy.package \n rule dummy "
+ return "rule dummy "
+ (dialect == null ? "" : " dialect \"" + dialect + "\" ")
+ "\n when \n then \n org.drools.workflow.instance.NodeInstance nodeInstance; \n " + prefix;
}
@@ -112,7 +113,7 @@
}
}
- public List getGlobals() {
+ public List<GlobalDescr> getGlobals() {
if (globals == null) {
loadGlobals();
}
@@ -120,7 +121,11 @@
}
private void loadGlobals() {
- this.globals = Arrays.asList(process.getGlobalNames());
+ String[] globalNames = process.getGlobalNames();
+ this.globals = new ArrayList<GlobalDescr>(globalNames.length);
+ for (String globalName: globalNames) {
+ this.globals.add(new GlobalDescr(globalName, "java.lang.Object"));
+ }
}
private void loadAttributes() {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java 2008-10-16 05:32:57 UTC (rev 23468)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java 2008-10-16 05:34:28 UTC (rev 23469)
@@ -23,6 +23,7 @@
import org.drools.eclipse.editors.DRLRuleEditor;
import org.drools.eclipse.editors.completion.RuleCompletionProcessor;
+import org.drools.lang.descr.GlobalDescr;
import org.drools.workflow.core.WorkflowProcess;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
@@ -45,8 +46,8 @@
public class ConstraintCompletionProcessor extends RuleCompletionProcessor {
private WorkflowProcess process;
- private List imports;
- private List globals;
+ private List<String> imports;
+ private List<GlobalDescr> globals;
public ConstraintCompletionProcessor(WorkflowProcess process) {
super(null);
@@ -100,7 +101,7 @@
}
}
- public List getGlobals() {
+ public List<GlobalDescr> getGlobals() {
if (globals == null) {
loadGlobals();
}
@@ -108,7 +109,11 @@
}
private void loadGlobals() {
- this.globals = Arrays.asList(process.getGlobalNames());
+ String[] globalNames = process.getGlobalNames();
+ this.globals = new ArrayList<GlobalDescr>(globalNames.length);
+ for (String globalName: globalNames) {
+ this.globals.add(new GlobalDescr(globalName, "java.lang.Object"));
+ }
}
private IJavaProject getJavaProject() {
More information about the jboss-svn-commits
mailing list