Changeset 3809


Ignore:
Timestamp:
Sep 1, 2010, 2:10:00 PM (13 years ago)
Author:
Gregory Vincic
Message:

Refs #698. Removed getRolesForm from FormFactory. Also introduced RoleForm.

Location:
trunk/client/servlet/src/org/proteios
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/client/servlet/src/org/proteios/action/role/SaveRole.java

    r3600 r3809  
    3030import org.proteios.action.ProteiosAction;
    3131import org.proteios.core.DbControl;
    32 import org.proteios.core.Item;
    33 import org.proteios.core.ItemNotFoundException;
    34 import org.proteios.core.Permission;
    3532import org.proteios.core.Role;
    36 import org.proteios.gui.form.Form;
    37 import org.proteios.gui.form.FormFactory;
     33import org.proteios.gui.form.*;
    3834import se.lu.thep.waf.ActionException;
    3935import se.lu.thep.waf.constraints.InvalidParameterValue;
    40 import se.lu.thep.waf.constraints.VString;
    41 import java.util.ArrayList;
    42 import java.util.EnumSet;
    43 import java.util.Set;
    4436
    45 /**
    46  * @author gregory
    47  */
    4837public class SaveRole
    4938    extends ProteiosAction<SaveRole>
    … …  
    5342      throws ActionException, InvalidParameterValue
    5443  {
    55     Form form = getFormFactory().getRolesForm(null);
     44    Form form = new RoleForm();
    5645    verifyParameters(form);
    5746    DbControl dc = newDbControl();
    5847    Integer roleId = getSessionAttribute(ViewActiveRole.VID);
    5948    Role role = Role.getById(dc, roleId);
    60     String name = getValidString(FormFactory.VNAME);
    61     String descr = getValidString(FormFactory.VDESCR);
     49    String name = getValidString(NameField.VPARAM);
     50    String descr = getValidString(DescriptionField.VPARAM);
    6251    role.setName(name);
    6352    role.setDescription(descr);

  • trunk/client/servlet/src/org/proteios/action/role/ViewActiveRole.java

    r3600 r3809  
    3737import org.proteios.gui.ColumnContainer;
    3838import org.proteios.gui.form.Form;
     39import org.proteios.gui.form.RoleForm;
    3940import org.proteios.gui.layout.RowLayout;
    4041import se.lu.thep.waf.ActionException;
    … …  
    6061  DbControl dc;
    6162  Role role;
    62   Form rolesForm;
     63  RoleForm rolesForm;
    6364  Toolbar tb,toolbar;
    6465  RowLayout layout;
    … …  
    8081    tb.add(getActionFactory().getActionLink(SaveRole.class, "Save"));
    8182
    82     rolesForm = getFormFactory().getRolesForm(role);
     83    rolesForm = new RoleForm(role);
    8384    rolesForm.setToolbar(tb);
    84 
    85   roleIdF = new TextField<Integer>(ViewActiveRole.VID);
    86   roleIdF.setValue(role.getId());
    8785
    8886  toolbar.add(getActionFactory().getActionLink(SaveRolePermissions.class,
    … …  
    9088
    9189  permTable = getFormFactory().getRolePermissionsTable(role);
    92   permTable.add(roleIdF);
     90  permTable.add(rolesForm.fs.itemIdF);
    9391  permTable.setToolbar(toolbar); 
    9492

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

    r3808 r3809  
    10971097
    10981098
    1099  // Cleaning up from here
    1100 
    11011099  /**
     1100  * This will probably be removed when fixint #691
    11021101   * @param peaklist to edit, or null if an empty form is needed
    11031102   * @return Form for editing a peaklist
    … …  
    11961195    return form;
    11971196  }
    1198 
    11991197
    12001198  /**
    … …  
    22662264
    22672265
    2268 
    2269   public Form getRolesForm(Role role)
    2270   {
    2271     /***********************************************************************
    2272      * Properties fieldset
    2273      */
    2274     Fieldset properties = new Fieldset();
    2275     properties.getLegendTitle().setTitle("Properties");
    2276     // Name field
    2277     TextField<String> nameF = new NameField();
    2278     properties.add(nameF);
    2279     // Description field
    2280     TextArea descrF = newDescriptionField();
    2281     properties.add(descrF);
    2282     if (role != null)
    2283     {
    2284       nameF.setValue(role.getName());
    2285       descrF.setValue(role.getDescription());
    2286     }
    2287 
    2288     /***********************************************************************
    2289      * Form
    2290      */
    2291     Form form = new Form("rolesForm");
    2292     form.addFieldset(properties);
    2293     return form;
    2294   }
     2266 // Cleaning up from here
    22952267
    22962268 public Table getRolePermissionsTable(Role role)

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

    r3804 r3809  
    22 $Id$
    33
    4  Copyright (C) 2006, 2007,2009 Gregory Vincic
     4 Copyright (C) 2010 Gregory Vincic
    55
    66 Files are copyright by their respective authors. The contributions to
    … …  
    2929
    3030import org.proteios.core.Nameable;
    31 /**
    32  TODO
    33 
    34  @author gregory
     31/**
    3532*/
    3633public final class TemplateForm
    … …  
    4138  after construction.
    4239 */
    43  public Fieldset fs;
     40 public final Fieldset fs;
    4441 
    4542 /**
Note: See TracChangeset for help on using the changeset viewer.