From 632a9a6e00863b567c855984afafd200efc63521 Mon Sep 17 00:00:00 2001
From: Ezequiel Bergamaschi <ezequielbergamaschi@gmail.com>
Date: Sun, 2 Feb 2014 01:26:28 -0300
Subject: [PATCH] ordering labels on mindmap retreive

---
 wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java   | 3 ++-
 .../main/java/com/wisemapping/rest/model/RestMindmapInfo.java  | 3 ++-
 .../src/main/resources/com/wisemapping/model/Mindmap.hbm.xml   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java b/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java
index 29333a6d..c158b691 100644
--- a/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java
@@ -29,6 +29,7 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.Calendar;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 public class Mindmap {
@@ -44,7 +45,7 @@ public class Mindmap {
     private User lastEditor;
 
     private Set<Collaboration> collaborations = new HashSet<Collaboration>();
-    private Set<Label> labels = new HashSet<Label>();
+    private Set<Label> labels = new LinkedHashSet<>();
 
     private User creator;
     private String tags;
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java
index 2566d2f8..b1194739 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java
@@ -37,6 +37,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.Calendar;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 @XmlRootElement(name = "map")
@@ -97,7 +98,7 @@ public class RestMindmapInfo {
         mindmap.setTitle(title);
     }
      public Set<RestLabel> getLabels() {
-         final Set<RestLabel> result = new HashSet<>();
+         final Set<RestLabel> result = new LinkedHashSet<>();
          for (Label label : mindmap.getLabels()) {
              result.add(new RestLabel(label));
          }
diff --git a/wise-webapp/src/main/resources/com/wisemapping/model/Mindmap.hbm.xml b/wise-webapp/src/main/resources/com/wisemapping/model/Mindmap.hbm.xml
index a40c3fb3..5f3da53a 100644
--- a/wise-webapp/src/main/resources/com/wisemapping/model/Mindmap.hbm.xml
+++ b/wise-webapp/src/main/resources/com/wisemapping/model/Mindmap.hbm.xml
@@ -27,7 +27,7 @@
         </set>
 
         <set name = "labels"
-             table="R_LABEL_MINDMAP">
+             table="R_LABEL_MINDMAP" order-by="label_id">
             <key column="mindmap_id" not-null="true"/>
             <many-to-many column="label_id" class="com.wisemapping.model.Label"/>
         </set>