diff --git a/pom.xml b/pom.xml index 074bdec..7d93895 100644 --- a/pom.xml +++ b/pom.xml @@ -62,49 +62,48 @@ ${parboiled.version} - org.jetbrains - annotations-java5 - 17.0.0 + com.google.code.findbugs + jsr305 + 3.0.2 + + + com.evolvedbinary.j8fu + j8fu + 1.23.0 junit junit 4.13.2 + test - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - - - com.mycila license-maven-plugin - 3.0 + 4.3 -
GPL2-template.txt
true - true true - - ${project.organization.name} - - - **/pom.xml - **/README.md - **/LICENSE - .github/** - src/main/resources/** - ${project.build.sourceEncoding} + + +
GPL2-template.txt
+ + ${project.organization.name} + + + **/pom.xml + **/README.md + **/LICENSE + .github/** + src/main/resources/** + + + @@ -119,7 +118,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.2.0 + 3.6.1 analyze @@ -148,6 +147,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.11.0 ${project.build.source} ${project.build.target} @@ -157,7 +157,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.3.0 @@ -212,10 +212,34 @@ + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.6.2 + + + + true + true + + + ${build-tag} + ${build-commit} + ${build-commit-abbrev} + ${build-version} + ${build-tstamp} + ${project.scm.connection} + ${project.description} + ${project.url} + + + + org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.1.0 org.apache.maven.plugins diff --git a/src/main/java/com/evolvedbinary/functional/Either.java b/src/main/java/com/evolvedbinary/functional/Either.java deleted file mode 100644 index 9ef148d..0000000 --- a/src/main/java/com/evolvedbinary/functional/Either.java +++ /dev/null @@ -1,196 +0,0 @@ -/** - * XPath 2 Parser - * A Parser for XPath 2 - * Copyright (C) 2016 Evolved Binary Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -package com.evolvedbinary.functional; - -import java.util.NoSuchElementException; - -/** - * A disjunction, more basic than but similar to {@link scala.util.Either} - * in addition it is also right-biased in a similar way to {@link scalaz.\/} - * - * @param Type of left-hand-side parameter - * @param Type of right-hand-side parameter - * - * @author Adam Retter - */ -public abstract class Either { - - private final boolean isLeft; - - Either(final boolean isLeft) { - this.isLeft = isLeft; - } - - public final boolean isLeft() { - return isLeft; - } - - public final boolean isRight() { - return !isLeft; - } - - public final LeftProjection left() { - return new LeftProjection(this); - } - - public final RightProjection right() { - return new RightProjection(this); - } - - /** - * Map on the right-hand-side of the disjunction - * - * @param f The function to map with - */ - public final Either map(final Function f) { - if(isLeft()) { - return (Left)this; - } else { - return Right(f.apply(((Right)this).value)); - } - } - - /** - * Bind through on the right-hand-side of this disjunction - * - * @param f the function to bind through - */ - public final Either flatMap(final Function> f) { - if(isLeft) { - return (Left)this; - } else { - return f.apply(((Right)this).value); - } - } - - /** - * Map on the left-hand-side of the disjunction - * - * @param f The function to map with - */ - public final Either leftMap(final Function f) { - if(isLeft) { - return Left(f.apply(((Left)this).value)); - } else { - return (Right)this; - } - } - - /** - * Catamorphism. Run the first given function if left, - * otherwise the second given function - * - * - * @param The result type from performing the fold - * @param lf A function that may be applied to the left-hand-side - * @param rf A function that may be applied to the right-hand-side - */ - public final T fold(final Function lf, final Function rf) { - if(isLeft) { - return lf.apply(((Left)this).value); - } else { - return rf.apply(((Right)this).value); - } - } - - /** - * Return the value from the right-hand-side of this disjunction or - * run the function on the left-hand-side - * - * @param The result type - * @param lf A function that may be applied to the left-hand-side - */ - public final RR valueOr(final Function lf) { - if(isLeft) { - return lf.apply(((Left)this).value); - } else { - return ((Right)this).value; - } - } - - @Override - public boolean equals(final Object obj) { - if(obj != null && obj instanceof Either) { - final Either other = (Either)obj; - - if(other.isLeft && this.isLeft) { - return other.left().get().equals(this.left().get()); - } else if((!other.isLeft) && (!this.isLeft)) { - return other.right().get().equals(this.right().get()); - } - } - - return false; - } - - public final static Either Left(final L value) { - return new Left(value); - } - - public final static Either Right(final R value) { - return new Right(value); - } - - public final static class Left extends Either { - final L value; - private Left(final L value) { - super(true); - this.value = value; - } - } - - public final static class Right extends Either { - final R value; - private Right(final R value) { - super(false); - this.value = value; - } - } - - public final class LeftProjection { - final Either e; - private LeftProjection(final Either e) { - this.e = e; - } - - public final L get() { - if(e.isLeft()) { - return ((Left)e).value; - } else { - throw new NoSuchElementException("Either.left value on Right"); - } - } - } - - public final class RightProjection { - final Either e; - private RightProjection(final Either e) { - this.e = e; - } - - public final R get() { - if(e.isRight()) { - return ((Right)e).value; - } else { - throw new NoSuchElementException("Either.right value on Left"); - } - } - } -} diff --git a/src/main/java/com/evolvedbinary/functional/Function.java b/src/main/java/com/evolvedbinary/functional/Function.java deleted file mode 100644 index 072d94c..0000000 --- a/src/main/java/com/evolvedbinary/functional/Function.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - * XPath 2 Parser - * A Parser for XPath 2 - * Copyright (C) 2016 Evolved Binary Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -package com.evolvedbinary.functional; - -/** - * Replacement interface for Java 8 {@link java.util.function.Function} - * - * @param the type of the input to the function - * @param the type of the result of the function - */ -public interface Function { - - /** - * Applies this function to the given argument. - * - * @param t the function argument - * @return the function result - */ - R apply(final T t); -} diff --git a/src/main/java/com/evolvedbinary/xpath/parser/XPathParser.java b/src/main/java/com/evolvedbinary/xpath/parser/XPathParser.java index 8dd4576..3781299 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/XPathParser.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/XPathParser.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. @@ -19,9 +19,8 @@ */ package com.evolvedbinary.xpath.parser; -import com.evolvedbinary.functional.Either; +import com.evolvedbinary.j8fu.Either; import com.evolvedbinary.xpath.parser.ast.partial.*; -import org.jetbrains.annotations.Nullable; import org.parboiled.BaseParser; import org.parboiled.Rule; import org.parboiled.annotations.BuildParseTree; @@ -32,6 +31,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.annotation.Nullable; //TODO(AR) think about whether we can remove the use of org.parboiled.support.Var in favour of PartialASTNode, then we would have an immutable AST production //TODO(AR) may be possible to replace some uses of Var with popAllR diff --git a/src/main/java/com/evolvedbinary/xpath/parser/XPathUtil.java b/src/main/java/com/evolvedbinary/xpath/parser/XPathUtil.java index 26bb26b..fc7e35d 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/XPathUtil.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/XPathUtil.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/ASTNode.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/ASTNode.java index a2f9f1c..b766d86 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/ASTNode.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/ASTNode.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/AbstractASTNode.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/AbstractASTNode.java index a72762e..3d45b9d 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/AbstractASTNode.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/AbstractASTNode.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/AbstractOperand.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/AbstractOperand.java index 64a4c42..90bfa98 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/AbstractOperand.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/AbstractOperand.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/AbstractOperandWithOps.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/AbstractOperandWithOps.java index 0c931f0..dc8c3f6 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/AbstractOperandWithOps.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/AbstractOperandWithOps.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/AbstractSequenceType.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/AbstractSequenceType.java index 96dcf07..f0125f3 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/AbstractSequenceType.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/AbstractSequenceType.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/AdditiveExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/AdditiveExpr.java index 3e0c1f7..3f48d3e 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/AdditiveExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/AdditiveExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/AndExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/AndExpr.java index 3ff2fb5..dd3951e 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/AndExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/AndExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/AnyKindTest.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/AnyKindTest.java index 0ecde7d..ed282d0 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/AnyKindTest.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/AnyKindTest.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/AtomicType.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/AtomicType.java index 14efffe..19188a0 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/AtomicType.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/AtomicType.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/AttributeTest.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/AttributeTest.java index 8f81b2c..30b5746 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/AttributeTest.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/AttributeTest.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. @@ -19,7 +19,7 @@ */ package com.evolvedbinary.xpath.parser.ast; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nullable; /** * Created by aretter on 30/01/2016. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/Axis.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/Axis.java index 391e3dd..ef4fa26 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/Axis.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/Axis.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/AxisStep.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/AxisStep.java index 2f66ada..fd68ac6 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/AxisStep.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/AxisStep.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/CastExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/CastExpr.java index 8cf16f6..7250e2b 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/CastExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/CastExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/CastableExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/CastableExpr.java index eab9043..e5e98fb 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/CastableExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/CastableExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/CommentTest.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/CommentTest.java index 9734f11..a249770 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/CommentTest.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/CommentTest.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/Comparison.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/Comparison.java index 614d4f9..a2c8362 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/Comparison.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/Comparison.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/ComparisonExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/ComparisonExpr.java index 284ff79..0e96df1 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/ComparisonExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/ComparisonExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/ContextItemExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/ContextItemExpr.java index 48c5cfc..ecda737 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/ContextItemExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/ContextItemExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/DecimalLiteral.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/DecimalLiteral.java index 2c2dd7d..da9911e 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/DecimalLiteral.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/DecimalLiteral.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/DocumentTest.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/DocumentTest.java index 44a0cab..e5a1854 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/DocumentTest.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/DocumentTest.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. @@ -19,8 +19,8 @@ */ package com.evolvedbinary.xpath.parser.ast; -import com.evolvedbinary.functional.Either; -import org.jetbrains.annotations.Nullable; +import com.evolvedbinary.j8fu.Either; +import javax.annotation.Nullable; /** * Created by aretter on 30/01/2016. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/DoubleLiteral.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/DoubleLiteral.java index 80a0a25..5603b32 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/DoubleLiteral.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/DoubleLiteral.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/ElementTest.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/ElementTest.java index 0161b3f..9094a2c 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/ElementTest.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/ElementTest.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. @@ -19,7 +19,7 @@ */ package com.evolvedbinary.xpath.parser.ast; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nullable; /** * Created by aretter on 30/01/2016. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/Expr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/Expr.java index b6acc68..20bcd5b 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/Expr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/Expr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/ExprSingle.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/ExprSingle.java index 69cb1a5..a9fd448 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/ExprSingle.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/ExprSingle.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/FilterExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/FilterExpr.java index 06e20a4..91384b7 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/FilterExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/FilterExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/ForExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/ForExpr.java index c8cc549..3730c3c 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/ForExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/ForExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/FunctionCall.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/FunctionCall.java index e3ad2b1..cc8bdcd 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/FunctionCall.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/FunctionCall.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/GeneralComp.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/GeneralComp.java index 50d8c44..885114c 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/GeneralComp.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/GeneralComp.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/IfExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/IfExpr.java index f281bd8..f060986 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/IfExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/IfExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/InstanceOfExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/InstanceOfExpr.java index 7a01134..0605586 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/InstanceOfExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/InstanceOfExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/IntegerLiteral.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/IntegerLiteral.java index 6dc6b4a..b79453c 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/IntegerLiteral.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/IntegerLiteral.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/IntersectExceptExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/IntersectExceptExpr.java index f73ae5e..b14491f 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/IntersectExceptExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/IntersectExceptExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/ItemType.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/ItemType.java index e45cbf5..2caf8a0 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/ItemType.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/ItemType.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/ItemTypeItem.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/ItemTypeItem.java index 09e3e96..7625c1a 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/ItemTypeItem.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/ItemTypeItem.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/KindTest.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/KindTest.java index 7691869..b11297c 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/KindTest.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/KindTest.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/Literal.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/Literal.java index 7277807..f8a2700 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/Literal.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/Literal.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/MultiplicativeExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/MultiplicativeExpr.java index 88784ba..ff1d0cd 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/MultiplicativeExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/MultiplicativeExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/NameTest.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/NameTest.java index b48d30c..e32519c 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/NameTest.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/NameTest.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/NodeComp.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/NodeComp.java index 0a163ba..b7cde7e 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/NodeComp.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/NodeComp.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/NodeTest.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/NodeTest.java index b1d7b82..d1c33f6 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/NodeTest.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/NodeTest.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/NumericLiteral.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/NumericLiteral.java index 5337437..43659e3 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/NumericLiteral.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/NumericLiteral.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/OccurrenceIndicator.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/OccurrenceIndicator.java index 0ddd020..5c2c32e 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/OccurrenceIndicator.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/OccurrenceIndicator.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/OrExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/OrExpr.java index 04864ea..b61a82b 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/OrExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/OrExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/PITest.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/PITest.java index 97200f7..c22406d 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/PITest.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/PITest.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. @@ -19,7 +19,7 @@ */ package com.evolvedbinary.xpath.parser.ast; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nullable; /** * Created by aretter on 30/01/2016. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/ParenthesizedExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/ParenthesizedExpr.java index 0f2a517..253d28c 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/ParenthesizedExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/ParenthesizedExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/PathExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/PathExpr.java index de10fca..461ec63 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/PathExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/PathExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/Predicate.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/Predicate.java index e116d50..1aff75b 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/Predicate.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/Predicate.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/PredicateList.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/PredicateList.java index 72f4635..66506ae 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/PredicateList.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/PredicateList.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/PrimaryExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/PrimaryExpr.java index 5a53e5b..052e8ed 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/PrimaryExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/PrimaryExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/QNameW.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/QNameW.java index 6d482c0..e8e31c3 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/QNameW.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/QNameW.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. @@ -19,7 +19,7 @@ */ package com.evolvedbinary.xpath.parser.ast; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nullable; /** * Similar to a QName but where the prefix or localPart diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/QuantifiedExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/QuantifiedExpr.java index df1e0e0..3675dcf 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/QuantifiedExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/QuantifiedExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/RangeExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/RangeExpr.java index cde080a..0389e78 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/RangeExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/RangeExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/RelativePathExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/RelativePathExpr.java index b74042e..7ff6212 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/RelativePathExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/RelativePathExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/SchemaAttributeTest.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/SchemaAttributeTest.java index 7fec1cb..6f5aca2 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/SchemaAttributeTest.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/SchemaAttributeTest.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/SchemaElementTest.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/SchemaElementTest.java index 8709684..5d0cd1a 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/SchemaElementTest.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/SchemaElementTest.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/SequenceType.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/SequenceType.java index 37adb2a..fc0b949 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/SequenceType.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/SequenceType.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. @@ -19,7 +19,7 @@ */ package com.evolvedbinary.xpath.parser.ast; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nullable; /** * Created by aretter on 11/02/2016. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/SimpleForClause.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/SimpleForClause.java index d9224f9..f08fcac 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/SimpleForClause.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/SimpleForClause.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/SingleType.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/SingleType.java index 469e327..fd5fe47 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/SingleType.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/SingleType.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/Step.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/Step.java index 74f837a..fcff93c 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/Step.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/Step.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/StepExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/StepExpr.java index 600cddb..d9c9354 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/StepExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/StepExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/StringLiteral.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/StringLiteral.java index d928edb..54d6de7 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/StringLiteral.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/StringLiteral.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/TextTest.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/TextTest.java index db34fba..bc151a6 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/TextTest.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/TextTest.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/TreatExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/TreatExpr.java index 4bf3ccc..3337828 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/TreatExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/TreatExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/UnaryExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/UnaryExpr.java index be5cf90..61f6fb0 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/UnaryExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/UnaryExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/UnionExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/UnionExpr.java index 2898dd8..1430f03 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/UnionExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/UnionExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/ValueComp.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/ValueComp.java index 552b6ee..d12be8c 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/ValueComp.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/ValueComp.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/ValueExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/ValueExpr.java index 6130833..4f4b858 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/ValueExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/ValueExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/VarRef.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/VarRef.java index 425a3a9..8e172bf 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/VarRef.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/VarRef.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/AbstractPartialASTNode.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/AbstractPartialASTNode.java index 3ea31c5..892079a 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/AbstractPartialASTNode.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/AbstractPartialASTNode.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialASTNode.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialASTNode.java index 8c1a51f..a364b23 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialASTNode.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialASTNode.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialAdditiveExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialAdditiveExpr.java index 07d9382..b69b515 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialAdditiveExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialAdditiveExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialAndExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialAndExpr.java index f5449ec..aaa8ed8 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialAndExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialAndExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialAttributeTest.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialAttributeTest.java index 22c2e84..fb1355b 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialAttributeTest.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialAttributeTest.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. @@ -21,7 +21,7 @@ import com.evolvedbinary.xpath.parser.ast.AttributeTest; import com.evolvedbinary.xpath.parser.ast.QNameW; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nullable; /** * Created by aretter on 30/01/2016. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialAxisStep.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialAxisStep.java index e951844..25bbf3f 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialAxisStep.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialAxisStep.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialComparisonExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialComparisonExpr.java index b547625..4ef1292 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialComparisonExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialComparisonExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialDecimalLiteral.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialDecimalLiteral.java index cc26432..bf76711 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialDecimalLiteral.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialDecimalLiteral.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. @@ -20,7 +20,7 @@ package com.evolvedbinary.xpath.parser.ast.partial; import com.evolvedbinary.xpath.parser.ast.DecimalLiteral; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nullable; /** * Created by aretter on 10/02/2016. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialDocumentTest.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialDocumentTest.java index c3c5b72..eb82721 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialDocumentTest.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialDocumentTest.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. @@ -19,7 +19,7 @@ */ package com.evolvedbinary.xpath.parser.ast.partial; -import com.evolvedbinary.functional.Either; +import com.evolvedbinary.j8fu.Either; import com.evolvedbinary.xpath.parser.ast.ElementTest; import com.evolvedbinary.xpath.parser.ast.DocumentTest; import com.evolvedbinary.xpath.parser.ast.SchemaElementTest; diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialDoubleLiteral.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialDoubleLiteral.java index 5b02c1e..8b2050f 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialDoubleLiteral.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialDoubleLiteral.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. @@ -20,7 +20,7 @@ package com.evolvedbinary.xpath.parser.ast.partial; import com.evolvedbinary.xpath.parser.ast.DoubleLiteral; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nullable; /** * Created by aretter on 10/02/2016. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialElementTest.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialElementTest.java index 8487559..94e7c1b 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialElementTest.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialElementTest.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. @@ -21,7 +21,7 @@ import com.evolvedbinary.xpath.parser.ast.ElementTest; import com.evolvedbinary.xpath.parser.ast.QNameW; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nullable; /** * Created by aretter on 30/01/2016. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialFilterExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialFilterExpr.java index a136bd9..0a090f8 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialFilterExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialFilterExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialForExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialForExpr.java index a8ced65..0659d39 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialForExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialForExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialFunctionCall.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialFunctionCall.java index c86fb81..eac620a 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialFunctionCall.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialFunctionCall.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialIfExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialIfExpr.java index 5445725..15eed45 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialIfExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialIfExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialIntersectExceptExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialIntersectExceptExpr.java index 4f367f5..2aab003 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialIntersectExceptExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialIntersectExceptExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialMultiplicativeExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialMultiplicativeExpr.java index de6807a..1b0a207 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialMultiplicativeExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialMultiplicativeExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialOrExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialOrExpr.java index 44da396..fc524f8 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialOrExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialOrExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialPITest.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialPITest.java index a89e9dc..8238852 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialPITest.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialPITest.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. @@ -20,7 +20,7 @@ package com.evolvedbinary.xpath.parser.ast.partial; import com.evolvedbinary.xpath.parser.ast.PITest; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nullable; /** * Created by aretter on 30/01/2016. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialPrefixedName.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialPrefixedName.java index e0c8e33..d0f51aa 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialPrefixedName.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialPrefixedName.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialQuantifierExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialQuantifierExpr.java index 681795b..85194a3 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialQuantifierExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialQuantifierExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialRangeExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialRangeExpr.java index 08d4280..7a66034 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialRangeExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialRangeExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialSequenceType.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialSequenceType.java index 72a8da5..da66824 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialSequenceType.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialSequenceType.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. @@ -22,7 +22,7 @@ import com.evolvedbinary.xpath.parser.ast.ItemType; import com.evolvedbinary.xpath.parser.ast.OccurrenceIndicator; import com.evolvedbinary.xpath.parser.ast.SequenceType; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nullable; /** * Created by aretter on 12/02/2016. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialStep.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialStep.java index 0101f63..6d23ab3 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialStep.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialStep.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialUnaryExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialUnaryExpr.java index a414b5a..dc0abe5 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialUnaryExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialUnaryExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialUnionExpr.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialUnionExpr.java index 2a0e419..b189756 100644 --- a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialUnionExpr.java +++ b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialUnionExpr.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. diff --git a/src/test/java/com/evolvedbinary/xpath/parser/XPathParserTest.java b/src/test/java/com/evolvedbinary/xpath/parser/XPathParserTest.java index 3543b7f..f8482df 100644 --- a/src/test/java/com/evolvedbinary/xpath/parser/XPathParserTest.java +++ b/src/test/java/com/evolvedbinary/xpath/parser/XPathParserTest.java @@ -1,4 +1,4 @@ -/** +/* * XPath 2 Parser * A Parser for XPath 2 * Copyright (C) 2016 Evolved Binary Ltd. @@ -19,7 +19,7 @@ */ package com.evolvedbinary.xpath.parser; -import com.evolvedbinary.functional.Either; +import com.evolvedbinary.j8fu.Either; import com.evolvedbinary.xpath.parser.ast.*; import org.junit.Test; import org.parboiled.Parboiled;