add label icons back-end (model and database)

config/database/hsql/apopulate-schemas.sql

@@ -30,7 +30,7 @@ INSERT INTO COLLABORATION (id, colaborator_id, properties_id, mindmap_id, role_i
 INSERT INTO COLLABORATION_PROPERTIES (id, starred, mindmap_properties) VALUES (2, 1, '{zoom:0.8}');
 INSERT INTO COLLABORATION (id, colaborator_id, properties_id, mindmap_id, role_id) VALUES (2, 2, 2, 1, 1);
 
-INSERT INTO LABEL (id, title, creator_id, parent_label_id, color) VALUES (1, 'test label', 1, NULL, '#ff0000');
+INSERT INTO LABEL (id, title, creator_id, parent_label_id, color, icon) VALUES (1, 'test label', 1, NULL, '#ff0000', 'glyphicon glyphicon-tag');
 INSERT INTO R_LABEL_MINDMAP (label_id, mindmap_id) VALUES (1,1);
 
 INSERT INTO MINDMAP (id, title, xml, description, public, creation_date, edition_date, creator_id, tags, last_editor_id) 
@@ -38,9 +38,9 @@ INSERT INTO MINDMAP (id, title, xml, description, public, creation_date, edition
 INSERT INTO COLLABORATION_PROPERTIES (id, starred, mindmap_properties) VALUES (3, 1, '{zoom:0.8}');
 INSERT INTO COLLABORATION (id, colaborator_id, properties_id, mindmap_id, role_id) VALUES (3, 2, 3, 2, 0);
 
-INSERT INTO LABEL (id, title, creator_id, parent_label_id, color) VALUES (2, 'admin label', 2, NULL, '#0000ff');
+INSERT INTO LABEL (id, title, creator_id, parent_label_id, color, icon) VALUES (2, 'admin label', 2, NULL, '#0000ff', 'glyphicon glyphicon-star');
 INSERT INTO R_LABEL_MINDMAP (label_id, mindmap_id) VALUES (2,2);
-INSERT INTO LABEL (id, title, creator_id, parent_label_id, color) VALUES (3, 'mindmap shared', 2, NULL, '#00ff00');
+INSERT INTO LABEL (id, title, creator_id, parent_label_id, color, icon) VALUES (3, 'mindmap shared', 2, NULL, '#00ff00', 'glyphicon glyphicon-share');
 INSERT INTO R_LABEL_MINDMAP (label_id, mindmap_id) VALUES (3,1);
 
 COMMIT;

config/database/hsql/create-schemas.sql

@@ -37,7 +37,8 @@ CREATE TABLE LABEL (
   title           VARCHAR(30),
   creator_id      INTEGER            NOT NULL,
   parent_label_id INTEGER,
-  color           VARCHAR(7)         NOT NULL
+  color           VARCHAR(7)         NOT NULL,
+  icon            VARCHAR(255)       NOT NULL
   --FOREIGN KEY (creator_id) REFERENCES USER (colaborator_id)
 );
 

config/database/mysql/apopulate-schemas.sql

@@ -34,7 +34,7 @@ INSERT INTO COLLABORATION (id, colaborator_id, properties_id, mindmap_id, role_i
 INSERT INTO COLLABORATION_PROPERTIES (id, starred, mindmap_properties) VALUES (2, 1, '{zoom:0.8}');
 INSERT INTO COLLABORATION (id, colaborator_id, properties_id, mindmap_id, role_id) VALUES (2, 2, 2, 1, 1);
 
-INSERT INTO LABEL (id, title, creator_id, parent_label_id, color) VALUES (1, 'test label', 1, NULL, '#ff0000');
+INSERT INTO LABEL (id, title, creator_id, parent_label_id, color, icon) VALUES (1, 'test label', 1, NULL, '#ff0000', 'glyphicon glyphicon-tag');
 INSERT INTO R_LABEL_MINDMAP (label_id, mindmap_id) VALUES (1,1);
 
 INSERT INTO MINDMAP (id, title, xml, description, public, creation_date, edition_date, creator_id, tags, last_editor_id) 
@@ -42,9 +42,9 @@ INSERT INTO MINDMAP (id, title, xml, description, public, creation_date, edition
 INSERT INTO COLLABORATION_PROPERTIES (id, starred, mindmap_properties) VALUES (3, 1, '{zoom:0.8}');
 INSERT INTO COLLABORATION (id, colaborator_id, properties_id, mindmap_id, role_id) VALUES (3, 2, 3, 2, 0);
 
-INSERT INTO LABEL (id, title, creator_id, parent_label_id, color) VALUES (2, 'admin label', 2, NULL, '#0000ff');
+INSERT INTO LABEL (id, title, creator_id, parent_label_id, color, icon) VALUES (2, 'admin label', 2, NULL, '#0000ff', 'glyphicon glyphicon-star');
 INSERT INTO R_LABEL_MINDMAP (label_id, mindmap_id) VALUES (2,2);
-INSERT INTO LABEL (id, title, creator_id, parent_label_id, color) VALUES (3, 'mindmap shared', 2, NULL, '#00ff00');
+INSERT INTO LABEL (id, title, creator_id, parent_label_id, color, icon) VALUES (3, 'mindmap shared', 2, NULL, '#00ff00', 'glyphicon glyphicon-share');
 INSERT INTO R_LABEL_MINDMAP (label_id, mindmap_id) VALUES (3,1);
 
 COMMIT;

config/database/mysql/create-schemas.sql

@@ -58,6 +58,7 @@ CREATE TABLE LABEL (
   creator_id      INTEGER            NOT NULL,
   parent_label_id INTEGER,
   color           VARCHAR(7)         NOT NULL,
+  icon            VARCHAR(255)       NOT NULL,
   FOREIGN KEY (creator_id) REFERENCES USER (colaborator_id),
   FOREIGN KEY (parent_label_id) REFERENCES LABEL (id)
     ON DELETE CASCADE

wise-webapp/src/main/java/com/wisemapping/model/Label.java

@@ -12,6 +12,7 @@ public class Label {
     @NotNull private User creator;
     @Nullable private Label parent;
     @NotNull private String color;
+    @NotNull private String icon;
 
     public void setParent(@Nullable Label parent) {
         this.parent = parent;
@@ -57,6 +58,15 @@ public class Label {
         this.color = color;
     }
 
+    @NotNull
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(@NotNull String icon) {
+        this.icon = icon;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -76,4 +86,5 @@ public class Label {
         result = 31 * result + (parent != null ? parent.hashCode() : 0);
         return result;
     }
+
 }

wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabel.java

@@ -65,10 +65,18 @@ public class RestLabel {
         label.setColor(color);
     }
 
+    public void setIcon(@NotNull final String icon) {
+        label.setIcon(icon);
+    }
+
     @Nullable public String getColor() {
         return label.getColor();
     }
 
+    @Nullable public String getIcon() {
+        return label.getIcon();
+    }
+
     @JsonIgnore
     public Label getDelegated() {
         return label;

wise-webapp/src/main/resources/com/wisemapping/model/Label.hbm.xml

@@ -11,6 +11,7 @@
         </id>
         <property name="title"/>
         <property name="color"/>
+        <property name="icon"/>
         <many-to-one name="parent" column="parent_label_id" not-null="false"/>
         <many-to-one name="creator" column="creator_id" unique="true" not-null="false" lazy="proxy"/>
     </class>