diff options
author | Tom Hochstein | 2013-01-14 10:10:39 +0000 |
---|---|---|
committer | Dirk Fauth | 2013-01-14 10:10:39 +0000 |
commit | d4bc3994ec59e292ea803c901a57543583b84b11 (patch) | |
tree | d0c58715286cf45e5f5b5e0abe9d24a7dc0b58a7 | |
parent | 86507af375e4b1693230b3267e2632a6107ceedd (diff) | |
download | org.eclipse.nebula.widgets.nattable-d4bc3994ec59e292ea803c901a57543583b84b11.tar.gz org.eclipse.nebula.widgets.nattable-d4bc3994ec59e292ea803c901a57543583b84b11.tar.xz org.eclipse.nebula.widgets.nattable-d4bc3994ec59e292ea803c901a57543583b84b11.zip |
Bug 390943 - fixed returning color white for not persisted colors
2 files changed, 9 insertions, 4 deletions
diff --git a/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/persistence/ColorPersistorTest.java b/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/persistence/ColorPersistorTest.java index b5e93aaf..7daad4a9 100644 --- a/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/persistence/ColorPersistorTest.java +++ b/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/persistence/ColorPersistorTest.java @@ -11,6 +11,7 @@ package org.eclipse.nebula.widgets.nattable.persistence; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import java.util.Properties; @@ -38,11 +39,15 @@ public class ColorPersistorTest { } @Test - public void shouldRecostructColorInstanceFromSavedRGBString() throws Exception { + public void shouldLoadColorFromSavedRGBString() throws Exception { properties.setProperty("prefix.color", "255, 0, 0"); - Color actual = ColorPersistor.loadColor("prefix", properties); - assertEquals(TEST_COLOR, actual); } + + @Test + public void shouldFailToLoadForMissingRGBString() throws Exception { + Color actual = ColorPersistor.loadColor("missing", properties); + assertNull(actual); + } } diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/persistence/ColorPersistor.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/persistence/ColorPersistor.java index 5b4bbf51..f24c2cfe 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/persistence/ColorPersistor.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/persistence/ColorPersistor.java @@ -42,7 +42,7 @@ public class ColorPersistor { String colorAsString = properties.getProperty(prefix); if (colorAsString == null) { - return DEFAULT_COLOR; + return null; } else { return asColor(colorAsString); } |