Changeset 3864

Timestamp:

Sep 20, 2010, 11:31:11 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed method getFileProtocolForm from FormFactory. Decided to put this form creation within the action class that uses it.

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/file/SelectProtocolType.java (modified) (5 diffs)
• gui/form/FormFactory.java (modified) (1 diff)

trunk/client/servlet/src/org/proteios/action/file/SelectProtocolType.java

@@ -15 +15 @@
 import org.proteios.core.File;
 import org.proteios.core.ItemFactory;
+import org.proteios.core.ItemResultList;
+import org.proteios.core.ItemQuery;
 import org.proteios.core.ProtocolType;
+import org.proteios.core.query.Orders;
+import org.proteios.core.query.Hql;
 import org.proteios.gui.Title;
 import org.proteios.gui.Toolbar;
@@ -23 +27 @@
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
+import se.lu.thep.waf.constraints.VString;
 
 /**
@@ -31 +36 @@
     implements ContextEnabled
 {
+  public static final VString VTYPE = new VString("type", 1, 64, true);
+
   @Override
   protected void runMe()
@@ -64 +71 @@
     log.debug("fileId = " + fileId);
     log.debug("file = " + file);
-    Form form = getFormFactory().getFileProtocolForm(file, null);
+    Form form = getFileProtocolForm(file, null);
     /*
      * Add the selected file ids to the forms first file set
@@ -93 +100 @@
 
 
+
+  public Form getFileProtocolForm(File file, ProtocolType protocolType)
+  {
+    Form form = new Form("FileProtocol");
+    form.setTitle("Protocol");
+    Fieldset fs = new Fieldset();
+    fs.setTitle("Protocol");
+    // Protocol Name
+    TextField<String> nameF = new NameField();
+    fs.add(nameF);
+    // Protocol Description
+    TextArea descF = new DescriptionField();
+    fs.add(descF);
+    if (file != null)
+    {
+      nameF.setValue(file.getName());
+      descF.setValue(file.getDescription());
+    }
+    // Protocol Type Select Box
+    Select<VString> typeS = new Select<VString>(VTYPE);
+    typeS.setLabel("ProtocolType");
+    DbControl dc = file.getDbControl();
+    ItemQuery<ProtocolType> query = ProtocolType.getQuery();
+    query.order(Orders.asc(Hql.property("name")));
+    ItemResultList<ProtocolType> types = query.list(dc);
+    //
+    for (ProtocolType type : types)
+    {
+      Option o = new Option(type.getSystemId());
+      o.setContent(type.getName());
+      typeS.addOption(o);
+      if (protocolType != null)
+      {
+        if (type.equals(protocolType))
+        {
+          o.setSelected(true);
+        }
+      }
+    }
+    dc.close();
+    fs.add(typeS);
+    form.addFieldset(fs);
+    return form;
+  }
+
+
   public List<Context> listContexts()
   {

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

@@ -6040 +6040 @@
 
 
-  public Form getFileProtocolForm(File file, ProtocolType protocolType)
-  {
-    Form form = new Form("FileProtocol");
-    form.setTitle("Protocol");
-    Fieldset fs = new Fieldset();
-    fs.setTitle("Protocol");
-    // Protocol Name
-    TextField<String> nameF = new NameField();
-    fs.add(nameF);
-    // Protocol Description
-    TextArea descF = new DescriptionField();
-    fs.add(descF);
-    if (file != null)
-    {
-      nameF.setValue(file.getName());
-      descF.setValue(file.getDescription());
-    }
-    // Protocol Type Select Box
-    Select<VString> typeS = new Select<VString>(VTYPE);
-    typeS.setLabel("ProtocolType");
-    DbControl dc = sc.newDbControl();
-    ItemQuery<ProtocolType> query = ProtocolType.getQuery();
-    query.order(Orders.asc(Hql.property("name")));
-    ItemResultList<ProtocolType> types = query.list(dc);
-    //
-    for (ProtocolType type : types)
-    {
-      Option o = new Option(type.getSystemId());
-      o.setContent(type.getName());
-      typeS.addOption(o);
-      if (protocolType != null)
-      {
-        if (type.equals(protocolType))
-        {
-          o.setSelected(true);
-        }
-      }
-    }
-    dc.close();
-    fs.add(typeS);
-    form.addFieldset(fs);
-    return form;
-  }
-
-
   /**
    * Form for new Protocol item. The difference between calling