Changeset 3818


Ignore:
Timestamp:
Sep 6, 2010, 11:51:40 AM (13 years ago)
Author:
Gregory Vincic
Message:

Refs #698. Removed VEXTERNALID from FormFactory, using ExternalIdField?.VPARAM instead

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

Legend:

Unmodified
Added
Removed

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

    r2554 r3818  
    2828package org.proteios.action.extract;
    2929
     30
     31
    3032import org.proteios.action.ProteiosAction;
    3133import org.proteios.core.CreationEvent;
    … …  
    3436import org.proteios.core.ItemFactory;
    3537import org.proteios.core.Sample;
    36 import org.proteios.gui.form.Form;
    37 import org.proteios.gui.form.FormFactory;
    38 
    3938import se.lu.thep.waf.ActionException;
    4039import se.lu.thep.waf.constraints.InvalidParameterValue;
     40import org.proteios.gui.form.*;
    4141
    4242/**
    … …  
    9393    extract.setName(name);
    9494    //
    95     String externalId = getString(FormFactory.VEXTERNALID);
     95    String externalId = getString(ExternalIdField.VPARAM);
    9696    extract.setExternalId(externalId);
    9797    //

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

    r2554 r3818  
    2828package org.proteios.action.extract;
    2929
     30
     31
    3032import org.proteios.action.ProteiosAction;
    3133import org.proteios.core.CreationEvent;
    … …  
    3537import org.proteios.core.Label;
    3638import org.proteios.core.LabeledExtract;
    37 import org.proteios.gui.form.Form;
    38 import org.proteios.gui.form.FormFactory;
    39 
    4039import se.lu.thep.waf.ActionException;
    4140import se.lu.thep.waf.constraints.InvalidParameterValue;
     41import org.proteios.gui.form.*;
    4242
    4343/**
    … …  
    9090    labeledExtract.setName(name);
    9191    //
    92     String externalId = getString(FormFactory.VEXTERNALID);
     92    String externalId = getString(ExternalIdField.VPARAM);
    9393    labeledExtract.setExternalId(externalId);
    9494    //

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

    r2554 r3818  
    2828package org.proteios.action.extract;
    2929
     30
     31
    3032import org.proteios.action.ProteiosAction;
    3133import org.proteios.core.CreationEvent;
    … …  
    3335import org.proteios.core.Extract;
    3436import org.proteios.core.ItemFactory;
    35 import org.proteios.gui.form.Form;
    36 import org.proteios.gui.form.FormFactory;
    37 
    3837import se.lu.thep.waf.ActionException;
    3938import se.lu.thep.waf.constraints.InvalidParameterValue;
     39import org.proteios.gui.form.*;
    4040
    4141/**
    … …  
    8181    extract.setName(name);
    8282    //
    83     String externalId = getString(FormFactory.VEXTERNALID);
     83    String externalId = getString(ExternalIdField.VPARAM);
    8484    extract.setExternalId(externalId);
    8585    //

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

    r2554 r3818  
    2828package org.proteios.action.extract;
    2929
     30
     31
    3032import org.proteios.action.ProteiosAction;
    3133import org.proteios.core.CreationEvent;
    … …  
    3537import org.proteios.core.Label;
    3638import org.proteios.core.LabeledExtract;
    37 import org.proteios.gui.form.Form;
    38 import org.proteios.gui.form.FormFactory;
    39 
    4039import se.lu.thep.waf.ActionException;
    4140import se.lu.thep.waf.constraints.InvalidParameterValue;
     41import org.proteios.gui.form.*;
    4242
    4343/**
    … …  
    9393    labeledExtract.setName(name);
    9494    //
    95     String externalId = getString(FormFactory.VEXTERNALID);
     95    String externalId = getString(ExternalIdField.VPARAM);
    9696    labeledExtract.setExternalId(externalId);
    9797    //

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

    r2554 r3818  
    2828package org.proteios.action.extract;
    2929
     30
    3031import org.proteios.action.ProteiosAction;
    3132import org.proteios.core.DbControl;
    … …  
    3334import org.proteios.core.ItemFactory;
    3435import org.proteios.core.UpdateEvent;
    35 import org.proteios.gui.form.Form;
    36 import org.proteios.gui.form.FormFactory;
    3736import se.lu.thep.waf.ActionException;
    3837import se.lu.thep.waf.constraints.InvalidParameterValue;
     38import org.proteios.gui.form.*;
    3939
    4040/**
    … …  
    5858    DbControl dc = newDbControl();
    5959    ItemFactory factory = getItemFactory(dc);
    60     Integer extractId = getInteger(FormFactory.VID);
     60    Integer extractId = getInteger(ItemIdField.VPARAM);
    6161    Extract extract = factory.getById(Extract.class, extractId);
    6262    // Get copy of extract before update
    … …  
    6767    extract.setName(name);
    6868    //
    69     String externalId = getString(FormFactory.VEXTERNALID);
     69    String externalId = getString(ExternalIdField.VPARAM);
    7070    extract.setExternalId(externalId);
    7171    //

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

    r3405 r3818  
    2828package org.proteios.action.extract;
    2929
     30
     31
    3032import org.proteios.action.ProteiosAction;
    3133import org.proteios.core.DbControl;
    … …  
    3436import org.proteios.core.LabeledExtract;
    3537import org.proteios.core.UpdateEvent;
    36 import org.proteios.gui.form.Form;
    37 import org.proteios.gui.form.FormFactory;
    38 
    3938import se.lu.thep.waf.ActionException;
    4039import se.lu.thep.waf.constraints.InvalidParameterValue;
     40import org.proteios.gui.form.*;
    4141
    4242/**
    … …  
    6060     */
    6161    ItemFactory factory = getItemFactory(dc);
    62     Integer extractId = getInteger(FormFactory.VID);
     62    Integer extractId = getInteger(ItemIdField.VPARAM);
    6363    LabeledExtract extract = factory.getById(LabeledExtract.class,
    6464      extractId);
    … …  
    7171    extract.setName(name);
    7272    //
    73     String externalId = getString(FormFactory.VEXTERNALID);
     73    String externalId = getString(ExternalIdField.VPARAM);
    7474    extract.setExternalId(externalId);
    7575    //

  • trunk/client/servlet/src/org/proteios/action/gel/AddGel.java

    r2738 r3818  
    2828package org.proteios.action.gel;
    2929
     30
     31
    3032import org.proteios.action.ProteiosAction;
    3133import org.proteios.action.project.ListGelsInProject;
    … …  
    3335import org.proteios.core.GelElectrophoresis;
    3436import org.proteios.core.ItemFactory;
    35 import org.proteios.gui.form.Form;
    36 import org.proteios.gui.form.FormFactory;
    37 
    3837import se.lu.thep.waf.ActionException;
    3938import se.lu.thep.waf.constraints.InvalidParameterValue;
     39import org.proteios.gui.form.*;
    4040
    4141/**
    … …  
    6464    itemFactory = getItemFactory(dc);
    6565    gel = itemFactory.create(GelElectrophoresis.class);
    66     externalId = getString(FormFactory.VEXTERNALID);
     66    externalId = getString(ExternalIdField.VPARAM);
    6767    massStart = getValidInteger(FormFactory.VMASSSTART);
    6868    massEnd = getValidInteger(FormFactory.VMASSEND);
    … …  
    9393    setMessage("Gel saved");
    9494    setSessionAttribute(ViewActiveGel.VACTIVEGELID, gel.getId());
    95     forwardTo = getValidString(FormFactory.VFWDACTION);
     95    forwardTo = getValidString(ForwardField.VPARAM);
    9696    if (forwardTo != null)
    9797      setForwardTo(forwardTo);

  • trunk/client/servlet/src/org/proteios/action/gel/NewGel.java

    r3817 r3818  
    6464    {
    6565      // Set it as an attribute so it get's filled out in the form
    66       setAttribute(FormFactory.VEXTERNALID, gelExternalId);
     66      setAttribute(ExternalIdField.VPARAM, gelExternalId);
    6767    }
    6868    populateForm(form);

  • trunk/client/servlet/src/org/proteios/action/gel/SaveGel.java

    r2272 r3818  
    2828package org.proteios.action.gel;
    2929
     30
    3031import org.proteios.action.ProteiosAction;
    3132import org.proteios.core.DbControl;
    3233import org.proteios.core.GelElectrophoresis;
    3334import org.proteios.core.ItemFactory;
    34 import org.proteios.gui.form.Form;
    35 import org.proteios.gui.form.FormFactory;
    3635import se.lu.thep.waf.ActionException;
    3736import se.lu.thep.waf.constraints.InvalidParameterValue;
     37import org.proteios.gui.form.*;
    3838
    3939/**
    … …  
    5252    Form form = getFormFactory().getForm(GelElectrophoresis.class, null);
    5353    verifyParameters(form);
    54     Integer gelId = getInteger(FormFactory.VID);
     54    Integer gelId = getInteger(ItemIdField.VPARAM);
    5555    /***********************************************************************
    5656     * Get existing gel
    … …  
    6262      gelId);
    6363    // Set values
    64     String externalId = getString(FormFactory.VEXTERNALID);
     64    String externalId = getString(ExternalIdField.VPARAM);
    6565    gel.setExternalId(externalId);
    6666    //

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

    r3775 r3818  
    2828package org.proteios.action.hit;
    2929
     30
     31
     32
    3033import org.proteios.action.ProteiosAction;
    3134import org.proteios.core.LsidElement;
    32 import org.proteios.gui.form.FormFactory;
    3335import se.lu.thep.waf.ActionException;
    3436import se.lu.thep.waf.constraints.InvalidParameterValue;
    3537import java.io.IOException;
    3638import java.net.URL;
     39import org.proteios.gui.form.*;
    3740
    3841/**
    … …  
    5255     * Verify parameters
    5356     */
    54     verifySessionAttributes(FormFactory.VEXTERNALID);
    55     String externalId = getSessionAttribute(FormFactory.VEXTERNALID);
     57    verifySessionAttributes(ExternalIdField.VPARAM);
     58    String externalId = getSessionAttribute(ExternalIdField.VPARAM);
    5659    log.debug("externalId = \"" + externalId + "\"");
    5760    /***********************************************************************
    … …  
    99102       */
    100103      Integer hitId = getSessionAttribute(ViewActiveHit.VHITID);
    101    if(hitId!=null) { hitId = getValidInteger(FormFactory.VID); }
     104   if(hitId!=null) { hitId = getValidInteger(ItemIdField.VPARAM); }
    102105   
    103106      log.debug("hitId = " + hitId);

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

    r3510 r3818  
    2727 */
    2828package org.proteios.action.hit;
     29
     30
     31
     32
    2933
    3034import org.proteios.ActionLink;
    … …  
    3640import org.proteios.gui.Title;
    3741import org.proteios.gui.TitledWindow;
    38 import org.proteios.gui.form.FormFactory;
    3942import org.proteios.gui.layout.RowLayout;
    4043import org.proteios.gui.table.Cell;
    … …  
    4245import org.proteios.gui.table.Row;
    4346import org.proteios.gui.table.Table;
    44 
    4547import se.lu.thep.waf.ActionException;
    4648import se.lu.thep.waf.constraints.InvalidParameterValue;
    47 
    4849import java.io.BufferedReader;
    4950import java.io.FileInputStream;
    … …  
    6162import java.util.GregorianCalendar;
    6263import java.util.List;
    63 
    6464import org.apache.commons.codec.DecoderException;
    6565import org.apache.commons.httpclient.HttpClient;
    … …  
    7676import org.apache.commons.httpclient.methods.multipart.PartSource;
    7777import org.apache.commons.httpclient.methods.multipart.StringPart;
     78import org.proteios.gui.form.*;
    7879
    7980/**
    … …  
    218219     * Verify parameters
    219220     */
    220     verifySessionAttributes(FormFactory.VEXTERNALID);
    221     String externalId = getSessionAttribute(FormFactory.VEXTERNALID);
     221    verifySessionAttributes(ExternalIdField.VPARAM);
     222    String externalId = getSessionAttribute(ExternalIdField.VPARAM);
    222223    log.debug("externalId = \"" + externalId + "\"");
    223224    verifySessionAttributes(ViewActiveHit.VHITID);

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

    r3775 r3818  
    2828package org.proteios.action.hit;
    2929
     30
    3031import org.proteios.action.ProteiosAction;
    3132import org.proteios.action.ConfigureTableFactory2;
    … …  
    3334import org.proteios.core.Hit;
    3435import org.proteios.core.ItemFactory;
    35 import org.proteios.gui.form.FormFactory;
    3636import se.lu.thep.waf.ActionException;
    3737import se.lu.thep.waf.constraints.InvalidParameterValue;
     38import org.proteios.gui.form.*;
    3839
    3940/**
    40  * Sets the ViewActiveHit.VHITID and FormFactory.VEXTERNALID attributes and
     41 * Sets the ViewActiveHit.VHITID and ExternalIdField.VPARAM attributes and
    4142 * forwards request to {@link ViewActiveHitExternalId}.
    4243 *
    … …  
    5354     * Get hit id from valid parameter and set it as session attribute.
    5455     */
    55     Integer hitId = getValidInteger(FormFactory.VID);
     56    Integer hitId = getValidInteger(ItemIdField.VPARAM);
    5657    log.debug("hitId = " + hitId);
    5758    log.debug("ViewActiveHit.VHITID.getName() = \"" + ViewActiveHit.VHITID
    … …  
    7677       * get url.
    7778       */
    78       setSessionAttribute(FormFactory.VEXTERNALID, externalId);
     79      setSessionAttribute(ExternalIdField.VPARAM, externalId);
    7980      setForwardTo(ViewActiveHitExternalId.class);
    8081    }

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

    r3210 r3818  
    2828package org.proteios.action.hit;
    2929
     30
    3031import org.proteios.action.ProteiosAction;
    3132import org.proteios.core.DbControl;
    3233import org.proteios.core.Hit;
    3334import org.proteios.core.ItemFactory;
    34 import org.proteios.gui.form.FormFactory;
    3535import se.lu.thep.waf.ActionException;
    3636import se.lu.thep.waf.constraints.InvalidParameterValue;
     37import org.proteios.gui.form.*;
    3738
    3839/**
    39  * Sets the ViewActiveHit.VHITID and FormFactory.VEXTERNALID attributes and
     40 * Sets the ViewActiveHit.VHITID and ExternalIdField.VPARAM attributes and
    4041 * forwards request to {@link ViewActiveHitPDBFile}.
    4142 *
    … …  
    5253     * Get hit id from valid parameter and set it as session attribute.
    5354     */
    54     Integer hitId = getValidInteger(FormFactory.VID);
     55    Integer hitId = getValidInteger(ItemIdField.VPARAM);
    5556    log.debug("hitId = " + hitId);
    5657    log.debug("ViewActiveHit.VHITID.getName() = \"" + ViewActiveHit.VHITID
    … …  
    7576       * get url.
    7677       */
    77       setSessionAttribute(FormFactory.VEXTERNALID, externalId);
     78      setSessionAttribute(ExternalIdField.VPARAM, externalId);
    7879      setForwardTo(ViewActiveHitPDBFile.class);
    7980    }

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

    r2450 r3818  
    2828package org.proteios.action.ipg;
    2929
     30
     31
    3032import org.proteios.action.ProteiosAction;
    3133import org.proteios.action.project.ListIPGsInProject;
    … …  
    3335import org.proteios.core.IPG;
    3436import org.proteios.core.ItemFactory;
    35 import org.proteios.gui.form.Form;
    36 import org.proteios.gui.form.FormFactory;
    37 
    3837import se.lu.thep.waf.ActionException;
    3938import se.lu.thep.waf.constraints.InvalidParameterValue;
     39import org.proteios.gui.form.*;
    4040
    4141/**
    … …  
    6969    if (length != null)
    7070      ipg.setLengthInCentiMeters(length);
    71     ipg.setExternalId(getString(FormFactory.VEXTERNALID));
     71    ipg.setExternalId(getString(ExternalIdField.VPARAM));
    7272    dc.saveItem(ipg);
    7373    dc.commit();
    7474    setMessage("Saved");
    7575    setSessionAttribute(ViewActiveIPG.VACTIVEIPGID, ipg.getId());
    76     String forwardTo = getValidString(FormFactory.VFWDACTION);
     76    String forwardTo = getValidString(ForwardField.VPARAM);
    7777    if (forwardTo != null)
    7878      setForwardTo(forwardTo);

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

    r2171 r3818  
    2828package org.proteios.action.ipg;
    2929
     30
     31
    3032import org.proteios.action.ProteiosAction;
    3133import org.proteios.core.DbControl;
    3234import org.proteios.core.IPG;
    3335import org.proteios.core.ItemFactory;
    34 import org.proteios.gui.form.Form;
    35 import org.proteios.gui.form.FormFactory;
    36 
    3736import se.lu.thep.waf.ActionException;
    3837import se.lu.thep.waf.constraints.InvalidParameterValue;
     38import org.proteios.gui.form.*;
    3939
    4040/**
    … …  
    5353    Form form = getFormFactory().getIPGForm(null);
    5454    verifyParameters(form);
    55     Integer ipgId = getInteger(FormFactory.VID);
     55    Integer ipgId = getInteger(ItemIdField.VPARAM);
    5656    /***********************************************************************
    5757     * Get existing ipg
    … …  
    6565    ipg.setPiEnd(getInteger(FormFactory.VPIEND));
    6666    ipg.setLengthInCentiMeters(getInteger(FormFactory.VLENGTH));
    67     ipg.setExternalId(getString(FormFactory.VEXTERNALID));
     67    ipg.setExternalId(getString(ExternalIdField.VPARAM));
    6868    dc.commit();
    6969    setMessage("Saved");

  • trunk/client/servlet/src/org/proteios/action/spectrumSearch/ViewExternalId.java

    r2288 r3818  
    2828package org.proteios.action.spectrumSearch;
    2929
     30
     31
     32
    3033import org.proteios.action.ProteiosAction;
    3134import org.proteios.action.hit.ViewActiveHitExternalId;
    … …  
    3538import org.proteios.core.PolyPeptide;
    3639import org.proteios.core.Protein;
    37 import org.proteios.gui.form.FormFactory;
    38 
    3940import se.lu.thep.waf.ActionException;
    4041import se.lu.thep.waf.constraints.InvalidParameterValue;
     42import org.proteios.gui.form.*;
    4143
    4244/**
    43  * Sets the FormFactory.VEXTERNALID attribute and forwards request to
     45 * Sets the ExternalIdField.VPARAM attribute and forwards request to
    4446 * {@link ViewActiveHitExternalId}.
    4547 *
    … …  
    5658     * Get hit id from valid parameter and set it as session attribute.
    5759     */
    58     verifyParameters(FormFactory.VID);
    59     Integer polypeptideId = getValidInteger(FormFactory.VID);
     60    verifyParameters(ItemIdField.VPARAM);
     61    Integer polypeptideId = getValidInteger(ItemIdField.VPARAM);
    6062    DbControl dc = newDbControl();
    6163    ItemFactory factory = new ItemFactory(dc);
    … …  
    6769    }
    6870    String externalId = pp.getAccessionNumber();
    69     setSessionAttribute(FormFactory.VEXTERNALID.getName(), externalId);
     71    setSessionAttribute(ExternalIdField.VPARAM.getName(), externalId);
    7072    setForwardTo(ViewActiveHitExternalId.class);
    7173  }

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

    r3817 r3818  
    287287  public static final VString VRANDOMSTRING = new VString("randomString", 1,
    288288    15, true);
    289   public static final VString VEXTERNALID = ExternalIdField.VPARAM;
    290289  public static final VString VSTORAGELOCATION = new VString(
    291290    "storageLocation", 0, 255, false);
    … …  
    34753474    form.addFieldset(fs);
    34763475    //
    3477     TextField<String> externalId = createField(VEXTERNALID);
     3476    TextField<String> externalId = new ExternalIdField();
    34783477    fs.add(externalId);
    34793478    //
    … …  
    98999898    if (SeparationMethod.class.isAssignableFrom(cls))
    99009899    {
    9901       TextField<String> externalId = createField(VEXTERNALID);
     9900      TextField<String> externalId = new ExternalIdField();
    99029901      fs.add(externalId);
    99039902      if (obj != null)
    … …  
    1022610225        GelElectrophoresis method = (GelElectrophoresis) sm;
    1022710226        //
    10228         TextField<String> externalId = createField(VEXTERNALID);
     10227        TextField<String> externalId = new ExternalIdField();
    1022910228        externalId.setValue(method.getExternalId());
    1023010229        fs.add(externalId);
    … …  
    1023910238        IPG method = (IPG) sm;
    1024010239        //
    10241         TextField<String> externalId = createField(VEXTERNALID);
     10240        TextField<String> externalId = new ExternalIdField();
    1024210241        externalId.setValue(method.getExternalId());
    1024310242        fs.add(externalId);
Note: See TracChangeset for help on using the changeset viewer.