SpreadsheetFormatterSharedExpression was ExpressionSpreadsheetFormatter extends SpreadsheetFormatterShared

Author: mP1

…rmat/ExpressionSpreadsheetFormatter.java …preadsheetFormatterSharedExpression.javasrc/main/java/walkingkooka/spreadsheet/format/ExpressionSpreadsheetFormatter.java renamed to src/main/java/walkingkooka/spreadsheet/format/SpreadsheetFormatterSharedExpression.java src/main/java/walkingkooka/spreadsheet/format/ExpressionSpreadsheetFormatter.java renamed to src/main/java/walkingkooka/spreadsheet/format/SpreadsheetFormatterSharedExpression.java

@@ -31,16 +31,16 @@
  * A {@link SpreadsheetFormatter} that executes the given {@link Expression} and returning a {@link TextNode}
  * from the result.
  */
-final class ExpressionSpreadsheetFormatter implements SpreadsheetFormatter,
-    TreePrintable {
+final class SpreadsheetFormatterSharedExpression extends SpreadsheetFormatterShared
+    implements TreePrintable {
 
-    static ExpressionSpreadsheetFormatter with(final Expression expression) {
-        return new ExpressionSpreadsheetFormatter(
+    static SpreadsheetFormatterSharedExpression with(final Expression expression) {
+        return new SpreadsheetFormatterSharedExpression(
             Objects.requireNonNull(expression, "expression")
         );
     }
 
-    private ExpressionSpreadsheetFormatter(final Expression expression) {
+    private SpreadsheetFormatterSharedExpression(final Expression expression) {
         super();
         this.expression = expression;
     }
@@ -76,10 +76,10 @@ public int hashCode() {
 
     @Override
     public boolean equals(final Object other) {
-        return this == other || other instanceof ExpressionSpreadsheetFormatter && this.equals0((ExpressionSpreadsheetFormatter) other);
+        return this == other || other instanceof SpreadsheetFormatterSharedExpression && this.equals0((SpreadsheetFormatterSharedExpression) other);
     }
 
-    private boolean equals0(final ExpressionSpreadsheetFormatter other) {
+    private boolean equals0(final SpreadsheetFormatterSharedExpression other) {
         return this.expression.equals(other.expression);
     }
 

src/main/java/walkingkooka/spreadsheet/format/SpreadsheetFormatters.java

@@ -136,10 +136,10 @@ public static SpreadsheetFormatter empty() {
     }
 
     /**
-     * {@see ExpressionSpreadsheetFormatter}
+     * {@see SpreadsheetFormatterSharedExpression}
      */
     public static SpreadsheetFormatter expression(final Expression expression) {
-        return ExpressionSpreadsheetFormatter.with(expression);
+        return SpreadsheetFormatterSharedExpression.with(expression);
     }
 
     /**

…/ExpressionSpreadsheetFormatterTest.java …dsheetFormatterSharedExpressionTest.javasrc/test/java/walkingkooka/spreadsheet/format/ExpressionSpreadsheetFormatterTest.java renamed to src/test/java/walkingkooka/spreadsheet/format/SpreadsheetFormatterSharedExpressionTest.java src/test/java/walkingkooka/spreadsheet/format/ExpressionSpreadsheetFormatterTest.java renamed to src/test/java/walkingkooka/spreadsheet/format/SpreadsheetFormatterSharedExpressionTest.java

@@ -86,8 +86,8 @@
 import java.util.Locale;
 import java.util.Optional;
 
-public final class ExpressionSpreadsheetFormatterTest implements SpreadsheetFormatterTesting2<ExpressionSpreadsheetFormatter>,
-    HashCodeEqualsDefinedTesting2<ExpressionSpreadsheetFormatter>,
+public final class SpreadsheetFormatterSharedExpressionTest extends SpreadsheetFormatterSharedTestCase<SpreadsheetFormatterSharedExpression>
+    implements HashCodeEqualsDefinedTesting2<SpreadsheetFormatterSharedExpression>,
     SpreadsheetMetadataTesting {
 
     private final static ExpressionNumberKind EXPRESSION_NUMBER_KIND = ExpressionNumberKind.BIG_DECIMAL;
@@ -129,10 +129,10 @@ public void testToken() {
     private final static ExpressionFunctionName HELLO = SpreadsheetExpressionFunctions.name("hello");
 
     @Override
-    public ExpressionSpreadsheetFormatter createFormatter() {
+    public SpreadsheetFormatterSharedExpression createFormatter() {
 
         // 1 + hello($FORMAT_VALUE)
-        return ExpressionSpreadsheetFormatter.with(
+        return SpreadsheetFormatterSharedExpression.with(
             Expression.add(
                 Expression.value(EXPRESSION_NUMBER_KIND.one()),
                 Expression.call(
@@ -367,15 +367,15 @@ public CaseSensitivity expressionFunctionNameCaseSensitivity() {
     @Test
     public void testEqualsDifferentExpression() {
         this.checkNotEquals(
-            ExpressionSpreadsheetFormatter.with(
+            SpreadsheetFormatterSharedExpression.with(
                 Expression.value("Different2")
             )
         );
     }
 
     @Override
-    public ExpressionSpreadsheetFormatter createObject() {
-        return ExpressionSpreadsheetFormatter.with(
+    public SpreadsheetFormatterSharedExpression createObject() {
+        return SpreadsheetFormatterSharedExpression.with(
             Expression.value("Hello1")
         );
     }
@@ -385,13 +385,13 @@ public ExpressionSpreadsheetFormatter createObject() {
     @Test
     public void testTreePrintable() {
         this.treePrintAndCheck(
-            ExpressionSpreadsheetFormatter.with(
+            SpreadsheetFormatterSharedExpression.with(
                 Expression.add(
                     Expression.value(1),
                     Expression.value(23)
                 )
             ),
-            "ExpressionSpreadsheetFormatter\n" +
+            "SpreadsheetFormatterSharedExpression\n" +
                 "  AddExpression\n" +
                 "    ValueExpression 1 (java.lang.Integer)\n" +
                 "    ValueExpression 23 (java.lang.Integer)\n"
@@ -401,7 +401,7 @@ public void testTreePrintable() {
     // class............................................................................................................
 
     @Override
-    public Class<ExpressionSpreadsheetFormatter> type() {
-        return ExpressionSpreadsheetFormatter.class;
+    public Class<SpreadsheetFormatterSharedExpression> type() {
+        return SpreadsheetFormatterSharedExpression.class;
     }
 }