[cvs] eforum commit by lhamel: fix deprecations
JCorporate Ltd
jcorp at jcorp2.servlets.net
Wed Oct 13 16:12:39 PDT 2004
Log Message:
-----------
fix deprecations
Modified Files:
--------------
eforum/src/WEB-INF/src/com/jcorporate/eforum/controller:
Browse.java
Revision Data
-------------
Index: Browse.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/controller/Browse.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Browse.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Browse.java -u -r1.23 -r1.24
--- src/WEB-INF/src/com/jcorporate/eforum/controller/Browse.java
+++ src/WEB-INF/src/com/jcorporate/eforum/controller/Browse.java
@@ -1,28 +1,8 @@
package com.jcorporate.eforum.controller;
// Fri Jan 23 19:50:25 GMT 2004
-import java.io.BufferedReader;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.StringReader;
-import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import javax.servlet.http.*;
-import org.apache.struts.upload.FormFile;
import com.jcorporate.eforum.dbobj.ForumAttachment;
import com.jcorporate.eforum.dbobj.ForumAttachmentMessage;
-
import com.jcorporate.eforum.dbobj.ForumGroup;
import com.jcorporate.eforum.dbobj.ForumMessage;
import com.jcorporate.eforum.dbobj.ForumSecurity;
@@ -33,36 +13,46 @@
import com.jcorporate.expresso.core.controller.ControllerException;
import com.jcorporate.expresso.core.controller.ControllerRequest;
import com.jcorporate.expresso.core.controller.ControllerResponse;
-import com.jcorporate.expresso.core.controller.ServletControllerRequest;
-import com.jcorporate.expresso.core.controller.ServletControllerResponse;
import com.jcorporate.expresso.core.controller.DBController;
import com.jcorporate.expresso.core.controller.ErrorCollection;
import com.jcorporate.expresso.core.controller.Input;
import com.jcorporate.expresso.core.controller.NonHandleableException;
import com.jcorporate.expresso.core.controller.Output;
+import com.jcorporate.expresso.core.controller.ServletControllerRequest;
import com.jcorporate.expresso.core.controller.State;
import com.jcorporate.expresso.core.controller.Transition;
import com.jcorporate.expresso.core.controller.ValidationException;
-import com.jcorporate.expresso.core.dataobjects.Securable;
import com.jcorporate.expresso.core.dataobjects.DataObjectMetaData;
+import com.jcorporate.expresso.core.dataobjects.Securable;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.DBObject;
import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
-import com.jcorporate.expresso.services.dbobj.MediaDBObject;
-import com.jcorporate.expresso.services.dbobj.MimeTypes;
import com.jcorporate.expresso.core.misc.RecordPaginator;
import com.jcorporate.expresso.core.misc.StringUtil;
import com.jcorporate.expresso.core.security.User;
import com.jcorporate.expresso.core.security.filters.FilterManager;
-import com.jcorporate.expresso.services.dbobj.ControllerDefault;
import com.jcorporate.expresso.kernel.util.FastStringBuffer;
+import com.jcorporate.expresso.services.dbobj.ControllerDefault;
+import com.jcorporate.expresso.services.dbobj.MimeTypes;
import org.apache.log4j.Logger;
+import org.apache.struts.upload.FormFile;
+
+import java.io.BufferedInputStream;
import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.io.StringReader;
import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Iterator;
+import java.util.List;
/**
@@ -264,8 +254,8 @@
/* Prompt for info to start a new group */
State newGroup = new State("newGroup", "Add New Group");
- newGroup.addParameter("GroupName");
- newGroup.addParameter("GroupDescription");
+ newGroup.addRequiredParameter("GroupName");
+ newGroup.addRequiredParameter("GroupDescription");
addState(newGroup);
/* Prompt for info to start a new group */
@@ -286,7 +276,7 @@
/* Choose a group (from the groups you're subscribed to) */
State selGroup = new State("selGroup", "Select Group");
addState(selGroup);
- selGroup.addParameter("project", false);
+ selGroup.addOptionalParameter("project");
setInitialState("selGroup");
/* Show the threads available in a particular group */
@@ -313,7 +303,7 @@
/* Add a new thread */
State newThread = new State("newThread", "Add New Topic to Group");
- newThread.addParameter("Subject");
+ newThread.addRequiredParameter("Subject");
newThread.addParameter("GroupId", DBObject.INT_MASK);
newThread.setErrorState("promptNewThread");
addState(newThread);
@@ -321,8 +311,8 @@
/* Add a new message to a thread */
State newMessage = new State("newMessage", "Post New Message");
newMessage.addParameter("ThreadId", DBObject.INT_MASK);
- newMessage.addParameter("Subject");
- newMessage.addParameter("Body");
+ newMessage.addRequiredParameter("Subject");
+ newMessage.addRequiredParameter("Body");
newMessage.setErrorState("promptNewMessage");
addState(newMessage);
@@ -348,8 +338,8 @@
/* Reply to an existing message */
State replyTo = new State("replyTo", "Reply to Message");
- replyTo.addParameter("Subject");
- replyTo.addParameter("Body");
+ replyTo.addRequiredParameter("Subject");
+ replyTo.addRequiredParameter("Body");
replyTo.addParameter("MessageId", DBObject.INT_MASK);
replyTo.setErrorState("promptReply");
addState(replyTo);
@@ -487,7 +477,7 @@
oneMessageOutput.setAttribute("Body",
FilterManager.getInstance().filterString(
bodyText,
- "ISO-8859-1-eForum",
+ null,
"standardFilter"));
} catch (Exception exc) {
throw new DBException("Error eForum Filtering Message", exc);
@@ -591,8 +581,6 @@
* @param response the <code>ControllerResponse</code> objcet
* @throws ControllerException
*
- * @see #addReplies(ControllerRequest request, ForumMessage baseMessage, Output messageOutput, int depth )
- *
*/
protected void runBrowseMessagesState(ControllerRequest request,
ControllerResponse response)
@@ -631,7 +619,7 @@
FilterManager.getInstance().filterString(
thisThread.getField(
"Subject"),
- "ISO-8859-1-eForum",
+ null,
"standardFilter")));
} catch (Exception exc) {
throw new ControllerException("Error Forum Filtering Subject Line",
@@ -663,7 +651,6 @@
Output oneMessageOutput = null;
String browseGroupId = request.getParameter("GroupId");
- String browseThreadId = request.getParameter("ThreadId");
// Create a transition to reload the browse messages view,
// if the user request this again (a refresh
@@ -688,7 +675,7 @@
"message",
FilterManager.getInstance().filterString(
oneMessage.getField( "Subject"),
- "ISO-8859-1-eForum", "standardFilter") );
+ null, "standardFilter") );
oneMessageOutput.setName( "message"+indexCount );
// response.addOutput(oneMessageOutput);
} catch (Exception exc) {
@@ -710,7 +697,7 @@
bodyText, (Class)null, "standardFilter");
oneMessageOutput.setAttribute("Body",
FilterManager.getInstance().filterString(
- bodyText, "ISO-8859-1-eForum", "standardFilter"));
+ bodyText, null, "standardFilter"));
} catch (Exception exc) {
throw new ControllerException("Error eForum Filtering Message", exc);
}
@@ -883,7 +870,7 @@
message = new Output("message",
FilterManager.getInstance().filterString(
ml.getField("Subject"),
- "ISO-8859-1-eForum",
+ null,
"standardFilter"));
// Append the generated Output to the "root" messages
// block for the web user interface.
@@ -907,7 +894,7 @@
message.setAttribute("Body",
FilterManager.getInstance().filterString(
ml.getField("Body").trim(),
- "ISO-8859-1-eForum",
+ null,
"standardFilter"));
} catch (Exception e) {
throw new ControllerException("Error eForum Filtering Message",
@@ -2343,7 +2330,6 @@
debugFormCache( response );
ServletControllerRequest servReq = (ServletControllerRequest)request;
- ServletControllerResponse servRes = (ServletControllerResponse)response;
BrowseForm browseForm = (BrowseForm)servReq.getForm();
System.out.println( "request.getFormAttribute() = "+ request.getFormAttribute() );
System.out.println( "servReq.getForm() = "+ servReq.getForm() );
More information about the cvs
mailing list