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

allow adding tag to main timeline

Browse Source 
tagtree:remove unnecessary tree parameter 
binary export: use .swf extension for swf files
export:select export types fixed when inner swf is selected
debug menu:create new swf
check all tags when debugcopy is enabled
This commit is contained in:
[email protected]
2015-12-05 07:48:34 +01:00
parent 9a323a1355
commit 531e687821
9 changed files with 67 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/gui/Main.java
+2 -18
View File
@@ -16,28 +16,15 @@
*/
package com.jpexs.decompiler.flash.gui;
import com.jpexs.debugger.flash.DebugConnectionListener;
import com.jpexs.debugger.flash.DebugMessageListener;
import com.jpexs.debugger.flash.Debugger;
import com.jpexs.debugger.flash.DebuggerCommands;
import com.jpexs.debugger.flash.DebuggerConnection;
import com.jpexs.debugger.flash.SWD;
import com.jpexs.debugger.flash.messages.in.InAskBreakpoints;
import com.jpexs.debugger.flash.messages.in.InBreakAt;
import com.jpexs.debugger.flash.messages.in.InNumScript;
import com.jpexs.debugger.flash.messages.in.InScript;
import com.jpexs.debugger.flash.messages.in.InSwfInfo;
import com.jpexs.decompiler.flash.ApplicationInfo;
import com.jpexs.decompiler.flash.EventListener;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.SWFBundle;
import com.jpexs.decompiler.flash.SWFCompression;
import com.jpexs.decompiler.flash.SWFSourceInfo;
import com.jpexs.decompiler.flash.SearchMode;
import com.jpexs.decompiler.flash.SwfOpenException;
import com.jpexs.decompiler.flash.Version;
import com.jpexs.decompiler.flash.abc.ClassPath;
import com.jpexs.decompiler.flash.abc.ScriptPack;
import com.jpexs.decompiler.flash.abc.avm2.AVM2Code;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.configuration.SwfSpecificConfiguration;
@@ -94,15 +81,11 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeSet;
import java.util.WeakHashMap;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import java.util.logging.ConsoleHandler;
@@ -165,6 +148,7 @@ public class Main {
//private static int ip = 0;
//private static String ipClass = null;
private static Process runProcess;
private static boolean runProcessDebug;
private static boolean inited = false;
@@ -426,7 +410,7 @@ public class Main {
}
/* public static void debuggerNotSuspended() {
}*/
public static boolean isDebugging() {
return isDebugRunning();
src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java
+11
View File
@@ -997,6 +997,17 @@ public abstract class MainFrameMenu implements MenuBuilder {
sourceInfos[1] = new SWFSourceInfo(null, path, null);
Main.openFile(sourceInfos);
}, PRIORITY_MEDIUM, null, true, null, false);
addMenuItem("/debug/createNewSwf", "Create new SWF", "update16", e -> {
SWF swf = new SWF();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try {
swf.saveTo(baos);
} catch (IOException ex) {
Logger.getLogger(MainFrameMenu.class.getName()).log(Level.SEVERE, null, ex);
}
Main.openFile(new SWFSourceInfo(new ByteArrayInputStream(baos.toByteArray()), "New SWF", "New SWF"));
}, PRIORITY_MEDIUM, null, true, null, false);
finishMenu("/debug");
}
src/com/jpexs/decompiler/flash/gui/MainPanel.java
+5 -5
View File
@@ -1063,7 +1063,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
public List<File> exportSelection(AbortRetryIgnoreHandler handler, String selFile, ExportDialog export) throws IOException, InterruptedException {
List<File> ret = new ArrayList<>();
List<TreeItem> sel = folderPreviewPanel.selectedItems.isEmpty() ? tagTree.getAllSelected(tagTree) : new ArrayList<>(folderPreviewPanel.selectedItems.values());
List<TreeItem> sel = folderPreviewPanel.selectedItems.isEmpty() ? tagTree.getAllSelected() : new ArrayList<>(folderPreviewPanel.selectedItems.values());
Set<SWF> usedSwfs = new HashSet<>();
for (TreeItem d : sel) {
@@ -2148,7 +2148,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
public void export(final boolean onlySel) {
final SWF swf = getCurrentSwf();
List<TreeItem> sel = tagTree.getSelection(swf);
List<TreeItem> sel = tagTree.getAllSelected();
if (!onlySel) {
sel = null;
} else {
@@ -2201,7 +2201,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
}
public void exportJavaSource() {
List<TreeItem> sel = tagTree.getSelected(tagTree);
List<TreeItem> sel = tagTree.getSelected();
for (TreeItem item : sel) {
if (item instanceof SWF) {
SWF swf = (SWF) item;
@@ -2221,7 +2221,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
}
public void exportSwfXml() {
List<TreeItem> sel = tagTree.getSelected(tagTree);
List<TreeItem> sel = tagTree.getSelected();
Set<SWF> swfs = new HashSet<>();
for (TreeItem item : sel) {
@@ -2245,7 +2245,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
}
public void importSwfXml() {
List<TreeItem> sel = tagTree.getSelected(tagTree);
List<TreeItem> sel = tagTree.getSelected();
Set<SWF> swfs = new HashSet<>();
for (TreeItem item : sel) {
swfs.add(item.getSwf());
src/com/jpexs/decompiler/flash/gui/PreviewPanel.java
+6 -7
View File
@@ -1076,16 +1076,15 @@ public class PreviewPanel extends JPersistentSplitPane implements TagEditorPanel
}
//Inject Loader
if (swf.isAS3() && Configuration.autoOpenLoadedSWFs.get() && !Configuration.internalFlashViewer.get() && !DebuggerTools.hasDebugger(swf)) {
SWF instrSWF = null;
SWF instrSWF;
try (FileInputStream fis = new FileInputStream(tempFile)) {
instrSWF = new SWF(fis, false, false);
}
if (instrSWF != null) {
DebuggerTools.switchDebugger(instrSWF);
DebuggerTools.injectDebugLoader(instrSWF);
try (OutputStream fos = new BufferedOutputStream(new FileOutputStream(tempFile))) {
instrSWF.saveTo(fos);
}
DebuggerTools.switchDebugger(instrSWF);
DebuggerTools.injectDebugLoader(instrSWF);
try (OutputStream fos = new BufferedOutputStream(new FileOutputStream(tempFile))) {
instrSWF.saveTo(fos);
}
}
flashPanel.displaySWF(tempFile.getAbsolutePath(), backgroundColor, swf.frameRate);
src/com/jpexs/decompiler/flash/gui/tagtree/TagTree.java
+23 -10
View File
@@ -408,7 +408,12 @@ public class TagTree extends JTree {
ret = Arrays.asList(DefineBinaryDataTag.ID);
break;
case TagTreeModel.FOLDER_FRAMES:
ret = new ArrayList<>();
// same as nested tags of DefineSpriteTag?
ret = Arrays.asList(PlaceObjectTag.ID, PlaceObject2Tag.ID, PlaceObject3Tag.ID, PlaceObject4Tag.ID,
RemoveObjectTag.ID, RemoveObject2Tag.ID, ShowFrameTag.ID, FrameLabelTag.ID,
StartSoundTag.ID, StartSound2Tag.ID, VideoFrameTag.ID,
SoundStreamBlockTag.ID, SoundStreamHeadTag.ID, SoundStreamHead2Tag.ID,
DefineScalingGridTag.ID);
break;
case TagTreeModel.FOLDER_OTHERS:
ret = Arrays.asList(
@@ -428,6 +433,14 @@ public class TagTree extends JTree {
return ret;
}
public List<Integer> getFrameNestedTagIds() {
return Arrays.asList(PlaceObjectTag.ID, PlaceObject2Tag.ID, PlaceObject3Tag.ID, PlaceObject4Tag.ID,
RemoveObjectTag.ID, RemoveObject2Tag.ID, FrameLabelTag.ID,
StartSoundTag.ID, StartSound2Tag.ID, VideoFrameTag.ID,
SoundStreamBlockTag.ID, SoundStreamHeadTag.ID, SoundStreamHead2Tag.ID,
DefineScalingGridTag.ID);
}
public List<Integer> getNestedTagIds(Tag obj) {
if (obj instanceof DefineSpriteTag) {
return Arrays.asList(PlaceObjectTag.ID, PlaceObject2Tag.ID, PlaceObject3Tag.ID, PlaceObject4Tag.ID,
@@ -455,16 +468,16 @@ public class TagTree extends JTree {
return !getSelection(mainPanel.getCurrentSwf()).isEmpty();
}
public void getAllSubs(JTree tree, TreeItem o, List<TreeItem> ret) {
TagTreeModel tm = (TagTreeModel) tree.getModel();
public void getAllSubs(TreeItem o, List<TreeItem> ret) {
TagTreeModel tm = getModel();
for (TreeItem c : tm.getAllChildren(o)) {
ret.add(c);
getAllSubs(tree, c, ret);
getAllSubs(c, ret);
}
}
public List<TreeItem> getAllSelected(TagTree tree) {
TreeSelectionModel tsm = tree.getSelectionModel();
public List<TreeItem> getAllSelected() {
TreeSelectionModel tsm = getSelectionModel();
TreePath[] tps = tsm.getSelectionPaths();
List<TreeItem> ret = new ArrayList<>();
if (tps == null) {
@@ -474,16 +487,16 @@ public class TagTree extends JTree {
for (TreePath tp : tps) {
TreeItem treeNode = (TreeItem) tp.getLastPathComponent();
ret.add(treeNode);
getAllSubs(tree, treeNode, ret);
getAllSubs(treeNode, ret);
}
return ret;
}
public List<TreeItem> getSelected(JTree tree) {
public List<TreeItem> getSelected() {
if (!mainPanel.folderPreviewPanel.selectedItems.isEmpty()) {
return new ArrayList<>(mainPanel.folderPreviewPanel.selectedItems.values());
}
TreeSelectionModel tsm = tree.getSelectionModel();
TreeSelectionModel tsm = getSelectionModel();
TreePath[] tps = tsm.getSelectionPaths();
List<TreeItem> ret = new ArrayList<>();
if (tps == null) {
@@ -500,7 +513,7 @@ public class TagTree extends JTree {
public List<TreeItem> getSelection(SWF swf) {
List<TreeItem> sel;
if (mainPanel.folderPreviewPanel.selectedItems.isEmpty()) {
sel = getAllSelected(this);
sel = getAllSelected();
} else {
sel = new ArrayList<>(mainPanel.folderPreviewPanel.selectedItems.values());
}
src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java
+8 -4
View File
@@ -357,6 +357,10 @@ public class TagTreeContextMenu extends JPopupMenu {
} else if (firstItem instanceof Tag) {
List<Integer> allowedTagTypes = tagTree.getNestedTagIds((Tag) firstItem);
addAddTagMenuItems(allowedTagTypes, addTagMenu, firstItem);
} else if (firstItem instanceof Frame) {
// todo: honfika: add to the selected frame
//List<Integer> allowedTagTypes = tagTree.getFrameNestedTagIds();
//addAddTagMenuItems(allowedTagTypes, addTagMenu, firstItem);
}
addTagMenu.setVisible(addTagMenu.getItemCount() > 0);
@@ -623,7 +627,7 @@ public class TagTreeContextMenu extends JPopupMenu {
}
private void openSwfInsideActionPerformed(ActionEvent evt) {
List<TreeItem> sel = tagTree.getSelected(tagTree);
List<TreeItem> sel = tagTree.getSelected();
List<DefineBinaryDataTag> binaryDatas = new ArrayList<>();
for (TreeItem item : sel) {
DefineBinaryDataTag binaryData = (DefineBinaryDataTag) item;
@@ -680,7 +684,7 @@ public class TagTreeContextMenu extends JPopupMenu {
}
private void removeItemActionPerformed(ActionEvent evt, boolean removeDependencies) {
List<TreeItem> sel = tagTree.getSelected(tagTree);
List<TreeItem> sel = tagTree.getSelected();
List<Tag> tagsToRemove = new ArrayList<>();
for (TreeItem item : sel) {
@@ -730,7 +734,7 @@ public class TagTreeContextMenu extends JPopupMenu {
}
private void undoTagActionPerformed(ActionEvent evt) {
List<TreeItem> sel = tagTree.getSelected(tagTree);
List<TreeItem> sel = tagTree.getSelected();
for (TreeItem item : sel) {
if (item instanceof Tag) {
@@ -749,7 +753,7 @@ public class TagTreeContextMenu extends JPopupMenu {
}
private void closeSwfActionPerformed(ActionEvent evt) {
List<TreeItem> sel = tagTree.getSelected(tagTree);
List<TreeItem> sel = tagTree.getSelected();
for (TreeItem item : sel) {
if (item instanceof SWF) {
SWF swf = (SWF) item;