Remove generics from YangNumberExpr

[yangtools.git] / yang / yang-xpath-api / src / main / java / org / opendaylight / yangtools / yang / xpath / api / BigDecimalXPathMathSupport.java

diff --git a/yang/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/BigDecimalXPathMathSupport.java b/yang/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/BigDecimalXPathMathSupport.java
index 5c3c117c83091ff0d5fb490d33d552d95018cd3d..f489b98c5ab5e174c272efb66156325dbccaed29 100644 (file)
--- a/yang/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/BigDecimalXPathMathSupport.java
+++ b/yang/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/BigDecimalXPathMathSupport.java
@@ -10,7 +10,8 @@ package org.opendaylight.yangtools.yang.xpath.api;
 import java.math.BigDecimal;
 
 final class BigDecimalXPathMathSupport extends AbstractYangXPathMathSupport<BigDecimalNumberExpr> {
-    private static final BigDecimalXPathMathSupport INSTANCE = new BigDecimalXPathMathSupport();
+    static final BigDecimalXPathMathSupport INSTANCE = new BigDecimalXPathMathSupport();
+
     private static final BigDecimalNumberExpr ZERO = BigDecimalNumberExpr.of(BigDecimal.ZERO);
     private static final BigDecimalNumberExpr ONE = BigDecimalNumberExpr.of(BigDecimal.ONE);
     private static final BigDecimalNumberExpr TEN = BigDecimalNumberExpr.of(BigDecimal.TEN);
@@ -19,10 +20,6 @@ final class BigDecimalXPathMathSupport extends AbstractYangXPathMathSupport<BigD
         super(BigDecimalNumberExpr.class);
     }
 
-    static BigDecimalXPathMathSupport getInstance() {
-        return INSTANCE;
-    }
-
     @Override
     public BigDecimalNumberExpr createNumber(final String str) {
         switch (str) {
@@ -52,12 +49,12 @@ final class BigDecimalXPathMathSupport extends AbstractYangXPathMathSupport<BigD
     }
 
     @Override
-    BigDecimalNumberExpr doNegate(final BigDecimalNumberExpr number) {
+    protected BigDecimalNumberExpr doNegateNumber(final BigDecimalNumberExpr number) {
         return BigDecimalNumberExpr.of(number.getNumber().negate());
     }
 
     @Override
-    YangExpr evaluate(final YangBinaryOperator operator, final BigDecimalNumberExpr left,
+    protected YangExpr doEvaluate(final YangBinaryOperator operator, final BigDecimalNumberExpr left,
             final BigDecimalNumberExpr right) {
         final BigDecimal l = left.getNumber();
         final BigDecimal r = right.getNumber();