aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Georgi2013-10-15 05:34:08 (EDT)
committerChristian Georgi2013-10-15 05:45:01 (EDT)
commitf9ae23c0e490a981e6e252fd0cee1c7194d101ba (patch)
treec39a7179a045cad94d65cdb98e3ee363511647d3
parent565a21ee8779cfe82e989c4a8f3457b162b31feb (diff)
downloadeclipse.platform.ui-f9ae23c0e490a981e6e252fd0cee1c7194d101ba.zip
eclipse.platform.ui-f9ae23c0e490a981e6e252fd0cee1c7194d101ba.tar.gz
eclipse.platform.ui-f9ae23c0e490a981e6e252fd0cee1c7194d101ba.tar.bz2
Bug 419435 - Prevent RGB color values from making workbench unusablerefs/changes/75/17375/2
Bug: 419435 Change-Id: Ie50c0a33757f63f2bf21af14e9e9b2dc2c1872c3 Signed-off-by: Christian Georgi <christian.georgi@sap.com>
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/resource/StringConverter.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/StringConverter.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/StringConverter.java
index e56b897..828d76b 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/StringConverter.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/StringConverter.java
@@ -562,7 +562,9 @@ public class StringConverter {
} catch (NumberFormatException e) {
throw new DataFormatException(e.getMessage());
}
- return new RGB(rval, gval, bval);
+ return new RGB(rval, gval, bval); // may throw IllegalArgumentException
+ } catch (IllegalArgumentException e) {
+ throw new DataFormatException(e.getMessage());
} catch (NoSuchElementException e) {
throw new DataFormatException(e.getMessage());
}