haul 02/03/15 07:02:28
Modified: src/java/org/apache/cocoon/acting
AbstractDatabaseAction.java
Log:
change access to get/setAttribute from default to protected
Revision Changes Path
1.6 +17 -17
xml-cocoon2/src/java/org/apache/cocoon/acting/AbstractDatabaseAction.java
Index: AbstractDatabaseAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/AbstractDatabaseAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractDatabaseAction.java 22 Feb 2002 06:59:26 -0000 1.5
+++ AbstractDatabaseAction.java 15 Mar 2002 15:02:28 -0000 1.6
@@ -190,7 +190,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Id: AbstractDatabaseAction.java,v 1.5 2002/02/22 06:59:26
cziegeler Exp $
+ * @version CVS $Id: AbstractDatabaseAction.java,v 1.6 2002/03/15 15:02:28 haul Exp
$
*/
public abstract class AbstractDatabaseAction extends
AbstractComplementaryConfigurableAction implements Configurable, Disposable {
protected Map files = new HashMap();
@@ -566,26 +566,26 @@
statement.setTimestamp(position, ts);
break;
- case Types.ARRAY:
- statement.setArray(position, (Array) value); // no way to convert string to
array
- break;
- case Types.STRUCT:
+ case Types.ARRAY:
+ statement.setArray(position, (Array) value); // no way to convert
string to array
+ break;
+ case Types.STRUCT:
case Types.OTHER:
- statement.setObject(position, value);
+ statement.setObject(position, value);
break;
- case Types.LONGVARBINARY:
+ case Types.LONGVARBINARY:
statement.setTimestamp(position, new Timestamp((new
java.util.Date()).getTime()));
case Types.VARCHAR:
if ("string".equals(typeName)) {
- statement.setString(position, (String) value);
- break;
+ statement.setString(position, (String) value);
+ break;
} else if ("image-mime-type".equals(typeName)) {
String imageAttr = param.substring(0, (param.length() -
"-mime-type".length()));
file = (File) request.get(imageAttr);
synchronized (this.files) {
Parameters parameters = (Parameters) this.files.get(file);
- String imageMimeType = parameters.getParameter("image-mime-type",
- (String) settings.get("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? **/
@@ -595,11 +595,11 @@
}
case Types.BLOB:
if (value instanceof File) {
- file = (File)value;
+ file = (File)value;
} else if (value instanceof String) {
- file = new File((String)value);
+ file = new File((String)value);
} else {
- throw new SQLException("Invalid type for blob:
"+value.getClass().getName());
+ throw new SQLException("Invalid type for blob:
"+value.getClass().getName());
}
//InputStream input = new BufferedInputStream(new
FileInputStream(file));
FileInputStream input = new FileInputStream(file);
@@ -637,7 +637,7 @@
file = (File) request.get(imageAttr);
synchronized (this.files) {
Parameters parameters = (Parameters) this.files.get(file);
- statement.setInt(position,
parameters.getParameterAsInteger("image-width",
+ 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? **/
@@ -703,14 +703,14 @@
* Store a key/value pair in the request attributes. We prefix the key
* with the name of this class to prevent potential name collisions.
*/
- void setRequestAttribute(Request request, String key, Object value) {
+ protected void setRequestAttribute(Request request, String key, Object value) {
request.setAttribute("org.apache.cocoon.acting.AbstractDatabaseAction:"+key,value);
}
/**
* Retreive a value from the request attributes.
*/
- Object getRequestAttribute(Request request, String key) {
+ protected Object getRequestAttribute(Request request, String key) {
return
request.getAttribute("org.apache.cocoon.acting.AbstractDatabaseAction:"+key);
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
