Changeset 3952

Timestamp:

Nov 5, 2010, 10:51:24 AM (13 years ago)

Author:

olle

Message:

Refs #704. Refs #585. Refs #287. Project table tool bar updated
to remove the "Delete" button coupled to action DeleteItems,
and rename button "Trash Project" coupled to action TrashProject
to new name "Delete":

1. Class/file action/project/ListMyProjects.java in client/servlet/

updated:

1. Public method void runMe() updated to remove the "Delete" button

coupled to action DeleteItems from the tool bar of the project table.

2. Class/file gui/Toolbar.java in client/servlet/ updated:

a Public method void clear() updated to first check if instance
variable ArrayList<AbstractLink> toolbar differs from null,
before calling its clear() method.

3. English dictionary file locale/en/dictionary in client/servlet/

updated by changing the string value for key TrashProject
from "Trash Project" to "Delete".

Location:

trunk/client/servlet/src

Files:

• locale/en/dictionary (modified) (1 diff)
• org/proteios/action/project/ListMyProjects.java (modified) (3 diffs)
• org/proteios/gui/Toolbar.java (modified) (1 diff)

trunk/client/servlet/src/locale/en/dictionary

@@ -838 +838 @@
 TotalPeaks=Total Peaks
 Trashcan=Trashcan
-TrashProject=Trash Project
+TrashProject=Delete
 Trash=Trash
 TransparentCompression=Transparent compression

trunk/client/servlet/src/org/proteios/action/project/ListMyProjects.java

@@ -29 +29 @@
 
 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.core.Project;
 import org.proteios.core.data.ProjectData;
@@ -40 +42 @@
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class ListMyProjects
@@ -70 +75 @@
       // Toolbar
       Toolbar tb = tbl.getToolbar();
+      // Remove DeleteItems action from tool bar,
+      // as TrashProject action is used to delete projects
+      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);
+        }
+      }
       // Add "new project" button
       tb.add(getActionFactory().getActionLink(NewProject.class,

trunk/client/servlet/src/org/proteios/gui/Toolbar.java

@@ -51 +51 @@
   public void clear()
   {
-    toolbar.clear();
+    if (toolbar != null)
+    {
+      toolbar.clear();
+    }
   }