vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-15 11:07:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

allow null value to rgbToHex method

Browse Source
This commit is contained in:
Claudio Barril 2015-03-08 00:54:34 -03:00
parent 36f2143f46
commit 53e210456e
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java
View File

@ -357,13 +357,15 @@ public class FreemindExporter
private String rgbToHex(String color) {
String result = color;
boolean isRGB = Pattern.matches("^rgb\\([0-9]{1,3}, [0-9]{1,3}, [0-9]{1,3}\\)$", color);
if (isRGB) {
String[] rgb = color.substring(4, color.length() - 1).split(",");
Integer r = Integer.valueOf(rgb[0].trim());
Integer g = Integer.valueOf(rgb[1].trim());
Integer b = Integer.valueOf(rgb[2].trim());
result = String.format("#%02x%02x%02x", r, g, b);
if (color != null) {
boolean isRGB = Pattern.matches("^rgb\\([0-9]{1,3}, [0-9]{1,3}, [0-9]{1,3}\\)$", color);
if (isRGB) {
String[] rgb = color.substring(4, color.length() - 1).split(",");
Integer r = Integer.valueOf(rgb[0].trim());
Integer g = Integer.valueOf(rgb[1].trim());
Integer b = Integer.valueOf(rgb[2].trim());
result = String.format("#%02x%02x%02x", r, g, b);
}
}
return result;
}