From 59a043b3b06f516c59c07577c9416a69b6962bfe Mon Sep 17 00:00:00 2001
From: =?utf8?q?Patrik=20Lindstr=C3=B6m?= <patrik@vaadin.com>
Date: Tue, 30 Jul 2013 14:14:07 +0300
Subject: [PATCH] Fix actions in action menu appearing in random order #12250

Change-Id: I77186adb94392cd317d37b9d9250f28891e6f06e
---
 server/src/com/vaadin/ui/Calendar.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/src/com/vaadin/ui/Calendar.java b/server/src/com/vaadin/ui/Calendar.java
index 8b8cc7b475..9ccc8ea2d9 100644
--- a/server/src/com/vaadin/ui/Calendar.java
+++ b/server/src/com/vaadin/ui/Calendar.java
@@ -26,7 +26,7 @@ import java.util.Date;
 import java.util.EventListener;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
@@ -573,7 +573,7 @@ public class Calendar extends AbstractComponent implements
             CalendarDateRange range = new CalendarDateRange(s, e, getTimeZone());
             Action[] actions = actionHandler.getActions(range, this);
             if (actions != null) {
-                Set<Action> actionSet = new HashSet<Action>(
+                Set<Action> actionSet = new LinkedHashSet<Action>(
                         Arrays.asList(actions));
                 actionMap.put(range, actionSet);
             }
@@ -587,7 +587,8 @@ public class Calendar extends AbstractComponent implements
                 getTimeZone());
         Action[] actions = actionHandler.getActions(range, this);
         if (actions != null) {
-            Set<Action> actionSet = new HashSet<Action>(Arrays.asList(actions));
+            Set<Action> actionSet = new LinkedHashSet<Action>(
+                    Arrays.asList(actions));
             actionMap.put(range, actionSet);
         }
     }
@@ -1872,4 +1873,4 @@ public class Calendar extends AbstractComponent implements
             dropHandler.getAcceptCriterion().paint(target);
         }
     }
-}
\ No newline at end of file
+}
-- 
2.39.5