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 00000000..e2672c20 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/clock.png differ 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 00000000..2842cc33 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/clock_red.png differ diff --git a/wise-webapp/src/main/webapp/icons/close.png b/wise-webapp/src/main/webapp/icons/close.png new file mode 100644 index 00000000..4de1c381 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/close.png differ 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 00000000..0ca9074d Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/coins.png differ diff --git a/wise-webapp/src/main/webapp/images/connect.png b/wise-webapp/src/main/webapp/icons/connect.png old mode 100755 new mode 100644 similarity index 100% rename from wise-webapp/src/main/webapp/images/connect.png rename to wise-webapp/src/main/webapp/icons/connect.png diff --git a/wise-webapp/src/main/webapp/images/cross.png b/wise-webapp/src/main/webapp/icons/cross.png old mode 100755 new mode 100644 similarity index 100% rename from wise-webapp/src/main/webapp/images/cross.png rename to wise-webapp/src/main/webapp/icons/cross.png diff --git a/wise-webapp/src/main/webapp/images/delNode.png b/wise-webapp/src/main/webapp/icons/delNode.png old mode 100755 new mode 100644 similarity index 100% rename from wise-webapp/src/main/webapp/images/delNode.png rename to wise-webapp/src/main/webapp/icons/delNode.png diff --git a/wise-webapp/src/main/webapp/images/delete.png b/wise-webapp/src/main/webapp/icons/delete.png old mode 100755 new mode 100644 similarity index 100% rename from wise-webapp/src/main/webapp/images/delete.png rename to wise-webapp/src/main/webapp/icons/delete.png diff --git a/wise-webapp/src/main/webapp/images/disconnect.png b/wise-webapp/src/main/webapp/icons/disconnect.png old mode 100755 new mode 100644 similarity index 100% rename from wise-webapp/src/main/webapp/images/disconnect.png rename to wise-webapp/src/main/webapp/icons/disconnect.png diff --git a/wise-webapp/src/main/webapp/images/face-angel.png b/wise-webapp/src/main/webapp/icons/face-angel.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-angel.png rename to wise-webapp/src/main/webapp/icons/face-angel.png diff --git a/wise-webapp/src/main/webapp/images/face-crying.png b/wise-webapp/src/main/webapp/icons/face-crying.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-crying.png rename to wise-webapp/src/main/webapp/icons/face-crying.png diff --git a/wise-webapp/src/main/webapp/images/face-devilish.png b/wise-webapp/src/main/webapp/icons/face-devilish.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-devilish.png rename to wise-webapp/src/main/webapp/icons/face-devilish.png diff --git a/wise-webapp/src/main/webapp/images/face-glasses.png b/wise-webapp/src/main/webapp/icons/face-glasses.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-glasses.png rename to wise-webapp/src/main/webapp/icons/face-glasses.png diff --git a/wise-webapp/src/main/webapp/images/face-grin.png b/wise-webapp/src/main/webapp/icons/face-grin.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-grin.png rename to wise-webapp/src/main/webapp/icons/face-grin.png diff --git a/wise-webapp/src/main/webapp/images/face-kiss.png b/wise-webapp/src/main/webapp/icons/face-kiss.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-kiss.png rename to wise-webapp/src/main/webapp/icons/face-kiss.png diff --git a/wise-webapp/src/main/webapp/images/face-monkey.png b/wise-webapp/src/main/webapp/icons/face-monkey.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-monkey.png rename to wise-webapp/src/main/webapp/icons/face-monkey.png diff --git a/wise-webapp/src/main/webapp/images/face-plain.png b/wise-webapp/src/main/webapp/icons/face-plain.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-plain.png rename to wise-webapp/src/main/webapp/icons/face-plain.png diff --git a/wise-webapp/src/main/webapp/images/face-sad.png b/wise-webapp/src/main/webapp/icons/face-sad.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-sad.png rename to wise-webapp/src/main/webapp/icons/face-sad.png diff --git a/wise-webapp/src/main/webapp/images/face-smile-big.png b/wise-webapp/src/main/webapp/icons/face-smile-big.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-smile-big.png rename to wise-webapp/src/main/webapp/icons/face-smile-big.png diff --git a/wise-webapp/src/main/webapp/images/face-smile.png b/wise-webapp/src/main/webapp/icons/face-smile.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-smile.png rename to wise-webapp/src/main/webapp/icons/face-smile.png diff --git a/wise-webapp/src/main/webapp/images/face-surprise.png b/wise-webapp/src/main/webapp/icons/face-surprise.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-surprise.png rename to wise-webapp/src/main/webapp/icons/face-surprise.png diff --git a/wise-webapp/src/main/webapp/images/face-wink.png b/wise-webapp/src/main/webapp/icons/face-wink.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-wink.png rename to wise-webapp/src/main/webapp/icons/face-wink.png diff --git a/wise-webapp/src/main/webapp/images/flag_blue.png b/wise-webapp/src/main/webapp/icons/flag_blue.png similarity index 100% rename from wise-webapp/src/main/webapp/images/flag_blue.png rename to wise-webapp/src/main/webapp/icons/flag_blue.png diff --git a/wise-webapp/src/main/webapp/images/flag_green.png b/wise-webapp/src/main/webapp/icons/flag_green.png similarity index 100% rename from wise-webapp/src/main/webapp/images/flag_green.png rename to wise-webapp/src/main/webapp/icons/flag_green.png diff --git a/wise-webapp/src/main/webapp/images/flag_orange.png b/wise-webapp/src/main/webapp/icons/flag_orange.png similarity index 100% rename from wise-webapp/src/main/webapp/images/flag_orange.png rename to wise-webapp/src/main/webapp/icons/flag_orange.png diff --git a/wise-webapp/src/main/webapp/images/flag_pink.png b/wise-webapp/src/main/webapp/icons/flag_pink.png similarity index 100% rename from wise-webapp/src/main/webapp/images/flag_pink.png rename to wise-webapp/src/main/webapp/icons/flag_pink.png diff --git a/wise-webapp/src/main/webapp/images/flag_purple.png b/wise-webapp/src/main/webapp/icons/flag_purple.png similarity index 100% rename from wise-webapp/src/main/webapp/images/flag_purple.png rename to wise-webapp/src/main/webapp/icons/flag_purple.png diff --git a/wise-webapp/src/main/webapp/images/flag_yellow.png b/wise-webapp/src/main/webapp/icons/flag_yellow.png similarity index 100% rename from wise-webapp/src/main/webapp/images/flag_yellow.png rename to wise-webapp/src/main/webapp/icons/flag_yellow.png diff --git a/wise-webapp/src/main/webapp/icons/icons.xml b/wise-webapp/src/main/webapp/icons/icons.xml deleted file mode 100644 index dc09f557..00000000 --- a/wise-webapp/src/main/webapp/icons/icons.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ 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 00000000..d22fde8b Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/lightbulb.png differ diff --git a/wise-webapp/src/main/webapp/icons/lightbulb_off.png b/wise-webapp/src/main/webapp/icons/lightbulb_off.png new file mode 100644 index 00000000..e95b8c5b Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/lightbulb_off.png differ diff --git a/wise-webapp/src/main/webapp/images/money.png b/wise-webapp/src/main/webapp/icons/money.png similarity index 100% rename from wise-webapp/src/main/webapp/images/money.png rename to wise-webapp/src/main/webapp/icons/money.png diff --git a/wise-webapp/src/main/webapp/images/money_dollar.png b/wise-webapp/src/main/webapp/icons/money_dollar.png similarity index 100% rename from wise-webapp/src/main/webapp/images/money_dollar.png rename to wise-webapp/src/main/webapp/icons/money_dollar.png diff --git a/wise-webapp/src/main/webapp/images/money_euro.png b/wise-webapp/src/main/webapp/icons/money_euro.png similarity index 100% rename from wise-webapp/src/main/webapp/images/money_euro.png rename to wise-webapp/src/main/webapp/icons/money_euro.png diff --git a/wise-webapp/src/main/webapp/images/money_pound.png b/wise-webapp/src/main/webapp/icons/money_pound.png similarity index 100% rename from wise-webapp/src/main/webapp/images/money_pound.png rename to wise-webapp/src/main/webapp/icons/money_pound.png diff --git a/wise-webapp/src/main/webapp/images/money_yen.png b/wise-webapp/src/main/webapp/icons/money_yen.png similarity index 100% rename from wise-webapp/src/main/webapp/images/money_yen.png rename to wise-webapp/src/main/webapp/icons/money_yen.png diff --git a/wise-webapp/src/main/webapp/icons/ruby.png b/wise-webapp/src/main/webapp/icons/ruby.png new file mode 100644 index 00000000..f763a168 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/ruby.png differ diff --git a/wise-webapp/src/main/webapp/images/tag_blue.png b/wise-webapp/src/main/webapp/icons/tag_blue.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tag_blue.png rename to wise-webapp/src/main/webapp/icons/tag_blue.png diff --git a/wise-webapp/src/main/webapp/images/tag_blue_add.png b/wise-webapp/src/main/webapp/icons/tag_blue_add.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tag_blue_add.png rename to wise-webapp/src/main/webapp/icons/tag_blue_add.png diff --git a/wise-webapp/src/main/webapp/images/tag_blue_add2.png b/wise-webapp/src/main/webapp/icons/tag_blue_add2.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tag_blue_add2.png rename to wise-webapp/src/main/webapp/icons/tag_blue_add2.png diff --git a/wise-webapp/src/main/webapp/images/tag_green.png b/wise-webapp/src/main/webapp/icons/tag_green.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tag_green.png rename to wise-webapp/src/main/webapp/icons/tag_green.png diff --git a/wise-webapp/src/main/webapp/images/tag_orange.png b/wise-webapp/src/main/webapp/icons/tag_orange.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tag_orange.png rename to wise-webapp/src/main/webapp/icons/tag_orange.png diff --git a/wise-webapp/src/main/webapp/images/tag_pink.png b/wise-webapp/src/main/webapp/icons/tag_pink.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tag_pink.png rename to wise-webapp/src/main/webapp/icons/tag_pink.png diff --git a/wise-webapp/src/main/webapp/images/tag_purple.png b/wise-webapp/src/main/webapp/icons/tag_purple.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tag_purple.png rename to wise-webapp/src/main/webapp/icons/tag_purple.png diff --git a/wise-webapp/src/main/webapp/images/tag_red.png b/wise-webapp/src/main/webapp/icons/tag_red.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tag_red.png rename to wise-webapp/src/main/webapp/icons/tag_red.png diff --git a/wise-webapp/src/main/webapp/images/tag_yellow.png b/wise-webapp/src/main/webapp/icons/tag_yellow.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tag_yellow.png rename to wise-webapp/src/main/webapp/icons/tag_yellow.png diff --git a/wise-webapp/src/main/webapp/images/thumb_down.png b/wise-webapp/src/main/webapp/icons/thumb_down.png similarity index 100% rename from wise-webapp/src/main/webapp/images/thumb_down.png rename to wise-webapp/src/main/webapp/icons/thumb_down.png diff --git a/wise-webapp/src/main/webapp/images/thumb_up.png b/wise-webapp/src/main/webapp/icons/thumb_up.png similarity index 100% rename from wise-webapp/src/main/webapp/images/thumb_up.png rename to wise-webapp/src/main/webapp/icons/thumb_up.png diff --git a/wise-webapp/src/main/webapp/icons/tick.png b/wise-webapp/src/main/webapp/icons/tick.png new file mode 100644 index 00000000..a9925a06 Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/tick.png differ diff --git a/wise-webapp/src/main/webapp/icons/waring_icon.png b/wise-webapp/src/main/webapp/icons/waring_icon.png new file mode 100644 index 00000000..628cf2da Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/waring_icon.png differ 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 @@ + + + + +