joerg 2004/03/06 06:24:51
Modified: src/java/org/apache/cocoon/generation StreamGenerator.java
Log:
formatting
Revision Changes Path
1.9 +17 -18
cocoon-2.1/src/java/org/apache/cocoon/generation/StreamGenerator.java
Index: StreamGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/generation/StreamGenerator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StreamGenerator.java 6 Mar 2004 14:05:04 -0000 1.8
+++ StreamGenerator.java 6 Mar 2004 14:24:51 -0000 1.9
@@ -78,25 +78,26 @@
/**
* Generate XML data out of request InputStream.
*/
- public void generate()
+ public void generate()
throws IOException, SAXException, ProcessingException {
SAXParser parser = null;
int len = 0;
String contentType = null;
-
+
Request request = ObjectModelHelper.getRequest(this.objectModel);
try {
contentType = request.getContentType();
if (contentType == null) {
contentType = parameters.getParameter("defaultContentType",
null);
if (getLogger().isDebugEnabled()) {
- getLogger().debug("no Content-Type header - using
contentType parameter");
+ getLogger().debug("no Content-Type header - using
contentType parameter: " + contentType);
+ }
+ if (contentType == null) {
+ throw new IOException("both Content-Type header and
defaultContentType parameter are not set");
}
}
- if (contentType == null) {
- throw new IOException("both Content-Type header and
defaultContentType parameter are not set");
- } else if
(contentType.startsWith("application/x-www-form-urlencoded")
- || contentType.startsWith("multipart/form-data")) {
+ if (contentType.startsWith("application/x-www-form-urlencoded")
||
+ contentType.startsWith("multipart/form-data")) {
String parameter = parameters.getParameter(FORM_NAME, null);
if (parameter == null) {
throw new ProcessingException(
@@ -106,16 +107,14 @@
}
Object xmlObject = request.get(parameter);
Reader xmlReader = null;
- if (xmlObject instanceof String){
- xmlReader = new StringReader((String)xmlObject);
- }
- else if (xmlObject instanceof Part){
- xmlReader = new
InputStreamReader(((Part)xmlObject).getInputStream());
- }
- else{
- throw new ProcessingException("Unknown request object
encountred named " +
- parameter + " : " + xmlObject);
- }
+ if (xmlObject instanceof String) {
+ xmlReader = new StringReader((String)xmlObject);
+ } else if (xmlObject instanceof Part) {
+ xmlReader = new
InputStreamReader(((Part)xmlObject).getInputStream());
+ } else {
+ throw new ProcessingException("Unknown request object
encountered named " +
+ parameter + " : " +
xmlObject);
+ }
inputSource = new InputSource(xmlReader);
} else if (contentType.startsWith("text/plain") ||
contentType.startsWith("text/xml") ||
