LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-25 03:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

better switching between DumpView and Resources view (preserve selected nodes, do not show the components of the other view, e.g traits and constants list in dump view)

Browse Source
This commit is contained in:
honfika
2014-07-19 22:37:08 +02:00
parent d825ee82d7
commit 4f03df03eb
5 changed files with 696 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/gui/MainPanel.java
+45 -14
View File
@@ -499,7 +499,6 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
});
searchPanel.add(closeSearchButton, BorderLayout.EAST);
treePanel = new JPanel(new BorderLayout());
showDumpView(Configuration.dumpView.get());
treePanel.add(searchPanel, BorderLayout.SOUTH);
filterField.addActionListener(this);
@@ -570,6 +569,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
});
detailPanel.setVisible(false);
showDumpView(Configuration.dumpView.get());
updateUi();
//Opening files with drag&drop to main window
@@ -1158,7 +1158,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
}
}
}
if (documentClass != null) {
if (documentClass != null && !Configuration.dumpView.get()) {
showDetail(DETAILCARDAS3NAVIGATOR);
showCard(CARDACTIONSCRIPT3PANEL);
abcPanel.setSwf(swf);
@@ -1256,11 +1256,22 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
@Override
public void updateSearchPos(TextTag item) {
setTreeItem(item);
setTagTreeSelectedNode(item);
previewPanel.getTextPanel().updateSearchPos();
}
public void setTreeItem(TreeItem treeItem) {
private void setDumpTreeSelectedNode(DumpInfo dumpInfo) {
DumpTreeModel dtm = (DumpTreeModel) dumpTree.getModel();
TreePath tp = dtm.getDumpInfoPath(dumpInfo);
if (tp != null) {
dumpTree.setSelectionPath(tp);
dumpTree.scrollPathToVisible(tp);
} else {
showCard(CARDEMPTYPANEL);
}
}
public void setTagTreeSelectedNode(TreeItem treeItem) {
TagTreeModel ttm = (TagTreeModel) tagTree.getModel();
TreePath tp = ttm.getTagPath(treeItem);
if (tp != null) {
@@ -1833,13 +1844,17 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
previewPanel.clear();
showCard(CARDEMPTYPANEL);
TreeItem treeItem = tagTree.getCurrentTreeItem();
DumpInfo dumpInfo = (DumpInfo) dumpTree.getLastSelectedPathComponent();
View.refreshTree(tagTree, new TagTreeModel(mainFrame, swfs));
View.refreshTree(dumpTree, new DumpTreeModel(swfs));
if (treeItem != null) {
setTreeItem(treeItem);
setTagTreeSelectedNode(treeItem);
}
if (dumpInfo != null) {
setDumpTreeSelectedNode(dumpInfo);
}
}
public void refreshDecompiled() {
clearCache();
if (abcPanel != null) {
@@ -1993,7 +2008,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
swf.tags.set(swf.tags.indexOf(it), jpeg2Tag);
swf.updateCharacters();
refreshTree();
setTreeItem(jpeg2Tag);
setTagTreeSelectedNode(jpeg2Tag);
} else {
it.setImage(data);
}
@@ -2062,19 +2077,14 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
}
private void dumpTreeValueChanged(TreeSelectionEvent e) {
DumpInfo dumpInfo = (DumpInfo) e.getPath().getLastPathComponent();
dumpViewPanel.setData(DumpInfoSwfNode.getSwfNode(dumpInfo).getSwf().uncompressedData, dumpInfo);
dumpViewPanel.revalidate();
showCard(CARDDUMPVIEW);
dumpViewReload(false);
}
@Override
public void valueChanged(TreeSelectionEvent e) {
Object source = e.getSource();
if (source == dumpTree) {
dumpTreeValueChanged(e);
reload(false);
return;
}
TreeNode treeNode = (TreeNode) e.getPath().getLastPathComponent();
@@ -2121,14 +2131,35 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
if (show) {
treePanel.add(new JScrollPane(dumpTree), BorderLayout.CENTER);
treePanelMode = TreePanelMode.DUMP_TREE;
showDetail(DETAILCARDEMPTYPANEL);
} else {
treePanel.add(new JScrollPane(tagTree), BorderLayout.CENTER);
treePanelMode = TreePanelMode.TAG_TREE;
}
reload(true);
treePanel.revalidate();
}
private void dumpViewReload(boolean forceReload) {
showDetail(DETAILCARDEMPTYPANEL);
DumpInfo dumpInfo = (DumpInfo) dumpTree.getLastSelectedPathComponent();
if (dumpInfo == null) {
showCard(CARDEMPTYPANEL);
return;
}
dumpViewPanel.setData(DumpInfoSwfNode.getSwfNode(dumpInfo).getSwf().uncompressedData, dumpInfo);
dumpViewPanel.revalidate();
showCard(CARDDUMPVIEW);
}
public void reload(boolean forceReload) {
if (Configuration.dumpView.get()) {
dumpViewReload(forceReload);
return;
}
TreeNode treeNode = (TreeNode) tagTree.getLastSelectedPathComponent();
if (treeNode == null) {
return;
src/com/jpexs/decompiler/flash/gui/PreviewImage.java
+1 -1
View File
@@ -119,7 +119,7 @@ public class PreviewImage extends JPanel {
public void mouseClicked(MouseEvent e) {
if (e.getButton() == MouseEvent.BUTTON1 && e.getClickCount() >= 2) {
mainPanel.setTreeItem(treeItem);
mainPanel.setTagTreeSelectedNode(treeItem);
}
}
src/com/jpexs/decompiler/flash/gui/PreviewPanel.java
+1 -1
View File
@@ -882,7 +882,7 @@ public class PreviewPanel extends JSplitPane implements ActionListener {
tag.getSwf().updateCharacters();
tag.getTimelined().resetTimeline();
mainPanel.refreshTree();
mainPanel.setTreeItem(tag);
mainPanel.setTagTreeSelectedNode(tag);
editButton.setVisible(true);
saveButton.setVisible(false);
cancelButton.setVisible(false);
src/com/jpexs/decompiler/flash/gui/TagTree.java
+614 -614
View File
File diff suppressed because it is too large Load Diff
src/com/jpexs/decompiler/flash/gui/dumpview/DumpTreeModel.java
+35 -2
View File
@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.gui.dumpview;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.dumpview.DumpInfo;
import com.jpexs.decompiler.flash.treeitems.SWFList;
import java.util.ArrayList;
import java.util.List;
import javax.swing.event.TreeModelListener;
import javax.swing.tree.TreeModel;
@@ -43,13 +44,45 @@ public class DumpTreeModel implements TreeModel {
this.root = root;
}
private List<DumpInfo> searchDumpInfo(DumpInfo dumpInfo, DumpInfo parent, List<DumpInfo> path) {
List<DumpInfo> ret = null;
int cnt = getChildCount(parent);
for (int i = 0; i < cnt; i++) {
DumpInfo n = getChild(parent, i);
List<DumpInfo> newPath = new ArrayList<>();
newPath.addAll(path);
newPath.add(n);
if (dumpInfo == n) {
return newPath;
}
ret = searchDumpInfo(dumpInfo, n, newPath);
if (ret != null) {
return ret;
}
}
return ret;
}
public TreePath getDumpInfoPath(DumpInfo dumpInfo) {
List<DumpInfo> path = new ArrayList<>();
path.add(getRoot());
path = searchDumpInfo(dumpInfo, getRoot(), path);
if (path == null) {
return null;
}
TreePath tp = new TreePath(path.toArray(new Object[path.size()]));
return tp;
}
@Override
public Object getRoot() {
public DumpInfo getRoot() {
return root;
}
@Override
public Object getChild(Object o, int i) {
public DumpInfo getChild(Object o, int i) {
return ((DumpInfo) o).getChildInfos().get(i);
}