craigmcc 02/01/15 10:39:36
Modified: src/share/org/apache/struts/config ApplicationConfig.java
Log:
Change the name of the collection used to store ActionConfig objects, to
avoid potential confusion with the collection named "actions" in
RequestProcessor.
Submitted by: Donnie Hale <[EMAIL PROTECTED]>
Revision Changes Path
1.7 +11 -11
jakarta-struts/src/share/org/apache/struts/config/ApplicationConfig.java
Index: ApplicationConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/ApplicationConfig.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ApplicationConfig.java 13 Jan 2002 04:21:18 -0000 1.6
+++ ApplicationConfig.java 15 Jan 2002 18:39:36 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/ApplicationConfig.java,v
1.6 2002/01/13 04:21:18 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2002/01/13 04:21:18 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/ApplicationConfig.java,v
1.7 2002/01/15 18:39:36 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/01/15 18:39:36 $
*
* ====================================================================
*
@@ -82,7 +82,7 @@
* previous Struts behavior that only supported one application.</p>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2002/01/13 04:21:18 $
+ * @version $Revision: 1.7 $ $Date: 2002/01/15 18:39:36 $
* @since Struts 1.1
*/
@@ -115,7 +115,7 @@
* The set of action configurations for this application, if any,
* keyed by the <code>path</code> property.
*/
- protected FastHashMap actions = new FastHashMap();
+ protected FastHashMap actionConfigs = new FastHashMap();
/**
@@ -264,7 +264,7 @@
if (configured)
throw new IllegalStateException("Configuration is frozen");
config.setApplicationConfig(this);
- actions.put(config.getPath(), config);
+ actionConfigs.put(config.getPath(), config);
}
@@ -349,7 +349,7 @@
*/
public ActionConfig findActionConfig(String path) {
- return ((ActionConfig) actions.get(path));
+ return ((ActionConfig) actionConfigs.get(path));
}
@@ -360,8 +360,8 @@
*/
public ActionConfig[] findActionConfigs() {
- ActionConfig results[] = new ActionConfig[actions.size()];
- return ((ActionConfig[]) actions.values().toArray(results));
+ ActionConfig results[] = new ActionConfig[actionConfigs.size()];
+ return ((ActionConfig[]) actionConfigs.values().toArray(results));
}
@@ -474,7 +474,7 @@
public void freeze() {
this.configured = true;
- actions.setFast(true);
+ actionConfigs.setFast(true);
dataSources.setFast(true);
exceptions.setFast(true);
formBeans.setFast(true);
@@ -500,7 +500,7 @@
if (configured)
throw new IllegalStateException("Configuration is frozen");
config.setApplicationConfig(null);
- actions.remove(config.getPath());
+ actionConfigs.remove(config.getPath());
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
