You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2010/02/23 11:07:47 UTC
svn commit: r915266 - in
/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core:
database/ConnectionFactory.java interfaces/StringSet.java
interfaces/StringSetBuffer.java keystore/KeystoreManager.java
lockmanager/LockManager.java
Author: kwright
Date: Tue Feb 23 10:07:47 2010
New Revision: 915266
URL: http://svn.apache.org/viewvc?rev=915266&view=rev
Log:
Address compilation warnings, as per connectors-14.
Modified:
incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/ConnectionFactory.java
incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/StringSet.java
incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/StringSetBuffer.java
incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/keystore/KeystoreManager.java
incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/lockmanager/LockManager.java
Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/ConnectionFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/ConnectionFactory.java?rev=915266&r1=915265&r2=915266&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/ConnectionFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/ConnectionFactory.java Tue Feb 23 10:07:47 2010
@@ -250,11 +250,11 @@
// difficult conditions.
- Enumeration enum = _pool.getPools();
+ Enumeration enumeration = _pool.getPools();
ArrayList connectionShutdownThreads = new ArrayList();
- while (enum.hasMoreElements())
+ while (enumeration.hasMoreElements())
{
- ConnectionPool pool = (ConnectionPool)enum.nextElement();
+ ConnectionPool pool = (ConnectionPool)enumeration.nextElement();
try
{
// The removeAllConnections() method did not work, probably because the cleanup was
Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/StringSet.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/StringSet.java?rev=915266&r1=915265&r2=915266&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/StringSet.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/StringSet.java Tue Feb 23 10:07:47 2010
@@ -130,10 +130,10 @@
{
String[] rval = new String[hashtable.size()];
int i = 0;
- Iterator enum = hashtable.keySet().iterator();
- while (enum.hasNext())
+ Iterator iter = hashtable.keySet().iterator();
+ while (iter.hasNext())
{
- String x = (String)enum.next();
+ String x = (String)iter.next();
if (prefix != null)
x = prefix + x;
rval[i++] = x;
@@ -145,10 +145,10 @@
*/
public StringSet(StringSet oldOne, String prefix)
{
- Iterator enum = oldOne.hashtable.keySet().iterator();
- while (enum.hasNext())
+ Iterator iter = oldOne.hashtable.keySet().iterator();
+ while (iter.hasNext())
{
- String x = (String)enum.next();
+ String x = (String)iter.next();
if (prefix != null)
x = prefix + x;
hashtable.put(x,x);
Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/StringSetBuffer.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/StringSetBuffer.java?rev=915266&r1=915265&r2=915266&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/StringSetBuffer.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/StringSetBuffer.java Tue Feb 23 10:07:47 2010
@@ -129,10 +129,10 @@
{
String[] rval = new String[hashtable.size()];
int i = 0;
- Iterator enum = hashtable.keySet().iterator();
- while (enum.hasNext())
+ Iterator iter = hashtable.keySet().iterator();
+ while (iter.hasNext())
{
- String x = (String)enum.next();
+ String x = (String)iter.next();
if (prefix != null)
x = prefix + x;
rval[i++] = x;
Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/keystore/KeystoreManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/keystore/KeystoreManager.java?rev=915266&r1=915265&r2=915266&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/keystore/KeystoreManager.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/keystore/KeystoreManager.java Tue Feb 23 10:07:47 2010
@@ -124,11 +124,11 @@
try
{
String[] rval = new String[keystore.size()];
- Enumeration enum = keystore.aliases();
+ Enumeration enumeration = keystore.aliases();
int i = 0;
- while (enum.hasMoreElements())
+ while (enumeration.hasMoreElements())
{
- String alias = (String)enum.nextElement();
+ String alias = (String)enumeration.nextElement();
rval[i++] = alias;
}
return rval;
Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/lockmanager/LockManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/lockmanager/LockManager.java?rev=915266&r1=915265&r2=915266&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/lockmanager/LockManager.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/lockmanager/LockManager.java Tue Feb 23 10:07:47 2010
@@ -1605,10 +1605,10 @@
LockDescription[] rval = new LockDescription[ht.size()];
String[] sortarray = new String[ht.size()];
i = 0;
- Iterator enum = ht.keySet().iterator();
- while (enum.hasNext())
+ Iterator iter = ht.keySet().iterator();
+ while (iter.hasNext())
{
- String key = (String)enum.next();
+ String key = (String)iter.next();
sortarray[i++] = key;
}
java.util.Arrays.sort(sortarray);