From daba02803521df569bc474ffe8006e30464bae41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sun, 28 Aug 2016 10:59:46 +0200
Subject: [PATCH] AS3 direct edit - Classic error display on nonFlex compiler

---
 .../jpexs/decompiler/flash/gui/abc/ABCPanel.java    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index f6552341c..335777c8a 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -71,6 +71,7 @@ import com.jpexs.decompiler.flash.gui.tagtree.TagTreeModel;
 import com.jpexs.decompiler.flash.importers.As3ScriptReplaceException;
 import com.jpexs.decompiler.flash.importers.As3ScriptReplaceExceptionItem;
 import com.jpexs.decompiler.flash.importers.As3ScriptReplacerInterface;
+import com.jpexs.decompiler.flash.importers.FFDecAs3ScriptReplacer;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.decompiler.flash.tags.Tag;
 import com.jpexs.decompiler.flash.treeitems.TreeItem;
@@ -1206,6 +1207,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
             StringBuilder sb = new StringBuilder();
             int firstErrorLine = As3ScriptReplaceExceptionItem.LINE_UNKNOWN;
             int firstErrorCol = As3ScriptReplaceExceptionItem.COL_UNKNOWN;
+            String firstErrorText = null;
             abc.script_info.get(oldIndex).delete(abc, false);
 
             for (As3ScriptReplaceExceptionItem item : asre.getExceptionItems()) {
@@ -1213,6 +1215,9 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
                     firstErrorLine = item.getLine();
                     firstErrorCol = item.getCol();
                 }
+                if (firstErrorText == null) {
+                    firstErrorText = item.getMessage();
+                }
                 sb.append(item.getFile()).append(":").append(item.getLine()).append(" (column ").append(item.getCol()).append(")").append(":").append("\n");
                 sb.append("  ").append(item.getMessage());
                 sb.append("\n");
@@ -1226,8 +1231,12 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
                 }
                 decompiledTextArea.markError();
             }
-            //View.showMessageDialog(this, AppStrings.translate("error.action.save").replace("%error%", ex.text).replace("%line%", Long.toString(ex.line)), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
-            View.showMessageDialog(this, sb.toString(), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
+
+            if (scriptReplacer instanceof FFDecAs3ScriptReplacer) { //oldStyle error display - single error, no column
+                View.showMessageDialog(this, AppStrings.translate("error.action.save").replace("%error%", firstErrorText).replace("%line%", Long.toString(firstErrorLine)), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
+            } else {
+                View.showMessageDialog(this, sb.toString(), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
+            }
             decompiledTextArea.requestFocus();
         } catch (Throwable ex) {
             Logger.getLogger(ABCPanel.class.getName()).log(Level.SEVERE, null, ex);