Remove commentted out or unused code and fix IDE warnings

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@772947 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 2 insertions, 16 deletions

diff --git a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
index a6428f6984..d57471e215 100644
--- a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
+++ b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
@@ -31,7 +31,7 @@ public class ODEDeployment {
     public File deployDir;
 
     /** If non-null the type of exception we expect to get when we deploy. */
-    public Class expectedException = null;
+    public Class<?> expectedException = null;
 
     public ODEDeployment(File deployDir) {
         this.deployDir = deployDir;
diff --git a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
index 328403e626..deaeaec040 100644
--- a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
+++ b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
@@ -34,14 +34,9 @@ import org.w3c.dom.Element;
  * @version $Rev$ $Date$
  */
 public class TuscanyEPR implements EndpointReference {
-    private final QName prcessName;
-    private final Endpoint endpoint;
     private final Document doc = DOMUtils.newDocument();
     
     public TuscanyEPR(QName processName, Endpoint endpoint) {
-        this.prcessName = processName;
-        this.endpoint = endpoint;
-        
         Element serviceref = doc.createElementNS(EndpointReference.SERVICE_REF_QNAME.getNamespaceURI(),
                                                  EndpointReference.SERVICE_REF_QNAME.getLocalPart());
         serviceref.setNodeValue(endpoint.serviceName + ":" + endpoint.portName);
diff --git a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
index 8f8f608217..b0539970ec 100644
--- a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
+++ b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
@@ -36,15 +36,9 @@ import org.w3c.dom.Element;
  */
 public class TuscanyPRC implements PartnerRoleChannel {
     private final QName processName;
-    private final QName pid;
-    private final PortType portType;
-    private final Endpoint endpoint;
     
     public TuscanyPRC(QName processName, QName pid, PortType portType, Endpoint endpoint){
         this.processName = processName;
-        this.pid = pid;
-        this.portType = portType;
-        this.endpoint = endpoint;
     }
     
     public QName getProcessName() {
diff --git a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
index fcb0d27354..e07fdbc302 100644
--- a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
+++ b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
@@ -60,7 +60,6 @@ public class BPELInvoker implements Invoker {
     private EmbeddedODEServer odeServer;
     private TransactionManager txMgr;
     
-    private RuntimeComponent component;
     private RuntimeComponentService service;
     private Operation operation;
     private QName bpelServiceName;
@@ -69,7 +68,6 @@ public class BPELInvoker implements Invoker {
     private Part bpelOperationOutputPart;
     
     public BPELInvoker(RuntimeComponent component, RuntimeComponentService service, Operation operation, EmbeddedODEServer odeServer, TransactionManager txMgr) {
-        this.component = component;
         this.service = service;
         this.operation = operation;
         this.bpelOperationName = operation.getName();
@@ -120,7 +118,7 @@ public class BPELInvoker implements Invoker {
         }
         
         org.apache.ode.bpel.iapi.MyRoleMessageExchange mex = null;
-        Future onhold = null;
+        Future<?> onhold = null;
         
         //Process the BPEL process invocation
         try {
@@ -239,7 +237,6 @@ public class BPELInvoker implements Invoker {
      * @return
      */
     private Element processResponse(Element response) {
-        // return (Element) DOMUtils.findChildByName(response, new QName("",bpelOperationOutputPart.getName())).getFirstChild();
         return (Element) DOMUtils.findChildByName(response, new QName("",bpelOperationOutputPart.getName()));
     }
 }