LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-15 03:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #676: include characterid and previous text of the text tag in text import error log message

Browse Source
This commit is contained in:
honfika@gmail.com
2014-11-30 14:07:04 +01:00
parent e27eaed6ed
commit eec3db60c9
11 changed files with 9598 additions and 8667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2663
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/pcode/Flasm3Lexer.java
View File

File diff suppressed because it is too large Load Diff

4137
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScriptLexer.java
View File

File diff suppressed because it is too large Load Diff

2131
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/MethodInfoLexer.java
View File

File diff suppressed because it is too large Load Diff

2039
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/pcode/FlasmLexer.java
View File

File diff suppressed because it is too large Load Diff

4663
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptLexer.java
View File

File diff suppressed because it is too large Load Diff

6
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/TextImporter.java
View File

@@ -58,7 +58,7 @@ public class TextImporter {
String[] records = textArr[1].split(recordSeparator);
result.put(id, records);
} else {
if (errorHandler.handle()) {
if (errorHandler.handle(null)) {
return null;
}
}
@@ -175,9 +175,9 @@ public class TextImporter {
return true;
}
return !errorHandler.handle();
return !errorHandler.handle(textTag);
} catch (TextParseException ex) {
return !errorHandler.handle(ex.text, ex.line);
return !errorHandler.handle(textTag, ex.text, ex.line);
}
}
}

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/TextImportErrorHandler.java
View File

@@ -22,7 +22,7 @@ package com.jpexs.decompiler.flash.tags.base;
*/
public abstract class TextImportErrorHandler {
public abstract boolean handle();
public abstract boolean handle(TextTag textTag);
public abstract boolean handle(String message, long line);
public abstract boolean handle(TextTag textTag, String message, long line);
}

1392
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java
View File

File diff suppressed because it is too large Load Diff

1212
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/annotations/parser/ConditionLexer.java
View File

File diff suppressed because it is too large Load Diff

17
src/com/jpexs/decompiler/flash/gui/MainPanel.java
View File

@@ -1390,17 +1390,26 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
private final ConfigurationItem<Boolean> doNotShowImportError = new ConfigurationItem<>("doNotShowImportError", true, true);
private final ConfigurationItem<Boolean> doNotShowInvalidText = new ConfigurationItem<>("doNotShowInvalidText", true, true);
private String getTextTagInfo(TextTag textTag) {
String ret = "";
if (textTag != null) {
ret += " TextId: " + textTag.getCharacterId() + " (" + textTag.getText(", ") + ")";
}
return ret;
}
@Override
public boolean handle() {
public boolean handle(TextTag textTag) {
String msg = translate("error.text.import");
logger.log(Level.SEVERE, msg);
logger.log(Level.SEVERE, msg + getTextTagInfo(textTag));
return View.showConfirmDialog(diz, msg, translate("error"), JOptionPane.OK_CANCEL_OPTION, doNotShowImportError, JOptionPane.OK_OPTION) == JOptionPane.CANCEL_OPTION;
}
@Override
public boolean handle(String message, long line) {
public boolean handle(TextTag textTag, String message, long line) {
String msg = translate("error.text.invalid.continue").replace("%text%", message).replace("%line%", Long.toString(line));
logger.log(Level.SEVERE, msg);
logger.log(Level.SEVERE, msg + getTextTagInfo(textTag));
return View.showConfirmDialog(diz, msg, translate("error"), JOptionPane.OK_CANCEL_OPTION, doNotShowInvalidText, JOptionPane.OK_OPTION) == JOptionPane.CANCEL_OPTION;
}
});

1
src/com/jpexs/decompiler/flash/gui/player/FlashPlayerPanel.java
View File

@@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.gui.player;
import com.jpexs.decompiler.flash.gui.FlashUnsupportedException;
import com.jpexs.decompiler.flash.gui.Main;
import com.jpexs.javactivex.ActiveX;
import com.jpexs.javactivex.ActiveXControl;
import com.jpexs.javactivex.ActiveXEvent;
import com.jpexs.javactivex.ActiveXEventListener;
import com.jpexs.javactivex.ActiveXException;