minor changes according to JLint

[mir.git] / source / mircoders / servlet / ServletModuleProducer.java

diff --git a/source/mircoders/servlet/ServletModuleProducer.java b/source/mircoders/servlet/ServletModuleProducer.java
index 26af533..c6ba0ec 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleProducer.java
+++ b/source/mircoders/servlet/ServletModuleProducer.java
@@ -36,11 +36,10 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Vector;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts.util.MessageResources;
-
 import mir.generator.Generator;
 import mir.log.LoggerWrapper;
 import mir.producer.ProducerFactory;
@@ -50,18 +49,18 @@ import mir.util.HTTPRequestParser;
 import mir.util.ResourceBundleGeneratorFunction;
 import mircoders.global.MirGlobal;
 
+import org.apache.struts.util.MessageResources;
+
 public class ServletModuleProducer extends ServletModule
 {
   private static ServletModuleProducer instance = new ServletModuleProducer();
   public static ServletModule getInstance() { return instance; }
 
   Object comments;
-  Map generationData;
-  Generator generator;
   int totalNrComments;
-  List producersData;
 
   void generateResponse(String aGeneratorIdentifier, PrintWriter aWriter, Map aResponseData, Locale aLocale) {
+    Generator generator;
     try {
       generator = MirGlobal.localizer().generators().makeAdminGeneratorLibrary().makeGenerator(aGeneratorIdentifier);
       MirGlobal.localizer().producerAssistant().initializeGenerationValueSet(aResponseData);
@@ -94,7 +93,6 @@ public class ServletModuleProducer extends ServletModule
     }
   }
 
-
   public void showProducerQueueStatus(HttpServletRequest aRequest, HttpServletResponse aResponse) {
     Object comments;
     Map generationData;
@@ -144,7 +142,6 @@ public class ServletModuleProducer extends ServletModule
     /*
      * This method will only be called by external scripts (e.g. from cron jobs).
      * The output therefore is very simple.
-     *
      */
 
     try {
@@ -163,10 +160,11 @@ public class ServletModuleProducer extends ServletModule
     }
   }
 
-  public void produceAllNew(HttpServletRequest aRequest, HttpServletResponse aResponse) {
+  public void producerecipe(HttpServletRequest aRequest, HttpServletResponse aResponse) {
     try {
-      MirGlobal.localizer().producers().produceAllNew();
-      showMessage(aRequest, aResponse, "produceAllNewAddedToQueue", "", "");
+      String recipe = aRequest.getParameter("recipe");
+      MirGlobal.localizer().producers().produceRecipe(recipe);
+      showMessage(aRequest, aResponse, "recipeAddedToQueue", recipe, "");
     }
     catch (Throwable t) {
       throw new ServletModuleFailure(t);
@@ -192,9 +190,15 @@ public class ServletModuleProducer extends ServletModule
   public void cancel(HttpServletRequest aRequest, HttpServletResponse aResponse)  {
     try {
       HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);
-      List jobs = new Vector(requestParser.getParameterList("jobid"));
 
-      MirGlobal.producerEngine().cancelJobs(jobs);
+      if (requestParser.getParameter("cancelall") != null) {
+        MirGlobal.producerEngine().cancelAllJobs();
+      }
+      else {
+        List jobs = new Vector(requestParser.getParameterList("jobid"));
+
+        MirGlobal.producerEngine().cancelJobs(jobs);
+      }
       ServletHelper.redirect(aResponse, "Producer", "showProducerQueueStatus");
     }
     catch (Throwable t) {