Skip to content

Commit 99e3632

Browse files
committed
Merge branch 'release_2.0' of https://github.com/GwtMaterialDesign/gwt-material into release_2.0
2 parents 081c203 + c0abc72 commit 99e3632

File tree

5 files changed

+8
-22
lines changed

5 files changed

+8
-22
lines changed

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialDoubleBox.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ public MaterialDoubleBox(String placeholder, double value) {
5454
}
5555

5656
@Override
57-
public Double getValue() {
58-
double number = getValueAsNumber();
57+
protected Double parseNumber(double number) {
5958
if (Double.isNaN(number)) {
6059
return null;
6160
}

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialFloatBox.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ public MaterialFloatBox(String placeholder, float value) {
5353
}
5454

5555
@Override
56-
public Float getValue() {
57-
double number = getValueAsNumber();
56+
protected Float parseNumber(double number) {
5857
if (Double.isNaN(number)) {
5958
return null;
6059
}

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialIntegerBox.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ public MaterialIntegerBox(String placeholder, int value) {
5454
}
5555

5656
@Override
57-
public Integer getValue() {
58-
double number = getValueAsNumber();
57+
protected Integer parseNumber(double number) {
5958
if (Double.isNaN(number)) {
6059
return null;
6160
}

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialLongBox.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ public MaterialLongBox(String placeholder, long value) {
5454
}
5555

5656
@Override
57-
public Long getValue() {
58-
double number = getValueAsNumber();
57+
protected Long parseNumber(double number) {
5958
if (Double.isNaN(number)) {
6059
return null;
6160
}

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialNumberBox.java

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package gwt.material.design.client.ui;
2121

2222
import com.google.gwt.dom.client.Element;
23-
import com.google.gwt.uibinder.client.UiConstructor;
2423
import gwt.material.design.client.base.NumberBox;
2524
import gwt.material.design.client.base.NumberBox.NumberHandler;
2625
import gwt.material.design.client.constants.InputType;
@@ -35,7 +34,7 @@
3534
* @see <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/#!forms">Material MaterialNumberBox</a>
3635
*/
3736
//@formatter:on
38-
public class MaterialNumberBox<T> extends MaterialValueBox<T> {
37+
public abstract class MaterialNumberBox<T> extends MaterialValueBox<T> {
3938

4039
protected MaterialNumberBox() {
4140
initValueBox(new NumberBox<>(new NumberHandler<>(this)));
@@ -71,21 +70,13 @@ public String getMax() {
7170
return valueBoxBase.getElement().getAttribute("max");
7271
}
7372

74-
@Override
75-
public String getText() {
76-
return valueBoxBase.getText();
77-
}
78-
79-
/**
80-
* This is expected to be overridden in the inherited classes.
81-
*/
8273
@Override
8374
public T getValue() {
84-
throw new RuntimeException("MaterialNumberBox#getValue should not be called directly, " +
85-
"please make sure you are not using the MaterialNumberBox directly. See MaterialIntegerBox, " +
86-
"MaterialDoubleBox, MaterialFloatBox, MaterialLongBox for correct implementations.");
75+
return parseNumber(getValueAsNumber());
8776
}
8877

78+
protected abstract T parseNumber(double number);
79+
8980
/**
9081
* Returns the value parsed natively by the browser.
9182
*
@@ -101,5 +92,4 @@ public double getValueAsNumber() {
10192
protected native double getValueAsNumber(Element el)/*-{
10293
return el.valueAsNumber;
10394
}-*/;
104-
10595
}

0 commit comments

Comments
 (0)