Changeset 3933

Timestamp:

Nov 1, 2010, 1:42:25 PM (13 years ago)

Author:

olle

Message:

Refs #547. Refs #287. First version of limited number of items in the
"Select Project" menu in Proteios SE:

1. New class/file action/DummyAction.java in client/servlet/ added.

It does nothing, and returns directly. It is Intended to be used
for action links in menus, where one wants a menu item with a comment
but no action, but does not want the action link to be disabled,
as this would make the entry to be dimmed, and hard to read.

2. Class/file gui/MainMenu.java in client/servlet/ updated:
3. New private constant final int MAX_NUM_PROJECT_ITEMS added.

Its value is set to 20.

2. Private method Node createSelectProjectNode() updated to limit

the number of displayed project items to the set limit. If the
number of projects is larger, the list will be truncated, and
an ellipsis item, a separator, and a new "more projects" item
added. However, if the active project is not among the projects
listed by default, it will be inserted after the ellipsis item
and the separator, while the last project item is the default list
will be omitted. The "more projects" item will display the number
of projects not listed, e.g. "6 more" if 6 more projects exist.
Clicking on the "more projects" menu will redirect the user
to a listing of all available projects.

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

updated with new entries for various string keys.

Location:

trunk/client/servlet/src

Files:

• locale/en/dictionary (modified) (2 diffs)
• org/proteios/action/DummyAction.java (added)
• org/proteios/gui/MainMenu.java (modified) (6 diffs)

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

@@ -149 +149 @@
 Download=Download
 Edit=Edit
+EllipsisMenuItem=…
 email=email
 Email=E-mail
@@ -410 +411 @@
 Model=Model
 Modifications=Modifications
+MoreProjectsMenuItem=more
 Move=Move
 MsFile=MS File

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

@@ -17 +17 @@
 import org.proteios.action.ActionFactory;
 import org.proteios.action.ConfigureTableFactory2;
+import org.proteios.action.DummyAction;
 import org.proteios.action.ProteiosAction;
 import org.proteios.action.ShowTable;
@@ -132 +133 @@
   private static final Node separator = new Node().setActionLink(empty);
   private SessionControl sc;
+  private final int MAX_NUM_PROJECT_ITEMS = 20;
  
 
@@ -249 +251 @@
   {
     // Define
-    Node rootN, noActiveProjectN;
-    List<Node> projectNodeList;
+    Node rootN, noActiveProjectN, ellipsisN, moreProjectsN;
+    List<Node> projectNodeList; 
     String label;
     ActionLink actionLink;
     boolean selected;
     ItemQuery<Project> query;
+    int maxNumProjectItems = MAX_NUM_PROJECT_ITEMS;
     // Create
     rootN = new Node().setLabel("SelectProject");
     projectNodeList = new ArrayList<Node>(0);
     selected = false;
+    //
     label = "NoActiveProjectMenuItem";
     actionLink = actionFactory
       .getActionLink(DeactivateProject.class, label);
     noActiveProjectN = new Node(actionLink, label + "id");
+    //
+    label = "EllipsisMenuItem";
+    actionLink = actionFactory
+      .getActionLink(DummyAction.class, label);
+    ellipsisN = new Node(actionLink, label + "id");
+    //
     // Use
     // Set selection flag
@@ -283 +293 @@
       .parameter("closed")));
     query.setParameter("closed", true, null);
+    int numProjects = query.count(dc);
+    int numAddedProjectItems = 0;
+    boolean selectedFound = false;
+    boolean ellipsisItemAdded = false;
     for (Project project : query.list(dc))
     {
@@ -290 +304 @@
       {
         selected = true;
+        selectedFound = true;
       }
       label = project.getName();
@@ -301 +316 @@
       projectN.setLocalizationUsed(false);
       // Add project node to list
-      projectNodeList.add(projectN);
-    }
+      // Restrict number of added project items; always add selected project
+      if (numAddedProjectItems < (maxNumProjectItems - 1))
+      {
+        // Place for more than one more project item
+        projectNodeList.add(projectN);
+        numAddedProjectItems++;
+      }
+      else if (numAddedProjectItems == (maxNumProjectItems - 1))
+      {
+        // Place for one more project item
+        if (selectedFound)
+        {
+          // Add last project item, selected project in list
+          projectNodeList.add(projectN);
+          numAddedProjectItems++;
+        }
+        else if (activeProject == null)
+        {
+          // No project selected, add last project item
+          projectNodeList.add(projectN);
+          numAddedProjectItems++;
+        }
+        else
+        {
+          // Selected project item exists, but is not current item
+          // Add ellipsis item once, waiting for the selected item
+          if (!ellipsisItemAdded)
+          {
+            // Add "..." ellipsis item
+            projectNodeList.add(ellipsisN);
+            ellipsisItemAdded = true;
+          }
+        }
+      }
+    }
+    // Check if not all projects in menu
+    if (numProjects > maxNumProjectItems)
+    {
+      // Add "..." ellipsis item, if not already added
+      if (!ellipsisItemAdded)
+      {
+        // Add "..." ellipsis item
+        projectNodeList.add(ellipsisN);
+        ellipsisItemAdded = true;
+      }
+      // Add separator item
+      projectNodeList.add(separator);
+      // Add "<number of unlisted projects> more" node
+      String moreLabel = locale.get("MoreProjectsMenuItem");
+      int numMoreProjects = numProjects - numAddedProjectItems;
+      label = new String(numMoreProjects + " " + moreLabel);
+      actionLink = actionFactory
+        .getActionLink(ListMyProjects.class, label);
+      moreProjectsN = new Node(actionLink, label + "id");
+      projectNodeList.add(moreProjectsN);
+    }
+    // Add menu items to hierarchical menu
     for (int i = 0; i < projectNodeList.size(); i++)
     {