1.1 --- a/bpel.refactoring/src/org/netbeans/modules/bpel/refactoring/BpelVisitor.java	Fri Oct 27 11:58:36 2006 +0000
     1.2 +++ b/bpel.refactoring/src/org/netbeans/modules/bpel/refactoring/BpelVisitor.java	Tue Oct 31 13:20:00 2006 +0000
     1.3 @@ -41,7 +41,10 @@
     1.4  import org.netbeans.modules.bpel.model.api.StartCounterValue;
     1.5  import org.netbeans.modules.bpel.model.api.Throw;
     1.6  import org.netbeans.modules.bpel.model.api.To;
     1.7 +import org.netbeans.modules.bpel.model.api.Validate;
     1.8  import org.netbeans.modules.bpel.model.api.Variable;
     1.9 +import org.netbeans.modules.bpel.model.api.VariableDeclaration;
    1.10 +import org.netbeans.modules.bpel.model.api.references.BpelReference;
    1.11  import org.netbeans.modules.bpel.model.api.references.WSDLReference;
    1.12  import org.netbeans.modules.bpel.model.api.support.ImportHelper;
    1.13  import org.netbeans.modules.bpel.model.api.support.SimpleBpelModelVisitorAdaptor;
    1.14 @@ -104,6 +107,25 @@
    1.15    }
    1.16  
    1.17    @Override
    1.18 +  public void visit(Validate validate)
    1.19 +  {
    1.20 +    List<BpelReference<VariableDeclaration>> variables =
    1.21 +      validate.getVaraibles();
    1.22 +
    1.23 +    if (variables == null) {
    1.24 +      return;
    1.25 +    }
    1.26 +    for (BpelReference<VariableDeclaration> variable : variables) {
    1.27 +      Util.visit(
    1.28 +        variable,
    1.29 +        myTarget,
    1.30 +        validate,
    1.31 +        myUsage
    1.32 +      );
    1.33 +    }
    1.34 +  }
    1.35 +
    1.36 +  @Override
    1.37    public void visit(StartCounterValue value)
    1.38    {
    1.39  //Log.out();
    1.40 @@ -160,27 +182,6 @@
    1.41    }
    1.42  
    1.43    @Override
    1.44 -  public void visit(To to)
    1.45 -  {
    1.46 -//Log.out();
    1.47 -//Log.out();
    1.48 -//Log.out("[TO]: " + Util.getName(to));
    1.49 -    Util.visit(
    1.50 -      to.getPart(),
    1.51 -      myTarget,
    1.52 -      to,
    1.53 -      myUsage
    1.54 -    );
    1.55 -    Util.visit(
    1.56 -      to.getProperty(),
    1.57 -      myTarget,
    1.58 -      to,
    1.59 -      myUsage
    1.60 -    );
    1.61 -    visitContentElement(to);
    1.62 -  }
    1.63 -                     
    1.64 -  @Override
    1.65    public void visit(CorrelationSet correlationSet)
    1.66    {
    1.67      List<WSDLReference<CorrelationProperty>> references =
    1.68 @@ -217,9 +218,42 @@
    1.69        from,
    1.70        myUsage
    1.71      );
    1.72 +    Util.visit(
    1.73 +      from.getVariable(),
    1.74 +      myTarget,
    1.75 +      from,
    1.76 +      myUsage
    1.77 +    );
    1.78      visitContentElement(from);
    1.79    }
    1.80  
    1.81 +  @Override
    1.82 +  public void visit(To to)
    1.83 +  {
    1.84 +//Log.out();
    1.85 +//Log.out();
    1.86 +//Log.out("[TO]: " + Util.getName(to));
    1.87 +    Util.visit(
    1.88 +      to.getPart(),
    1.89 +      myTarget,
    1.90 +      to,
    1.91 +      myUsage
    1.92 +    );
    1.93 +    Util.visit(
    1.94 +      to.getProperty(),
    1.95 +      myTarget,
    1.96 +      to,
    1.97 +      myUsage
    1.98 +    );
    1.99 +    Util.visit(
   1.100 +      to.getVariable(),
   1.101 +      myTarget,
   1.102 +      to,
   1.103 +      myUsage
   1.104 +    );
   1.105 +    visitContentElement(to);
   1.106 +  }
   1.107 +
   1.108    private void visitContentElement(BpelEntity entity) {
   1.109  //Log.out("[CONTENT]: " + ((ContentElement) entity).getContent());
   1.110      if (myXPath != null) {
   1.111 @@ -281,6 +315,12 @@
   1.112        message,
   1.113        myUsage
   1.114      );
   1.115 +    Util.visit(
   1.116 +      message.getVariable(),
   1.117 +      myTarget,
   1.118 +      message,
   1.119 +      myUsage
   1.120 +    );
   1.121    }
   1.122  
   1.123    @Override
   1.124 @@ -337,6 +377,12 @@
   1.125        reply,
   1.126        myUsage
   1.127      );
   1.128 +    Util.visit(
   1.129 +      reply.getVariable(),
   1.130 +      myTarget,
   1.131 +      reply,
   1.132 +      myUsage
   1.133 +    );
   1.134    }
   1.135  
   1.136    @Override
   1.137 @@ -362,6 +408,12 @@
   1.138        receive,
   1.139        myUsage
   1.140      );
   1.141 +    Util.visit(
   1.142 +      receive.getVariable(),
   1.143 +      myTarget,
   1.144 +      receive,
   1.145 +      myUsage
   1.146 +    );
   1.147    }
   1.148  
   1.149    @Override
   1.150 @@ -381,6 +433,18 @@
   1.151        invoke,
   1.152        myUsage
   1.153      );
   1.154 +    Util.visit(
   1.155 +      invoke.getInputVariable(),
   1.156 +      myTarget,
   1.157 +      invoke,
   1.158 +      myUsage
   1.159 +    );
   1.160 +    Util.visit(
   1.161 +      invoke.getOutputVariable(),
   1.162 +      myTarget,
   1.163 +      invoke,
   1.164 +      myUsage
   1.165 +    );
   1.166    }
   1.167  
   1.168    @Override
   1.169 @@ -394,6 +458,12 @@
   1.170        _throw,
   1.171        myUsage
   1.172      );
   1.173 +    Util.visit(
   1.174 +      _throw.getFaultVariable(),
   1.175 +      myTarget,
   1.176 +      _throw,
   1.177 +      myUsage
   1.178 +    );
   1.179    }
   1.180  
   1.181    @Override

     2.1 --- a/bpel.refactoring/src/org/netbeans/modules/bpel/refactoring/XPath.java	Fri Oct 27 11:58:36 2006 +0000
     2.2 +++ b/bpel.refactoring/src/org/netbeans/modules/bpel/refactoring/XPath.java	Tue Oct 31 13:20:00 2006 +0000
     2.3 @@ -176,6 +176,11 @@
     2.4        return;
     2.5      }
     2.6  //Log.out(" Variable: " + myVariable.getName());
     2.7 +
     2.8 +    if (myVariable == myTarget) {
     2.9 +      addItem();
    2.10 +      return;
    2.11 +    }
    2.12      LocationStep[] locations = expressionPath.getSteps();
    2.13      List<LocationStep> steps = new LinkedList<LocationStep>();
    2.14      steps.add(null); // first step is fake