LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-27 22:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

swf bundle save fixed, other small fixes

Browse Source
This commit is contained in:
Honfika
2014-01-22 15:34:12 +01:00
parent e2a42471de
commit 863cf1d387
12 changed files with 140 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
+27 -27
View File
@@ -278,27 +278,31 @@ public class ActionPanel extends JPanel implements ActionListener, SearchListene
});
}
private void setText(HilightedText text, String contentType) {
int pos = editor.getCaretPosition();
Highlighting lastH = null;
for (Highlighting h : disassembledHilights) {
if (pos < h.startPos) {
break;
private void setText(final HilightedText text, final String contentType) {
View.execInEventDispatch(new Runnable() {
@Override
public void run() {
int pos = editor.getCaretPosition();
Highlighting lastH = null;
for (Highlighting h : disassembledHilights) {
if (pos < h.startPos) {
break;
}
lastH = h;
}
String offset = lastH == null ? "0" : lastH.getPropertyString("offset");
disassembledHilights = text.instructionHilights;
String stripped = text.text;
setEditorText(stripped, contentType);
Highlighting h = Highlighting.search(disassembledHilights, "offset", offset);
if (h != null) {
if (h.startPos <= editor.getDocument().getLength()) {
editor.setCaretPosition(h.startPos);
}
}
}
lastH = h;
}
String offset = lastH == null ? "0" : lastH.getPropertyString("offset");
// getting hilights is fast now
// setEditorText("; " + AppStrings.translate("work.gettinghilights") + "...", "text/flasm");
disassembledHilights = text.instructionHilights;
String stripped = text.text;
setEditorText(stripped, contentType);
Highlighting h = Highlighting.search(disassembledHilights, "offset", offset);
if (h != null) {
if (h.startPos <= editor.getText().length()) {
editor.setCaretPosition(h.startPos);
}
}
});
}
private HilightedText getHilightedText(ExportMode exportMode) {
@@ -479,7 +483,6 @@ public class ActionPanel extends JPanel implements ActionListener, SearchListene
panB.add(panCode, BorderLayout.CENTER);
JPanel buttonsPan = new JPanel();
buttonsPan.setLayout(new FlowLayout());
buttonsPan.add(editButton);
@@ -515,7 +518,6 @@ public class ActionPanel extends JPanel implements ActionListener, SearchListene
cancelButton.setVisible(false);
saveDecompiledButton.addActionListener(this);
saveDecompiledButton.setActionCommand(ACTION_SAVE_DECOMPILED);
editDecompiledButton.addActionListener(this);
@@ -539,10 +541,6 @@ public class ActionPanel extends JPanel implements ActionListener, SearchListene
//decLabel.setBorder(new BevelBorder(BevelBorder.RAISED));
setLayout(new BorderLayout());
add(splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, panA, panB), BorderLayout.CENTER);
splitPane.setResizeWeight(0.5);
@@ -578,7 +576,9 @@ public class ActionPanel extends JPanel implements ActionListener, SearchListene
Highlighting h2 = Highlighting.search(decompiledHilights, "offset", ofs);
if (h2 != null) {
ignoreCarret = true;
decompiledEditor.setCaretPosition(h2.startPos);
if (h2.startPos <= decompiledEditor.getDocument().getLength()) {
decompiledEditor.setCaretPosition(h2.startPos);
}
decompiledEditor.getCaret().setVisible(true);
ignoreCarret = false;