[ 2447689 ] Display format not set for WNumberEditor
This commit is contained in:
parent
891d7e071d
commit
38bb572ac7
|
@ -18,6 +18,7 @@
|
||||||
package org.adempiere.webui.editor;
|
package org.adempiere.webui.editor;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
import java.text.DecimalFormat;
|
||||||
|
|
||||||
import org.adempiere.webui.ValuePreference;
|
import org.adempiere.webui.ValuePreference;
|
||||||
import org.adempiere.webui.component.NumberBox;
|
import org.adempiere.webui.component.NumberBox;
|
||||||
|
@ -46,6 +47,8 @@ public class WNumberEditor extends WEditor
|
||||||
private BigDecimal oldValue;
|
private BigDecimal oldValue;
|
||||||
|
|
||||||
private boolean mandatory = false;
|
private boolean mandatory = false;
|
||||||
|
|
||||||
|
private int displayType;
|
||||||
|
|
||||||
public WNumberEditor()
|
public WNumberEditor()
|
||||||
{
|
{
|
||||||
|
@ -60,6 +63,7 @@ public class WNumberEditor extends WEditor
|
||||||
{
|
{
|
||||||
super(new NumberBox(gridField.getDisplayType() == DisplayType.Integer),
|
super(new NumberBox(gridField.getDisplayType() == DisplayType.Integer),
|
||||||
gridField);
|
gridField);
|
||||||
|
this.displayType = gridField.getDisplayType();
|
||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,6 +75,7 @@ public class WNumberEditor extends WEditor
|
||||||
public WNumberEditor(GridField gridField, boolean integral)
|
public WNumberEditor(GridField gridField, boolean integral)
|
||||||
{
|
{
|
||||||
super(new NumberBox(integral), gridField);
|
super(new NumberBox(integral), gridField);
|
||||||
|
this.displayType = integral ? DisplayType.Integer : DisplayType.Number;
|
||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -88,6 +93,7 @@ public class WNumberEditor extends WEditor
|
||||||
{
|
{
|
||||||
super(new NumberBox(displayType == DisplayType.Integer), columnName, title, null, mandatory,
|
super(new NumberBox(displayType == DisplayType.Integer), columnName, title, null, mandatory,
|
||||||
readonly, updateable);
|
readonly, updateable);
|
||||||
|
this.displayType = displayType;
|
||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -97,6 +103,11 @@ public class WNumberEditor extends WEditor
|
||||||
{
|
{
|
||||||
getComponent().setTooltiptext(gridField.getDescription());
|
getComponent().setTooltiptext(gridField.getDescription());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!DisplayType.isNumeric(displayType))
|
||||||
|
displayType = DisplayType.Number;
|
||||||
|
DecimalFormat format = DisplayType.getNumberFormat(displayType);
|
||||||
|
getComponent().getDecimalbox().setFormat(format.toPattern());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue