Changeset 4795

Timestamp:

06/09/08 07:20:38 (6 months ago)

Author:

risto.yrjana@…

Message:

Fix for #1783 and refactoring for java 1.5

Location:

incubator/widgets/menubar/src/com/itmill/toolkit/ui

Files:

• MenuBar.java (modified) (14 diffs)
• gwt/client/ui/IMenuBar.java (modified) (4 diffs)

incubator/widgets/menubar/src/com/itmill/toolkit/ui/MenuBar.java

@@ -18 +18 @@
 public class MenuBar extends AbstractComponent {
 
-    private List menuItems = new ArrayList(); // Items of the top-level menu
-    private static int numberOfItems = 0; // Number of items in this menu
+    // Items of the top-level menu
+    private List<MenuItem> menuItems = new ArrayList<MenuItem>();
+
+    // Number of items in this menu
+    private static int numberOfItems = 0;
 
     /** Tag is the UIDL element name for client-server communications. */
@@ -29 +32 @@
     public void paintContent(PaintTarget target) throws PaintException {
 
-        Stack iteratorStack = new Stack(); // Stack for list iterators
-
-        
+        // Superclass writes any common attributes in the paint target.
+        super.paintContent(target);
+
+        // Stack for list iterators
+        Stack<Iterator<MenuItem>> iteratorStack = new Stack<Iterator<MenuItem>>();
+
         target.startTag("items");
 
-        Iterator itr = menuItems.iterator();
+        Iterator<MenuItem> itr = menuItems.iterator();
 
         // This generates the tree from the contents of the menu
@@ -52 +58 @@
                 target.addAttribute("command", false);
             }
-            
 
             Resource icon = item.getIcon();
@@ -61 +66 @@
             if (item.hasChildren()) {
                 iteratorStack.push(itr); // For later use
-                itr = item.getChildren().iterator(); // Go through the children
+
+                // Go through the children
+                itr = item.getChildren().iterator();
             } else {
                 target.endTag("item"); // Item had no children, end description
@@ -67 +74 @@
 
             if (!itr.hasNext() && !iteratorStack.empty()) { // The end submenu
-                itr = (Iterator) iteratorStack.pop(); 
+                itr = (Iterator<MenuItem>) iteratorStack.pop();
                 target.endTag("item");
             }
@@ -78 +85 @@
     /** Deserialize changes received from client. */
     public void changeVariables(Object source, Map variables) {
-        Stack items = new Stack();
+        Stack<MenuItem> items = new Stack<MenuItem>();
         boolean found = false;
 
@@ -84 +91 @@
 
             Integer clickedId = (Integer) variables.get("clickedId");
-            Iterator itr = this.getItems().iterator();
+            Iterator<MenuItem> itr = this.getItems().iterator();
             while (itr.hasNext()) {
-                items.push(itr.next());
+                items.push((MenuItem) itr.next());
             }
 
@@ -137 +144 @@
      *                The menu items to be added
      */
-    public void addItems(java.util.List items) {
+    public void addItems(java.util.List<MenuItem> items) {
         if (items != null) {
-            Iterator itr = items.iterator();
+            Iterator<MenuItem> itr = items.iterator();
 
             while (itr.hasNext()) {
@@ -153 +160 @@
      * @return a list containing the MenuItem objects in the menubar
      */
-    public java.util.List getItems() {
+    public java.util.List<MenuItem> getItems() {
         return menuItems;
     }
@@ -207 +214 @@
         private MenuCommand itsCommand;
         private String itsText;
-        private List itsChildren;
+        private List<MenuItem> itsChildren;
         private Resource itsIcon;
         private MenuItem itsParent;
@@ -245 +252 @@
          *                A list of MenuItems to be added to the item
          */
-        public MenuItem(java.lang.String text, java.util.List children) {
+        public MenuItem(java.lang.String text, java.util.List<MenuItem> children) {
             itsId = ++numberOfItems;
             itsText = text;
@@ -270 +277 @@
 
                 if (itsChildren == null) {
-                    itsChildren = new ArrayList();
+                    itsChildren = new ArrayList<MenuItem>();
                 }
 
-                //The only place where the parent is set
+                // The only place where the parent is set
                 item.setParent(this);
                 itsChildren.add(item);
@@ -286 +293 @@
          *                A list of menu items to be added.
          */
-        public void addItems(java.util.List items) {
+        public void addItems(java.util.List<MenuItem> items) {
             if (items != null) {
 
-                Iterator itr = items.iterator();
+                Iterator<MenuItem> itr = items.iterator();
                 while (itr.hasNext()) {
                     addItem((MenuItem) itr.next());
@@ -330 +337 @@
          * @return List of children items, or null if there are none
          */
-        public java.util.List getChildren() {
+        public java.util.List<MenuItem> getChildren() {
             return itsChildren;
         }

incubator/widgets/menubar/src/com/itmill/toolkit/ui/gwt/client/ui/IMenuBar.java

@@ -17 +17 @@
 
     /** Component identifier in UIDL communications. */
-    String uidlId;
+    protected String uidlId;
 
     /** Reference to the server connection object. */
-    ApplicationConnection client;
+    protected ApplicationConnection client;
 
     /** A host reference for the Command objects */
-    final IMenuBar hostReference = this;
+    protected final IMenuBar hostReference = this;
 
     /**
@@ -66 +66 @@
         // Get tree received from server and actualize it in the GWT-MenuBar
         UIDL items = uidl.getChildUIDL(0);
-        Iterator itr = items.getChildIterator();
-        Stack iteratorStack = new Stack();
+        Iterator<UIDL> itr = items.getChildIterator();
+        Stack<Iterator<UIDL>> iteratorStack = new Stack<Iterator<UIDL>>();
+        Stack<MenuBar> menuStack = new Stack<MenuBar>();
         MenuBar currentMenu = this;
-        MenuBar parentMenu = null;
 
         // Construct an empty command to be used when the item has no command
@@ -115 +115 @@
 
             if (item.getChildCount() > 0) {
-                parentMenu = currentMenu;
+                menuStack.push(currentMenu);
                 iteratorStack.push(itr);
                 itr = item.getChildIterator();
@@ -123 +123 @@
 
             if (!itr.hasNext() && !iteratorStack.empty()) {
-                itr = (Iterator) iteratorStack.pop();
-                currentMenu = parentMenu;
+                itr = (Iterator<UIDL>) iteratorStack.pop();
+                currentMenu = menuStack.pop();
             }
         }// while