[Jboss-cvs] JBoss Messaging SVN: r1312 - in branches/Branch_1_0: . src/main/org/jboss/jms/client/container src/main/org/jboss/jms/client/state

[jboss-cvs-commits at lists.jboss.org]

Author: ovidiu.feodorov at jboss.com
Date: 2006-09-18 20:01:33 -0400 (Mon, 18 Sep 2006)
New Revision: 1312

Modified:
   branches/Branch_1_0/messaging.iml
   branches/Branch_1_0/src/main/org/jboss/jms/client/container/ProducerAspect.java
   branches/Branch_1_0/src/main/org/jboss/jms/client/container/TransactionAspect.java
   branches/Branch_1_0/src/main/org/jboss/jms/client/state/SessionState.java
Log:
minor reformatting

Modified: branches/Branch_1_0/messaging.iml
===================================================================
--- branches/Branch_1_0/messaging.iml	2006-09-18 23:59:31 UTC (rev 1311)
+++ branches/Branch_1_0/messaging.iml	2006-09-19 00:01:33 UTC (rev 1312)
@@ -113,7 +113,9 @@
           <root url="jar://$MODULE_DIR$/tests/lib/jms-ra.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/../../jboss-4.0.4.GA-src/connector/src/main" />
+        </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">

Modified: branches/Branch_1_0/src/main/org/jboss/jms/client/container/ProducerAspect.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/client/container/ProducerAspect.java	2006-09-18 23:59:31 UTC (rev 1311)
+++ branches/Branch_1_0/src/main/org/jboss/jms/client/container/ProducerAspect.java	2006-09-19 00:01:33 UTC (rev 1312)
@@ -97,7 +97,7 @@
 
       if (deliveryMode == -1)
       {
-         //Use the delivery mode of the producer
+         // Use the delivery mode of the producer
          deliveryMode = producerState.getDeliveryMode();
          if (trace) { log.trace("Using producer's default delivery mode: " + deliveryMode); }
       }
@@ -105,7 +105,7 @@
 
       if (priority == -1)
       {
-         //Use the priority of the producer
+         // Use the priority of the producer
          priority = producerState.getPriority();
          if (trace) { log.trace("Using producer's default priority: " + priority); }
       }

Modified: branches/Branch_1_0/src/main/org/jboss/jms/client/container/TransactionAspect.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/client/container/TransactionAspect.java	2006-09-18 23:59:31 UTC (rev 1311)
+++ branches/Branch_1_0/src/main/org/jboss/jms/client/container/TransactionAspect.java	2006-09-19 00:01:33 UTC (rev 1312)
@@ -155,7 +155,7 @@
 
       if (sessionState.isTransacted())
       {
-         //Session is transacted - so we add message to tx instead of sending now
+         // Session is transacted - so we add message to tx instead of sending now
 
          Object txID = sessionState.getCurrentTxId();
 

Modified: branches/Branch_1_0/src/main/org/jboss/jms/client/state/SessionState.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/client/state/SessionState.java	2006-09-18 23:59:31 UTC (rev 1311)
+++ branches/Branch_1_0/src/main/org/jboss/jms/client/state/SessionState.java	2006-09-19 00:01:33 UTC (rev 1312)
@@ -57,7 +57,7 @@
    
    private Object currentTxId;
    
-   //Executor used for executing onMessage methods
+   // Executor used for executing onMessage methods
    private QueuedExecutor executor;
    
    private boolean recoverCalled;
@@ -76,12 +76,12 @@
       this.xa = xa;      
       if (xa)
       {
-         //Create an XA resource
+         // Create an XA resource
          xaResource = new MessagingXAResource(parent.getResourceManager(), this);                            
       }
       if (transacted)
       {
-         //Create a local tx                                                  
+         // Create a local tx
          currentTxId = parent.getResourceManager().createLocalTx();        
       }
       executor = new QueuedExecutor(new LinkedQueue());
@@ -92,8 +92,8 @@
          toAck = new ArrayList();
       }
       
-      //TODO could optimise this to use the same map of callbackmanagers (which holds refs
-      //to callbackhandlers) in the connection, instead of maintaining another map
+      // TODO could optimise this to use the same map of callbackmanagers (which holds refs
+      // to callbackhandlers) in the connection, instead of maintaining another map
       callbackHandlers = new HashMap();
    }