epugh 2003/03/17 17:06:39
Modified: src/java/org/apache/turbine/modules/screens Error.java
Log:
Fixed to work with new rundata signature.
Revision Changes Path
1.4 +76 -69
jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/Error.java
Index: Error.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/Error.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Error.java 9 Mar 2003 02:41:46 -0000 1.3
+++ Error.java 18 Mar 2003 01:06:38 -0000 1.4
@@ -58,6 +58,9 @@
import java.util.Enumeration;
import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
import org.apache.ecs.ConcreteElement;
import org.apache.ecs.html.B;
@@ -78,72 +81,76 @@
*/
public class Error extends Screen
{
- /**
- * Build screen.
- *
- * @param data Turbine information.
- * @exception Exception, a generic exception.
- */
- public ConcreteElement doBuild(RunData data)
- throws Exception
- {
- data.setTitle("There has been an error!");
-
- Table table = new Table().setBorder(0);
- boolean hasValues = false;
- Enumeration keys = data.getParameters().keys();
- while (keys.hasMoreElements())
- {
- String key = (String) keys.nextElement();
- String value = data.getParameters().getString(key);
- TR tr = new TR()
- .addElement(new TD().addElement(new B(key)))
- .addElement(new TD().addElement(" = " + value));
- table.addElement(tr);
- hasValues = true;
- }
-
- Table table2 = new Table().setBorder(0);
- Hashtable varDebug = data.getVarDebug();
- keys = varDebug.keys();
- boolean hasValues2 = false;
- while (keys.hasMoreElements())
- {
- String key = (String) keys.nextElement();
- String value = varDebug.get(key).toString();
- TR tr = new TR()
- .addElement(new TD().addElement(new B(key)))
- .addElement(new TD().addElement(" = " + value));
- table2.addElement(tr);
- hasValues2 = true;
- }
-
- data.getPage().getBody().addElement(new H3(data.getTitle() +
- " Please review the exception below for more information."));
-
- if (hasValues)
- {
- data.getPage().getBody()
- .addElement(new H4().addElement("Get/Post Data:"));
- data.getPage().getBody().addElement(table);
- }
-
- if (hasValues2)
- {
- data.getPage()
- .getBody().addElement(new H4()
- .addElement("Debugging Data:"));
- data.getPage().getBody().addElement(table2);
- }
-
- String trace = data.getStackTrace();
- if (trace != null)
- {
- data.getPage().getBody()
- .addElement(new H4().addElement("The exception is:"))
- .addElement(new PRE(trace))
- .addElement(new PRE(data.getStackTraceException().toString()));
- }
- return null;
- }
+ /**
+ * Build screen.
+ *
+ * @param data Turbine information.
+ * @exception Exception, a generic exception.
+ */
+ public ConcreteElement doBuild(RunData data) throws Exception
+ {
+ data.setTitle("There has been an error!");
+
+ Table table = new Table().setBorder(0);
+ boolean hasValues = false;
+ Enumeration keys = data.getParameters().keys();
+ while (keys.hasMoreElements())
+ {
+ String key = (String) keys.nextElement();
+ String value = data.getParameters().getString(key);
+ TR tr =
+ new TR().addElement(
+ new TD().addElement(new B(key))).addElement(
+ new TD().addElement(" = " + value));
+ table.addElement(tr);
+ hasValues = true;
+ }
+
+ Table table2 = new Table().setBorder(0);
+ Map varDebug = data.getVarDebug();
+
+
+ boolean hasValues2 = false;
+ for (Iterator i = varDebug.keySet().iterator();i.hasNext();){
+ String key = (String) i.next();
+ String value = varDebug.get(key).toString();
+ TR tr =
+ new TR().addElement(
+ new TD().addElement(new B(key))).addElement(
+ new TD().addElement(" = " + value));
+ table2.addElement(tr);
+ hasValues2 = true;
+ }
+
+ data.getPage().getBody().addElement(
+ new H3(
+ data.getTitle()
+ + " Please review the exception below for more
information."));
+
+ if (hasValues)
+ {
+ data.getPage().getBody().addElement(
+ new H4().addElement("Get/Post Data:"));
+ data.getPage().getBody().addElement(table);
+ }
+
+ if (hasValues2)
+ {
+ data.getPage().getBody().addElement(
+ new H4().addElement("Debugging Data:"));
+ data.getPage().getBody().addElement(table2);
+ }
+
+ String trace = data.getStackTrace();
+ if (trace != null)
+ {
+ data
+ .getPage()
+ .getBody()
+ .addElement(new H4().addElement("The exception is:"))
+ .addElement(new PRE(trace))
+ .addElement(new
PRE(data.getStackTraceException().toString()));
+ }
+ return null;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
