Changeset 3827


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

Refs #698. Replaced references to FormFactory.VNAME with NameField.VPARAM

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

Legend:

Unmodified
Added
Removed

  • trunk/client/servlet/src/org/proteios/action/directory/AddDirectory.java

    r2832 r3827  
    3232import org.proteios.core.Directory;
    3333import org.proteios.core.ItemFactory;
    34 import org.proteios.gui.form.Form;
    35 import org.proteios.gui.form.FormFactory;
     34import org.proteios.gui.form.*;
    3635import se.lu.thep.waf.ActionException;
    3736import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    6564    Directory newDir = factory.create(Directory.class);
    6665    newDir.setParent(parentDir);
    67     newDir.setName(getValidString(FormFactory.VNAME));
     66    newDir.setName(getValidString(NameField.VPARAM));
    6867    newDir.setDescription(getValidString(FormFactory.VDESCR));   
    6968    dc.saveItem(newDir);

  • trunk/client/servlet/src/org/proteios/action/directory/SaveDirectory.java

    r2823 r3827  
    3232import org.proteios.core.Directory;
    3333import org.proteios.core.ItemFactory;
    34 import org.proteios.gui.form.Form;
    35 import org.proteios.gui.form.FormFactory;
     34import org.proteios.gui.form.*;
    3635import se.lu.thep.waf.ActionException;
    3736import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    6160    ItemFactory factory = new ItemFactory(dc);
    6261    Directory dir = factory.getById(Directory.class, projectId);
    63     dir.setName(getValidString(FormFactory.VNAME));
     62    dir.setName(getValidString(NameField.VPARAM));
    6463    dir.setDescription(getValidString(FormFactory.VDESCR));
    6564    dc.commit();

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

    r3824 r3827  
    8888    }
    8989    //
    90     String name = getString(FormFactory.VNAME);
     90    String name = getString(NameField.VPARAM);
    9191    extract.setName(name);
    9292    //

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

    r3824 r3827  
    8585    }
    8686    //
    87     String name = getString(FormFactory.VNAME);
     87    String name = getString(NameField.VPARAM);
    8888    labeledExtract.setName(name);
    8989    //

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

    r3824 r3827  
    7676    creation.setComment("Extraction");
    7777    //
    78     String name = getString(FormFactory.VNAME);
     78    String name = getString(NameField.VPARAM);
    7979    extract.setName(name);
    8080    //

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

    r3824 r3827  
    8888    }
    8989    //
    90     String name = getString(FormFactory.VNAME);
     90    String name = getString(NameField.VPARAM);
    9191    labeledExtract.setName(name);
    9292    //

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

    r3824 r3827  
    6363    Extract oldExtract = getItemFactory(dc2).getById(Extract.class, extractId);
    6464    //
    65     String name = getString(FormFactory.VNAME);
     65    String name = getString(NameField.VPARAM);
    6666    extract.setName(name);
    6767    //

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

    r3824 r3827  
    6666      extractId);
    6767    //
    68     String name = getString(FormFactory.VNAME);
     68    String name = getString(NameField.VPARAM);
    6969    extract.setName(name);
    7070    //

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

    r2455 r3827  
    66import java.security.InvalidParameterException;
    77import java.util.List;
    8 
    98import org.proteios.action.ProteiosAction;
    109import org.proteios.action.directory.ViewActiveDirectory;
    … …  
    1413import org.proteios.core.Protocol;
    1514import org.proteios.core.ProtocolType;
    16 import org.proteios.gui.form.FormFactory;
    17 
     15import org.proteios.gui.form.*;
    1816import se.lu.thep.waf.ActionException;
    1917import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    5048        "Please select only one file to use as a protocol");
    5149    }
    52     String name = getValidString(FormFactory.VNAME);
     50    String name = getValidString(NameField.VPARAM);
    5351    String descr = getValidString(FormFactory.VDESCR);
    5452    String type = getValidString(FormFactory.VTYPE);

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

    r2511 r3827  
    3333import org.proteios.core.FileType;
    3434import org.proteios.core.ItemFactory;
    35 import org.proteios.gui.form.Form;
    36 import org.proteios.gui.form.FormFactory;
     35import org.proteios.gui.form.*;
    3736import se.lu.thep.waf.ActionException;
    3837import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    6261    //
    6362    //String name = getString(FormFactory.VREQUIRED_FILENAME);
    64     String name = getString(FormFactory.VNAME);
     63    String name = getString(NameField.VPARAM);
    6564    file.setName(name);
    6665    //

  • trunk/client/servlet/src/org/proteios/action/group/AddGroup.java

    r2693 r3827  
    2828package org.proteios.action.group;
    2929
    30 import static org.proteios.gui.form.FormFactory.VDESCR;
    31 import static org.proteios.gui.form.FormFactory.VNAME;
    32 
    3330import org.proteios.action.ProteiosAction;
    3431import org.proteios.action.user.ViewActiveUser;
    3532import org.proteios.core.DbControl;
    3633import org.proteios.core.Group;
     34import org.proteios.gui.form.*;
    3735import se.lu.thep.waf.ActionException;
    3836import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    5149
    5250    // Create
    53     name = getValidString(VNAME);
    54     description = getValidString(VDESCR);
     51    name = getValidString(NameField.VPARAM);
     52    description = getValidString(DescriptionField.VPARAM);
    5553    dc = newDbControl();
    5654    group = getItemFactory(dc).create(Group.class);

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

    r3825 r3827  
    6565    verifyParameters(form);
    6666    // Get values
    67     String name = getString(FormFactory.VNAME);
     67    String name = getString(NameField.VPARAM);
    6868    String description = getString(FormFactory.VDESCR);
    6969    Integer parameterTemplateFileId = getInteger(VMASCOTPARAMETERTEMPLATEFILEID);

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

    r3825 r3827  
    6161    String forwardTo = getValidString(ForwardField.VPARAM);
    6262    // Get and reset MascotParameterSetStorage name session attribute
    63     String name = getSessionAttribute(FormFactory.VNAME);
    64     setSessionAttribute(FormFactory.VNAME, null);
     63    String name = getSessionAttribute(NameField.VPARAM);
     64    setSessionAttribute(NameField.VPARAM, null);
    6565    // Get and reset MascotParameterSetStorage description session attribute
    6666    String description = getSessionAttribute(FormFactory.VDESCR);

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

    r3825 r3827  
    228228         */
    229229        log.debug("##### - \"Save As...\" Step 2");
    230         String name = getValidString(FormFactory.VNAME);
     230        String name = getValidString(NameField.VPARAM);
    231231        log.debug("name = \"" + name + "\"");
    232232        String description = getValidString(FormFactory.VDESCR);

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

    r3823 r3827  
    5656    Form form = getFormFactory().getNewMascotParameterSetStorageForm(null);
    5757    verifyParameters(form);
    58     String name = getString(FormFactory.VNAME);
     58    String name = getString(NameField.VPARAM);
    5959    String description = getString(FormFactory.VDESCR);
    6060    Integer parameterTemplateFileId = getInteger(AddMascotParameterSetStorage.VMASCOTPARAMETERTEMPLATEFILEID);
    … …  
    9292    // Set session attributes for current field values
    9393    setSessionAttribute(ViewActiveDirectory.VDIRID, dirId);
    94     setSessionAttribute(FormFactory.VNAME, name);
     94    setSessionAttribute(NameField.VPARAM, name);
    9595    setSessionAttribute(FormFactory.VDESCR, description);
    9696    setSessionAttribute(AddMascotParameterSetStorage.VMASCOTPARAMETERTEMPLATEFILEID, parameterTemplateFileId);

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

    r3825 r3827  
    5454     * Get session parameters
    5555     */
    56     String name = getSessionAttribute(FormFactory.VNAME);
     56    String name = getSessionAttribute(NameField.VPARAM);
    5757    String description = getSessionAttribute(FormFactory.VDESCR);
    5858    Integer parameterTemplateFileId = getSessionAttribute(AddMascotParameterSetStorage.VMASCOTPARAMETERTEMPLATEFILEID);

  • trunk/client/servlet/src/org/proteios/action/news/AddNews.java

    r2380 r3827  
    2828package org.proteios.action.news;
    2929
     30import java.util.Date;
    3031import org.proteios.action.ProteiosAction;
    3132import org.proteios.core.DbControl;
    3233import org.proteios.core.ItemFactory;
    3334import org.proteios.core.News;
    34 import org.proteios.gui.form.Form;
    35 import org.proteios.gui.form.FormFactory;
     35import org.proteios.gui.form.*;
    3636import se.lu.thep.waf.ActionException;
    3737import se.lu.thep.waf.constraints.InvalidParameterValue;
    38 import java.util.Date;
    3938
    4039/**
    … …  
    6160    ItemFactory factory = getItemFactory(dc);
    6261    News news = factory.create(News.class);
    63     String name = getString(FormFactory.VNAME);
     62    String name = getString(NameField.VPARAM);
    6463    String descr = getString(FormFactory.VDESCR);
    6564    Date startDate = getValidDate(FormFactory.VSTARTDATE);

  • trunk/client/servlet/src/org/proteios/action/news/SaveNews.java

    r2380 r3827  
    2828package org.proteios.action.news;
    2929
     30import java.util.Date;
    3031import org.proteios.action.ProteiosAction;
    3132import org.proteios.core.DbControl;
    3233import org.proteios.core.ItemFactory;
    3334import org.proteios.core.News;
    34 import org.proteios.gui.form.Form;
    35 import org.proteios.gui.form.FormFactory;
     35import org.proteios.gui.form.*;
    3636import se.lu.thep.waf.ActionException;
    3737import se.lu.thep.waf.constraints.InvalidParameterValue;
    38 import java.util.Date;
    3938
    4039/**
    … …  
    6564     * Set new values
    6665     */
    67     String name = getString(FormFactory.VNAME);
     66    String name = getString(NameField.VPARAM);
    6867    String descr = getString(FormFactory.VDESCR);
    6968    Date startDate = getValidDate(FormFactory.VSTARTDATE);

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

    r3825 r3827  
    6565    verifyParameters(form);
    6666    // Get values
    67     String name = getString(FormFactory.VNAME);
     67    String name = getString(NameField.VPARAM);
    6868    String description = getString(FormFactory.VDESCR);
    6969    Integer parameterTemplateFileId = getInteger(VOMSSAPARAMETERTEMPLATEFILEID);

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

    r3825 r3827  
    6161    String forwardTo = getValidString(ForwardField.VPARAM);
    6262    // Get and reset OMSSAParameterSetStorage name session attribute
    63     String name = getSessionAttribute(FormFactory.VNAME);
    64     setSessionAttribute(FormFactory.VNAME, null);
     63    String name = getSessionAttribute(NameField.VPARAM);
     64    setSessionAttribute(NameField.VPARAM, null);
    6565    // Get and reset OMSSAParameterSetStorage description session attribute
    6666    String description = getSessionAttribute(FormFactory.VDESCR);

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

    r3825 r3827  
    278278         */
    279279        log.debug("##### - \"Save As...\" Step 2");
    280         String name = getValidString(FormFactory.VNAME);
     280        String name = getValidString(NameField.VPARAM);
    281281        log.debug("name = \"" + name + "\"");
    282282        String description = getValidString(FormFactory.VDESCR);

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

    r3823 r3827  
    5656    Form form = getFormFactory().getNewOMSSAParameterSetStorageForm(null);
    5757    verifyParameters(form);
    58     String name = getString(FormFactory.VNAME);
     58    String name = getString(NameField.VPARAM);
    5959    String description = getString(FormFactory.VDESCR);
    6060    Integer parameterTemplateFileId = getInteger(AddOMSSAParameterSetStorage.VOMSSAPARAMETERTEMPLATEFILEID);
    … …  
    9292    // Set session attributes for current field values
    9393    setSessionAttribute(ViewActiveDirectory.VDIRID, dirId);
    94     setSessionAttribute(FormFactory.VNAME, name);
     94    setSessionAttribute(NameField.VPARAM, name);
    9595    setSessionAttribute(FormFactory.VDESCR, description);
    9696    setSessionAttribute(AddOMSSAParameterSetStorage.VOMSSAPARAMETERTEMPLATEFILEID, parameterTemplateFileId);

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

    r3825 r3827  
    5454     * Get session parameters
    5555     */
    56     String name = getSessionAttribute(FormFactory.VNAME);
     56    String name = getSessionAttribute(NameField.VPARAM);
    5757    String description = getSessionAttribute(FormFactory.VDESCR);
    5858    Integer parameterTemplateFileId = getSessionAttribute(AddOMSSAParameterSetStorage.VOMSSAPARAMETERTEMPLATEFILEID);

  • trunk/client/servlet/src/org/proteios/action/peakListSet/CreateFileExportJob.java

    r3821 r3827  
    6060    Integer plsId = getValidInteger(ItemIdField.VPARAM);
    6161    Integer pluginDefId = getValidInteger(PluginIdField.VPARAM);
    62     String filename = getValidString(FormFactory.VNAME);
     62    String filename = getValidString(NameField.VPARAM);
    6363    /***********************************************************************
    6464    * Create job

  • trunk/client/servlet/src/org/proteios/action/peakListSet/SavePeakListSet.java

    r2381 r3827  
    3131import org.proteios.core.DbControl;
    3232import org.proteios.core.PeakListSet;
    33 import org.proteios.gui.form.Form;
    34 import org.proteios.gui.form.FormFactory;
     33import org.proteios.gui.form.*;
    3534import se.lu.thep.waf.ActionException;
    3635import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    5857     */
    5958    Integer plsId = getValidInteger(FormFactory.VID);
    60     String name = getValidString(FormFactory.VNAME);
     59    String name = getValidString(NameField.VPARAM);
    6160    String descr = getValidString(FormFactory.VDESCR);
    6261    DbControl dc = newDbControl();

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

    r3411 r3827  
    2828package org.proteios.action.project;
    2929
     30import java.util.ArrayList;
     31import java.util.Collection;
     32import java.util.Set;
     33import java.util.TreeSet;
    3034import org.proteios.action.ProteiosAction;
    3135import org.proteios.core.BaseException;
    … …  
    3842import org.proteios.core.Project;
    3943import org.proteios.core.User;
    40 import org.proteios.gui.form.Form;
    41 import org.proteios.gui.form.FormFactory;
     44import org.proteios.gui.form.*;
    4245import se.lu.thep.waf.ActionException;
    4346import se.lu.thep.waf.constraints.InvalidParameterValue;
    44 import java.util.ArrayList;
    45 import java.util.Collection;
    46 import java.util.Set;
    47 import java.util.TreeSet;
    4847
    4948/**
    … …  
    7473    form = getFormFactory().getForm(Project.class,null);
    7574    verifyParameters(form);
    76   name = getString(FormFactory.VNAME);
     75  name = getString(NameField.VPARAM);
    7776  description = getString(FormFactory.VDESCR);
    7877  projectType = getInteger(FormFactory.VPROJECTTYPE);

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

    r3316 r3827  
    3131import org.proteios.core.DbControl;
    3232import org.proteios.core.Project;
    33 import org.proteios.gui.form.Form;
    34 import org.proteios.gui.form.FormFactory;
     33import org.proteios.gui.form.*;
    3534import se.lu.thep.waf.ActionException;
    3635import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    5049    // All is good get values
    5150    Integer projectId = getValidInteger(FormFactory.VID);
    52     String name = getValidString(FormFactory.VNAME);
     51    String name = getValidString(NameField.VPARAM);
    5352    String description = getValidString(FormFactory.VDESCR);
    5453  Integer projectType = getValidInteger(FormFactory.VPROJECTTYPE);

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

    r3825 r3827  
    5656    verifyParameters(form);
    5757    // Get values
    58     String name = getString(FormFactory.VNAME);
     58    String name = getString(NameField.VPARAM);
    5959    String description = getString(FormFactory.VDESCR);
    6060    String type = getString(FormFactory.VTYPE);

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

    r3825 r3827  
    6363    String forwardTo = getValidString(ForwardField.VPARAM);
    6464    // Get and reset protocol name session attribute
    65     String name = getSessionAttribute(FormFactory.VNAME);
    66     setSessionAttribute(FormFactory.VNAME, null);
     65    String name = getSessionAttribute(NameField.VPARAM);
     66    setSessionAttribute(NameField.VPARAM, null);
    6767    // Get and reset protocol description session attribute
    6868    String description = getSessionAttribute(FormFactory.VDESCR);

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

    r3825 r3827  
    5858    Form form = getFormFactory().getNewProtocolForm(null);
    5959    verifyParameters(form);
    60     String name = getString(FormFactory.VNAME);
     60    String name = getString(NameField.VPARAM);
    6161    String description = getString(FormFactory.VDESCR);
    6262    String type = getString(FormFactory.VTYPE);
    … …  
    9696    // Set session attributes for current field values
    9797    setSessionAttribute(ViewActiveDirectory.VDIRID, dirId);
    98     setSessionAttribute(FormFactory.VNAME, name);
     98    setSessionAttribute(NameField.VPARAM, name);
    9999    setSessionAttribute(FormFactory.VDESCR, description);
    100100    setSessionAttribute(FormFactory.VTYPE, type);

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

    r3825 r3827  
    5656    Form form = getFormFactory().getNewProtocolForm(null);
    5757    verifyParameters(form);
    58     String name = getString(FormFactory.VNAME);
     58    String name = getString(NameField.VPARAM);
    5959    String description = getString(FormFactory.VDESCR);
    6060    String type = getString(FormFactory.VTYPE);
    … …  
    9494    // Set session attributes for current field values
    9595    setSessionAttribute(ViewActiveDirectory.VDIRID, dirId);
    96     setSessionAttribute(FormFactory.VNAME, name);
     96    setSessionAttribute(NameField.VPARAM, name);
    9797    setSessionAttribute(FormFactory.VDESCR, description);
    9898    setSessionAttribute(FormFactory.VTYPE, type);

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

    r3825 r3827  
    5555     * Get session parameters
    5656     */
    57     String name = getSessionAttribute(FormFactory.VNAME);
     57    String name = getSessionAttribute(NameField.VPARAM);
    5858    String description = getSessionAttribute(FormFactory.VDESCR);
    5959    String type = getSessionAttribute(FormFactory.VTYPE);

  • trunk/client/servlet/src/org/proteios/action/user/SaveMyProfileProperties.java

    r3608 r3827  
    3131import org.proteios.core.DbControl;
    3232import org.proteios.core.User;
    33 import org.proteios.gui.form.Form;
    34 import org.proteios.gui.form.FormFactory;
     33import org.proteios.gui.form.*;
    3534import se.lu.thep.waf.ActionException;
    3635import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    5453    verifyParameters(form);
    5554
    56     name = getString(FormFactory.VNAME);
     55    name = getString(NameField.VPARAM);
    5756    email = getString(FormFactory.VEMAIL);
    5857    descr = getString(FormFactory.VDESCR);

  • trunk/client/servlet/src/org/proteios/action/user/SaveUserProperties.java

    r3608 r3827  
    3131import org.proteios.core.DbControl;
    3232import org.proteios.core.User;
    33 import org.proteios.gui.form.Form;
    34 import org.proteios.gui.form.FormFactory;
     33import org.proteios.gui.form.*;
    3534import se.lu.thep.waf.ActionException;
    3635import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    5655
    5756    userId = getValidInteger(FormFactory.VID);
    58     name = getString(FormFactory.VNAME);
     57    name = getString(NameField.VPARAM);
    5958    email = getString(FormFactory.VEMAIL);
    6059    descr = getString(FormFactory.VDESCR);

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

    r3825 r3827  
    6565    verifyParameters(form);
    6666    // Get values
    67     String name = getString(FormFactory.VNAME);
     67    String name = getString(NameField.VPARAM);
    6868    String description = getString(FormFactory.VDESCR);
    6969    Integer parameterTemplateFileId = getInteger(VXTANDEMPARAMETERTEMPLATEFILEID);

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

    r3825 r3827  
    6161    String forwardTo = getValidString(ForwardField.VPARAM);
    6262    // Get and reset XTandemParameterSetStorage name session attribute
    63     String name = getSessionAttribute(FormFactory.VNAME);
    64     setSessionAttribute(FormFactory.VNAME, null);
     63    String name = getSessionAttribute(NameField.VPARAM);
     64    setSessionAttribute(NameField.VPARAM, null);
    6565    // Get and reset XTandemParameterSetStorage description session attribute
    6666    String description = getSessionAttribute(FormFactory.VDESCR);

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

    r3825 r3827  
    332332         */
    333333        log.debug("##### - \"Save As...\" Step 2");
    334         String name = getValidString(FormFactory.VNAME);
     334        String name = getValidString(NameField.VPARAM);
    335335        log.debug("name = \"" + name + "\"");
    336336        String description = getValidString(FormFactory.VDESCR);

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

    r3823 r3827  
    5656    Form form = getFormFactory().getNewXTandemParameterSetStorageForm(null);
    5757    verifyParameters(form);
    58     String name = getString(FormFactory.VNAME);
     58    String name = getString(NameField.VPARAM);
    5959    String description = getString(FormFactory.VDESCR);
    6060    Integer parameterTemplateFileId = getInteger(AddXTandemParameterSetStorage.VXTANDEMPARAMETERTEMPLATEFILEID);
    … …  
    9292    // Set session attributes for current field values
    9393    setSessionAttribute(ViewActiveDirectory.VDIRID, dirId);
    94     setSessionAttribute(FormFactory.VNAME, name);
     94    setSessionAttribute(NameField.VPARAM, name);
    9595    setSessionAttribute(FormFactory.VDESCR, description);
    9696    setSessionAttribute(AddXTandemParameterSetStorage.VXTANDEMPARAMETERTEMPLATEFILEID, parameterTemplateFileId);

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

    r3825 r3827  
    5454     * Get session parameters
    5555     */
    56     String name = getSessionAttribute(FormFactory.VNAME);
     56    String name = getSessionAttribute(NameField.VPARAM);
    5757    String description = getSessionAttribute(FormFactory.VDESCR);
    5858    Integer parameterTemplateFileId = getSessionAttribute(AddXTandemParameterSetStorage.VXTANDEMPARAMETERTEMPLATEFILEID);

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

    r3826 r3827  
    207207  public static final VInteger VANNOTYPEID = new VInteger("annotationTypeId",0, true);
    208208  public static final VInteger VGROUPID = new VInteger("groupId", 1, false);
    209   public static final VString VNAME = NameField.VPARAM;
    210209  public static final VString VUSERNAME = new VString("username", 1, 32, true);
    211210  public static final VString VANNONAME = new VString("annotationName", 1,64, false);
    … …  
    23182317      // Properties fieldset
    23192318      Fieldset properties = new Fieldset();
    2320       properties.getLegendTitle().setTitle(
    2321         "ImportHitsWizardStep1FormLegend");
     2319      properties.getLegendTitle().setTitle("ImportHitsWizardStep1FormLegend");
    23222320      form.addFieldset(properties);
    23232321      /*
    … …  
    23492347       */
    23502348      TextField<String> forwardF = new ForwardField();
    2351       forwardF
    2352         .setValue(actionFactory.getId(ImportHitsWizardStep1b.class));
     2349      forwardF.setValue(actionFactory.getId(ImportHitsWizardStep1b.class));
    23532350      properties.add(forwardF);
    23542351      // Gel id (optional)
    … …  
    36283625    fs.getLegendTitle().setTitle("NewMascotParameterSetStorage");
    36293626    // MascotParameterSetStorage Name
    3630     TextField<String> nameF = createField(VNAME);
    3631     nameF.setLabel("Name");
     3627    TextField<String> nameF = new NameField();
    36323628    fs.add(nameF);
    36333629    nameF.setValue("Mascot parameter set storage");
    … …  
    37423738    fs.getLegendTitle().setTitle("SaveAsMascotParameterSetStorage");
    37433739    // MascotParameterSetStorage Name
    3744     TextField<String> nameF = createField(VNAME);
    3745     nameF.setLabel("Name");
     3740    TextField<String> nameF = new NameField();
    37463741    fs.add(nameF);
    37473742    nameF.setValue("Mascot parameter set storage");
    … …  
    47644759    fs.getLegendTitle().setTitle("NewOMSSAParameterSetStorage");
    47654760    // OMSSAParameterSetStorage Name
    4766     TextField<String> nameF = createField(VNAME);
    4767     nameF.setLabel("Name");
     4761    TextField<String> nameF = new NameField();
    47684762    fs.add(nameF);
    47694763    nameF.setValue("OMSSA parameter set storage");
    … …  
    48594853    fs.getLegendTitle().setTitle("SaveAsOMSSAParameterSetStorage");
    48604854    // OMSSAParameterSetStorage Name
    4861     TextField<String> nameF = createField(VNAME);
    4862     nameF.setLabel("Name");
     4855    TextField<String> nameF = new NameField();
    48634856    fs.add(nameF);
    48644857    nameF.setValue("OMSSA parameter set storage");
    … …  
    57855778    fs.getLegendTitle().setTitle("NewXTandemParameterSetStorage");
    57865779    // XTandemParameterSetStorage Name
    5787     TextField<String> nameF = createField(VNAME);
    5788     nameF.setLabel("Name");
     5780    TextField<String> nameF = new NameField();
    57895781    fs.add(nameF);
    57905782    nameF.setValue("X!Tandem parameter set storage");
    … …  
    58615853    fs.getLegendTitle().setTitle("SaveAsXTandemParameterSetStorage");
    58625854    // XTandemParameterSetStorage Name
    5863     TextField<String> nameF = createField(VNAME);
    5864     nameF.setLabel("Name");
     5855    TextField<String> nameF = new NameField();
    58655856    fs.add(nameF);
    58665857    nameF.setValue("X!Tandem parameter set storage");
    … …  
    93559346    fs.getLegendTitle().setTitle("Protocol");
    93569347    // Protocol Name
    9357     TextField<String> nameF = createField(VNAME);
     9348    TextField<String> nameF = new NameField();
    93589349    fs.add(nameF);
    9359     nameF.setLabel("Name");
    93609350    // Protocol Description
    93619351    TextArea descF = new TextArea(VDESCR);
    … …  
    94179407    fs.getLegendTitle().setTitle("NewProtocol");
    94189408    // Protocol Name
    9419     TextField<String> nameF = createField(VNAME);
    9420     nameF.setLabel("Name");
     9409    TextField<String> nameF = new NameField();
    94219410    fs.add(nameF);
    94229411    if (protocol != null)
    … …  
    95599548    if (Nameable.class.isAssignableFrom(cls))
    95609549    {
    9561       TextField<String> nameF = createField(VNAME);
     9550      TextField<String> nameF = new NameField();
    95629551      fs.add(nameF);
    9563       nameF.setLabel("Name");
    95649552      TextArea descF = new TextArea(VDESCR);
    95659553      descF.setLabel("Description");
Note: See TracChangeset for help on using the changeset viewer.