[openorb-commits] CVS: TransactionService/src/main/org/openorb/ots/Impl Current.java,1.18,1.19

[<lk...@us...>]

Update of /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30333/src/main/org/openorb/ots/Impl

Modified Files:
	Current.java 
Log Message:
renamed local variable 'enum' to make the code JDK 1.5 compliant
removed obsolete java.lang. prefixes for String, Thread, Exception 


Index: Current.java
===================================================================
RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl/Current.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Current.java	26 Jul 2004 12:04:40 -0000	1.18
+++ Current.java	4 Aug 2004 11:02:46 -0000	1.19
@@ -297,7 +297,7 @@
      * equivalent to performing the get_transaction_name operation on the corresponding
      * Coordinator object.
      */
-    public java.lang.String get_transaction_name()
+    public String get_transaction_name()
     {
         try
         {
@@ -425,7 +425,7 @@
                         m_info.resolve_initial_references( "PICurrent" ) );
                 piCurrent.set_slot( m_slot_id, any );
             }
-            catch ( java.lang.Exception ex )
+            catch ( Exception ex )
             {
                 throw new org.omg.CosTransactions.InvalidControl();
             }
@@ -477,11 +477,11 @@
     public void push_txcontext( org.omg.CosTransactions.PropagationContext pctx )
     {
         java.util.Stack stack = ( java.util.Stack ) s_propagation_ctx_stacks.get(
-              java.lang.Thread.currentThread() );
+              Thread.currentThread() );
         if ( stack == null )
         {
             stack = new java.util.Stack();
-            s_propagation_ctx_stacks.put( java.lang.Thread.currentThread(), stack );
+            s_propagation_ctx_stacks.put( Thread.currentThread(), stack );
         }
         stack.push( pctx );
     }
@@ -494,7 +494,7 @@
     {
         boolean clean = false;
         java.util.Stack stack = ( java.util.Stack ) s_propagation_ctx_stacks.get(
-              java.lang.Thread.currentThread() );
+              Thread.currentThread() );
 
         if ( stack == null )
         {
@@ -593,7 +593,7 @@
                     session.updateConnection( xa_connection, pctx.current.coord );
                 }
             }
-            catch ( java.lang.Exception ex )
+            catch ( Exception ex )
             {
                 getLogger().error( ex.toString(), ex );
                 throw new org.omg.CORBA.INTERNAL();
@@ -639,7 +639,7 @@
                       rootPOA.id_to_reference( id ) );
                 pctx.current.coord.register_resource( res );
             }
-            catch ( java.lang.Exception ex )
+            catch ( Exception ex )
             {
                 getLogger().error( "Unable to register XA resource: " + ex.toString(), ex );
                 throw new org.omg.CORBA.INTERNAL();
@@ -675,7 +675,7 @@
             byte [] id = rootPOA.servant_to_id( xaBag.getXACoordinator() );
             rootPOA.deactivate_object( id );
         }
-        catch ( java.lang.Exception ex )
+        catch ( Exception ex )
         {
             getLogger().error( "unable to unregister XA coordinator: " + ex.toString(), ex );
             throw new org.omg.CORBA.INTERNAL();
@@ -709,13 +709,13 @@
     private org.openorb.ots.xa.XABag getXABag( org.omg.CosTransactions.PropagationContext pctx )
     {
         org.openorb.ots.xa.XABag bag = ( org.openorb.ots.xa.XABag ) m_xa_list.get(
-              java.lang.Thread.currentThread() );
+              Thread.currentThread() );
         if ( bag != null )
         {
             return bag;
         }
         bag = new org.openorb.ots.xa.XABag();
-        m_xa_list.put( java.lang.Thread.currentThread(), bag );
+        m_xa_list.put( Thread.currentThread(), bag );
         return bag;
     }
 
@@ -724,7 +724,7 @@
      */
     private void forgetXABag()
     {
-        m_xa_list.remove( java.lang.Thread.currentThread() );
+        m_xa_list.remove( Thread.currentThread() );
         s_xa.removeAllElements();
     }
 
@@ -734,10 +734,10 @@
     private org.openorb.ots.xa.XABag getXABagFromCoordinator(
           org.openorb.ots.xa.XACoordinator coord )
     {
-        java.util.Enumeration enum = m_xa_list.elements();
-        while ( enum.hasMoreElements() )
+        java.util.Enumeration xaBags = m_xa_list.elements();
+        while ( xaBags.hasMoreElements() )
         {
-            org.openorb.ots.xa.XABag bag = ( org.openorb.ots.xa.XABag ) enum.nextElement();
+            org.openorb.ots.xa.XABag bag = ( org.openorb.ots.xa.XABag ) xaBags.nextElement();
             if ( bag.getXACoordinator() != null )
             {
                 if ( bag.getXACoordinator().equals( coord ) )