From a118547523f8485ef36884011f0a1911591bbe37 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Mon, 10 Jan 2022 16:51:06 -0800 Subject: [PATCH] Clen up unsed classes and resources --- .../main/java/com/wisemapping/model/Font.java | 55 ---- .../com/wisemapping/model/IconFamily.java | 50 ---- .../java/com/wisemapping/model/Mindmap.java | 7 +- .../com/wisemapping/model/MindmapIcon.java | 45 --- .../com/wisemapping/model/MindmapIcons.java | 258 ------------------ .../src/main/resources/messages_en.properties | 8 - wise-webapp/src/main/webapp/css/header.less | 14 +- wise-webapp/src/main/webapp/css/viewonly.less | 1 - 8 files changed, 4 insertions(+), 434 deletions(-) delete mode 100755 wise-webapp/src/main/java/com/wisemapping/model/Font.java delete mode 100755 wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java delete mode 100755 wise-webapp/src/main/java/com/wisemapping/model/MindmapIcon.java delete mode 100755 wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Font.java b/wise-webapp/src/main/java/com/wisemapping/model/Font.java deleted file mode 100755 index 242021cf..00000000 --- a/wise-webapp/src/main/java/com/wisemapping/model/Font.java +++ /dev/null @@ -1,55 +0,0 @@ -/* -* Copyright [2015] [wisemapping] -* -* Licensed under WiseMapping Public License, Version 1.0 (the "License"). -* It is basically the Apache License, Version 2.0 (the "License") plus the -* "powered by wisemapping" text requirement on every single page; -* you may not use this file except in compliance with the License. -* You may obtain a copy of the license at -* -* http://www.wisemapping.org/license -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package com.wisemapping.model; - -import org.jetbrains.annotations.NotNull; - -public enum Font { - - VERDANA("Verdana"), - TIMES("Times"), - TAHOMA("Tahoma"), - ARIAL("Arial"); - - private final String fontName; - - Font (String name) - { - this.fontName = name; - } - - public String getFontName() - { - return fontName; - } - - public static boolean isValidFont(@NotNull String font) { - boolean isValid = false; - try { - if (font != null) { - isValid = Font.valueOf(font.toUpperCase()) != null; - } - } - catch (IllegalArgumentException ignote) { - // Ignore ... - } - - return isValid; - } -} diff --git a/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java b/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java deleted file mode 100755 index dba4ab8a..00000000 --- a/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java +++ /dev/null @@ -1,50 +0,0 @@ -/* -* Copyright [2015] [wisemapping] -* -* Licensed under WiseMapping Public License, Version 1.0 (the "License"). -* It is basically the Apache License, Version 2.0 (the "License") plus the -* "powered by wisemapping" text requirement on every single page; -* you may not use this file except in compliance with the License. -* You may obtain a copy of the license at -* -* http://www.wisemapping.org/license -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package com.wisemapping.model; - -public enum IconFamily { - - // NUMBER("NUMBER","number_"), - FACE, - FUNY, - - CONN, - SPORT, - BULB, - THUMB, - TICK, - ONOFF, - MONEY, - TIME, - CHART, - SIGN, - HARD, - SOFT, - ARROW, - ARROWC, - PEOPLE, - MAIL, - FLAG, - BULLET, - TAG, - OBJECT, - WEATHER, - TASK, - NUMBER -} diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java b/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java index 466955de..c70c5807 100644 --- a/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java @@ -28,10 +28,7 @@ import org.jetbrains.annotations.Nullable; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; -import java.util.Calendar; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.Set; +import java.util.*; public class Mindmap { private static final String UTF_8 = "UTF-8"; @@ -264,7 +261,7 @@ public class Mindmap { @NotNull public CollaborationProperties findCollaborationProperties(@NotNull Collaborator collaborator) throws WiseMappingException { - return this.findCollaborationProperties(collaborator, true); + return Objects.requireNonNull(this.findCollaborationProperties(collaborator, true)); } @Nullable diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcon.java b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcon.java deleted file mode 100755 index b0552fd2..00000000 --- a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcon.java +++ /dev/null @@ -1,45 +0,0 @@ -/* -* Copyright [2015] [wisemapping] -* -* Licensed under WiseMapping Public License, Version 1.0 (the "License"). -* It is basically the Apache License, Version 2.0 (the "License") plus the -* "powered by wisemapping" text requirement on every single page; -* you may not use this file except in compliance with the License. -* You may obtain a copy of the license at -* -* http://www.wisemapping.org/license -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package com.wisemapping.model; - -public class MindmapIcon implements Comparable{ - private final String name; - private final IconFamily family; - - MindmapIcon(IconFamily family, String name) { - this.name = name; - this.family = family; - } - - public String getName() { - return name; - } - - public IconFamily getFamily() { - return family; - } - - public String getId() { - return family.name().toLowerCase() + "_" + name; - } - - public int compareTo(Object o) { - return ((MindmapIcon)o).getId().compareTo(this.getId()); - } -} diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java deleted file mode 100755 index 28195520..00000000 --- a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java +++ /dev/null @@ -1,258 +0,0 @@ -/* -* Copyright [2015] [wisemapping] -* -* Licensed under WiseMapping Public License, Version 1.0 (the "License"). -* It is basically the Apache License, Version 2.0 (the "License") plus the -* "powered by wisemapping" text requirement on every single page; -* you may not use this file except in compliance with the License. -* You may obtain a copy of the license at -* -* http://www.wisemapping.org/license -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package com.wisemapping.model; - -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - -@SuppressWarnings({"UnusedDeclaration"}) -public class MindmapIcons { - - private static Map> iconsByFamily; - - public static final MindmapIcon FACE_PLAIN = new MindmapIcon(IconFamily.FACE, "plain"); - public static final MindmapIcon FACE_SAD = new MindmapIcon(IconFamily.FACE, "sad"); - public static final MindmapIcon FACE_CRYING = new MindmapIcon(IconFamily.FACE, "crying"); - public static final MindmapIcon FACE_SMILE = new MindmapIcon(IconFamily.FACE, "smile"); - public static final MindmapIcon FACE_SURPRISE = new MindmapIcon(IconFamily.FACE, "surprise"); - public static final MindmapIcon FACE_WINK = new MindmapIcon(IconFamily.FACE, "wink"); - - public static final MindmapIcon THUMB__UP = new MindmapIcon(IconFamily.THUMB, "thumb_up"); - public static final MindmapIcon THUMB_DOWN = new MindmapIcon(IconFamily.THUMB, "thumb_down"); - - - public static final MindmapIcon ARROW_UP = new MindmapIcon(IconFamily.ARROW, "up"); - public static final MindmapIcon ARROW_DOWN = new MindmapIcon(IconFamily.ARROW, "down"); - public static final MindmapIcon ARROW_LEFT = new MindmapIcon(IconFamily.ARROW, "left"); - public static final MindmapIcon ARROW_RIGHT = new MindmapIcon(IconFamily.ARROW, "right"); - - // 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 ONOFF_STATUS_OFFLINE = new MindmapIcon(IconFamily.ONOFF, "status_offline"); - public static final MindmapIcon ONOFF_STATUS_ONLINE = new MindmapIcon(IconFamily.ONOFF, "status_online"); - - - 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 TAG_PURPLE = new MindmapIcon(IconFamily.TAG, "purple"); - - public static final MindmapIcon NUMBER_1 = new MindmapIcon(IconFamily.NUMBER, "1"); - public static final MindmapIcon NUMBER_2 = new MindmapIcon(IconFamily.NUMBER, "2"); - public static final MindmapIcon NUMBER_3 = new MindmapIcon(IconFamily.NUMBER, "3"); - public static final MindmapIcon NUMBER_4 = new MindmapIcon(IconFamily.NUMBER, "4"); - public static final MindmapIcon NUMBER_5 = new MindmapIcon(IconFamily.NUMBER, "5"); - public static final MindmapIcon NUMBER_6 = new MindmapIcon(IconFamily.NUMBER, "6"); - public static final MindmapIcon NUMBER_7 = new MindmapIcon(IconFamily.NUMBER, "7"); - public static final MindmapIcon NUMBER_8 = new MindmapIcon(IconFamily.NUMBER, "8"); - public static final MindmapIcon NUMBER_9 = new MindmapIcon(IconFamily.NUMBER, "9"); - - public static final MindmapIcon TASK_0 = new MindmapIcon(IconFamily.TASK, "0"); - public static final MindmapIcon TASK_25 = new MindmapIcon(IconFamily.TASK, "25"); - public static final MindmapIcon TASK_50 = new MindmapIcon(IconFamily.TASK, "50"); - public static final MindmapIcon TASK_75 = new MindmapIcon(IconFamily.TASK, "75"); - public static final MindmapIcon TASK_100 = new MindmapIcon(IconFamily.TASK, "100"); - - - public static final MindmapIcon FUNNY_ANGEL = new MindmapIcon(IconFamily.FUNY, "angel"); - public static final MindmapIcon FUNNY_DEVILISH = new MindmapIcon(IconFamily.FUNY, "devilish"); - public static final MindmapIcon FUNNY_GLASSES = new MindmapIcon(IconFamily.FUNY, "glasses"); - public static final MindmapIcon FUNNY_GRIN = new MindmapIcon(IconFamily.FUNY, "grin"); - public static final MindmapIcon FUNNY_KISS = new MindmapIcon(IconFamily.FUNY, "kiss"); - public static final MindmapIcon FUNNY_MONKEY = new MindmapIcon(IconFamily.FUNY, "monkey"); - - 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"); - - public static final MindmapIcon SPORT_BASKETBALL = new MindmapIcon(IconFamily.SPORT, "basketball"); - public static final MindmapIcon SPORT_FOOTBALL = new MindmapIcon(IconFamily.SPORT, "football"); - public static final MindmapIcon SPORT_GOLF = new MindmapIcon(IconFamily.SPORT, "golf"); - public static final MindmapIcon SPORT_RAQUET = new MindmapIcon(IconFamily.SPORT, "raquet"); - public static final MindmapIcon SPORT_SHUTTLECLOCK = new MindmapIcon(IconFamily.SPORT, "shuttlecock"); - public static final MindmapIcon SPORT_SOURCE = new MindmapIcon(IconFamily.SPORT, "soccer"); - public static final MindmapIcon SPORT_TENNIS = new MindmapIcon(IconFamily.SPORT, "tennis"); - - public static final MindmapIcon TIME_CALENDAR = new MindmapIcon(IconFamily.TIME, "calendar"); - public static final MindmapIcon TIME_CLOCK = new MindmapIcon(IconFamily.TIME, "clock"); - public static final MindmapIcon TIME_HOURGLASS = new MindmapIcon(IconFamily.TIME, "hourglass"); - - - public static final MindmapIcon OBJECT_BELL = new MindmapIcon(IconFamily.OBJECT, "bell"); - public static final MindmapIcon OBJECT_BOMB = new MindmapIcon(IconFamily.OBJECT, "clanbomber"); - public static final MindmapIcon OBJECT_KEY = new MindmapIcon(IconFamily.OBJECT, "key"); - public static final MindmapIcon OBJECT_PENCIL = new MindmapIcon(IconFamily.OBJECT, "pencil"); - public static final MindmapIcon OBJECT_PHONE = new MindmapIcon(IconFamily.OBJECT, "phone"); - public static final MindmapIcon OBJECT_MAGNIFIER = new MindmapIcon(IconFamily.OBJECT, "magnifier"); - public static final MindmapIcon OBJECT_CLIP = new MindmapIcon(IconFamily.OBJECT, "clip"); - public static final MindmapIcon OBJECT_MUSIC = new MindmapIcon(IconFamily.OBJECT, "music"); - public static final MindmapIcon OBJECT_STAR = new MindmapIcon(IconFamily.OBJECT, "star"); - public static final MindmapIcon OBJECT_WIZARD = new MindmapIcon(IconFamily.OBJECT, "wizard"); - public static final MindmapIcon OBJECT_HOUSE = new MindmapIcon(IconFamily.OBJECT, "house"); - public static final MindmapIcon OBJECT_CAKE = new MindmapIcon(IconFamily.OBJECT, "cake"); - public static final MindmapIcon OBJECT_CAMERA = new MindmapIcon(IconFamily.OBJECT, "camera"); - public static final MindmapIcon OBJECT_PALETTE = new MindmapIcon(IconFamily.OBJECT, "palette"); - public static final MindmapIcon OBJECT_RAINBOW = new MindmapIcon(IconFamily.OBJECT, "rainbow"); - - - public static final MindmapIcon WEATHER_CLEAR_NIGHT = new MindmapIcon(IconFamily.WEATHER, "clear-night"); - public static final MindmapIcon WEATHER_CLEAR = new MindmapIcon(IconFamily.WEATHER, "clear"); - public static final MindmapIcon WEATHER_FEW_CLOUDS_NIGHT = new MindmapIcon(IconFamily.WEATHER, "few-clouds-night"); - public static final MindmapIcon WEATHER_FEW_CLOUDS = new MindmapIcon(IconFamily.WEATHER, "few-clouds"); - public static final MindmapIcon WEATHER_OVERCAST = new MindmapIcon(IconFamily.WEATHER, "overcast"); - public static final MindmapIcon WEATHER_SEVERE_ALERT = new MindmapIcon(IconFamily.WEATHER, "severe-alert"); - public static final MindmapIcon WEATHER_SHOWERS_SCATTERED = new MindmapIcon(IconFamily.WEATHER, "showers-scattered"); - public static final MindmapIcon WEATHER_SHOWERS = new MindmapIcon(IconFamily.WEATHER, "showers"); - public static final MindmapIcon WEATHER_SNOW = new MindmapIcon(IconFamily.WEATHER, "snow"); - public static final MindmapIcon WEATHER_STORM = new MindmapIcon(IconFamily.WEATHER, "storm"); - - public static final MindmapIcon MAIL_ENVELOP = new MindmapIcon(IconFamily.MAIL, "envelop"); - public static final MindmapIcon MAIL_MAILBOX = new MindmapIcon(IconFamily.MAIL, "mailbox"); - public static final MindmapIcon MAIL_EDIT = new MindmapIcon(IconFamily.MAIL, "edit"); - public static final MindmapIcon MAIL_LIST = new MindmapIcon(IconFamily.MAIL, "list"); - - - public static final MindmapIcon SIGN_WARNING = new MindmapIcon(IconFamily.SIGN, "warning"); - public static final MindmapIcon SIGN_INFO = new MindmapIcon(IconFamily.SIGN, "info"); - public static final MindmapIcon SIGN_STOP = new MindmapIcon(IconFamily.SIGN, "stop"); - public static final MindmapIcon SIGN_HELP = new MindmapIcon(IconFamily.SIGN, "help"); - public static final MindmapIcon SIGN_CANCEL = new MindmapIcon(IconFamily.SIGN, "cancel"); - - public static final MindmapIcon HARD_CD = new MindmapIcon(IconFamily.HARD, "cd"); - public static final MindmapIcon HARD_COMPUTER = new MindmapIcon(IconFamily.HARD, "computer"); - public static final MindmapIcon HARD_CONTROLLER = new MindmapIcon(IconFamily.HARD, "controller"); - public static final MindmapIcon HARD_DRIVER_DISK = new MindmapIcon(IconFamily.HARD, "driver_disk"); - public static final MindmapIcon HARD_IPOD = new MindmapIcon(IconFamily.HARD, "ipod"); - public static final MindmapIcon HARD_KEYBOARD = new MindmapIcon(IconFamily.HARD, "keyboard"); - public static final MindmapIcon HARD_MOUSE = new MindmapIcon(IconFamily.HARD, "mouse"); - public static final MindmapIcon HARD_PRINTER = new MindmapIcon(IconFamily.HARD, "printer"); - - public static final MindmapIcon SOFT_BUG = new MindmapIcon(IconFamily.SOFT, "bug"); - public static final MindmapIcon SOFT_CURSOR = new MindmapIcon(IconFamily.SOFT, "cursor"); - public static final MindmapIcon SOFT_DATABASE_TABLE = new MindmapIcon(IconFamily.SOFT, "database_table"); - public static final MindmapIcon SOFT_DATABASE = new MindmapIcon(IconFamily.SOFT, "database"); - public static final MindmapIcon SOFT_FEED = new MindmapIcon(IconFamily.SOFT, "feed"); - public static final MindmapIcon SOFT_FOLDER_EXPORE = new MindmapIcon(IconFamily.SOFT, "folder_explore"); - public static final MindmapIcon SOFT_RSS = new MindmapIcon(IconFamily.SOFT, "rss"); - public static final MindmapIcon SOFT_PENGUIN = new MindmapIcon(IconFamily.SOFT, "penguin"); - - public static final MindmapIcon PEOPLE_GROUP = new MindmapIcon(IconFamily.PEOPLE, "group"); - public static final MindmapIcon PEOPLE_MALE = new MindmapIcon(IconFamily.PEOPLE, "male1"); - public static final MindmapIcon PEOPLE_MALE2 = new MindmapIcon(IconFamily.PEOPLE, "male2"); - public static final MindmapIcon PEOPLE_FEMALE = new MindmapIcon(IconFamily.PEOPLE, "female1"); - public static final MindmapIcon PEOPLE_FEMALE2 = new MindmapIcon(IconFamily.PEOPLE, "female2"); - - - public static List getIconByFamily(@NotNull IconFamily family) { - - load(); - return iconsByFamily.get(family); - } - - private static void load() { - try { - if (iconsByFamily == null) { - iconsByFamily = new TreeMap<>(); - - Field[] fields = MindmapIcons.class.getDeclaredFields(); - for (Field field : fields) { - final Object object = field.get(null); - - if (object instanceof MindmapIcon) { - - 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); - } - } - - - } - } catch (IllegalAccessException e) { - throw new IllegalStateException(e); - } - } - - public static MindmapIcon findById(final @NotNull String id) { - for (IconFamily imageFamily : iconsByFamily.keySet()) { - final List mindmapIcons = iconsByFamily.get(imageFamily); - for (MindmapIcon mindmapIcon : mindmapIcons) { - if (mindmapIcon.getId().equals(id)) { - return mindmapIcon; - } - } - } - - throw new IllegalArgumentException("Image could not be found. Id:" + id); - } -} diff --git a/wise-webapp/src/main/resources/messages_en.properties b/wise-webapp/src/main/resources/messages_en.properties index a6457600..deedee7f 100644 --- a/wise-webapp/src/main/resources/messages_en.properties +++ b/wise-webapp/src/main/resources/messages_en.properties @@ -4,22 +4,14 @@ NAME=Name DESCRIPTION=Description ADD=Add VIEWERS=Viewers -USER_REGISTRATION=User Registration -SEND_ME_A_NEW_PASSWORD=Send Me A New Password CANCEL=Cancel FIRSTNAME=First Name -LASTNAME=Last Name EMAIL=Email HELP=Help LOGOUT=Logout PASSWORD=Password -NEW_PASSWORD=New password -CONFIRM_NEW_PASSWORD=Confirm new password DELETE__ACCOUNT=Delete My Account -MY_WISEMAPS=My Wisemaps -RETYPE_PASSWORD=Retype Password REGISTER=Register -REMEMBER_ME=Stay signed in SIGN_IN=Sign In SIGN_UP=Sign Up ACCOUNT=Account diff --git a/wise-webapp/src/main/webapp/css/header.less b/wise-webapp/src/main/webapp/css/header.less index 617425e4..e548dfff 100644 --- a/wise-webapp/src/main/webapp/css/header.less +++ b/wise-webapp/src/main/webapp/css/header.less @@ -2,20 +2,10 @@ div#header { width: 100%; - height: 0px; - background: #202020; - z-index: 1000; + height:@header-toolbar-height; position: absolute; top: 0; -} - -div#headerActions span { - border-bottom: 3px solid rgb(247, 201, 49); -} - -div#headerActions a { - color: white; - text-decoration: none; + z-index:1000; } div#headerNotifier { diff --git a/wise-webapp/src/main/webapp/css/viewonly.less b/wise-webapp/src/main/webapp/css/viewonly.less index 498250e2..8c6aa76a 100644 --- a/wise-webapp/src/main/webapp/css/viewonly.less +++ b/wise-webapp/src/main/webapp/css/viewonly.less @@ -28,7 +28,6 @@ div#mapDetails .title { margin-right: 3px; } - div#mindplot { top: 0; }