[prev in list] [next in list] [prev in thread] [next in thread]
List: openorb-commits
Subject: [openorb-commits] CVS: PersistentStateService/src/main/org/openorb/pss/connector/file DataManager.ja
From: Lars_Kühne <lkuehne () users ! sourceforge ! net>
Date: 2004-11-19 22:40:32
Message-ID: E1CVHQe-00072H-0d () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]
Update of /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/file
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26843/src/main/org/openorb/pss/connector/file
Modified Files:
DataManager.java FileCatalog.java FileSession.java
FileWrapper.java FlushManager.java
TransactionalDataManager.java TransactionalFileSession.java
Log Message:
Renamed "enum" variables to allow compilation on JDK 1.5
Index: DataManager.java
===================================================================
RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/file/DataManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- DataManager.java 10 Feb 2004 21:53:58 -0000 1.7
+++ DataManager.java 19 Nov 2004 22:40:28 -0000 1.8
@@ -238,18 +238,18 @@
public void flush()
{
- java.util.Enumeration enum = null;
+ java.util.Enumeration enumeration = null;
org.openorb.pss.connector.file.DataEntry entry = null;
if ( ( _cache.size() != 0 ) && ( _lock_flush == false ) )
{
org.openorb.pss.util.debug.print( "Flush all information saved into the \
cache... [ " + _home_name + " ]" );
- enum = _cache.elements();
+ enumeration = _cache.elements();
- while ( enum.hasMoreElements() )
+ while ( enumeration.hasMoreElements() )
{
- entry = ( org.openorb.pss.connector.file.DataEntry ) \
enum.nextElement(); + entry = ( \
org.openorb.pss.connector.file.DataEntry ) enumeration.nextElement();
if ( entry.valid )
write_entry_into_datastore( entry );
@@ -274,13 +274,13 @@
_cache.clear();
// 2. Invalidate all entries
- java.util.Enumeration enum = _index_table.elements();
+ java.util.Enumeration enumeration = _index_table.elements();
- while ( enum.hasMoreElements() )
+ while ( enumeration.hasMoreElements() )
{
try
{
- Long index = ( Long ) enum.nextElement();
+ Long index = ( Long ) enumeration.nextElement();
if ( index == null )
return;
Index: FileCatalog.java
===================================================================
RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/file/FileCatalog.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- FileCatalog.java 10 Feb 2004 21:19:16 -0000 1.6
+++ FileCatalog.java 19 Nov 2004 22:40:28 -0000 1.7
@@ -135,7 +135,7 @@
throws org.omg.CosPersistentState.NotFound
{
- java.util.Enumeration enum = _home_incarnations.elements();
+ java.util.Enumeration enumeration = _home_incarnations.elements();
org.openorb.pss.connector.file.PersistentObjectHome object_home = null;
@@ -145,9 +145,9 @@
byte [] short_pid = \
org.openorb.pss.connector.file.PIDFactory.pid_to_short_pid( the_pid );
- while ( enum.hasMoreElements() )
+ while ( enumeration.hasMoreElements() )
{
- object_home = ( org.openorb.pss.connector.file.PersistentObjectHome ) \
enum.nextElement(); + object_home = ( \
org.openorb.pss.connector.file.PersistentObjectHome ) enumeration.nextElement();
org.openorb.pss.connector.PID home_pid = object_home.getPID();
@@ -173,19 +173,17 @@
public org.omg.CosPersistentState.StorageObjectRef find_ref_by_pid( byte [] \
the_pid ) throws org.omg.CosPersistentState.NotFound
{
- java.util.Enumeration enum = _home_incarnations.elements();
+ java.util.Enumeration enumeration = _home_incarnations.elements();
org.openorb.pss.connector.file.PersistentObjectHome object_home = null;
- org.omg.CosPersistentState.StorageHomeBase home = null;
-
byte [] catalog_pid = \
org.openorb.pss.connector.file.PIDFactory.pid_to_catalog_pid( the_pid, _info );
byte [] short_pid = \
org.openorb.pss.connector.file.PIDFactory.pid_to_short_pid( the_pid );
- while ( enum.hasMoreElements() )
+ while ( enumeration.hasMoreElements() )
{
- object_home = ( org.openorb.pss.connector.file.PersistentObjectHome ) \
enum.nextElement(); + object_home = ( \
org.openorb.pss.connector.file.PersistentObjectHome ) enumeration.nextElement();
org.openorb.pss.connector.PID home_pid = object_home.getPID();
@@ -205,14 +203,14 @@
{
org.openorb.pss.connector.PID home_pid = ( ( \
org.openorb.pss.connector.file.PersistentObjectHome ) home ).getPID();
- java.util.Enumeration enum = getSequentialAccess( home_pid );
+ java.util.Enumeration enumeration = getSequentialAccess( home_pid );
java.util.Vector list = new java.util.Vector();
- while ( enum.hasMoreElements() )
+ while ( enumeration.hasMoreElements() )
{
list.addElement( PIDFactory.short_pid_to_pid(
- ( ( org.openorb.pss.connector.file.FileKeyBag ) enum.nextElement() \
).short_pid, + ( ( org.openorb.pss.connector.file.FileKeyBag ) \
enumeration.nextElement() ).short_pid, home_pid ) );
}
Index: FileSession.java
===================================================================
RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/file/FileSession.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- FileSession.java 10 Feb 2004 21:19:16 -0000 1.10
+++ FileSession.java 19 Nov 2004 22:40:28 -0000 1.11
@@ -254,7 +254,8 @@
new_entry.valid = true;
new_entry.short_pid = type_pid.short_value();
- org.openorb.orb.io.StorageBuffer buffer = ( ( \
org.openorb.orb.io.MarshalBuffer ) ( ( org.openorb.orb.iiop.CDROutputStream ) output \
).getMarshalBuffer() ).lastFragment(); + org.openorb.orb.io.StorageBuffer \
buffer = + ( ( ( org.openorb.orb.iiop.CDROutputStream ) output \
).getMarshalBuffer() ).lastFragment(); new_entry.data = buffer.linearize();
// Verify if another entry exists with the same PID and if so, deleted it
@@ -329,11 +330,11 @@
//
public synchronized void flush()
{
- java.util.Enumeration enum = _home_datastores.elements();
+ java.util.Enumeration enumeration = _home_datastores.elements();
DataManager manager = null;
- while ( enum.hasMoreElements() )
+ while ( enumeration.hasMoreElements() )
{
- manager = ( DataManager ) enum.nextElement();
+ manager = ( DataManager ) enumeration.nextElement();
manager.flush();
}
}
@@ -343,11 +344,11 @@
//
public synchronized void refresh()
{
- java.util.Enumeration enum = _home_incarnations.elements();
+ java.util.Enumeration enumeration = _home_incarnations.elements();
PersistentObjectHome home = null;
- while ( enum.hasMoreElements() )
+ while ( enumeration.hasMoreElements() )
{
- home = ( PersistentObjectHome ) enum.nextElement();
+ home = ( PersistentObjectHome ) enumeration.nextElement();
home.refreshAll();
}
}
@@ -357,11 +358,11 @@
//
public synchronized void free_all()
{
- java.util.Enumeration enum = _home_datastores.elements();
+ java.util.Enumeration enumeration = _home_datastores.elements();
DataManager manager = null;
- while ( enum.hasMoreElements() )
+ while ( enumeration.hasMoreElements() )
{
- manager = ( DataManager ) enum.nextElement();
+ manager = ( DataManager ) enumeration.nextElement();
manager.free_all();
}
}
@@ -371,11 +372,11 @@
//
public synchronized void close()
{
- java.util.Enumeration enum = _home_datastores.elements();
+ java.util.Enumeration enumeration = _home_datastores.elements();
DataManager manager = null;
- while ( enum.hasMoreElements() )
+ while ( enumeration.hasMoreElements() )
{
- manager = ( DataManager ) enum.nextElement();
+ manager = ( DataManager ) enumeration.nextElement();
manager.close();
}
if ( ! manager.shared() ) _datastores.remove( manager.key() );
@@ -512,11 +513,11 @@
public org.omg.CosPersistentState.StorageHomeBase find_home_base( PID pid )
{
PID p = null;
- java.util.Enumeration enum = _home_datastores.keys();
+ java.util.Enumeration enumeration = _home_datastores.keys();
- while ( enum.hasMoreElements() )
+ while ( enumeration.hasMoreElements() )
{
- p = ( PID ) enum.nextElement();
+ p = ( PID ) enumeration.nextElement();
if ( p.is_same_catalog( pid.catalog_value() ) )
{
DataManager mgr = ( DataManager ) _home_datastores.get( p );
Index: FileWrapper.java
===================================================================
RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/file/FileWrapper.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- FileWrapper.java 10 Feb 2004 21:19:16 -0000 1.11
+++ FileWrapper.java 19 Nov 2004 22:40:28 -0000 1.12
@@ -867,9 +867,7 @@
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.psdlState state = null;
// File header
@@ -1344,7 +1342,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 enumeration = null;
org.openorb.pss.compiler.reflect.psdlState state = null;
if ( factories.length != 0 )
@@ -1359,11 +1357,11 @@
file.print( " " + factories[ i ].idlName() + "( " );
boolean first = true;
- enum = factories[ i ].content();
+ enumeration = factories[ 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();
if ( !first )
file.print( ", " );
@@ -1391,11 +1389,11 @@
file.println( " register_type_incarnation( obj );" );
- enum = factories[ i ].content();
+ enumeration = factories[ 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();
file.println( " obj." + state.idlName() + "( " + \
state.idlName() + " );" ); }
@@ -1502,7 +1500,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 )
@@ -1516,17 +1514,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();
tools.javaType( m_pcp, state.stateType(), file );
file.print( " " + state.idlName() );
- if ( enum.hasMoreElements() )
+ if ( enumeration.hasMoreElements() )
file.print( ", " );
}
@@ -1599,17 +1597,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();
tools.javaType( m_pcp, state.stateType(), file );
file.print( " " + state.idlName() );
- if ( enum.hasMoreElements() )
+ if ( enumeration.hasMoreElements() )
file.print( ", " );
}
@@ -1761,15 +1759,15 @@
file.print( " if ( " );
- java.util.Enumeration enum = key.content();
+ java.util.Enumeration enumeration = key.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();
file.print( " ( " + map_condition( state.stateType(), "_tmp_" + \
state.idlName(), state.idlName() ) + " ) " );
- if ( enum.hasMoreElements() )
+ if ( enumeration.hasMoreElements() )
file.print( "&& " );
}
@@ -1782,7 +1780,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() )
{
@@ -1799,15 +1797,15 @@
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() ) + " )";
- if ( enum.hasMoreElements() )
+ if ( enumeration.hasMoreElements() )
condition = condition + " && ";
}
@@ -1815,12 +1813,12 @@
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/file/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:16 -0000 1.6
+++ FlushManager.java 19 Nov 2004 22:40:29 -0000 1.7
@@ -49,11 +49,11 @@
{
org.openorb.pss.connector.file.DataManager 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.file.DataManager ) \
enum.nextElement(); + manager = ( \
org.openorb.pss.connector.file.DataManager ) enumeration.nextElement();
manager.flush();
}
Index: TransactionalDataManager.java
===================================================================
RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/file/TransactionalDataManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- TransactionalDataManager.java 10 Feb 2004 21:19:16 -0000 1.5
+++ TransactionalDataManager.java 19 Nov 2004 22:40:29 -0000 1.6
@@ -122,15 +122,15 @@
private synchronized void apply_modification()
{
- java.util.Enumeration enum = _modified.keys();
+ java.util.Enumeration enumeration = _modified.keys();
String key = null;
org.openorb.pss.connector.PID pid = null;
org.openorb.pss.connector.file.DataEntry entry = null;
java.util.Hashtable table = get_index_table();
- while ( enum.hasMoreElements() )
+ while ( enumeration.hasMoreElements() )
{
- key = ( String ) enum.nextElement();
+ key = ( String ) enumeration.nextElement();
if ( _modified.get( key ) instanceof org.openorb.pss.connector.PID )
{
Index: TransactionalFileSession.java
===================================================================
RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/file/TransactionalFileSession.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- TransactionalFileSession.java 10 Feb 2004 21:19:16 -0000 1.6
+++ TransactionalFileSession.java 19 Nov 2004 22:40:29 -0000 1.7
@@ -276,11 +276,11 @@
catch ( java.lang.Exception ex )
{ }
- java.util.Enumeration enum = _home_datastores.elements();
+ java.util.Enumeration enumeration = _home_datastores.elements();
org.openorb.pss.connector.file.TransactionalDataManager manager = null;
- while ( enum.hasMoreElements() )
+ while ( enumeration.hasMoreElements() )
{
- manager = ( org.openorb.pss.connector.file.TransactionalDataManager ) \
enum.nextElement(); + manager = ( \
org.openorb.pss.connector.file.TransactionalDataManager ) enumeration.nextElement(); \
if ( !manager.begun() ) manager.begin(); }
}
@@ -291,12 +291,12 @@
public org.openorb.pss.connector.file.TransactionalDataManager [] \
get_data_managers() {
org.openorb.pss.connector.file.TransactionalDataManager [] managers = new \
org.openorb.pss.connector.file.TransactionalDataManager[ \
_home_datastores.size() ];
- java.util.Enumeration enum = _home_datastores.elements();
+ java.util.Enumeration enumeration = _home_datastores.elements();
int i = 0;
- while ( enum.hasMoreElements() )
+ while ( enumeration.hasMoreElements() )
{
- managers[ i++ ] = ( \
org.openorb.pss.connector.file.TransactionalDataManager ) enum.nextElement(); + \
managers[ i++ ] = ( org.openorb.pss.connector.file.TransactionalDataManager ) \
enumeration.nextElement(); }
return managers;
-------------------------------------------------------
This SF.Net email is sponsored by: InterSystems CACHE
FREE OODBMS DOWNLOAD - A multidimensional database that combines
robust object and relational technologies, making it a perfect match
for Java, C++,COM, XML, ODBC and JDBC. www.intersystems.com/match8
_______________________________________________
openorb-commits mailing list
openorb-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openorb-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic