| Author | DaveJarvis <email> |
|---|---|
| Date | 2021-12-04 20:21:04 GMT-0800 |
| Commit | e7a743edbe487ad76893d916f2249bf41cf9da1d |
| Parent | 0ab1a3d |
| Delta | 48 lines added, 48 lines removed |
| } | ||
| - private Tokens createRTokens() { | ||
| + private Sigils createRTokens() { | ||
| return createTokens( "x(", ")" ); | ||
| } | ||
| - private Tokens createYamlTokens() { | ||
| + private Sigils createYamlTokens() { | ||
| return createTokens( "{{", "}}" ); | ||
| } | ||
| - private Tokens createTokens( final String began, final String ended ) { | ||
| - return new Tokens( createToken( began ), createToken( ended ) ); | ||
| + private Sigils createTokens( final String began, final String ended ) { | ||
| + return new Sigils( createToken( began ), createToken( ended ) ); | ||
| } | ||
| */ | ||
| public abstract class SigilOperator implements UnaryOperator<String> { | ||
| - private final Tokens mTokens; | ||
| + private final Sigils mSigils; | ||
| - SigilOperator( final Tokens tokens ) { | ||
| - mTokens = tokens; | ||
| + SigilOperator( final Sigils sigils ) { | ||
| + mSigils = sigils; | ||
| } | ||
| String getBegan() { | ||
| - return mTokens.getBegan(); | ||
| + return mSigils.getBegan(); | ||
| } | ||
| String getEnded() { | ||
| - return mTokens.getEnded(); | ||
| + return mSigils.getEnded(); | ||
| } | ||
| +/* Copyright 2020-2021 White Magic Software, Ltd. -- All rights reserved. */ | ||
| +package com.keenwrite.sigils; | ||
| + | ||
| +import javafx.beans.property.StringProperty; | ||
| + | ||
| +import java.util.AbstractMap.SimpleImmutableEntry; | ||
| + | ||
| +/** | ||
| + * Convenience class for pairing a start and an end sigil together. | ||
| + */ | ||
| +public final class Sigilsg | ||
| + extends SimpleImmutableEntry<StringProperty, StringProperty> { | ||
| + | ||
| + /** | ||
| + * Associates a new key-value pair. | ||
| + * | ||
| + * @param began The starting sigil. | ||
| + * @param ended The ending sigil. | ||
| + */ | ||
| + public Sigils( final StringProperty began, final StringProperty ended ) { | ||
| + super( began, ended ); | ||
| + } | ||
| + | ||
| + /** | ||
| + * @return The opening sigil token. | ||
| + */ | ||
| + public String getBegan() { | ||
| + return getKey().get(); | ||
| + } | ||
| + | ||
| + /** | ||
| + * @return The closing sigil token, or the empty string if none set. | ||
| + */ | ||
| + public String getEnded() { | ||
| + return getValue().get(); | ||
| + } | ||
| +} | ||
| -/* Copyright 2020-2021 White Magic Software, Ltd. -- All rights reserved. */ | ||
| -package com.keenwrite.sigils; | ||
| - | ||
| -import javafx.beans.property.StringProperty; | ||
| - | ||
| -import java.util.AbstractMap.SimpleImmutableEntry; | ||
| - | ||
| -/** | ||
| - * Convenience class for pairing a start and an end sigil together. | ||
| - */ | ||
| -public final class Tokens | ||
| - extends SimpleImmutableEntry<StringProperty, StringProperty> { | ||
| - | ||
| - /** | ||
| - * Associates a new key-value pair. | ||
| - * | ||
| - * @param began The starting sigil. | ||
| - * @param ended The ending sigil. | ||
| - */ | ||
| - public Tokens( final StringProperty began, final StringProperty ended ) { | ||
| - super( began, ended ); | ||
| - } | ||
| - | ||
| - /** | ||
| - * @return The opening sigil token. | ||
| - */ | ||
| - public String getBegan() { | ||
| - return getKey().get(); | ||
| - } | ||
| - | ||
| - /** | ||
| - * @return The closing sigil token, or the empty string if none set. | ||
| - */ | ||
| - public String getEnded() { | ||
| - return getValue().get(); | ||
| - } | ||
| -} | ||
| public static final char KEY_SEPARATOR_DEF = '.'; | ||
| - public YamlSigilOperator( final Tokens tokens ) { | ||
| - super( tokens ); | ||
| + public YamlSigilOperator( final Sigils sigils ) { | ||
| + super( sigils ); | ||
| } | ||