Changeset 3808

Timestamp:

Sep 1, 2010, 12:05:25 PM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed getJobForm method from FormFactory. Also introduced CreatedDateField, EndedDateField, StatusField and JobFrom.

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/job/ViewActiveJob.java (modified) (2 diffs)
• gui/form/CreatedDateField.java (added)
• gui/form/EndedDateField.java (added)
• gui/form/FormFactory.java (modified) (4 diffs)
• gui/form/JobForm.java (added)
• gui/form/StatusField.java (added)

trunk/client/servlet/src/org/proteios/action/job/ViewActiveJob.java

@@ -35 +35 @@
 import org.proteios.core.Job.Status;
 import org.proteios.gui.form.Form;
+import org.proteios.gui.form.JobForm;
 import org.proteios.gui.layout.RowLayout;
 import org.proteios.gui.Listing;
@@ -82 +83 @@
     job = Job.getById(dc, jobId);
   title.setSubtitle(job.getName());
-    form = getFormFactory().getJobForm(job);
+    form = new JobForm(job);
     // Toolbar
     toolbar = new Toolbar();

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

@@ -241 +241 @@
   public static final VInteger VPLUGINDEFID = new VInteger("definitionId", 1,
     true); // Remove
-  public static final VDate VCDATE = new VDate("created", false,
-    Format.DATETIME);
-  public static final VDate VEDATE = new VDate("ended", false,
-    Format.DATETIME);
   public static final VString VCLASSNAME = new VString("className", 1, 255,
     true);
@@ -269 +265 @@
     true);
   public static final VString VPERCENT = new VString("percent", 0, 4, false);
-  public static final VString VSTATUS = new VString("status", 0, 32, false);
   public static final VInteger VMASSSTART = new VInteger(
     "massStartInKiloDaltons", 0, false);
@@ -598 +593 @@
 
 
-  private TextField<Date> newCDateField()
-  {
-    TextField<Date> field = new TextField<Date>(VCDATE);
-    field.setLabel("Created");
-    return field;
-  }
-
-
-  private TextField<Date> newEDateField()
-  {
-    TextField<Date> field = new TextField<Date>(VEDATE);
-    field.setLabel("Ended");
-    return field;
-  }
 
 
@@ -1117 +1098 @@
 
  // Cleaning up from here
-
-
-  /**
-   * @param job the job used to populate information in the form, may be null
-   * @return Form representing a job
-   */
-  public Form getJobForm(Job job)
-  {
-    Form form;
-  Fieldset properties;
-  TextField<String> nameF, statusF;
-  TextArea descrF;
-  TextField<Date> createdF, endedF;
-
-    nameF = new NameField();
-    descrF = newDescriptionField();
-    createdF = newCDateField();
-    endedF = newEDateField();
-  statusF = new TextField<String>(VSTATUS);
-    statusF.setLabel("Status");
-
-    properties = new Fieldset();
-    properties.getLegendTitle().setTitle("Properties");
-    properties.add(nameF);
-    properties.add(descrF);
-    properties.add(createdF);
-    properties.add(endedF);
-    properties.add(statusF);
-
-  form = new Form("jobsForm");
-    form.setTitle("Job");
-    form.addFieldset(properties);
-
-    if (job != null)
-    {
-      nameF.setValue(job.getName());
-      nameF.setDisabled(true);
-      descrF.setValue(job.getDescription());
-      descrF.setDisabled(true);
-      createdF.setValue(job.getCreated());
-      createdF.setDisabled(true);
-      endedF.setValue(job.getEnded());
-      endedF.setDisabled(true);
-   statusF.setValue(job.getStatus().toString());
-      statusF.setDisabled(true);
-    }
-    return form;
-  }
-
 
   /**