Changeset 3802

Timestamp:

Aug 31, 2010, 9:34:41 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed getNewFileForm, getFileForm and selectFileType methods from FormFactory.

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/file/NewFile.java (modified) (2 diffs)
• gui/form/FileField.java (modified) (3 diffs)
• gui/form/FileTypeSelect.java (added)
• gui/form/FormFactory.java (modified) (5 diffs)
• gui/form/NewFileForm.java (added)
• gui/form/StoreCompressedCheckbox.java (added)

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

@@ -32 +32 @@
 import org.proteios.gui.Toolbar;
 import org.proteios.gui.form.Form;
+import org.proteios.gui.form.NewFileForm;
 import org.proteios.gui.layout.RowLayout;
 import se.lu.thep.waf.ActionException;
@@ -49 +50 @@
   {
     DbControl dc = newDbControl();
-    Form form = getFormFactory().getNewFileForm(dc);
+    Form form = new NewFileForm(dc);
     // Toolbar
     Toolbar tb = new Toolbar();

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

@@ -28 +28 @@
 package org.proteios.gui.form;
 
-import se.lu.thep.waf.constraints.VParameter;
+import se.lu.thep.waf.constraints.*;
 
 /**
@@ -37 +37 @@
 {
   private String value = null;
-
+ public static final VString VPARAM = new VString("file", 1, 512); // Default
 
   public String getValue()
@@ -55 +55 @@
     super(param);
   }
+
+ public FileField()
+ {
+  super(FileField.VPARAM);
+  setLabel("File");
+ }
 }

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

@@ -936 +936 @@
   }
 
- // Cleaning up from here
 
   /**
@@ -1117 +1116 @@
 
 
-  public Form getNewFileForm(DbControl dc)
-  {
-    log.debug("Start");
-    Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("Properties");
-    // id
-    TextField<Integer> itemIdF = newHiddenItemIdField();
-    fs.add(itemIdF);
-    // Name field
-    FileField fileF = newFileField();
-    fs.add(fileF);
-    // File type selector
-    Select<VInteger> fileTypeS = selectFileType(dc, null);
-    fs.add(fileTypeS);
-    // File compression flag
-    Checkbox<VBoolean> storedCompressedCB = new Checkbox<VBoolean>(
-      SaveFile.VSTOREDINCOMPRESSEDFORMAT);
-    storedCompressedCB.setLabel("StoredInCompressedFormat");
-    storedCompressedCB.setValue("true");
-    storedCompressedCB.isChecked(false);
-    fs.add(storedCompressedCB);
-    //
-    /***********************************************************************
-     * Form
-     */
-    Form form = new Form("newFileForm");
-    form.setTitle("File upload");
-    form.addFieldset(fs);
-    return form;
-  }
-
-
-  public Form getFileForm(DbControl dc, File file)
-  {
-    log.debug("FormFactory::getFileForm(): file = " + file);
-    Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("Properties");
-    // id
-    TextField<Integer> itemIdF = newHiddenItemIdField();
-    fs.add(itemIdF);
-    if (file != null)
-    {
-      itemIdF.setValue(file.getId());
-      // Name field
-      TextField<String> nameF = new TextField<String>(VREQUIRED_FILENAME);
-      nameF.setLabel("Name");
-      nameF.setDisabled(true);
-      fs.add(nameF);
-      nameF.setValue(file.getName());
-      /*
-       * This hidden forward field sets action id used by the directory
-       * selection action called by MoveFile1.
-       */
-      TextField<String> forwardF = newForwardField();
-      forwardF.setValue(actionFactory.getId(MoveFile2.class));
-      fs.add(forwardF);
-    }
-    else
-    {
-      // Name field
-      FileField fileF = newFileField();
-      fs.add(fileF);
-      // File type selector
-      Select<VInteger> fileTypeS = selectFileType(dc, null);
-      fs.add(fileTypeS);
-    }
-    /***********************************************************************
-     * Form
-     */
-    Form form = new Form("fileForm");
-    form.setTitle("File upload");
-    form.addFieldset(fs);
-    return form;
-  }
-
+ // Cleaning up from here
 
   public Form getFileTypeForm(DbControl dc, File file)
@@ -1202 +1127 @@
     fs.add(itemIdF);
     // File type selector
-    Select<VInteger> fileTypeS = selectFileType(dc, file);
+    Select<VInteger> fileTypeS = new FileTypeSelect(dc,file);
     fs.add(fileTypeS);
     /***********************************************************************
@@ -4069 +3994 @@
     //
     return form;
-  }
-
-
-  @SuppressWarnings("unused")
-  private Select<VInteger> selectFileType(DbControl dc, File file)
-  {
-    Select<VInteger> select = new Select<VInteger>(VFILETYPEID);
-    select.setLabel("FileType");
-    Option noFileType = new Option("0");
-    noFileType.setContent("");
-    select.addOption(noFileType);
-    if (dc != null && dc.isConnected())
-    {
-      ItemQuery<FileType> query = FileType.getQuery();
-      query.include(Include.SHARED);
-      for (FileType ft : query.list(dc))
-      {
-        Option o = new Option("" + ft.getId());
-        o.setContent(ft.getName());
-        select.addOption(o);
-        if (file != null && file.getFileType() != null && file
-          .getFileType().equals(ft))
-          o.setSelected(true);
-      }
-    }
-    return select;
   }
 
@@ -10581 +10480 @@
       }
       // File type selector
-      Select<VInteger> fileTypeS = selectFileType(dc, file);
+      Select<VInteger> fileTypeS = new FileTypeSelect(dc, file);
       fs.add(fileTypeS);
       TextField<String> uriF = createField(VURI);