Changeset 3789

Timestamp:

Aug 24, 2010, 9:35:50 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Adding UploadField? PluginDefinitionForm? and ClassNameField? also removing methods getLoginForm() and getPluginForm() from FormFactory?. Also removed no longer used actions AddPlugin? and NewPlugin? as plugins are Not to be added through the gui.

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/plugin/AddPlugin.java (deleted)
• action/plugin/NewPlugin.java (deleted)
• action/plugin/ViewActivePluginDefinition.java (modified) (2 diffs)
• gui/form/ClassNameField.java (added)
• gui/form/FormFactory.java (modified) (3 diffs)
• gui/form/ItemIdField.java (modified) (1 diff)
• gui/form/LabeledExtractForm.java (modified) (2 diffs)
• gui/form/NameableProperties.java (modified) (2 diffs)
• gui/form/PluginDefinitionForm.java (added)
• gui/form/UploadField.java (added)

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

@@ -32 +32 @@
 import org.proteios.core.PluginDefinition;
 import org.proteios.gui.Title;
-import org.proteios.gui.Toolbar;
+
+import org.proteios.gui.form.PluginDefinitionForm;
+import org.proteios.gui.form.ItemIdField;
 import org.proteios.gui.form.Form;
-import org.proteios.gui.form.FormFactory;
 import org.proteios.gui.layout.RowLayout;
 import se.lu.thep.waf.ActionException;
@@ -45 +46 @@
     extends ProteiosAction<ViewActivePluginDefinition>
 {
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.proteios.action.ProteiosAction#runMe()
-   */
   @Override
   protected void runMe()
       throws ActionException, InvalidParameterValue
   {
-    /***********************************************************************
-     * Verify parameters
-     */
-    verifySessionAttributes(FormFactory.VID);
-    Integer pluginDefId = getSessionAttribute(FormFactory.VID);
-    DbControl dc = newDbControl();
-    PluginDefinition pd = PluginDefinition.getById(dc, pluginDefId);
-    /***********************************************************************
-     * Plugin definition form
-     */
-    Form form = getFormFactory().getPluginForm(pd);
-    if (pd == null)
-    {
-      // Toolbar
-      Toolbar tb = new Toolbar();
-      tb.add(getActionFactory().getActionLink(AddPlugin.class, "Save"));
-      form.setToolbar(tb);
-    }
-    /***********************************************************************
-     * Layout
-     */
-    RowLayout layout = getLayoutFactory().getRowLayout();
-    layout.add(new Title("Plugin definition"));
+  Integer pluginDefId;
+  DbControl dc;
+  PluginDefinition pd;
+  Form form;
+  RowLayout layout;
+  Title title;
+  
+    verifySessionAttributes(ItemIdField.VPARAM);
+    pluginDefId = getSessionAttribute(ItemIdField.VPARAM);
+  title = new Title("PluginDefinition");
+
+    dc = newDbControl();
+    pd = getItemFactory(dc).getById(PluginDefinition.class, pluginDefId);
+    form = new PluginDefinitionForm(pd);
+
+    layout = getLayoutFactory().getRowLayout();
+    layout.add(title);
     layout.add(form);
     setLayout(layout);

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

@@ -586 +586 @@
 
 
-  public Form getPluginForm(PluginDefinition pd)
-  {
-    Form form = new Form("pluginDefinitionForm");
-    Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("Properties");
-    form.addFieldset(fs);
-    // Plugin class name field
-    TextField<String> cnF = newClassNameField();
-    fs.add(cnF);
-    //
-    if (pd != null)
-    {
-      // Id
-      TextField<Integer> idF = newHiddenItemIdField();
-      fs.add(idF);
-      idF.setValue(pd.getId());
-      cnF.setValue(pd.getClassName());
-      cnF.setDisabled(true);
-      // Description
-      TextArea descF = newDescriptionField();
-      descF.setValue(pd.getDescription());
-      descF.setDisabled(true);
-      fs.add(descF);
-    }
-    else
-    {
-      // File field
-      FileField fileF = newFileField();
-      fs.add(fileF);
-    }
-    return form;
-  }
-
-
-  /**
-   * @deprecated use new LoginForm()
-   */
-  public Form getLoginForm()
-  {
-    return new LoginForm();
-  }
-
 
   public void modifyForPopup(Fieldset fs)
@@ -691 +649 @@
   }
 
-
-  private TextField<String> newClassNameField()
-  {
-    TextField<String> field = new TextField<String>(VCLASSNAME);
-    field.setLabel("PluginClassPath");
-    return field;
-  }
 
 
@@ -9910 +9861 @@
       classNameFull = itemClass.getName();
     }
-    TextField<String> cnF = newClassNameField();
+    TextField<String> cnF = new ClassNameField();
     mainFS.add(cnF);
     cnF.setHidden(true);

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

@@ -33 +33 @@
  extends TextField<Integer>
 {
-  public static final VInteger VITEMID  = new VInteger("itemId",  1, true);
+  public static final VInteger VPARAM  = new VInteger("itemId",  1, true);
 
  public ItemIdField()
  {
-  super(ItemIdField.VITEMID);
+  super(ItemIdField.VPARAM);
   this.setLabel("ItemId");
  }

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

@@ -28 +28 @@
 package org.proteios.gui.form;
 
-import org.proteios.core.DbControl;
-import org.proteios.core.Include;
-import org.proteios.core.ItemQuery;
 import org.proteios.core.Extract;
 import org.proteios.core.Label;
@@ -103 +100 @@
   // Fill out the form
   this.itemIdF.setValue(obj.getId());
-  this.propertiesFS.nameF.setValue(obj.getName());
+  this.propertiesFS.setValues(obj);
   this.externalIdF.setValue(obj.getExternalId());
-  this.propertiesFS.descriptionF.setValue(obj.getDescription());
   this.storageLocationF.setValue(obj.getStorageLocation());
   this.quantityF.setValue(obj.getOriginalQuantityInMicroLiters());

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

@@ -29 +29 @@
 
 import se.lu.thep.waf.constraints.VString;
+import org.proteios.core.Nameable;
 
 public class NameableProperties
@@ -47 +48 @@
  }
 
+ public void setValues(Nameable obj)
+ {
+  this.nameF.setValue(obj.getName());
+  this.descriptionF.setValue(obj.getDescription());
+ }
 }