Changeset 4094

Timestamp:

Jan 13, 2011, 12:57:33 PM (12 years ago)

Author:

olle

Message:

Refs #735. Class/file action/job/ListJobs.java in client/servlet/ updated to remove the automatically added "Delete" button coupled to action DeleteItems:

1. Public method void runMe() updated to remove the automatically added "Delete" button coupled to action DeleteItems from the tool bar of the jobs table.

File:

• trunk/client/servlet/src/org/proteios/action/job/ListJobs.java (modified) (3 diffs)

trunk/client/servlet/src/org/proteios/action/job/ListJobs.java

@@ -28 +28 @@
 package org.proteios.action.job;
 
+import org.proteios.AbstractLink;
 import org.proteios.ActionLink;
 import org.proteios.action.ConfigureTableFactory2;
 import org.proteios.action.ProteiosAction;
+import org.proteios.action.write.DeleteItems;
 import org.proteios.action.write.DeleteJobs;
 import org.proteios.core.DbControl;
@@ -60 +62 @@
 import se.lu.thep.waf.constraints.InvalidParameterValue;
 
+import java.util.ArrayList;
 import java.util.List;
 
@@ -317 +320 @@
       // Get tool bar
       tb = tbl.getToolbar();
+      // Remove DeleteItems action from tool bar,
+      // as DeleteJobs action is used to delete jobs
+      if (tb != null && tb.list() != null)
+      {
+        List<AbstractLink> tbAbstractLinks = new ArrayList<AbstractLink>();
+        for (AbstractLink abstractLink: tb.list())
+        {
+          if (abstractLink instanceof ActionLink)
+          {
+            ActionLink al = (ActionLink) abstractLink;
+            // Skip original Delete action
+            if (!al.getActionId().equals(DeleteItems.class.getName()))
+            {
+              tbAbstractLinks.add(al);
+            }
+          }
+          else
+          {
+            // This case includes PopupLinks added via TableToolbarContext etc.
+            tbAbstractLinks.add(abstractLink);
+          }
+        }
+        // Replace original tool bar with modified one
+        tb.clear();
+        for (AbstractLink al: tbAbstractLinks)
+        {
+          tb.add(al);
+        }
+      }
       // Button for putting job in high priority queue
       putJobInHighPriorityQueueAction = getActionFactory().getActionLink(