From 16fa1c3f2ba7db4bc96e7e33de1f92e09cc3a1b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= Date: Mon, 21 Apr 2014 15:04:45 +0200 Subject: [PATCH] Multiname table fix AS3 direct editing - Reloading constants table --- .../src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java | 3 ++- .../flash/gui/abc/tablemodels/MultinameTableModel.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java index 537ba2cd6..4a749edf5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java @@ -691,8 +691,9 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener, Se ((Tag) abc.parentTag).setModified(true); lastDecompiled = decompiledTextArea.getText(); decompiledTextArea.setClassIndex(-1); - View.showMessageDialog(this, AppStrings.translate("message.action.saved")); + navigator.setClassIndex(-1, oldIndex); setDecompiledEditMode(false); + View.showMessageDialog(this, AppStrings.translate("message.action.saved")); reload(); } catch (ParseException ex) { ex.printStackTrace(); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/tablemodels/MultinameTableModel.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/tablemodels/MultinameTableModel.java index 9601ef8e2..77423bfdc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/tablemodels/MultinameTableModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/tablemodels/MultinameTableModel.java @@ -131,16 +131,16 @@ public class MultinameTableModel implements TableModel { if (rowIndex == 0) { return ""; } - if (abc.constants.getMultiname(rowIndex).namespace_index == -1) { - return ""; + if (abc.constants.getMultiname(rowIndex).namespace_index <= 0 ) { + return "-"; } return abc.constants.getMultiname(rowIndex).getNamespace(abc.constants).getNameWithKind(abc.constants); case 4: if (rowIndex == 0) { return ""; } - if (abc.constants.getMultiname(rowIndex).namespace_set_index == -1) { - return ""; + if (abc.constants.getMultiname(rowIndex).namespace_set_index <= 0) { + return "-"; } return abc.constants.getMultiname(rowIndex).getNamespaceSet(abc.constants).toString(abc.constants); default: