TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove DecimalFormatSymbols from JsclMathEngine

Browse Source
This commit is contained in:
serso
2016-04-10 21:29:34 +02:00
parent 0fbd6c44e8
commit a2d5d89fe4
5 changed files with 10 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
jscl/src/main/java/jscl/JsclMathEngine.java
View File

@@ -17,15 +17,13 @@ import org.solovyev.common.msg.Messages;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.math.BigDecimal;
import java.text.DecimalFormatSymbols;
import java.util.List;
import java.util.Locale;
public class JsclMathEngine implements MathEngine {
public static final AngleUnit DEFAULT_ANGLE_UNITS = AngleUnit.deg;
public static final NumeralBase DEFAULT_NUMERAL_BASE = NumeralBase.dec;
public static final String GROUPING_SEPARATOR_DEFAULT = " ";
public static final char GROUPING_SEPARATOR_DEFAULT = ' ';
public static final int MAX_FRACTION_DIGITS = 20;
@Nonnull
private static JsclMathEngine instance = new JsclMathEngine();
@@ -38,8 +36,7 @@ public class JsclMathEngine implements MathEngine {
return new NumberFormatter();
}
};
@Nonnull
private DecimalFormatSymbols decimalGroupSymbols = new DecimalFormatSymbols(Locale.getDefault());
private char groupingSeparator = GROUPING_SEPARATOR_DEFAULT;
private boolean roundResult = false;
private boolean scienceNotation = false;
private int precision = 5;
@@ -51,11 +48,6 @@ public class JsclMathEngine implements MathEngine {
@Nonnull
private MessageRegistry messageRegistry = Messages.synchronizedMessageRegistry(new FixedCapacityListMessageRegistry(10));
{
decimalGroupSymbols.setDecimalSeparator('.');
decimalGroupSymbols.setGroupingSeparator(GROUPING_SEPARATOR_DEFAULT.charAt(0));
}
public JsclMathEngine() {
}
@@ -173,7 +165,7 @@ public class JsclMathEngine implements MathEngine {
}
}
final NumberFormatter nf = numberFormatter.get();
nf.setGroupingSeparator(useGroupingSeparator ? decimalGroupSymbols.getGroupingSeparator() : NumberFormatter.NO_GROUPING);
nf.setGroupingSeparator(useGroupingSeparator ? groupingSeparator : NumberFormatter.NO_GROUPING);
nf.setPrecision(roundResult ? precision : NumberFormatter.DEFAULT_PRECISION);
if (scienceNotation) {
nf.useEngineeringFormat(NumberFormatter.DEFAULT_MAGNITUDE);
@@ -250,7 +242,7 @@ public class JsclMathEngine implements MathEngine {
@Nonnull
public String addGroupingSeparators(@Nonnull NumeralBase nb, @Nonnull String ungroupedDoubleValue) {
if (useGroupingSeparator) {
String groupingSeparator = nb == NumeralBase.dec ? String.valueOf(decimalGroupSymbols.getGroupingSeparator()) : " ";
final String groupingSeparator = nb == NumeralBase.dec ? String.valueOf(this.groupingSeparator) : " ";
final int dotIndex = ungroupedDoubleValue.indexOf(".");
@@ -302,10 +294,6 @@ public class JsclMathEngine implements MathEngine {
return result;
}
public void setDecimalGroupSymbols(@Nonnull DecimalFormatSymbols decimalGroupSymbols) {
this.decimalGroupSymbols = decimalGroupSymbols;
}
public void setRoundResult(boolean roundResult) {
this.roundResult = roundResult;
}
@@ -323,10 +311,10 @@ public class JsclMathEngine implements MathEngine {
}
public char getGroupingSeparator() {
return this.decimalGroupSymbols.getGroupingSeparator();
return this.groupingSeparator;
}
public void setGroupingSeparator(char groupingSeparator) {
this.decimalGroupSymbols.setGroupingSeparator(groupingSeparator);
this.groupingSeparator = groupingSeparator;
}
}

3
jscl/src/main/java/jscl/MathContext.java
View File

@@ -6,7 +6,6 @@ import jscl.math.operator.Operator;
import org.solovyev.common.math.MathRegistry;
import javax.annotation.Nonnull;
import java.text.DecimalFormatSymbols;
public interface MathContext {
@@ -36,8 +35,6 @@ public interface MathContext {
void setNumeralBase(@Nonnull NumeralBase numeralBase);
void setDecimalGroupSymbols(@Nonnull DecimalFormatSymbols decimalGroupSymbols);
void setRoundResult(boolean roundResult);
void setPrecision(int precision);