diff --git a/src/net/sourceforge/plantuml/tim/TContext.java b/src/net/sourceforge/plantuml/tim/TContext.java index f4647e84db1..bba2da0faf2 100644 --- a/src/net/sourceforge/plantuml/tim/TContext.java +++ b/src/net/sourceforge/plantuml/tim/TContext.java @@ -71,6 +71,72 @@ import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.theme.Theme; import net.sourceforge.plantuml.theme.ThemeUtils; +import net.sourceforge.plantuml.tim.builtin.AlwaysFalse; +import net.sourceforge.plantuml.tim.builtin.AlwaysTrue; +import net.sourceforge.plantuml.tim.builtin.BoolVal; +import net.sourceforge.plantuml.tim.builtin.CallUserFunction; +import net.sourceforge.plantuml.tim.builtin.Chr; +import net.sourceforge.plantuml.tim.builtin.Darken; +import net.sourceforge.plantuml.tim.builtin.DateFunction; +import net.sourceforge.plantuml.tim.builtin.Dec2hex; +import net.sourceforge.plantuml.tim.builtin.Dirpath; +import net.sourceforge.plantuml.tim.builtin.Eval; +import net.sourceforge.plantuml.tim.builtin.Feature; +import net.sourceforge.plantuml.tim.builtin.FileExists; +import net.sourceforge.plantuml.tim.builtin.Filedate; +import net.sourceforge.plantuml.tim.builtin.Filename; +import net.sourceforge.plantuml.tim.builtin.FilenameNoExtension; +import net.sourceforge.plantuml.tim.builtin.FunctionExists; +import net.sourceforge.plantuml.tim.builtin.GetAllStdlib; +import net.sourceforge.plantuml.tim.builtin.GetAllTheme; +import net.sourceforge.plantuml.tim.builtin.GetJsonKey; +import net.sourceforge.plantuml.tim.builtin.GetJsonType; +import net.sourceforge.plantuml.tim.builtin.GetStdlib; +import net.sourceforge.plantuml.tim.builtin.GetVariableValue; +import net.sourceforge.plantuml.tim.builtin.GetVersion; +import net.sourceforge.plantuml.tim.builtin.Getenv; +import net.sourceforge.plantuml.tim.builtin.Hex2dec; +import net.sourceforge.plantuml.tim.builtin.HslColor; +import net.sourceforge.plantuml.tim.builtin.IntVal; +import net.sourceforge.plantuml.tim.builtin.InvokeProcedure; +import net.sourceforge.plantuml.tim.builtin.IsDark; +import net.sourceforge.plantuml.tim.builtin.IsLight; +import net.sourceforge.plantuml.tim.builtin.JsonAdd; +import net.sourceforge.plantuml.tim.builtin.JsonKeyExists; +import net.sourceforge.plantuml.tim.builtin.JsonMerge; +import net.sourceforge.plantuml.tim.builtin.JsonRemove; +import net.sourceforge.plantuml.tim.builtin.JsonSet; +import net.sourceforge.plantuml.tim.builtin.Lighten; +import net.sourceforge.plantuml.tim.builtin.LoadJson; +import net.sourceforge.plantuml.tim.builtin.LogicalAnd; +import net.sourceforge.plantuml.tim.builtin.LogicalNand; +import net.sourceforge.plantuml.tim.builtin.LogicalNor; +import net.sourceforge.plantuml.tim.builtin.LogicalNot; +import net.sourceforge.plantuml.tim.builtin.LogicalNxor; +import net.sourceforge.plantuml.tim.builtin.LogicalOr; +import net.sourceforge.plantuml.tim.builtin.LogicalXor; +import net.sourceforge.plantuml.tim.builtin.Lower; +import net.sourceforge.plantuml.tim.builtin.Modulo; +import net.sourceforge.plantuml.tim.builtin.Newline; +import net.sourceforge.plantuml.tim.builtin.NewlineShort; +import net.sourceforge.plantuml.tim.builtin.Now; +import net.sourceforge.plantuml.tim.builtin.Ord; +import net.sourceforge.plantuml.tim.builtin.RandomFunction; +import net.sourceforge.plantuml.tim.builtin.RetrieveProcedure; +import net.sourceforge.plantuml.tim.builtin.ReverseColor; +import net.sourceforge.plantuml.tim.builtin.ReverseHsluvColor; +import net.sourceforge.plantuml.tim.builtin.SetVariableValue; +import net.sourceforge.plantuml.tim.builtin.Size; +import net.sourceforge.plantuml.tim.builtin.SplitStr; +import net.sourceforge.plantuml.tim.builtin.SplitStrRegex; +import net.sourceforge.plantuml.tim.builtin.Str2Json; +import net.sourceforge.plantuml.tim.builtin.StringFunction; +import net.sourceforge.plantuml.tim.builtin.Strlen; +import net.sourceforge.plantuml.tim.builtin.Strpos; +import net.sourceforge.plantuml.tim.builtin.Substr; +import net.sourceforge.plantuml.tim.builtin.Upper; +import net.sourceforge.plantuml.tim.builtin.VariableExists; +import net.sourceforge.plantuml.tim.builtin.Xargs; import net.sourceforge.plantuml.tim.expression.Knowledge; import net.sourceforge.plantuml.tim.expression.TValue; import net.sourceforge.plantuml.tim.iterator.CodeIterator; @@ -86,72 +152,6 @@ import net.sourceforge.plantuml.tim.iterator.CodeIteratorShortComment; import net.sourceforge.plantuml.tim.iterator.CodeIteratorSub; import net.sourceforge.plantuml.tim.iterator.CodeIteratorWhile; -import net.sourceforge.plantuml.tim.stdlib.AlwaysFalse; -import net.sourceforge.plantuml.tim.stdlib.AlwaysTrue; -import net.sourceforge.plantuml.tim.stdlib.BoolVal; -import net.sourceforge.plantuml.tim.stdlib.CallUserFunction; -import net.sourceforge.plantuml.tim.stdlib.Chr; -import net.sourceforge.plantuml.tim.stdlib.Darken; -import net.sourceforge.plantuml.tim.stdlib.DateFunction; -import net.sourceforge.plantuml.tim.stdlib.Dec2hex; -import net.sourceforge.plantuml.tim.stdlib.Dirpath; -import net.sourceforge.plantuml.tim.stdlib.Eval; -import net.sourceforge.plantuml.tim.stdlib.Feature; -import net.sourceforge.plantuml.tim.stdlib.FileExists; -import net.sourceforge.plantuml.tim.stdlib.Filedate; -import net.sourceforge.plantuml.tim.stdlib.Filename; -import net.sourceforge.plantuml.tim.stdlib.FilenameNoExtension; -import net.sourceforge.plantuml.tim.stdlib.FunctionExists; -import net.sourceforge.plantuml.tim.stdlib.GetAllStdlib; -import net.sourceforge.plantuml.tim.stdlib.GetAllTheme; -import net.sourceforge.plantuml.tim.stdlib.GetJsonKey; -import net.sourceforge.plantuml.tim.stdlib.GetJsonType; -import net.sourceforge.plantuml.tim.stdlib.GetStdlib; -import net.sourceforge.plantuml.tim.stdlib.GetVariableValue; -import net.sourceforge.plantuml.tim.stdlib.GetVersion; -import net.sourceforge.plantuml.tim.stdlib.Getenv; -import net.sourceforge.plantuml.tim.stdlib.Hex2dec; -import net.sourceforge.plantuml.tim.stdlib.HslColor; -import net.sourceforge.plantuml.tim.stdlib.IntVal; -import net.sourceforge.plantuml.tim.stdlib.InvokeProcedure; -import net.sourceforge.plantuml.tim.stdlib.IsDark; -import net.sourceforge.plantuml.tim.stdlib.IsLight; -import net.sourceforge.plantuml.tim.stdlib.JsonAdd; -import net.sourceforge.plantuml.tim.stdlib.JsonKeyExists; -import net.sourceforge.plantuml.tim.stdlib.JsonMerge; -import net.sourceforge.plantuml.tim.stdlib.JsonRemove; -import net.sourceforge.plantuml.tim.stdlib.JsonSet; -import net.sourceforge.plantuml.tim.stdlib.Lighten; -import net.sourceforge.plantuml.tim.stdlib.LoadJson; -import net.sourceforge.plantuml.tim.stdlib.LogicalAnd; -import net.sourceforge.plantuml.tim.stdlib.LogicalNand; -import net.sourceforge.plantuml.tim.stdlib.LogicalNor; -import net.sourceforge.plantuml.tim.stdlib.LogicalNot; -import net.sourceforge.plantuml.tim.stdlib.LogicalNxor; -import net.sourceforge.plantuml.tim.stdlib.LogicalOr; -import net.sourceforge.plantuml.tim.stdlib.LogicalXor; -import net.sourceforge.plantuml.tim.stdlib.Lower; -import net.sourceforge.plantuml.tim.stdlib.Modulo; -import net.sourceforge.plantuml.tim.stdlib.Newline; -import net.sourceforge.plantuml.tim.stdlib.NewlineShort; -import net.sourceforge.plantuml.tim.stdlib.Now; -import net.sourceforge.plantuml.tim.stdlib.Ord; -import net.sourceforge.plantuml.tim.stdlib.RandomFunction; -import net.sourceforge.plantuml.tim.stdlib.RetrieveProcedure; -import net.sourceforge.plantuml.tim.stdlib.ReverseColor; -import net.sourceforge.plantuml.tim.stdlib.ReverseHsluvColor; -import net.sourceforge.plantuml.tim.stdlib.SetVariableValue; -import net.sourceforge.plantuml.tim.stdlib.Size; -import net.sourceforge.plantuml.tim.stdlib.SplitStr; -import net.sourceforge.plantuml.tim.stdlib.SplitStrRegex; -import net.sourceforge.plantuml.tim.stdlib.Str2Json; -import net.sourceforge.plantuml.tim.stdlib.StringFunction; -import net.sourceforge.plantuml.tim.stdlib.Strlen; -import net.sourceforge.plantuml.tim.stdlib.Strpos; -import net.sourceforge.plantuml.tim.stdlib.Substr; -import net.sourceforge.plantuml.tim.stdlib.Upper; -import net.sourceforge.plantuml.tim.stdlib.VariableExists; -import net.sourceforge.plantuml.tim.stdlib.Xargs; import net.sourceforge.plantuml.utils.LineLocation; public class TContext { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java b/src/net/sourceforge/plantuml/tim/builtin/AlwaysFalse.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java rename to src/net/sourceforge/plantuml/tim/builtin/AlwaysFalse.java index 29b116da73a..5dc312c33ae 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java +++ b/src/net/sourceforge/plantuml/tim/builtin/AlwaysFalse.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java b/src/net/sourceforge/plantuml/tim/builtin/AlwaysTrue.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java rename to src/net/sourceforge/plantuml/tim/builtin/AlwaysTrue.java index e59c5e0f657..53ffdf844f3 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java +++ b/src/net/sourceforge/plantuml/tim/builtin/AlwaysTrue.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/BoolVal.java b/src/net/sourceforge/plantuml/tim/builtin/BoolVal.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/BoolVal.java rename to src/net/sourceforge/plantuml/tim/builtin/BoolVal.java index 3f712073615..569a395e53d 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/BoolVal.java +++ b/src/net/sourceforge/plantuml/tim/builtin/BoolVal.java @@ -33,7 +33,7 @@ * Contribution: Aravind Pai * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.Arrays; import java.util.List; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java b/src/net/sourceforge/plantuml/tim/builtin/CallUserFunction.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java rename to src/net/sourceforge/plantuml/tim/builtin/CallUserFunction.java index 36bbdf7c102..8e6943b9905 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java +++ b/src/net/sourceforge/plantuml/tim/builtin/CallUserFunction.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Chr.java b/src/net/sourceforge/plantuml/tim/builtin/Chr.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/Chr.java rename to src/net/sourceforge/plantuml/tim/builtin/Chr.java index fb55e335ad1..592a5b4d559 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Chr.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Chr.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Darken.java b/src/net/sourceforge/plantuml/tim/builtin/Darken.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/Darken.java rename to src/net/sourceforge/plantuml/tim/builtin/Darken.java index 924f24be1c6..c41dc932aca 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Darken.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Darken.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java b/src/net/sourceforge/plantuml/tim/builtin/DateFunction.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java rename to src/net/sourceforge/plantuml/tim/builtin/DateFunction.java index 6f8efa2eac6..6c27d2698d9 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java +++ b/src/net/sourceforge/plantuml/tim/builtin/DateFunction.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java b/src/net/sourceforge/plantuml/tim/builtin/Dec2hex.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java rename to src/net/sourceforge/plantuml/tim/builtin/Dec2hex.java index 9bbc29e4cc8..9e14d1e3d79 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Dec2hex.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java b/src/net/sourceforge/plantuml/tim/builtin/Dirpath.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java rename to src/net/sourceforge/plantuml/tim/builtin/Dirpath.java index ef08879cc89..d566ce3a60b 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Dirpath.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Eval.java b/src/net/sourceforge/plantuml/tim/builtin/Eval.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/Eval.java rename to src/net/sourceforge/plantuml/tim/builtin/Eval.java index 311404c1720..3e7fa853fff 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Eval.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Eval.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Feature.java b/src/net/sourceforge/plantuml/tim/builtin/Feature.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/Feature.java rename to src/net/sourceforge/plantuml/tim/builtin/Feature.java index 0f789f30c68..2ace55d53ce 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Feature.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Feature.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/FileExists.java b/src/net/sourceforge/plantuml/tim/builtin/FileExists.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/FileExists.java rename to src/net/sourceforge/plantuml/tim/builtin/FileExists.java index cee70de583a..55dece70b2a 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/FileExists.java +++ b/src/net/sourceforge/plantuml/tim/builtin/FileExists.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Filedate.java b/src/net/sourceforge/plantuml/tim/builtin/Filedate.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/Filedate.java rename to src/net/sourceforge/plantuml/tim/builtin/Filedate.java index 195b6f93c65..4eefd64048f 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Filedate.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Filedate.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Filename.java b/src/net/sourceforge/plantuml/tim/builtin/Filename.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/Filename.java rename to src/net/sourceforge/plantuml/tim/builtin/Filename.java index 9a4223d45a9..1c86120b6b9 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Filename.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Filename.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/FilenameNoExtension.java b/src/net/sourceforge/plantuml/tim/builtin/FilenameNoExtension.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/FilenameNoExtension.java rename to src/net/sourceforge/plantuml/tim/builtin/FilenameNoExtension.java index 3ed8af398e9..0c8f0230f52 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/FilenameNoExtension.java +++ b/src/net/sourceforge/plantuml/tim/builtin/FilenameNoExtension.java @@ -33,7 +33,7 @@ * Contribution: The-Lum * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java b/src/net/sourceforge/plantuml/tim/builtin/FunctionExists.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java rename to src/net/sourceforge/plantuml/tim/builtin/FunctionExists.java index d2bd9d1b2a2..79f26c07c9a 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java +++ b/src/net/sourceforge/plantuml/tim/builtin/FunctionExists.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java b/src/net/sourceforge/plantuml/tim/builtin/GetAllStdlib.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java rename to src/net/sourceforge/plantuml/tim/builtin/GetAllStdlib.java index c020bd923c7..1a23aa69e1c 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java +++ b/src/net/sourceforge/plantuml/tim/builtin/GetAllStdlib.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.io.IOException; import java.util.List; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java b/src/net/sourceforge/plantuml/tim/builtin/GetAllTheme.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java rename to src/net/sourceforge/plantuml/tim/builtin/GetAllTheme.java index 2512d26f1b8..8e784c93924 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java +++ b/src/net/sourceforge/plantuml/tim/builtin/GetAllTheme.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.io.IOException; import java.util.List; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java b/src/net/sourceforge/plantuml/tim/builtin/GetJsonKey.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java rename to src/net/sourceforge/plantuml/tim/builtin/GetJsonKey.java index 6e7df046c25..1624c21adc9 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java +++ b/src/net/sourceforge/plantuml/tim/builtin/GetJsonKey.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java b/src/net/sourceforge/plantuml/tim/builtin/GetJsonType.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java rename to src/net/sourceforge/plantuml/tim/builtin/GetJsonType.java index 0c09b9e847d..160eb249f58 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java +++ b/src/net/sourceforge/plantuml/tim/builtin/GetJsonType.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetStdlib.java b/src/net/sourceforge/plantuml/tim/builtin/GetStdlib.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/GetStdlib.java rename to src/net/sourceforge/plantuml/tim/builtin/GetStdlib.java index 39faf21345c..31dca6f39ce 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetStdlib.java +++ b/src/net/sourceforge/plantuml/tim/builtin/GetStdlib.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.io.IOException; import java.util.List; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java b/src/net/sourceforge/plantuml/tim/builtin/GetVariableValue.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java rename to src/net/sourceforge/plantuml/tim/builtin/GetVariableValue.java index b99e3478add..5a9865bf885 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java +++ b/src/net/sourceforge/plantuml/tim/builtin/GetVariableValue.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java b/src/net/sourceforge/plantuml/tim/builtin/GetVersion.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java rename to src/net/sourceforge/plantuml/tim/builtin/GetVersion.java index df0218cea3e..4ff14ce99e6 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java +++ b/src/net/sourceforge/plantuml/tim/builtin/GetVersion.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java b/src/net/sourceforge/plantuml/tim/builtin/Getenv.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/Getenv.java rename to src/net/sourceforge/plantuml/tim/builtin/Getenv.java index 4c93f23f5c4..efd48e290cb 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Getenv.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java b/src/net/sourceforge/plantuml/tim/builtin/Hex2dec.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java rename to src/net/sourceforge/plantuml/tim/builtin/Hex2dec.java index 964a6cfb048..bcb7ac69717 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Hex2dec.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java b/src/net/sourceforge/plantuml/tim/builtin/HslColor.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/HslColor.java rename to src/net/sourceforge/plantuml/tim/builtin/HslColor.java index 2113908d21a..5c621097a7e 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java +++ b/src/net/sourceforge/plantuml/tim/builtin/HslColor.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.awt.Color; import java.util.List; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IntVal.java b/src/net/sourceforge/plantuml/tim/builtin/IntVal.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/IntVal.java rename to src/net/sourceforge/plantuml/tim/builtin/IntVal.java index c89e1a42815..2fe9ec73946 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IntVal.java +++ b/src/net/sourceforge/plantuml/tim/builtin/IntVal.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java b/src/net/sourceforge/plantuml/tim/builtin/InvokeProcedure.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java rename to src/net/sourceforge/plantuml/tim/builtin/InvokeProcedure.java index 4eab28dde9c..7aef33e4fa3 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java +++ b/src/net/sourceforge/plantuml/tim/builtin/InvokeProcedure.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java b/src/net/sourceforge/plantuml/tim/builtin/IsDark.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/IsDark.java rename to src/net/sourceforge/plantuml/tim/builtin/IsDark.java index cf94491222f..0dd5c3e539a 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java +++ b/src/net/sourceforge/plantuml/tim/builtin/IsDark.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java b/src/net/sourceforge/plantuml/tim/builtin/IsLight.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/IsLight.java rename to src/net/sourceforge/plantuml/tim/builtin/IsLight.java index b717e419a13..0231952681d 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java +++ b/src/net/sourceforge/plantuml/tim/builtin/IsLight.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/JsonAdd.java b/src/net/sourceforge/plantuml/tim/builtin/JsonAdd.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/JsonAdd.java rename to src/net/sourceforge/plantuml/tim/builtin/JsonAdd.java index 7961ae79551..cbc16a70886 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/JsonAdd.java +++ b/src/net/sourceforge/plantuml/tim/builtin/JsonAdd.java @@ -33,7 +33,7 @@ * Contribution: The-Lum * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java b/src/net/sourceforge/plantuml/tim/builtin/JsonKeyExists.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java rename to src/net/sourceforge/plantuml/tim/builtin/JsonKeyExists.java index 98984a669eb..850bf5d0d2b 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java +++ b/src/net/sourceforge/plantuml/tim/builtin/JsonKeyExists.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/JsonMerge.java b/src/net/sourceforge/plantuml/tim/builtin/JsonMerge.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/JsonMerge.java rename to src/net/sourceforge/plantuml/tim/builtin/JsonMerge.java index 424c2326e41..bccfc451b8e 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/JsonMerge.java +++ b/src/net/sourceforge/plantuml/tim/builtin/JsonMerge.java @@ -33,7 +33,7 @@ * Contribution: The-Lum * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/JsonRemove.java b/src/net/sourceforge/plantuml/tim/builtin/JsonRemove.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/JsonRemove.java rename to src/net/sourceforge/plantuml/tim/builtin/JsonRemove.java index f477708d65a..f93fc63ae2a 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/JsonRemove.java +++ b/src/net/sourceforge/plantuml/tim/builtin/JsonRemove.java @@ -33,7 +33,7 @@ * Contribution: The-Lum * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/JsonSet.java b/src/net/sourceforge/plantuml/tim/builtin/JsonSet.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/JsonSet.java rename to src/net/sourceforge/plantuml/tim/builtin/JsonSet.java index eab1aff5278..8ac05ffd6b7 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/JsonSet.java +++ b/src/net/sourceforge/plantuml/tim/builtin/JsonSet.java @@ -33,7 +33,7 @@ * Contribution: The-Lum * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java b/src/net/sourceforge/plantuml/tim/builtin/Lighten.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/Lighten.java rename to src/net/sourceforge/plantuml/tim/builtin/Lighten.java index e309859b33c..f134b64c4fe 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Lighten.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java b/src/net/sourceforge/plantuml/tim/builtin/LoadJson.java similarity index 99% rename from src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java rename to src/net/sourceforge/plantuml/tim/builtin/LoadJson.java index 5f8e30b004a..3f53462f276 100755 --- a/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java +++ b/src/net/sourceforge/plantuml/tim/builtin/LoadJson.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java b/src/net/sourceforge/plantuml/tim/builtin/LogicalAnd.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java rename to src/net/sourceforge/plantuml/tim/builtin/LogicalAnd.java index ede165c2217..cbef07e72b1 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java +++ b/src/net/sourceforge/plantuml/tim/builtin/LogicalAnd.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java b/src/net/sourceforge/plantuml/tim/builtin/LogicalNand.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java rename to src/net/sourceforge/plantuml/tim/builtin/LogicalNand.java index 0740118e54f..8ffc5773515 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java +++ b/src/net/sourceforge/plantuml/tim/builtin/LogicalNand.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java b/src/net/sourceforge/plantuml/tim/builtin/LogicalNor.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java rename to src/net/sourceforge/plantuml/tim/builtin/LogicalNor.java index d0fcb1e146a..a438ee329ad 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java +++ b/src/net/sourceforge/plantuml/tim/builtin/LogicalNor.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java b/src/net/sourceforge/plantuml/tim/builtin/LogicalNot.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java rename to src/net/sourceforge/plantuml/tim/builtin/LogicalNot.java index 071620862ba..876229b5130 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java +++ b/src/net/sourceforge/plantuml/tim/builtin/LogicalNot.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java b/src/net/sourceforge/plantuml/tim/builtin/LogicalNxor.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java rename to src/net/sourceforge/plantuml/tim/builtin/LogicalNxor.java index 8403263c7c8..93b466a7ef0 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java +++ b/src/net/sourceforge/plantuml/tim/builtin/LogicalNxor.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java b/src/net/sourceforge/plantuml/tim/builtin/LogicalOr.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java rename to src/net/sourceforge/plantuml/tim/builtin/LogicalOr.java index de58b384a2a..ee6f97f5785 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java +++ b/src/net/sourceforge/plantuml/tim/builtin/LogicalOr.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java b/src/net/sourceforge/plantuml/tim/builtin/LogicalXor.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java rename to src/net/sourceforge/plantuml/tim/builtin/LogicalXor.java index 3a5e24eabeb..0657ba76e3d 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java +++ b/src/net/sourceforge/plantuml/tim/builtin/LogicalXor.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Lower.java b/src/net/sourceforge/plantuml/tim/builtin/Lower.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/Lower.java rename to src/net/sourceforge/plantuml/tim/builtin/Lower.java index 721a521b8ef..e91e2c644cc 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Lower.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Lower.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Modulo.java b/src/net/sourceforge/plantuml/tim/builtin/Modulo.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/Modulo.java rename to src/net/sourceforge/plantuml/tim/builtin/Modulo.java index ed42aaa112c..d5314a88366 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Modulo.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Modulo.java @@ -33,7 +33,7 @@ * Contribution: Aravind Pai * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Newline.java b/src/net/sourceforge/plantuml/tim/builtin/Newline.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/Newline.java rename to src/net/sourceforge/plantuml/tim/builtin/Newline.java index d3b4b87685d..d04b9ebac95 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Newline.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Newline.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/NewlineShort.java b/src/net/sourceforge/plantuml/tim/builtin/NewlineShort.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/NewlineShort.java rename to src/net/sourceforge/plantuml/tim/builtin/NewlineShort.java index a10760d828c..01f38df7c2d 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/NewlineShort.java +++ b/src/net/sourceforge/plantuml/tim/builtin/NewlineShort.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Now.java b/src/net/sourceforge/plantuml/tim/builtin/Now.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/Now.java rename to src/net/sourceforge/plantuml/tim/builtin/Now.java index de2c7bb71bb..ca93be5849c 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Now.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Now.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Ord.java b/src/net/sourceforge/plantuml/tim/builtin/Ord.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/Ord.java rename to src/net/sourceforge/plantuml/tim/builtin/Ord.java index 9b1c87d5d4e..cb8a7bb0304 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Ord.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Ord.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java b/src/net/sourceforge/plantuml/tim/builtin/RandomFunction.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java rename to src/net/sourceforge/plantuml/tim/builtin/RandomFunction.java index 1b4de5ac9bd..c73a93085b5 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java +++ b/src/net/sourceforge/plantuml/tim/builtin/RandomFunction.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java b/src/net/sourceforge/plantuml/tim/builtin/RetrieveProcedure.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java rename to src/net/sourceforge/plantuml/tim/builtin/RetrieveProcedure.java index a9b51e5f35f..6ed0f5e6349 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java +++ b/src/net/sourceforge/plantuml/tim/builtin/RetrieveProcedure.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.Collections; import java.util.List; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java b/src/net/sourceforge/plantuml/tim/builtin/ReverseColor.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java rename to src/net/sourceforge/plantuml/tim/builtin/ReverseColor.java index a46c9695f43..0966b006ec8 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java +++ b/src/net/sourceforge/plantuml/tim/builtin/ReverseColor.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java b/src/net/sourceforge/plantuml/tim/builtin/ReverseHsluvColor.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java rename to src/net/sourceforge/plantuml/tim/builtin/ReverseHsluvColor.java index 8fd8422e3ab..cbc50e36d71 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java +++ b/src/net/sourceforge/plantuml/tim/builtin/ReverseHsluvColor.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java b/src/net/sourceforge/plantuml/tim/builtin/SetVariableValue.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java rename to src/net/sourceforge/plantuml/tim/builtin/SetVariableValue.java index 631037c45eb..7d7a5049f8a 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java +++ b/src/net/sourceforge/plantuml/tim/builtin/SetVariableValue.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java b/src/net/sourceforge/plantuml/tim/builtin/SimpleReturnFunction.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java rename to src/net/sourceforge/plantuml/tim/builtin/SimpleReturnFunction.java index c649a86a4a1..7cfecc91699 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java +++ b/src/net/sourceforge/plantuml/tim/builtin/SimpleReturnFunction.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Size.java b/src/net/sourceforge/plantuml/tim/builtin/Size.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/Size.java rename to src/net/sourceforge/plantuml/tim/builtin/Size.java index b2e17650426..3cbdb5d40bd 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Size.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Size.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java b/src/net/sourceforge/plantuml/tim/builtin/SplitStr.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java rename to src/net/sourceforge/plantuml/tim/builtin/SplitStr.java index 536ee9ba059..7fb3f0a5c22 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java +++ b/src/net/sourceforge/plantuml/tim/builtin/SplitStr.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/SplitStrRegex.java b/src/net/sourceforge/plantuml/tim/builtin/SplitStrRegex.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/SplitStrRegex.java rename to src/net/sourceforge/plantuml/tim/builtin/SplitStrRegex.java index 6c15e7b1a5f..da26ba01433 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/SplitStrRegex.java +++ b/src/net/sourceforge/plantuml/tim/builtin/SplitStrRegex.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Str2Json.java b/src/net/sourceforge/plantuml/tim/builtin/Str2Json.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/Str2Json.java rename to src/net/sourceforge/plantuml/tim/builtin/Str2Json.java index 5e78904998c..598d0bb702e 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Str2Json.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Str2Json.java @@ -33,7 +33,7 @@ * Contribution: The-Lum * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/StringFunction.java b/src/net/sourceforge/plantuml/tim/builtin/StringFunction.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/StringFunction.java rename to src/net/sourceforge/plantuml/tim/builtin/StringFunction.java index de63add20d9..76d6c396413 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/StringFunction.java +++ b/src/net/sourceforge/plantuml/tim/builtin/StringFunction.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Strlen.java b/src/net/sourceforge/plantuml/tim/builtin/Strlen.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/Strlen.java rename to src/net/sourceforge/plantuml/tim/builtin/Strlen.java index 2a91bd05dcc..8149dfb7545 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Strlen.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Strlen.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Strpos.java b/src/net/sourceforge/plantuml/tim/builtin/Strpos.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/Strpos.java rename to src/net/sourceforge/plantuml/tim/builtin/Strpos.java index 2f7c32c7c51..2d81e367f63 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Strpos.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Strpos.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Substr.java b/src/net/sourceforge/plantuml/tim/builtin/Substr.java similarity index 98% rename from src/net/sourceforge/plantuml/tim/stdlib/Substr.java rename to src/net/sourceforge/plantuml/tim/builtin/Substr.java index 76e7751f9d5..5067acf3a83 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Substr.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Substr.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Upper.java b/src/net/sourceforge/plantuml/tim/builtin/Upper.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/Upper.java rename to src/net/sourceforge/plantuml/tim/builtin/Upper.java index 71ebe587ea2..9db4354ae56 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Upper.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Upper.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java b/src/net/sourceforge/plantuml/tim/builtin/VariableExists.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java rename to src/net/sourceforge/plantuml/tim/builtin/VariableExists.java index db3c39f1b27..3dfb25001e9 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java +++ b/src/net/sourceforge/plantuml/tim/builtin/VariableExists.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Xargs.java b/src/net/sourceforge/plantuml/tim/builtin/Xargs.java similarity index 97% rename from src/net/sourceforge/plantuml/tim/stdlib/Xargs.java rename to src/net/sourceforge/plantuml/tim/builtin/Xargs.java index 0243682046d..3eeb2de0bf9 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Xargs.java +++ b/src/net/sourceforge/plantuml/tim/builtin/Xargs.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim.stdlib; +package net.sourceforge.plantuml.tim.builtin; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/readme.md b/src/net/sourceforge/plantuml/tim/builtin/readme.md similarity index 100% rename from src/net/sourceforge/plantuml/tim/stdlib/readme.md rename to src/net/sourceforge/plantuml/tim/builtin/readme.md