diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAbsoluteParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAbsoluteParserToken.java index 690f06c9..13be1565 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAbsoluteParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAbsoluteParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Holds an absolute path */ @@ -37,32 +32,6 @@ private NodeSelectorAbsoluteParserToken(final String value, final String text) { super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorAbsoluteParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorAbsoluteParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorAbsoluteParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorAbsoluteParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAdditionParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAdditionParserToken.java index 2f25da55..db5b6154 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAdditionParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAdditionParserToken.java @@ -20,8 +20,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Holds an addition @@ -50,32 +48,6 @@ public NodeSelectorAdditionParserToken setChildren(final List child ); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorAdditionParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorAdditionParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorAdditionParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorAdditionParserToken.class - ); - } - // Visitor........................................................................................................ @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAncestorOrSelfParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAncestorOrSelfParserToken.java index 3c2109b8..be043626 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAncestorOrSelfParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAncestorOrSelfParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Holds an ancestor-or-self:: axis */ @@ -37,32 +32,6 @@ private NodeSelectorAncestorOrSelfParserToken(final String value, final String t super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorAncestorOrSelfParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorAncestorOrSelfParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorAncestorOrSelfParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorAncestorOrSelfParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAncestorParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAncestorParserToken.java index 6ca9becf..7f6dfdf9 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAncestorParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAncestorParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Holds an ancestor axis */ @@ -37,32 +32,6 @@ private NodeSelectorAncestorParserToken(final String value, final String text) { super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorAncestorParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorAncestorParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorAncestorParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorAncestorParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAndParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAndParserToken.java index f99a2917..72538d9d 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAndParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAndParserToken.java @@ -20,8 +20,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Holds two selectors joined by an AND. @@ -49,32 +47,6 @@ public NodeSelectorAndParserToken setChildren(final List children) ); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorAndParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorAndParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorAndParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorAndParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAndSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAndSymbolParserToken.java index 5549b677..26fb2bf0 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAndSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAndSymbolParserToken.java @@ -19,8 +19,6 @@ import walkingkooka.text.cursor.parser.ParserToken; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Represents and symbol token. @@ -50,32 +48,6 @@ NodeSelectorBinaryParserToken binaryOperand(final List tokens, f return and(tokens, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorAndSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorAndSymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorAndSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorAndSymbolParserToken.class - ); - } - // Visitor................................................................................................ @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAtSignSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAtSignSymbolParserToken.java index 99b09bc8..0dd41683 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAtSignSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAtSignSymbolParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Represents at sign symbol token that prefixes an attribute name. */ @@ -37,32 +32,6 @@ private NodeSelectorAtSignSymbolParserToken(final String value, final String tex super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorAtSignSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorAtSignSymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorAtSignSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorAtSignSymbolParserToken.class - ); - } - // Visitor......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAttributeNameParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAttributeNameParserToken.java index 6248b646..5c2d6549 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAttributeNameParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAttributeNameParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Holds an attribute name. */ @@ -37,32 +32,6 @@ private NodeSelectorAttributeNameParserToken(final NodeSelectorAttributeName val super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorAttributeNameParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorAttributeNameParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorAttributeNameParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorAttributeNameParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAttributeParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAttributeParserToken.java index 473e00cf..df03d08b 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAttributeParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorAttributeParserToken.java @@ -20,8 +20,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Container for an attribute reference holding its component. @@ -66,32 +64,6 @@ public NodeSelectorAttributeParserToken setChildren(final List chil ); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorAttributeParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorAttributeParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorAttributeParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorAttributeParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorBracketCloseSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorBracketCloseSymbolParserToken.java index 21b5b974..9c56b2d6 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorBracketCloseSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorBracketCloseSymbolParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Represents a predicate / close bracket symbol token. */ @@ -37,32 +32,6 @@ private NodeSelectorBracketCloseSymbolParserToken(final String value, final Stri super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorBracketCloseSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorBracketCloseSymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorBracketCloseSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorBracketCloseSymbolParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorBracketOpenSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorBracketOpenSymbolParserToken.java index a9147cba..0cb446af 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorBracketOpenSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorBracketOpenSymbolParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Represents a predicate / open bracket symbol token. */ @@ -37,33 +32,6 @@ private NodeSelectorBracketOpenSymbolParserToken(final String value, final Strin super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorBracketOpenSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorBracketOpenSymbolParserToken.class - ); - } - - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorBracketOpenSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorBracketOpenSymbolParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorChildParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorChildParserToken.java index 4e464a95..020ef100 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorChildParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorChildParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Holds an children axis */ @@ -37,32 +32,6 @@ private NodeSelectorChildParserToken(final String value, final String text) { super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorChildParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorChildParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorChildParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorChildParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorDescendantOrSelfParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorDescendantOrSelfParserToken.java index 8fa3a68b..76ac1792 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorDescendantOrSelfParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorDescendantOrSelfParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Holds a descendant-or-self:: selector. */ @@ -37,32 +32,6 @@ private NodeSelectorDescendantOrSelfParserToken(final String value, final String super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorDescendantOrSelfParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorDescendantOrSelfParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorDescendantOrSelfParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorDescendantOrSelfParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorDescendantParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorDescendantParserToken.java index 414c8c6e..40f3272e 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorDescendantParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorDescendantParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Holds a descendant selector. */ @@ -37,32 +32,6 @@ private NodeSelectorDescendantParserToken(final String value, final String text) super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorDescendantParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorDescendantParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorDescendantParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorDescendantParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorDivideSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorDivideSymbolParserToken.java index e596ea66..28bfc71b 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorDivideSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorDivideSymbolParserToken.java @@ -19,8 +19,6 @@ import walkingkooka.text.cursor.parser.ParserToken; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Represents a DIV symbol token. @@ -50,32 +48,6 @@ NodeSelectorBinaryParserToken binaryOperand(final List tokens, f return division(tokens, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorDivideSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorDivideSymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorDivideSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorDivideSymbolParserToken.class - ); - } - // Visitor................................................................................................ @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorDivisionParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorDivisionParserToken.java index b5d69a68..c6e31d63 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorDivisionParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorDivisionParserToken.java @@ -20,8 +20,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Holds a division @@ -50,32 +48,6 @@ public NodeSelectorDivisionParserToken setChildren(final List child ); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorDivisionParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorDivisionParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorDivisionParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorDivisionParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorEqualsParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorEqualsParserToken.java index 7d585d33..6f890ea6 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorEqualsParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorEqualsParserToken.java @@ -21,8 +21,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Parser token that represents an equals condition including parameters. @@ -51,32 +49,6 @@ public NodeSelectorEqualsParserToken setChildren(final List childre ); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorEqualsParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorEqualsParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorEqualsParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorEqualsParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorEqualsSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorEqualsSymbolParserToken.java index 6ab14278..9c8108c2 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorEqualsSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorEqualsSymbolParserToken.java @@ -19,8 +19,6 @@ import walkingkooka.text.cursor.parser.ParserToken; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Represents an equals sign parser token. @@ -50,32 +48,6 @@ NodeSelectorBinaryParserToken binaryOperand(final List tokens, f return equalsParserToken(tokens, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorEqualsSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorEqualsSymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorEqualsSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorEqualsSymbolParserToken.class - ); - } - // Visitor................................................................................................ @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorExpressionNumberParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorExpressionNumberParserToken.java index 10ea5f9e..f7b02914 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorExpressionNumberParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorExpressionNumberParserToken.java @@ -16,12 +16,8 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; import walkingkooka.tree.expression.ExpressionNumber; -import java.util.function.Function; -import java.util.function.Predicate; - /** * Holds a single decimal number. */ @@ -37,32 +33,6 @@ private NodeSelectorExpressionNumberParserToken(final ExpressionNumber value, fi super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorExpressionNumberParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorExpressionNumberParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorExpressionNumberParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorExpressionNumberParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorExpressionParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorExpressionParserToken.java index 38024dec..da9be9c5 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorExpressionParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorExpressionParserToken.java @@ -20,8 +20,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * A parser token that holds an entire expression. @@ -56,32 +54,6 @@ public NodeSelectorExpressionParserToken setChildren(final List chi ); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorExpressionParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorExpressionParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorExpressionParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorExpressionParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFirstChildParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFirstChildParserToken.java index 2b5b3894..371adf8c 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFirstChildParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFirstChildParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Holds an first child axis */ @@ -37,32 +32,6 @@ private NodeSelectorFirstChildParserToken(final String value, final String text) super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorFirstChildParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorFirstChildParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorFirstChildParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorFirstChildParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFollowingParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFollowingParserToken.java index c1546305..7098a655 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFollowingParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFollowingParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Holds an following axis */ @@ -37,32 +32,6 @@ private NodeSelectorFollowingParserToken(final String value, final String text) super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorFollowingParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorFollowingParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorFollowingParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorFollowingParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFollowingSiblingParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFollowingSiblingParserToken.java index a9e043fb..4020e6c6 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFollowingSiblingParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFollowingSiblingParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Holds an following-sibling axis */ @@ -37,32 +32,6 @@ private NodeSelectorFollowingSiblingParserToken(final String value, final String super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorFollowingSiblingParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorFollowingSiblingParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorFollowingSiblingParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorFollowingSiblingParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFunctionNameParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFunctionNameParserToken.java index c9d07ed3..1bfb9623 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFunctionNameParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFunctionNameParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Holds a namedFunction name. */ @@ -37,32 +32,6 @@ private NodeSelectorFunctionNameParserToken(final NodeSelectorFunctionName value super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorFunctionNameParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorFunctionNameParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorFunctionNameParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorFunctionNameParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFunctionParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFunctionParserToken.java index 7d18332f..9bdb5777 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFunctionParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorFunctionParserToken.java @@ -20,8 +20,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * A parser token that holds an entire namedFunction. @@ -75,32 +73,6 @@ public NodeSelectorFunctionParserToken setChildren(final List child ); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorFunctionParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorFunctionParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorFunctionParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorFunctionParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGreaterThanEqualsParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGreaterThanEqualsParserToken.java index 6f3cbb1f..8295662c 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGreaterThanEqualsParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGreaterThanEqualsParserToken.java @@ -21,8 +21,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Parser token that represents an greater than equals condition including parameters. @@ -51,32 +49,6 @@ public NodeSelectorGreaterThanEqualsParserToken setChildren(final List predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorGreaterThanEqualsParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorGreaterThanEqualsParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorGreaterThanEqualsParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGreaterThanEqualsSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGreaterThanEqualsSymbolParserToken.java index 805d2d65..50a9bc31 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGreaterThanEqualsSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGreaterThanEqualsSymbolParserToken.java @@ -19,8 +19,6 @@ import walkingkooka.text.cursor.parser.ParserToken; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Represents a greater than equals sign in a comparison parser token. @@ -50,32 +48,6 @@ NodeSelectorBinaryParserToken binaryOperand(final List tokens, f return greaterThanEquals(tokens, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorGreaterThanEqualsSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorGreaterThanEqualsSymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorGreaterThanEqualsSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorGreaterThanEqualsSymbolParserToken.class - ); - } - // Visitor................................................................................................ @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGreaterThanParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGreaterThanParserToken.java index 8d0c415d..043ae13e 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGreaterThanParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGreaterThanParserToken.java @@ -21,8 +21,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Parser token that represents an greater than condition including parameters. @@ -51,32 +49,6 @@ public NodeSelectorGreaterThanParserToken setChildren(final List ch ); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorGreaterThanParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorGreaterThanParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorGreaterThanParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorGreaterThanParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGreaterThanSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGreaterThanSymbolParserToken.java index b4949f8c..2c0372fc 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGreaterThanSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGreaterThanSymbolParserToken.java @@ -19,8 +19,6 @@ import walkingkooka.text.cursor.parser.ParserToken; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Represents a greater than equals sign in a comparison parser token. @@ -50,32 +48,6 @@ NodeSelectorBinaryParserToken binaryOperand(final List tokens, f return greaterThan(tokens, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorGreaterThanSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorGreaterThanSymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorGreaterThanSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorGreaterThanSymbolParserToken.class - ); - } - // Visitor................................................................................................ @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGroupParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGroupParserToken.java index 9d5f55cb..52c04992 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGroupParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorGroupParserToken.java @@ -20,8 +20,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * A group parser token. @@ -50,32 +48,6 @@ public NodeSelectorGroupParserToken setChildren(final List children ); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorGroupParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorGroupParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorGroupParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorGroupParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLastChildParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLastChildParserToken.java index 86db57d4..2af2a6fe 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLastChildParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLastChildParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Holds an last-child axis */ @@ -37,32 +32,6 @@ private NodeSelectorLastChildParserToken(final String value, final String text) super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorLastChildParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorLastChildParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorLastChildParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorLastChildParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLessThanEqualsParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLessThanEqualsParserToken.java index 5bcb6af3..0afe2b7f 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLessThanEqualsParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLessThanEqualsParserToken.java @@ -21,8 +21,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Parser token that represents an less than equals condition including parameters. @@ -51,32 +49,6 @@ public NodeSelectorLessThanEqualsParserToken setChildren(final List ); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorLessThanEqualsParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorLessThanEqualsParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorLessThanEqualsParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorLessThanEqualsParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLessThanEqualsSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLessThanEqualsSymbolParserToken.java index cdb22f65..56b6eb53 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLessThanEqualsSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLessThanEqualsSymbolParserToken.java @@ -19,8 +19,6 @@ import walkingkooka.text.cursor.parser.ParserToken; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Represents a less than equals sign in a comparison parser token. @@ -50,32 +48,6 @@ NodeSelectorBinaryParserToken binaryOperand(final List tokens, f return lessThanEquals(tokens, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorLessThanEqualsSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorLessThanEqualsSymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorLessThanEqualsSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorLessThanEqualsSymbolParserToken.class - ); - } - // Visitor................................................................................................ @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLessThanParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLessThanParserToken.java index 613549cc..552bab0b 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLessThanParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLessThanParserToken.java @@ -21,8 +21,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Parser token that represents an less than condition including parameters. @@ -51,32 +49,6 @@ public NodeSelectorLessThanParserToken setChildren(final List child ); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorLessThanParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorLessThanParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorLessThanParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorLessThanParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLessThanSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLessThanSymbolParserToken.java index e9fedbcf..96da225c 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLessThanSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorLessThanSymbolParserToken.java @@ -19,8 +19,6 @@ import walkingkooka.text.cursor.parser.ParserToken; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Represents a less than equals sign in a comparison parser token. @@ -50,32 +48,6 @@ NodeSelectorBinaryParserToken binaryOperand(final List tokens, f return lessThan(tokens, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorLessThanSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorLessThanSymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorLessThanSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorLessThanSymbolParserToken.class - ); - } - // Visitor................................................................................................ @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorMinusSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorMinusSymbolParserToken.java index 4101a686..03b7c350 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorMinusSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorMinusSymbolParserToken.java @@ -19,8 +19,6 @@ import walkingkooka.text.cursor.parser.ParserToken; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Represents a minus symbol token. @@ -50,32 +48,6 @@ NodeSelectorBinaryParserToken binaryOperand(final List tokens, f return subtraction(tokens, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorMinusSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorMinusSymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorMinusSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorMinusSymbolParserToken.class - ); - } - // Visitor................................................................................................ @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorModuloParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorModuloParserToken.java index 1aac400e..e540f35c 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorModuloParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorModuloParserToken.java @@ -20,8 +20,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Holds an modulo operation @@ -50,32 +48,6 @@ public NodeSelectorModuloParserToken setChildren(final List childre ); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorModuloParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorModuloParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorModuloParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorModuloParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorModuloSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorModuloSymbolParserToken.java index 460d60d7..0f9b8665 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorModuloSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorModuloSymbolParserToken.java @@ -19,8 +19,6 @@ import walkingkooka.text.cursor.parser.ParserToken; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Represents a MOD symbol token. @@ -50,32 +48,6 @@ NodeSelectorBinaryParserToken binaryOperand(final List tokens, f return NodeSelectorParserToken.modulo(tokens, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorModuloSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorModuloSymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorModuloSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorModuloSymbolParserToken.class - ); - } - // Visitor................................................................................................ @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorMultiplicationParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorMultiplicationParserToken.java index 10a56f32..69a40930 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorMultiplicationParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorMultiplicationParserToken.java @@ -20,8 +20,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Holds an multiply @@ -50,32 +48,6 @@ public NodeSelectorMultiplicationParserToken setChildren(final List ); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorMultiplicationParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorMultiplicationParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorMultiplicationParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorMultiplicationParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorMultiplySymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorMultiplySymbolParserToken.java index b52198fd..d7b17805 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorMultiplySymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorMultiplySymbolParserToken.java @@ -19,8 +19,6 @@ import walkingkooka.text.cursor.parser.ParserToken; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Represents a MOD symbol token. @@ -50,32 +48,6 @@ NodeSelectorBinaryParserToken binaryOperand(final List tokens, f return NodeSelectorParserToken.multiplication(tokens, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorMultiplySymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorMultiplySymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorMultiplySymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorMultiplySymbolParserToken.class - ); - } - // Visitor................................................................................................ @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorNegativeParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorNegativeParserToken.java index 5ac8272f..9a10e76b 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorNegativeParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorNegativeParserToken.java @@ -20,8 +20,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Holds a unary negative token with an argument such as a number or namedFunction. @@ -64,32 +62,6 @@ public NodeSelectorNegativeParserToken setChildren(final List child ); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorNegativeParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorNegativeParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorNegativeParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorNegativeParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorNodeNameParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorNodeNameParserToken.java index f329252b..64413133 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorNodeNameParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorNodeNameParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Holds a namedFunction name. */ @@ -37,32 +32,6 @@ private NodeSelectorNodeNameParserToken(final NodeSelectorNodeName value, final super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorNodeNameParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorNodeNameParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorNodeNameParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorNodeNameParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorNotEqualsParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorNotEqualsParserToken.java index 0b1295de..96afe531 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorNotEqualsParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorNotEqualsParserToken.java @@ -21,8 +21,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Parser token that represents an not equals condition including parameters. @@ -51,32 +49,6 @@ public NodeSelectorNotEqualsParserToken setChildren(final List chil ); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorNotEqualsParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorNotEqualsParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorNotEqualsParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorNotEqualsParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorNotEqualsSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorNotEqualsSymbolParserToken.java index 904351f4..70e5b828 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorNotEqualsSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorNotEqualsSymbolParserToken.java @@ -19,8 +19,6 @@ import walkingkooka.text.cursor.parser.ParserToken; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Represents a NE comparison parser token. @@ -50,32 +48,6 @@ NodeSelectorBinaryParserToken binaryOperand(final List tokens, f return notEquals(tokens, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorNotEqualsSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorNotEqualsSymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorNotEqualsSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorNotEqualsSymbolParserToken.class - ); - } - // Visitor................................................................................................ @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorOrParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorOrParserToken.java index f6dec3b5..27679bcb 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorOrParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorOrParserToken.java @@ -20,8 +20,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Holds two selectors joined by a logical OR. @@ -50,32 +48,6 @@ public NodeSelectorOrParserToken setChildren(final List children) { ); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorOrParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorOrParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorOrParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorOrParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorOrSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorOrSymbolParserToken.java index 4efbd7f4..fc73a0af 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorOrSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorOrSymbolParserToken.java @@ -19,8 +19,6 @@ import walkingkooka.text.cursor.parser.ParserToken; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Represents or symbol token. @@ -50,32 +48,6 @@ NodeSelectorBinaryParserToken binaryOperand(final List tokens, f return or(tokens, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorOrSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorOrSymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorOrSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorOrSymbolParserToken.class - ); - } - // Visitor................................................................................................ @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorParameterSeparatorSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorParameterSeparatorSymbolParserToken.java index 35e21680..0923a893 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorParameterSeparatorSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorParameterSeparatorSymbolParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Represents the separator between elements or key/value pairs belonging to arrays and objects. */ @@ -37,32 +32,6 @@ private NodeSelectorParameterSeparatorSymbolParserToken(final String value, fina super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorParameterSeparatorSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorParameterSeparatorSymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorParameterSeparatorSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorParameterSeparatorSymbolParserToken.class - ); - } - // Visitor......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorParentOfParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorParentOfParserToken.java index 0fadd7b9..d6262f0a 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorParentOfParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorParentOfParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - public final class NodeSelectorParentOfParserToken extends NodeSelectorNonSymbolParserToken { static NodeSelectorParentOfParserToken with(final String value, final String text) { @@ -34,32 +29,6 @@ private NodeSelectorParentOfParserToken(final String value, final String text) { super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorParentOfParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorParentOfParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorParentOfParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorParentOfParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorParenthesisCloseSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorParenthesisCloseSymbolParserToken.java index d8c5713c..e487aaaa 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorParenthesisCloseSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorParenthesisCloseSymbolParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Represents a close object (parens) symbol token. */ @@ -37,32 +32,6 @@ private NodeSelectorParenthesisCloseSymbolParserToken(final String value, final super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorParenthesisCloseSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorParenthesisCloseSymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorParenthesisCloseSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorParenthesisCloseSymbolParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorParenthesisOpenSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorParenthesisOpenSymbolParserToken.java index 540cd994..16652f7a 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorParenthesisOpenSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorParenthesisOpenSymbolParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Represents a open object (parens) symbol token. */ @@ -37,32 +32,6 @@ private NodeSelectorParenthesisOpenSymbolParserToken(final String value, final S super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorParenthesisOpenSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorParenthesisOpenSymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorParenthesisOpenSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorParenthesisOpenSymbolParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorPlusSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorPlusSymbolParserToken.java index 668396d5..603edd0a 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorPlusSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorPlusSymbolParserToken.java @@ -19,8 +19,6 @@ import walkingkooka.text.cursor.parser.ParserToken; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Represents a plus symbol token. @@ -50,32 +48,6 @@ NodeSelectorBinaryParserToken binaryOperand(final List tokens, f return addition(tokens, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorPlusSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorPlusSymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorPlusSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorPlusSymbolParserToken.class - ); - } - // Visitor................................................................................................ @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorPrecedingParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorPrecedingParserToken.java index 05d007ab..16d43493 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorPrecedingParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorPrecedingParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Holds an preceding axis */ @@ -37,32 +32,6 @@ private NodeSelectorPrecedingParserToken(final String value, final String text) super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorPrecedingParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorPrecedingParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorPrecedingParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorPrecedingParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorPrecedingSiblingParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorPrecedingSiblingParserToken.java index 4ed7ca23..b289d95b 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorPrecedingSiblingParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorPrecedingSiblingParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Holds an preceding-sibling axis */ @@ -37,31 +32,6 @@ private NodeSelectorPrecedingSiblingParserToken(final String value, final String super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorPrecedingSiblingParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorPrecedingSiblingParserToken.class - ); - } - // replaceIf........................................................................................................ - - @Override - public NodeSelectorPrecedingSiblingParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorPrecedingSiblingParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorPredicateParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorPredicateParserToken.java index aaf39abe..df7490ab 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorPredicateParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorPredicateParserToken.java @@ -22,7 +22,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; import java.util.function.Predicate; /** @@ -59,32 +58,6 @@ public NodeSelectorPredicateParserToken setChildren(final List chil ); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorPredicateParserToken replaceFirstIf(final Predicate predicate, - final Function mappern) { - return ParserToken.replaceFirstIf( - this, - predicate, - mappern, - NodeSelectorPredicateParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorPredicateParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorPredicateParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorQuotedTextParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorQuotedTextParserToken.java index b52dc4bf..ffea7c02 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorQuotedTextParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorQuotedTextParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Holds quoted text. */ @@ -37,32 +32,6 @@ private NodeSelectorQuotedTextParserToken(final String value, final String text) super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorQuotedTextParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorQuotedTextParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorQuotedTextParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorQuotedTextParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorSelfParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorSelfParserToken.java index 9cd53802..e23911e7 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorSelfParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorSelfParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - public final class NodeSelectorSelfParserToken extends NodeSelectorNonSymbolParserToken { static NodeSelectorSelfParserToken with(final String value, final String text) { @@ -34,32 +29,6 @@ private NodeSelectorSelfParserToken(final String value, final String text) { super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorSelfParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorSelfParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorSelfParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorSelfParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorSlashSeparatorSymbolParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorSlashSeparatorSymbolParserToken.java index b70a533e..e1b9b354 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorSlashSeparatorSymbolParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorSlashSeparatorSymbolParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Represents a slash which often separates components. */ @@ -37,32 +32,6 @@ private NodeSelectorSlashSeparatorSymbolParserToken(final String value, final St super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorSlashSeparatorSymbolParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorSlashSeparatorSymbolParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorSlashSeparatorSymbolParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorSlashSeparatorSymbolParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorSubtractionParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorSubtractionParserToken.java index 5b9c4bc7..af4c03e0 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorSubtractionParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorSubtractionParserToken.java @@ -20,8 +20,6 @@ import walkingkooka.visit.Visiting; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; /** * Holds an subtract operation. @@ -50,32 +48,6 @@ public NodeSelectorSubtractionParserToken setChildren(final List ch ); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorSubtractionParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorSubtractionParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorSubtractionParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorSubtractionParserToken.class - ); - } - // Visitor.......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorWhitespaceParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorWhitespaceParserToken.java index b319f82d..71498b84 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorWhitespaceParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorWhitespaceParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * Holds the combination any whitespace that may appear within a selector. */ @@ -37,32 +32,6 @@ private NodeSelectorWhitespaceParserToken(final String value, final String text) super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorWhitespaceParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorWhitespaceParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorWhitespaceParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorWhitespaceParserToken.class - ); - } - // Visitor......................................................................................................... @Override diff --git a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorWildcardParserToken.java b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorWildcardParserToken.java index ddd5442c..295526b7 100644 --- a/src/main/java/walkingkooka/tree/select/parser/NodeSelectorWildcardParserToken.java +++ b/src/main/java/walkingkooka/tree/select/parser/NodeSelectorWildcardParserToken.java @@ -16,11 +16,6 @@ */ package walkingkooka.tree.select.parser; -import walkingkooka.text.cursor.parser.ParserToken; - -import java.util.function.Function; -import java.util.function.Predicate; - /** * A token for "*" */ @@ -37,32 +32,6 @@ private NodeSelectorWildcardParserToken(final String value, final String text) { super(value, text); } - // replaceFirstIf................................................................................................... - - @Override - public NodeSelectorWildcardParserToken replaceFirstIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceFirstIf( - this, - predicate, - mapper, - NodeSelectorWildcardParserToken.class - ); - } - - // replaceIf........................................................................................................ - - @Override - public NodeSelectorWildcardParserToken replaceIf(final Predicate predicate, - final Function mapper) { - return ParserToken.replaceIf( - this, - predicate, - mapper, - NodeSelectorWildcardParserToken.class - ); - } - // Visitor.......................................................................................................... @Override