Changeset 3804

Timestamp:

Sep 1, 2010, 8:05:42 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed selectMimeType method from FormFactory. Also introduced classes MimeTypeForm and MimeTypeSelect.

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/file/SetMimeType.java (modified) (1 diff)
• action/file/SetMimeTypeExtension.java (modified) (2 diffs)
• gui/form/FileTypeForm.java (modified) (2 diffs)
• gui/form/FormFactory.java (modified) (3 diffs)
• gui/form/MimeTypeForm.java (added)
• gui/form/MimeTypeSelect.java (added)
• gui/form/TemplateForm.java (modified) (2 diffs)

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

@@ -34 +34 @@
 import org.proteios.core.MimeType;
 import org.proteios.core.ItemFactory;
-import org.proteios.gui.form.FormFactory;
 
 import java.util.List;

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

@@ -34 +34 @@
 import org.proteios.gui.Title;
 import org.proteios.gui.Toolbar;
-import org.proteios.gui.form.Form;
-import org.proteios.gui.form.FormFactory;
+import org.proteios.gui.form.*;
 import org.proteios.gui.layout.RowLayout;
 
@@ -98 +97 @@
     Integer firstFileId = fileIds.get(0);
     File file = factory.getById(File.class, firstFileId);
-    Form form = getFormFactory().getMimeTypeForm(dc, file);
+    Form form = new MimeTypeForm(dc, file);
     /***********************************************************************
      * Toolbar

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

@@ -43 +43 @@
  public final Fieldset fs;
  public final FileTypeSelect fileTypeS;
- public final TextField<Integer> itemIdF;
-
+ 
  /**
   Creates a form with no values
@@ -54 +53 @@
     setTitle("SelectFileType");
 
-    itemIdF = new ItemIdField();
-
   fs = new Fieldset();
   fs.getLegendTitle().setTitle("FileType");
-    fs.add(itemIdF);
     fs.add(fileTypeS);
   addFieldset(fs);
  }
-
-
 }

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

@@ -182 +182 @@
  * 
  * @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
@@ -1118 +1119 @@
  // Cleaning up from here
 
-  public Form getMimeTypeForm(DbControl dc, File file)
-  {
-    log.debug("file = " + file);
-    Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("MimeType");
-    // id
-    TextField<Integer> itemIdF = newHiddenItemIdField();
-    fs.add(itemIdF);
-    // MIME type selector
-    Select<VString> mimeTypeS = selectMimeType(dc, file);
-    fs.add(mimeTypeS);
-    /***********************************************************************
-     * Form
-     */
-    Form form = new Form("mimeTypeForm");
-    form.setTitle("SelectMimeType");
-    form.addFieldset(fs);
-    return form;
-  }
-
-
   private Select<VInteger> selectImportPlugins(DbControl dc,
       Plugin.MainType... types)
@@ -3973 +3953 @@
     //
     return form;
-  }
-
-
-  private Select<VString> selectMimeType(DbControl dc, File file)
-  {
-    log.debug("file = " + file);
-    Select<VString> select = new Select<VString>(SetMimeType.VMIMETYPENAME);
-    select.setLabel("MimeType");
-    Option noMimeType = new Option("");
-    noMimeType.setContent("");
-    select.addOption(noMimeType);
-    // Get MIME type hints from file
-    String oldFileMimeType = null;
-    String mimeTypeFromExtension = null;
-    if (file != null)
-    {
-      oldFileMimeType = file.getMimeType();
-      // Try to get MIME type from file extension
-      String filename = file.getName();
-      int dotIndex = filename.lastIndexOf(".");
-      if (dotIndex > 0)
-      {
-        String fileExtension = filename.substring(dotIndex + 1);
-        log
-          .debug("filename = \"" + filename + "\" fileExtension = \"" + fileExtension + "\"");
-        mimeTypeFromExtension = MimeType.getMimeTypeStringByExtension(
-          dc, fileExtension);
-      }
-    }
-    log.debug("oldFileMimeType = \"" + oldFileMimeType + "\"");
-    log.debug("mimeTypeFromExtension = \"" + mimeTypeFromExtension + "\"");
-    // Add MIME type options to select box
-    if (dc != null && dc.isConnected())
-    {
-      // Get all MIME types in database
-      List<MimeTypeData> mimeTypeDataRawList = MimeType
-        .getMimeTypeDataList(dc);
-      // Get first MIME type with new MIME value
-      List<MimeTypeData> mimeTypeDataList = new ArrayList<MimeTypeData>(0);
-      List<String> mimeTypeValueList = new ArrayList<String>(0);
-      for (MimeTypeData mt : mimeTypeDataRawList)
-      {
-        if (!mimeTypeValueList.contains(mt.getName()))
-        {
-          mimeTypeValueList.add(mt.getName());
-          mimeTypeDataList.add(mt);
-        }
-      }
-      // Add options for unique MIME values
-      for (MimeTypeData mt : mimeTypeDataList)
-      {
-        Option o = new Option("" + mt.getId());
-        o.setContent(mt.getName() + " - " + mt.getDescription());
-        o.setValue(mt.getName());
-        select.addOption(o);
-        // Set default option from file hints
-        if (oldFileMimeType != null && !oldFileMimeType.equals(""))
-        {
-          // Set old MIME type for file as default MIME type
-          if (oldFileMimeType.equals(mt.getName()))
-          {
-            o.setSelected(true);
-          }
-        }
-        else if (mimeTypeFromExtension != null && !mimeTypeFromExtension
-          .equals(""))
-        {
-          // Set MIME type from file extension as default MIME type
-          if (mimeTypeFromExtension.equals(mt.getName()))
-          {
-            o.setSelected(true);
-          }
-        }
-      }
-    }
-    return select;
   }
 

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

@@ -41 +41 @@
   after construction. 
  */
- public NameableProperties propertiesFS;
+ public Fieldset fs;
  
  /**
@@ -48 +48 @@
  public TemplateForm()
  {
-  propertiesFS = new NameableProperties();
-  addFieldset(propertiesFS);
+  fs = new Fieldset();
+  addFieldset(fs);
  }
-
- public TemplateForm(Nameable obj)
- {
-  this(); // Create all fields using empty constructor
-
-  // Fill out form
-  propertiesFS.setValues(obj);
-  propertiesFS.disable();
- }
-
 }