SpreadsheetRowReference.MAX_VALUE & RADIX made package private

Author: mP1

src/main/java/walkingkooka/spreadsheet/formula/SpreadsheetRowReferenceSpreadsheetParser.java

@@ -49,12 +49,12 @@ private SpreadsheetRowReferenceSpreadsheetParser(final boolean required) {
 
     @Override
     int valueFromDigit(final char c) {
-        return Character.digit(c, SpreadsheetRowReference.RADIX);
+        return Character.digit(c, 10);
     }
 
     @Override
     int radix() {
-        return SpreadsheetRowReference.RADIX;
+        return 10;
     }
 
     @Override

src/main/java/walkingkooka/spreadsheet/reference/IllegalColumnArgumentException.java

@@ -18,7 +18,7 @@
 package walkingkooka.spreadsheet.reference;
 
 /**
- * This exception is thrown to denote an invalid column value, eg negative or greater than {@link SpreadsheetColumnReference#MAX_VALUE}.
+ * This exception is thrown to denote an invalid column value, eg negative or greater than {@link SpreadsheetSelection#MAX_COLUMN}.
  */
 public final class IllegalColumnArgumentException extends IllegalColumnOrRowArgumentException {
 

src/main/java/walkingkooka/spreadsheet/reference/IllegalRowArgumentException.java

@@ -19,7 +19,7 @@
 package walkingkooka.spreadsheet.reference;
 
 /**
- * This exception is thrown to denote an invalid column value, eg negative or greater than {@link SpreadsheetRowReference#MAX_VALUE}.
+ * This exception is thrown to denote an invalid column value, eg negative or greater than {@link SpreadsheetSelection#MAX_ROW}.
  */
 public final class IllegalRowArgumentException extends IllegalColumnOrRowArgumentException {
 

src/main/java/walkingkooka/spreadsheet/reference/SpreadsheetRowReference.java

@@ -43,9 +43,9 @@ public final class SpreadsheetRowReference extends SpreadsheetRowReferenceOrRang
     SpreadsheetColumnOrRowReference{
 
     // https://support.office.com/en-us/article/excel-specifications-and-limits-1672b34d-7043-467e-8e27-269d656771c3
-    public final static int MAX_VALUE = 1_048_576 - 1; // max value inclusive
+    final static int MAX_VALUE = 1_048_576 - 1; // max value inclusive
 
-    public final static int RADIX = 10;
+    final static int RADIX = 10;
 
     static SpreadsheetRowReference[] absoluteCache() {
         if (null == ABSOLUTE_CACHE) {

src/test/java/walkingkooka/spreadsheet/formula/SpreadsheetLabelNameSpreadsheetParserTest.java

@@ -25,7 +25,6 @@
 import walkingkooka.spreadsheet.parser.SpreadsheetParserContext;
 import walkingkooka.spreadsheet.parser.SpreadsheetParserContexts;
 import walkingkooka.spreadsheet.parser.SpreadsheetParserTesting2;
-import walkingkooka.spreadsheet.reference.SpreadsheetRowReference;
 import walkingkooka.spreadsheet.reference.SpreadsheetSelection;
 
 public final class SpreadsheetLabelNameSpreadsheetParserTest implements SpreadsheetParserTesting2<SpreadsheetLabelNameSpreadsheetParser>,
@@ -65,7 +64,9 @@ public void testParseColumnAndAbsoluteRowFail() {
     @Test
     public void testParseMaxColumn() {
         // A1 column+row
-        this.parseAndCheck2("A" + SpreadsheetRowReference.MAX_VALUE + 1);
+        this.parseAndCheck2(
+            "A" + SpreadsheetSelection.MAX_ROW + 1
+        );
     }
 
     @Test

src/test/java/walkingkooka/spreadsheet/formula/SpreadsheetRowReferenceSpreadsheetParserTest.java

@@ -22,7 +22,7 @@
 import walkingkooka.spreadsheet.formula.parser.RowSpreadsheetFormulaParserToken;
 import walkingkooka.spreadsheet.formula.parser.SpreadsheetFormulaParserToken;
 import walkingkooka.spreadsheet.reference.SpreadsheetReferenceKind;
-import walkingkooka.spreadsheet.reference.SpreadsheetRowReference;
+import walkingkooka.spreadsheet.reference.SpreadsheetSelection;
 
 public final class SpreadsheetRowReferenceSpreadsheetParserTest extends SpreadsheetColumnOrRowReferenceSpreadsheetParserTestCase<SpreadsheetRowReferenceSpreadsheetParser> {
 
@@ -97,13 +97,16 @@ public void testParseAbsoluteReference3() {
 
     @Test
     public void testParseRelativeReferenceInvalid() {
-        final int value = SpreadsheetRowReference.MAX_VALUE + 1 + 1;
-        this.parseThrows("" + value, "Invalid row=1048576 not between 0 and 1048576");
+        final int value = SpreadsheetSelection.MAX_ROW + 1 + 1;
+        this.parseThrows(
+            "" + value,
+            "Invalid row=1048576 not between 0 and 1048576"
+        );
     }
 
     @Test
     public void testParseAbsoluteReferenceInvalid() {
-        final int value = SpreadsheetRowReference.MAX_VALUE + 1 + 1;
+        final int value = SpreadsheetSelection.MAX_ROW + 1 + 1;
         this.parseThrows("$" + value, "Invalid row=1048576 not between 0 and 1048576");
     }
 
@@ -114,7 +117,11 @@ public void testParseRange() {
 
     @Test
     public void testParseMaxValue() {
-        this.parseAndCheck2("1048576", SpreadsheetReferenceKind.RELATIVE, SpreadsheetRowReference.MAX_VALUE);
+        this.parseAndCheck2(
+            "1048576",
+            SpreadsheetReferenceKind.RELATIVE,
+            SpreadsheetSelection.MAX_ROW
+        );
     }
 
     private void parseAndCheck2(final String text,