Changeset 3825


Ignore:
Timestamp:
Sep 8, 2010, 9:19:49 AM (13 years ago)
Author:
Gregory Vincic
Message:

Refs #698. Replaced references FormFactory.VFWDACTION with ForwardField.VPARAM

Location:
trunk/client/servlet/src/org/proteios
Files:
55 edited

Legend:

Unmodified
Added
Removed

  • trunk/client/servlet/src/org/proteios/action/ActionFactory.java

    r3777 r3825  
    2828package org.proteios.action;
    2929
     30import java.io.File;
     31import java.io.IOException;
     32import java.security.Principal;
     33import java.util.HashMap;
     34import java.util.List;
     35import java.util.Properties;
     36import java.util.jar.JarEntry;
     37import java.util.regex.Pattern;
     38import javax.servlet.ServletContext;
     39import javax.servlet.http.HttpSession;
    3040import org.apache.log4j.Logger;
    3141import org.proteios.ActionLink;
    … …  
    3848import org.proteios.Registry;
    3949import org.proteios.RoleController;
     50import org.proteios.action.execute.Login;
    4051import org.proteios.action.execute.ViewLoginForm;
    41 import org.proteios.action.execute.Login;
    4252import org.proteios.action.extract.ViewExtract;
    4353import org.proteios.action.feature.ViewFeatureHits;
    … …  
    7787import org.proteios.gui.GUIFactory;
    7888import org.proteios.gui.GUIParameterValidator;
    79 import org.proteios.gui.form.FormFactory;
     89import org.proteios.gui.form.*;
    8090import org.proteios.gui.layout.LayoutFactory;
     91import org.proteios.gui.table.TableFactory2;
    8192import org.proteios.gui.table.TableFactory;
    82 import org.proteios.gui.table.TableFactory2;
    8393import org.proteios.gui.web.LayoutConverter;
    84 
    8594import se.lu.thep.waf.AbstractAction;
    8695import se.lu.thep.waf.ActionFactoryInterface;
    … …  
    92101import se.lu.thep.waf.constraints.StringConverter;
    93102import se.lu.thep.waf.constraints.VBoolean;
    94 
    95 import java.io.File;
    96 import java.io.IOException;
    97 import java.security.Principal;
    98 import java.util.HashMap;
    99 import java.util.List;
    100 import java.util.Properties;
    101 import java.util.jar.JarEntry;
    102 import java.util.regex.Pattern;
    103 
    104 import javax.servlet.ServletContext;
    105 import javax.servlet.http.HttpSession;
    106103
    107104/**
    … …  
    229226
    230227   log.debug("Setting VFWDACTION to " + forwardActionId);
    231       httpSession.setAttribute(FormFactory.VFWDACTION.getName(),  forwardActionId);
     228      httpSession.setAttribute(ForwardField.VPARAM.getName(), forwardActionId);
    232229
    233230   // return the action for logon

  • trunk/client/servlet/src/org/proteios/action/SetColumnSelection.java

    r2389 r3825  
    2828package org.proteios.action;
    2929
     30import java.util.ArrayList;
    3031import org.proteios.ActionLink;
    3132import org.proteios.action.ProteiosAction;
    3233import org.proteios.core.DbControl;
    33 import org.proteios.gui.form.Form;
    34 import org.proteios.gui.form.FormFactory;
     34import org.proteios.gui.form.*;
    3535import org.proteios.gui.table.TableFactory;
    36 
    3736import se.lu.thep.waf.ActionException;
    3837import se.lu.thep.waf.constraints.InvalidParameterValue;
    39 import java.util.ArrayList;
    4038
    4139/**
    … …  
    5048  {
    5149    log.debug(this.getClass().getSimpleName() + "::runMe(): Start");
    52     String forwardActionId = getValidString(FormFactory.VFWDACTION);
     50    String forwardActionId = getValidString(ForwardField.VPARAM);
    5351    Integer columnListSize = getValidInteger(FormFactory.VCOLUMNLISTSIZE);
    5452    log.debug(this.getClass().getSimpleName() + "::runMe(): forwardActionId = \"" + forwardActionId + "\"");

  • trunk/client/servlet/src/org/proteios/action/SetFilter1.java

    r2389 r3825  
    2828package org.proteios.action;
    2929
     30import java.util.HashMap;
     31import java.util.List;
    3032import org.proteios.ActionLink;
    3133import org.proteios.gui.Toolbar;
    32 import org.proteios.gui.form.Form;
    33 import org.proteios.gui.form.FormFactory;
     34import org.proteios.gui.form.*;
    3435import org.proteios.gui.layout.RowLayout;
    3536import org.proteios.gui.table.TableFactory;
    3637import se.lu.thep.waf.ActionException;
    3738import se.lu.thep.waf.constraints.InvalidParameterValue;
    38 import java.util.HashMap;
    39 import java.util.List;
    4039
    4140/**
    … …  
    5857    String filterCondition = getValidString(FormFactory.VFILTERCONDITION);
    5958    String filterValue = getValidString(FormFactory.VFILTERVALUE);
    60     String forwardActionId = getValidString(FormFactory.VFWDACTION);
     59    String forwardActionId = getValidString(ForwardField.VPARAM);
    6160    Integer filterListSize = getValidInteger(FormFactory.VLISTSIZE);
    6261    log.debug(this.getClass().getSimpleName() + "::runMe(): filterName = " + filterName);

  • trunk/client/servlet/src/org/proteios/action/SetFilter2.java

    r2389 r3825  
    2828package org.proteios.action;
    2929
     30import java.util.ArrayList;
     31import java.util.HashMap;
     32import java.util.Iterator;
     33import java.util.List;
    3034import org.proteios.ActionLink;
    31 import org.proteios.gui.form.Field;
    32 import org.proteios.gui.form.Fieldset;
    33 import org.proteios.gui.form.Form;
    34 import org.proteios.gui.form.FormFactory;
     35import org.proteios.gui.form.*;
    3536import org.proteios.gui.table.TableFactory;
    3637import se.lu.thep.waf.ActionException;
    … …  
    3839import se.lu.thep.waf.constraints.VParameter;
    3940import se.lu.thep.waf.constraints.VString;
    40 import java.util.ArrayList;
    41 import java.util.HashMap;
    42 import java.util.Iterator;
    43 import java.util.List;
    4441
    4542/**
    … …  
    9390    log.debug(this.getClass().getSimpleName() + "::runMe(): filterCondition = " + filterCondition);
    9491    log.debug(this.getClass().getSimpleName() + "::runMe(): filterValue = " + filterValue);
    95     String forwardActionId = getValidString(FormFactory.VFWDACTION);
     92    String forwardActionId = getValidString(ForwardField.VPARAM);
    9693    // Convert filter values for strings to hex code to handle problem
    9794    // characters.

  • trunk/client/servlet/src/org/proteios/action/SetSortColumn.java

    r2389 r3825  
    2929
    3030import org.proteios.ActionLink;
    31 import org.proteios.gui.form.FormFactory;
     31import org.proteios.gui.form.*;
    3232import org.proteios.gui.table.TableFactory;
    3333import se.lu.thep.waf.ActionException;
    … …  
    5050     */
    5151    String sortColumnKey = getValidString(FormFactory.VSORTCOLUMNKEY);
    52     String forwardActionId = getValidString(FormFactory.VFWDACTION);
     52    String forwardActionId = getValidString(ForwardField.VPARAM);
    5353    log.debug(this.getClass().getSimpleName() + "::runMe(): sortColumnKey  = \"" + sortColumnKey + "\"");
    5454    log.debug(this.getClass().getSimpleName() + "::runMe(): forwardActionId = \"" + forwardActionId + "\"");

  • trunk/client/servlet/src/org/proteios/action/SetTableConfiguration.java

    r2602 r3825  
    2828package org.proteios.action;
    2929
     30import java.util.HashMap;
     31import java.util.List;
    3032import org.proteios.ActionLink;
    3133import org.proteios.action.read.ScrollTo;
    3234import org.proteios.gui.Scroller;
    33 import org.proteios.gui.form.FormFactory;
     35import org.proteios.gui.form.*;
    3436import org.proteios.gui.table.TableFactory;
    3537import se.lu.thep.waf.ActionException;
    3638import se.lu.thep.waf.constraints.InvalidParameterValue;
    37 import java.util.HashMap;
    38 import java.util.List;
    3939
    4040/**
    … …  
    5050    log.debug("Start");
    5151    String tableConfActionId = getValidString(FormFactory.VTABLECONFACTION);
    52     String forwardActionId = getValidString(FormFactory.VFWDACTION);
     52    String forwardActionId = getValidString(ForwardField.VPARAM);
    5353    log.debug("tableConfActionId = \"" + tableConfActionId + "\"");
    5454    log.debug("forwardActionId = \"" + forwardActionId + "\"");

  • trunk/client/servlet/src/org/proteios/action/events/AddImageFileEvent.java

    r2162 r3825  
    3333import org.proteios.core.DbControl;
    3434import org.proteios.core.Project;
    35 import org.proteios.gui.form.FormFactory;
    36 
     35import org.proteios.gui.form.*;
    3736import se.lu.thep.waf.ActionException;
    3837import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    5251    setSessionAttribute(CreateImageFileEvent.VEVENTID,
    5352      getValidInteger(FormFactory.VID));
    54     setSessionAttribute(FormFactory.VFWDACTION, getActionFactory().getId(
     53    setSessionAttribute(ForwardField.VPARAM, getActionFactory().getId(
    5554      CreateImageFileEvent.class));
    5655    setSessionAttribute(ViewActiveDirectory.VDIRID, project

  • trunk/client/servlet/src/org/proteios/action/events/NewGelElectrophoresis.java

    r2183 r3825  
    3434import org.proteios.gui.Title;
    3535import org.proteios.gui.Toolbar;
    36 import org.proteios.gui.form.Form;
    37 import org.proteios.gui.form.FormFactory;
     36import org.proteios.gui.form.*;
    3837import org.proteios.gui.layout.RowLayout;
    3938import se.lu.thep.waf.ActionException;
    … …  
    6766    Toolbar toolbar = new Toolbar();
    6867    ActionLink save = getActionLink(AddGel.class, "Next");
    69     save.addParameter(FormFactory.VFWDACTION, getActionFactory().getId(
     68    save.addParameter(ForwardField.VPARAM, getActionFactory().getId(
    7069      NewGelElectrophoresisSeparationEvent.class));
    7170    toolbar.add(save);

  • trunk/client/servlet/src/org/proteios/action/execute/Login.java

    r3797 r3825  
    3535import org.proteios.core.ItemNotFoundException;
    3636import org.proteios.core.SessionControl;
    37 import org.proteios.gui.form.Form;
    38 import org.proteios.gui.form.PasswordField;
    39 import org.proteios.gui.form.UsernameField;
    40 import org.proteios.gui.form.FormFactory;
    41 import org.proteios.gui.form.LoginForm;
     37import org.proteios.gui.form.*;
    4238import se.lu.thep.waf.ActionException;
    4339import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    7672  }
    7773
    78     forwardActionId = super.getSessionAttribute(FormFactory.VFWDACTION);
     74    forwardActionId = super.getSessionAttribute(ForwardField.VPARAM);
    7975  log.debug("Forwarding to: " + forwardActionId);
    8076    sessionControlId = getRequest().getSession().getId();

  • trunk/client/servlet/src/org/proteios/action/extract/AddExtractFile.java

    r2479 r3825  
    3232import org.proteios.core.DbControl;
    3333import org.proteios.core.Project;
    34 import org.proteios.gui.form.FormFactory;
    35 
     34import org.proteios.gui.form.*;
    3635import se.lu.thep.waf.ActionException;
    3736import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    4948    DbControl dc = newDbControl();
    5049    Project project = getActiveProject(dc);
    51     setSessionAttribute(FormFactory.VFWDACTION, getActionFactory().getId(
     50    setSessionAttribute(ForwardField.VPARAM, getActionFactory().getId(
    5251      CreateExtractFile.class));
    5352    setSessionAttribute(ViewActiveDirectory.VDIRID, project

  • trunk/client/servlet/src/org/proteios/action/extract/AddLabeledExtractFile.java

    r2479 r3825  
    3232import org.proteios.core.DbControl;
    3333import org.proteios.core.Project;
    34 import org.proteios.gui.form.FormFactory;
    35 
     34import org.proteios.gui.form.*;
    3635import se.lu.thep.waf.ActionException;
    3736import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    4948    DbControl dc = newDbControl();
    5049    Project project = getActiveProject(dc);
    51     setSessionAttribute(FormFactory.VFWDACTION, getActionFactory().getId(
     50    setSessionAttribute(ForwardField.VPARAM, getActionFactory().getId(
    5251      CreateLabeledExtractFile.class));
    5352    setSessionAttribute(ViewActiveDirectory.VDIRID, project

  • trunk/client/servlet/src/org/proteios/action/extract/ListAllExtracts.java

    r3620 r3825  
    3434import org.proteios.core.Include;
    3535import org.proteios.core.ItemQuery;
     36import org.proteios.gui.Title;
    3637import org.proteios.gui.Toolbar;
    37 import org.proteios.gui.Title;
    38 import org.proteios.gui.form.FormFactory;
     38import org.proteios.gui.form.*;
    3939import org.proteios.gui.layout.RowLayout;
    4040import org.proteios.gui.table.Table;
    4141import org.proteios.gui.table.TableFactory;
    42 
    4342import se.lu.thep.waf.ActionException;
    4443import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    8786    newExtract = getActionFactory().getActionLink(ClearActiveSample.class, "New");
    8887    newExtractActionId = getActionFactory().getId(NewExtract.class);
    89     newExtract.addParameter(FormFactory.VFWDACTION, newExtractActionId);
     88    newExtract.addParameter(ForwardField.VPARAM, newExtractActionId);
    9089
    9190    // Get the toolbar from the generated table in case there already is one

  • trunk/client/servlet/src/org/proteios/action/file/MoveFile1.java

    r2511 r3825  
    3434import org.proteios.core.File;
    3535import org.proteios.core.ItemFactory;
    36 import org.proteios.gui.form.FormFactory;
    37 import org.proteios.gui.form.Form;
     36import org.proteios.gui.form.*;
    3837import se.lu.thep.waf.ActionException;
    3938import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    6463     * Set parameters
    6564     */
    66     saveToSession(FormFactory.VFWDACTION);
     65    saveToSession(ForwardField.VPARAM);
    6766    log.debug(this.getClass().getSimpleName() + "::runMe(): file.getDirectory() = \"" + file.getDirectory() + "\"");
    6867    Integer dirId = file.getDirectory().getId();

  • trunk/client/servlet/src/org/proteios/action/file/ViewActiveFile.java

    r3642 r3825  
    2828package org.proteios.action.file;
    2929
     30import java.util.Iterator;
    3031import org.proteios.ActionLink;
    3132import org.proteios.action.ProteiosAction;
    … …  
    4950import org.proteios.gui.Title;
    5051import org.proteios.gui.Toolbar;
    51 import org.proteios.gui.form.Form;
    52 import org.proteios.gui.form.FormFactory;
     52import org.proteios.gui.form.*;
    5353import org.proteios.gui.layout.RowLayout;
    5454import org.proteios.gui.table.Cell;
    … …  
    5757import org.proteios.gui.table.Table;
    5858import org.proteios.gui.table.TableFactory;
    59 
    6059import se.lu.thep.waf.ActionException;
    6160import se.lu.thep.waf.constraints.InvalidParameterValue;
    6261import se.lu.thep.waf.constraints.VInteger;
    63 
    64 import java.util.Iterator;
    6562
    6663/**
    … …  
    169166      deleteFile.addParameter(FormFactory.VCLASSNAME, File.class
    170167        .getName());
    171       deleteFile.addParameter(FormFactory.VFWDACTION,
     168      deleteFile.addParameter(ForwardField.VPARAM,
    172169        ViewActiveDirectory.class.getName());
    173170      //

  • trunk/client/servlet/src/org/proteios/action/hit/SelectPrideProtocolFileStep1b.java

    r3082 r3825  
    2828package org.proteios.action.hit;
    2929
     30import java.util.List;
    3031import org.proteios.action.ProteiosAction;
    31 import org.proteios.gui.form.FormFactory;
    32 
    33 import java.util.List;
    34 
     32import org.proteios.gui.form.*;
    3533import se.lu.thep.waf.ActionException;
    3634import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    5654     */
    5755    String forward2Id = getSessionAttribute(FormFactory.VFWD2ACTION);
    58     String forwardId = getValidString(FormFactory.VFWDACTION);
     56    String forwardId = getValidString(ForwardField.VPARAM);
    5957    log.debug("forward2Id = " + forward2Id);
    6058    log.debug("forwardId = " + forwardId);

  • trunk/client/servlet/src/org/proteios/action/ipg/NewIPG.java

    r2184 r3825  
    3434import org.proteios.gui.Title;
    3535import org.proteios.gui.Toolbar;
    36 import org.proteios.gui.form.Form;
    37 import org.proteios.gui.form.FormFactory;
     36import org.proteios.gui.form.*;
    3837import org.proteios.gui.layout.RowLayout;
    3938import se.lu.thep.waf.ActionException;
    … …  
    6059    Toolbar toolbar = new Toolbar();
    6160    ActionLink save = getActionLink(AddIPG.class, "Next");
    62     save.addParameter(FormFactory.VFWDACTION, getActionFactory().getId(
     61    save.addParameter(ForwardField.VPARAM, getActionFactory().getId(
    6362      NewIPGSeparationEvent.class));
    6463    toolbar.add(save);

  • trunk/client/servlet/src/org/proteios/action/mascot/AddMascotParameterSetStorage.java

    r3297 r3825  
    2828package org.proteios.action.mascot;
    2929
     30import java.io.InputStream;
     31import java.util.Calendar;
    3032import org.proteios.action.ProteiosAction;
    3133import org.proteios.core.BaseException;
    … …  
    3638import org.proteios.core.ItemFactory;
    3739import org.proteios.core.ItemNotFoundException;
     40import org.proteios.core.MascotParameterSetStorage;
    3841import org.proteios.core.Project;
    39 import org.proteios.core.MascotParameterSetStorage;
    4042import org.proteios.core.User;
    41 import org.proteios.gui.form.Form;
    42 import org.proteios.gui.form.FormFactory;
    43 
    44 import java.io.InputStream;
    45 import java.util.Calendar;
    46 
     43import org.proteios.gui.form.*;
    4744import se.lu.thep.waf.ActionException;
    4845import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    7269    Integer parameterTemplateFileId = getInteger(VMASCOTPARAMETERTEMPLATEFILEID);
    7370    String searchType = getString(SaveMascotParameterSetStorage.VMASCOT_SEARCH_TYPE);
    74     String forwardTo = getValidString(FormFactory.VFWDACTION);
     71    String forwardTo = getValidString(ForwardField.VPARAM);
    7572    log.debug("name = \"" + name + "\"");
    7673    log.debug("description = \"" + description + "\"");

  • trunk/client/servlet/src/org/proteios/action/mascot/NewMascotParameterSetStorage.java

    r3297 r3825  
    3636import org.proteios.gui.Title;
    3737import org.proteios.gui.Toolbar;
    38 import org.proteios.gui.form.Form;
    39 import org.proteios.gui.form.FormFactory;
     38import org.proteios.gui.form.*;
    4039import org.proteios.gui.layout.RowLayout;
    4140import se.lu.thep.waf.ActionException;
    … …  
    6059     * previous field entries are read from session attributes.
    6160     */
    62     String forwardTo = getValidString(FormFactory.VFWDACTION);
     61    String forwardTo = getValidString(ForwardField.VPARAM);
    6362    // Get and reset MascotParameterSetStorage name session attribute
    6463    String name = getSessionAttribute(FormFactory.VNAME);
    … …  
    120119    String saveLabel = "Save";
    121120    ActionLink saveAction = getActionFactory().getActionLink(AddMascotParameterSetStorage.class, saveLabel);
    122     saveAction.addParameter(FormFactory.VFWDACTION.getName(),
     121    saveAction.addParameter(ForwardField.VPARAM.getName(),
    123122      forwardTo);
    124123    tb.add(saveAction);
    … …  
    127126    ActionLink selectParameterFileAction = getActionFactory().getActionLink(SelectMascotParameterFileStep1a.class,
    128127      selectParameterFileLabel);
    129     selectParameterFileAction.addParameter(FormFactory.VFWDACTION.getName(),
     128    selectParameterFileAction.addParameter(ForwardField.VPARAM.getName(),
    130129      forwardTo);
    131130    tb.add(selectParameterFileAction);

  • trunk/client/servlet/src/org/proteios/action/mascot/SaveMascotParameterSetStorage.java

    r3768 r3825  
    2828package org.proteios.action.mascot;
    2929
     30import java.util.ArrayList;
     31import java.util.List;
     32import java.util.StringTokenizer;
     33import java.util.regex.Pattern;
    3034import org.proteios.ActionLink;
    3135import org.proteios.action.ProteiosAction;
    … …  
    3842import org.proteios.core.ItemQuery;
    3943import org.proteios.core.ItemResultIterator;
     44import org.proteios.core.MascotParameterSetStorage;
    4045import org.proteios.core.Project;
    4146import org.proteios.core.User;
    42 import org.proteios.core.MascotParameterSetStorage;
    4347import org.proteios.core.query.Expressions;
    4448import org.proteios.core.query.Hql;
    4549import org.proteios.core.query.Restrictions;
    46 import org.proteios.io.FileExtraUtil;
    4750import org.proteios.gui.Title;
    4851import org.proteios.gui.Toolbar;
    49 import org.proteios.gui.form.Form;
    50 import org.proteios.gui.form.Fieldset;
    51 import org.proteios.gui.form.TextField;
    52 import org.proteios.gui.form.FormFactory;
     52import org.proteios.gui.form.*;
    5353import org.proteios.gui.layout.RowLayout;
     54import org.proteios.io.FileExtraUtil;
    5455import org.proteios.io.MascotParameterSet;
    55 
    5656import se.lu.thep.waf.ActionException;
    5757import se.lu.thep.waf.constraints.InvalidParameterValue;
    5858import se.lu.thep.waf.constraints.VInteger;
    5959import se.lu.thep.waf.constraints.VString;
    60 import java.util.ArrayList;
    61 import java.util.List;
    62 import java.util.regex.Pattern;
    63 import java.util.StringTokenizer;
    6460
    6561/**
    … …  
    147143    saveMascotParameterSetFlag = getValidBoolean(SearchMascot.VSAVEMASCOTPARAMETERSETFLAG);
    148144    saveAsMascotParameterSetFlag = getValidBoolean(SearchMascot.VSAVEASMASCOTPARAMETERSETFLAG);
    149     forwardId = getValidString(FormFactory.VFWDACTION);
     145    forwardId = getValidString(ForwardField.VPARAM);
    150146    spectrumFileIds = getValidIntegerList(SearchMascot.VSPECTRUMFILEID);
    151147    useWebInterfaceFlag = getValidBoolean(SearchMascot.VMASCOTUSEWEBINTERFACEFLAG);
    … …  
    199195        saveAction.addParameter(SearchMascot.VSAVEASMASCOTPARAMETERSETFLAG,
    200196          true);
    201         saveAction.addParameter(FormFactory.VFWDACTION.getName(),
     197        saveAction.addParameter(ForwardField.VPARAM.getName(),
    202198          forwardId);
    203199        if (spectrumFileIds != null)
    … …  
    390386      setAttribute(SearchMascot.VSAVEASMASCOTPARAMETERSETFLAG,
    391387        true);
    392       setAttribute(FormFactory.VFWDACTION.getName(),
     388      setAttribute(ForwardField.VPARAM.getName(),
    393389        forwardId);
    394390      if (useWebInterfaceFlag != null)

  • trunk/client/servlet/src/org/proteios/action/mascot/SelectMascotParameterFileStep1b.java

    r3297 r3825  
    2828package org.proteios.action.mascot;
    2929
     30import java.util.List;
    3031import org.proteios.action.ProteiosAction;
    3132import org.proteios.action.mascot.NewMascotParameterSetStorage;
    32 import org.proteios.gui.form.FormFactory;
    33 
    34 import java.util.List;
    35 
     33import org.proteios.gui.form.*;
    3634import se.lu.thep.waf.ActionException;
    3735import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    6058    Integer parameterTemplateFileId = getSessionAttribute(AddMascotParameterSetStorage.VMASCOTPARAMETERTEMPLATEFILEID);
    6159    String forward2Id = getSessionAttribute(FormFactory.VFWD2ACTION);
    62     String forwardId = getValidString(FormFactory.VFWDACTION);
     60    String forwardId = getValidString(ForwardField.VPARAM);
    6361    log.debug("name = \"" + name + "\"");
    6462    log.debug("description = \"" + description + "\"");

  • trunk/client/servlet/src/org/proteios/action/mascot/ViewActiveMascotParameterFile.java

    r3297 r3825  
    3535import org.proteios.gui.Title;
    3636import org.proteios.gui.Toolbar;
    37 import org.proteios.gui.form.Form;
    38 import org.proteios.gui.form.FormFactory;
     37import org.proteios.gui.form.*;
    3938import org.proteios.gui.layout.RowLayout;
    4039import se.lu.thep.waf.ActionException;
    … …  
    7473      fileId = mascotParameterSetStorage.getParameterFile().getId();
    7574    }
    76     String forwardTo = getValidString(FormFactory.VFWDACTION);
     75    String forwardTo = getValidString(ForwardField.VPARAM);
    7776    log.debug("mascotParameterSetStorageId = " + mascotParameterSetStorageId);
    7877    log.debug("mascotParameterSetStorage.getName() = \"" + mascotParameterSetStorage.getName() + "\"");
    … …  
    9089    viewFileAction.addParameter(FormFactory.VID.getName(),
    9190      mascotParameterSetStorageId);
    92     viewFileAction.addParameter(FormFactory.VFWDACTION.getName(),
     91    viewFileAction.addParameter(ForwardField.VPARAM.getName(),
    9392      forwardTo);
    9493    if (fileId == null || fileId < 1)

  • trunk/client/servlet/src/org/proteios/action/mascot/ViewActiveMascotParameterSetStorage.java

    r3768 r3825  
    2828package org.proteios.action.mascot;
    2929
     30import java.io.InputStream;
     31import java.util.ArrayList;
     32import java.util.List;
    3033import org.proteios.ActionLink;
    3134import org.proteios.action.ProteiosAction;
    … …  
    3538import org.proteios.gui.Title;
    3639import org.proteios.gui.Toolbar;
    37 import org.proteios.gui.form.Form;
    38 import org.proteios.gui.form.FormFactory;
    39 import org.proteios.gui.form.Fieldset;
    40 import org.proteios.gui.form.Option;
    41 import org.proteios.gui.form.TextField;
     40import org.proteios.gui.form.*;
    4241import org.proteios.gui.layout.RowLayout;
     42import org.proteios.io.MascotParameterFileUtil;
    4343import org.proteios.io.MascotParameterSet;
    4444import org.proteios.io.MascotParameterSetOptionsUtil;
    45 import org.proteios.io.MascotParameterFileUtil;
    4645import se.lu.thep.waf.ActionException;
    4746import se.lu.thep.waf.constraints.InvalidParameterValue;
    4847import se.lu.thep.waf.constraints.VInteger;
    49 import java.io.InputStream;
    50 import java.util.ArrayList;
    51 import java.util.List;
    5248
    5349/**
    … …  
    231227      save = getActionLink(SaveMascotParameterSetStorage.class, "Save");
    232228      save.addParameter(SearchMascot.VSAVEMASCOTPARAMETERSETFLAG, true);
    233       save.addParameter(FormFactory.VFWDACTION, ViewActiveMascotParameterSetStorage.class.getName());
     229      save.addParameter(ForwardField.VPARAM, ViewActiveMascotParameterSetStorage.class.getName());
    234230      toolbar.add(save);
    235231      // "Save As" Mascot parameter set button
    … …  
    237233      saveAs.addParameter(SearchMascot.VSAVEMASCOTPARAMETERSETFLAG, false);
    238234      saveAs.addParameter(SearchMascot.VSAVEASMASCOTPARAMETERSETFLAG, true);
    239       saveAs.addParameter(FormFactory.VFWDACTION, ListMascotParameterSetStorage.class.getName());
     235      saveAs.addParameter(ForwardField.VPARAM, ListMascotParameterSetStorage.class.getName());
    240236      toolbar.add(saveAs);
    241237    }
    … …  
    252248      searchMascot = getActionLink(SaveMascotParameterSetStorage.class, "SaveAndSearchMascot");
    253249      searchMascot.addParameter(SearchMascot.VSAVEMASCOTPARAMETERSETFLAG, true);
    254       searchMascot.addParameter(FormFactory.VFWDACTION, SearchMascot.class.getName());
     250      searchMascot.addParameter(ForwardField.VPARAM, SearchMascot.class.getName());
    255251      toolbar.add(searchMascot);
    256252      // "Save As" and Search Mascot
    … …  
    258254      saveAsAndSearchMascot.addParameter(SearchMascot.VSAVEMASCOTPARAMETERSETFLAG, false);
    259255      saveAsAndSearchMascot.addParameter(SearchMascot.VSAVEASMASCOTPARAMETERSETFLAG, true);
    260       saveAsAndSearchMascot.addParameter(FormFactory.VFWDACTION, SearchMascot.class.getName());
     256      saveAsAndSearchMascot.addParameter(ForwardField.VPARAM, SearchMascot.class.getName());
    261257      toolbar.add(saveAsAndSearchMascot);
    262258    }

  • trunk/client/servlet/src/org/proteios/action/mascot/ViewMascotParameterFile.java

    r3297 r3825  
    3434import org.proteios.core.ItemFactory;
    3535import org.proteios.core.MascotParameterSetStorage;
    36 import org.proteios.gui.form.FormFactory;
     36import org.proteios.gui.form.*;
    3737import se.lu.thep.waf.ActionException;
    3838import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    6262      mascotParameterSetStorageId);
    6363    File parameterFile = mascotParameterSetStorage.getParameterFile();
    64     String forwardTo = getValidString(FormFactory.VFWDACTION);
     64    String forwardTo = getValidString(ForwardField.VPARAM);
    6565    log.debug("mascotParameterSetStorageId = " + mascotParameterSetStorageId);
    6666    log.debug("mascotParameterSetStorage.getName() = \"" + mascotParameterSetStorage.getName() + "\"");

  • trunk/client/servlet/src/org/proteios/action/omssa/AddOMSSAParameterSetStorage.java

    r2917 r3825  
    2828package org.proteios.action.omssa;
    2929
     30import java.io.InputStream;
     31import java.util.Calendar;
    3032import org.proteios.action.ProteiosAction;
    3133import org.proteios.core.BaseException;
    … …  
    3638import org.proteios.core.ItemFactory;
    3739import org.proteios.core.ItemNotFoundException;
     40import org.proteios.core.OMSSAParameterSetStorage;
    3841import org.proteios.core.Project;
    39 import org.proteios.core.OMSSAParameterSetStorage;
    4042import org.proteios.core.User;
    41 import org.proteios.gui.form.Form;
    42 import org.proteios.gui.form.FormFactory;
    43 
    44 import java.io.InputStream;
    45 import java.util.Calendar;
    46 
     43import org.proteios.gui.form.*;
    4744import se.lu.thep.waf.ActionException;
    4845import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    7269    Integer parameterTemplateFileId = getInteger(VOMSSAPARAMETERTEMPLATEFILEID);
    7370    String searchSpectrumType = getString(SaveOMSSAParameterSetStorage.VOMSSA_SEARCH_SPECTRUM_TYPE);
    74     String forwardTo = getValidString(FormFactory.VFWDACTION);
     71    String forwardTo = getValidString(ForwardField.VPARAM);
    7572    log.debug("name = \"" + name + "\"");
    7673    log.debug("description = \"" + description + "\"");

  • trunk/client/servlet/src/org/proteios/action/omssa/NewOMSSAParameterSetStorage.java

    r2917 r3825  
    3636import org.proteios.gui.Title;
    3737import org.proteios.gui.Toolbar;
    38 import org.proteios.gui.form.Form;
    39 import org.proteios.gui.form.FormFactory;
     38import org.proteios.gui.form.*;
    4039import org.proteios.gui.layout.RowLayout;
    4140import se.lu.thep.waf.ActionException;
    … …  
    6059     * previous field entries are read from session attributes.
    6160     */
    62     String forwardTo = getValidString(FormFactory.VFWDACTION);
     61    String forwardTo = getValidString(ForwardField.VPARAM);
    6362    // Get and reset OMSSAParameterSetStorage name session attribute
    6463    String name = getSessionAttribute(FormFactory.VNAME);
    … …  
    120119    String saveLabel = "Save";
    121120    ActionLink saveAction = getActionFactory().getActionLink(AddOMSSAParameterSetStorage.class, saveLabel);
    122     saveAction.addParameter(FormFactory.VFWDACTION.getName(),
     121    saveAction.addParameter(ForwardField.VPARAM.getName(),
    123122      forwardTo);
    124123    tb.add(saveAction);
    … …  
    127126    ActionLink selectParameterFileAction = getActionFactory().getActionLink(SelectOMSSAParameterFileStep1a.class,
    128127      selectParameterFileLabel);
    129     selectParameterFileAction.addParameter(FormFactory.VFWDACTION.getName(),
     128    selectParameterFileAction.addParameter(ForwardField.VPARAM.getName(),
    130129      forwardTo);
    131130    tb.add(selectParameterFileAction);

  • trunk/client/servlet/src/org/proteios/action/omssa/SaveOMSSAParameterSetStorage.java

    r3455 r3825  
    2828package org.proteios.action.omssa;
    2929
     30import java.util.ArrayList;
     31import java.util.List;
     32import java.util.StringTokenizer;
     33import java.util.regex.Pattern;
    3034import org.proteios.ActionLink;
    3135import org.proteios.action.ProteiosAction;
    … …  
    3842import org.proteios.core.ItemQuery;
    3943import org.proteios.core.ItemResultIterator;
     44import org.proteios.core.OMSSAParameterSetStorage;
    4045import org.proteios.core.Project;
    4146import org.proteios.core.User;
    42 import org.proteios.core.OMSSAParameterSetStorage;
    4347import org.proteios.core.query.Expressions;
    4448import org.proteios.core.query.Hql;
    4549import org.proteios.core.query.Restrictions;
    46 import org.proteios.io.FileExtraUtil;
    4750import org.proteios.gui.Title;
    4851import org.proteios.gui.Toolbar;
    49 import org.proteios.gui.form.Form;
    50 import org.proteios.gui.form.FormFactory;
     52import org.proteios.gui.form.*;
    5153import org.proteios.gui.layout.RowLayout;
     54import org.proteios.io.FileExtraUtil;
    5255import org.proteios.io.OMSSAParameterSet;
    53 
    5456import se.lu.thep.waf.ActionException;
    5557import se.lu.thep.waf.constraints.InvalidParameterValue;
    5658import se.lu.thep.waf.constraints.VInteger;
    5759import se.lu.thep.waf.constraints.VString;
    58 import java.util.ArrayList;
    59 import java.util.List;
    60 import java.util.regex.Pattern;
    61 import java.util.StringTokenizer;
    6260
    6361/**
    … …  
    199197    }
    200198    log.debug("saveAsOMSSAParameterSetFlag = " + saveAsOMSSAParameterSetFlag);
    201     String forwardId = getValidString(FormFactory.VFWDACTION);
     199    String forwardId = getValidString(ForwardField.VPARAM);
    202200    // Get the forward id
    203201    log.debug("forwardId = " + forwardId);
    … …  
    251249        saveAction.addParameter(SearchOMSSA.VSAVEASOMSSAPARAMETERSETFLAG,
    252250          true);
    253         saveAction.addParameter(FormFactory.VFWDACTION.getName(),
     251        saveAction.addParameter(ForwardField.VPARAM.getName(),
    254252          forwardId);
    255253        if (spectrumFileIds != null)
    … …  
    416414      setAttribute(SearchOMSSA.VSAVEASOMSSAPARAMETERSETFLAG,
    417415        true);
    418       setAttribute(FormFactory.VFWDACTION.getName(),
     416      setAttribute(ForwardField.VPARAM.getName(),
    419417        forwardId);
    420418      if (useWebInterfaceFlag != null)

  • trunk/client/servlet/src/org/proteios/action/omssa/SelectOMSSAParameterFileStep1b.java

    r2917 r3825  
    2828package org.proteios.action.omssa;
    2929
     30import java.util.List;
    3031import org.proteios.action.ProteiosAction;
    3132import org.proteios.action.omssa.NewOMSSAParameterSetStorage;
    32 import org.proteios.gui.form.FormFactory;
    33 
    34 import java.util.List;
    35 
     33import org.proteios.gui.form.*;
    3634import se.lu.thep.waf.ActionException;
    3735import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    6058    Integer parameterTemplateFileId = getSessionAttribute(AddOMSSAParameterSetStorage.VOMSSAPARAMETERTEMPLATEFILEID);
    6159    String forward2Id = getSessionAttribute(FormFactory.VFWD2ACTION);
    62     String forwardId = getValidString(FormFactory.VFWDACTION);
     60    String forwardId = getValidString(ForwardField.VPARAM);
    6361    log.debug("name = \"" + name + "\"");
    6462    log.debug("description = \"" + description + "\"");

  • trunk/client/servlet/src/org/proteios/action/omssa/ViewActiveOMSSAParameterFile.java

    r2917 r3825  
    3535import org.proteios.gui.Title;
    3636import org.proteios.gui.Toolbar;
    37 import org.proteios.gui.form.Form;
    38 import org.proteios.gui.form.FormFactory;
     37import org.proteios.gui.form.*;
    3938import org.proteios.gui.layout.RowLayout;
    4039import se.lu.thep.waf.ActionException;
    … …  
    7473      fileId = omssaParameterSetStorage.getParameterFile().getId();
    7574    }
    76     String forwardTo = getValidString(FormFactory.VFWDACTION);
     75    String forwardTo = getValidString(ForwardField.VPARAM);
    7776    log.debug("omssaParameterSetStorageId = " + omssaParameterSetStorageId);
    7877    log.debug("omssaParameterSetStorage.getName() = \"" + omssaParameterSetStorage.getName() + "\"");
    … …  
    9089    viewFileAction.addParameter(FormFactory.VID.getName(),
    9190      omssaParameterSetStorageId);
    92     viewFileAction.addParameter(FormFactory.VFWDACTION.getName(),
     91    viewFileAction.addParameter(ForwardField.VPARAM.getName(),
    9392      forwardTo);
    9493    if (fileId == null || fileId < 1)

  • trunk/client/servlet/src/org/proteios/action/omssa/ViewActiveOMSSAParameterSetStorage.java

    r3291 r3825  
    2929package org.proteios.action.omssa;
    3030
     31import java.io.InputStream;
     32import java.util.ArrayList;
     33import java.util.List;
    3134import org.proteios.ActionLink;
    3235import org.proteios.action.ProteiosAction;
    … …  
    3639import org.proteios.gui.Title;
    3740import org.proteios.gui.Toolbar;
    38 import org.proteios.gui.form.Form;
    39 import org.proteios.gui.form.FormFactory;
    40 import org.proteios.gui.form.Option;
     41import org.proteios.gui.form.*;
    4142import org.proteios.gui.layout.RowLayout;
     43import org.proteios.io.OMSSAParameterFileUtil;
    4244import org.proteios.io.OMSSAParameterSet;
    4345import org.proteios.io.OMSSAParameterSetOptionsUtil;
    44 import org.proteios.io.OMSSAParameterFileUtil;
    4546import se.lu.thep.waf.ActionException;
    4647import se.lu.thep.waf.constraints.InvalidParameterValue;
    4748import se.lu.thep.waf.constraints.VInteger;
    48 import java.io.InputStream;
    49 import java.util.ArrayList;
    50 import java.util.List;
    5149
    5250/**
    … …  
    156154      save.addParameter(VOMSSAPARAMETERSETSTORAGEID, omssapssId);
    157155      save.addParameter(SearchOMSSA.VSAVEOMSSAPARAMETERSETFLAG, true);
    158       save.addParameter(FormFactory.VFWDACTION, ViewActiveOMSSAParameterSetStorage.class.getName());
     156      save.addParameter(ForwardField.VPARAM, ViewActiveOMSSAParameterSetStorage.class.getName());
    159157      toolbar.add(save);
    160158      // "Save As" OMSSA parameter set button
    … …  
    163161      saveAs.addParameter(SearchOMSSA.VSAVEOMSSAPARAMETERSETFLAG, false);
    164162      saveAs.addParameter(SearchOMSSA.VSAVEASOMSSAPARAMETERSETFLAG, true);
    165       saveAs.addParameter(FormFactory.VFWDACTION, ListOMSSAParameterSetStorage.class.getName());
     163      saveAs.addParameter(ForwardField.VPARAM, ListOMSSAParameterSetStorage.class.getName());
    166164      toolbar.add(saveAs);
    167165    }
    … …  
    172170      searchOMSSA.addParameter(VOMSSAPARAMETERSETSTORAGEID, omssapssId);
    173171      searchOMSSA.addParameter(SearchOMSSA.VSAVEOMSSAPARAMETERSETFLAG, true);
    174       searchOMSSA.addParameter(FormFactory.VFWDACTION, SearchOMSSA.class.getName());
     172      searchOMSSA.addParameter(ForwardField.VPARAM, SearchOMSSA.class.getName());
    175173      for (Integer spectrumFileId : spectrumFileIds)
    176174      {
    … …  
    184182      saveAsAndSearchOMSSA.addParameter(SearchOMSSA.VSAVEOMSSAPARAMETERSETFLAG, false);
    185183      saveAsAndSearchOMSSA.addParameter(SearchOMSSA.VSAVEASOMSSAPARAMETERSETFLAG, true);
    186       saveAsAndSearchOMSSA.addParameter(FormFactory.VFWDACTION, SearchOMSSA.class.getName());
     184      saveAsAndSearchOMSSA.addParameter(ForwardField.VPARAM, SearchOMSSA.class.getName());
    187185      for (Integer spectrumFileId : spectrumFileIds)
    188186      {

  • trunk/client/servlet/src/org/proteios/action/omssa/ViewOMSSAParameterFile.java

    r2917 r3825  
    3434import org.proteios.core.ItemFactory;
    3535import org.proteios.core.OMSSAParameterSetStorage;
    36 import org.proteios.gui.form.FormFactory;
     36import org.proteios.gui.form.*;
    3737import se.lu.thep.waf.ActionException;
    3838import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    6262      omssaParameterSetStorageId);
    6363    File parameterFile = omssaParameterSetStorage.getParameterFile();
    64     String forwardTo = getValidString(FormFactory.VFWDACTION);
     64    String forwardTo = getValidString(ForwardField.VPARAM);
    6565    log.debug("omssaParameterSetStorageId = " + omssaParameterSetStorageId);
    6666    log.debug("omssaParameterSetStorage.getName() = \"" + omssaParameterSetStorage.getName() + "\"");

  • trunk/client/servlet/src/org/proteios/action/project/ListExtractsInProject.java

    r2450 r3825  
    3838import org.proteios.core.ItemQuery;
    3939import org.proteios.gui.Toolbar;
    40 import org.proteios.gui.form.FormFactory;
     40import org.proteios.gui.form.*;
    4141import org.proteios.gui.layout.RowLayout;
    4242import org.proteios.gui.table.Table;
    … …  
    8080      ClearActiveSample.class, "New");
    8181    String newExtractActionId = getActionFactory().getId(NewExtract.class);
    82     newExtract.addParameter(FormFactory.VFWDACTION, newExtractActionId);
     82    newExtract.addParameter(ForwardField.VPARAM, newExtractActionId);
    8383    toolbar.add(newExtract);
    8484    //

  • trunk/client/servlet/src/org/proteios/action/project/ListProtocolsInProject.java

    r2457 r3825  
    4141import org.proteios.gui.Title;
    4242import org.proteios.gui.Toolbar;
    43 import org.proteios.gui.form.FormFactory;
     43import org.proteios.gui.form.*;
    4444import org.proteios.gui.layout.RowLayout;
    4545import org.proteios.gui.table.Table;
    … …  
    7777    ActionLink viewAction = getActionFactory().getActionLink(ViewProtocol.class,
    7878      "View");
    79     viewAction.addParameter(FormFactory.VFWDACTION.getName(),
     79    viewAction.addParameter(ForwardField.VPARAM.getName(),
    8080      getActionFactory().getId(ListProtocolsInProject.class));
    8181    tableFactory.setColumnAction("Name", viewAction);
    … …  
    8383    ActionLink viewFileAction = getActionFactory().getActionLink(
    8484      ViewProtocolFile.class, "View");
    85     viewFileAction.addParameter(FormFactory.VFWDACTION.getName(),
     85    viewFileAction.addParameter(ForwardField.VPARAM.getName(),
    8686      getActionFactory().getId(ListProtocolsInProject.class));
    8787    tableFactory.setColumnAction("ProtocolFile", viewFileAction);
    … …  
    9090    Toolbar tb = tbl.getToolbar();
    9191    ActionLink newAction = getActionFactory().getActionLink(NewProtocol.class, "NewProtocol");
    92     newAction.addParameter(FormFactory.VFWDACTION.getName(),
     92    newAction.addParameter(ForwardField.VPARAM.getName(),
    9393      getActionFactory().getId(ListProtocolsInProject.class));
    9494    tb.add(newAction);

  • trunk/client/servlet/src/org/proteios/action/protocol/AddProtocol.java

    r2459 r3825  
    3636import org.proteios.core.Protocol;
    3737import org.proteios.core.ProtocolType;
    38 import org.proteios.gui.form.Form;
    39 import org.proteios.gui.form.FormFactory;
     38import org.proteios.gui.form.*;
    4039import se.lu.thep.waf.ActionException;
    4140import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    6160    String type = getString(FormFactory.VTYPE);
    6261    Integer fileId = getInteger(FormFactory.VPROTOCOLFILEID);
    63     String forwardTo = getValidString(FormFactory.VFWDACTION);
     62    String forwardTo = getValidString(ForwardField.VPARAM);
    6463    log.debug("name = \"" + name + "\"");
    6564    log.debug("description = \"" + description + "\"");

  • trunk/client/servlet/src/org/proteios/action/protocol/ListProtocols.java

    r3604 r3825  
    2828package org.proteios.action.protocol;
    2929
     30import java.util.List;
    3031import org.proteios.AbstractLink;
    3132import org.proteios.ActionLink;
    3233import org.proteios.ProtocolContext;
    3334import org.proteios.action.ProteiosAction;
    34 import org.proteios.core.ItemQuery;
    35 import org.proteios.core.Protocol;
    36 import org.proteios.core.Permission;
    3735import org.proteios.core.DbControl;
    3836import org.proteios.core.Include;
     37import org.proteios.core.ItemQuery;
     38import org.proteios.core.Permission;
     39import org.proteios.core.Protocol;
    3940import org.proteios.gui.Title;
    4041import org.proteios.gui.Toolbar;
    41 import org.proteios.gui.form.FormFactory;
     42import org.proteios.gui.form.*;
    4243import org.proteios.gui.layout.RowLayout;
    4344import org.proteios.gui.table.Table;
    … …  
    4546import se.lu.thep.waf.ActionException;
    4647import se.lu.thep.waf.constraints.InvalidParameterValue;
    47 import java.util.List;
     48
    4849/**
    4950 * Lists all protocols of the currently logged in user.
    … …  
    7778
    7879    viewAction = getActionFactory().getActionLink(ViewProtocol.class, "View");
    79     viewAction.addParameter(FormFactory.VFWDACTION.getName(),
     80    viewAction.addParameter(ForwardField.VPARAM.getName(),
    8081      getActionFactory().getId(ListProtocols.class));
    8182
    8283    viewFileAction = getActionFactory().getActionLink(ViewProtocolFile.class, "View");
    83     viewFileAction.addParameter(FormFactory.VFWDACTION.getName(),
     84    viewFileAction.addParameter(ForwardField.VPARAM.getName(),
    8485      getActionFactory().getId(ListProtocols.class));
    8586
    8687    newAction = getActionFactory().getActionLink(NewProtocol.class, "NewProtocol");
    87     newAction.addParameter(FormFactory.VFWDACTION.getName(),
     88    newAction.addParameter(ForwardField.VPARAM.getName(),
    8889      getActionFactory().getId(ListProtocols.class));
    8990

  • trunk/client/servlet/src/org/proteios/action/protocol/NewProtocol.java

    r2473 r3825  
    3838import org.proteios.gui.Title;
    3939import org.proteios.gui.Toolbar;
    40 import org.proteios.gui.form.Form;
    41 import org.proteios.gui.form.FormFactory;
     40import org.proteios.gui.form.*;
    4241import org.proteios.gui.layout.RowLayout;
    4342import se.lu.thep.waf.ActionException;
    … …  
    6261     * are read from session attributes.
    6362     */
    64     String forwardTo = getValidString(FormFactory.VFWDACTION);
     63    String forwardTo = getValidString(ForwardField.VPARAM);
    6564    // Get and reset protocol name session attribute
    6665    String name = getSessionAttribute(FormFactory.VNAME);
    … …  
    135134    String saveLabel = "Save";
    136135    ActionLink saveAction = getActionFactory().getActionLink(AddProtocol.class, saveLabel);
    137     saveAction.addParameter(FormFactory.VFWDACTION.getName(),
     136    saveAction.addParameter(ForwardField.VPARAM.getName(),
    138137      forwardTo);
    139138    tb.add(saveAction);
    … …  
    142141    ActionLink changeFileAction = getActionFactory().getActionLink(SelectProtocolFileStep1a.class,
    143142      changeFileLabel);
    144     changeFileAction.addParameter(FormFactory.VFWDACTION.getName(),
     143    changeFileAction.addParameter(ForwardField.VPARAM.getName(),
    145144      forwardTo);
    146145    tb.add(changeFileAction);
    … …  
    149148    ActionLink resetFileAction = getActionFactory().getActionLink(ResetProtocolFile.class,
    150149      resetFileLabel);
    151     resetFileAction.addParameter(FormFactory.VFWDACTION.getName(),
     150    resetFileAction.addParameter(ForwardField.VPARAM.getName(),
    152151      forwardTo);
    153152    tb.add(resetFileAction);

  • trunk/client/servlet/src/org/proteios/action/protocol/ResetProtocolFile.java

    r2457 r3825  
    3535import org.proteios.core.Project;
    3636import org.proteios.core.User;
    37 import org.proteios.gui.form.Form;
    38 import org.proteios.gui.form.FormFactory;
     37import org.proteios.gui.form.*;
    3938import se.lu.thep.waf.ActionException;
    4039import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    6463    Integer fileId = getInteger(FormFactory.VPROTOCOLFILEID);
    6564    // Get original forward action
    66     String forward2Id = getValidString(FormFactory.VFWDACTION);
     65    String forward2Id = getValidString(ForwardField.VPARAM);
    6766    String forwardId = getActionFactory().getId(SelectProtocolFileStep1b.class);
    6867    log.debug("name = \"" + name + "\"");
    … …  
    102101    setSessionAttribute(ViewActiveDirectory.VSELECT, true);
    103102    setSessionAttribute(FormFactory.VFWD2ACTION, forward2Id);
    104     setSessionAttribute(FormFactory.VFWDACTION, forwardId);
     103    setSessionAttribute(ForwardField.VPARAM, forwardId);
    105104    // Set flag to reset protocol file
    106105    setSessionAttribute(FormFactory.VPROTOCOLFILERESET, true);

  • trunk/client/servlet/src/org/proteios/action/protocol/SelectProtocolFileStep1a.java

    r2457 r3825  
    3434import org.proteios.core.Project;
    3535import org.proteios.core.User;
    36 import org.proteios.gui.form.Form;
    37 import org.proteios.gui.form.FormFactory;
     36import org.proteios.gui.form.*;
    3837import se.lu.thep.waf.ActionException;
    3938import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    6261    Integer fileId = getInteger(FormFactory.VPROTOCOLFILEID);
    6362    // Get original forward action
    64     String forward2Id = getValidString(FormFactory.VFWDACTION);
     63    String forward2Id = getValidString(ForwardField.VPARAM);
    6564    String forwardId = getActionFactory().getId(SelectProtocolFileStep1b.class);
    6665    log.debug("name = \"" + name + "\"");
    … …  
    10099    setSessionAttribute(ViewActiveDirectory.VSELECT, true);
    101100    setSessionAttribute(FormFactory.VFWD2ACTION, forward2Id);
    102     setSessionAttribute(FormFactory.VFWDACTION, forwardId);
     101    setSessionAttribute(ForwardField.VPARAM, forwardId);
    103102    setForwardTo(ViewActiveDirectory.class);
    104103  }

  • trunk/client/servlet/src/org/proteios/action/protocol/SelectProtocolFileStep1b.java

    r2457 r3825  
    2828package org.proteios.action.protocol;
    2929
     30import java.util.List;
    3031import org.proteios.action.ProteiosAction;
    3132import org.proteios.action.file.ViewActiveFile;
    3233import org.proteios.action.protocol.NewProtocol;
    33 import org.proteios.gui.form.FormFactory;
    34 
    35 import java.util.List;
    36 
     34import org.proteios.gui.form.*;
    3735import se.lu.thep.waf.ActionException;
    3836import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    6159    String type = getSessionAttribute(FormFactory.VTYPE);
    6260    String forward2Id = getSessionAttribute(FormFactory.VFWD2ACTION);
    63     String forwardId = getValidString(FormFactory.VFWDACTION);
     61    String forwardId = getValidString(ForwardField.VPARAM);
    6462    log.debug("name = \"" + name + "\"");
    6563    log.debug("description = \"" + description + "\"");

  • trunk/client/servlet/src/org/proteios/action/protocol/ViewActiveProtocol.java

    r3597 r3825  
    2828package org.proteios.action.protocol;
    2929
     30import java.util.ArrayList;
     31import java.util.List;
    3032import org.proteios.ActionLink;
    3133import org.proteios.ProtocolContext;
    … …  
    3335import org.proteios.core.DbControl;
    3436import org.proteios.core.ItemFactory;
     37import org.proteios.core.Permission;
    3538import org.proteios.core.Protocol;
    36 import org.proteios.core.Permission;
    3739import org.proteios.gui.Title;
    3840import org.proteios.gui.Toolbar;
    39 import org.proteios.gui.form.Form;
    40 import org.proteios.gui.form.FormFactory;
     41import org.proteios.gui.form.*;
    4142import org.proteios.gui.layout.RowLayout;
    4243import se.lu.thep.waf.ActionException;
    4344import se.lu.thep.waf.constraints.InvalidParameterValue;
    4445import se.lu.thep.waf.constraints.VInteger;
    45 
    46 import java.util.List;
    47 import java.util.ArrayList;
    4846
    4947/**
    … …  
    8785      fileId = protocol.getFile().getId();
    8886    }
    89     forwardTo = getValidString(FormFactory.VFWDACTION);
     87    forwardTo = getValidString(ForwardField.VPARAM);
    9088
    9189    tb = new Toolbar();
    … …  
    9492    viewFileAction.addParameter(FormFactory.VID.getName(),
    9593      protocolId);
    96     viewFileAction.addParameter(FormFactory.VFWDACTION.getName(),
     94    viewFileAction.addParameter(ForwardField.VPARAM.getName(),
    9795      forwardTo);
    9896    if (fileId == null || fileId < 1)

  • trunk/client/servlet/src/org/proteios/action/protocol/ViewProtocolFile.java

    r2459 r3825  
    3434import org.proteios.core.ItemFactory;
    3535import org.proteios.core.Protocol;
    36 import org.proteios.gui.form.FormFactory;
     36import org.proteios.gui.form.*;
    3737import se.lu.thep.waf.ActionException;
    3838import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    6262      protocolId);
    6363    File protocolFile = protocol.getFile();
    64     String forwardTo = getValidString(FormFactory.VFWDACTION);
     64    String forwardTo = getValidString(ForwardField.VPARAM);
    6565    log.debug("protocolId = " + protocolId);
    6666    log.debug("protocol.getName() = \"" + protocol.getName() + "\"");

  • trunk/client/servlet/src/org/proteios/action/read/ScrollTo.java

    r2444 r3825  
    3030import org.proteios.action.ProteiosAction;
    3131import org.proteios.gui.Scroller;
    32 import org.proteios.gui.form.FormFactory;
     32import org.proteios.gui.form.*;
    3333import org.proteios.gui.table.TableFactory;
    3434import se.lu.thep.waf.ActionException;
    … …  
    5555    Integer from = getValidInteger(VFROM);
    5656    Integer max = getValidInteger(VMAXRESULT);
    57     String forwardAction = getValidString(FormFactory.VFWDACTION);
     57    String forwardAction = getValidString(ForwardField.VPARAM);
    5858    log.debug("forwardAction  = \"" + forwardAction + "\"");
    5959    // Configure the table factory for the subsequent action

  • trunk/client/servlet/src/org/proteios/action/sample/AddSampleFile.java

    r2153 r3825  
    3333import org.proteios.core.DbControl;
    3434import org.proteios.core.Project;
    35 import org.proteios.gui.form.FormFactory;
    36 
     35import org.proteios.gui.form.*;
    3736import se.lu.thep.waf.ActionException;
    3837import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    5049    DbControl dc = newDbControl();
    5150    Project project = getActiveProject(dc);
    52     setSessionAttribute(FormFactory.VFWDACTION, getActionFactory().getId(
     51    setSessionAttribute(ForwardField.VPARAM, getActionFactory().getId(
    5352      CreateSampleFile.class));
    5453    setSessionAttribute(ViewActiveDirectory.VDIRID, project

  • trunk/client/servlet/src/org/proteios/action/sample/ClearActiveSample.java

    r1948 r3825  
    2929
    3030import org.proteios.action.ProteiosAction;
    31 import org.proteios.gui.form.FormFactory;
     31import org.proteios.gui.form.*;
    3232import se.lu.thep.waf.ActionException;
    3333import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    4545    // make sure we know where to go after we've cleared the session
    4646    // attribute
    47     verifyParameters(FormFactory.VFWDACTION);
     47    verifyParameters(ForwardField.VPARAM);
    4848    getRequest().getSession().removeAttribute(
    4949      ViewActiveSample.VSAMPLEID.getName());
    50     setForwardTo(getString(FormFactory.VFWDACTION));
     50    setForwardTo(getString(ForwardField.VPARAM));
    5151  }
    5252}

  • trunk/client/servlet/src/org/proteios/action/write/AddAnnotation.java

    r2487 r3825  
    3838import org.proteios.core.ItemFactory;
    3939import org.proteios.core.Type;
    40 import org.proteios.gui.form.Form;
    41 import org.proteios.gui.form.FormFactory;
     40import org.proteios.gui.form.*;
    4241import se.lu.thep.waf.ActionException;
    4342import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    6160    Integer id = getValidInteger(FormFactory.VID);
    6261    Integer annotationTypeId = getValidInteger(FormFactory.VANNOTYPEID);
    63     String forwardActionId = getValidString(FormFactory.VFWDACTION);
     62    String forwardActionId = getValidString(ForwardField.VPARAM);
    6463    String itemType = getValidString(FormFactory.VTYPE);
    6564    log.debug("itemType: " + itemType);

  • trunk/client/servlet/src/org/proteios/action/write/ConfirmAction.java

    r2254 r3825  
    3232import org.proteios.gui.TitledWindow;
    3333import org.proteios.gui.Toolbar;
    34 import org.proteios.gui.form.FormFactory;
     34import org.proteios.gui.form.*;
    3535import org.proteios.gui.layout.RowLayout;
    3636import se.lu.thep.waf.ActionException;
    … …  
    5252    String confirmMessage = getRequest().getAttribute(FormFactory.VCONFIRMMESSAGE.getName()).toString();
    5353    String cnlActionId = getRequest().getAttribute(FormFactory.VCANCELACTION.getName()).toString();
    54     String fwdActionId = getRequest().getAttribute(FormFactory.VFWDACTION.getName()).toString();
     54    String fwdActionId = getRequest().getAttribute(ForwardField.VPARAM.getName()).toString();
    5555    log.debug(this.getClass().getSimpleName() + "::runMe(): confirmMessage = \"" + confirmMessage + "\"");
    5656    log.debug(this.getClass().getSimpleName() + "::runMe(): cnlActionId = \"" + cnlActionId + "\"");

  • trunk/client/servlet/src/org/proteios/action/write/DeleteActiveItem.java

    r2890 r3825  
    2828package org.proteios.action.write;
    2929
     30import java.util.List;
    3031import org.proteios.action.ProteiosAction;
    3132import org.proteios.core.BasicItem;
    … …  
    3334import org.proteios.core.ItemFactory;
    3435import org.proteios.core.Removable;
    35 import org.proteios.gui.form.FormFactory;
     36import org.proteios.gui.form.*;
    3637import se.lu.thep.waf.ActionException;
    3738import se.lu.thep.waf.constraints.InvalidParameterValue;
    38 import java.util.List;
    3939
    4040/**
    … …  
    4343 * forms showing information for the active item,
    4444 * it expects an action id for a forward action to be
    45  * stored in valid parameter VString FormFactory.VFWDACTION,
     45 * stored in valid parameter VString ForwardField.VPARAM,
    4646 * as it does not seem wise to return to a form
    4747 * for a deleted item, even if it still remains
    … …  
    6666        "Select at least one item in the list");
    6767    String className = getValidString(FormFactory.VCLASSNAME);
    68     String fwdActionId = getValidString(FormFactory.VFWDACTION);
     68    String fwdActionId = getValidString(ForwardField.VPARAM);
    6969    /***********************************************************************
    7070     * Tag items for removal

  • trunk/client/servlet/src/org/proteios/action/xTandemInput/AddXTandemParameterSetStorage.java

    r2911 r3825  
    2828package org.proteios.action.xTandemInput;
    2929
     30import java.io.InputStream;
     31import java.util.Calendar;
    3032import org.proteios.action.ProteiosAction;
    3133import org.proteios.core.BaseException;
    … …  
    3739import org.proteios.core.ItemNotFoundException;
    3840import org.proteios.core.Project;
     41import org.proteios.core.User;
    3942import org.proteios.core.XTandemParameterSetStorage;
    40 import org.proteios.core.User;
    41 import org.proteios.gui.form.Form;
    42 import org.proteios.gui.form.FormFactory;
    43 
    44 import java.io.InputStream;
    45 import java.util.Calendar;
    46 
     43import org.proteios.gui.form.*;
    4744import se.lu.thep.waf.ActionException;
    4845import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    7168    String description = getString(FormFactory.VDESCR);
    7269    Integer parameterTemplateFileId = getInteger(VXTANDEMPARAMETERTEMPLATEFILEID);
    73     String forwardTo = getValidString(FormFactory.VFWDACTION);
     70    String forwardTo = getValidString(ForwardField.VPARAM);
    7471    log.debug("name = \"" + name + "\"");
    7572    log.debug("description = \"" + description + "\"");

  • trunk/client/servlet/src/org/proteios/action/xTandemInput/NewXTandemParameterSetStorage.java

    r2661 r3825  
    3636import org.proteios.gui.Title;
    3737import org.proteios.gui.Toolbar;
    38 import org.proteios.gui.form.Form;
    39 import org.proteios.gui.form.FormFactory;
     38import org.proteios.gui.form.*;
    4039import org.proteios.gui.layout.RowLayout;
    4140import se.lu.thep.waf.ActionException;
    … …  
    6059     * previous field entries are read from session attributes.
    6160     */
    62     String forwardTo = getValidString(FormFactory.VFWDACTION);
     61    String forwardTo = getValidString(ForwardField.VPARAM);
    6362    // Get and reset XTandemParameterSetStorage name session attribute
    6463    String name = getSessionAttribute(FormFactory.VNAME);
    … …  
    120119    String saveLabel = "Save";
    121120    ActionLink saveAction = getActionFactory().getActionLink(AddXTandemParameterSetStorage.class, saveLabel);
    122     saveAction.addParameter(FormFactory.VFWDACTION.getName(),
     121    saveAction.addParameter(ForwardField.VPARAM.getName(),
    123122      forwardTo);
    124123    tb.add(saveAction);
    … …  
    127126    ActionLink selectParameterFileAction = getActionFactory().getActionLink(SelectXTandemParameterFileStep1a.class,
    128127      selectParameterFileLabel);
    129     selectParameterFileAction.addParameter(FormFactory.VFWDACTION.getName(),
     128    selectParameterFileAction.addParameter(ForwardField.VPARAM.getName(),
    130129      forwardTo);
    131130    tb.add(selectParameterFileAction);

  • trunk/client/servlet/src/org/proteios/action/xTandemInput/SaveXTandemParameterSetStorage.java

    r3292 r3825  
    2828package org.proteios.action.xTandemInput;
    2929
     30import java.util.ArrayList;
     31import java.util.List;
     32import java.util.StringTokenizer;
     33import java.util.regex.Pattern;
    3034import org.proteios.ActionLink;
    3135import org.proteios.action.ProteiosAction;
    … …  
    4448import org.proteios.core.query.Hql;
    4549import org.proteios.core.query.Restrictions;
    46 import org.proteios.io.FileExtraUtil;
    4750import org.proteios.gui.Title;
    4851import org.proteios.gui.Toolbar;
    49 import org.proteios.gui.form.Form;
    50 import org.proteios.gui.form.FormFactory;
     52import org.proteios.gui.form.*;
    5153import org.proteios.gui.layout.RowLayout;
     54import org.proteios.io.FileExtraUtil;
    5255import org.proteios.io.XTandemParameterSet;
    53 
    5456import se.lu.thep.waf.ActionException;
    5557import se.lu.thep.waf.constraints.InvalidParameterValue;
    5658import se.lu.thep.waf.constraints.VInteger;
    5759import se.lu.thep.waf.constraints.VString;
    58 import java.util.ArrayList;
    59 import java.util.List;
    60 import java.util.regex.Pattern;
    61 import java.util.StringTokenizer;
    6260
    6361/**
    … …  
    253251    }
    254252    log.debug("saveAsXTandemParameterSetFlag = " + saveAsXTandemParameterSetFlag);
    255     String forwardId = getValidString(FormFactory.VFWDACTION);
     253    String forwardId = getValidString(ForwardField.VPARAM);
    256254    // Get the forward id
    257255    log.debug("forwardId = " + forwardId);
    … …  
    305303        saveAction.addParameter(SearchXTandem.VSAVEASXTANDEMPARAMETERSETFLAG,
    306304          true);
    307         saveAction.addParameter(FormFactory.VFWDACTION.getName(),
     305        saveAction.addParameter(ForwardField.VPARAM.getName(),
    308306          forwardId);
    309307        if (spectrumFileIds != null)
    … …  
    470468      setAttribute(SearchXTandem.VSAVEASXTANDEMPARAMETERSETFLAG,
    471469        true);
    472       setAttribute(FormFactory.VFWDACTION.getName(),
     470      setAttribute(ForwardField.VPARAM.getName(),
    473471        forwardId);
    474472      if (useWebInterfaceFlag != null)

  • trunk/client/servlet/src/org/proteios/action/xTandemInput/SelectXTandemParameterFileStep1b.java

    r2661 r3825  
    2828package org.proteios.action.xTandemInput;
    2929
     30import java.util.List;
    3031import org.proteios.action.ProteiosAction;
    3132import org.proteios.action.xTandemInput.NewXTandemParameterSetStorage;
    32 import org.proteios.gui.form.FormFactory;
    33 
    34 import java.util.List;
    35 
     33import org.proteios.gui.form.*;
    3634import se.lu.thep.waf.ActionException;
    3735import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    6058    Integer parameterTemplateFileId = getSessionAttribute(AddXTandemParameterSetStorage.VXTANDEMPARAMETERTEMPLATEFILEID);
    6159    String forward2Id = getSessionAttribute(FormFactory.VFWD2ACTION);
    62     String forwardId = getValidString(FormFactory.VFWDACTION);
     60    String forwardId = getValidString(ForwardField.VPARAM);
    6361    log.debug("name = \"" + name + "\"");
    6462    log.debug("description = \"" + description + "\"");

  • trunk/client/servlet/src/org/proteios/action/xTandemInput/ViewActiveXTandemParameterFile.java

    r2661 r3825  
    3535import org.proteios.gui.Title;
    3636import org.proteios.gui.Toolbar;
    37 import org.proteios.gui.form.Form;
    38 import org.proteios.gui.form.FormFactory;
     37import org.proteios.gui.form.*;
    3938import org.proteios.gui.layout.RowLayout;
    4039import se.lu.thep.waf.ActionException;
    … …  
    7473      fileId = xTandemParameterSetStorage.getParameterFile().getId();
    7574    }
    76     String forwardTo = getValidString(FormFactory.VFWDACTION);
     75    String forwardTo = getValidString(ForwardField.VPARAM);
    7776    log.debug("xTandemParameterSetStorageId = " + xTandemParameterSetStorageId);
    7877    log.debug("xTandemParameterSetStorage.getName() = \"" + xTandemParameterSetStorage.getName() + "\"");
    … …  
    9089    viewFileAction.addParameter(FormFactory.VID.getName(),
    9190      xTandemParameterSetStorageId);
    92     viewFileAction.addParameter(FormFactory.VFWDACTION.getName(),
     91    viewFileAction.addParameter(ForwardField.VPARAM.getName(),
    9392      forwardTo);
    9493    if (fileId == null || fileId < 1)

  • trunk/client/servlet/src/org/proteios/action/xTandemInput/ViewActiveXTandemParameterSetStorage.java

    r3463 r3825  
    2929package org.proteios.action.xTandemInput;
    3030
     31import java.io.InputStream;
     32import java.util.ArrayList;
     33import java.util.List;
    3134import org.proteios.ActionLink;
    3235import org.proteios.action.ProteiosAction;
    … …  
    3639import org.proteios.gui.Title;
    3740import org.proteios.gui.Toolbar;
    38 import org.proteios.gui.form.Form;
    39 import org.proteios.gui.form.FormFactory;
    40 import org.proteios.gui.form.Option;
     41import org.proteios.gui.form.*;
    4142import org.proteios.gui.layout.RowLayout;
     43import org.proteios.io.XTandemParameterFileUtil;
    4244import org.proteios.io.XTandemParameterSet;
    4345import org.proteios.io.XTandemParameterSetOptionsUtil;
    44 import org.proteios.io.XTandemParameterFileUtil;
    4546import se.lu.thep.waf.ActionException;
    4647import se.lu.thep.waf.constraints.InvalidParameterValue;
    4748import se.lu.thep.waf.constraints.VInteger;
    48 import java.io.InputStream;
    49 import java.util.ArrayList;
    50 import java.util.List;
    5149
    5250/**
    … …  
    154152      save.addParameter(VXTANDEMPARAMETERSETSTORAGEID, xtpssId);
    155153      save.addParameter(SearchXTandem.VSAVEXTANDEMPARAMETERSETFLAG, true);
    156       save.addParameter(FormFactory.VFWDACTION, ViewActiveXTandemParameterSetStorage.class.getName());
     154      save.addParameter(ForwardField.VPARAM, ViewActiveXTandemParameterSetStorage.class.getName());
    157155      toolbar.add(save);
    158156      // "Save As" X!Tandem parameter set button
    … …  
    161159      saveAs.addParameter(SearchXTandem.VSAVEXTANDEMPARAMETERSETFLAG, false);
    162160      saveAs.addParameter(SearchXTandem.VSAVEASXTANDEMPARAMETERSETFLAG, true);
    163       saveAs.addParameter(FormFactory.VFWDACTION, ListXTandemParameterSetStorage.class.getName());
     161      saveAs.addParameter(ForwardField.VPARAM, ListXTandemParameterSetStorage.class.getName());
    164162      toolbar.add(saveAs);
    165163    }
    … …  
    171169      searchXTandemViaWebInterface.addParameter(VXTANDEMPARAMETERSETSTORAGEID, xtpssId);
    172170      searchXTandemViaWebInterface.addParameter(SearchXTandem.VSAVEXTANDEMPARAMETERSETFLAG, true);
    173       searchXTandemViaWebInterface.addParameter(FormFactory.VFWDACTION, SearchXTandem.class.getName());
     171      searchXTandemViaWebInterface.addParameter(ForwardField.VPARAM, SearchXTandem.class.getName());
    174172      for (Integer spectrumFileId : spectrumFileIds)
    175173      {
    … …  
    184182      saveAsAndSearchXTandemViaWebInterface.addParameter(SearchXTandem.VSAVEXTANDEMPARAMETERSETFLAG, false);
    185183      saveAsAndSearchXTandemViaWebInterface.addParameter(SearchXTandem.VSAVEASXTANDEMPARAMETERSETFLAG, true);
    186       saveAsAndSearchXTandemViaWebInterface.addParameter(FormFactory.VFWDACTION, SearchXTandem.class.getName());
     184      saveAsAndSearchXTandemViaWebInterface.addParameter(ForwardField.VPARAM, SearchXTandem.class.getName());
    187185      saveAsAndSearchXTandemViaWebInterface.addParameter(SearchXTandem.VXTANDEMUSEWEBINTERFACEFLAG, true);
    188186      toolbar.add(saveAsAndSearchXTandemViaWebInterface);
    … …  
    193191      searchXTandem.addParameter(VXTANDEMPARAMETERSETSTORAGEID, xtpssId);
    194192      searchXTandem.addParameter(SearchXTandem.VSAVEXTANDEMPARAMETERSETFLAG, true);
    195       searchXTandem.addParameter(FormFactory.VFWDACTION, SearchXTandem.class.getName());
     193      searchXTandem.addParameter(ForwardField.VPARAM, SearchXTandem.class.getName());
    196194      for (Integer spectrumFileId : spectrumFileIds)
    197195      {

  • trunk/client/servlet/src/org/proteios/action/xTandemInput/ViewXTandemParameterFile.java

    r3723 r3825  
    2828package org.proteios.action.xTandemInput;
    2929
     30import java.util.ArrayList;
     31import java.util.List;
    3032import org.proteios.Context;
    3133import org.proteios.ContextEnabled;
    … …  
    3739import org.proteios.core.ItemFactory;
    3840import org.proteios.core.XTandemParameterSetStorage;
    39 import org.proteios.gui.form.FormFactory;
     41import org.proteios.gui.form.*;
    4042import se.lu.thep.waf.ActionException;
    4143import se.lu.thep.waf.constraints.InvalidParameterValue;
    42 
    43 import java.util.List;
    44 import java.util.ArrayList;
    4544
    4645/**
    … …  
    6968      xTandemParameterSetStorageId);
    7069    File parameterFile = xTandemParameterSetStorage.getParameterFile();
    71     String forwardTo = getValidString(FormFactory.VFWDACTION);
     70    String forwardTo = getValidString(ForwardField.VPARAM);
    7271    log.debug("xTandemParameterSetStorageId = " + xTandemParameterSetStorageId);
    7372    log.debug("xTandemParameterSetStorage.getName() = \"" + xTandemParameterSetStorage.getName() + "\"");

  • trunk/client/servlet/src/org/proteios/gui/form/FormFactory.java

    r3824 r3825  
    2828package org.proteios.gui.form;
    2929
     30import java.lang.reflect.InvocationTargetException;
     31import java.lang.reflect.Method;
     32import java.lang.reflect.Modifier;
     33import java.text.SimpleDateFormat;
     34import java.util.ArrayList;
     35import java.util.Date;
     36import java.util.HashMap;
     37import java.util.Hashtable;
     38import java.util.Iterator;
     39import java.util.List;
     40import java.util.Set;
     41import javax.servlet.http.HttpServletRequest;
    3042import org.proteios.ActionLink;
    3143import org.proteios.Localizer;
    3244import org.proteios.MascotPropertiesFile;
    33 import org.proteios.params.*;
    3445import org.proteios.action.ActionFactory;
    3546import org.proteios.action.ProteiosAction;
    … …  
    125136import org.proteios.core.XTandemParameterSetStorage;
    126137import org.proteios.core.data.MimeTypeData;
     138import org.proteios.core.plugin.Plugin.MainType;
    127139import org.proteios.core.plugin.Plugin;
    128 import org.proteios.core.plugin.Plugin.MainType;
    129140import org.proteios.core.query.Expression;
    130141import org.proteios.core.query.Expressions;
    … …  
    132143import org.proteios.core.query.Orders;
    133144import org.proteios.core.query.Restrictions;
     145import org.proteios.gui.form.*;
    134146import org.proteios.gui.table.Cell;
    135147import org.proteios.gui.table.Column;
    … …  
    151163import org.proteios.io.TablePreferencesConfiguration;
    152164import org.proteios.io.XTandemParameterSet;
    153 
     165import org.proteios.params.*;
    154166import se.lu.thep.waf.constraints.Format;
    155167import se.lu.thep.waf.constraints.VBoolean;
    … …  
    159171import se.lu.thep.waf.constraints.VParameter;
    160172import se.lu.thep.waf.constraints.VString;
    161 
    162 import java.lang.reflect.InvocationTargetException;
    163 import java.lang.reflect.Method;
    164 import java.lang.reflect.Modifier;
    165 import java.text.SimpleDateFormat;
    166 import java.util.ArrayList;
    167 import java.util.Date;
    168 import java.util.HashMap;
    169 import java.util.Hashtable;
    170 import java.util.Iterator;
    171 import java.util.List;
    172 import java.util.Set;
    173 
    174 import javax.servlet.http.HttpServletRequest;
    175173
    176174/**
    … …  
    222220  public static final VString VLOGIN = new VString("login", 1, 32, true);
    223221  public static final VString VTYPE = new VString("type", 1, 64, true);
    224   public static final VString VFILE = new VString("file", 1, 512); // Allowpublic static final VString VFILENAME = new VString("fileName", 1, 255);
     222  public static final VString VFILE = new VString("file", 1, 512); // Allow
    225223  public static final VString VNONREQUIRED_FILENAME = new VString("fileName",0, 255, false);
    226224  public static final VString VREQUIRED_FILENAME = new VString("fileName", 1,255, true);
    227   public static final VString VFWDACTION = ForwardField.VPARAM;
    228225  public static final VString VFWD2ACTION = new VString("forward2ActionId",1, 255, false);
    229226  public static final VString VCLASSNAME = new VString("className", 1, 255,true);
    … …  
    83878384    log
    83888385      .debug("FormFactory::getSetFilterForm(): forwardActionId = \"" + forwardActId + "\"");
    8389     TextField<String> fwdF = newHiddenStringField(VFWDACTION);
     8386    TextField<String> fwdF = newHiddenStringField(ForwardField.VPARAM);
    83908387    fwdF.setValue(forwardActId);
    83918388    properties.add(fwdF);

  • trunk/client/servlet/src/org/proteios/gui/table/TableFactory.java

    r3496 r3825  
    2828package org.proteios.gui.table;
    2929
     30import java.io.IOException;
     31import java.io.OutputStream;
     32import java.lang.reflect.Method;
     33import java.text.ParseException;
     34import java.text.SimpleDateFormat;
     35import java.util.ArrayList;
     36import java.util.Date;
     37import java.util.HashMap;
     38import java.util.List;
    3039import org.apache.log4j.Logger;
    3140import org.proteios.AbstractLink;
    … …  
    7988import org.proteios.gui.TitledWindow;
    8089import org.proteios.gui.Toolbar;
    81 import org.proteios.gui.form.Checkbox;
    82 import org.proteios.gui.form.Fieldset;
    83 import org.proteios.gui.form.Form;
    84 import org.proteios.gui.form.FormFactory;
    85 import org.proteios.gui.form.TextField;
     90import org.proteios.gui.form.*;
    8691import org.proteios.gui.table.cols.IdColumn;
    8792import org.proteios.props.AnnotationTypeNameReader;
    … …  
    100105import org.proteios.props.ProtocolTypeNameReader;
    101106import org.proteios.props.XTandemParameterFileNameReader;
    102 
    103107import se.lu.thep.waf.Event;
    104108import se.lu.thep.waf.constraints.Format;
    105109import se.lu.thep.waf.constraints.VInteger;
    106 
    107 import java.io.IOException;
    108 import java.io.OutputStream;
    109 import java.lang.reflect.Method;
    110 import java.text.ParseException;
    111 import java.text.SimpleDateFormat;
    112 import java.util.ArrayList;
    113 import java.util.Date;
    114 import java.util.HashMap;
    115 import java.util.List;
    116110
    117111/**
    … …  
    11341128    log.debug("getCurrentAction().getId() = " + getCurrentAction().getId());
    11351129    TextField<String> forwardActionField = new TextField<String>(
    1136       FormFactory.VFWDACTION);
     1130      ForwardField.VPARAM);
    11371131    forwardActionField.setHidden(true);
    11381132    forwardActionField.setValue(getCurrentAction().getId());
    … …  
    13051299    log.debug("getCurrentAction().getId() = " + getCurrentAction().getId());
    13061300    TextField<String> forwardActionField = new TextField<String>(
    1307       FormFactory.VFWDACTION);
     1301      ForwardField.VPARAM);
    13081302    forwardActionField.setValue(getCurrentAction().getId());
    13091303    table.add(forwardActionField);
    … …  
    16901684  {
    16911685    // Add forward action id to hash map.
    1692     paramHashMap.put(FormFactory.VFWDACTION.getName(), getCurrentAction()
     1686    paramHashMap.put(ForwardField.VPARAM.getName(), getCurrentAction()
    16931687      .getId());
    16941688    return paramHashMap;
Note: See TracChangeset for help on using the changeset viewer.