From 1790a20d6a9cf5df9e057df983f00fc83e7cb77b Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Mon, 21 Mar 2011 01:04:43 -0300 Subject: [PATCH] Move icons to icons directory. Now, start working on tests to check that all the icons has his image. --- mindplot/src/main/javascript/ImageIcon.js | 130 ++++----- pom.xml | 6 +- wise-webapp/pom.xml | 12 - .../freemind/FreemindIconConverter.java | 18 +- .../com/wisemapping/model/MindmapIcons.java | 268 +++++++----------- .../src/main/webapp/{images => icons}/add.png | Bin .../webapp/{images => icons}/arrow_down.gif | Bin .../webapp/{images => icons}/arrow_down.png | Bin .../webapp/{images => icons}/arrow_left.png | Bin .../webapp/{images => icons}/arrow_merge.png | Bin .../webapp/{images => icons}/arrow_right.png | Bin .../arrow_rotate_anticlockwise.png | Bin .../arrow_rotate_clockwise.png | Bin .../{images => icons}/arrow_turn_left.png | Bin .../{images => icons}/arrow_turn_right.png | Bin .../webapp/{images => icons}/arrow_up.png | Bin .../webapp/{images => icons}/bullet_black.png | Bin .../webapp/{images => icons}/bullet_blue.png | Bin .../webapp/{images => icons}/bullet_green.png | Bin .../{images => icons}/bullet_orange.png | Bin .../webapp/{images => icons}/bullet_pink.png | Bin .../{images => icons}/bullet_purple.png | Bin .../webapp/{images => icons}/bullet_red.png | Bin .../webapp/{images => icons}/chart_bar.png | Bin .../webapp/{images => icons}/chart_curve.png | Bin .../webapp/{images => icons}/chart_line.png | Bin .../{images => icons}/chart_organisation.png | Bin .../webapp/{images => icons}/chart_pie.png | Bin wise-webapp/src/main/webapp/icons/clock.png | Bin 0 -> 882 bytes .../src/main/webapp/icons/clock_red.png | Bin 0 -> 889 bytes wise-webapp/src/main/webapp/icons/close.png | Bin 0 -> 3758 bytes wise-webapp/src/main/webapp/icons/coins.png | Bin 0 -> 732 bytes .../main/webapp/{images => icons}/connect.png | Bin .../main/webapp/{images => icons}/cross.png | Bin .../main/webapp/{images => icons}/delNode.png | Bin .../main/webapp/{images => icons}/delete.png | Bin .../webapp/{images => icons}/disconnect.png | Bin .../webapp/{images => icons}/face-angel.png | Bin .../webapp/{images => icons}/face-crying.png | Bin .../{images => icons}/face-devilish.png | Bin .../webapp/{images => icons}/face-glasses.png | Bin .../webapp/{images => icons}/face-grin.png | Bin .../webapp/{images => icons}/face-kiss.png | Bin .../webapp/{images => icons}/face-monkey.png | Bin .../webapp/{images => icons}/face-plain.png | Bin .../webapp/{images => icons}/face-sad.png | Bin .../{images => icons}/face-smile-big.png | Bin .../webapp/{images => icons}/face-smile.png | Bin .../{images => icons}/face-surprise.png | Bin .../webapp/{images => icons}/face-wink.png | Bin .../webapp/{images => icons}/flag_blue.png | Bin .../webapp/{images => icons}/flag_green.png | Bin .../webapp/{images => icons}/flag_orange.png | Bin .../webapp/{images => icons}/flag_pink.png | Bin .../webapp/{images => icons}/flag_purple.png | Bin .../webapp/{images => icons}/flag_yellow.png | Bin wise-webapp/src/main/webapp/icons/icons.xml | 9 - .../src/main/webapp/icons/lightbulb.png | Bin 0 -> 782 bytes .../src/main/webapp/icons/lightbulb_off.png | Bin 0 -> 700 bytes .../main/webapp/{images => icons}/money.png | Bin .../webapp/{images => icons}/money_dollar.png | Bin .../webapp/{images => icons}/money_euro.png | Bin .../webapp/{images => icons}/money_pound.png | Bin .../webapp/{images => icons}/money_yen.png | Bin wise-webapp/src/main/webapp/icons/ruby.png | Bin 0 -> 592 bytes .../webapp/{images => icons}/tag_blue.png | Bin .../webapp/{images => icons}/tag_blue_add.png | Bin .../{images => icons}/tag_blue_add2.png | Bin .../webapp/{images => icons}/tag_green.png | Bin .../webapp/{images => icons}/tag_orange.png | Bin .../webapp/{images => icons}/tag_pink.png | Bin .../webapp/{images => icons}/tag_purple.png | Bin .../main/webapp/{images => icons}/tag_red.png | Bin .../webapp/{images => icons}/tag_yellow.png | Bin .../webapp/{images => icons}/thumb_down.png | Bin .../webapp/{images => icons}/thumb_up.png | Bin wise-webapp/src/main/webapp/icons/tick.png | Bin 0 -> 537 bytes .../src/main/webapp/icons/waring_icon.png | Bin 0 -> 666 bytes .../wisemapping/test/model/ImagesTest.java | 20 ++ wise-webapp/testng.xml | 5 + 80 files changed, 204 insertions(+), 264 deletions(-) rename wise-webapp/src/main/webapp/{images => icons}/add.png (100%) mode change 100755 => 100644 rename wise-webapp/src/main/webapp/{images => icons}/arrow_down.gif (100%) rename wise-webapp/src/main/webapp/{images => icons}/arrow_down.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/arrow_left.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/arrow_merge.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/arrow_right.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/arrow_rotate_anticlockwise.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/arrow_rotate_clockwise.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/arrow_turn_left.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/arrow_turn_right.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/arrow_up.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/bullet_black.png (100%) mode change 100755 => 100644 rename wise-webapp/src/main/webapp/{images => icons}/bullet_blue.png (100%) mode change 100755 => 100644 rename wise-webapp/src/main/webapp/{images => icons}/bullet_green.png (100%) mode change 100755 => 100644 rename wise-webapp/src/main/webapp/{images => icons}/bullet_orange.png (100%) mode change 100755 => 100644 rename wise-webapp/src/main/webapp/{images => icons}/bullet_pink.png (100%) mode change 100755 => 100644 rename wise-webapp/src/main/webapp/{images => icons}/bullet_purple.png (100%) mode change 100755 => 100644 rename wise-webapp/src/main/webapp/{images => icons}/bullet_red.png (100%) mode change 100755 => 100644 rename wise-webapp/src/main/webapp/{images => icons}/chart_bar.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/chart_curve.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/chart_line.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/chart_organisation.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/chart_pie.png (100%) create mode 100644 wise-webapp/src/main/webapp/icons/clock.png create mode 100644 wise-webapp/src/main/webapp/icons/clock_red.png create mode 100644 wise-webapp/src/main/webapp/icons/close.png create mode 100644 wise-webapp/src/main/webapp/icons/coins.png rename wise-webapp/src/main/webapp/{images => icons}/connect.png (100%) mode change 100755 => 100644 rename wise-webapp/src/main/webapp/{images => icons}/cross.png (100%) mode change 100755 => 100644 rename wise-webapp/src/main/webapp/{images => icons}/delNode.png (100%) mode change 100755 => 100644 rename wise-webapp/src/main/webapp/{images => icons}/delete.png (100%) mode change 100755 => 100644 rename wise-webapp/src/main/webapp/{images => icons}/disconnect.png (100%) mode change 100755 => 100644 rename wise-webapp/src/main/webapp/{images => icons}/face-angel.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/face-crying.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/face-devilish.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/face-glasses.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/face-grin.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/face-kiss.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/face-monkey.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/face-plain.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/face-sad.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/face-smile-big.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/face-smile.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/face-surprise.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/face-wink.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/flag_blue.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/flag_green.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/flag_orange.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/flag_pink.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/flag_purple.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/flag_yellow.png (100%) delete mode 100644 wise-webapp/src/main/webapp/icons/icons.xml create mode 100644 wise-webapp/src/main/webapp/icons/lightbulb.png create mode 100644 wise-webapp/src/main/webapp/icons/lightbulb_off.png rename wise-webapp/src/main/webapp/{images => icons}/money.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/money_dollar.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/money_euro.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/money_pound.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/money_yen.png (100%) create mode 100644 wise-webapp/src/main/webapp/icons/ruby.png rename wise-webapp/src/main/webapp/{images => icons}/tag_blue.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/tag_blue_add.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/tag_blue_add2.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/tag_green.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/tag_orange.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/tag_pink.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/tag_purple.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/tag_red.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/tag_yellow.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/thumb_down.png (100%) rename wise-webapp/src/main/webapp/{images => icons}/thumb_up.png (100%) create mode 100644 wise-webapp/src/main/webapp/icons/tick.png create mode 100644 wise-webapp/src/main/webapp/icons/waring_icon.png create mode 100644 wise-webapp/src/test/java/com/wisemapping/test/model/ImagesTest.java diff --git a/mindplot/src/main/javascript/ImageIcon.js b/mindplot/src/main/javascript/ImageIcon.js index d776b654..74de5e14 100644 --- a/mindplot/src/main/javascript/ImageIcon.js +++ b/mindplot/src/main/javascript/ImageIcon.js @@ -36,7 +36,7 @@ mindplot.ImageIcon = function(iconModel, topic, designer) { var container = new Element('div'); var removeImage = new Element('img'); - removeImage.src = "../images/bin.png"; + removeImage.src = "../icons/bin.png"; removeImage.inject(container); if (!designer._viewMode) @@ -263,87 +263,87 @@ mindplot.ImageIcon.ICON_TYPE_TASK_FIVE = mindplot.ImageIcon.ICON_FAMILIY_TASK_PR mindplot.ImageIcon.prototype.ICON_IMAGE_MAP = new Object(); //FLAG -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FLAG_BLUE] = "../images/flag_blue.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FLAG_GREEN] = "../images/flag_green.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FLAG_ORANGE] = "../images/flag_orange.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FLAG_PINK] = "../images/flag_pink.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FLAG_PURPLE] = "../images/flag_purple.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FLAG_YELLOW] = "../images/flag_yellow.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FLAG_BLUE] = "../icons/flag_blue.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FLAG_GREEN] = "../icons/flag_green.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FLAG_ORANGE] = "../icons/flag_orange.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FLAG_PINK] = "../icons/flag_pink.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FLAG_PURPLE] = "../icons/flag_purple.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FLAG_YELLOW] = "../icons/flag_yellow.png"; //BULLET -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_BLACK] = "../images/bullet_black.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_BLUE] = "../images/bullet_blue.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_GREEN] = "../images/bullet_blue.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_ORANGE] = "../images/bullet_green.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_RED] = "../images/bullet_orange.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_PINK] = "../images/bullet_pink.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_PURPLE] = "../images/bullet_purple.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_BLACK] = "../icons/bullet_black.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_BLUE] = "../icons/bullet_blue.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_GREEN] = "../icons/bullet_blue.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_ORANGE] = "../icons/bullet_green.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_RED] = "../icons/bullet_orange.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_PINK] = "../icons/bullet_pink.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_PURPLE] = "../icons/bullet_purple.png"; //TAGS -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_BLUE] = "../images/tag_blue.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_GREEN] = "../images/tag_green.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_ORANGE] = "../images/tag_orange.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_RED] = "../images/tag_red.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_PINK] = "../images/tag_pink.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_YELLOW] = "../images/tag_yellow.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_PURPLE] = "../images/tag_purple.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_BLUE] = "../icons/tag_blue.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_GREEN] = "../icons/tag_green.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_ORANGE] = "../icons/tag_orange.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_RED] = "../icons/tag_red.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_PINK] = "../icons/tag_pink.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_YELLOW] = "../icons/tag_yellow.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_PURPLE] = "../icons/tag_purple.png"; //FACES -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_ANGEL] = "../images/face-angel.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_DEVIL] = "../images/face-devilish.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_GLASSES] = "../images/face-glasses.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_KISS] = "../images/face-kiss.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_MONKEY] = "../images/face-monkey.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_PLAIN] = "../images/face-plain.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_CRYING] = "../images/face-crying.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_SAD] = "../images/face-sad.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_SMILE] = "../images/face-smile.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_SURPRISE] = "../images/face-surprise.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_WINK] = "../images/face-wink.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_ANGEL] = "../icons/face-angel.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_DEVIL] = "../icons/face-devilish.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_GLASSES] = "../icons/face-glasses.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_KISS] = "../icons/face-kiss.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_MONKEY] = "../icons/face-monkey.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_PLAIN] = "../icons/face-plain.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_CRYING] = "../icons/face-crying.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_SAD] = "../icons/face-sad.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_SMILE] = "../icons/face-smile.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_SURPRISE] = "../icons/face-surprise.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_WINK] = "../icons/face-wink.png"; //ARROWS -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROW_UP] = "../images/arrow_up.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROW_DOWN] = "../images/arrow_down.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROW_LEFT] = "../images/arrow_left.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROW_RIGHT] = "../images/arrow_right.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROW_UP] = "../icons/arrow_up.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROW_DOWN] = "../icons/arrow_down.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROW_LEFT] = "../icons/arrow_left.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROW_RIGHT] = "../icons/arrow_right.png"; // ARROWS COMPLEX. -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROWC_TURN_LEFT] = "../images/arrow_turn_left.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROWC_TURN_RIGHT] = "../images/arrow_turn_right.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROWC_UNDO] = "../images/arrow_undo.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROWC_ANTICLOCKWISE] = "../images/arrow_rotate_anticlockwise.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROWC_CLOCKWISE] = "../images/arrow_rotate_clockwise.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROWC_TURN_LEFT] = "../icons/arrow_turn_left.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROWC_TURN_RIGHT] = "../icons/arrow_turn_right.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROWC_UNDO] = "../icons/arrow_undo.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROWC_ANTICLOCKWISE] = "../icons/arrow_rotate_anticlockwise.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROWC_CLOCKWISE] = "../icons/arrow_rotate_clockwise.png"; //CHARTS -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CHART_BAR] = "../images/chart_bar.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CHART_LINE] = "../images/chart_line.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CHART_CURVE] = "../images/chart_curve.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CHART_PIE] = "../images/chart_pie.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CHART_ORGANISATION] = "../images/chart_organisation.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CHART_BAR] = "../icons/chart_bar.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CHART_LINE] = "../icons/chart_line.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CHART_CURVE] = "../icons/chart_curve.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CHART_PIE] = "../icons/chart_pie.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CHART_ORGANISATION] = "../icons/chart_organisation.png"; // THUMB -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ONOFF_THUMB_UP] = "../images/thumb_up.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ONOFF_THUMB_DOWN] = "../images/thumb_down.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ONOFF_THUMB_UP] = "../icons/thumb_up.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ONOFF_THUMB_DOWN] = "../icons/thumb_down.png"; // ON OFF -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TICK_ON] = "../images/tick.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TICK_OFF] = "../images/cross.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TICK_ON] = "../icons/tick.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TICK_OFF] = "../icons/cross.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULB_ON] = "../images/lightbulb.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULB_OFF] = "../images/lightbulb_off.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULB_ON] = "../icons/lightbulb.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULB_OFF] = "../icons/lightbulb_off.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CONNECT_ON] = "../images/connect.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CONNECT_OFF] = "../images/disconnect.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CONNECT_ON] = "../icons/connect.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CONNECT_OFF] = "../icons/disconnect.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ONOFF_CLOCK] = "../images/clock.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ONOFF_CLOCK_RED] = "../images/clock_red.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ONOFF_ADD] = "../images/add.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ONOFF_DELETE] = "../images/delete.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ONOFF_CLOCK] = "../icons/clock.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ONOFF_CLOCK_RED] = "../icons/clock_red.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ONOFF_ADD] = "../icons/add.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ONOFF_DELETE] = "../icons/delete.png"; //MONEY -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_MONEY] = "../images/money.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_DOLLAR] = "../images/money_dollar.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_EURO] = "../images/money_euro.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_POUND] = "../images/money_pound.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_YEN] = "../images/money_yen.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_COINS] = "../images/coins.png"; -mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_RUBY] = "../images/ruby.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_MONEY] = "../icons/money.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_DOLLAR] = "../icons/money_dollar.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_EURO] = "../icons/money_euro.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_POUND] = "../icons/money_pound.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_YEN] = "../icons/money_yen.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_COINS] = "../icons/coins.png"; +mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_RUBY] = "../icons/ruby.png"; //FAMILIES diff --git a/pom.xml b/pom.xml index 9e280a83..742bb3db 100644 --- a/pom.xml +++ b/pom.xml @@ -38,9 +38,9 @@ org.apache.maven.plugins true maven-resources-plugin - - UTF-8 - + + + org.apache.maven.plugins diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml index 6c819f5c..a28f8c2c 100644 --- a/wise-webapp/pom.xml +++ b/wise-webapp/pom.xml @@ -119,12 +119,6 @@ 1.5.6 compile - - org.springframework.ws - spring-ws-core-tiger - 1.5.6 - compile - org.hibernate hibernate @@ -167,12 +161,6 @@ - - com.octo.captcha - jcaptcha - 1.0 - compile - org.acegisecurity acegi-security 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 a08e25cf..5d81d14e 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 @@ -35,16 +35,13 @@ final public class FreemindIconConverter { private final static Map freeIdToIcon = new HashMap(); private final static Map iconToFreeId = new HashMap(); - private static final MindmapIcon DEFAULT_ICON = MindmapIcons.getIconByFamily(IconFamily.BULLET).get(3); - private FreemindIconConverter() { - } @Nullable public static String toWiseId(@NotNull String iconId) { final MindmapIcon result = freeIdToIcon.get(iconId); - return result!=null?result.getId():null; + return result != null ? result.getId() : null; } @Nullable @@ -55,19 +52,18 @@ final public class FreemindIconConverter { static { - // Load bullets image mapping ... + // Map numbers icons family ... 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); } - final List bulbImages = MindmapIcons.getIconByFamily(IconFamily.BULB); - iconToFreeId.put(bulbImages.get(0), "idea"); - - final List tickImages = MindmapIcons.getIconByFamily(IconFamily.TICK); - iconToFreeId.put(tickImages.get(0), "button_ok"); - iconToFreeId.put(tickImages.get(1), "button_cancel"); + // Generic mapping ... + iconToFreeId.put(MindmapIcons.BULB_LIGHT_ON, "idea"); + iconToFreeId.put(MindmapIcons.TICK_TICK, "button_ok"); + iconToFreeId.put(MindmapIcons.TICK_CROSS, "button_cancel"); // Map arrow icons ... iconToFreeId.put(MindmapIcons.ARROW_UP, "up"); 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 24b4005d..5a729524 100755 --- a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java @@ -20,11 +20,14 @@ package com.wisemapping.model; import org.jetbrains.annotations.NotNull; +import java.lang.IllegalStateException; +import java.lang.reflect.Field; import java.util.*; + public class MindmapIcons { - private static Map> images = new HashMap>(); + private static Map> iconsByFamily; public static final MindmapIcon FACE_PLAIN = new MindmapIcon(IconFamily.SMILEY, "plain"); public static final MindmapIcon FACE_SAD = new MindmapIcon(IconFamily.SMILEY, "sad"); @@ -41,179 +44,116 @@ public class MindmapIcons { public static final MindmapIcon ARROW_LEFT = new MindmapIcon(IconFamily.ARROW, "left"); public static final MindmapIcon ARROW_RIGHT = new MindmapIcon(IconFamily.ARROW, "right"); - static { - images.put(IconFamily.BULLET, getImagesBullet()); - images.put(IconFamily.FLAG, getImagesFlag()); - images.put(IconFamily.NUMBER, getImagesNumber()); - images.put(IconFamily.TAG, getImagesTag()); - images.put(IconFamily.TASK, getImagesTask()); - images.put(IconFamily.SMILEY, getImagesFaces()); - images.put(IconFamily.BULB, getImagesBulb()); - images.put(IconFamily.ARROW, getImagesArrow()); - images.put(IconFamily.ARROWC, getImagesArrowC()); - images.put(IconFamily.CONN, getImagesConn()); - images.put(IconFamily.THUMB, getImagesThumbs()); - images.put(IconFamily.TICK, getImagesTick()); - images.put(IconFamily.ONOFF, getImagesOnOff()); - images.put(IconFamily.MONEY, getImagesMoney()); - images.put(IconFamily.CHART, getImagesChart()); + public static final MindmapIcon TASK_ONE = new MindmapIcon(IconFamily.TASK, "one"); + public static final MindmapIcon TASK_TWO = new MindmapIcon(IconFamily.TASK, "two"); + public static final MindmapIcon TASK_THREE = new MindmapIcon(IconFamily.TASK, "three"); + public static final MindmapIcon TASK_FOUR = new MindmapIcon(IconFamily.TASK, "four"); + public static final MindmapIcon TASK_FIVE = new MindmapIcon(IconFamily.TASK, "five"); + + public static final MindmapIcon ARROWC_UNDO = new MindmapIcon(IconFamily.ARROWC, "undo"); + public static final MindmapIcon ARROWC_ANTICLOCK_WISE = new MindmapIcon(IconFamily.ARROWC, "rotate_anticlockwise"); + public static final MindmapIcon ARROWC_CLOCK_WISE = new MindmapIcon(IconFamily.ARROWC, "rotate_clockwise"); + public static final MindmapIcon ARROWC_LEFT = new MindmapIcon(IconFamily.ARROWC, "turn_left"); + public static final MindmapIcon ARROWC_RIGHT = new MindmapIcon(IconFamily.ARROWC, "turn_right"); + + public static final MindmapIcon BULB_LIGHT_ON = new MindmapIcon(IconFamily.BULB, "light_on"); + public static final MindmapIcon BULB_LIGHT__OFF = new MindmapIcon(IconFamily.BULB, "light_off"); + + public static final MindmapIcon TICK_TICK = new MindmapIcon(IconFamily.TICK, "tick"); + public static final MindmapIcon TICK_CROSS = new MindmapIcon(IconFamily.TICK, "cross"); + + public static final MindmapIcon CHART_BAR = new MindmapIcon(IconFamily.CHART, "bar"); + public static final MindmapIcon CHART_LINE = new MindmapIcon(IconFamily.CHART, "line"); + public static final MindmapIcon CHART_CURVE = new MindmapIcon(IconFamily.CHART, "curve"); + public static final MindmapIcon CHART_PIE = new MindmapIcon(IconFamily.CHART, "pie"); + public static final MindmapIcon CHART_ORGANISATION = new MindmapIcon(IconFamily.CHART, "organisation"); + + public static final MindmapIcon ONOFF_CLOCK = new MindmapIcon(IconFamily.ONOFF, "clock"); + public static final MindmapIcon ONOFF_CLOCK__RED = new MindmapIcon(IconFamily.ONOFF, "clock_red"); + public static final MindmapIcon ONOFF_ADD = new MindmapIcon(IconFamily.ONOFF, "add"); + public static final MindmapIcon ONOFF_DELETE = new MindmapIcon(IconFamily.ONOFF, "delete"); + + public static final MindmapIcon TAG_BLUE = new MindmapIcon(IconFamily.TAG, "blue"); + public static final MindmapIcon TAG_GREEN = new MindmapIcon(IconFamily.TAG, "green"); + public static final MindmapIcon TAG_ORANGE = new MindmapIcon(IconFamily.TAG, "orange"); + public static final MindmapIcon TAG_RED = new MindmapIcon(IconFamily.TAG, "red"); + public static final MindmapIcon TAG_PINK = new MindmapIcon(IconFamily.TAG, "pink"); + public static final MindmapIcon TAG_YELLOW = new MindmapIcon(IconFamily.TAG, "yellow"); + + public static final MindmapIcon NUMBER_ONE = new MindmapIcon(IconFamily.NUMBER, "one"); + public static final MindmapIcon NUMBER_TWO = new MindmapIcon(IconFamily.NUMBER, "two"); + public static final MindmapIcon NUMBER_THREE = new MindmapIcon(IconFamily.NUMBER, "three"); + public static final MindmapIcon NUMBER_FOUR = new MindmapIcon(IconFamily.NUMBER, "four"); + public static final MindmapIcon NUMBER_FIVE = new MindmapIcon(IconFamily.NUMBER, "five"); + public static final MindmapIcon NUMBER_SIX = new MindmapIcon(IconFamily.NUMBER, "six"); + public static final MindmapIcon NUMBER_SEVEN = new MindmapIcon(IconFamily.NUMBER, "seven"); + public static final MindmapIcon NUMBER_EIGHT = new MindmapIcon(IconFamily.NUMBER, "eight"); + public static final MindmapIcon NUMBER_NINE = new MindmapIcon(IconFamily.NUMBER, "nine"); + + public static final MindmapIcon FLAG_BLUE = new MindmapIcon(IconFamily.FLAG, "blue"); + public static final MindmapIcon FLAG_GREEN = new MindmapIcon(IconFamily.FLAG, "green"); + public static final MindmapIcon FLAG_ORANGE = new MindmapIcon(IconFamily.FLAG, "orange"); + public static final MindmapIcon FLAG_PINK = new MindmapIcon(IconFamily.FLAG, "pink"); + public static final MindmapIcon FLAG_PURPLE = new MindmapIcon(IconFamily.FLAG, "purple"); + public static final MindmapIcon FLAG_YELLOW = new MindmapIcon(IconFamily.FLAG, "yellow"); + + public static final MindmapIcon BULLET_BLACK = new MindmapIcon(IconFamily.BULLET, "black"); + public static final MindmapIcon BULLET_BLUE = new MindmapIcon(IconFamily.BULLET, "blue"); + public static final MindmapIcon BULLET_BLUEGREEN = new MindmapIcon(IconFamily.BULLET, "green"); + public static final MindmapIcon BULLET_BLUEORANGE = new MindmapIcon(IconFamily.BULLET, "orange"); + public static final MindmapIcon BULLET_BLUERED = new MindmapIcon(IconFamily.BULLET, "red"); + public static final MindmapIcon BULLET_BLUEPINK = new MindmapIcon(IconFamily.BULLET, "pink"); + public static final MindmapIcon BULLET_BLUEPURPLE = new MindmapIcon(IconFamily.BULLET, "purple"); + + public static final MindmapIcon MONEY_GENERIC = new MindmapIcon(IconFamily.MONEY, "money"); + public static final MindmapIcon MONEY_DOLLAR = new MindmapIcon(IconFamily.MONEY, "dollar"); + public static final MindmapIcon MONEY_EURO = new MindmapIcon(IconFamily.MONEY, "euro"); + public static final MindmapIcon MONEY_POUND = new MindmapIcon(IconFamily.MONEY, "pound"); + public static final MindmapIcon MONEY_YEN = new MindmapIcon(IconFamily.MONEY, "yen"); + public static final MindmapIcon MONEY_COINS = new MindmapIcon(IconFamily.MONEY, "coins"); + public static final MindmapIcon MONEY_RUBY = new MindmapIcon(IconFamily.MONEY, "ruby"); + public static final MindmapIcon MONEY_CONNECT = new MindmapIcon(IconFamily.CONN, "connect"); + public static final MindmapIcon MONEY_DISCONNECT = new MindmapIcon(IconFamily.CONN, "disconnect"); + + @NotNull + public static List getIconByFamily(@NotNull IconFamily family) { + + load(); + return iconsByFamily.get(family); } - private static List getImagesFaces() { - final List images = new ArrayList(); - images.add(FACE_PLAIN); - images.add(FACE_SAD); - images.add(FACE_CRYING); - images.add(FACE_SMILE); - images.add(FACE_SURPRISE); - images.add(FACE_WINK); - return images; - } + private static void load() { + try { + if (iconsByFamily == null) { + iconsByFamily = new HashMap>(); - private static List getImagesArrow() { - final List result = new ArrayList(); - result.add(ARROW_UP); - result.add(ARROW_DOWN); - result.add(ARROW_LEFT); - result.add(ARROW_RIGHT); - return result; - } + Field[] fields = MindmapIcons.class.getDeclaredFields(); + for (Field field : fields) { + final Object object = field.get(null); - private static List getImagesArrowC() { - final List result = new ArrayList(); - result.add(new MindmapIcon(IconFamily.ARROWC, "undo")); - result.add(new MindmapIcon(IconFamily.ARROWC, "rotate_anticlockwise")); - result.add(new MindmapIcon(IconFamily.ARROWC, "rotate_clockwise")); - result.add(new MindmapIcon(IconFamily.ARROWC, "turn_left")); - result.add(new MindmapIcon(IconFamily.ARROWC, "turn_right")); - return result; - } + if (object instanceof MindmapIcon) { - private static List getImagesBulb() { - final List images = new ArrayList(); - images.add(new MindmapIcon(IconFamily.BULB, "light_on")); - images.add(new MindmapIcon(IconFamily.BULB, "light_off")); - return images; - } - - private static List getImagesTick() { - final List images = new ArrayList(); - images.add(new MindmapIcon(IconFamily.TICK, "tick")); - images.add(new MindmapIcon(IconFamily.TICK, "cross")); - return images; - } - - private static List getImagesChart() { - final List images = new ArrayList(); - images.add(new MindmapIcon(IconFamily.CHART, "bar")); - images.add(new MindmapIcon(IconFamily.CHART, "line")); - images.add(new MindmapIcon(IconFamily.CHART, "curve")); - images.add(new MindmapIcon(IconFamily.CHART, "pie")); - images.add(new MindmapIcon(IconFamily.CHART, "organisation")); - return images; - } - - private static List getImagesOnOff() { - final List images = new ArrayList(); - images.add(new MindmapIcon(IconFamily.ONOFF, "clock")); - images.add(new MindmapIcon(IconFamily.ONOFF, "clock_red")); - images.add(new MindmapIcon(IconFamily.ONOFF, "add")); - images.add(new MindmapIcon(IconFamily.ONOFF, "delete")); - return images; - } - - private static List getImagesMoney() { - final List images = new ArrayList(); - images.add(new MindmapIcon(IconFamily.MONEY, "money")); - images.add(new MindmapIcon(IconFamily.MONEY, "dollar")); - images.add(new MindmapIcon(IconFamily.MONEY, "euro")); - images.add(new MindmapIcon(IconFamily.MONEY, "pound")); - images.add(new MindmapIcon(IconFamily.MONEY, "yen")); - images.add(new MindmapIcon(IconFamily.MONEY, "coins")); - images.add(new MindmapIcon(IconFamily.MONEY, "ruby")); - return images; - } - - private static List getImagesThumbs() { - final List images = new ArrayList(); - images.add(THUMB__UP); - images.add(THUMB_DOWN); - return images; - } - - private static List getImagesConn() { - final List images = new ArrayList(); - images.add(new MindmapIcon(IconFamily.CONN, "connect")); - images.add(new MindmapIcon(IconFamily.CONN, "disconnect")); - return images; - } - - private static List getImagesBullet() { - final List images = new ArrayList(); - images.add(new MindmapIcon(IconFamily.BULLET, "black")); - images.add(new MindmapIcon(IconFamily.BULLET, "blue")); - images.add(new MindmapIcon(IconFamily.BULLET, "green")); - images.add(new MindmapIcon(IconFamily.BULLET, "orange")); - images.add(new MindmapIcon(IconFamily.BULLET, "red")); - images.add(new MindmapIcon(IconFamily.BULLET, "pink")); - images.add(new MindmapIcon(IconFamily.BULLET, "purple")); - return images; - } - - private static List getImagesFlag() { - final List images = new ArrayList(); - images.add(new MindmapIcon(IconFamily.FLAG, "blue")); - images.add(new MindmapIcon(IconFamily.FLAG, "green")); - images.add(new MindmapIcon(IconFamily.FLAG, "orange")); - images.add(new MindmapIcon(IconFamily.FLAG, "pink")); - images.add(new MindmapIcon(IconFamily.FLAG, "purple")); - images.add(new MindmapIcon(IconFamily.FLAG, "yellow")); - return images; - } - - private static List getImagesNumber() { - final List images = new ArrayList(); - images.add(new MindmapIcon(IconFamily.NUMBER, "one")); - images.add(new MindmapIcon(IconFamily.NUMBER, "two")); - images.add(new MindmapIcon(IconFamily.NUMBER, "three")); - images.add(new MindmapIcon(IconFamily.NUMBER, "four")); - images.add(new MindmapIcon(IconFamily.NUMBER, "five")); - images.add(new MindmapIcon(IconFamily.NUMBER, "six")); - images.add(new MindmapIcon(IconFamily.NUMBER, "seven")); - images.add(new MindmapIcon(IconFamily.NUMBER, "eight")); - images.add(new MindmapIcon(IconFamily.NUMBER, "nine")); - return images; - } - - private static List getImagesTag() { - final List images = new ArrayList(); - images.add(new MindmapIcon(IconFamily.TAG, "blue")); - images.add(new MindmapIcon(IconFamily.TAG, "green")); - images.add(new MindmapIcon(IconFamily.TAG, "orange")); - images.add(new MindmapIcon(IconFamily.TAG, "red")); - images.add(new MindmapIcon(IconFamily.TAG, "pink")); - images.add(new MindmapIcon(IconFamily.TAG, "yellow")); - return images; - } - - private static List getImagesTask() { - final List images = new ArrayList(); - images.add(new MindmapIcon(IconFamily.TASK, "one")); - images.add(new MindmapIcon(IconFamily.TASK, "two")); - images.add(new MindmapIcon(IconFamily.TASK, "three")); - images.add(new MindmapIcon(IconFamily.TASK, "four")); - images.add(new MindmapIcon(IconFamily.TASK, "five")); - return images; - } + final MindmapIcon icon = (MindmapIcon) object; + final IconFamily iconFamily = icon.getFamily(); + List mindmapIcons = iconsByFamily.get(iconFamily); + if (mindmapIcons == null) { + mindmapIcons = new ArrayList(); + iconsByFamily.put(iconFamily, mindmapIcons); + } + mindmapIcons.add(icon); + } + } - public static List getIconByFamily(IconFamily family) { - return images.get(family); + } + } catch (IllegalAccessException e) { + throw new IllegalStateException(e); + } } public static MindmapIcon findById(final @NotNull String id) { - for (IconFamily imageFamily : images.keySet()) { - final List mindmapIcons = images.get(imageFamily); + for (IconFamily imageFamily : iconsByFamily.keySet()) { + final List mindmapIcons = iconsByFamily.get(imageFamily); for (MindmapIcon mindmapIcon : mindmapIcons) { if (mindmapIcon.getId().equals(id)) { return mindmapIcon; diff --git a/wise-webapp/src/main/webapp/images/add.png b/wise-webapp/src/main/webapp/icons/add.png old mode 100755 new mode 100644 similarity index 100% rename from wise-webapp/src/main/webapp/images/add.png rename to wise-webapp/src/main/webapp/icons/add.png diff --git a/wise-webapp/src/main/webapp/images/arrow_down.gif b/wise-webapp/src/main/webapp/icons/arrow_down.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_down.gif rename to wise-webapp/src/main/webapp/icons/arrow_down.gif diff --git a/wise-webapp/src/main/webapp/images/arrow_down.png b/wise-webapp/src/main/webapp/icons/arrow_down.png similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_down.png rename to wise-webapp/src/main/webapp/icons/arrow_down.png diff --git a/wise-webapp/src/main/webapp/images/arrow_left.png b/wise-webapp/src/main/webapp/icons/arrow_left.png similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_left.png rename to wise-webapp/src/main/webapp/icons/arrow_left.png diff --git a/wise-webapp/src/main/webapp/images/arrow_merge.png b/wise-webapp/src/main/webapp/icons/arrow_merge.png similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_merge.png rename to wise-webapp/src/main/webapp/icons/arrow_merge.png diff --git a/wise-webapp/src/main/webapp/images/arrow_right.png b/wise-webapp/src/main/webapp/icons/arrow_right.png similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_right.png rename to wise-webapp/src/main/webapp/icons/arrow_right.png diff --git a/wise-webapp/src/main/webapp/images/arrow_rotate_anticlockwise.png b/wise-webapp/src/main/webapp/icons/arrow_rotate_anticlockwise.png similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_rotate_anticlockwise.png rename to wise-webapp/src/main/webapp/icons/arrow_rotate_anticlockwise.png diff --git a/wise-webapp/src/main/webapp/images/arrow_rotate_clockwise.png b/wise-webapp/src/main/webapp/icons/arrow_rotate_clockwise.png similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_rotate_clockwise.png rename to wise-webapp/src/main/webapp/icons/arrow_rotate_clockwise.png diff --git a/wise-webapp/src/main/webapp/images/arrow_turn_left.png b/wise-webapp/src/main/webapp/icons/arrow_turn_left.png similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_turn_left.png rename to wise-webapp/src/main/webapp/icons/arrow_turn_left.png diff --git a/wise-webapp/src/main/webapp/images/arrow_turn_right.png b/wise-webapp/src/main/webapp/icons/arrow_turn_right.png similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_turn_right.png rename to wise-webapp/src/main/webapp/icons/arrow_turn_right.png diff --git a/wise-webapp/src/main/webapp/images/arrow_up.png b/wise-webapp/src/main/webapp/icons/arrow_up.png similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_up.png rename to wise-webapp/src/main/webapp/icons/arrow_up.png diff --git a/wise-webapp/src/main/webapp/images/bullet_black.png b/wise-webapp/src/main/webapp/icons/bullet_black.png old mode 100755 new mode 100644 similarity index 100% rename from wise-webapp/src/main/webapp/images/bullet_black.png rename to wise-webapp/src/main/webapp/icons/bullet_black.png diff --git a/wise-webapp/src/main/webapp/images/bullet_blue.png b/wise-webapp/src/main/webapp/icons/bullet_blue.png old mode 100755 new mode 100644 similarity index 100% rename from wise-webapp/src/main/webapp/images/bullet_blue.png rename to wise-webapp/src/main/webapp/icons/bullet_blue.png diff --git a/wise-webapp/src/main/webapp/images/bullet_green.png b/wise-webapp/src/main/webapp/icons/bullet_green.png old mode 100755 new mode 100644 similarity index 100% rename from wise-webapp/src/main/webapp/images/bullet_green.png rename to wise-webapp/src/main/webapp/icons/bullet_green.png diff --git a/wise-webapp/src/main/webapp/images/bullet_orange.png b/wise-webapp/src/main/webapp/icons/bullet_orange.png old mode 100755 new mode 100644 similarity index 100% rename from wise-webapp/src/main/webapp/images/bullet_orange.png rename to wise-webapp/src/main/webapp/icons/bullet_orange.png diff --git a/wise-webapp/src/main/webapp/images/bullet_pink.png b/wise-webapp/src/main/webapp/icons/bullet_pink.png old mode 100755 new mode 100644 similarity index 100% rename from wise-webapp/src/main/webapp/images/bullet_pink.png rename to wise-webapp/src/main/webapp/icons/bullet_pink.png diff --git a/wise-webapp/src/main/webapp/images/bullet_purple.png b/wise-webapp/src/main/webapp/icons/bullet_purple.png old mode 100755 new mode 100644 similarity index 100% rename from wise-webapp/src/main/webapp/images/bullet_purple.png rename to wise-webapp/src/main/webapp/icons/bullet_purple.png diff --git a/wise-webapp/src/main/webapp/images/bullet_red.png b/wise-webapp/src/main/webapp/icons/bullet_red.png old mode 100755 new mode 100644 similarity index 100% rename from wise-webapp/src/main/webapp/images/bullet_red.png rename to wise-webapp/src/main/webapp/icons/bullet_red.png diff --git a/wise-webapp/src/main/webapp/images/chart_bar.png b/wise-webapp/src/main/webapp/icons/chart_bar.png similarity index 100% rename from wise-webapp/src/main/webapp/images/chart_bar.png rename to wise-webapp/src/main/webapp/icons/chart_bar.png diff --git a/wise-webapp/src/main/webapp/images/chart_curve.png b/wise-webapp/src/main/webapp/icons/chart_curve.png similarity index 100% rename from wise-webapp/src/main/webapp/images/chart_curve.png rename to wise-webapp/src/main/webapp/icons/chart_curve.png diff --git a/wise-webapp/src/main/webapp/images/chart_line.png b/wise-webapp/src/main/webapp/icons/chart_line.png similarity index 100% rename from wise-webapp/src/main/webapp/images/chart_line.png rename to wise-webapp/src/main/webapp/icons/chart_line.png diff --git a/wise-webapp/src/main/webapp/images/chart_organisation.png b/wise-webapp/src/main/webapp/icons/chart_organisation.png similarity index 100% rename from wise-webapp/src/main/webapp/images/chart_organisation.png rename to wise-webapp/src/main/webapp/icons/chart_organisation.png diff --git a/wise-webapp/src/main/webapp/images/chart_pie.png b/wise-webapp/src/main/webapp/icons/chart_pie.png similarity index 100% rename from wise-webapp/src/main/webapp/images/chart_pie.png rename to wise-webapp/src/main/webapp/icons/chart_pie.png diff --git a/wise-webapp/src/main/webapp/icons/clock.png b/wise-webapp/src/main/webapp/icons/clock.png new file mode 100644 index 0000000000000000000000000000000000000000..e2672c20676177efb2fdea593b8f000fd5f12342 GIT binary patch literal 882 zcmV-&1C9KNP)Zkp%;s8}r$h6cUMpt8KZ&`memftw9r2BH zXZp!+CFaEnJk?xA$eKJbHrNPn>;Axd{TeCT;zL2Z2lqOE#$fse--k~9GCAnb$WrIY zUzF=05;%7ScRp;-^ba=g4+!_yjOVxZHrAy=-Qy;3W{V_ws3i3@rj zN6Uq**d4Ifp5hMksmBf!JrmJQC(GkeNV1GOW##ZtQFwF|H80+P{}RL%{YNk_%ft(I z#;Cz`v~ti@ZP83cwQ@*mu2Dwn=d>z@4RV(M%#h6&LDo!N4vuc zo|;?G=MQ0U0&vMd?WX`v6t{tSSteePbgELlMO}xKy8^QHBD{2ALkbX%5TpZC;3a)d zD?(MwgLzpdUa8!vFvP literal 0 HcmV?d00001 diff --git a/wise-webapp/src/main/webapp/icons/clock_red.png b/wise-webapp/src/main/webapp/icons/clock_red.png new file mode 100644 index 0000000000000000000000000000000000000000..2842cc3386709236ba7608965c716054c08ecfe0 GIT binary patch literal 889 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 literal 0 HcmV?d00001 diff --git a/wise-webapp/src/main/webapp/icons/coins.png b/wise-webapp/src/main/webapp/icons/coins.png new file mode 100644 index 0000000000000000000000000000000000000000..0ca9074d66e7a008dbdd265a48ff37f454941be9 GIT binary patch literal 732 zcmV<20wev2P)7$(F5I~EPw2+A2=20Sy*#|n7r8sf)7*RgqMLv3&KWmL+^F4r z7i0Z}>kq&FSJ~Z9+<5!dQFwCOz1ndvw%m_4J#=sT@Q1U19`B}1iL1?~3va{ZF~|VI zfHw0WI@T{zdi2I_>3m@YYk3d;l(JU>d+bPFLOo8G;T$3)1!qp*$dock%HEEk|V0 z3L2&;r~p>tQh+yD{T!MxBF4;%7xC6JH1CtlE}+w%Xkuu&haUcdHC?=ZKr(+GZJfIQ zJ6@GU%>XYSae67{=&NN{rB<>+N;FbBA#_{A0WZW7cXJ0E=}(_?dx9< zr?bEW55s(NboZ^^cb|S1s~AxnBh?-gQ{Ob@*3}OO`vCi&FRqICO$~lSg*6r5QDf7DTmJy^bFNy&p3d3; O0000 - - - - - - - - \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/icons/lightbulb.png b/wise-webapp/src/main/webapp/icons/lightbulb.png new file mode 100644 index 0000000000000000000000000000000000000000..d22fde8ba46eabd4335e4fa88077e80f96b92d62 GIT binary patch literal 782 zcmV+p1M&QcP)0XYhLR!1P*SpVQi>)dUV<_*6qInHGcnEb zQfX6|c{lO4l#RKaZC-XZ&u-_k%Q@eEE?Qa!_Tt0u@H@}<^E~``A^=3}gr(l4vU*i7 zyV6Lx=4yE7RGGkx6gV71cjvY=iqb#p!ylZn>j-Cf+b>x95wMRT==lzjH$f681f9ze zR{P)>$i_z3RfAovII&B>n%*Ds>XegyS_9EX5sW0f1d*FX&^tjGBX?Rzej4t{=ddW_ z9h>UH!(o9}TURNVdq{y5qM#$E1yaxnNWKtKkRh^p1YA9U=z#4*HY{(h_k{(nnF>pQ znJ2Y6(rFb^z)nJ2pnqIQ&_2v{yl+xxUhm5uO{Q#!J8DY)klFd_YP)!y2hX0`01t+}>V>!L2Ii?(iJ%bC$d(ON6}*wnOwG9V2N zOG`{7!B5mwL_|_S2m}#C`CdG|@7W+M+U(-lIXipb-}9Vv-Vy*Mg_?2)&x|dud>nH6 z+Pg4Y7{H$F@$4DL`b~nbIs5knvB+k zHj8ub763Kx9CrFf76K8`6xv9LChyt?+yu)3H}{cgBtWFDjV( zT46G1p#RVaN{MFkER1%KNN}rd=ywA89=YD?5^*~T(5|_U4sv3(jyQy?qF#!I-YIcK zeuGD!Ck%N2HSJIh+U=tYeo@e&trgAm(x7tzP$_D_zeF>F>u*g-I^VNp4(M<9KQ~%~ z3}FWb=nBN{ra3RFTFeCC z!$l`CCu*vADm$NUP}Jde?Il#nFW_p845!NWW$Et^{&SQIRV}^fRyMzZQmIB=eG~3I zc!HA^Wx-;#MFG+)=LYmWJqQGXuvo_MLh%Zf$0hUI2Iy7tvy~@~#>&eNWlKvX*<(i} i@%N3@m$wc0AN>MB3Mf9{XhoL*0000k7R5;7c zlif>`Q5?tj7Yw@ZCMtTF^Q|ZedeJhM%QPCR*bs8V79p$QTo7e94yQNXRs-{0?hOn_-8n0AMO@u1Ts zNl8QzJs1#rz%RBt?ux>l+amAvh+J!{$lkaqv}+Erb-6j2xp>K4GLQnNB*W`hFg*?P z^AL@~(h~Z+wfcWEXHqV^Tq-#z$7Y#o0;yFxA!00F}F2dX# zjE$iOgT#G4*1TR6kB1Gnn@>$meCh2a>c5YuIvFn-R2W@>4@M*m@-|jiDV?b)bccgA zyPfsMM!rjy>+1O2)5Eg29Z_*2p&qGnmS!OH?vZ(4>QB01d>j%9n4QINxkyT(Dos?I zjaWF$*IQmh`SF-?xU%xMEfjq1=6qY*g&lgG_cXv$BGoIWyfO5 zp>pdV*O+y=&6@N2WWFo(%RtT`Q(H^6zn^a%epE~Kx^mEJ{c8`luC$nc*z9j|4Ms8aJK-laHs{AQG2a)rMyf zFQK~pm1x3+7!nu%-M`k}``c>^00{o_1pjWJUTfl8mg=3qGEl8H@}^@w`VUx0_$uy4 z2FhRqKX}xI*?Tv1DJd8z#F#0c%*~rM30HE1@2o5m~}ZyoWhqv>ql{V z1ZGE0lgcoK^lx+eqc*rAX1Ky;Xx3U%u#zG!m-;eD1Qsn@kf3|F9qz~|95=&g3(7!X zB}JAT>RU;a%vaNOGnJ%e1=K6eAh43c(QN8RQ6~GP%O}Jju$~Ld*%`mO1peOSYYtbpBV}~vsBnU!_?2tr-P=|^T zED%wc9ezHgW@NMb!^uT_|SvCpFLJylbx zY%bpaTGI8IYXMN$9w<3j9VkA~NYOKEQXsj?6a9_hcwfU$acAhJhB)zb_w@MVUEy@S zX&I>K-R!bhu3?(6bHWIg$HEl7{9g>>&l_qdd+UYb(1~BCo9LptNq&8>!yoJ3Ui(i5 zRJ|XnYBklL!{@$-7=3mJ>P@1c=7Oc79e-V7yf+%lD2!I;Y&nXBZ>=B!5?CB>LvEx6 znI%n)qqi$#X#wKB(U7XP2P=+4{b@j#r%9-K(8UqtSDk>0UKzf*HM9yqMZ1D!$2MdZ zR=`U>0zhOH1XqN?nY@AQqB7)Fp4{v&dKXvb43hZKvnN8;Po;+jY*}~*Z|W9Q0W%{D z^T}Cc<|r(Su=1K=P5>Z4 zg`et&Va}tdzBS-G-ZcO)zCWpJvGQwrHZ`@wpM420ac@bI5~KkTFfGEM3sPWO8co4^fI6lPnA)Y{ef%@{+SnoUk0+dW+*{8WvF8}}l07*qoM6N<$g7cXs A&j0`b literal 0 HcmV?d00001 diff --git a/wise-webapp/src/test/java/com/wisemapping/test/model/ImagesTest.java b/wise-webapp/src/test/java/com/wisemapping/test/model/ImagesTest.java new file mode 100644 index 00000000..e01a518e --- /dev/null +++ b/wise-webapp/src/test/java/com/wisemapping/test/model/ImagesTest.java @@ -0,0 +1,20 @@ +package com.wisemapping.test.model; + + +import com.wisemapping.model.IconFamily; +import com.wisemapping.model.MindmapIcon; +import com.wisemapping.model.MindmapIcons; +import org.testng.Assert; +import org.testng.annotations.Test; + +import java.util.List; + +@Test +public class ImagesTest { + @Test + void checkImagesByFamily() throws IllegalAccessException { + List iconByFamily = MindmapIcons.getIconByFamily(IconFamily.BULLET); + Assert.assertEquals(iconByFamily.size(), 7); + } + +} diff --git a/wise-webapp/testng.xml b/wise-webapp/testng.xml index f75cd296..daba101b 100644 --- a/wise-webapp/testng.xml +++ b/wise-webapp/testng.xml @@ -6,4 +6,9 @@ + + + + +