diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/deobfuscation/ActionDeobfuscatorSimple.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/deobfuscation/ActionDeobfuscatorSimple.java index ce41e474d..9299c7658 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/deobfuscation/ActionDeobfuscatorSimple.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/deobfuscation/ActionDeobfuscatorSimple.java @@ -22,7 +22,6 @@ import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.ActionList; import com.jpexs.decompiler.flash.action.ActionLocalData; -import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; import com.jpexs.decompiler.flash.action.special.ActionStore; import com.jpexs.decompiler.flash.action.swf4.ActionAdd; import com.jpexs.decompiler.flash.action.swf4.ActionCharToAscii; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java index ed9e3a9bf..73daed597 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java @@ -21,9 +21,11 @@ import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.tags.base.StaticTextTag; import com.jpexs.decompiler.flash.types.MATRIX; import com.jpexs.decompiler.flash.types.RECT; +import com.jpexs.decompiler.flash.types.TEXTRECORD; import com.jpexs.helpers.ByteArrayRange; import java.io.IOException; import java.util.ArrayList; +import java.util.List; /** * @@ -50,6 +52,16 @@ public class DefineText2Tag extends StaticTextTag { advanceBits = 0; } + public DefineText2Tag(SWF swf, int characterID, RECT textBounds, MATRIX textMatrix, List textRecords) { + super(swf, ID, NAME, null); + this.characterID = characterID; + this.textBounds = textBounds; + this.textMatrix = textMatrix; + this.textRecords = textRecords; + this.glyphBits = 0; + this.advanceBits = 0; + } + /** * Constructor * diff --git a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java index 35c97888a..69ea5f517 100644 --- a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java +++ b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java @@ -1787,7 +1787,7 @@ public class CommandLineArgumentParser { } Map ret = new HashMap<>(); for (String fmt : fmts) { - if (fmt.contains(":")) { + if (!fmt.contains(":")) { badArguments("format"); } String[] parts = fmt.split(":"); diff --git a/src/com/jpexs/decompiler/flash/gui/editor/UndoFixedEditorPane.java b/src/com/jpexs/decompiler/flash/gui/editor/UndoFixedEditorPane.java index 81539a84e..7db2c3703 100644 --- a/src/com/jpexs/decompiler/flash/gui/editor/UndoFixedEditorPane.java +++ b/src/com/jpexs/decompiler/flash/gui/editor/UndoFixedEditorPane.java @@ -96,7 +96,9 @@ public class UndoFixedEditorPane extends JEditorPane { @Override public void setText(final String t) { View.execInEventDispatch(() -> { + removeDocumentListener(); setText(t, getContentType()); + addDocumentListener(); }); }