Changeset 3829


Ignore:
Timestamp:
Sep 8, 2010, 10:09:59 AM (13 years ago)
Author:
Gregory Vincic
Message:

Refs #698. Replaced references to FormFactory.VSTORAGELOCATION with StorageLocationField.VPARAM

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

Legend:

Unmodified
Added
Removed

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

    r3828 r3829  
    9696    extract.setDescription(getString(DescriptionField.VPARAM));
    9797    //
    98     String storageLocation = getString(FormFactory.VSTORAGELOCATION);
     98    String storageLocation = getString(StorageLocationField.VPARAM);
    9999    extract.setStorageLocation(storageLocation);
    100100    //

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

    r3828 r3829  
    9393    labeledExtract.setDescription(getString(DescriptionField.VPARAM));
    9494    //
    95     String storageLocation = getString(FormFactory.VSTORAGELOCATION);
     95    String storageLocation = getString(StorageLocationField.VPARAM);
    9696    labeledExtract.setStorageLocation(storageLocation);
    9797    //

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

    r3828 r3829  
    8484    extract.setDescription(getString(DescriptionField.VPARAM));
    8585    //
    86     String storageLocation = getString(FormFactory.VSTORAGELOCATION);
     86    String storageLocation = getString(StorageLocationField.VPARAM);
    8787    extract.setStorageLocation(storageLocation);
    8888    //

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

    r3828 r3829  
    9696    labeledExtract.setDescription(getString(DescriptionField.VPARAM));
    9797    //
    98     String storageLocation = getString(FormFactory.VSTORAGELOCATION);
     98    String storageLocation = getString(StorageLocationField.VPARAM);
    9999    labeledExtract.setStorageLocation(storageLocation);
    100100    //

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

    r3828 r3829  
    7171    extract.setDescription(getString(DescriptionField.VPARAM));
    7272    //
    73     String storageLocation = getString(FormFactory.VSTORAGELOCATION);
     73    String storageLocation = getString(StorageLocationField.VPARAM);
    7474    extract.setStorageLocation(storageLocation);
    7575    //

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

    r3828 r3829  
    7474    extract.setDescription(getString(DescriptionField.VPARAM));
    7575    //
    76     String storageLocation = getString(FormFactory.VSTORAGELOCATION);
     76    String storageLocation = getString(StorageLocationField.VPARAM);
    7777    extract.setStorageLocation(storageLocation);
    7878    //

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

    r3828 r3829  
    248248  public static final VBoolean VISMICROTITREPLATE = new VBoolean("isMicrotitrePlate", false);
    249249  public static final VString VRANDOMSTRING = new VString("randomString", 1,15, true);
    250   public static final VString VSTORAGELOCATION = new VString("storageLocation", 0, 255, false);
    251250  public static final VInteger VCOUNT = new VInteger("count", 0, true);
    252251  public static final VInteger VDIRCOUNT = new VInteger("dirCount", 0, true);
    … …  
    81248123    fs.add(descriptionF);
    81258124    //
    8126     TextField<String> storageLocationF = newStorageLocationField();
     8125    TextField<String> storageLocationF = new StorageLocationField();
    81278126    fs.add(storageLocationF);
    81288127    //
    … …  
    81728171    fs.add(descriptionF);
    81738172    //
    8174     TextField<String> storageLocationF = newStorageLocationField();
     8173    TextField<String> storageLocationF = new StorageLocationField();
    81758174    fs.add(storageLocationF);
    81768175    //
    … …  
    82388237    fs.add(descriptionF);
    82398238    //
    8240     TextField<String> storageLocationF = newStorageLocationField();
     8239    TextField<String> storageLocationF = new StorageLocationField();
    82418240    fs.add(storageLocationF);
    82428241    //
    … …  
    84448443      }
    84458444    }
    8446   }
    8447 
    8448 
    8449 
    8450   private TextField<String> newStorageLocationField()
    8451   {
    8452     TextField<String> field = new TextField<String>(VSTORAGELOCATION);
    8453     field.setLabel("StorageLocation");
    8454   field.setHelp("E.g. Fridge X on floor Y");
    8455     return field;
    84568445  }
    84578446
Note: See TracChangeset for help on using the changeset viewer.