[prev in list] [next in list] [prev in thread] [next in thread]
List: openorb-commits
Subject: [openorb-commits] CVS: PropertyService/src/main/org/openorb/property PropertySetDefImpl.java,1.14,1.
From: Lars_Kühne <lkuehne () users ! sourceforge ! net>
Date: 2004-11-19 22:35:21
Message-ID: E1CVHLd-0006hf-7n () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]
Update of /cvsroot/openorb/PropertyService/src/main/org/openorb/property
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25714/src/main/org/openorb/property
Modified Files:
PropertySetDefImpl.java PropertySetImpl.java
Log Message:
Renamed "enum" variables to allow compilation on JDK 1.5
Index: PropertySetDefImpl.java
===================================================================
RCS file: /cvsroot/openorb/PropertyService/src/main/org/openorb/property/PropertySetDefImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- PropertySetDefImpl.java 19 Feb 2004 06:35:34 -0000 1.14
+++ PropertySetDefImpl.java 19 Nov 2004 22:35:18 -0000 1.15
@@ -729,23 +729,23 @@
{
int available = m_property_table.size();
int length = how_many <= available ? how_many : available; // < 0, if how_many < 0
- java.util.Enumeration enum = m_property_table.keys();
+ java.util.Enumeration enumeration = m_property_table.keys();
if ( length >= 0 )
{
property_names.value = new java.lang.String[ length ];
for ( int i = 0; i < length; i++ )
{
- property_names.value[ i ] = ( java.lang.String ) enum.nextElement();
+ property_names.value[ i ] = ( java.lang.String ) enumeration.nextElement();
}
}
- if ( enum.hasMoreElements() )
+ if ( enumeration.hasMoreElements() )
{
java.util.Vector theRest = new java.util.Vector();
- while ( enum.hasMoreElements() )
+ while ( enumeration.hasMoreElements() )
{
- theRest.addElement( ( java.lang.String ) enum.nextElement() );
+ theRest.addElement( ( java.lang.String ) enumeration.nextElement() );
}
java.lang.String[] the_rest = new java.lang.String[ theRest.size() ];
theRest.copyInto( the_rest );
@@ -865,7 +865,7 @@
{
int available = m_property_table.size();
int length = how_many <= available ? how_many : available; // < 0, if how_many < 0
- java.util.Enumeration enum = m_property_table.keys();
+ java.util.Enumeration enumeration = m_property_table.keys();
if ( length >= 0 )
{
@@ -874,20 +874,20 @@
{
org.omg.CosPropertyService.PropertyDef property_def =
( org.omg.CosPropertyService.PropertyDef )
- m_property_table.get( ( java.lang.String ) enum.nextElement() );
+ m_property_table.get( ( java.lang.String ) enumeration.nextElement() );
nproperties.value[ i ] = new org.omg.CosPropertyService.Property(
property_def.property_name, property_def.property_value );
}
}
- if ( enum.hasMoreElements() )
+ if ( enumeration.hasMoreElements() )
{
java.util.Vector theRest = new java.util.Vector();
- while ( enum.hasMoreElements() )
+ while ( enumeration.hasMoreElements() )
{
org.omg.CosPropertyService.PropertyDef property_def =
( org.omg.CosPropertyService.PropertyDef )
- m_property_table.get( ( java.lang.String ) enum.nextElement() );
+ m_property_table.get( ( java.lang.String ) enumeration.nextElement() );
theRest.addElement( new org.omg.CosPropertyService.Property(
property_def.property_name, property_def.property_value ) );
}
@@ -1027,12 +1027,12 @@
*/
public boolean delete_all_properties()
{
- java.util.Enumeration enum = m_property_table.keys();
- for ( ; enum.hasMoreElements(); )
+ java.util.Enumeration enumeration = m_property_table.keys();
+ for ( ; enumeration.hasMoreElements(); )
{
try
{
- delete_property( ( java.lang.String ) enum.nextElement() );
+ delete_property( ( java.lang.String ) enumeration.nextElement() );
}
catch ( org.omg.CosPropertyService.PropertyNotFound ex )
{
Index: PropertySetImpl.java
===================================================================
RCS file: /cvsroot/openorb/PropertyService/src/main/org/openorb/property/PropertySetImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- PropertySetImpl.java 19 Feb 2004 06:35:34 -0000 1.11
+++ PropertySetImpl.java 19 Nov 2004 22:35:18 -0000 1.12
@@ -287,23 +287,23 @@
{
int available = m_property_table.size();
int length = how_many <= available ? how_many : available; // < 0, if how_many < 0
- java.util.Enumeration enum = m_property_table.keys();
+ java.util.Enumeration enumeration = m_property_table.keys();
if ( length >= 0 )
{
property_names.value = new java.lang.String[ length ];
for ( int i = 0; i < length; i++ )
{
- property_names.value[ i ] = ( java.lang.String ) enum.nextElement();
+ property_names.value[ i ] = ( java.lang.String ) enumeration.nextElement();
}
}
- if ( enum.hasMoreElements() )
+ if ( enumeration.hasMoreElements() )
{
java.util.Vector propertyTableKeys = new java.util.Vector();
- while ( enum.hasMoreElements() )
+ while ( enumeration.hasMoreElements() )
{
- propertyTableKeys.addElement( ( java.lang.String ) enum.nextElement() );
+ propertyTableKeys.addElement( ( java.lang.String ) enumeration.nextElement() );
}
java.lang.String[] the_rest = new java.lang.String[ propertyTableKeys.size() ];
propertyTableKeys.copyInto( the_rest );
@@ -423,7 +423,7 @@
{
int available = m_property_table.size();
int length = how_many <= available ? how_many : available; // < 0, if how_many < 0
- java.util.Enumeration enum = m_property_table.keys();
+ java.util.Enumeration enumeration = m_property_table.keys();
if ( length >= 0 )
{
@@ -431,17 +431,17 @@
for ( int i = 0; i < length; i++ )
{
nproperties.value[ i ] = ( org.omg.CosPropertyService.Property )
- m_property_table.get( ( java.lang.String ) enum.nextElement() );
+ m_property_table.get( ( java.lang.String ) enumeration.nextElement() );
}
}
- if ( enum.hasMoreElements() )
+ if ( enumeration.hasMoreElements() )
{
java.util.Vector propertyTableKeys = new java.util.Vector();
- while ( enum.hasMoreElements() )
+ while ( enumeration.hasMoreElements() )
{
propertyTableKeys.addElement( m_property_table.get(
- ( java.lang.String ) enum.nextElement() ) );
+ ( java.lang.String ) enumeration.nextElement() ) );
}
org.omg.CosPropertyService.Property[] the_rest =
new org.omg.CosPropertyService.Property[ propertyTableKeys.size() ];
@@ -569,12 +569,12 @@
*/
public boolean delete_all_properties()
{
- java.util.Enumeration enum = m_property_table.keys();
- while ( enum.hasMoreElements() )
+ java.util.Enumeration enumeration = m_property_table.keys();
+ while ( enumeration.hasMoreElements() )
{
try
{
- delete_property( ( java.lang.String ) enum.nextElement() );
+ delete_property( ( java.lang.String ) enumeration.nextElement() );
} // not interested in exceptions
catch ( org.omg.CosPropertyService.PropertyNotFound ex )
{
-------------------------------------------------------
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