OSDN > Entwickler > t_nakayama1971 > Kammer > ThoughtBase > Commit

ThoughtBase

(Original-Repository, kein Fork Herkunft)

R/O
SSH
HTTPS

Commit

Commit MetaInfo

Revision	2615 (tree)
Zeit	2023-12-06 19:12:25
Autor	t_nakayama1971

Log Message

(empty log message)

Ändern Zusammenfassung

Diff

--- trunk/apache/struts1-core/src/main/java/org/apache/commons/chain2/web/servlet/ServletWebContextBase.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/commons/chain2/web/servlet/ServletWebContextBase.java (revision 2615)

		@@ -117,7 +117,7 @@
117	117	* <p>Construct an uninitialized {@link ServletWebContextBase} instance.</p>
118	118	*/
119	119	public ServletWebContextBase() {
120		- super();
	120	+ this(null, null, null);
121	121	}
122	122
123	123	/**

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/action/ActionErrors.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/action/ActionErrors.java (revision 2615)

		@@ -53,7 +53,7 @@
53	53	* <p>Create an empty <code>ActionErrors</code> object.</p>
54	54	*/
55	55	public ActionErrors() {
56		- super();
	56	+ this(null);
57	57	}
58	58
59	59	/**

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/action/ActionFormBean.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/action/ActionFormBean.java (revision 2615)

		@@ -49,7 +49,7 @@
49	49	* <p>Construct an instance with default values.</p>
50	50	*/
51	51	public ActionFormBean() {
52		- super();
	52	+ this(null, null);
53	53	}
54	54
55	55	/**

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/action/ActionForward.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/action/ActionForward.java (revision 2615)

		@@ -93,10 +93,7 @@
93	93	* @param redirect Redirect flag for this instance
94	94	*/
95	95	public ActionForward(final String path, final boolean redirect) {
96		- super();
97		- setName(null);
98		- setPath(path);
99		- setRedirect(redirect);
	96	+ this(null, path, redirect);
100	97	}
101	98
102	99	/**

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/action/ActionMessages.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/action/ActionMessages.java (revision 2615)

		@@ -87,7 +87,7 @@
87	87	* <p>Create an empty <code>ActionMessages</code> object.</p>
88	88	*/
89	89	public ActionMessages() {
90		- super();
	90	+ this(null);
91	91	}
92	92
93	93	/**

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/action/InvalidCancelException.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/action/InvalidCancelException.java (revision 2615)

		@@ -35,7 +35,7 @@
35	35	* <p>Default constructor.</p>
36	36	*/
37	37	public InvalidCancelException() {
38		- super();
	38	+ this(null);
39	39	}
40	40
41	41	/**

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/action/RequestActionMapping.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/action/RequestActionMapping.java (revision 2615)

		@@ -38,7 +38,6 @@
38	38	* bean scope.</p>
39	39	*/
40	40	public RequestActionMapping() {
41		- super();
42	41	setScope("request");
43	42	}
44	43	}

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/action/SessionActionMapping.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/action/SessionActionMapping.java (revision 2615)

		@@ -38,7 +38,6 @@
38	38	* bean scope.</p>
39	39	*/
40	40	public SessionActionMapping() {
41		- super();
42	41	setScope("session");
43	42	}
44	43	}

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/chain/commands/InvalidPathException.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/chain/commands/InvalidPathException.java (revision 2615)

		@@ -41,7 +41,6 @@
41	41	* <p> Default, no-argument constructor. </p>
42	42	*/
43	43	public InvalidPathException() {
44		- super();
45	44	this.path = null;
46	45	}
47	46

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/chain/commands/UnauthorizedActionException.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/chain/commands/UnauthorizedActionException.java (revision 2615)

		@@ -37,7 +37,7 @@
37	37	* <p> Default no-argument constructor. </p>
38	38	*/
39	39	public UnauthorizedActionException() {
40		- super();
	40	+ this(null);
41	41	}
42	42
43	43	/**

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/chain/contexts/ServletActionContext.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/chain/contexts/ServletActionContext.java (revision 2615)

		@@ -294,7 +294,7 @@
294	294	*/
295	295	@Override
296	296	public void saveToken() {
297		- super.getTokenProcessor().saveToken(getRequest());
	297	+ getTokenProcessor().saveToken(getRequest());
298	298	}
299	299
300	300	/**

		@@ -302,7 +302,7 @@
302	302	*/
303	303	@Override
304	304	public String generateToken() {
305		- return super.getTokenProcessor().generateToken(getRequest());
	305	+ return getTokenProcessor().generateToken(getRequest());
306	306	}
307	307
308	308	/**

		@@ -310,7 +310,7 @@
310	310	*/
311	311	@Override
312	312	public boolean isTokenValid(final boolean reset) {
313		- return super.getTokenProcessor().isTokenValid(getRequest(), reset);
	313	+ return getTokenProcessor().isTokenValid(getRequest(), reset);
314	314	}
315	315
316	316	/**

		@@ -318,7 +318,7 @@
318	318	*/
319	319	@Override
320	320	public void resetToken() {
321		- super.getTokenProcessor().resetToken(getRequest());
	321	+ getTokenProcessor().resetToken(getRequest());
322	322	}
323	323
324	324	/**

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/chain/contexts/WebActionContext.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/chain/contexts/WebActionContext.java (revision 2615)

		@@ -49,7 +49,7 @@
49	49	* @return The wrapped WebContext
50	50	*/
51	51	protected WebContext<String, Object> webContext() {
52		- return super.getBaseContext();
	52	+ return getBaseContext();
53	53	}
54	54
55	55	// -------------------------------

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/config/ActionConfig.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/config/ActionConfig.java (revision 2615)

		@@ -258,7 +258,7 @@
258	258	* @since Struts 1.3.6
259	259	*/
260	260	public void setActionId(final String aid) {
261		- super.throwIfConfigured();
	261	+ throwIfConfigured();
262	262
263	263	if (aid != null && aid.indexOf('/') > -1) {
264	264	throw new IllegalArgumentException(

		@@ -281,7 +281,7 @@
281	281	* @param config ModuleConfig
282	282	*/
283	283	public void setModuleConfig(final ModuleConfig config) {
284		- super.throwIfConfigured();
	284	+ throwIfConfigured();
285	285
286	286	this.moduleConfig = config;
287	287	}

		@@ -309,7 +309,7 @@
309	309	* under which our form bean is access.
310	310	*/
311	311	public void setAttribute(final String val) {
312		- super.throwIfConfigured();
	312	+ throwIfConfigured();
313	313
314	314	this.attribute = val;
315	315	}

		@@ -329,7 +329,7 @@
329	329	* @param val boolean
330	330	*/
331	331	public void setCancellable(final boolean val) {
332		- super.throwIfConfigured();
	332	+ throwIfConfigured();
333	333
334	334	this.cancellable = val;
335	335	this.cancellableSet = true;

		@@ -354,7 +354,7 @@
354	354	* inherit properties from.
355	355	*/
356	356	public void setExtends(final String val) {
357		- super.throwIfConfigured();
	357	+ throwIfConfigured();
358	358
359	359	this.inherit = val;
360	360	}

		@@ -386,7 +386,7 @@
386	386	* that will process this request.
387	387	*/
388	388	public void setForward(final String val) {
389		- super.throwIfConfigured();
	389	+ throwIfConfigured();
390	390
391	391	this.forward = val;
392	392	}

		@@ -411,7 +411,7 @@
411	411	* that will process this request.
412	412	*/
413	413	public void setInclude(final String val) {
414		- super.throwIfConfigured();
	414	+ throwIfConfigured();
415	415
416	416	this.include = val;
417	417	}

		@@ -436,7 +436,7 @@
436	436	* should be returned if a validation error is encountered.
437	437	*/
438	438	public void setInput(final String val) {
439		- super.throwIfConfigured();
	439	+ throwIfConfigured();
440	440
441	441	this.input = val;
442	442	}

		@@ -461,7 +461,7 @@
461	461	* implementation class.
462	462	*/
463	463	public void setMultipartClass(final String multipart) {
464		- super.throwIfConfigured();
	464	+ throwIfConfigured();
465	465
466	466	this.multipartClass = multipart;
467	467	}

		@@ -478,7 +478,7 @@
478	478	* @param val name of the form bean associated with this Action.
479	479	*/
480	480	public void setName(final String val) {
481		- super.throwIfConfigured();
	481	+ throwIfConfigured();
482	482
483	483	this.name = val;
484	484	}

		@@ -501,7 +501,7 @@
501	501	* @param val General purpose configuration parameter.
502	502	*/
503	503	public void setParameter(final String val) {
504		- super.throwIfConfigured();
	504	+ throwIfConfigured();
505	505
506	506	this.parameter = val;
507	507	}

		@@ -524,7 +524,7 @@
524	524	* @param val context-relative path of the submitted request.
525	525	*/
526	526	public void setPath(final String val) {
527		- super.throwIfConfigured();
	527	+ throwIfConfigured();
528	528
529	529	this.path = val;
530	530	}

		@@ -543,7 +543,7 @@
543	543	* property names, if any.
544	544	*/
545	545	public void setPrefix(final String val) {
546		- super.throwIfConfigured();
	546	+ throwIfConfigured();
547	547
548	548	this.prefix = val;
549	549	}

		@@ -559,7 +559,7 @@
559	559	* @param val String
560	560	*/
561	561	public void setRoles(final String val) {
562		- super.throwIfConfigured();
	562	+ throwIfConfigured();
563	563
564	564	this.roles = val;
565	565

		@@ -612,7 +612,7 @@
612	612	* is accessed, if any.
613	613	*/
614	614	public void setScope(final String val) {
615		- super.throwIfConfigured();
	615	+ throwIfConfigured();
616	616
617	617	this.scope = val;
618	618	}

		@@ -631,7 +631,7 @@
631	631	* property names, if any.
632	632	*/
633	633	public void setSuffix(final String val) {
634		- super.throwIfConfigured();
	634	+ throwIfConfigured();
635	635
636	636	this.suffix = val;
637	637	}

		@@ -647,7 +647,7 @@
647	647	* @param val String
648	648	*/
649	649	public void setType(final String val) {
650		- super.throwIfConfigured();
	650	+ throwIfConfigured();
651	651
652	652	this.type = val;
653	653	}

		@@ -666,7 +666,7 @@
666	666	* this module, when true.
667	667	*/
668	668	public void setUnknown(final boolean val) {
669		- super.throwIfConfigured();
	669	+ throwIfConfigured();
670	670
671	671	this.unknown = val;
672	672	}

		@@ -682,7 +682,7 @@
682	682	* @param val boolean
683	683	*/
684	684	public void setValidate(final boolean val) {
685		- super.throwIfConfigured();
	685	+ throwIfConfigured();
686	686
687	687	this.validate = val;
688	688	this.validateSet = true;

		@@ -724,7 +724,7 @@
724	724	* @since Struts 1.3.0
725	725	*/
726	726	public void setCommand(final String val) {
727		- super.throwIfConfigured();
	727	+ throwIfConfigured();
728	728
729	729	this.command = val;
730	730	}

		@@ -740,7 +740,7 @@
740	740	* @since Struts 1.3.0
741	741	*/
742	742	public void setCatalog(final String val) {
743		- super.throwIfConfigured();
	743	+ throwIfConfigured();
744	744
745	745	this.catalog = val;
746	746	}

		@@ -783,7 +783,7 @@
783	783	*/
784	784	protected void inheritExceptionHandlers(final ActionConfig baseConfig) {
785	785
786		- super.throwIfConfigured();
	786	+ throwIfConfigured();
787	787
788	788	// Inherit exception handler configs
789	789	ExceptionConfig[] baseHandlers = baseConfig.findExceptionConfigs();

		@@ -816,7 +816,7 @@
816	816	*/
817	817	protected void inheritForwards(final ActionConfig baseConfig) {
818	818
819		- super.throwIfConfigured();
	819	+ throwIfConfigured();
820	820
821	821	// Inherit forward configs
822	822	ForwardConfig[] baseForwards = baseConfig.findForwardConfigs();

		@@ -852,7 +852,7 @@
852	852	* frozen
853	853	*/
854	854	public void addExceptionConfig(final ExceptionConfig config) {
855		- super.throwIfConfigured();
	855	+ throwIfConfigured();
856	856
857	857	this.exceptions.put(config.getType(), config);
858	858	}

		@@ -866,7 +866,7 @@
866	866	* frozen
867	867	*/
868	868	public void addForwardConfig(final ForwardConfig config) {
869		- super.throwIfConfigured();
	869	+ throwIfConfigured();
870	870
871	871	this.forwards.put(config.getName(), config);
872	872	}

		@@ -998,7 +998,7 @@
998	998	*/
999	999	public void inheritFrom(final ActionConfig config) {
1000	1000
1001		- super.throwIfConfigured();
	1001	+ throwIfConfigured();
1002	1002
1003	1003	// Inherit values that have not been overridden
1004	1004	setAttribute(getAttribute() == null ? config.getAttribute() : getAttribute());

		@@ -1084,7 +1084,7 @@
1084	1084	*/
1085	1085	public void processExtends(final Map<String, ActionConfig> config) {
1086	1086
1087		- super.throwIfConfigured();
	1087	+ throwIfConfigured();
1088	1088
1089	1089	String ancestorPath = getExtends();
1090	1090

		@@ -1124,7 +1124,7 @@
1124	1124	* frozen
1125	1125	*/
1126	1126	public void removeExceptionConfig(final ExceptionConfig config) {
1127		- super.throwIfConfigured();
	1127	+ throwIfConfigured();
1128	1128
1129	1129	this.exceptions.remove(config.getType());
1130	1130	}

		@@ -1137,7 +1137,7 @@
1137	1137	* frozen
1138	1138	*/
1139	1139	public void removeForwardConfig(final ForwardConfig config) {
1140		- super.throwIfConfigured();
	1140	+ throwIfConfigured();
1141	1141
1142	1142	this.forwards.remove(config.getName());
1143	1143	}

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/config/ConfigHelper.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/config/ConfigHelper.java (revision 2615)

		@@ -87,7 +87,7 @@
87	87	* constructor
88	88	*/
89	89	public ConfigHelper() {
90		- super();
	90	+ this(null, null, null);
91	91	}
92	92
93	93	/**

		@@ -98,7 +98,7 @@
98	98	public ConfigHelper(final ServletContext ctx, final HttpServletRequest req,
99	99	final HttpServletResponse res) {
100	100	super();
101		- this.setResources(ctx, req, res);
	101	+ setResources(ctx, req, res);
102	102	}
103	103
104	104	/**

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/config/ConfigRuleSet.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/config/ConfigRuleSet.java (revision 2615)

		@@ -225,13 +225,6 @@
225	225	private static final class PlugInSetPropertyRule extends Rule {
226	226
227	227	/**
228		- * constructor
229		- */
230		- PlugInSetPropertyRule() {
231		- super();
232		- }
233		-
234		- /**
235	228	* @see org.apache.commons.digester3.Rule#begin(
236	229	* java.lang.String, java.lang.String, org.xml.sax.Attributes)
237	230	*/

		@@ -252,13 +245,6 @@
252	245	private static final class SetActionFormBeanClassRule extends Rule {
253	246
254	247	/**
255		- * constructor
256		- */
257		- SetActionFormBeanClassRule() {
258		- super();
259		- }
260		-
261		- /**
262	248	* @see org.apache.commons.digester3.Rule#begin(
263	249	* java.lang.String, java.lang.String, org.xml.sax.Attributes)
264	250	*/

		@@ -382,13 +368,6 @@
382	368	private static final class SetActionMappingClassRule extends Rule {
383	369
384	370	/**
385		- * constructor
386		- */
387		- SetActionMappingClassRule() {
388		- super();
389		- }
390		-
391		- /**
392	371	* @see org.apache.commons.digester3.Rule#begin(
393	372	* java.lang.String, java.lang.String, org.xml.sax.Attributes)
394	373	*/

		@@ -458,13 +437,6 @@
458	437	private static final class SetActionForwardClassRule extends Rule {
459	438
460	439	/**
461		- * constructor
462		- */
463		- SetActionForwardClassRule() {
464		- super();
465		- }
466		-
467		- /**
468	440	* @see org.apache.commons.digester3.Rule#begin(
469	441	* java.lang.String, java.lang.String, org.xml.sax.Attributes)
470	442	*/

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/config/ControllerConfig.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/config/ControllerConfig.java (revision 2615)

		@@ -182,7 +182,7 @@
182	182	* @param size BufferSize
183	183	*/
184	184	public void setBufferSize(final int size) {
185		- super.throwIfConfigured();
	185	+ throwIfConfigured();
186	186
187	187	this.bufferSize = size;
188	188	}

		@@ -198,7 +198,7 @@
198	198	* @param val ContentType
199	199	*/
200	200	public void setContentType(final String val) {
201		- super.throwIfConfigured();
	201	+ throwIfConfigured();
202	202
203	203	this.contentType = val;
204	204	}

		@@ -214,7 +214,7 @@
214	214	* @param val Catalog
215	215	*/
216	216	public void setCatalog(final String val) {
217		- super.throwIfConfigured();
	217	+ throwIfConfigured();
218	218
219	219	this.catalog = val;
220	220	}

		@@ -230,7 +230,7 @@
230	230	* @param val Command
231	231	*/
232	232	public void setCommand(final String val) {
233		- super.throwIfConfigured();
	233	+ throwIfConfigured();
234	234
235	235	this.command = val;
236	236	}

		@@ -274,7 +274,7 @@
274	274	* @param val Locale
275	275	*/
276	276	public void setLocale(final boolean val) {
277		- super.throwIfConfigured();
	277	+ throwIfConfigured();
278	278
279	279	this.locale = val;
280	280	}

		@@ -290,7 +290,7 @@
290	290	* @param size MaxFileSize
291	291	*/
292	292	public void setMaxFileSize(final String size) {
293		- super.throwIfConfigured();
	293	+ throwIfConfigured();
294	294
295	295	this.maxFileSize = size;
296	296	}

		@@ -306,7 +306,7 @@
306	306	* @param size MemFileSize
307	307	*/
308	308	public void setMemFileSize(final String size) {
309		- super.throwIfConfigured();
	309	+ throwIfConfigured();
310	310
311	311	this.memFileSize = size;
312	312	}

		@@ -322,7 +322,7 @@
322	322	* @param multipart MultipartClass
323	323	*/
324	324	public void setMultipartClass(final String multipart) {
325		- super.throwIfConfigured();
	325	+ throwIfConfigured();
326	326
327	327	this.multipartClass = multipart;
328	328	}

		@@ -338,7 +338,7 @@
338	338	* @param val Nocache
339	339	*/
340	340	public void setNocache(final boolean val) {
341		- super.throwIfConfigured();
	341	+ throwIfConfigured();
342	342
343	343	this.nocache = val;
344	344	}

		@@ -368,7 +368,7 @@
368	368	* @param processor ProcessClass
369	369	*/
370	370	public void setProcessorClass(final String processor) {
371		- super.throwIfConfigured();
	371	+ throwIfConfigured();
372	372
373	373	this.processorClass = processor;
374	374	}

		@@ -384,7 +384,7 @@
384	384	* @param dir TempDir
385	385	*/
386	386	public void setTempDir(final String dir) {
387		- super.throwIfConfigured();
	387	+ throwIfConfigured();
388	388
389	389	this.tempDir = dir;
390	390	}

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/config/ExceptionConfig.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/config/ExceptionConfig.java (revision 2615)

		@@ -97,7 +97,7 @@
97	97	* @param val Bundle
98	98	*/
99	99	public void setBundle(final String val) {
100		- super.throwIfConfigured();
	100	+ throwIfConfigured();
101	101
102	102	this.bundle = val;
103	103	}

		@@ -113,7 +113,7 @@
113	113	* @param val Extends
114	114	*/
115	115	public void setExtends(final String val) {
116		- super.throwIfConfigured();
	116	+ throwIfConfigured();
117	117
118	118	this.inherit = val;
119	119	}

		@@ -136,7 +136,7 @@
136	136	* @param val Handler
137	137	*/
138	138	public void setHandler(final String val) {
139		- super.throwIfConfigured();
	139	+ throwIfConfigured();
140	140
141	141	this.handler = val;
142	142	}

		@@ -152,7 +152,7 @@
152	152	* @param val Key
153	153	*/
154	154	public void setKey(final String val) {
155		- super.throwIfConfigured();
	155	+ throwIfConfigured();
156	156
157	157	this.key = val;
158	158	}

		@@ -168,7 +168,7 @@
168	168	* @param val Path
169	169	*/
170	170	public void setPath(final String val) {
171		- super.throwIfConfigured();
	171	+ throwIfConfigured();
172	172
173	173	this.path = val;
174	174	}

		@@ -184,7 +184,7 @@
184	184	* @param val Scope
185	185	*/
186	186	public void setScope(final String val) {
187		- super.throwIfConfigured();
	187	+ throwIfConfigured();
188	188
189	189	this.scope = val;
190	190	}

		@@ -200,7 +200,7 @@
200	200	* @param val Type
201	201	*/
202	202	public void setType(final String val) {
203		- super.throwIfConfigured();
	203	+ throwIfConfigured();
204	204
205	205	this.type = val;
206	206	}

		@@ -319,7 +319,7 @@
319	319	*/
320	320	public void inheritFrom(final ExceptionConfig config) {
321	321
322		- super.throwIfConfigured();
	322	+ throwIfConfigured();
323	323
324	324	// Inherit values that have not been overridden
325	325	if (getBundle() == null) {

		@@ -362,7 +362,7 @@
362	362	public void processExtends(final Map<String, ExceptionConfig> moduleConfig,
363	363	final Map<String, ExceptionConfig> actionConfig) {
364	364
365		- super.throwIfConfigured();
	365	+ throwIfConfigured();
366	366
367	367	String ancestorType = getExtends();
368	368

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/config/FormBeanConfig.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/config/FormBeanConfig.java (revision 2615)

		@@ -382,7 +382,7 @@
382	382	*/
383	383	public void processExtends(final Map<String, FormBeanConfig> moduleConfig) {
384	384
385		- super.throwIfConfigured();
	385	+ throwIfConfigured();
386	386
387	387	String ancestor = getExtends();
388	388

		@@ -420,7 +420,7 @@
420	420	* @param config FormPropertyConfig instance to be removed
421	421	*/
422	422	public void removeFormPropertyConfig(final FormPropertyConfig config) {
423		- super.throwIfConfigured();
	423	+ throwIfConfigured();
424	424
425	425	this.formProperties.remove(config.getName());
426	426	}

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/config/ForwardConfig.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/config/ForwardConfig.java (revision 2615)

		@@ -119,7 +119,7 @@
119	119	* Construct a new instance with default values.
120	120	*/
121	121	public ForwardConfig() {
122		- super();
	122	+ this(null, null, false, null);
123	123	}
124	124
125	125	/**

		@@ -178,7 +178,7 @@
178	178	* @param val String
179	179	*/
180	180	public void setExtends(final String val) {
181		- super.throwIfConfigured();
	181	+ throwIfConfigured();
182	182
183	183	this.inherit = val;
184	184	}

		@@ -201,7 +201,7 @@
201	201	* @param val String
202	202	*/
203	203	public void setName(final String val) {
204		- super.throwIfConfigured();
	204	+ throwIfConfigured();
205	205
206	206	this.name = val;
207	207	}

		@@ -217,7 +217,7 @@
217	217	* @param val String
218	218	*/
219	219	public void setPath(final String val) {
220		- super.throwIfConfigured();
	220	+ throwIfConfigured();
221	221
222	222	this.path = val;
223	223	}

		@@ -233,7 +233,7 @@
233	233	* @param val String
234	234	*/
235	235	public void setModule(final String val) {
236		- super.throwIfConfigured();
	236	+ throwIfConfigured();
237	237
238	238	this.module = val;
239	239	}

		@@ -249,7 +249,7 @@
249	249	* @param val boolean
250	250	*/
251	251	public void setRedirect(final boolean val) {
252		- super.throwIfConfigured();
	252	+ throwIfConfigured();
253	253
254	254	this.redirect = val;
255	255	}

		@@ -265,7 +265,7 @@
265	265	* @param val String
266	266	*/
267	267	public void setCommand(final String val) {
268		- super.throwIfConfigured();
	268	+ throwIfConfigured();
269	269
270	270	this.command = val;
271	271	}

		@@ -281,7 +281,7 @@
281	281	* @param val String
282	282	*/
283	283	public void setCatalog(final String val) {
284		- super.throwIfConfigured();
	284	+ throwIfConfigured();
285	285
286	286	this.catalog = val;
287	287	}

		@@ -399,7 +399,7 @@
399	399	*/
400	400	public void inheritFrom(final ForwardConfig config) {
401	401
402		- super.throwIfConfigured();
	402	+ throwIfConfigured();
403	403
404	404	// Inherit values that have not been overridden
405	405	if (getCatalog() == null) {

		@@ -441,7 +441,7 @@
441	441	public void processExtends(final Map<String, ForwardConfig> moduleConfig,
442	442	final Map<String, ForwardConfig> actionConfig) {
443	443
444		- super.throwIfConfigured();
	444	+ throwIfConfigured();
445	445
446	446	String ancestorName = getExtends();
447	447

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/config/MessageResourcesConfig.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/config/MessageResourcesConfig.java (revision 2615)

		@@ -80,7 +80,7 @@
80	80	* @param val String
81	81	*/
82	82	public void setFactory(final String val) {
83		- super.throwIfConfigured();
	83	+ throwIfConfigured();
84	84
85	85	this.factory = val;
86	86	}

		@@ -96,7 +96,7 @@
96	96	* @param val String
97	97	*/
98	98	public void setKey(final String val) {
99		- super.throwIfConfigured();
	99	+ throwIfConfigured();
100	100
101	101	this.key = val;
102	102	}

		@@ -112,7 +112,7 @@
112	112	* @param val boolean
113	113	*/
114	114	public void setNull(final boolean val) {
115		- super.throwIfConfigured();
	115	+ throwIfConfigured();
116	116
117	117	this.nullValue = val;
118	118	}

		@@ -148,7 +148,7 @@
148	148	* @param val String
149	149	*/
150	150	public void setParameter(final String val) {
151		- super.throwIfConfigured();
	151	+ throwIfConfigured();
152	152
153	153	this.parameter = val;
154	154	}

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/util/PropertyMessageDefaultLocaleResources.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/util/PropertyMessageDefaultLocaleResources.java (revision 2615)

		@@ -82,7 +82,7 @@
82	82	String message = findMessage(locale, key, originalKey);
83	83	// PropertyResourcesBundle - searches through the hierarchy
84	84	// for the default Locale (e.g. first en_US then en)
85		- if (message == null && !super.getDefaultLocale().equals(locale)) {
	85	+ if (message == null && !getDefaultLocale().equals(locale)) {
86	86	message = findMessage(getDefaultLocale(), key, originalKey);
87	87	}
88	88

		@@ -96,7 +96,7 @@
96	96	}
97	97
98	98	// Return an appropriate error indication
99		- if (super.getReturnNull()) {
	99	+ if (getReturnNull()) {
100	100	return null;
101	101	}
102	102

--- trunk/apache/struts1-core/src/main/java/org/apache/struts/util/PropertyMessageResources.java (revision 2614)

+++ trunk/apache/struts1-core/src/main/java/org/apache/struts/util/PropertyMessageResources.java (revision 2615)

		@@ -219,7 +219,7 @@
219	219	}
220	220
221	221	// Return an appropriate error indication
222		- if (super.getReturnNull()) {
	222	+ if (getReturnNull()) {
223	223	return null;
224	224	}
225	225

		@@ -252,7 +252,7 @@
252	252	this.locales.put(localeKey, localeKey);
253	253
254	254	// Set up to load the property resource for this locale key, if we can
255		- String name = super.getConfig().replace('.', '/');
	255	+ String name = getConfig().replace('.', '/');
256	256	if (!localeKey.isEmpty()) {
257	257	name = name + "_" + localeKey;
258	258	}

		@@ -311,7 +311,7 @@
311	311	protected String findMessage(final Locale locale, final String key, final String originalKey) {
312	312
313	313	// Initialize variables we will require
314		- String localeKey = super.localeKey(locale);
	314	+ String localeKey = localeKey(locale);
315	315
316	316	String message = findMessage(localeKey, key, originalKey);
317	317

		@@ -349,7 +349,7 @@
349	349	loadLocale(localeKey);
350	350
351	351	// Check if we have this key for the current locale key
352		- String messageKey = super.messageKey(localeKey, key);
	352	+ String messageKey = messageKey(localeKey, key);
353	353
354	354	String message = this.messages.get(messageKey);
355	355	if (message != null) {