haul 01/07/23 09:31:02
Modified: src/org/apache/cocoon/acting Tag: cocoon_20_branch
AbstractDatabaseAction.java
Log:
moved configure method code to AbstractConfigurabeAction (sic!), subclassed
it with
ConfigurableComposableAction, moved some actions that used that
configuration scheme
to appropriate superclasses.
extended actions that do take parameters but didn't support configuration of
default
values to use this scheme
Revision Changes Path
No revision
No revision
1.7.2.4 +23 -9
xml-cocoon2/src/org/apache/cocoon/acting/AbstractDatabaseAction.java
Index: AbstractDatabaseAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractDatabaseAction.java,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -r1.7.2.3 -r1.7.2.4
--- AbstractDatabaseAction.java 2001/07/13 13:37:14 1.7.2.3
+++ AbstractDatabaseAction.java 2001/07/23 16:31:02 1.7.2.4
@@ -158,7 +158,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
- * @version CVS $Revision: 1.7.2.3 $ $Date: 2001/07/13 13:37:14 $
+ * @version CVS $Revision: 1.7.2.4 $ $Date: 2001/07/23 16:31:02 $
*/
public abstract class AbstractDatabaseAction extends
AbstractComplementaryConfigurableAction implements Configurable, Disposable {
protected Map files = new HashMap();
@@ -537,10 +537,12 @@
file = (File) request.get(imageAttr);
synchronized (this.files) {
Parameters parameters = (Parameters)
this.files.get(file);
- statement.setString(position,
parameters.getParameter("image-mime-type",""));
+ String imageMimeType =
parameters.getParameter("image-mime-type",
+ (String)
settings.get("image-mime-type",""));
+ statement.setString(position, imageMimeType);
/** Store the image mime type in the request
attributes.
Why do we do this? **/
-
setRequestAttribute(request,param,parameters.getParameter("image-mime-type",""));
+ setRequestAttribute(request, param, imageMimeType);
}
break;
}
@@ -588,10 +590,14 @@
file = (File) request.get(imageAttr);
synchronized (this.files) {
Parameters parameters = (Parameters)
this.files.get(file);
- statement.setInt(position,
parameters.getParameterAsInteger("image-width", -1));
+ statement.setInt(position,
parameters.getParameterAsInteger("image-width",
+
Integer.parseInt((String)settings.get("image-width","-1"))));
/** Store the image width in the request attributes.
Why do we do this? **/
-
setRequestAttribute(request,param,parameters.getParameter("image-width",""));
+ setRequestAttribute(request,
+ param,
+
parameters.getParameter("image-width",
+ (String)
settings.get("image-width","")));
}
break;
} else if ("image-height".equals(typeName)) {
@@ -600,8 +606,12 @@
file = (File) request.get(imageAttr);
synchronized (this.files) {
Parameters parameters = (Parameters)
this.files.get(file);
- statement.setInt(position,
parameters.getParameterAsInteger("image-height", -1));
-
setRequestAttribute(request,param,parameters.getParameter("image-height",""));
+ statement.setInt(position,
parameters.getParameterAsInteger("image-height",
+
Integer.parseInt((String)settings.get("image-height","-1"))));
+ setRequestAttribute(request,
+ param,
+
parameters.getParameter("image-height",
+ (String)
settings.get("image-height","")));
}
break;
} else if ("image-size".equals(typeName)) {
@@ -610,8 +620,12 @@
file = (File) request.get(imageAttr);
synchronized (this.files) {
Parameters parameters = (Parameters)
this.files.get(file);
- statement.setInt(position,
parameters.getParameterAsInteger("image-size", -1));
-
setRequestAttribute(request,param,parameters.getParameter("image-size",""));
+ statement.setInt(position,
parameters.getParameterAsInteger("image-size",
+
Integer.parseInt((String)settings.get("image-height","-1"))));
+ setRequestAttribute(request,
+ param,
+
parameters.getParameter("image-size",
+ (String)
settings.get("image-size","")));
}
break;
} else if ("row-index".equals(typeName)) {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
