Changeset 5404

Timestamp:

Sep 10, 2010, 1:03:53 PM (13 years ago)

Author:

Martin Svensson

Message:

Fixes #1508 Hide "Restart job" for failed jobs if the plug-in doesn't support restarting

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/plugins/SimpleExport.java (modified) (2 diffs)
• src/core/net/sf/basedb/core/Install.java (modified) (1 diff)
• src/core/net/sf/basedb/core/plugin/NonRestartable.java (added)
• www/views/jobs/view_job.jsp (modified) (2 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/plugins/SimpleExport.java

@@ -59 +59 @@
 import net.sf.basedb.core.plugin.Plugin;
 import net.sf.basedb.core.plugin.InteractivePlugin;
+import net.sf.basedb.core.plugin.NonRestartable;
 import net.sf.basedb.core.plugin.Request;
 import net.sf.basedb.core.plugin.Response;
@@ -100 +101 @@
 public class SimpleExport
   extends AbstractExporterPlugin
-  implements InteractivePlugin, SignalTarget
+  implements InteractivePlugin, SignalTarget, NonRestartable
 {
 

trunk/src/core/net/sf/basedb/core/Install.java

@@ -669 +669 @@
         "API documentation for more details.",
         "net.sf.basedb.plugins.executor.IOSupport", null);
+      createPluginType("Non-restartable plug-in", 
+          "This is a tagging interface that should be implemented by plug-ins that " +
+          "don't support restart and reconfiguration of a job after an interrupted execution. " +
+          "This interface doesn't define any method that implementing classes should use.",
+          "net.sf.basedb.core.plugin.NonRestartable", null);
       
       createPluginDefinition("net.sf.basedb.plugins.Base1PluginExecuter", null, null, true, null, false);

trunk/www/views/jobs/view_job.jsp

@@ -42 +42 @@
   import="net.sf.basedb.core.ItemResultIterator"
   import="net.sf.basedb.core.ItemQuery"
-  import="net.sf.basedb.core.ItemResultList"
+  import="net.sf.basedb.core.ItemResultList"  
   import="net.sf.basedb.core.PermissionDeniedException"
   import="net.sf.basedb.core.PluginDefinition"
   import="net.sf.basedb.core.PluginConfiguration"
+  import="net.sf.basedb.core.PluginType"
   import="net.sf.basedb.core.ParameterInfo"
   import="net.sf.basedb.core.query.Orders"
   import="net.sf.basedb.core.query.Hql"
   import="net.sf.basedb.core.plugin.GuiContext"
+  import="net.sf.basedb.core.plugin.NonRestartable"
   import="net.sf.basedb.core.plugin.Plugin"
   import="net.sf.basedb.core.signal.SignalTransporter"
@@ -653 +655 @@
       if (job.getStatus() == Job.Status.ERROR && job.getJobType() == Job.Type.RUN_PLUGIN)
       {
-        %>
-        <base:button onclick="restartJob(0)" title="Restart job" 
-          image="refresh.gif" 
-          tooltip="Try to run this job again with the same parameters"
-        />
-        <base:button onclick="reconfigureJob()" title="Re-configure job"
-          image="runplugin.gif"
-          tooltip="Change the parameters for this job and try again"
-          visible="<%=job.hasContext()%>"
-        />
-        <%
+        boolean restartable = !job.getPluginDefinition().supports("net.sf.basedb.core.plugin.NonRestartable");        
+        if (restartable)
+        {
+          %>
+          <base:button onclick="restartJob(0)" title="Restart job" 
+            image="refresh.gif" 
+            tooltip="Try to run this job again with the same parameters"
+          />
+          <base:button onclick="reconfigureJob()" title="Re-configure job"
+            image="runplugin.gif"
+            tooltip="Change the parameters for this job and try again"
+            visible="<%=job.hasContext()%>"
+          />
+          <%
+        }
       }
       if (job.getStatus() == Job.Status.DONE && job.isDryRun())