You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by qu...@apache.org on 2003/01/14 00:07:09 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/modules/actions InitContextsAction.java
quintonm 2003/01/13 15:07:09
Modified: src/java/org/apache/turbine/modules/actions
InitContextsAction.java
Log:
Iterator is now initialized in a for loop
Revision Changes Path
1.3 +9 -15 jakarta-turbine-2/src/java/org/apache/turbine/modules/actions/InitContextsAction.java
Index: InitContextsAction.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/actions/InitContextsAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InitContextsAction.java 8 Dec 2002 14:25:55 -0000 1.2
+++ InitContextsAction.java 13 Jan 2003 23:07:09 -0000 1.3
@@ -54,17 +54,13 @@
* <http://www.apache.org/>.
*/
-import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Properties;
-
import javax.naming.InitialContext;
import org.apache.turbine.modules.Action;
-
import org.apache.turbine.services.resources.TurbineResources;
-
import org.apache.turbine.util.RunData;
/**
@@ -84,7 +80,7 @@
* @exception Exception, a generic exception.
*/
public void doPerform(RunData data)
- throws Exception
+ throws Exception
{
// Context properties are specified in lines in the properties
// file that begin with "context.contextname.", allowing
@@ -93,34 +89,32 @@
// used by the InitialContext class to create a new context
// instance.
- Iterator contextKeys = TurbineResources.getKeys("context.");
Hashtable contextPropsList = new Hashtable();
- while (contextKeys.hasNext())
+ for(Iterator contextKeys = TurbineResources.getKeys("context."); contextKeys.hasNext();)
{
String key = (String) contextKeys.next();
int start = key.indexOf(".") + 1;
int end = key.indexOf(".", start);
String contextName = key.substring(start, end);
Properties contextProps = null;
- if (contextPropsList.containsKey(contextName))
+ if(contextPropsList.containsKey(contextName))
{
contextProps =
- (Properties) contextPropsList.get(contextName);
+ (Properties) contextPropsList.get(contextName);
}
else
{
contextProps = new Properties();
}
contextProps.put(key.substring(end + 1),
- TurbineResources.getString(key));
+ TurbineResources.getString(key));
contextPropsList.put(contextName, contextProps);
}
- Enumeration contextPropsKeys = contextPropsList.keys();
- while (contextPropsKeys.hasMoreElements())
+ for(Iterator contextPropsKeys = contextPropsList.keySet().iterator(); contextPropsKeys.hasNext();)
{
- String key = (String) contextPropsKeys.nextElement();
+ String key = (String) contextPropsKeys.next();
Properties contextProps =
- (Properties) contextPropsList.get(key);
+ (Properties) contextPropsList.get(key);
InitialContext context = new InitialContext(contextProps);
data.getJNDIContexts().put(key, context);
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>