Changeset 3779

Timestamp:

Aug 18, 2010, 3:35:14 PM (13 years ago)

Author:

Fredrik Levander

Message:

Polishing of form and job return message.

Location:

trunk/contrib/SpectrumLibraryExport/src/satoshi

Files:

• LibraryExportForm.java (modified) (4 diffs)
• LibraryExportPlugin.java (modified) (1 diff)

trunk/contrib/SpectrumLibraryExport/src/satoshi/LibraryExportForm.java

@@ -5 +5 @@
 import org.proteios.Context;
 import org.proteios.ContextEnabled;
-import org.proteios.FileContext;
+import org.proteios.TableToolbarContext;
 import org.proteios.action.ProteiosAction;
+import org.proteios.action.feature.FeatureHitMatchForm;
 import org.proteios.action.hit.CreateProteinAssemblyJob;
+import org.proteios.core.Hit;
 import org.proteios.gui.Title;
 import org.proteios.gui.Toolbar;
@@ -59 +61 @@
       TextField<String> fdrCutOff = new TextField<String>(FDRCUTOFF);
       fdrCutOff.setLabel(getLocale().get("FDR cutoff"));
+      fdrCurOff.setValue("0.01");
       fieldSet.add(fdrCutOff);
       
       TextField<String> filename = new TextField<String>(OUTFILENAME);
       filename.setLabel(getLocale().get(".mgf file name"));
+      filename.setValue("spectrum_library.mgf");
       fieldSet.add(filename);
 
       TextField<String> filename2 = new TextField<String>(OUTFILENAME2);
+      filename2.setValue("spectrum_library.msp");
       filename2.setLabel(getLocale().get(".msp file name"));
       fieldSet.add(filename2);
@@ -71 +76 @@
       Checkbox<VBoolean> mgfON = new Checkbox<VBoolean>(MGFFORMAT);
       mgfON.setValue("true"); // default check value 
-      mgfON.isChecked(true); // default check status
+      mgfON.isChecked(false); // default check status
       mgfON.setLabel(getLocale().get(".mgf format as output"));
       fieldSet.add(mgfON);
@@ -100 +105 @@
 
 
-  /**
-   * Tell the application in which context this action should be available
-   */
+  private static List<Context> contexts = new ArrayList<Context>(1);
+  static
+  {
+    TableToolbarContext btn = new TableToolbarContext("libraryexport",
+      "Library export", LibraryExportForm.class, Hit.class);
+    contexts.add(btn);
+  }
+
+
   public List<Context> listContexts()
   {
-    List<Context> contexts = new ArrayList<Context>(1);
-    /*
-     * We want our action to appear as an extension when viewing files. Do
-     * this by adding a FileContext to the list of contexts.
-     */
-    FileContext files = new FileContext("Library export", "Create .mgf and .msp files from combinedHits",
-      LibraryExportForm.class);
-    contexts.add(files);
     return contexts;
   }
+
 }

trunk/contrib/SpectrumLibraryExport/src/satoshi/LibraryExportPlugin.java

@@ -192 +192 @@
   protected String getSuccessMessage()
   {
-    return "Report generated: " + outfile;
-  }
-
-
-  protected String getSuccessMessage2() // never called
-  {
-    return "Report generated: " + outfile2;
+    String retval = "Done.";
+    if (outfile != null)
+      retval += " Library exported: " + outfile;
+    if (outfile2 != null)
+      retval += " Library exported: " + outfile2;
+    return retval;
   }