small fixes about removing tags, action reading

This commit is contained in:
honfika
2014-08-02 21:29:25 +02:00
parent 31c7cc0bde
commit fa56f881f4
4 changed files with 6 additions and 6 deletions

View File

@@ -933,7 +933,7 @@ public final class SWF implements TreeItem, Timelined {
List<File> ret = new ArrayList<>();
List<ContainerItem> list2 = new ArrayList<>();
list2.addAll(tags);
List<TreeNode> list = createASTagList(list2, null);
List<TreeNode> list = createASTagList(list2, this);
TagNode.setExport(list, true);
if (!outdir.endsWith(File.separator)) {

View File

@@ -183,7 +183,7 @@ public class ActionListReader {
}
updateJumps(actions, jumps, containerLastActions, endAddress, version);
//updateActionStores(actions, jumps);
updateActionStores(actions, jumps);
updateContainerSizes(actions, containerLastActions);
updateActionLengths(actions, version);
@@ -417,7 +417,6 @@ public class ActionListReader {
if (a1 == null || a1 == nextActionAfterStore) {
break;
}
actions.remove(a1);
store.add(a1);
}
aStore.setStore(store);
@@ -579,7 +578,7 @@ public class ActionListReader {
updateAddresses(actions, startIp, version);
updateJumps(actions, jumps, containerLastActions, endAddress, version);
//updateActionStores(actions, jumps);
updateActionStores(actions, jumps);
updateContainerSizes(actions, containerLastActions);
updateActionLengths(actions, version);

View File

@@ -121,7 +121,7 @@ public class TagTreeModel implements TreeModel {
List<TreeNode> binaryData = new ArrayList<>();
List<TreeNode> others = new ArrayList<>();
List<TreeNode> actionScript = SWF.createASTagList(list, null);
List<TreeNode> actionScript = SWF.createASTagList(list, swf);
List<Tag> actionScriptTags = new ArrayList<>();
SWF.getTagsFromTreeNodes(actionScript, actionScriptTags);

View File

@@ -220,7 +220,8 @@ public class ActionPanel extends JPanel implements ActionListener, SearchListene
public boolean search(final String txt, boolean ignoreCase, boolean regexp) {
if ((txt != null) && (!txt.isEmpty())) {
searchPanel.setOptions(ignoreCase, regexp);
List<TreeNode> list = SWF.createASTagList(mainPanel.getCurrentSwf().tags, null);
SWF swf = mainPanel.getCurrentSwf();
List<TreeNode> list = SWF.createASTagList(swf.tags, swf);
Map<String, ASMSource> asms = new HashMap<>();
getASMs("", list, asms);
final List<ActionSearchResult> found = new ArrayList<>();