From d1760f0d0a226760b1ca66a6f17a949c039080db Mon Sep 17 00:00:00 2001 From: Antoine ELIAS Date: Thu, 13 Mar 2014 12:18:54 +0100 Subject: [PATCH] in listbox and popupmenu, color must start by # Change-Id: I47a6352641d403bdd2d34510cf8d5e76d517cb5f --- .../gui/bridge/listbox/SwingScilabListBox.java | 12 ++++++++++++ .../gui/bridge/popupmenu/SwingScilabPopupMenu.java | 13 +++++++++++++ 2 files changed, 25 insertions(+) diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/listbox/SwingScilabListBox.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/listbox/SwingScilabListBox.java index 53a56e6..f676960 100644 --- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/listbox/SwingScilabListBox.java +++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/listbox/SwingScilabListBox.java @@ -413,6 +413,11 @@ public class SwingScilabListBox extends JScrollPane implements SwingViewObject, if (tryColorBox) { //color try { + //format #FFFFFF + if (text[i].startsWith("#") == false) { + throw new NumberFormatException(); + } + Color color = Color.decode(text[i]); icon = ColorBox.createColorBox(16, 16, color); } catch (NumberFormatException e) { @@ -445,8 +450,15 @@ public class SwingScilabListBox extends JScrollPane implements SwingViewObject, str = text[(nbRow * colIndex) + i]; if (nbCol > (1 + colIndex)) { + if (text[nbRow * (1 + colIndex) + i].startsWith("#") == false) { + throw new NumberFormatException(); + } + background = Color.decode(text[nbRow * (1 + colIndex) + i]); if (nbCol > (2 + colIndex)) { + if (text[nbRow * (2 + colIndex) + i].startsWith("#") == false) { + throw new NumberFormatException(); + } foreground = Color.decode(text[nbRow * (2 + colIndex) + i]); } } diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/popupmenu/SwingScilabPopupMenu.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/popupmenu/SwingScilabPopupMenu.java index 776847a..d05335d 100644 --- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/popupmenu/SwingScilabPopupMenu.java +++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/popupmenu/SwingScilabPopupMenu.java @@ -353,6 +353,11 @@ public class SwingScilabPopupMenu extends JComboBox implements SwingViewObject, if (tryColorBox) { //color try { + //format #FFFFFF + if (text[i].startsWith("#") == false) { + throw new NumberFormatException(); + } + Color color = Color.decode(text[i]); icon = ColorBox.createColorBox(16, 16, color); } catch (NumberFormatException e) { @@ -385,8 +390,16 @@ public class SwingScilabPopupMenu extends JComboBox implements SwingViewObject, str = text[(nbRow * colIndex) + i]; if (nbCol > (1 + colIndex)) { + if (text[nbRow * (1 + colIndex) + i].startsWith("#") == false) { + throw new NumberFormatException(); + } + background = Color.decode(text[nbRow * (1 + colIndex) + i]); if (nbCol > (2 + colIndex)) { + if (text[nbRow * (2 + colIndex) + i].startsWith("#") == false) { + throw new NumberFormatException(); + } + foreground = Color.decode(text[nbRow * (2 + colIndex) + i]); } } -- 1.7.9.5