Update of /var/cvs/applications/scan/src/org/mmbase/module/gui/html
In directory james.mmbase.org:/tmp/cvs-serv29842/src/org/mmbase/module/gui/html

Modified Files:
        CommandHandlerInterface.java FieldEditor.java 
        FieldSelector.java HtmlBase.java MMEdit.java MMLanguage.java 
        ObjectSelector.java StateManager.java 
Log Message:
  MMB-1756


See also: 
http://cvs.mmbase.org/viewcvs/applications/scan/src/org/mmbase/module/gui/html
See also: http://www.mmbase.org/jira/browse/MMB-1756


Index: CommandHandlerInterface.java
===================================================================
RCS file: 
/var/cvs/applications/scan/src/org/mmbase/module/gui/html/CommandHandlerInterface.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- CommandHandlerInterface.java        1 Oct 2004 08:43:44 -0000       1.6
+++ CommandHandlerInterface.java        22 Dec 2008 18:52:37 -0000      1.7
@@ -21,23 +21,23 @@
  *
  * @application SCAN
  * @author Hans Speijer
- * @version $Id: CommandHandlerInterface.java,v 1.6 2004/10/01 08:43:44 pierre 
Exp $
+ * @version $Id: CommandHandlerInterface.java,v 1.7 2008/12/22 18:52:37 
michiel Exp $
  */
 public interface CommandHandlerInterface {
 
     /**
      * List commands
      */
-    public Vector getList(scanpage sp, StringTagger args, StringTokenizer 
command) throws ParseException;
+    public List<String> getList(PageInfo sp, StringTagger args, 
StringTokenizer command) throws ParseException;
 
     /**
      * Replace/Trigger commands
      */
-    public String replace(scanpage sp, StringTokenizer command);
+    public String replace(PageInfo sp, StringTokenizer command);
 
     /**
      * The hook that passes all form related pages to the correct handler
      */
-    public boolean process(scanpage sp, StringTokenizer command, Hashtable 
cmds, Hashtable vars);
+    public boolean process(PageInfo sp, StringTokenizer command, Hashtable 
cmds, Hashtable vars);
 
 }


Index: FieldEditor.java
===================================================================
RCS file: 
/var/cvs/applications/scan/src/org/mmbase/module/gui/html/FieldEditor.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- FieldEditor.java    27 Sep 2005 14:52:36 -0000      1.17
+++ FieldEditor.java    22 Dec 2008 18:52:37 -0000      1.18
@@ -27,7 +27,7 @@
  * @author Daniel Ockeloen
  * @author Hans Speijer
  * @author Arjan Houtman
- * @version $Id: FieldEditor.java,v 1.17 2005/09/27 14:52:36 michiel Exp $
+ * @version $Id: FieldEditor.java,v 1.18 2008/12/22 18:52:37 michiel Exp $
  */
 public class FieldEditor implements CommandHandlerInterface {
     // Logger
@@ -47,7 +47,7 @@
      * List commands
      * @javadoc
      */
-    public Vector getList(scanpage sp, StringTagger args, StringTokenizer 
command) throws ParseException {
+    public List<String> getList(PageInfo sp, StringTagger args, 
StringTokenizer command) throws ParseException {
         String token;
         String userName=HttpAuth.getRemoteUser(sp);
 
@@ -68,7 +68,7 @@
      * Replace/Trigger commands
      * @javadoc
      */
-    public String replace(scanpage sp, StringTokenizer command) {
+    public String replace(PageInfo sp, StringTokenizer command) {
         String token;
         String userName=HttpAuth.getRemoteUser(sp);
         EditState state = stateMngr.getEditState(userName);
@@ -97,7 +97,7 @@
      * The hook that passes all form related pages to the correct handler
      * @javadoc
      */
-    public boolean process(scanpage sp, StringTokenizer command,Hashtable 
cmds, Hashtable vars) {
+    public boolean process(PageInfo sp, StringTokenizer command,Hashtable 
cmds, Hashtable vars) {
         String token;
         String userName=HttpAuth.getRemoteUser(sp);
         EditState state = stateMngr.getEditState(userName);
@@ -112,7 +112,7 @@
                 return setEditDateField (state, command.nextToken (), cmds);
             } else if (token.equals("SETFIELDFILE_IMG")) {
                 log.info("FieldEditor -> FILE UPLOAD DETECTED");
-                setEditIMGField(state,command.nextToken(),cmds,sp);
+                setEditIMGField(state,command.nextToken(),cmds, (scanpage) sp);
                 return true;
             } else if (token.equals("SETFIELDFILE_DISK")) {
                 log.info("FieldEditor -> FILE DISK DETECTED");
@@ -260,7 +260,7 @@
     /**
      * @javadoc
      */
-    boolean setEditDISKField(EditState ed, String fieldname,Hashtable 
cmds,scanpage sp) {
+    boolean setEditDISKField(EditState ed, String fieldname,Hashtable 
cmds,PageInfo sp) {
         MMObjectBuilder obj=ed.getBuilder();
         FieldDefs def=obj.getField(fieldname);
         try {


Index: FieldSelector.java
===================================================================
RCS file: 
/var/cvs/applications/scan/src/org/mmbase/module/gui/html/FieldSelector.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- FieldSelector.java  11 Sep 2006 10:44:48 -0000      1.13
+++ FieldSelector.java  22 Dec 2008 18:52:37 -0000      1.14
@@ -23,7 +23,7 @@
  * @application SCAN
  * @author Daniel Ockeloen
  * @author Hans Speijer
- * @version $Id: FieldSelector.java,v 1.13 2006/09/11 10:44:48 pierre Exp $
+ * @version $Id: FieldSelector.java,v 1.14 2008/12/22 18:52:37 michiel Exp $
  */
 public class FieldSelector implements CommandHandlerInterface {
 
@@ -39,7 +39,7 @@
     /**
      * General List pages coming from MMEdit.
      */
-    public Vector getList(scanpage sp, StringTagger args, StringTokenizer 
commands) throws ParseException {
+    public List<String> getList(PageInfo sp, StringTagger args, 
StringTokenizer commands) throws ParseException {
         String token;
         String userName=HttpAuth.getRemoteUser(sp);
         EditState state = stateMngr.getEditState(userName);
@@ -170,14 +170,14 @@
     /**
      * Replace/Trigger commands
      */
-    public String replace(scanpage sp, StringTokenizer cmds) {
+    public String replace(PageInfo sp, StringTokenizer cmds) {
         return "Command not defined (FieldSelector)";
     }
 
     /**
      * The hook that passes all form related pages to the correct handler
      */
-    public boolean process(scanpage sp, StringTokenizer command, Hashtable 
cmds, Hashtable vars) {
+    public boolean process(PageInfo sp, StringTokenizer command, Hashtable 
cmds, Hashtable vars) {
         return false;
     }
 


Index: HtmlBase.java
===================================================================
RCS file: 
/var/cvs/applications/scan/src/org/mmbase/module/gui/html/HtmlBase.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- HtmlBase.java       3 Sep 2008 21:57:05 -0000       1.59
+++ HtmlBase.java       22 Dec 2008 18:52:37 -0000      1.60
@@ -33,7 +33,7 @@
  *
  * @application SCAN
  * @author Daniel Ockeloen
- * @version $Id: HtmlBase.java,v 1.59 2008/09/03 21:57:05 michiel Exp $
+ * @version $Id: HtmlBase.java,v 1.60 2008/12/22 18:52:37 michiel Exp $
  */
 public class HtmlBase extends ProcessorModule {
     /**
@@ -117,7 +117,7 @@
     /**
      * Generate a list of values from a command to the processor
      */
-    public Vector getList(scanpage sp,StringTagger tagger, String value) 
throws ParseException {
+    @Override public List<String> getList(PageInfo sp,StringTagger tagger, 
String value)  {
         String line = Strip.doubleQuote(value,Strip.BOTH);
         StringTokenizer tok = new StringTokenizer(line,"-\n\r");
         if (tok.hasMoreTokens()) {
@@ -134,7 +134,7 @@
     /**
      * show Objects
      */
-    public Vector doObjects(scanpage sp, StringTagger tagger) {
+    public Vector doObjects(PageInfo sp, StringTagger tagger) {
         String result=null;
         MMObjectNode node;
         Vector results=new Vector();
@@ -388,7 +388,7 @@
     /**
      * show Relations
      */
-    public Vector doRelations(scanpage sp, StringTagger tagger) {
+    public Vector doRelations(PageInfo sp, StringTagger tagger) {
         Object tmp;
         MMObjectNode node;
         MMObjectBuilder bul=null;
@@ -437,7 +437,7 @@
             }
             tagger.setValue("ITEMS",""+tagger.Values("FIELDS").size());
         } catch(Exception e) {
-            log.error("doRelations("+sp.getUrl()+"): ERROR: node("+snode+"), 
type("+type+"), where("+where+"):"+e);
+            log.error("doRelations("+sp+"): ERROR: node("+snode+"), 
type("+type+"), where("+where+"):"+e);
             if (bul!=null) {
                 log.error(Logging.stackTrace(e));
             }
@@ -446,7 +446,7 @@
     }
 
 
-    public String doGetRelationValue(scanpage sp, StringTokenizer tok) {
+    public String doGetRelationValue(PageInfo sp, StringTokenizer tok) {
         MMObjectBuilder bul = mmb.getBuilder("typedef");
 
         // reads $MOD-MMBASE-GETRELATIONVALUE-12-23-title where 12 is the 
source
@@ -510,7 +510,7 @@
         return "";
     }
 
-    public String doGetRelationCount(scanpage sp, StringTokenizer tok) {
+    public String doGetRelationCount(PageInfo sp, StringTokenizer tok) {
         MMObjectBuilder bul=mmb.getBuilder("typedef");
         // reads $MOD-MMBASE-GETRELATIONCOUNT-12-images where 12 is the 
nodenumber
         // and images is optional (if not it will return the total number of
@@ -547,7 +547,7 @@
         }
     }
 
-    public String doSetRelationValue(scanpage sp, StringTokenizer tok) {
+    public String doSetRelationValue(PageInfo sp, StringTokenizer tok) {
         MMObjectBuilder bul=mmb.getBuilder("typedef");
         // reads $MOD-MMBASE-GETRELATIONVALUE-12-23-title where 12 is the 
source
         // number, 23 the target number and title the key of the relation
@@ -612,7 +612,7 @@
     /**
      * show Relations
      */
-    public Vector doRelations_replace(scanpage sp, StringTokenizer tok) {
+    public Vector doRelations_replace(PageInfo sp, StringTokenizer tok) {
         Object tmp;
         MMObjectNode node;
         MMObjectBuilder bul=null;
@@ -656,7 +656,7 @@
     /**
      * Execute the commands provided in the form values
      */
-    public boolean process(scanpage sp, Hashtable cmds,Hashtable vars) {
+    @Override public boolean process(PageInfo sp, Hashtable cmds,Hashtable 
vars) {
         String cmdline,token;
 
         for (Enumeration h = cmds.keys();h.hasMoreElements();) {
@@ -676,7 +676,7 @@
     /**
      * Handle a $MOD command
      */
-    public String replace(scanpage sp, String cmds) {
+    @Override public String replace(PageInfo sp, String cmds) {
         StringTokenizer tok = new StringTokenizer(cmds,"-\n\r");
         if (tok.hasMoreTokens()) {
             String cmd=tok.nextToken();
@@ -738,7 +738,7 @@
         return "No command defined";
     }
 
-    String doCache(scanpage sp, StringTokenizer tok) {
+    String doCache(PageInfo sp, StringTokenizer tok) {
         String result="";
         String cmd = tok.nextToken();
         if (cmd.equals("SIZE")) {
@@ -758,7 +758,7 @@
         return result;
     }
 
-    String getObjectType(scanpage sp, StringTokenizer tok) {
+    String getObjectType(PageInfo sp, StringTokenizer tok) {
         if (tok.hasMoreTokens()) {
             String number=tok.nextToken();
             MMObjectNode node=mmb.getTypeDef().getNode(number);
@@ -767,7 +767,7 @@
         return "unknown";
     }
 
-    String getObjectTypeName(scanpage sp, StringTokenizer tok) {
+    String getObjectTypeName(PageInfo sp, StringTokenizer tok) {
         if (tok.hasMoreTokens()) {
             String number=tok.nextToken();
             MMObjectNode node=mmb.getTypeDef().getNode(number);
@@ -776,7 +776,7 @@
         return "unknown";
     }
 
-    String getGuiIndicator(scanpage sp, StringTokenizer tok) {
+    String getGuiIndicator(PageInfo sp, StringTokenizer tok) {
         if (tok.hasMoreTokens()) {
             String number=tok.nextToken();
             MMObjectNode node=mmb.getTypeDef().getNode(number);
@@ -785,7 +785,7 @@
         return "unknown";
     }
 
-    String getBuilderValue(scanpage sp, StringTokenizer tok) {
+    String getBuilderValue(PageInfo sp, StringTokenizer tok) {
         if (tok.hasMoreTokens()) {
             String number=tok.nextToken();
             String field="number";
@@ -796,7 +796,7 @@
         return "";
     }
 
-    String getObjectField(scanpage sp, StringTokenizer tok) {
+    String getObjectField(PageInfo sp, StringTokenizer tok) {
         if (tok.hasMoreTokens()) {
             String nodeNr=tok.nextToken();
             if( tok.hasMoreTokens()){
@@ -804,7 +804,7 @@
                 String result=null;
                 MMObjectBuilder bul=mmb.getBuilder("typedef");
                 MMObjectNode node=bul.getNode(nodeNr);
-                sessionInfo pagesession=getPageSession(sp);
+                sessionInfo pagesession=getPageSession((scanpage) sp);
                 if (pagesession!=null) {
                     pagesession.addSetValue("PAGECACHENODES",""+nodeNr);
                 }
@@ -820,18 +820,18 @@
                         return "";
                     }
                 }
-            } else log.error("getObjectField(): no token fieldname found, 
nodenr("+nodeNr+"), url("+sp.getUrl()+")");
-        } else log.error("getObjectField(): no token nodenr found, 
url("+sp.getUrl()+")");
+            } else log.error("getObjectField(): no token fieldname found, 
nodenr("+nodeNr+"), url("+sp +")");
+        } else log.error("getObjectField(): no token nodenr found, url("+sp 
+")");
         return "no command defined";
     }
 
-    String getObjectProperty(scanpage sp, StringTokenizer tok) {
+    String getObjectProperty(PageInfo sp, StringTokenizer tok) {
         if (tok.hasMoreTokens()) {
             String nodeNr=tok.nextToken();
             String fieldname=tok.nextToken();
             MMObjectBuilder bul=mmb.getBuilder("fielddef");
             MMObjectNode node=bul.getNode(nodeNr);
-            sessionInfo pagesession=getPageSession(sp);
+            sessionInfo pagesession=getPageSession((scanpage) sp);
             if (pagesession!=null) {
                 pagesession.addSetValue("PAGECACHENODES",""+nodeNr);
             }
@@ -893,7 +893,7 @@
         return null;
     }
 
-    public Vector doMultiLevel(scanpage sp, StringTagger tagger) throws 
MultiLevelParseException {
+    public Vector doMultiLevel(PageInfo sp, StringTagger tagger) throws 
MultiLevelParseException {
         String result=null,fieldname;
         MMObjectNode node;
         Integer hash;
@@ -901,7 +901,7 @@
         Enumeration e,f;
         boolean reload=true;
 
-        if (scancache) reload=getReload(sp,tagger);
+        if (scancache) reload=getReload((scanpage) sp,tagger);
 
         Vector type=tagger.Values("TYPE");
         if ((type==null) || (type.size()==0)) throw new 
MultiLevelParseException("No TYPE specified");
@@ -984,7 +984,7 @@
             long end=System.currentTimeMillis();
             len=(end-begin);
             if (len>200) {
-                log.debug("doMultilevel("+type+")="+(len)+" ms URI for 
page("+sp.req_line+")");
+                log.debug("doMultilevel("+type+")="+(len)+" ms URI for 
page("+sp +")");
             }
         } else {
             log.debug("doMultiLevel cache HIT  "+hash);
@@ -1019,7 +1019,7 @@
         return new Integer(hash);
     }
 
-    public String doBuilderReplace(scanpage sp,StringTokenizer tok) {
+    public String doBuilderReplace(PageInfo sp,StringTokenizer tok) {
         if (tok.hasMoreTokens()) {
             String type=tok.nextToken();
             MMObjectBuilder bul=mmb.getBuilder(type);
@@ -1046,7 +1046,7 @@
         return "FALSE";
     }
 
-    public Vector doBuilder(scanpage sp,StringTagger tagger, StringTokenizer 
tok) throws ParseException {
+    public Vector doBuilder(PageInfo sp,StringTagger tagger, StringTokenizer 
tok) throws ParseException {
         if (tok.hasMoreTokens()) {
             String type=tok.nextToken();
             MMObjectBuilder bul=mmb.getBuilder(type);


Index: MMEdit.java
===================================================================
RCS file: 
/var/cvs/applications/scan/src/org/mmbase/module/gui/html/MMEdit.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- MMEdit.java 23 Aug 2008 18:56:59 -0000      1.14
+++ MMEdit.java 22 Dec 2008 18:52:37 -0000      1.15
@@ -24,7 +24,7 @@
  * @application SCAN
  * @author Daniel Ockeloen
  * @author Hans Speijer
- * @version $Id: MMEdit.java,v 1.14 2008/08/23 18:56:59 michiel Exp $
+ * @version $Id: MMEdit.java,v 1.15 2008/12/22 18:52:37 michiel Exp $
  */
 public class MMEdit extends ProcessorModule {
 
@@ -118,8 +118,8 @@
     /**
      * The hook that passes all list related pages to the correct handler
      */
-    public Vector getList(scanpage sp,StringTagger tagger, String command) 
throws ParseException {
-        Vector result = new Vector();
+    @Override public List<String> getList(PageInfo sp,StringTagger tagger, 
String command) throws ParseException {
+        List<String> result = new Vector();
         CommandHandlerInterface handler;
 
         StringTokenizer tok = new 
StringTokenizer(Strip.doubleQuote(command,Strip.BOTH),"-\n\r");
@@ -147,7 +147,7 @@
                     if (reverse!=null) {
                         if(reverse.equals("YES")) {
                             int items = 3;
-                            result = imglister.reverse(result,items);
+                            Collections.reverse(result);
                         }
                     }
                 } else {
@@ -157,7 +157,7 @@
                     if (handler != null) {
                         result = handler.getList(sp, tagger, tok);
                     } else {
-                        result.addElement("List not defined (MMEdit)");
+                        result.add("List not defined (MMEdit)");
                     }
                 }
 
@@ -170,7 +170,7 @@
     /**
      * The hook that passes all form related pages to the correct handler
      */
-    public boolean process(scanpage sp, Hashtable cmds, Hashtable vars) {
+    @Override public boolean process(PageInfo sp, Hashtable cmds, Hashtable 
vars) {
 
         CommandHandlerInterface handler;
         String token, cmdline;
@@ -208,7 +208,7 @@
      * The hook that passes all replace and trigger related pages to the
      * correct handler
      */
-    public String replace(scanpage sp, String command) {
+    @Override public String replace(PageInfo sp, String command) {
         CommandHandlerInterface handler;
         String token;
 


Index: MMLanguage.java
===================================================================
RCS file: 
/var/cvs/applications/scan/src/org/mmbase/module/gui/html/MMLanguage.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- MMLanguage.java     26 Oct 2005 07:35:36 -0000      1.12
+++ MMLanguage.java     22 Dec 2008 18:52:37 -0000      1.13
@@ -24,7 +24,7 @@
  *
  * @application SCAN - Removing this from Core requires changes in Casting
  * @author Daniel Ockeloen
- * @version $Id: MMLanguage.java,v 1.12 2005/10/26 07:35:36 michiel Exp $
+ * @version $Id: MMLanguage.java,v 1.13 2008/12/22 18:52:37 michiel Exp $
  */
 public class MMLanguage extends ProcessorModule {
 
@@ -66,7 +66,7 @@
      * @param cmds the tokenized command
      * @return the result of the command as a String
      */
-    public String replace(scanpage sp, String cmds) {
+    @Override public String replace(PageInfo sp, String cmds) {
         StringTokenizer tok = new StringTokenizer(cmds,"-\n\r");
         if (tok.hasMoreTokens()) {
             String cmd=tok.nextToken();


Index: ObjectSelector.java
===================================================================
RCS file: 
/var/cvs/applications/scan/src/org/mmbase/module/gui/html/ObjectSelector.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- ObjectSelector.java 21 Jun 2007 15:50:23 -0000      1.24
+++ ObjectSelector.java 22 Dec 2008 18:52:37 -0000      1.25
@@ -9,19 +9,14 @@
 */
 package org.mmbase.module.gui.html;
 
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-import java.util.Vector;
+import java.util.*;
 
 import org.mmbase.module.ParseException;
 import org.mmbase.module.core.ClusterBuilder;
 import org.mmbase.module.core.MMObjectBuilder;
 import org.mmbase.module.core.MMObjectNode;
 import org.mmbase.module.corebuilders.FieldDefs;
-import org.mmbase.util.HttpAuth;
-import org.mmbase.util.StringTagger;
-import org.mmbase.util.scanpage;
+import org.mmbase.util.*;
 
 /**
  * The ObjectSelector class offers the functionality to search for objects
@@ -31,7 +26,7 @@
  * @application SCAN
  * @author Daniel Ockeloen
  * @author Hans Speijer
- * @version $Id: ObjectSelector.java,v 1.24 2007/06/21 15:50:23 nklasens Exp $
+ * @version $Id: ObjectSelector.java,v 1.25 2008/12/22 18:52:37 michiel Exp $
  */
 public class ObjectSelector implements CommandHandlerInterface {
 
@@ -48,7 +43,7 @@
      * General List pages coming from MMEdit.
      * @javadoc
      */
-    public Vector getList(scanpage sp, StringTagger args, StringTokenizer 
commands) throws ParseException {
+    public List<String> getList(PageInfo sp, StringTagger args, 
StringTokenizer commands) throws ParseException {
         String token;
         String userName=HttpAuth.getRemoteUser(sp);
 
@@ -376,7 +371,7 @@
     /**
      * General proces pages coming from MMEdit.
      */
-    public boolean process(scanpage sp, StringTokenizer command, Hashtable 
cmds, Hashtable vars) {
+    public boolean process(PageInfo sp, StringTokenizer command, Hashtable 
cmds, Hashtable vars) {
         return false;
     }
 
@@ -396,7 +391,7 @@
      * Handle a $MOD command.
      * ObjectSelector does not offer any commands.
      */
-    public String replace(scanpage sp, StringTokenizer cmds) {
+    public String replace(PageInfo sp, StringTokenizer cmds) {
         return "Command not defined (ObjectSelector)";
         // bedoeld voor het clearen van de serachvalues
     }


Index: StateManager.java
===================================================================
RCS file: 
/var/cvs/applications/scan/src/org/mmbase/module/gui/html/StateManager.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- StateManager.java   21 Jun 2007 15:50:23 -0000      1.19
+++ StateManager.java   22 Dec 2008 18:52:37 -0000      1.20
@@ -28,7 +28,7 @@
  * @author Daniel Ockeloen
  * @author Hans Speijer
  * @author Pierre van Rooden
- * @version $Id: StateManager.java,v 1.19 2007/06/21 15:50:23 nklasens Exp $
+ * @version $Id: StateManager.java,v 1.20 2008/12/22 18:52:37 michiel Exp $
  */
 
 public class StateManager implements CommandHandlerInterface {
@@ -109,7 +109,7 @@
      *  <li>ISCHANGED : ??? </li>
      * </ul>
      */
-    public String replace(scanpage sp, StringTokenizer commands) {
+    public String replace(PageInfo sp, StringTokenizer commands) {
         // Retrieve the username.
         // Or at least, that is the intention.
         // What this method REALLY does is authenticate the user (even if he 
was authenticated before).
@@ -138,7 +138,7 @@
             } else if (token.equals("CLEARBUILDERS")) {
                     state.clear();
             } else if (token.equals("ADDRELATION")) {
-                    log.warn("ADDRELATION is deprecated in "+sp.getUrl()+"; 
use NEWINSNODE");
+                    log.warn("ADDRELATION is deprecated in "+sp +"; use 
NEWINSNODE");
                     state.addRelation(userName);
             } else if (token.equals("SETHTMLVALUE")) {
                     
state.setHtmlValue(commands.nextToken(),commands.nextToken());
@@ -353,7 +353,7 @@
      * List commands
      * @javadoc
      */
-    public Vector getList(scanpage sp, StringTagger args, StringTokenizer 
command) throws org.mmbase.module.ParseException {
+    public List<String> getList(PageInfo sp, StringTagger args, 
StringTokenizer command) throws org.mmbase.module.ParseException {
         String token;
         String userName=HttpAuth.getRemoteUser(sp);
         EditState state = getEditState(userName);
@@ -373,7 +373,7 @@
      * The hook that passes all form related pages to the correct handler
      * @javadoc
      */
-    public boolean process(scanpage sp, StringTokenizer command,Hashtable 
cmds, Hashtable vars) {
+    public boolean process(PageInfo sp, StringTokenizer command,Hashtable 
cmds, Hashtable vars) {
         String userName=HttpAuth.getRemoteUser(sp);
         EditState state = getEditState(userName);
 
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to