martinc 02/01/27 22:03:31
Modified: src/share/org/apache/struts/action ActionError.java
ActionMessage.java
Log:
Add a constructor that takes an array of parameter values.
PR: 5646
Submitted by: Chuck Cavaness
Revision Changes Path
1.7 +21 -8
jakarta-struts/src/share/org/apache/struts/action/ActionError.java
Index: ActionError.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionError.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ActionError.java 13 Jan 2002 00:25:35 -0000 1.6
+++ ActionError.java 28 Jan 2002 06:03:31 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionError.java,v 1.6
2002/01/13 00:25:35 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2002/01/13 00:25:35 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionError.java,v 1.7
2002/01/28 06:03:31 martinc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/01/28 06:03:31 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* placeholder is '{0}', the second is '{1}', etc.</p>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2002/01/13 00:25:35 $
+ * @version $Revision: 1.7 $ $Date: 2002/01/28 06:03:31 $
*/
public class ActionError extends ActionMessage implements Serializable {
@@ -93,7 +93,7 @@
*/
public ActionError(String key) {
- this(key, null, null, null, null);
+ super(key);
}
@@ -106,7 +106,7 @@
*/
public ActionError(String key, Object value0) {
- this(key, value0, null, null, null);
+ super(key, value0);
}
@@ -120,7 +120,7 @@
*/
public ActionError(String key, Object value0, Object value1) {
- this(key, value0, value1, null, null);
+ super(key, value0, value1);
}
@@ -136,7 +136,7 @@
public ActionError(String key, Object value0, Object value1,
Object value2) {
- this(key, value0, value1, value2, null);
+ super(key, value0, value1, value2);
}
@@ -154,6 +154,19 @@
Object value2, Object value3) {
super(key, value0, value1, value2, value3);
+
+ }
+
+
+ /**
+ * Construct an action error with the specified replacement values.
+ *
+ * @param key Message key for this message
+ * @param values Array of replacement values
+ */
+ public ActionError(String key, Object[] values) {
+
+ super(key, values);
}
1.4 +27 -14
jakarta-struts/src/share/org/apache/struts/action/ActionMessage.java
Index: ActionMessage.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionMessage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ActionMessage.java 13 Jan 2002 00:25:35 -0000 1.3
+++ ActionMessage.java 28 Jan 2002 06:03:31 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionMessage.java,v 1.3
2002/01/13 00:25:35 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2002/01/13 00:25:35 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionMessage.java,v 1.4
2002/01/28 06:03:31 martinc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/01/28 06:03:31 $
*
* ====================================================================
*
@@ -76,7 +76,7 @@
* @since 1.1
* @author Craig R. McClanahan
* @author David Winterfeldt
- * @version $Revision: 1.3 $ $Date: 2002/01/13 00:25:35 $
+ * @version $Revision: 1.4 $ $Date: 2002/01/28 06:03:31 $
*/
public class ActionMessage implements Serializable {
@@ -92,7 +92,8 @@
*/
public ActionMessage(String key) {
- this(key, null, null, null, null);
+ this.key = key;
+ this.values = null;
}
@@ -105,7 +106,8 @@
*/
public ActionMessage(String key, Object value0) {
- this(key, value0, null, null, null);
+ this.key = key;
+ this.values = new Object[] { value0 };
}
@@ -119,7 +121,8 @@
*/
public ActionMessage(String key, Object value0, Object value1) {
- this(key, value0, value1, null, null);
+ this.key = key;
+ this.values = new Object[] { value0, value1 };
}
@@ -135,7 +138,8 @@
public ActionMessage(String key, Object value0, Object value1,
Object value2) {
- this(key, value0, value1, value2, null);
+ this.key = key;
+ this.values = new Object[] { value0, value1, value2 };
}
@@ -152,12 +156,21 @@
public ActionMessage(String key, Object value0, Object value1,
Object value2, Object value3) {
- super();
this.key = key;
- values[0] = value0;
- values[1] = value1;
- values[2] = value2;
- values[3] = value3;
+ this.values = new Object[] { value0, value1, value2, value3 };
+ }
+
+
+ /**
+ * Construct an action message with the specified replacement values.
+ *
+ * @param key Message key for this message
+ * @param values Array of replacement values
+ */
+ public ActionMessage(String key, Object[] values) {
+
+ this.key = key;
+ this.values = values;
}
@@ -174,7 +187,7 @@
/**
* The replacement values for this mesasge.
*/
- protected Object values[] = { null, null, null, null };
+ protected Object values[] = null;
// --------------------------------------------------------- Public Methods
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
