Menu
▾
▴
[openorb-commits] CVS: PersistentStateService/src/main/org/openorb/pss/connector/database DatabaseSession.java,1.12,1.13 DatabaseWrapper.java,1.11,1.12 FlushManager.java,1.6,1.7
Update of /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26843/src/main/org/openorb/pss/connector/database Modified Files: DatabaseSession.java DatabaseWrapper.java FlushManager.java Log Message: Renamed "enum" variables to allow compilation on JDK 1.5 Index: DatabaseSession.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/database/DatabaseSession.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- DatabaseSession.java 10 Aug 2004 19:00:05 -0000 1.12 +++ DatabaseSession.java 19 Nov 2004 22:40:26 -0000 1.13 @@ -179,18 +179,18 @@ // public synchronized void flush() { - java.util.Enumeration enum = null; + java.util.Enumeration enumeration = null; org.openorb.pss.connector.database.DatabaseEntry entry = null; if ( _cache.size() != 0 ) { org.openorb.pss.util.debug.print( "Flush data into the database..." ); - enum = _cache.elements(); + enumeration = _cache.elements(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - entry = ( org.openorb.pss.connector.database.DatabaseEntry ) enum.nextElement(); + entry = ( org.openorb.pss.connector.database.DatabaseEntry ) enumeration.nextElement(); write_entry_into_database( entry ); } @@ -204,14 +204,14 @@ // public synchronized void refresh() { - java.util.Enumeration enum = _home_from_pid.elements(); + java.util.Enumeration enumeration = _home_from_pid.elements(); org.openorb.pss.connector.database.PersistentObjectHome home = null; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { _cache.clear(); - home = ( org.openorb.pss.connector.database.PersistentObjectHome ) enum.nextElement(); + home = ( org.openorb.pss.connector.database.PersistentObjectHome ) enumeration.nextElement(); home.refreshAll(); } Index: DatabaseWrapper.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/database/DatabaseWrapper.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- DatabaseWrapper.java 10 Feb 2004 21:19:15 -0000 1.11 +++ DatabaseWrapper.java 19 Nov 2004 22:40:26 -0000 1.12 @@ -863,7 +863,6 @@ public void map_storagehome( java.io.File into, org.openorb.pss.compiler.reflect.psdlStorageHome sh ) { java.io.PrintWriter file = org.openorb.compiler.idl.util.tools.createNewFile( into, sh.idlName() ); - java.util.Enumeration enum = null; org.openorb.pss.compiler.reflect.psdlStorageType st = sh.homeFor(); org.openorb.pss.compiler.reflect.psdlAbstractStorageType [] ast = null; org.openorb.pss.compiler.reflect.psdlState state = null; @@ -1383,7 +1382,7 @@ private void map_factories( org.openorb.pss.compiler.reflect.psdlStorageHome sh, java.io.PrintWriter file ) { org.openorb.pss.compiler.reflect.psdlFactory [] factories = mappable_factories( sh ); - java.util.Enumeration enum = null; + java.util.Enumeration psdlStates = null; org.openorb.pss.compiler.reflect.psdlState state = null; if ( factories.length != 0 ) @@ -1393,16 +1392,17 @@ { file.print( " public " ); - org.openorb.pss.compiler.util.tools.javaType( m_pcp, ( ( org.openorb.pss.compiler.reflect.psdlAbstractStorageHome ) factories[ i ].idlDefinedIn() ).managed(), file ); + org.openorb.pss.compiler.util.tools.javaType( m_pcp, + ( ( org.openorb.pss.compiler.reflect.psdlAbstractStorageHome ) factories[ i ].idlDefinedIn() ).managed(), file ); file.print( " " + factories[ i ].idlName() + "( " ); boolean first = true; - enum = factories[ i ].content(); + psdlStates = factories[ i ].content(); - while ( enum.hasMoreElements() ) + while ( psdlStates.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) psdlStates.nextElement(); if ( !first ) file.print( ", " ); @@ -1430,11 +1430,11 @@ file.println( " register_type_incarnation( obj );" ); - enum = factories[ i ].content(); + psdlStates = factories[ i ].content(); - while ( enum.hasMoreElements() ) + while ( psdlStates.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) psdlStates.nextElement(); file.println( " obj." + state.idlName() + "( " + state.idlName() + " );" ); } @@ -1541,7 +1541,7 @@ private void map_keys( org.openorb.pss.compiler.reflect.psdlStorageHome sh, java.io.PrintWriter file ) { org.openorb.pss.compiler.reflect.psdlKey [] keys = mappable_keys( sh ); - java.util.Enumeration enum = null; + java.util.Enumeration enumeration = null; org.openorb.pss.compiler.reflect.psdlState state = null; if ( keys.length != 0 ) @@ -1555,17 +1555,17 @@ file.print( " find_by_" + keys[ i ].idlName() + "( " ); - enum = keys[ i ].content(); + enumeration = keys[ i ].content(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); org.openorb.pss.compiler.util.tools.javaType( m_pcp, state.stateType(), file ); file.print( " " + state.idlName() ); - if ( enum.hasMoreElements() ) + if ( enumeration.hasMoreElements() ) file.print( ", " ); } @@ -1574,22 +1574,22 @@ file.println( " {" ); int k_size = 0; - enum = keys[ i ].content(); + enumeration = keys[ i ].content(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { k_size++; - enum.nextElement(); + enumeration.nextElement(); } file.println( " org.openorb.pss.connector.database.KeyBag [] keys = org.openorb.pss.connector.database.DatabaseUtil.keys(" + k_size + ");" ); - enum = keys[ i ].content(); + enumeration = keys[ i ].content(); int j = 0; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); file.println( " keys[" + j + "].name = \"" + state.idlName() + "\";" ); @@ -1626,17 +1626,17 @@ file.print( "Ref find_ref_by_" + keys[ i ].idlName() + "( " ); - enum = keys[ i ].content(); + enumeration = keys[ i ].content(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); org.openorb.pss.compiler.util.tools.javaType( m_pcp, state.stateType(), file ); file.print( " " + state.idlName() ); - if ( enum.hasMoreElements() ) + if ( enumeration.hasMoreElements() ) file.print( ", " ); } @@ -1645,12 +1645,12 @@ file.println( " org.openorb.pss.connector.database.KeyBag [] keys = org.openorb.pss.connector.database.DatabaseUtil.keys(" + k_size + ");" ); - enum = keys[ i ].content(); + enumeration = keys[ i ].content(); j = 0; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); file.println( " keys[" + j + "].name = \"" + state.idlName() + "\";" ); @@ -1762,15 +1762,15 @@ file.print( " if ( " ); - java.util.Enumeration enum = key.content(); + java.util.Enumeration psdlStates = key.content(); - while ( enum.hasMoreElements() ) + while ( psdlStates.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) psdlStates.nextElement(); file.print( " ( " + map_condition( state.stateType(), "_tmp_" + state.idlName(), state.idlName() ) + " ) " ); - if ( enum.hasMoreElements() ) + if ( psdlStates.hasMoreElements() ) file.print( "&& " ); } @@ -1783,7 +1783,7 @@ private String map_condition( org.openorb.compiler.idl.reflect.idlObject item, String tmp_name, String state_name ) { String condition = ""; - java.util.Enumeration enum = null; + java.util.Enumeration enumeration = null; switch ( item.idlType() ) { @@ -1800,28 +1800,35 @@ case idlType.STRUCT : org.openorb.compiler.idl.reflect.idlStruct st = ( org.openorb.compiler.idl.reflect.idlStruct ) item; - enum = st.members(); + enumeration = st.members(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - org.openorb.compiler.idl.reflect.idlStructMember member = ( org.openorb.compiler.idl.reflect.idlStructMember ) enum.nextElement(); + org.openorb.compiler.idl.reflect.idlStructMember member = + ( org.openorb.compiler.idl.reflect.idlStructMember ) enumeration.nextElement(); - condition = condition + "(" + map_condition( member.internal(), tmp_name + "." + member.idlName(), state_name + "." + member.idlName() ) + " )"; + condition = condition + "(" + + map_condition( member.internal(), + tmp_name + "." + member.idlName(), + state_name + "." + member.idlName() ) + + " )"; - if ( enum.hasMoreElements() ) + if ( enumeration.hasMoreElements() ) + { condition = condition + " && "; + } } return condition; case idlType.VALUE : org.openorb.compiler.idl.reflect.idlValue val = ( org.openorb.compiler.idl.reflect.idlValue ) item; - enum = val.filter( org.openorb.compiler.idl.reflect.idlType.STATE ); + enumeration = val.filter( org.openorb.compiler.idl.reflect.idlType.STATE ); boolean first = true; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - org.openorb.compiler.idl.reflect.idlState state = ( org.openorb.compiler.idl.reflect.idlState ) enum.nextElement(); + org.openorb.compiler.idl.reflect.idlState state = ( org.openorb.compiler.idl.reflect.idlState ) enumeration.nextElement(); if ( state.isPublic() ) { Index: FlushManager.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/database/FlushManager.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- FlushManager.java 10 Feb 2004 21:19:15 -0000 1.6 +++ FlushManager.java 19 Nov 2004 22:40:26 -0000 1.7 @@ -49,11 +49,11 @@ { org.openorb.pss.connector.database.DatabaseCatalog manager = null; - java.util.Enumeration enum = manager_list.elements(); + java.util.Enumeration enumeration = manager_list.elements(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - manager = ( org.openorb.pss.connector.database.DatabaseCatalog ) enum.nextElement(); + manager = ( org.openorb.pss.connector.database.DatabaseCatalog ) enumeration.nextElement(); manager.flush(); } |
