Changeset 3805

Timestamp:

Sep 1, 2010, 9:17:58 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed methods getImportFileForm and selectImportPlugins from FormFactory. Also introduced classes ImportFileForm and ImportPluginSelect.

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/file/ListFilePlugins.java (modified) (2 diffs)
• action/plugin/CreateFileImportJob.java (modified) (2 diffs)
• gui/form/FileTypeForm.java (modified) (2 diffs)
• gui/form/FormFactory.java (modified) (5 diffs)
• gui/form/ImportFileForm.java (added)
• gui/form/ImportPluginSelect.java (added)

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

@@ -35 +35 @@
 import org.proteios.gui.Title;
 import org.proteios.gui.Toolbar;
-import org.proteios.gui.form.Form;
+import org.proteios.gui.form.*;
 import org.proteios.gui.layout.RowLayout;
 import se.lu.thep.waf.ActionException;
@@ -63 +63 @@
     Integer fileId = getSessionAttribute(ViewActiveFile.VFILEID);
     File file = factory.getById(File.class, fileId);
-    Form form = getFormFactory().getImportFileForm(file);
+    Form form = new ImportFileForm(file);
     /***********************************************************************
      * Toolbar

trunk/client/servlet/src/org/proteios/action/plugin/CreateFileImportJob.java

@@ -36 +36 @@
 import org.proteios.core.Job;
 import org.proteios.core.PluginDefinition;
-import org.proteios.gui.form.Form;
-import org.proteios.gui.form.FormFactory;
+import org.proteios.gui.form.*;
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
@@ -57 +56 @@
      * Verify parameters
      */
-    Form form = getFormFactory().getImportFileForm(null);
-    verifyParameters(form);
-    Integer fileId = getValidInteger(FormFactory.VID);
-    Integer pluginDefId = getValidInteger(FormFactory.VPLUGINDEFID);
+    Integer fileId = getValidInteger(ItemIdField.VPARAM);
+    Integer pluginDefId = getValidInteger(ImportPluginSelect.VPARAM);
     /***********************************************************************
      * Create job

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

@@ -2 +2 @@
  $Id$
 
- Copyright (C) 2006, 2007,2009 Gregory Vincic
+ Copyright (C) 2010 Gregory Vincic
 
  Files are copyright by their respective authors. The contributions to
@@ -11 +11 @@
  Available at http://www.proteios.org/
 
- proteios-2.x is free software; you can redistribute it and/or
+ Proteios is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
  as published by the Free Software Foundation; either version 2

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

@@ -179 +179 @@
 /**
  * Generates various forms used in the gui. It also populates forms from
- * requests.
+ * requests. NOTE! this class will be deprecated shortly
  * 
  * @author gregory
- * @deprecated Do not use this class. Create your own form classes in package org.proteios.gui.form or reuse the existing ones.
  */
 public class FormFactory
@@ -241 +240 @@
     1, 255, false);
   public static final VInteger VPLUGINDEFID = new VInteger("definitionId", 1,
-    true);
+    true); // Remove
   public static final VDate VCDATE = new VDate("created", false,
     Format.DATETIME);
@@ -1119 +1118 @@
  // Cleaning up from here
 
-  private Select<VInteger> selectImportPlugins(DbControl dc,
-      Plugin.MainType... types)
-  {
-    Select<VInteger> typeS = new Select<VInteger>(VPLUGINDEFID);
-    typeS.setLabel("Plugin");
-    if (dc != null && dc.isConnected())
-    {
-      ItemQuery<PluginDefinition> query = PluginDefinition.getQuery();
-      query.include(Include.SHARED);
-      Expression[] exp = new Expression[types.length];
-      int i = 0;
-      for (MainType type : types)
-      {
-        exp[i] = Expressions.integer(type.getValue());
-        i++;
-      }
-      query.restrict(Restrictions.in(Hql.property("mainType"), exp));
-      query.order(Orders.asc(Hql.property("mainType")));
-      for (PluginDefinition pd : query.list(dc))
-      {
-        Option o = new Option(pd.getId(), pd.getName());
-        typeS.addOption(o);
-      }
-    }
-    return typeS;
-  }
-
-
-  /**
-   * @param file the file to import
-   * @return Form representing the import plugins for a file
-   */
-  public Form getImportFileForm(File file)
-  {
-    Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("ImportPlugins");
-    // id
-    TextField<Integer> itemIdF = newHiddenItemIdField();
-    fs.add(itemIdF);
-    // Select field
-    if (file != null)
-    {
-      itemIdF.setValue(file.getId());
-      Select<VInteger> typeS = selectImportPlugins(file.getDbControl(),
-        Plugin.MainType.IMPORT);
-      fs.add(typeS);
-    }
-    /***********************************************************************
-     * Form
-     */
-    Form form = new Form("importPluginsForm");
-    form.setTitle("File plugins");
-    form.addFieldset(fs);
-    return form;
-  }
-
-
   public Form getSelectPluginForm(DbControl dc, Plugin.MainType... types)
   {
@@ -1182 +1124 @@
     if (dc != null)
     {
-      Select<VInteger> typeS = selectImportPlugins(dc, types);
+      Select<VInteger> typeS = new ImportPluginSelect(dc, types);
       fs.add(typeS);
     }
@@ -2901 +2843 @@
       properties.add(getPlateExternalIdField());
       // Selector of plugins
-      properties.add(selectImportPlugins(dc, Plugin.MainType.IMPORT,
+      properties.add(new ImportPluginSelect(dc, Plugin.MainType.IMPORT,
         Plugin.MainType.OTHER));
       //