diff --git a/.gitignore b/.gitignore index c57810ae..478a868d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ wisemapping.ipr wisemapping.iws wisemapping.iml wise-webapp/wisemapping.log +*/.DS_Store +.DS_Store diff --git a/mindplot/src/main/javascript/ImageIcon.js b/mindplot/src/main/javascript/ImageIcon.js index 4bac3275..2d30cb63 100644 --- a/mindplot/src/main/javascript/ImageIcon.js +++ b/mindplot/src/main/javascript/ImageIcon.js @@ -148,6 +148,6 @@ mindplot.ImageIcon.prototype.getUiId = function() }; -mindplot.ImageIcon.prototype.ICON_FAMILIES = [{"id": "flag", "icons" : ["flag_blue","flag_green","flag_orange","flag_pink","flag_purple","flag_yellow"]},{"id": "bullet", "icons" : ["bullet_black","bullet_blue","bullet_green","bullet_orange","bullet_red","bullet_pink","bullet_purple"]},{"id": "tag", "icons" : ["tag_blue","tag_green","tag_orange","tag_red","tag_pink","tag_yellow"]},{"id": "face", "icons" : ["face_plain","face_sad","face_crying","face_smile","face_surprise","face_wink"]},{"id": "funy", "icons" : ["funy_angel","funy_devilish","funy_glasses","funy_grin","funy_kiss","funy_monkey"]},{"id": "arrow", "icons" : ["arrow_up","arrow_down","arrow_left","arrow_right"]},{"id": "arrowc", "icons" : ["arrowc_rotate_anticlockwise","arrowc_rotate_clockwise","arrowc_turn_left","arrowc_turn_right"]},{"id": "conn", "icons" : ["conn_connect","conn_disconnect"]},{"id": "bulb", "icons" : ["bulb_light_on","bulb_light_off"]},{"id": "thumb", "icons" : ["thumb_thumb_up","thumb_thumb_down"]},{"id": "tick", "icons" : ["tick_tick","tick_cross"]},{"id": "onoff", "icons" : ["onoff_clock","onoff_clock_red","onoff_add","onoff_delete"]},{"id": "money", "icons" : ["money_money","money_dollar","money_euro","money_pound","money_yen","money_coins","money_ruby"]},{"id": "chart", "icons" : ["chart_bar","chart_line","chart_curve","chart_pie","chart_organisation"]},] +mindplot.ImageIcon.prototype.ICON_FAMILIES = [{"id": "flag", "icons" : ["flag_blue","flag_green","flag_orange","flag_pink","flag_purple","flag_yellow"]},{"id": "bullet", "icons" : ["bullet_black","bullet_blue","bullet_green","bullet_orange","bullet_red","bullet_pink","bullet_purple"]},{"id": "tag", "icons" : ["tag_blue","tag_green","tag_orange","tag_red","tag_pink","tag_yellow"]},{"id": "face", "icons" : ["face_plain","face_sad","face_crying","face_smile","face_surprise","face_wink"]},{"id": "funy", "icons" : ["funy_angel","funy_devilish","funy_glasses","funy_grin","funy_kiss","funy_monkey"]},{"id": "arrow", "icons" : ["arrow_up","arrow_down","arrow_left","arrow_right"]},{"id": "arrowc", "icons" : ["arrowc_rotate_anticlockwise","arrowc_rotate_clockwise","arrowc_turn_left","arrowc_turn_right"]},{"id": "conn", "icons" : ["conn_connect","conn_disconnect"]},{"id": "sport", "icons" : ["sport_basketball","sport_football","sport_golf","sport_raquet","sport_shuttlecock","sport_soccer","sport_tennis"]},{"id": "bulb", "icons" : ["bulb_light_on","bulb_light_off"]},{"id": "thumb", "icons" : ["thumb_thumb_up","thumb_thumb_down"]},{"id": "tick", "icons" : ["tick_tick","tick_cross"]},{"id": "onoff", "icons" : ["onoff_clock","onoff_clock_red","onoff_add","onoff_delete"]},{"id": "money", "icons" : ["money_money","money_dollar","money_euro","money_pound","money_yen","money_coins","money_ruby"]},{"id": "time", "icons" : ["time_calendar","time_clock","time_hourglass"]},{"id": "chart", "icons" : ["chart_bar","chart_line","chart_curve","chart_pie","chart_organisation"]},{"id": "sign", "icons" : ["sign_warning","sign_info","sign_stop","sign_help","sign_cancel"]},{"id": "mail", "icons" : ["mail_envelop","mail_mailbox","mail_edit"]},{"id": "object", "icons" : ["object_penguin","object_bell","object_clanbomber","object_key","object_pencil","object_phone","object_magnifier","object_clip","object_music","object_cd","object_star","object_wizard","object_house"]}] diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java index 5d81d14e..f341d3ff 100755 --- a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java +++ b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java @@ -52,9 +52,17 @@ final public class FreemindIconConverter { static { - // Map numbers icons family ... - final List bulletsImages = MindmapIcons.getIconByFamily(IconFamily.BULLET); + // By default, do a default mapping of all. The overwrite. + IconFamily[] families = IconFamily.values(); + for (IconFamily family : families) { + final List images = MindmapIcons.getIconByFamily(family); + for (MindmapIcon mindmapIcon : images) { + iconToFreeId.put(mindmapIcon, mindmapIcon.getName()); + } + } + // Now overwrite that are different ... + final List bulletsImages = MindmapIcons.getIconByFamily(IconFamily.BULLET); for (int i = 0; i < bulletsImages.size(); i++) { final MindmapIcon icon = bulletsImages.get(i); iconToFreeId.put(icon, "full-" + i); @@ -66,8 +74,6 @@ final public class FreemindIconConverter { iconToFreeId.put(MindmapIcons.TICK_CROSS, "button_cancel"); // Map arrow icons ... - iconToFreeId.put(MindmapIcons.ARROW_UP, "up"); - iconToFreeId.put(MindmapIcons.ARROW_DOWN, "down"); iconToFreeId.put(MindmapIcons.ARROW_RIGHT, "back"); iconToFreeId.put(MindmapIcons.ARROW_LEFT, "forward"); @@ -77,6 +83,23 @@ final public class FreemindIconConverter { iconToFreeId.put(MindmapIcons.FACE_SURPRISE, "smiley-oh"); iconToFreeId.put(MindmapIcons.FACE_SAD, "smiley_bad"); + // Objects mappings + iconToFreeId.put(MindmapIcons.OBJECT_KEY, "password"); + iconToFreeId.put(MindmapIcons.OBJECT_PHONE, "kaddressbook"); + iconToFreeId.put(MindmapIcons.OBJECT_STAR, "bookmark"); + iconToFreeId.put(MindmapIcons.OBJECT_MAGNIFIER, "xmag"); + iconToFreeId.put(MindmapIcons.OBJECT_CLIP, "attach"); + iconToFreeId.put(MindmapIcons.OBJECT_MUSIC, "knotify"); + iconToFreeId.put(MindmapIcons.OBJECT_HOUSE, "gohome"); + + + // Sign mapping ... + iconToFreeId.put(MindmapIcons.SIGN_WARNING, "messagebox_warning"); + iconToFreeId.put(MindmapIcons.SIGN_STOP, "stop-sign"); + + // Mail mappings + iconToFreeId.put(MindmapIcons.MAIL_ENVELOP, "Mail"); + iconToFreeId.put(MindmapIcons.MAIL_MAILBOX, "korn"); // Maps Flag familly Icons ... final List flagImages = MindmapIcons.getIconByFamily(IconFamily.FLAG); diff --git a/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java b/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java index 7ddc9d2c..050b1290 100755 --- a/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java @@ -19,20 +19,24 @@ package com.wisemapping.model; public enum IconFamily { - FLAG(), - BULLET(), - TAG(), + FLAG, + BULLET, + TAG, // NUMBER("NUMBER","number_"), - FACE(), - FUNY(), - ARROW(), - ARROWC(), - CONN(), - BULB(), - THUMB(), - TICK(), - ONOFF(), - MONEY(), - CHART(); - + FACE, + FUNY, + ARROW, + ARROWC, + CONN, + SPORT, + BULB, + THUMB, + TICK, + ONOFF, + MONEY, + TIME, + CHART, + SIGN, + MAIL, + OBJECT; } diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java index c9fab588..0211646d 100755 --- a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java @@ -24,7 +24,7 @@ import java.lang.IllegalStateException; import java.lang.reflect.Field; import java.util.*; - +@SuppressWarnings("all") public class MindmapIcons { private static Map> iconsByFamily; @@ -123,6 +123,43 @@ public class MindmapIcons { public static final MindmapIcon MONEY_CONNECT = new MindmapIcon(IconFamily.CONN, "connect"); public static final MindmapIcon MONEY_DISCONNECT = new MindmapIcon(IconFamily.CONN, "disconnect"); + public static final MindmapIcon SPORT_BASKETBALL = new MindmapIcon(IconFamily.SPORT, "basketball"); + public static final MindmapIcon SPORT_FOOTBALL = new MindmapIcon(IconFamily.SPORT, "football"); + public static final MindmapIcon SPORT_GOLF = new MindmapIcon(IconFamily.SPORT, "golf"); + public static final MindmapIcon SPORT_RAQUET = new MindmapIcon(IconFamily.SPORT, "raquet"); + public static final MindmapIcon SPORT_SHUTTLECLOCK = new MindmapIcon(IconFamily.SPORT, "shuttlecock"); + public static final MindmapIcon SPORT_SOURCE = new MindmapIcon(IconFamily.SPORT, "soccer"); + public static final MindmapIcon SPORT_TENNIS = new MindmapIcon(IconFamily.SPORT, "tennis"); + + public static final MindmapIcon TIME_CALENDAR = new MindmapIcon(IconFamily.TIME, "calendar"); + public static final MindmapIcon TIME_CLOCK = new MindmapIcon(IconFamily.TIME, "clock"); + public static final MindmapIcon TIME_HOURGLASS = new MindmapIcon(IconFamily.TIME, "hourglass"); + + + public static final MindmapIcon OBJECT_PENGUIN = new MindmapIcon(IconFamily.OBJECT, "penguin"); + public static final MindmapIcon OBJECT_BELL = new MindmapIcon(IconFamily.OBJECT, "bell"); + public static final MindmapIcon OBJECT_BOMB = new MindmapIcon(IconFamily.OBJECT, "clanbomber"); + public static final MindmapIcon OBJECT_KEY = new MindmapIcon(IconFamily.OBJECT, "key"); + public static final MindmapIcon OBJECT_PENCIL = new MindmapIcon(IconFamily.OBJECT, "pencil"); + public static final MindmapIcon OBJECT_PHONE = new MindmapIcon(IconFamily.OBJECT, "phone"); + public static final MindmapIcon OBJECT_MAGNIFIER = new MindmapIcon(IconFamily.OBJECT, "magnifier"); + public static final MindmapIcon OBJECT_CLIP = new MindmapIcon(IconFamily.OBJECT, "clip"); + public static final MindmapIcon OBJECT_MUSIC = new MindmapIcon(IconFamily.OBJECT, "music"); + public static final MindmapIcon OBJECT_CD = new MindmapIcon(IconFamily.OBJECT, "cd"); + public static final MindmapIcon OBJECT_STAR = new MindmapIcon(IconFamily.OBJECT, "star"); + public static final MindmapIcon OBJECT_WIZARD = new MindmapIcon(IconFamily.OBJECT, "wizard"); + public static final MindmapIcon OBJECT_HOUSE = new MindmapIcon(IconFamily.OBJECT, "house"); + + public static final MindmapIcon MAIL_ENVELOP = new MindmapIcon(IconFamily.MAIL, "envelop"); + public static final MindmapIcon MAIL_MAILBOX = new MindmapIcon(IconFamily.MAIL, "mailbox"); + public static final MindmapIcon MAIL_EDIT = new MindmapIcon(IconFamily.MAIL, "edit"); + + public static final MindmapIcon SIGN_WARNING = new MindmapIcon(IconFamily.SIGN, "warning"); + public static final MindmapIcon SIGN_INFO = new MindmapIcon(IconFamily.SIGN, "info"); + public static final MindmapIcon SIGN_STOP = new MindmapIcon(IconFamily.SIGN, "stop"); + public static final MindmapIcon SIGN_HELP = new MindmapIcon(IconFamily.SIGN, "help"); + public static final MindmapIcon SIGN_CANCEL = new MindmapIcon(IconFamily.SIGN , "cancel"); + @NotNull public static List getIconByFamily(@NotNull IconFamily family) { diff --git a/wise-webapp/src/main/webapp/icons/mail_edit.png b/wise-webapp/src/main/webapp/icons/mail_edit.png new file mode 100755 index 00000000..b4d31ce2 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/mail_edit.png differ diff --git a/wise-webapp/src/main/webapp/icons/mail_envelop.png b/wise-webapp/src/main/webapp/icons/mail_envelop.png new file mode 100755 index 00000000..7348aed7 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/mail_envelop.png differ diff --git a/wise-webapp/src/main/webapp/icons/mail_mailbox.png b/wise-webapp/src/main/webapp/icons/mail_mailbox.png new file mode 100755 index 00000000..8443c23e Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/mail_mailbox.png differ diff --git a/wise-webapp/src/main/webapp/icons/object_bell.png b/wise-webapp/src/main/webapp/icons/object_bell.png new file mode 100755 index 00000000..6e0015df Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/object_bell.png differ diff --git a/wise-webapp/src/main/webapp/icons/object_cd.png b/wise-webapp/src/main/webapp/icons/object_cd.png new file mode 100755 index 00000000..ef432235 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/object_cd.png differ diff --git a/wise-webapp/src/main/webapp/icons/object_clanbomber.png b/wise-webapp/src/main/webapp/icons/object_clanbomber.png new file mode 100755 index 00000000..1be37974 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/object_clanbomber.png differ diff --git a/wise-webapp/src/main/webapp/icons/object_clip.png b/wise-webapp/src/main/webapp/icons/object_clip.png new file mode 100755 index 00000000..ea897cc9 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/object_clip.png differ diff --git a/wise-webapp/src/main/webapp/icons/object_house.png b/wise-webapp/src/main/webapp/icons/object_house.png new file mode 100755 index 00000000..fed62219 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/object_house.png differ diff --git a/wise-webapp/src/main/webapp/icons/object_key.png b/wise-webapp/src/main/webapp/icons/object_key.png new file mode 100755 index 00000000..4ec1a928 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/object_key.png differ diff --git a/wise-webapp/src/main/webapp/icons/object_magnifier.png b/wise-webapp/src/main/webapp/icons/object_magnifier.png new file mode 100755 index 00000000..cf3d97f7 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/object_magnifier.png differ diff --git a/wise-webapp/src/main/webapp/icons/object_music.png b/wise-webapp/src/main/webapp/icons/object_music.png new file mode 100755 index 00000000..a8b3ede3 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/object_music.png differ diff --git a/wise-webapp/src/main/webapp/icons/object_pencil.png b/wise-webapp/src/main/webapp/icons/object_pencil.png new file mode 100755 index 00000000..0bfecd50 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/object_pencil.png differ diff --git a/wise-webapp/src/main/webapp/icons/object_penguin.png b/wise-webapp/src/main/webapp/icons/object_penguin.png new file mode 100755 index 00000000..bbefe2ec Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/object_penguin.png differ diff --git a/wise-webapp/src/main/webapp/icons/object_phone.png b/wise-webapp/src/main/webapp/icons/object_phone.png new file mode 100755 index 00000000..c39f162f Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/object_phone.png differ diff --git a/wise-webapp/src/main/webapp/icons/object_star.png b/wise-webapp/src/main/webapp/icons/object_star.png new file mode 100755 index 00000000..b88c8578 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/object_star.png differ diff --git a/wise-webapp/src/main/webapp/icons/object_wizard.png b/wise-webapp/src/main/webapp/icons/object_wizard.png new file mode 100755 index 00000000..44ccbf81 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/object_wizard.png differ diff --git a/wise-webapp/src/main/webapp/icons/sign_cancel.png b/wise-webapp/src/main/webapp/icons/sign_cancel.png new file mode 100755 index 00000000..c149c2bc Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/sign_cancel.png differ diff --git a/wise-webapp/src/main/webapp/icons/sign_exclamation.png b/wise-webapp/src/main/webapp/icons/sign_exclamation.png new file mode 100755 index 00000000..c37bd062 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/sign_exclamation.png differ diff --git a/wise-webapp/src/main/webapp/icons/sign_help.png b/wise-webapp/src/main/webapp/icons/sign_help.png new file mode 100755 index 00000000..5c870176 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/sign_help.png differ diff --git a/wise-webapp/src/main/webapp/icons/sign_info.png b/wise-webapp/src/main/webapp/icons/sign_info.png new file mode 100755 index 00000000..12cd1aef Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/sign_info.png differ diff --git a/wise-webapp/src/main/webapp/icons/sign_stop.png b/wise-webapp/src/main/webapp/icons/sign_stop.png new file mode 100755 index 00000000..0cfd5859 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/sign_stop.png differ diff --git a/wise-webapp/src/main/webapp/icons/waring_icon.png b/wise-webapp/src/main/webapp/icons/sign_warning.png old mode 100644 new mode 100755 similarity index 100% rename from wise-webapp/src/main/webapp/icons/waring_icon.png rename to wise-webapp/src/main/webapp/icons/sign_warning.png diff --git a/wise-webapp/src/main/webapp/icons/sport_basketball.png b/wise-webapp/src/main/webapp/icons/sport_basketball.png new file mode 100644 index 00000000..f7a000b9 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/sport_basketball.png differ diff --git a/wise-webapp/src/main/webapp/icons/sport_football.png b/wise-webapp/src/main/webapp/icons/sport_football.png new file mode 100644 index 00000000..199f0f7f Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/sport_football.png differ diff --git a/wise-webapp/src/main/webapp/icons/sport_golf.png b/wise-webapp/src/main/webapp/icons/sport_golf.png new file mode 100644 index 00000000..e21fa44c Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/sport_golf.png differ diff --git a/wise-webapp/src/main/webapp/icons/sport_raquet.png b/wise-webapp/src/main/webapp/icons/sport_raquet.png new file mode 100644 index 00000000..f5e0f0c2 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/sport_raquet.png differ diff --git a/wise-webapp/src/main/webapp/icons/sport_shuttlecock.png b/wise-webapp/src/main/webapp/icons/sport_shuttlecock.png new file mode 100644 index 00000000..917287fa Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/sport_shuttlecock.png differ diff --git a/wise-webapp/src/main/webapp/icons/sport_soccer.png b/wise-webapp/src/main/webapp/icons/sport_soccer.png new file mode 100644 index 00000000..3eb1828b Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/sport_soccer.png differ diff --git a/wise-webapp/src/main/webapp/icons/sport_tennis.png b/wise-webapp/src/main/webapp/icons/sport_tennis.png new file mode 100644 index 00000000..e88a6efa Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/sport_tennis.png differ diff --git a/wise-webapp/src/main/webapp/icons/time_calendar.png b/wise-webapp/src/main/webapp/icons/time_calendar.png new file mode 100755 index 00000000..9740f76e Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/time_calendar.png differ diff --git a/wise-webapp/src/main/webapp/icons/time_clock.png b/wise-webapp/src/main/webapp/icons/time_clock.png new file mode 100755 index 00000000..911da3f1 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/time_clock.png differ diff --git a/wise-webapp/src/main/webapp/icons/time_hourglass.png b/wise-webapp/src/main/webapp/icons/time_hourglass.png new file mode 100755 index 00000000..57b03ce7 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/time_hourglass.png differ diff --git a/wise-webapp/src/main/webapp/js/editor.js b/wise-webapp/src/main/webapp/js/editor.js index ada95ab4..bf6814c8 100644 --- a/wise-webapp/src/main/webapp/js/editor.js +++ b/wise-webapp/src/main/webapp/js/editor.js @@ -457,7 +457,7 @@ function afterMindpotLibraryLoading() } function buildIconChooser() { - var content = new Element('div').setStyles({width:230,height:240,padding:5}); + var content = new Element('div').setStyles({width:330,height:340,padding:5}); var count = 0; for (var i = 0; i < mindplot.ImageIcon.prototype.ICON_FAMILIES.length; i = i + 1) { diff --git a/wise-webapp/src/test/data/freemind/icons.mm b/wise-webapp/src/test/data/freemind/icons.mm index 6d64e04a..12bf8721 100644 --- a/wise-webapp/src/test/data/freemind/icons.mm +++ b/wise-webapp/src/test/data/freemind/icons.mm @@ -1,154 +1,232 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wise-webapp/src/test/data/freemind/icons.mmr b/wise-webapp/src/test/data/freemind/icons.mmr index 6359a625..30863439 100644 --- a/wise-webapp/src/test/data/freemind/icons.mmr +++ b/wise-webapp/src/test/data/freemind/icons.mmr @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/wise-webapp/src/test/java/com/wisemapping/test/model/IconsTest.java b/wise-webapp/src/test/java/com/wisemapping/test/model/IconsTest.java index b2fcfcaa..b70e53c9 100644 --- a/wise-webapp/src/test/java/com/wisemapping/test/model/IconsTest.java +++ b/wise-webapp/src/test/java/com/wisemapping/test/model/IconsTest.java @@ -12,7 +12,7 @@ import java.util.List; @Test public class IconsTest { - final private static String CURRENT_JSON_ICONS = "[{\"id\": \"flag\", \"icons\" : [\"flag_blue\",\"flag_green\",\"flag_orange\",\"flag_pink\",\"flag_purple\",\"flag_yellow\"]},{\"id\": \"bullet\", \"icons\" : [\"bullet_black\",\"bullet_blue\",\"bullet_green\",\"bullet_orange\",\"bullet_red\",\"bullet_pink\",\"bullet_purple\"]},{\"id\": \"tag\", \"icons\" : [\"tag_blue\",\"tag_green\",\"tag_orange\",\"tag_red\",\"tag_pink\",\"tag_yellow\"]},{\"id\": \"face\", \"icons\" : [\"face_plain\",\"face_sad\",\"face_crying\",\"face_smile\",\"face_surprise\",\"face_wink\"]},{\"id\": \"funy\", \"icons\" : [\"funy_angel\",\"funy_devilish\",\"funy_glasses\",\"funy_grin\",\"funy_kiss\",\"funy_monkey\"]},{\"id\": \"arrow\", \"icons\" : [\"arrow_up\",\"arrow_down\",\"arrow_left\",\"arrow_right\"]},{\"id\": \"arrowc\", \"icons\" : [\"arrowc_rotate_anticlockwise\",\"arrowc_rotate_clockwise\",\"arrowc_turn_left\",\"arrowc_turn_right\"]},{\"id\": \"conn\", \"icons\" : [\"conn_connect\",\"conn_disconnect\"]},{\"id\": \"bulb\", \"icons\" : [\"bulb_light_on\",\"bulb_light_off\"]},{\"id\": \"thumb\", \"icons\" : [\"thumb_thumb_up\",\"thumb_thumb_down\"]},{\"id\": \"tick\", \"icons\" : [\"tick_tick\",\"tick_cross\"]},{\"id\": \"onoff\", \"icons\" : [\"onoff_clock\",\"onoff_clock_red\",\"onoff_add\",\"onoff_delete\"]},{\"id\": \"money\", \"icons\" : [\"money_money\",\"money_dollar\",\"money_euro\",\"money_pound\",\"money_yen\",\"money_coins\",\"money_ruby\"]},{\"id\": \"chart\", \"icons\" : [\"chart_bar\",\"chart_line\",\"chart_curve\",\"chart_pie\",\"chart_organisation\"]},]"; + final private static String CURRENT_JSON_ICONS = "[{\"id\": \"flag\", \"icons\" : [\"flag_blue\",\"flag_green\",\"flag_orange\",\"flag_pink\",\"flag_purple\",\"flag_yellow\"]},{\"id\": \"bullet\", \"icons\" : [\"bullet_black\",\"bullet_blue\",\"bullet_green\",\"bullet_orange\",\"bullet_red\",\"bullet_pink\",\"bullet_purple\"]},{\"id\": \"tag\", \"icons\" : [\"tag_blue\",\"tag_green\",\"tag_orange\",\"tag_red\",\"tag_pink\",\"tag_yellow\"]},{\"id\": \"face\", \"icons\" : [\"face_plain\",\"face_sad\",\"face_crying\",\"face_smile\",\"face_surprise\",\"face_wink\"]},{\"id\": \"funy\", \"icons\" : [\"funy_angel\",\"funy_devilish\",\"funy_glasses\",\"funy_grin\",\"funy_kiss\",\"funy_monkey\"]},{\"id\": \"arrow\", \"icons\" : [\"arrow_up\",\"arrow_down\",\"arrow_left\",\"arrow_right\"]},{\"id\": \"arrowc\", \"icons\" : [\"arrowc_rotate_anticlockwise\",\"arrowc_rotate_clockwise\",\"arrowc_turn_left\",\"arrowc_turn_right\"]},{\"id\": \"conn\", \"icons\" : [\"conn_connect\",\"conn_disconnect\"]},{\"id\": \"sport\", \"icons\" : [\"sport_basketball\",\"sport_football\",\"sport_golf\",\"sport_raquet\",\"sport_shuttlecock\",\"sport_soccer\",\"sport_tennis\"]},{\"id\": \"bulb\", \"icons\" : [\"bulb_light_on\",\"bulb_light_off\"]},{\"id\": \"thumb\", \"icons\" : [\"thumb_thumb_up\",\"thumb_thumb_down\"]},{\"id\": \"tick\", \"icons\" : [\"tick_tick\",\"tick_cross\"]},{\"id\": \"onoff\", \"icons\" : [\"onoff_clock\",\"onoff_clock_red\",\"onoff_add\",\"onoff_delete\"]},{\"id\": \"money\", \"icons\" : [\"money_money\",\"money_dollar\",\"money_euro\",\"money_pound\",\"money_yen\",\"money_coins\",\"money_ruby\"]},{\"id\": \"time\", \"icons\" : [\"time_calendar\",\"time_clock\",\"time_hourglass\"]},{\"id\": \"chart\", \"icons\" : [\"chart_bar\",\"chart_line\",\"chart_curve\",\"chart_pie\",\"chart_organisation\"]},{\"id\": \"sign\", \"icons\" : [\"sign_warning\",\"sign_info\",\"sign_stop\",\"sign_help\",\"sign_cancel\"]},{\"id\": \"mail\", \"icons\" : [\"mail_envelop\",\"mail_mailbox\",\"mail_edit\"]},{\"id\": \"object\", \"icons\" : [\"object_penguin\",\"object_bell\",\"object_clanbomber\",\"object_key\",\"object_pencil\",\"object_phone\",\"object_magnifier\",\"object_clip\",\"object_music\",\"object_cd\",\"object_star\",\"object_wizard\",\"object_house\"]},]"; @Test void checkImagesByFamily() throws IllegalAccessException {