diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/widget/FloatProgress.java b/kernel/base/src/main/java/com/twosigma/beakerx/widget/FloatProgress.java index b0f42adaf3..c93bdcab5a 100644 --- a/kernel/base/src/main/java/com/twosigma/beakerx/widget/FloatProgress.java +++ b/kernel/base/src/main/java/com/twosigma/beakerx/widget/FloatProgress.java @@ -43,9 +43,13 @@ public class FloatProgress extends BoundedFloatWidget { public static final String VIEW_NAME_VALUE = "ProgressView"; public static final String MODEL_NAME_VALUE = "FloatProgressModel"; public static final String ORIENTATION = "orientation"; + public static final String BAR_STYLE = "bar_style"; private String orientation = "horizontal"; + private FloatProgress.BarStyle barStyle = FloatProgress.BarStyle.EMPTY; + + public FloatProgress() { super(); openComm(); @@ -78,4 +82,27 @@ public String getViewNameValue() { return VIEW_NAME_VALUE; } + public void setBarStyle(FloatProgress.BarStyle style) { + this.barStyle = style; + sendUpdate(BAR_STYLE, this.barStyle.getValue()); + } + + public enum BarStyle { + SUCCESS("success"), + INFO("info"), + WARNING("warning"), + DANGER("danger"), + EMPTY(""); + + private String value; + + BarStyle(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + } + } \ No newline at end of file diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/widget/IntProgress.java b/kernel/base/src/main/java/com/twosigma/beakerx/widget/IntProgress.java index 222a33dae6..ecaa737f91 100644 --- a/kernel/base/src/main/java/com/twosigma/beakerx/widget/IntProgress.java +++ b/kernel/base/src/main/java/com/twosigma/beakerx/widget/IntProgress.java @@ -21,7 +21,7 @@ /** * Progress bar that represents an integer bounded from above and below. */ -public class IntProgress extends BoundedIntWidget { +public class IntProgress extends BoundedIntWidget{ public static final String VIEW_NAME_VALUE = "ProgressView"; public static final String MODEL_NAME_VALUE = "IntProgressModel"; @@ -74,7 +74,7 @@ public String getViewNameValue() { } - enum BarStyle { + public enum BarStyle { SUCCESS("success"), INFO("info"), WARNING("warning"), diff --git a/kernel/base/src/test/java/com/twosigma/beakerx/widget/floats/FloatProgressTest.java b/kernel/base/src/test/java/com/twosigma/beakerx/widget/floats/FloatProgressTest.java index c47abf8d8f..9ba3d8805c 100644 --- a/kernel/base/src/test/java/com/twosigma/beakerx/widget/floats/FloatProgressTest.java +++ b/kernel/base/src/test/java/com/twosigma/beakerx/widget/floats/FloatProgressTest.java @@ -79,4 +79,15 @@ private FloatProgress floatProgress() throws NoSuchAlgorithmException { return progress; } + + @Test + public void shouldSendCommMsgWhenBarStyleChange() throws Exception { + //given + FloatProgress floatProgress = floatProgress(); + //when + floatProgress.setBarStyle(FloatProgress.BarStyle.SUCCESS); + //then + verifyMsgForProperty(groovyKernel, FloatProgress.BAR_STYLE, FloatProgress.BarStyle.SUCCESS.getValue()); + } + } \ No newline at end of file diff --git a/kernel/base/src/test/java/com/twosigma/beakerx/widget/integers/IntProgressTest.java b/kernel/base/src/test/java/com/twosigma/beakerx/widget/integers/IntProgressTest.java index 3aeb14eb68..db5ff17102 100644 --- a/kernel/base/src/test/java/com/twosigma/beakerx/widget/integers/IntProgressTest.java +++ b/kernel/base/src/test/java/com/twosigma/beakerx/widget/integers/IntProgressTest.java @@ -80,4 +80,15 @@ private IntProgress intProgress() throws NoSuchAlgorithmException { return progress; } + @Test + public void shouldSendCommMsgWhenBarStyleChange() throws Exception { + //given + IntProgress intProgress = intProgress(); + //when + intProgress.setBarStyle(IntProgress.BarStyle.SUCCESS); + //then + verifyMsgForProperty(groovyKernel, IntProgress.BAR_STYLE, IntProgress.BarStyle.SUCCESS.getValue()); + } + + } \ No newline at end of file