Author: bbrodt
Date: 2011-01-07 10:59:12 -0500 (Fri, 07 Jan 2011)
New Revision: 27982
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java
Log:
https://issues.jboss.org/browse/JBIDE-8042
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java 2011-01-07
15:28:47 UTC (rev 27981)
+++
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java 2011-01-07
15:59:12 UTC (rev 27982)
@@ -176,20 +176,13 @@
private static List<String> getVariablesNamesInUse(EObject parent) {
List<String> variablesNames = new ArrayList<String>();
- Variables variables;
- for (;parent != null; parent = parent.eContainer()) {
- if (parent instanceof Process) {
- variables = ((Process)parent).getVariables();
- } else if (parent instanceof Scope) {
- variables = ((Scope)parent).getVariables();
- } else {
- continue;
- }
- EList<Variable> variableList = variables.getChildren();
- for (Variable var : variableList) {
- variablesNames.add(var.getName());
- }
- }
+ //
https://issues.jboss.org/browse/JBIDE-8042
+ // grab all visible variables, not just Process and Scope variables
+ // NOTE: this includes implicit variables defined in ForEach
+ Variable[] variables = BPELUtil.getVisibleVariables((EObject)parent);
+ for (Variable var : variables) {
+ variablesNames.add(var.getName());
+ }
return variablesNames;
}