diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/ArgumentSeparatorToken.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/ArgumentSeparatorToken.java similarity index 93% rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/ArgumentSeparatorToken.java rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/ArgumentSeparatorToken.java index 1e559fda60..a7116f7559 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/ArgumentSeparatorToken.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/ArgumentSeparatorToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; /** * Represents an argument separator in functions i.e: ',' diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/CloseParenthesesToken.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/CloseParenthesesToken.java similarity index 93% rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/CloseParenthesesToken.java rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/CloseParenthesesToken.java index 12ae183205..028b474253 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/CloseParenthesesToken.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/CloseParenthesesToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; /** * represents closed parentheses diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Expression.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Expression.java index ddfb31d5e8..ca6ad534ae 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Expression.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Expression.java @@ -26,15 +26,6 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import com.l2jmobius.gameserver.util.exp4j.function.Function; -import com.l2jmobius.gameserver.util.exp4j.function.Functions; -import com.l2jmobius.gameserver.util.exp4j.operator.Operator; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.FunctionToken; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.NumberToken; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.OperatorToken; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.Token; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.VariableToken; - public class Expression { private final Token[] tokens; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/ExpressionBuilder.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/ExpressionBuilder.java index 1187ba2cfe..ce2d889da9 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/ExpressionBuilder.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/ExpressionBuilder.java @@ -23,11 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.l2jmobius.gameserver.util.exp4j.function.Function; -import com.l2jmobius.gameserver.util.exp4j.function.Functions; -import com.l2jmobius.gameserver.util.exp4j.operator.Operator; -import com.l2jmobius.gameserver.util.exp4j.shuntingyard.ShuntingYard; - /** * Factory class for {@link Expression} instances. This class is the main API entrypoint. Users should create new {@link Expression} instances using this factory class. */ @@ -60,8 +55,8 @@ public class ExpressionBuilder } /** - * Add a {@link com.l2jmobius.gameserver.util.exp4j.function.Function} implementation available for use in the expression - * @param function the custom {@link com.l2jmobius.gameserver.util.exp4j.function.Function} implementation that should be available for use in the expression. + * Add a {@link com.l2jmobius.gameserver.util.exp4j.Function} implementation available for use in the expression + * @param function the custom {@link com.l2jmobius.gameserver.util.exp4j.Function} implementation that should be available for use in the expression. * @return the ExpressionBuilder instance */ public ExpressionBuilder function(Function function) @@ -71,8 +66,8 @@ public class ExpressionBuilder } /** - * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.function.Function} implementations available for use in the expression - * @param functions the custom {@link com.l2jmobius.gameserver.util.exp4j.function.Function} implementations + * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.Function} implementations available for use in the expression + * @param functions the custom {@link com.l2jmobius.gameserver.util.exp4j.Function} implementations * @return the ExpressionBuilder instance */ public ExpressionBuilder functions(Function... functions) @@ -85,8 +80,8 @@ public class ExpressionBuilder } /** - * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.function.Function} implementations available for use in the expression - * @param functions A {@link java.util.List} of custom {@link com.l2jmobius.gameserver.util.exp4j.function.Function} implementations + * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.Function} implementations available for use in the expression + * @param functions A {@link java.util.List} of custom {@link com.l2jmobius.gameserver.util.exp4j.Function} implementations * @return the ExpressionBuilder instance */ public ExpressionBuilder functions(List functions) @@ -138,8 +133,8 @@ public class ExpressionBuilder } /** - * Add an {@link com.l2jmobius.gameserver.util.exp4j.operator.Operator} which should be available for use in the expression - * @param operator the custom {@link com.l2jmobius.gameserver.util.exp4j.operator.Operator} to add + * Add an {@link com.l2jmobius.gameserver.util.exp4j.Operator} which should be available for use in the expression + * @param operator the custom {@link com.l2jmobius.gameserver.util.exp4j.Operator} to add * @return the ExpressionBuilder instance */ public ExpressionBuilder operator(Operator operator) @@ -162,8 +157,8 @@ public class ExpressionBuilder } /** - * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.operator.Operator} implementations which should be available for use in the expression - * @param operators the set of custom {@link com.l2jmobius.gameserver.util.exp4j.operator.Operator} implementations to add + * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.Operator} implementations which should be available for use in the expression + * @param operators the set of custom {@link com.l2jmobius.gameserver.util.exp4j.Operator} implementations to add * @return the ExpressionBuilder instance */ public ExpressionBuilder operator(Operator... operators) @@ -176,8 +171,8 @@ public class ExpressionBuilder } /** - * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.operator.Operator} implementations which should be available for use in the expression - * @param operators the {@link java.util.List} of custom {@link com.l2jmobius.gameserver.util.exp4j.operator.Operator} implementations to add + * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.Operator} implementations which should be available for use in the expression + * @param operators the {@link java.util.List} of custom {@link com.l2jmobius.gameserver.util.exp4j.Operator} implementations to add * @return the ExpressionBuilder instance */ public ExpressionBuilder operator(List operators) diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/function/Function.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Function.java similarity index 98% rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/function/Function.java rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Function.java index 4c2f80b7bb..d9b2b76b52 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/function/Function.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Function.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.function; +package com.l2jmobius.gameserver.util.exp4j; /** * A class representing a Function which can be used in an expression diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/FunctionToken.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/FunctionToken.java similarity index 87% rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/FunctionToken.java rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/FunctionToken.java index eefc225289..91a765b66e 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/FunctionToken.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/FunctionToken.java @@ -13,9 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; - -import com.l2jmobius.gameserver.util.exp4j.function.Function; +package com.l2jmobius.gameserver.util.exp4j; public class FunctionToken extends Token { diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/function/Functions.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Functions.java similarity index 99% rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/function/Functions.java rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Functions.java index 4dbf430184..ac994e622f 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/function/Functions.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Functions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.function; +package com.l2jmobius.gameserver.util.exp4j; /** * Class representing the builtin functions available for use in expressions diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/NumberToken.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/NumberToken.java similarity index 95% rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/NumberToken.java rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/NumberToken.java index a0c5cd6183..74e0f3cdf5 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/NumberToken.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/NumberToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; /** * Represents a number in the expression diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/OpenParenthesesToken.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/OpenParenthesesToken.java similarity index 92% rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/OpenParenthesesToken.java rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/OpenParenthesesToken.java index 84402fa349..c1d4c264c3 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/OpenParenthesesToken.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/OpenParenthesesToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; class OpenParenthesesToken extends Token { diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/operator/Operator.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Operator.java similarity index 98% rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/operator/Operator.java rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Operator.java index bc4ed11b8b..0ad44f740c 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/operator/Operator.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Operator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.operator; +package com.l2jmobius.gameserver.util.exp4j; /** * Class representing operators that can be used in an expression diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/OperatorToken.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/OperatorToken.java similarity index 90% rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/OperatorToken.java rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/OperatorToken.java index 87d2c0185c..048865a0a3 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/OperatorToken.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/OperatorToken.java @@ -13,9 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; - -import com.l2jmobius.gameserver.util.exp4j.operator.Operator; +package com.l2jmobius.gameserver.util.exp4j; /** * Represents an operator used in expressions diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/operator/Operators.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Operators.java similarity index 98% rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/operator/Operators.java rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Operators.java index 6314d29a3f..f110daf2fb 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/operator/Operators.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Operators.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.operator; +package com.l2jmobius.gameserver.util.exp4j; public abstract class Operators { diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/shuntingyard/ShuntingYard.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java similarity index 88% rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/shuntingyard/ShuntingYard.java rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java index 98c78ca137..666e84979f 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/shuntingyard/ShuntingYard.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.shuntingyard; +package com.l2jmobius.gameserver.util.exp4j; import java.util.ArrayList; import java.util.List; @@ -21,12 +21,6 @@ import java.util.Map; import java.util.Set; import java.util.Stack; -import com.l2jmobius.gameserver.util.exp4j.function.Function; -import com.l2jmobius.gameserver.util.exp4j.operator.Operator; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.OperatorToken; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.Token; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.Tokenizer; - /** * Shunting yard implementation to convert infix to reverse polish notation */ @@ -39,7 +33,7 @@ public class ShuntingYard * @param userOperators the custom operators used * @param variableNames the variable names used in the expression * @param implicitMultiplication set to fasle to turn off implicit multiplication - * @return a {@link com.l2jmobius.gameserver.util.exp4j.tokenizer.Token} array containing the result + * @return a {@link com.l2jmobius.gameserver.util.exp4j.Token} array containing the result */ public static Token[] convertToRPN(final String expression, final Map userFunctions, final Map userOperators, final Set variableNames, final boolean implicitMultiplication) { diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/Token.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Token.java similarity index 95% rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/Token.java rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Token.java index 76dc60b992..a104db3c56 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/Token.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Token.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; /** * Abstract class for tokens used by exp4j to tokenize expressions diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/Tokenizer.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Tokenizer.java similarity index 96% rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/Tokenizer.java rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Tokenizer.java index 472c23f24d..ba86c0c120 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/Tokenizer.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/Tokenizer.java @@ -13,16 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; import java.util.Map; import java.util.Set; -import com.l2jmobius.gameserver.util.exp4j.function.Function; -import com.l2jmobius.gameserver.util.exp4j.function.Functions; -import com.l2jmobius.gameserver.util.exp4j.operator.Operator; -import com.l2jmobius.gameserver.util.exp4j.operator.Operators; - public class Tokenizer { private final char[] expression; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/UnknownFunctionOrVariableException.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/UnknownFunctionOrVariableException.java similarity index 96% rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/UnknownFunctionOrVariableException.java rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/UnknownFunctionOrVariableException.java index e7c69735b3..8e67d966c8 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/UnknownFunctionOrVariableException.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/UnknownFunctionOrVariableException.java @@ -1,4 +1,4 @@ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; /** * This exception is being thrown whenever {@link Tokenizer} finds unknown function or variable. diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/VariableToken.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/VariableToken.java similarity index 94% rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/VariableToken.java rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/VariableToken.java index db9fc3c62f..5fa62e43bd 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/VariableToken.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/exp4j/VariableToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; /** * represents a setVariable used in an expression diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/ArgumentSeparatorToken.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/ArgumentSeparatorToken.java similarity index 90% rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/ArgumentSeparatorToken.java rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/ArgumentSeparatorToken.java index 59392cd91a..5b9ae0efc9 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/ArgumentSeparatorToken.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/ArgumentSeparatorToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; /** * Represents an argument separator in functions i.e: ',' diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/CloseParenthesesToken.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/CloseParenthesesToken.java similarity index 90% rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/CloseParenthesesToken.java rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/CloseParenthesesToken.java index 7af5d8a264..8e49f956a9 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/CloseParenthesesToken.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/CloseParenthesesToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; /** * represents closed parentheses diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Expression.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Expression.java index e2d7a81ee0..c914843929 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Expression.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Expression.java @@ -26,15 +26,6 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import com.l2jmobius.gameserver.util.exp4j.function.Function; -import com.l2jmobius.gameserver.util.exp4j.function.Functions; -import com.l2jmobius.gameserver.util.exp4j.operator.Operator; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.FunctionToken; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.NumberToken; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.OperatorToken; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.Token; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.VariableToken; - public class Expression { private final Token[] tokens; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/ExpressionBuilder.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/ExpressionBuilder.java index e022714b52..3ab5cd6a05 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/ExpressionBuilder.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/ExpressionBuilder.java @@ -23,11 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.l2jmobius.gameserver.util.exp4j.function.Function; -import com.l2jmobius.gameserver.util.exp4j.function.Functions; -import com.l2jmobius.gameserver.util.exp4j.operator.Operator; -import com.l2jmobius.gameserver.util.exp4j.shuntingyard.ShuntingYard; - /** * Factory class for {@link Expression} instances. This class is the main API entrypoint. Users should create new {@link Expression} instances using this factory class. */ @@ -60,8 +55,8 @@ public class ExpressionBuilder } /** - * Add a {@link com.l2jmobius.gameserver.util.exp4j.function.Function} implementation available for use in the expression - * @param function the custom {@link com.l2jmobius.gameserver.util.exp4j.function.Function} implementation that should be available for use in the expression. + * Add a {@link com.l2jmobius.gameserver.util.exp4j.Function} implementation available for use in the expression + * @param function the custom {@link com.l2jmobius.gameserver.util.exp4j.Function} implementation that should be available for use in the expression. * @return the ExpressionBuilder instance */ public ExpressionBuilder function(Function function) @@ -71,8 +66,8 @@ public class ExpressionBuilder } /** - * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.function.Function} implementations available for use in the expression - * @param functions the custom {@link com.l2jmobius.gameserver.util.exp4j.function.Function} implementations + * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.Function} implementations available for use in the expression + * @param functions the custom {@link com.l2jmobius.gameserver.util.exp4j.Function} implementations * @return the ExpressionBuilder instance */ public ExpressionBuilder functions(Function... functions) @@ -85,8 +80,8 @@ public class ExpressionBuilder } /** - * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.function.Function} implementations available for use in the expression - * @param functions A {@link java.util.List} of custom {@link com.l2jmobius.gameserver.util.exp4j.function.Function} implementations + * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.Function} implementations available for use in the expression + * @param functions A {@link java.util.List} of custom {@link com.l2jmobius.gameserver.util.exp4j.Function} implementations * @return the ExpressionBuilder instance */ public ExpressionBuilder functions(List functions) @@ -138,8 +133,8 @@ public class ExpressionBuilder } /** - * Add an {@link com.l2jmobius.gameserver.util.exp4j.operator.Operator} which should be available for use in the expression - * @param operator the custom {@link com.l2jmobius.gameserver.util.exp4j.operator.Operator} to add + * Add an {@link com.l2jmobius.gameserver.util.exp4j.Operator} which should be available for use in the expression + * @param operator the custom {@link com.l2jmobius.gameserver.util.exp4j.Operator} to add * @return the ExpressionBuilder instance */ public ExpressionBuilder operator(Operator operator) @@ -162,8 +157,8 @@ public class ExpressionBuilder } /** - * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.operator.Operator} implementations which should be available for use in the expression - * @param operators the set of custom {@link com.l2jmobius.gameserver.util.exp4j.operator.Operator} implementations to add + * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.Operator} implementations which should be available for use in the expression + * @param operators the set of custom {@link com.l2jmobius.gameserver.util.exp4j.Operator} implementations to add * @return the ExpressionBuilder instance */ public ExpressionBuilder operator(Operator... operators) @@ -176,8 +171,8 @@ public class ExpressionBuilder } /** - * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.operator.Operator} implementations which should be available for use in the expression - * @param operators the {@link java.util.List} of custom {@link com.l2jmobius.gameserver.util.exp4j.operator.Operator} implementations to add + * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.Operator} implementations which should be available for use in the expression + * @param operators the {@link java.util.List} of custom {@link com.l2jmobius.gameserver.util.exp4j.Operator} implementations to add * @return the ExpressionBuilder instance */ public ExpressionBuilder operator(List operators) diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/function/Function.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Function.java similarity index 94% rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/function/Function.java rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Function.java index e8ff9a9275..0cb5df1a1f 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/function/Function.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Function.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.function; +package com.l2jmobius.gameserver.util.exp4j; /** * A class representing a Function which can be used in an expression diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/FunctionToken.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/FunctionToken.java similarity index 84% rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/FunctionToken.java rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/FunctionToken.java index 0b2dff6a2e..e5dacf83bb 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/FunctionToken.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/FunctionToken.java @@ -13,9 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; - -import com.l2jmobius.gameserver.util.exp4j.function.Function; +package com.l2jmobius.gameserver.util.exp4j; public class FunctionToken extends Token { diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/function/Functions.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Functions.java similarity index 94% rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/function/Functions.java rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Functions.java index 6f1d322ec0..159c5df2d5 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/function/Functions.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Functions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.function; +package com.l2jmobius.gameserver.util.exp4j; /** * Class representing the builtin functions available for use in expressions diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/NumberToken.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/NumberToken.java similarity index 91% rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/NumberToken.java rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/NumberToken.java index c74941cb00..13fac22814 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/NumberToken.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/NumberToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; /** * Represents a number in the expression diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/OpenParenthesesToken.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/OpenParenthesesToken.java similarity index 89% rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/OpenParenthesesToken.java rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/OpenParenthesesToken.java index 9ae54bd48d..851ce4af24 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/OpenParenthesesToken.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/OpenParenthesesToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; class OpenParenthesesToken extends Token { diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/operator/Operator.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Operator.java similarity index 94% rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/operator/Operator.java rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Operator.java index 9f805030d3..53c34b8851 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/operator/Operator.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Operator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.operator; +package com.l2jmobius.gameserver.util.exp4j; /** * Class representing operators that can be used in an expression diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/OperatorToken.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/OperatorToken.java similarity index 86% rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/OperatorToken.java rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/OperatorToken.java index 7f79f14288..5f849c4554 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/OperatorToken.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/OperatorToken.java @@ -13,9 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; - -import com.l2jmobius.gameserver.util.exp4j.operator.Operator; +package com.l2jmobius.gameserver.util.exp4j; /** * Represents an operator used in expressions diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/operator/Operators.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Operators.java similarity index 94% rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/operator/Operators.java rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Operators.java index 1a9d077c79..79abddd39e 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/operator/Operators.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Operators.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.operator; +package com.l2jmobius.gameserver.util.exp4j; public abstract class Operators { diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/shuntingyard/ShuntingYard.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java similarity index 86% rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/shuntingyard/ShuntingYard.java rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java index ebc5455a27..18a5ef7a3d 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/shuntingyard/ShuntingYard.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.shuntingyard; +package com.l2jmobius.gameserver.util.exp4j; import java.util.ArrayList; import java.util.List; @@ -21,12 +21,6 @@ import java.util.Map; import java.util.Set; import java.util.Stack; -import com.l2jmobius.gameserver.util.exp4j.function.Function; -import com.l2jmobius.gameserver.util.exp4j.operator.Operator; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.OperatorToken; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.Token; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.Tokenizer; - /** * Shunting yard implementation to convert infix to reverse polish notation */ @@ -39,7 +33,7 @@ public class ShuntingYard * @param userOperators the custom operators used * @param variableNames the variable names used in the expression * @param implicitMultiplication set to fasle to turn off implicit multiplication - * @return a {@link com.l2jmobius.gameserver.util.exp4j.tokenizer.Token} array containing the result + * @return a {@link com.l2jmobius.gameserver.util.exp4j.Token} array containing the result */ public static Token[] convertToRPN(final String expression, final Map userFunctions, final Map userOperators, final Set variableNames, final boolean implicitMultiplication) { diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/Token.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Token.java similarity index 92% rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/Token.java rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Token.java index fefd2c1de4..fdd2a6c469 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/Token.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Token.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; /** * Abstract class for tokens used by exp4j to tokenize expressions diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/Tokenizer.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Tokenizer.java similarity index 93% rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/Tokenizer.java rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Tokenizer.java index ac17846e12..33898c2c0e 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/Tokenizer.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/Tokenizer.java @@ -13,16 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; import java.util.Map; import java.util.Set; -import com.l2jmobius.gameserver.util.exp4j.function.Function; -import com.l2jmobius.gameserver.util.exp4j.function.Functions; -import com.l2jmobius.gameserver.util.exp4j.operator.Operator; -import com.l2jmobius.gameserver.util.exp4j.operator.Operators; - public class Tokenizer { private final char[] expression; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/UnknownFunctionOrVariableException.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/UnknownFunctionOrVariableException.java similarity index 91% rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/UnknownFunctionOrVariableException.java rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/UnknownFunctionOrVariableException.java index 37575a8ec3..051343afcb 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/UnknownFunctionOrVariableException.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/UnknownFunctionOrVariableException.java @@ -1,4 +1,4 @@ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; /** * This exception is being thrown whenever {@link Tokenizer} finds unknown function or variable. diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/VariableToken.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/VariableToken.java similarity index 91% rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/VariableToken.java rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/VariableToken.java index bdb8dfa5dc..102bbaf91d 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/VariableToken.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/VariableToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; /** * represents a setVariable used in an expression diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/ArgumentSeparatorToken.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/ArgumentSeparatorToken.java similarity index 90% rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/ArgumentSeparatorToken.java rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/ArgumentSeparatorToken.java index 59392cd91a..5b9ae0efc9 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/ArgumentSeparatorToken.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/ArgumentSeparatorToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; /** * Represents an argument separator in functions i.e: ',' diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/CloseParenthesesToken.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/CloseParenthesesToken.java similarity index 90% rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/CloseParenthesesToken.java rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/CloseParenthesesToken.java index 7af5d8a264..8e49f956a9 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/CloseParenthesesToken.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/CloseParenthesesToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; /** * represents closed parentheses diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Expression.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Expression.java index e2d7a81ee0..c914843929 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Expression.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Expression.java @@ -26,15 +26,6 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import com.l2jmobius.gameserver.util.exp4j.function.Function; -import com.l2jmobius.gameserver.util.exp4j.function.Functions; -import com.l2jmobius.gameserver.util.exp4j.operator.Operator; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.FunctionToken; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.NumberToken; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.OperatorToken; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.Token; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.VariableToken; - public class Expression { private final Token[] tokens; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/ExpressionBuilder.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/ExpressionBuilder.java index e022714b52..3ab5cd6a05 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/ExpressionBuilder.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/ExpressionBuilder.java @@ -23,11 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.l2jmobius.gameserver.util.exp4j.function.Function; -import com.l2jmobius.gameserver.util.exp4j.function.Functions; -import com.l2jmobius.gameserver.util.exp4j.operator.Operator; -import com.l2jmobius.gameserver.util.exp4j.shuntingyard.ShuntingYard; - /** * Factory class for {@link Expression} instances. This class is the main API entrypoint. Users should create new {@link Expression} instances using this factory class. */ @@ -60,8 +55,8 @@ public class ExpressionBuilder } /** - * Add a {@link com.l2jmobius.gameserver.util.exp4j.function.Function} implementation available for use in the expression - * @param function the custom {@link com.l2jmobius.gameserver.util.exp4j.function.Function} implementation that should be available for use in the expression. + * Add a {@link com.l2jmobius.gameserver.util.exp4j.Function} implementation available for use in the expression + * @param function the custom {@link com.l2jmobius.gameserver.util.exp4j.Function} implementation that should be available for use in the expression. * @return the ExpressionBuilder instance */ public ExpressionBuilder function(Function function) @@ -71,8 +66,8 @@ public class ExpressionBuilder } /** - * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.function.Function} implementations available for use in the expression - * @param functions the custom {@link com.l2jmobius.gameserver.util.exp4j.function.Function} implementations + * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.Function} implementations available for use in the expression + * @param functions the custom {@link com.l2jmobius.gameserver.util.exp4j.Function} implementations * @return the ExpressionBuilder instance */ public ExpressionBuilder functions(Function... functions) @@ -85,8 +80,8 @@ public class ExpressionBuilder } /** - * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.function.Function} implementations available for use in the expression - * @param functions A {@link java.util.List} of custom {@link com.l2jmobius.gameserver.util.exp4j.function.Function} implementations + * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.Function} implementations available for use in the expression + * @param functions A {@link java.util.List} of custom {@link com.l2jmobius.gameserver.util.exp4j.Function} implementations * @return the ExpressionBuilder instance */ public ExpressionBuilder functions(List functions) @@ -138,8 +133,8 @@ public class ExpressionBuilder } /** - * Add an {@link com.l2jmobius.gameserver.util.exp4j.operator.Operator} which should be available for use in the expression - * @param operator the custom {@link com.l2jmobius.gameserver.util.exp4j.operator.Operator} to add + * Add an {@link com.l2jmobius.gameserver.util.exp4j.Operator} which should be available for use in the expression + * @param operator the custom {@link com.l2jmobius.gameserver.util.exp4j.Operator} to add * @return the ExpressionBuilder instance */ public ExpressionBuilder operator(Operator operator) @@ -162,8 +157,8 @@ public class ExpressionBuilder } /** - * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.operator.Operator} implementations which should be available for use in the expression - * @param operators the set of custom {@link com.l2jmobius.gameserver.util.exp4j.operator.Operator} implementations to add + * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.Operator} implementations which should be available for use in the expression + * @param operators the set of custom {@link com.l2jmobius.gameserver.util.exp4j.Operator} implementations to add * @return the ExpressionBuilder instance */ public ExpressionBuilder operator(Operator... operators) @@ -176,8 +171,8 @@ public class ExpressionBuilder } /** - * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.operator.Operator} implementations which should be available for use in the expression - * @param operators the {@link java.util.List} of custom {@link com.l2jmobius.gameserver.util.exp4j.operator.Operator} implementations to add + * Add multiple {@link com.l2jmobius.gameserver.util.exp4j.Operator} implementations which should be available for use in the expression + * @param operators the {@link java.util.List} of custom {@link com.l2jmobius.gameserver.util.exp4j.Operator} implementations to add * @return the ExpressionBuilder instance */ public ExpressionBuilder operator(List operators) diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/function/Function.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Function.java similarity index 94% rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/function/Function.java rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Function.java index e8ff9a9275..0cb5df1a1f 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/function/Function.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Function.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.function; +package com.l2jmobius.gameserver.util.exp4j; /** * A class representing a Function which can be used in an expression diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/FunctionToken.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/FunctionToken.java similarity index 84% rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/FunctionToken.java rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/FunctionToken.java index 0b2dff6a2e..e5dacf83bb 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/FunctionToken.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/FunctionToken.java @@ -13,9 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; - -import com.l2jmobius.gameserver.util.exp4j.function.Function; +package com.l2jmobius.gameserver.util.exp4j; public class FunctionToken extends Token { diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/function/Functions.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Functions.java similarity index 94% rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/function/Functions.java rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Functions.java index 6f1d322ec0..159c5df2d5 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/function/Functions.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Functions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.function; +package com.l2jmobius.gameserver.util.exp4j; /** * Class representing the builtin functions available for use in expressions diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/NumberToken.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/NumberToken.java similarity index 91% rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/NumberToken.java rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/NumberToken.java index c74941cb00..13fac22814 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/NumberToken.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/NumberToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; /** * Represents a number in the expression diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/OpenParenthesesToken.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/OpenParenthesesToken.java similarity index 89% rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/OpenParenthesesToken.java rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/OpenParenthesesToken.java index 9ae54bd48d..851ce4af24 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/OpenParenthesesToken.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/OpenParenthesesToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; class OpenParenthesesToken extends Token { diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/operator/Operator.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Operator.java similarity index 94% rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/operator/Operator.java rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Operator.java index 9f805030d3..53c34b8851 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/operator/Operator.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Operator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.operator; +package com.l2jmobius.gameserver.util.exp4j; /** * Class representing operators that can be used in an expression diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/OperatorToken.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/OperatorToken.java similarity index 86% rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/OperatorToken.java rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/OperatorToken.java index 7f79f14288..5f849c4554 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/OperatorToken.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/OperatorToken.java @@ -13,9 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; - -import com.l2jmobius.gameserver.util.exp4j.operator.Operator; +package com.l2jmobius.gameserver.util.exp4j; /** * Represents an operator used in expressions diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/operator/Operators.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Operators.java similarity index 94% rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/operator/Operators.java rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Operators.java index 1a9d077c79..79abddd39e 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/operator/Operators.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Operators.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.operator; +package com.l2jmobius.gameserver.util.exp4j; public abstract class Operators { diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/shuntingyard/ShuntingYard.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java similarity index 86% rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/shuntingyard/ShuntingYard.java rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java index ebc5455a27..18a5ef7a3d 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/shuntingyard/ShuntingYard.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.shuntingyard; +package com.l2jmobius.gameserver.util.exp4j; import java.util.ArrayList; import java.util.List; @@ -21,12 +21,6 @@ import java.util.Map; import java.util.Set; import java.util.Stack; -import com.l2jmobius.gameserver.util.exp4j.function.Function; -import com.l2jmobius.gameserver.util.exp4j.operator.Operator; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.OperatorToken; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.Token; -import com.l2jmobius.gameserver.util.exp4j.tokenizer.Tokenizer; - /** * Shunting yard implementation to convert infix to reverse polish notation */ @@ -39,7 +33,7 @@ public class ShuntingYard * @param userOperators the custom operators used * @param variableNames the variable names used in the expression * @param implicitMultiplication set to fasle to turn off implicit multiplication - * @return a {@link com.l2jmobius.gameserver.util.exp4j.tokenizer.Token} array containing the result + * @return a {@link com.l2jmobius.gameserver.util.exp4j.Token} array containing the result */ public static Token[] convertToRPN(final String expression, final Map userFunctions, final Map userOperators, final Set variableNames, final boolean implicitMultiplication) { diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/Token.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Token.java similarity index 92% rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/Token.java rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Token.java index fefd2c1de4..fdd2a6c469 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/Token.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Token.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; /** * Abstract class for tokens used by exp4j to tokenize expressions diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/Tokenizer.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Tokenizer.java similarity index 93% rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/Tokenizer.java rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Tokenizer.java index ac17846e12..33898c2c0e 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/Tokenizer.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/Tokenizer.java @@ -13,16 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; import java.util.Map; import java.util.Set; -import com.l2jmobius.gameserver.util.exp4j.function.Function; -import com.l2jmobius.gameserver.util.exp4j.function.Functions; -import com.l2jmobius.gameserver.util.exp4j.operator.Operator; -import com.l2jmobius.gameserver.util.exp4j.operator.Operators; - public class Tokenizer { private final char[] expression; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/UnknownFunctionOrVariableException.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/UnknownFunctionOrVariableException.java similarity index 91% rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/UnknownFunctionOrVariableException.java rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/UnknownFunctionOrVariableException.java index 37575a8ec3..051343afcb 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/UnknownFunctionOrVariableException.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/UnknownFunctionOrVariableException.java @@ -1,4 +1,4 @@ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; /** * This exception is being thrown whenever {@link Tokenizer} finds unknown function or variable. diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/VariableToken.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/VariableToken.java similarity index 91% rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/VariableToken.java rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/VariableToken.java index bdb8dfa5dc..102bbaf91d 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/exp4j/tokenizer/VariableToken.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/exp4j/VariableToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.l2jmobius.gameserver.util.exp4j.tokenizer; +package com.l2jmobius.gameserver.util.exp4j; /** * represents a setVariable used in an expression