cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject svn commit: rev 57158 - in cocoon/trunk/src/blocks/forms: java/org/apache/cocoon/forms/formmodel samples/swan samples/swan/flow
Date Wed, 10 Nov 2004 14:38:47 GMT
Author: tim
Date: Wed Nov 10 06:38:46 2004
New Revision: 57158

Added:
   cocoon/trunk/src/blocks/forms/samples/swan/error.xml   (contents, props changed)
Modified:
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractContainerWidget.java
   cocoon/trunk/src/blocks/forms/samples/swan/flow/swan.js
Log:
Swan: upload error page, remove debugging output.  Whitespace

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractContainerWidget.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractContainerWidget.java
(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractContainerWidget.java
Wed Nov 10 06:38:46 2004
@@ -84,7 +84,7 @@
      *                    of the contained widgets.
      */
     public void readFromRequest(FormContext formContext) {
-        if(getCombinedState().isAcceptingInputs()) {
+        if (getCombinedState().isAcceptingInputs()) {
             widgets.readFromRequest(formContext);
         }
     }

Added: cocoon/trunk/src/blocks/forms/samples/swan/error.xml
==============================================================================
--- (empty file)
+++ cocoon/trunk/src/blocks/forms/samples/swan/error.xml	Wed Nov 10 06:38:46 2004
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$-->
+<html>
+  <head>
+    <title>Error</title>
+  </head>
+  <body>
+    <h3>== Error ==</h3>
+    You did something wrong, perhaps trying to view
+    a file to which this editor does not have access.
+    <br/><br/>
+    Return to the main <a href="./">Swan</a> page.
+  </body>
+</html>
+

Modified: cocoon/trunk/src/blocks/forms/samples/swan/flow/swan.js
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/swan/flow/swan.js	(original)
+++ cocoon/trunk/src/blocks/forms/samples/swan/flow/swan.js	Wed Nov 10 06:38:46 2004
@@ -58,10 +58,7 @@
       "sample_form_2.xml", "sample_form_2_template.xml"
     ];
 
-    if (present(documentURI, allowed_files)) {
-      print("Yeah! " + documentURI);
-    } else {
-      print("Trouble! " + documentURI);
+    if (!present(documentURI, allowed_files)) {
       cocoon.sendPage(type + "-error-pipeline");
       return;
     }

Mime
View raw message