From f52ea7c928c4d6138b5e0b2acd908082f947492f Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Tue, 22 Oct 2024 09:53:35 -0400 Subject: [PATCH] spelling: parenthesis Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- .../jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java | 2 +- .../decompiler/flash/abc/avm2/model/CallMethodAVM2Item.java | 2 +- .../decompiler/flash/abc/avm2/model/CallPropertyAVM2Item.java | 2 +- .../decompiler/flash/abc/avm2/model/CallStaticAVM2Item.java | 2 +- .../decompiler/flash/abc/avm2/model/ConstructAVM2Item.java | 2 +- .../flash/abc/avm2/model/ConstructPropAVM2Item.java | 2 +- .../flash/abc/avm2/model/ConstructSuperAVM2Item.java | 2 +- .../decompiler/flash/abc/avm2/model/Float4ValueAVM2Item.java | 2 +- .../decompiler/flash/abc/avm2/model/NameSpaceAVM2Item.java | 2 +- .../decompiler/flash/abc/avm2/model/NextNameAVM2Item.java | 2 +- .../decompiler/flash/abc/avm2/model/NextValueAVM2Item.java | 2 +- .../decompiler/flash/action/model/AsciiToCharActionItem.java | 2 +- .../jpexs/decompiler/flash/action/model/CallActionItem.java | 2 +- .../decompiler/flash/action/model/CallFunctionActionItem.java | 2 +- .../decompiler/flash/action/model/CallMethodActionItem.java | 2 +- .../decompiler/flash/action/model/CharToAsciiActionItem.java | 2 +- .../decompiler/flash/action/model/CloneSpriteActionItem.java | 2 +- .../jpexs/decompiler/flash/action/model/EvalActionItem.java | 2 +- .../decompiler/flash/action/model/FSCommand2ActionItem.java | 2 +- .../decompiler/flash/action/model/FSCommandActionItem.java | 2 +- .../decompiler/flash/action/model/FunctionActionItem.java | 2 +- .../decompiler/flash/action/model/GetPropertyActionItem.java | 2 +- .../decompiler/flash/action/model/GetTimeActionItem.java | 2 +- .../decompiler/flash/action/model/GetURL2ActionItem.java | 2 +- .../jpexs/decompiler/flash/action/model/GetURLActionItem.java | 2 +- .../decompiler/flash/action/model/GetVersionActionItem.java | 2 +- .../decompiler/flash/action/model/GotoFrame2ActionItem.java | 2 +- .../decompiler/flash/action/model/GotoFrameActionItem.java | 2 +- .../decompiler/flash/action/model/GotoLabelActionItem.java | 2 +- .../decompiler/flash/action/model/LoadMovieActionItem.java | 2 +- .../decompiler/flash/action/model/LoadMovieNumActionItem.java | 2 +- .../flash/action/model/LoadVariablesActionItem.java | 2 +- .../flash/action/model/LoadVariablesNumActionItem.java | 2 +- .../flash/action/model/MBAsciiToCharActionItem.java | 2 +- .../flash/action/model/MBCharToAsciiActionItem.java | 2 +- .../flash/action/model/MBStringExtractActionItem.java | 2 +- .../flash/action/model/MBStringLengthActionItem.java | 2 +- .../decompiler/flash/action/model/NewMethodActionItem.java | 2 +- .../decompiler/flash/action/model/NewObjectActionItem.java | 2 +- .../decompiler/flash/action/model/NextFrameActionItem.java | 2 +- .../jpexs/decompiler/flash/action/model/PlayActionItem.java | 2 +- .../decompiler/flash/action/model/PrevFrameActionItem.java | 2 +- .../jpexs/decompiler/flash/action/model/PrintActionItem.java | 2 +- .../flash/action/model/PrintAsBitmapActionItem.java | 2 +- .../flash/action/model/PrintAsBitmapNumActionItem.java | 2 +- .../decompiler/flash/action/model/PrintNumActionItem.java | 2 +- .../decompiler/flash/action/model/RandomNumberActionItem.java | 2 +- .../decompiler/flash/action/model/RemoveSpriteActionItem.java | 2 +- .../decompiler/flash/action/model/SetPropertyActionItem.java | 2 +- .../decompiler/flash/action/model/SetTarget2ActionItem.java | 2 +- .../decompiler/flash/action/model/SetVariableActionItem.java | 2 +- .../decompiler/flash/action/model/StartDragActionItem.java | 2 +- .../jpexs/decompiler/flash/action/model/StopActionItem.java | 2 +- .../flash/action/model/StopAllSoundsActionItem.java | 2 +- .../decompiler/flash/action/model/StopDragActionItem.java | 2 +- .../decompiler/flash/action/model/StrictModeActionItem.java | 2 +- .../flash/action/model/StringExtractActionItem.java | 2 +- .../decompiler/flash/action/model/StringLengthActionItem.java | 2 +- .../decompiler/flash/action/model/TargetPathActionItem.java | 2 +- .../decompiler/flash/action/model/ToIntegerActionItem.java | 2 +- .../decompiler/flash/action/model/ToNumberActionItem.java | 2 +- .../decompiler/flash/action/model/ToStringActionItem.java | 2 +- .../flash/action/model/ToggleHighQualityActionItem.java | 2 +- .../jpexs/decompiler/flash/action/model/TraceActionItem.java | 2 +- .../jpexs/decompiler/flash/action/model/TypeOfActionItem.java | 2 +- .../decompiler/flash/action/model/UnLoadMovieActionItem.java | 2 +- .../flash/action/model/UnLoadMovieNumActionItem.java | 2 +- .../flash/action/model/clauses/IfFrameLoadedActionItem.java | 2 +- .../flash/action/model/clauses/TellTargetActionItem.java | 2 +- .../com/jpexs/decompiler/flash/helpers/GraphTextWriter.java | 4 ++-- 70 files changed, 71 insertions(+), 71 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java index ca7b0a4f2..a2e746b2c 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java @@ -232,7 +232,7 @@ public class CallAVM2Item extends AVM2Item { } else { function.toString(writer, localData); } - writer.spaceBeforeCallParenthesies(arguments.size()); + writer.spaceBeforeCallParenthesis(arguments.size()); writer.append("("); for (int a = 0; a < arguments.size(); a++) { if (a > 0) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallMethodAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallMethodAVM2Item.java index 0f9e0b037..7e6f0f12f 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallMethodAVM2Item.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallMethodAVM2Item.java @@ -79,7 +79,7 @@ public class CallMethodAVM2Item extends AVM2Item { } writer.allowWrapHere().append("."); writer.append(methodName); - writer.spaceBeforeCallParenthesies(arguments.size()); + writer.spaceBeforeCallParenthesis(arguments.size()); writer.append("("); for (int a = 0; a < arguments.size(); a++) { if (a > 0) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallPropertyAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallPropertyAVM2Item.java index 63a80ab01..d44b2f8c2 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallPropertyAVM2Item.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallPropertyAVM2Item.java @@ -98,7 +98,7 @@ public class CallPropertyAVM2Item extends AVM2Item { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { formatProperty(writer, receiver, propertyName, localData, isStatic); - writer.spaceBeforeCallParenthesies(arguments.size()); + writer.spaceBeforeCallParenthesis(arguments.size()); writer.append("("); for (int a = 0; a < arguments.size(); a++) { if (a > 0) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallStaticAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallStaticAVM2Item.java index 8f45f8571..3d2610829 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallStaticAVM2Item.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallStaticAVM2Item.java @@ -80,7 +80,7 @@ public class CallStaticAVM2Item extends AVM2Item { } writer.append("."); writer.append(methodName); - writer.spaceBeforeCallParenthesies(arguments.size()); + writer.spaceBeforeCallParenthesis(arguments.size()); writer.append("("); for (int a = 0; a < arguments.size(); a++) { if (a > 0) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructAVM2Item.java index fc62feb45..eaa1a5ba3 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructAVM2Item.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructAVM2Item.java @@ -82,7 +82,7 @@ public class ConstructAVM2Item extends AVM2Item { if (object.getPrecedence() > getPrecedence() || objectIsCall) { writer.append(")"); } - writer.spaceBeforeCallParenthesies(args.size()); + writer.spaceBeforeCallParenthesis(args.size()); if (object instanceof InitVectorAVM2Item) { return writer; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructPropAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructPropAVM2Item.java index 771cbecd5..e92da7493 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructPropAVM2Item.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructPropAVM2Item.java @@ -87,7 +87,7 @@ public class ConstructPropAVM2Item extends AVM2Item { public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("new "); formatProperty(writer, object, propertyName, localData, isStatic); - writer.spaceBeforeCallParenthesies(args.size()); + writer.spaceBeforeCallParenthesis(args.size()); writer.append("("); for (int a = 0; a < args.size(); a++) { if (a > 0) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructSuperAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructSuperAVM2Item.java index 5ca6ccf0d..c32e818a1 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructSuperAVM2Item.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructSuperAVM2Item.java @@ -73,7 +73,7 @@ public class ConstructSuperAVM2Item extends AVM2Item { object.toString(writer, localData); writer.allowWrapHere().append("."); } - writer.spaceBeforeCallParenthesies(args.size()); + writer.spaceBeforeCallParenthesis(args.size()); writer.append("super("); for (int a = 0; a < args.size(); a++) { if (a > 0) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/Float4ValueAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/Float4ValueAVM2Item.java index 3257ef8ea..6b1938402 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/Float4ValueAVM2Item.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/Float4ValueAVM2Item.java @@ -60,7 +60,7 @@ public class Float4ValueAVM2Item extends NumberValueAVM2Item { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) { writer.append("float4"); - writer.spaceBeforeCallParenthesies(precedence); + writer.spaceBeforeCallParenthesis(precedence); writer.append("("); writer.append(EcmaScript.toString(value.values[0])); if (Float.isFinite(value.values[0])) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/NameSpaceAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/NameSpaceAVM2Item.java index 9a3b37656..2de935cf5 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/NameSpaceAVM2Item.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/NameSpaceAVM2Item.java @@ -67,7 +67,7 @@ public class NameSpaceAVM2Item extends AVM2Item { } } - writer.append("new Namespace").spaceBeforeCallParenthesies(1).append("("); + writer.append("new Namespace").spaceBeforeCallParenthesis(1).append("("); writer.append("\"").append(Helper.escapeActionScriptString(constants.getNamespace(namespaceIndex).getRawName(constants))).append("\""); //assume not null name writer.append(")"); return writer; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/NextNameAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/NextNameAVM2Item.java index 29e7efd05..4dc19a426 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/NextNameAVM2Item.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/NextNameAVM2Item.java @@ -77,7 +77,7 @@ public class NextNameAVM2Item extends AVM2Item { return writer; } writer.append("§§nextname"); - writer.spaceBeforeCallParenthesies(2); + writer.spaceBeforeCallParenthesis(2); writer.append("("); index.toString(writer, localData); writer.append(","); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/NextValueAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/NextValueAVM2Item.java index 48107157a..c54850431 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/NextValueAVM2Item.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/NextValueAVM2Item.java @@ -82,7 +82,7 @@ public class NextValueAVM2Item extends AVM2Item { return writer; } writer.append("§§nextvalue"); - writer.spaceBeforeCallParenthesies(2); + writer.spaceBeforeCallParenthesis(2); writer.append("("); index.toString(writer, localData); writer.append(","); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java index 88f577e9a..1b57ad0e4 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java @@ -49,7 +49,7 @@ public class AsciiToCharActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("chr"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); value.toString(writer, localData); return writer.append(")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CallActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CallActionItem.java index 760b88935..e99c68fb8 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CallActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CallActionItem.java @@ -48,7 +48,7 @@ public class CallActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("call"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); value.appendTo(writer, localData); return writer.append(")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CallFunctionActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CallFunctionActionItem.java index a8ca2faa8..2f88174ee 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CallFunctionActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CallFunctionActionItem.java @@ -99,7 +99,7 @@ public class CallFunctionActionItem extends ActionItem { writer.append(")"); } } - writer.spaceBeforeCallParenthesies(arguments.size()); + writer.spaceBeforeCallParenthesis(arguments.size()); writer.append("("); for (int t = 0; t < arguments.size(); t++) { if (t > 0) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java index 11bf02320..355081c88 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java @@ -185,7 +185,7 @@ public class CallMethodActionItem extends ActionItem { writer.append("]"); } - writer.spaceBeforeCallParenthesies(arguments.size()); + writer.spaceBeforeCallParenthesis(arguments.size()); writer.append("("); for (int t = 0; t < arguments.size(); t++) { if (t > 0) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CharToAsciiActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CharToAsciiActionItem.java index eabdcace7..fbe0bbbe4 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CharToAsciiActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CharToAsciiActionItem.java @@ -49,7 +49,7 @@ public class CharToAsciiActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("ord"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); value.toString(writer, localData); return writer.append(")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CloneSpriteActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CloneSpriteActionItem.java index 633d06ea1..121697b82 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CloneSpriteActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CloneSpriteActionItem.java @@ -80,7 +80,7 @@ public class CloneSpriteActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("duplicateMovieClip"); - writer.spaceBeforeCallParenthesies(3); + writer.spaceBeforeCallParenthesis(3); writer.append("("); target.toString(writer, localData); writer.append(","); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/EvalActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/EvalActionItem.java index 43c9e794b..fac943953 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/EvalActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/EvalActionItem.java @@ -48,7 +48,7 @@ public class EvalActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("eval"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); value.toString(writer, localData); return writer.append(")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FSCommand2ActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FSCommand2ActionItem.java index b30499202..c977629aa 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FSCommand2ActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FSCommand2ActionItem.java @@ -65,7 +65,7 @@ public class FSCommand2ActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("fscommand2"); - writer.spaceBeforeCallParenthesies(arguments.size()); + writer.spaceBeforeCallParenthesis(arguments.size()); writer.append("("); for (int t = 0; t < arguments.size(); t++) { if (t > 0) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java index 79d0bf5aa..153513488 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java @@ -66,7 +66,7 @@ public class FSCommandActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("fscommand"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); command.appendTry(writer, localData); if (parameter != null) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java index 9606bae9f..7f7915bcc 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java @@ -253,7 +253,7 @@ public class FunctionActionItem extends ActionItem implements BranchStackResista writer.append(fname); } } - writer.spaceBeforeCallParenthesies(paramNames.size()); + writer.spaceBeforeCallParenthesis(paramNames.size()); writer.append("("); Map n2r = new HashMap<>(); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetPropertyActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetPropertyActionItem.java index 9f93923c4..b64f3c75a 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetPropertyActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetPropertyActionItem.java @@ -86,7 +86,7 @@ public class GetPropertyActionItem extends ActionItem { return writer; }*/ writer.append("getProperty"); - writer.spaceBeforeCallParenthesies(2); + writer.spaceBeforeCallParenthesis(2); writer.append("("); target.appendTo(writer, localData); writer.append(", "); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetTimeActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetTimeActionItem.java index faa19296b..741caa7d3 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetTimeActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetTimeActionItem.java @@ -47,7 +47,7 @@ public class GetTimeActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) { writer.append("getTimer"); - writer.spaceBeforeCallParenthesies(0); + writer.spaceBeforeCallParenthesis(0); return writer.append("()"); } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetURL2ActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetURL2ActionItem.java index 1c781af8a..1ef75d4ff 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetURL2ActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetURL2ActionItem.java @@ -71,7 +71,7 @@ public class GetURL2ActionItem extends ActionItem { } writer.append("getURL"); - writer.spaceBeforeCallParenthesies(2); + writer.spaceBeforeCallParenthesis(2); writer.append("("); urlString.toString(writer, localData); writer.append(","); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java index e02531695..11f4a6f24 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java @@ -49,7 +49,7 @@ public class GetURLActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) { writer.append("getUrl"); - writer.spaceBeforeCallParenthesies(2); + writer.spaceBeforeCallParenthesis(2); writer.append("(\""); writer.append(Helper.escapeActionScriptString(urlString)); writer.append("\", \""); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java index 757366cb4..534e665ec 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java @@ -46,7 +46,7 @@ public class GetVersionActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) { writer.append("getVersion"); - writer.spaceBeforeCallParenthesies(0); + writer.spaceBeforeCallParenthesis(0); return writer.append("()"); } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java index 3933ef09f..53b0ef830 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java @@ -92,7 +92,7 @@ public class GotoFrame2ActionItem extends ActionItem { prefix = "gotoAndPlay"; } writer.append(prefix); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); if (sceneBiasFlag) { writer.append(sceneBias + ", "); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java index 9521f4ced..78b5b12cc 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java @@ -53,7 +53,7 @@ public class GotoFrameActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) { writer.append("gotoAndStop"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); writer.append(frame + 1); return writer.append(")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java index 50584436b..6b21a9522 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java @@ -55,7 +55,7 @@ public class GotoLabelActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) { writer.append("gotoAndStop"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("(\""); writer.append(Helper.escapeActionScriptString(label)); return writer.append("\")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java index ec7c9d779..d808380f8 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java @@ -85,7 +85,7 @@ public class LoadMovieActionItem extends ActionItem { methodStr = ",\"POST\""; } writer.append("loadMovie"); - writer.spaceBeforeCallParenthesies(2); + writer.spaceBeforeCallParenthesis(2); writer.append("("); urlString.toString(writer, localData); writer.append(","); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java index a95c98426..8104d0766 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java @@ -87,7 +87,7 @@ public class LoadMovieNumActionItem extends ActionItem { methodStr = ",\"POST\""; } writer.append("loadMovieNum"); - writer.spaceBeforeCallParenthesies(2); + writer.spaceBeforeCallParenthesis(2); writer.append("("); urlString.toString(writer, localData); writer.append(","); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/LoadVariablesActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/LoadVariablesActionItem.java index 9711b869f..5420874a1 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/LoadVariablesActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/LoadVariablesActionItem.java @@ -85,7 +85,7 @@ public class LoadVariablesActionItem extends ActionItem { methodStr = ",\"POST\""; } writer.append("loadVariables"); - writer.spaceBeforeCallParenthesies(2); + writer.spaceBeforeCallParenthesis(2); writer.append("("); urlString.toString(writer, localData); writer.append(","); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java index 2bff005ea..38d650d28 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java @@ -87,7 +87,7 @@ public class LoadVariablesNumActionItem extends ActionItem { methodStr = ",\"POST\""; } writer.append("loadVariablesNum"); - writer.spaceBeforeCallParenthesies(2); + writer.spaceBeforeCallParenthesis(2); writer.append("("); urlString.toString(writer, localData); writer.append(","); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/MBAsciiToCharActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/MBAsciiToCharActionItem.java index f6d55cbd8..44dc5f842 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/MBAsciiToCharActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/MBAsciiToCharActionItem.java @@ -49,7 +49,7 @@ public class MBAsciiToCharActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("mbchr"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); value.toString(writer, localData); return writer.append(")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/MBCharToAsciiActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/MBCharToAsciiActionItem.java index 4920e33a0..409a1e948 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/MBCharToAsciiActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/MBCharToAsciiActionItem.java @@ -48,7 +48,7 @@ public class MBCharToAsciiActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("mbord"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); value.toString(writer, localData); return writer.append(")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/MBStringExtractActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/MBStringExtractActionItem.java index aa96dad86..f16799857 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/MBStringExtractActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/MBStringExtractActionItem.java @@ -72,7 +72,7 @@ public class MBStringExtractActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("mbsubstring"); - writer.spaceBeforeCallParenthesies(3); + writer.spaceBeforeCallParenthesis(3); writer.append("("); value.toString(writer, localData); writer.append(","); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java index 930866e84..b73b6bcb1 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java @@ -50,7 +50,7 @@ public class MBStringLengthActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("mblength"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); if (value.getPrecedence() > precedence) { writer.append("("); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/NewMethodActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/NewMethodActionItem.java index 31bf9aa19..731c5b89c 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/NewMethodActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/NewMethodActionItem.java @@ -108,7 +108,7 @@ public class NewMethodActionItem extends ActionItem { writer.append("]"); } } - writer.spaceBeforeCallParenthesies(arguments.size()); + writer.spaceBeforeCallParenthesis(arguments.size()); writer.append("("); for (int t = 0; t < arguments.size(); t++) { if (t > 0) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/NewObjectActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/NewObjectActionItem.java index be94086d6..82c90522a 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/NewObjectActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/NewObjectActionItem.java @@ -71,7 +71,7 @@ public class NewObjectActionItem extends ActionItem { public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("new "); writer.append(IdentifiersDeobfuscation.printIdentifier(false, objectName.toStringNoQuotes(localData))); - writer.spaceBeforeCallParenthesies(arguments.size()); + writer.spaceBeforeCallParenthesis(arguments.size()); writer.append("("); for (int t = 0; t < arguments.size(); t++) { if (t > 0) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java index da1db8dc4..e632c035c 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java @@ -38,7 +38,7 @@ public class NextFrameActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) { writer.append("nextFrame"); - writer.spaceBeforeCallParenthesies(0); + writer.spaceBeforeCallParenthesis(0); return writer.append("()"); } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java index e9b1c5180..460fe0104 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java @@ -38,7 +38,7 @@ public class PlayActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) { writer.append("play"); - writer.spaceBeforeCallParenthesies(0); + writer.spaceBeforeCallParenthesis(0); return writer.append("()"); } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java index 074d5c06f..201f2cfc3 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java @@ -38,7 +38,7 @@ public class PrevFrameActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) { writer.append("prevFrame"); - writer.spaceBeforeCallParenthesies(0); + writer.spaceBeforeCallParenthesis(0); return writer.append("()"); } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java index e28b97132..6b29c2501 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java @@ -72,7 +72,7 @@ public class PrintActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("print"); - writer.spaceBeforeCallParenthesies(2); + writer.spaceBeforeCallParenthesis(2); writer.append("("); target.toString(writer, localData); writer.append(","); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java index b05b1cdd3..40023a8e6 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java @@ -72,7 +72,7 @@ public class PrintAsBitmapActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("printAsBitmap"); - writer.spaceBeforeCallParenthesies(2); + writer.spaceBeforeCallParenthesis(2); writer.append("("); target.toString(writer, localData); writer.append(","); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java index 3d23369de..b2c835948 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java @@ -73,7 +73,7 @@ public class PrintAsBitmapNumActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("printAsBitmapNum"); - writer.spaceBeforeCallParenthesies(2); + writer.spaceBeforeCallParenthesis(2); writer.append("("); num.toString(writer, localData); writer.append(","); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java index 65f33d783..f18a0a4eb 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java @@ -73,7 +73,7 @@ public class PrintNumActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("printNum"); - writer.spaceBeforeCallParenthesies(2); + writer.spaceBeforeCallParenthesis(2); writer.append("("); num.toString(writer, localData); writer.append(","); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/RandomNumberActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/RandomNumberActionItem.java index 34c22dff8..e16ce7cca 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/RandomNumberActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/RandomNumberActionItem.java @@ -69,7 +69,7 @@ public class RandomNumberActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("random"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); value.toString(writer, localData); return writer.append(")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/RemoveSpriteActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/RemoveSpriteActionItem.java index c47e726c7..409641ef4 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/RemoveSpriteActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/RemoveSpriteActionItem.java @@ -51,7 +51,7 @@ public class RemoveSpriteActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("removeMovieClip"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); value.toString(writer, localData); return writer.append(")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/SetPropertyActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/SetPropertyActionItem.java index afb0d40b4..e7b889104 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/SetPropertyActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/SetPropertyActionItem.java @@ -104,7 +104,7 @@ public class SetPropertyActionItem extends ActionItem implements SetTypeActionIt } writer.append("setProperty"); - writer.spaceBeforeCallParenthesies(3); + writer.spaceBeforeCallParenthesis(3); writer.append("("); target.appendTo(writer, localData); writer.append(", "); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/SetTarget2ActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/SetTarget2ActionItem.java index 8163ef5d3..609e94ec2 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/SetTarget2ActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/SetTarget2ActionItem.java @@ -54,7 +54,7 @@ public class SetTarget2ActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("tellTarget"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); target.toString(writer, localData); return writer.append(")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/SetVariableActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/SetVariableActionItem.java index 027ac0dc4..56f4c58c1 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/SetVariableActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/SetVariableActionItem.java @@ -141,7 +141,7 @@ public class SetVariableActionItem extends ActionItem implements SetTypeActionIt return value.toString(writer, localData); } else { writer.append("set"); - writer.spaceBeforeCallParenthesies(2); + writer.spaceBeforeCallParenthesis(2); writer.append("("); name.toString(writer, localData); writer.append(","); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StartDragActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StartDragActionItem.java index 94e220c12..33ee20a8e 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StartDragActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StartDragActionItem.java @@ -108,7 +108,7 @@ public class StartDragActionItem extends ActionItem { } } writer.append("startDrag"); - writer.spaceBeforeCallParenthesies(2); + writer.spaceBeforeCallParenthesis(2); writer.append("("); target.toString(writer, localData); writer.append(","); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java index d567a269c..86ad5a59e 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java @@ -38,7 +38,7 @@ public class StopActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) { writer.append("stop"); - writer.spaceBeforeCallParenthesies(0); + writer.spaceBeforeCallParenthesis(0); return writer.append("()"); } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java index 99e89f883..faeac1d27 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java @@ -38,7 +38,7 @@ public class StopAllSoundsActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) { writer.append("stopAllSounds"); - writer.spaceBeforeCallParenthesies(0); + writer.spaceBeforeCallParenthesis(0); return writer.append("()"); } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopDragActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopDragActionItem.java index a385ac024..2395a2ce3 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopDragActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopDragActionItem.java @@ -38,7 +38,7 @@ public class StopDragActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) { writer.append("stopDrag"); - writer.spaceBeforeCallParenthesies(0); + writer.spaceBeforeCallParenthesis(0); return writer.append("()"); } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StrictModeActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StrictModeActionItem.java index 663439c69..75becb735 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StrictModeActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StrictModeActionItem.java @@ -55,7 +55,7 @@ public class StrictModeActionItem extends ActionItem { writer.append("#strict"); } else { writer.append("§§strict"); - writer.spaceBeforeCallParenthesies(0); + writer.spaceBeforeCallParenthesis(0); writer.append("(").append(mode).append(")"); } return writer; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StringExtractActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StringExtractActionItem.java index 240c32de6..d16344feb 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StringExtractActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StringExtractActionItem.java @@ -65,7 +65,7 @@ public class StringExtractActionItem extends ActionItem { public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { value.toString(writer, localData); writer.append(".substr"); - writer.spaceBeforeCallParenthesies(2); + writer.spaceBeforeCallParenthesis(2); writer.append("("); index.toString(writer, localData); writer.append(","); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StringLengthActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StringLengthActionItem.java index 4699d3521..dc05c95bf 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StringLengthActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StringLengthActionItem.java @@ -49,7 +49,7 @@ public class StringLengthActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("length"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); value.toString(writer, localData); return writer.append(")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/TargetPathActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/TargetPathActionItem.java index 3dc778093..e2e9eee75 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/TargetPathActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/TargetPathActionItem.java @@ -48,7 +48,7 @@ public class TargetPathActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("targetPath"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); value.toString(writer, localData); return writer.append(")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToIntegerActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToIntegerActionItem.java index 3cfe72b37..468ca0450 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToIntegerActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToIntegerActionItem.java @@ -49,7 +49,7 @@ public class ToIntegerActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("int"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); value.toString(writer, localData); return writer.append(")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java index cfb0fb667..76a72046f 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java @@ -48,7 +48,7 @@ public class ToNumberActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("Number"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); value.toString(writer, localData); return writer.append(")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java index 816478fbf..448d5277c 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java @@ -49,7 +49,7 @@ public class ToStringActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("String"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); value.toString(writer, localData); return writer.append(")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java index 9434d1780..88601f65d 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java @@ -38,7 +38,7 @@ public class ToggleHighQualityActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) { writer.append("toggleHighQuality"); - writer.spaceBeforeCallParenthesies(0); + writer.spaceBeforeCallParenthesis(0); return writer.append("()"); } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/TraceActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/TraceActionItem.java index 93bc12dfe..270223082 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/TraceActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/TraceActionItem.java @@ -51,7 +51,7 @@ public class TraceActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("trace"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); value.toString(writer, localData); return writer.append(")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java index 3c72b6f35..648fbf5b1 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java @@ -52,7 +52,7 @@ public class TypeOfActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("typeof "); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); if (value.getPrecedence() > getPrecedence()) { writer.append("("); } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieActionItem.java index 225613624..db557a168 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieActionItem.java @@ -62,7 +62,7 @@ public class UnLoadMovieActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("unloadMovie"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); targetString.toString(writer, localData); return writer.append(")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java index 25d41736c..33be477fd 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java @@ -66,7 +66,7 @@ public class UnLoadMovieNumActionItem extends ActionItem { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("unloadMovieNum"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); num.toString(writer, localData); return writer.append(")"); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java index 9e0348b44..129c54522 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java @@ -78,7 +78,7 @@ public class IfFrameLoadedActionItem extends ActionItem implements Block { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("ifFrameLoaded"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); frame.toString(writer, localData); writer.append(")").startBlock(); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java index 3a99610c7..a80099ce0 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java @@ -76,7 +76,7 @@ public class TellTargetActionItem extends ActionItem implements Block { @Override public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { writer.append("tellTarget"); - writer.spaceBeforeCallParenthesies(1); + writer.spaceBeforeCallParenthesis(1); writer.append("("); target.toString(writer, localData); writer.append(")").newLine(); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/GraphTextWriter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/GraphTextWriter.java index a98809ad8..20d477f13 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/GraphTextWriter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/GraphTextWriter.java @@ -454,11 +454,11 @@ public abstract class GraphTextWriter { } /** - * Space before call parenthesies. + * Space before call parenthesis. * @param argCount Argument count * @return GraphTextWriter */ - public GraphTextWriter spaceBeforeCallParenthesies(int argCount) { + public GraphTextWriter spaceBeforeCallParenthesis(int argCount) { if (argCount > 0) { if (formatting.spaceBeforeParenthesesMethodCallParentheses) { space();