LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-28 13:45:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

text export fix

Browse Source
This commit is contained in:
honfika@gmail.com
2015-03-30 21:47:03 +02:00
parent a574da08a5
commit ec31310e2b
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java
View File

@@ -16,6 +16,7 @@
*/
package com.jpexs.decompiler.flash.tags;
import com.jpexs.decompiler.flash.AppResources;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.SWFInputStream;
import com.jpexs.decompiler.flash.SWFOutputStream;
@@ -113,7 +114,12 @@ public class DefineText2Tag extends TextTag {
ret += "\r\n";
}*/
}
ret.add(rec.getText(fnt));
if (fnt == null) {
ret.add(AppResources.translate("fontNotFound").replace("%fontId%", Integer.toString(rec.fontId)));
} else {
ret.add(rec.getText(fnt));
}
}
return ret;
}
@@ -179,7 +185,12 @@ public class DefineText2Tag extends TextTag {
}
writer.append("]");
}
writer.hilightSpecial(Helper.escapeString(rec.getText(fnt)).replace("[", "\\[").replace("]", "\\]"), HighlightSpecialType.TEXT);
if (fnt == null) {
writer.append(AppResources.translate("fontNotFound").replace("%fontId%", Integer.toString(rec.fontId)));
} else {
writer.hilightSpecial(Helper.escapeString(rec.getText(fnt)).replace("[", "\\[").replace("]", "\\]"), HighlightSpecialType.TEXT);
}
}
return new HighlightedText(writer);
}

7
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java
View File

@@ -114,7 +114,12 @@ public class DefineTextTag extends TextTag {
ret += "\r\n";
}*/
}
ret.add(rec.getText(fnt));
if (fnt == null) {
ret.add(AppResources.translate("fontNotFound").replace("%fontId%", Integer.toString(rec.fontId)));
} else {
ret.add(rec.getText(fnt));
}
}
return ret;
}

1
src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
View File

@@ -922,6 +922,7 @@ public class CommandLineArgumentParser {
if (stdErr != null) {
System.setErr(new PrintStream(new FileOutputStream(stdErr.replace("{swfFile}", inFileName), true)));
Main.initLogging(Configuration.debugMode.get());
}
long startTimeSwf = 0;

8
src/com/jpexs/decompiler/flash/gui/Main.java
View File

@@ -78,6 +78,7 @@ import java.util.Map.Entry;
import java.util.logging.ConsoleHandler;
import java.util.logging.FileHandler;
import java.util.logging.Formatter;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.logging.SimpleFormatter;
@@ -1372,10 +1373,11 @@ public class Main {
Logger logger = Logger.getLogger("");
logger.setLevel(Configuration.logLevel);
int handlerCount = logger.getHandlers().length;
for (int i = handlerCount - 1; i >= 0; i--) {
logger.removeHandler(logger.getHandlers()[i]);
Handler[] handlers = logger.getHandlers();
for (int i = handlers.length - 1; i >= 0; i--) {
logger.removeHandler(handlers[i]);
}
ConsoleHandler conHan = new ConsoleHandler();
conHan.setLevel(debug ? Level.CONFIG : Level.WARNING);
SimpleFormatter formatterTxt = new SimpleFormatter();