Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import walkingkooka.plugin.PluginName;
import walkingkooka.plugin.PluginNameLike;
import walkingkooka.spreadsheet.format.SpreadsheetFormatter;
import walkingkooka.spreadsheet.format.SpreadsheetFormatters;
import walkingkooka.spreadsheet.format.pattern.SpreadsheetPatternKind;
import walkingkooka.tree.json.JsonNode;
import walkingkooka.tree.json.marshall.JsonNodeContext;
Expand Down Expand Up @@ -187,6 +188,16 @@ public static boolean isChar(final int pos,
null
);

final static String HYPERLINKING_STRING = "hyperlinking";

/**
* The name of the {@link SpreadsheetFormatters#hyperlinking(SpreadsheetFormatter)}.
*/
public final static SpreadsheetFormatterName HYPERLINKING = new SpreadsheetFormatterName(
HYPERLINKING_STRING,
null
);

final static String LONG_DATE_STRING = "long-date";

/**
Expand Down Expand Up @@ -375,6 +386,9 @@ public static SpreadsheetFormatterName with(final String name) {
case GENERAL_STRING:
spreadsheetFormatterName = GENERAL;
break;
case HYPERLINKING_STRING:
spreadsheetFormatterName = HYPERLINKING;
break;
case LONG_DATE_STRING:
spreadsheetFormatterName = LONG_DATE;
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public SpreadsheetFormatter spreadsheetFormatter(final SpreadsheetFormatterSelec
case SpreadsheetFormatterName.FULL_DATE_TIME_STRING:
case SpreadsheetFormatterName.FULL_TIME_STRING:
case SpreadsheetFormatterName.GENERAL_STRING:
case SpreadsheetFormatterName.HYPERLINKING_STRING:
case SpreadsheetFormatterName.LONG_DATE_STRING:
case SpreadsheetFormatterName.LONG_DATE_TIME_STRING:
case SpreadsheetFormatterName.LONG_TIME_STRING:
Expand Down Expand Up @@ -260,6 +261,13 @@ public SpreadsheetFormatter spreadsheetFormatter(final SpreadsheetFormatterName

formatter = SpreadsheetFormatters.general();
break;
case SpreadsheetFormatterName.HYPERLINKING_STRING:
parameterCountCheck(1, count);

formatter = SpreadsheetFormatters.hyperlinking(
(SpreadsheetFormatter) copy.get(0)
);
break;
case SpreadsheetFormatterName.LONG_DATE_STRING:
parameterCountCheck(count);

Expand Down Expand Up @@ -648,6 +656,9 @@ public Optional<SpreadsheetFormatterSelectorToken> spreadsheetFormatterNextToken
case SpreadsheetFormatterName.GENERAL_STRING:
next = null;
break;
case SpreadsheetFormatterName.HYPERLINKING_STRING:
next = null;
break;
case SpreadsheetFormatterName.LONG_DATE_STRING:
next = null;
break;
Expand Down Expand Up @@ -1082,6 +1093,9 @@ public List<SpreadsheetFormatterSample> spreadsheetFormatterSamples(final Spread
}
break;
}
case SpreadsheetFormatterName.HYPERLINKING_STRING: {
break;
}
case SpreadsheetFormatterName.LONG_DATE_STRING:
samples.add(
longDateSample(
Expand Down Expand Up @@ -2118,6 +2132,7 @@ public SpreadsheetFormatterInfoSet spreadsheetFormatterInfos() {
spreadsheetFormatterInfo(SpreadsheetFormatterName.FULL_DATE_TIME),
spreadsheetFormatterInfo(SpreadsheetFormatterName.FULL_TIME),
spreadsheetFormatterInfo(SpreadsheetFormatterName.GENERAL),
spreadsheetFormatterInfo(SpreadsheetFormatterName.HYPERLINKING),
spreadsheetFormatterInfo(SpreadsheetFormatterName.LONG_DATE),
spreadsheetFormatterInfo(SpreadsheetFormatterName.LONG_DATE_TIME),
spreadsheetFormatterInfo(SpreadsheetFormatterName.LONG_TIME),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1315,7 +1315,7 @@ public void testToString() {
" \"findFunctions\": \"@\",\n" +
" \"findHighlighting\": false,\n" +
" \"formHandlers\": \"basic\",\n" +
" \"formatters\": \"accounting, automatic, badge-error, collection, currency, date, date-time, default-text, expression, full-date, full-date-time, full-time, general, long-date, long-date-time, long-time, medium-date, medium-date-time, medium-time, number, percent, scientific, short-date, short-date-time, short-time, text, time\",\n" +
" \"formatters\": \"accounting, automatic, badge-error, collection, currency, date, date-time, default-text, expression, full-date, full-date-time, full-time, general, hyperlinking, long-date, long-date-time, long-time, medium-date, medium-date-time, medium-time, number, percent, scientific, short-date, short-date-time, short-time, text, time\",\n" +
" \"formattingConverter\": \"collection(text, number, date-time, basic, spreadsheet-value, boolean, error-throwing, color, expression, environment, locale, plugins, spreadsheet-metadata, style, text-node, template, net)\",\n" +
" \"formulaConverter\": \"collection(text, number, date-time, basic, spreadsheet-value, boolean, error-throwing, color, expression, environment, json, locale, template, net)\",\n" +
" \"formulaFunctions\": \"@test-context-loadCell, test-context-serverUrl, test-context-spreadsheet-metadata, xyz\",\n" +
Expand Down Expand Up @@ -1540,7 +1540,7 @@ public void testToStringMetadataIncludingAllColorNameAndColorNumberProperties()
" \"findFunctions\": \"@\",\n" +
" \"findHighlighting\": false,\n" +
" \"formHandlers\": \"basic\",\n" +
" \"formatters\": \"accounting, automatic, badge-error, collection, currency, date, date-time, default-text, expression, full-date, full-date-time, full-time, general, long-date, long-date-time, long-time, medium-date, medium-date-time, medium-time, number, percent, scientific, short-date, short-date-time, short-time, text, time\",\n" +
" \"formatters\": \"accounting, automatic, badge-error, collection, currency, date, date-time, default-text, expression, full-date, full-date-time, full-time, general, hyperlinking, long-date, long-date-time, long-time, medium-date, medium-date-time, medium-time, number, percent, scientific, short-date, short-date-time, short-time, text, time\",\n" +
" \"formattingConverter\": \"collection(text, number, date-time, basic, spreadsheet-value, boolean, error-throwing, color, expression, environment, locale, plugins, spreadsheet-metadata, style, text-node, template, net)\",\n" +
" \"formulaConverter\": \"collection(text, number, date-time, basic, spreadsheet-value, boolean, error-throwing, color, expression, environment, json, locale, template, net)\",\n" +
" \"formulaFunctions\": \"@test-context-loadCell, test-context-serverUrl, test-context-spreadsheet-metadata, xyz\",\n" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ public void testWithGeneral() {
this.verifyConstant("general");
}

@Test
public void testWithHyperlinking() {
this.verifyConstant("hyperlinking");
}

@Test
public void testWithLongDate() {
this.verifyConstant("long-date");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,19 @@ public void testSpreadsheetFormatterSelectorWithGeneral() {
);
}

// hyperlinking.....................................................................................................

@Test
public void testSpreadsheetFormatterSelectorWithHyperlinking() {
this.spreadsheetFormatterAndCheck(
"hyperlinking(general)",
PROVIDER_CONTEXT,
SpreadsheetFormatters.hyperlinking(
SpreadsheetFormatters.general()
)
);
}

// long-date........................................................................................................

@Test
Expand Down Expand Up @@ -4683,6 +4696,7 @@ public void testTreePrintable() {
" https://github.com/mP1/walkingkooka-spreadsheet/SpreadsheetFormatter/full-date-time full-date-time\n" +
" https://github.com/mP1/walkingkooka-spreadsheet/SpreadsheetFormatter/full-time full-time\n" +
" https://github.com/mP1/walkingkooka-spreadsheet/SpreadsheetFormatter/general general\n" +
" https://github.com/mP1/walkingkooka-spreadsheet/SpreadsheetFormatter/hyperlinking hyperlinking\n" +
" https://github.com/mP1/walkingkooka-spreadsheet/SpreadsheetFormatter/long-date long-date\n" +
" https://github.com/mP1/walkingkooka-spreadsheet/SpreadsheetFormatter/long-date-time long-date-time\n" +
" https://github.com/mP1/walkingkooka-spreadsheet/SpreadsheetFormatter/long-time long-time\n" +
Expand Down Expand Up @@ -4720,6 +4734,7 @@ public void testMarshall() {
" \"https://github.com/mP1/walkingkooka-spreadsheet/SpreadsheetFormatter/full-date-time full-date-time\",\n" +
" \"https://github.com/mP1/walkingkooka-spreadsheet/SpreadsheetFormatter/full-time full-time\",\n" +
" \"https://github.com/mP1/walkingkooka-spreadsheet/SpreadsheetFormatter/general general\",\n" +
" \"https://github.com/mP1/walkingkooka-spreadsheet/SpreadsheetFormatter/hyperlinking hyperlinking\",\n" +
" \"https://github.com/mP1/walkingkooka-spreadsheet/SpreadsheetFormatter/long-date long-date\",\n" +
" \"https://github.com/mP1/walkingkooka-spreadsheet/SpreadsheetFormatter/long-date-time long-date-time\",\n" +
" \"https://github.com/mP1/walkingkooka-spreadsheet/SpreadsheetFormatter/long-time long-time\",\n" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3017,6 +3017,7 @@ public void testTreePrintWithSpreadsheetId() {
" full-date-time\n" +
" full-time\n" +
" general\n" +
" hyperlinking\n" +
" long-date\n" +
" long-date-time\n" +
" long-time\n" +
Expand Down Expand Up @@ -3243,6 +3244,7 @@ public void testTreePrintWithSpreadsheetIdAndSpreadsheetName() {
" full-date-time\n" +
" full-time\n" +
" general\n" +
" hyperlinking\n" +
" long-date\n" +
" long-date-time\n" +
" long-time\n" +
Expand Down Expand Up @@ -3467,6 +3469,7 @@ public void testTreePrintMissingSpreadsheetId() {
" full-date-time\n" +
" full-time\n" +
" general\n" +
" hyperlinking\n" +
" long-date\n" +
" long-date-time\n" +
" long-time\n" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,7 @@ public void testTreePrint() {
" full-date-time\n" +
" full-time\n" +
" general\n" +
" hyperlinking\n" +
" long-date\n" +
" long-date-time\n" +
" long-time\n" +
Expand Down
Loading