|
From: <lk...@us...> - 2004-11-19 22:36:17
|
Update of /cvsroot/openorb/TradingService/src/main/org/openorb/trader/repository In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25869/src/main/org/openorb/trader/repository Modified Files: Repository.java Log Message: Renamed "enum" variables to allow compilation on JDK 1.5 Index: Repository.java =================================================================== RCS file: /cvsroot/openorb/TradingService/src/main/org/openorb/trader/repository/Repository.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Repository.java 26 Jul 2004 12:03:55 -0000 1.13 +++ Repository.java 19 Nov 2004 22:36:04 -0000 1.14 @@ -356,20 +356,20 @@ org.omg.CosTradingRepos.ServiceTypeRepositoryPackage.TypeStruct ret = new org.omg.CosTradingRepos.ServiceTypeRepositoryPackage.TypeStruct(); String [] super_types = new String[ supers.size() ]; - java.util.Enumeration enum = supers.elements(); + java.util.Enumeration enumeration = supers.elements(); int i = 0; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - super_types[ i++ ] = ( String ) enum.nextElement(); + super_types[ i++ ] = ( String ) enumeration.nextElement(); } org.omg.CosTradingRepos.ServiceTypeRepositoryPackage.PropStruct [] props = new PropStruct[ properties.size() ]; - enum = properties.elements(); + enumeration = properties.elements(); i = 0; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { props[ i++ ] = ( org.omg.CosTradingRepos.ServiceTypeRepositoryPackage.PropStruct ) - enum.nextElement(); + enumeration.nextElement(); } ret.if_name = struct.if_name; ret.props = props; @@ -744,19 +744,19 @@ /** * Checks if the first property mode is strictly more restrictive than the second one. */ - private boolean is_more_restrictive( PropertyMode prop_a, PropertyMode prop_b ) + private boolean is_more_restrictive( PropertyMode prop_a, PropertyMode prop_b ) { - if ( prop_a == PropertyMode.PROP_NORMAL ) + if ( prop_a == PropertyMode.PROP_NORMAL ) { return false; } - if ( prop_a == PropertyMode.PROP_MANDATORY_READONLY - && prop_b != PropertyMode.PROP_MANDATORY_READONLY ) + if ( prop_a == PropertyMode.PROP_MANDATORY_READONLY + && prop_b != PropertyMode.PROP_MANDATORY_READONLY ) { return true; } - if ( ( prop_a == PropertyMode.PROP_MANDATORY || prop_a == PropertyMode.PROP_READONLY ) - && prop_b == PropertyMode.PROP_NORMAL ) + if ( ( prop_a == PropertyMode.PROP_MANDATORY || prop_a == PropertyMode.PROP_READONLY ) + && prop_b == PropertyMode.PROP_NORMAL ) { return true; } |