diff --git a/trunk/src/com/jpexs/asdec/Main.java b/trunk/src/com/jpexs/asdec/Main.java index a906dec31..0ca67993f 100644 --- a/trunk/src/com/jpexs/asdec/Main.java +++ b/trunk/src/com/jpexs/asdec/Main.java @@ -31,7 +31,6 @@ import java.awt.event.MouseEvent; import java.io.*; import java.lang.management.ManagementFactory; import java.net.Socket; -import java.util.ArrayList; import java.util.Calendar; import java.util.logging.ConsoleHandler; import java.util.logging.FileHandler; @@ -810,7 +809,7 @@ public class Main { if (debug) { ConsoleHandler conHan = new ConsoleHandler(); - conHan.setFormatter(formatterTxt); + conHan.setFormatter(formatterTxt); logger.addHandler(conHan); } diff --git a/trunk/src/com/jpexs/asdec/action/Action.java b/trunk/src/com/jpexs/asdec/action/Action.java index 55d18bac1..bb57bc69f 100644 --- a/trunk/src/com/jpexs/asdec/action/Action.java +++ b/trunk/src/com/jpexs/asdec/action/Action.java @@ -383,8 +383,8 @@ public class Action { if (importantOffsets.contains(offset)) { ret += "loc" + Helper.formatAddress(offset) + ":"; } + ret += Highlighting.hilighOffset("", offset) + a.getASMSource(importantOffsets, constantPool, version) + "\r\n"; offset += a.getBytes(version).length; - ret += a.getASMSource(importantOffsets, constantPool, version) + "\r\n"; } if (importantOffsets.contains(offset)) { ret += "loc" + Helper.formatAddress(offset) + ":\r\n"; diff --git a/trunk/src/com/jpexs/asdec/action/TagNode.java b/trunk/src/com/jpexs/asdec/action/TagNode.java index 7a8a14fa7..a31a8fc66 100644 --- a/trunk/src/com/jpexs/asdec/action/TagNode.java +++ b/trunk/src/com/jpexs/asdec/action/TagNode.java @@ -158,7 +158,7 @@ public class TagNode { } String ret; if (isPcode) { - ret = ((ASMSource) node.tag).getASMSource(SWF.DEFAULT_VERSION); + ret = Highlighting.stripHilights(((ASMSource) node.tag).getASMSource(SWF.DEFAULT_VERSION)); } else { List as = ((ASMSource) node.tag).getActions(SWF.DEFAULT_VERSION); com.jpexs.asdec.action.Action.setActionsAddresses(as, 0, SWF.DEFAULT_VERSION); diff --git a/trunk/src/com/jpexs/asdec/action/gui/ActionPanel.java b/trunk/src/com/jpexs/asdec/action/gui/ActionPanel.java index a712ed373..781d92d31 100644 --- a/trunk/src/com/jpexs/asdec/action/gui/ActionPanel.java +++ b/trunk/src/com/jpexs/asdec/action/gui/ActionPanel.java @@ -18,6 +18,7 @@ package com.jpexs.asdec.action.gui; import com.jpexs.asdec.Main; import com.jpexs.asdec.SWF; +import com.jpexs.asdec.abc.gui.LineMarkedEditorPane; import com.jpexs.asdec.action.TagNode; import com.jpexs.asdec.action.parser.ASMParser; import com.jpexs.asdec.action.parser.ParseException; @@ -34,17 +35,19 @@ import java.util.ArrayList; import java.util.List; import javax.swing.*; import javax.swing.border.BevelBorder; +import javax.swing.event.CaretEvent; +import javax.swing.event.CaretListener; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.TreePath; import jsyntaxpane.DefaultSyntaxKit; -public class ActionPanel extends JPanel implements TreeSelectionListener, ActionListener { +public class ActionPanel extends JPanel implements TreeSelectionListener, ActionListener, CaretListener { public JTree tagTree; - public JEditorPane editor; - public JEditorPane decompiledEditor; + public LineMarkedEditorPane editor; + public LineMarkedEditorPane decompiledEditor; public List list; public JSplitPane splitPane; public JSplitPane splitPane2; @@ -53,12 +56,14 @@ public class ActionPanel extends JPanel implements TreeSelectionListener, Action public JButton loadHexButton = new JButton("Load hex"); public JLabel asmLabel = new JLabel("P-code source (editable)"); public JLabel decLabel = new JLabel("ActionScript source"); + public List decompiledHilights = new ArrayList(); + public List disassembledHilights = new ArrayList(); public ActionPanel(List list) { this.list = list; DefaultSyntaxKit.initKit(); - editor = new JEditorPane(); - decompiledEditor = new JEditorPane(); + editor = new LineMarkedEditorPane(); + decompiledEditor = new LineMarkedEditorPane(); tagTree = new JTree(new TagTreeModel(list)); DefaultTreeCellRenderer treeRenderer = new DefaultTreeCellRenderer(); @@ -107,7 +112,7 @@ public class ActionPanel extends JPanel implements TreeSelectionListener, Action editor.setContentType("text/flasm"); decompiledEditor.setContentType("text/actionscript"); tagTree.addTreeSelectionListener(this); - + decompiledEditor.addCaretListener(this); } public void initSplits() { @@ -127,13 +132,17 @@ public class ActionPanel extends JPanel implements TreeSelectionListener, Action final ASMSource asm = (ASMSource) obj; (new Thread() { @Override - public void run() { - editor.setText(asm.getASMSource(SWF.DEFAULT_VERSION)); + public void run() { + String disasm = asm.getASMSource(SWF.DEFAULT_VERSION); + disassembledHilights = Highlighting.getInstrHighlights(disasm); + editor.setText(Highlighting.stripHilights(disasm)); if (Main.DO_DECOMPILE) { List as = asm.getActions(SWF.DEFAULT_VERSION); com.jpexs.asdec.action.Action.setActionsAddresses(as, 0, SWF.DEFAULT_VERSION); decompiledEditor.setText("//Decompiling..."); - decompiledEditor.setText(Highlighting.stripHilights(com.jpexs.asdec.action.Action.actionsToSource(as, SWF.DEFAULT_VERSION))); + String s = com.jpexs.asdec.action.Action.actionsToSource(as, SWF.DEFAULT_VERSION); + decompiledHilights = Highlighting.getInstrHighlights(s); + decompiledEditor.setText(Highlighting.stripHilights(s)); } Main.stopWork(); } @@ -177,4 +186,21 @@ public class ActionPanel extends JPanel implements TreeSelectionListener, Action } } } + + @Override + public void caretUpdate(CaretEvent e) { + decompiledEditor.getCaret().setVisible(true); + int pos = decompiledEditor.getCaretPosition(); + for (Highlighting h : decompiledHilights) { + if ((pos >= h.startPos) && (pos < h.startPos + h.len)) { + for (Highlighting h2 : disassembledHilights) { + if (h2.offset == h.offset) { + editor.setCaretPosition(h2.startPos); + break; + } + } + break; + } + } + } } diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionIf.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionIf.java index a561ec572..964ca2634 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionIf.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionIf.java @@ -81,6 +81,4 @@ public class ActionIf extends Action { public String toString() { return "ActionIf"; } - - } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/AsciiToCharTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/AsciiToCharTreeItem.java index bb6fb40bc..aff0ba4be 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/AsciiToCharTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/AsciiToCharTreeItem.java @@ -29,6 +29,6 @@ public class AsciiToCharTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "ord(" + value.toString(constants) + ")"; + return hilight("ord(") + value.toString(constants) + hilight(")"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CallFunctionTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/CallFunctionTreeItem.java index aad1b716e..967b465d1 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CallFunctionTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/CallFunctionTreeItem.java @@ -35,10 +35,10 @@ public class CallFunctionTreeItem extends TreeItem { String paramStr = ""; for (int t = 0; t < arguments.size(); t++) { if (t > 0) { - paramStr += ","; + paramStr += hilight(","); } paramStr += arguments.get(t).toString(constants); } - return stripQuotes(functionName) + "(" + paramStr + ")"; + return stripQuotes(functionName) + hilight("(") + paramStr + hilight(")"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CallMethodTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/CallMethodTreeItem.java index 1b4f2681a..062b942c6 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CallMethodTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/CallMethodTreeItem.java @@ -38,7 +38,7 @@ public class CallMethodTreeItem extends TreeItem { String paramStr = ""; for (int t = 0; t < arguments.size(); t++) { if (t > 0) { - paramStr += ","; + paramStr += hilight(","); } paramStr += arguments.get(t).toString(constants); } @@ -54,8 +54,8 @@ public class CallMethodTreeItem extends TreeItem { } } if (blankMethod) { - return scriptObject.toString(constants) + "(" + paramStr + ")"; + return scriptObject.toString(constants) + hilight("(") + paramStr + hilight(")"); } - return scriptObject.toString(constants) + "." + stripQuotes(methodName) + "(" + paramStr + ")"; + return scriptObject.toString(constants) + hilight(".") + stripQuotes(methodName) + hilight("(") + paramStr + hilight(")"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CallTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/CallTreeItem.java index 0920404eb..bec874a17 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CallTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/CallTreeItem.java @@ -29,6 +29,6 @@ public class CallTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return stripQuotes(value) + "()"; + return stripQuotes(value) + hilight("()"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CastOpTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/CastOpTreeItem.java index f83dafb0d..a9567c1a1 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CastOpTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/CastOpTreeItem.java @@ -31,6 +31,6 @@ public class CastOpTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "(" + stripQuotes(constructor) + ")" + object.toString(constants); + return hilight("(") + stripQuotes(constructor) + hilight(")") + object.toString(constants); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CharToAsciiTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/CharToAsciiTreeItem.java index e481bb55f..89470a80e 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CharToAsciiTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/CharToAsciiTreeItem.java @@ -29,6 +29,6 @@ public class CharToAsciiTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "chr(" + value.toString(constants) + ")"; + return hilight("chr(") + value.toString(constants) + hilight(")"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CloneSpriteTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/CloneSpriteTreeItem.java index dc533c92c..ea2af67dc 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CloneSpriteTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/CloneSpriteTreeItem.java @@ -33,6 +33,6 @@ public class CloneSpriteTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "duplicateMovieClip(" + target.toString(constants) + "," + source.toString(constants) + "," + depth.toString(constants) + ");"; + return hilight("duplicateMovieClip(") + target.toString(constants) + hilight(",") + source.toString(constants) + hilight(",") + depth.toString(constants) + hilight(")") + ";"; } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/DecrementTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/DecrementTreeItem.java index 681864f1e..792e973b5 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/DecrementTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/DecrementTreeItem.java @@ -29,6 +29,6 @@ public class DecrementTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return object.toString(constants) + "-1"; + return object.toString(constants) + hilight("-1"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/DefineLocalTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/DefineLocalTreeItem.java index 64add81da..8215f7b7a 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/DefineLocalTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/DefineLocalTreeItem.java @@ -32,8 +32,8 @@ public class DefineLocalTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { if (value == null) { - return "var " + stripQuotes(name); + return hilight("var ") + stripQuotes(name); } - return "var " + stripQuotes(name) + "=" + value.toString(constants); + return hilight("var ") + stripQuotes(name) + hilight("=") + value.toString(constants); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/DeleteTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/DeleteTreeItem.java index 4c21c5280..2cf3a5eac 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/DeleteTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/DeleteTreeItem.java @@ -32,8 +32,8 @@ public class DeleteTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { if (object == null) { - return "delete " + propertyName.toString(constants); + return hilight("delete ") + propertyName.toString(constants); } - return "delete " + object.toString(constants) + "." + stripQuotes(propertyName); + return hilight("delete ") + object.toString(constants) + "." + stripQuotes(propertyName); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/DirectValueTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/DirectValueTreeItem.java index 3a606265e..36853f92e 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/DirectValueTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/DirectValueTreeItem.java @@ -38,41 +38,41 @@ public class DirectValueTreeItem extends TreeItem { public String toStringNoQuotes(ConstantPool constants) { if (value instanceof Double) { if (Double.compare((double) (Double) value, 0) == 0) { - return "0"; + return hilight("0"); } } if (value instanceof Float) { if (Float.compare((float) (Float) value, 0) == 0) { - return "0"; + return hilight("0"); } } if (value instanceof String) { - return (String) value; + return hilight((String) value); } if (value instanceof ConstantIndex) { - return (this.constants.get(((ConstantIndex) value).index)); + return hilight(this.constants.get(((ConstantIndex) value).index)); } - return value.toString(); + return hilight(value.toString()); } @Override public String toString(ConstantPool constants) { if (value instanceof Double) { if (Double.compare((double) (Double) value, 0) == 0) { - return "0"; + return hilight("0"); } } if (value instanceof Float) { if (Float.compare((float) (Float) value, 0) == 0) { - return "0"; + return hilight("0"); } } if (value instanceof String) { - return "\"" + Helper.escapeString((String) value) + "\""; + return hilight("\"" + Helper.escapeString((String) value) + "\""); } if (value instanceof ConstantIndex) { - return "\"" + Helper.escapeString(this.constants.get(((ConstantIndex) value).index)) + "\""; + return hilight("\"" + Helper.escapeString(this.constants.get(((ConstantIndex) value).index)) + "\""); } - return value.toString(); + return hilight(value.toString()); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ExtendsTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/ExtendsTreeItem.java index f09207f9f..4d02c2d8c 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ExtendsTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/ExtendsTreeItem.java @@ -31,6 +31,6 @@ public class ExtendsTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return subclass.toString(constants) + " extends " + stripQuotes(superclass); + return subclass.toString(constants) + hilight(" extends ") + stripQuotes(superclass); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/FSCommand2TreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/FSCommand2TreeItem.java index 2cf68bbfd..586fe717a 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/FSCommand2TreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/FSCommand2TreeItem.java @@ -38,6 +38,6 @@ public class FSCommand2TreeItem extends TreeItem { paramStr += ","; paramStr += arguments.get(t).toString(constants); } - return "FSCommand2(" + command.toString(constants) + paramStr + ");"; + return hilight("FSCommand2(") + command.toString(constants) + paramStr + hilight(")") + ";"; } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/FunctionTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/FunctionTreeItem.java index 73fa40c7b..c57749bcd 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/FunctionTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/FunctionTreeItem.java @@ -37,20 +37,20 @@ public class FunctionTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - String ret = "function"; + String ret = hilight("function"); if (calculatedFunctionName != null) { ret += " " + calculatedFunctionName.toStringNoQuotes(constants); } else if (!functionName.equals("")) { ret += " " + functionName; } - ret += "("; + ret += hilight("("); for (int p = 0; p < paramNames.size(); p++) { if (p > 0) { - ret += ", "; + ret += hilight(", "); } - ret += paramNames.get(p); + ret += hilight(paramNames.get(p)); } - ret += ")\r\n{\r\n" + Action.treeToString(actions) + "}"; + ret += hilight(")") + "\r\n{\r\n" + Action.treeToString(actions) + "}"; return ret; } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GetPropertyTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/GetPropertyTreeItem.java index f997d2882..775af0192 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/GetPropertyTreeItem.java @@ -32,8 +32,8 @@ public class GetPropertyTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { if (isEmptyString(target)) { - return Action.propertyNames[propertyIndex]; + return hilight(Action.propertyNames[propertyIndex]); } - return target.toString(constants) + "." + Action.propertyNames[propertyIndex]; + return target.toString(constants) + hilight("." + Action.propertyNames[propertyIndex]); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GetURL2TreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/GetURL2TreeItem.java index b8a4c5391..178272c1a 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GetURL2TreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/GetURL2TreeItem.java @@ -42,7 +42,7 @@ public class GetURL2TreeItem extends TreeItem { prefix = "loadMovie"; } - return prefix + "(" + urlString.toString(constants) + "," + targetString.toString(constants) + methodStr + ");"; + return hilight(prefix + "(") + urlString.toString(constants) + hilight(",") + targetString.toString(constants) + hilight(methodStr + ")") + ";"; } public GetURL2TreeItem(Action instruction, TreeItem urlString, TreeItem targetString, int method, boolean loadTargetFlag, boolean loadVariablesFlag) { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GetURLTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/GetURLTreeItem.java index 52ce189f2..85f8e9e33 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GetURLTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/GetURLTreeItem.java @@ -25,7 +25,7 @@ public class GetURLTreeItem extends TreeItem { public String targetString; public String toString(ConstantPool constants) { - return "getUrl(\"" + Helper.escapeString(urlString) + "\", \"" + Helper.escapeString(targetString) + "\");"; + return hilight("getUrl(\"") + Helper.escapeString(urlString) + "\", \"" + Helper.escapeString(targetString) + hilight("\")") + ";"; } public GetURLTreeItem(Action instruction, String urlString, String targetString) { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrame2TreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrame2TreeItem.java index a17a55b0c..64b800a14 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrame2TreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrame2TreeItem.java @@ -39,6 +39,6 @@ public class GotoFrame2TreeItem extends TreeItem { if (playFlag) { prefix = "gotoAndPlay"; } - return prefix + "(" + frame.toString(constants) + (sceneBiasFlag ? "," + sceneBias : "") + ");"; + return hilight(prefix + "(") + frame.toString(constants) + (sceneBiasFlag ? "," + sceneBias : "") + hilight(")") + ";"; } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrameTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrameTreeItem.java index 1d40583fc..b7210e71c 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrameTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrameTreeItem.java @@ -29,6 +29,6 @@ public class GotoFrameTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "gotoAndStop(" + frame + ");"; + return hilight("gotoAndStop(") + frame + hilight(")") + ";"; } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GotoLabelTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/GotoLabelTreeItem.java index c92449a75..904626f40 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GotoLabelTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/GotoLabelTreeItem.java @@ -30,6 +30,6 @@ public class GotoLabelTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "gotoAndStop(\"" + Helper.escapeString(label) + "\");"; + return hilight("gotoAndStop(\"") + Helper.escapeString(label) + hilight("\")") + ";"; } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ImplementsOpTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/ImplementsOpTreeItem.java index 9aa7657ab..16366816a 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ImplementsOpTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/ImplementsOpTreeItem.java @@ -39,6 +39,6 @@ public class ImplementsOpTreeItem extends TreeItem { } impStr += superclasses.get(i).toString(constants); } - return subclass.toString(constants) + " implements " + impStr; + return subclass.toString(constants) + hilight(" implements ") + impStr; } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/IncrementTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/IncrementTreeItem.java index 03a336801..3657ed95c 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/IncrementTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/IncrementTreeItem.java @@ -29,6 +29,6 @@ public class IncrementTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return object.toString(constants) + "+1"; + return object.toString(constants) + hilight("+1"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/InitArrayTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/InitArrayTreeItem.java index aadb42f80..117aba8f9 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/InitArrayTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/InitArrayTreeItem.java @@ -33,10 +33,10 @@ public class InitArrayTreeItem extends TreeItem { String arrStr = ""; for (int i = 0; i < values.size(); i++) { if (i > 0) { - arrStr += ","; + arrStr += hilight(","); } arrStr += values.get(i).toString(constants); } - return "[" + arrStr + "]"; + return hilight("[") + arrStr + hilight("]"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/InitObjectTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/InitObjectTreeItem.java index ea0e5df5a..395ace3ff 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/InitObjectTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/InitObjectTreeItem.java @@ -35,10 +35,10 @@ public class InitObjectTreeItem extends TreeItem { String objStr = ""; for (int i = 0; i < values.size(); i++) { if (i > 0) { - objStr += ","; + objStr += hilight(","); } - objStr += names.get(i).toString(constants) + ":" + values.get(i).toString(constants); + objStr += names.get(i).toString(constants) + hilight(":") + values.get(i).toString(constants); } - return "{" + objStr + "}"; + return hilight("{") + objStr + hilight("}"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/MBAsciiToCharTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/MBAsciiToCharTreeItem.java index a23494cb2..b13af4c7d 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/MBAsciiToCharTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/MBAsciiToCharTreeItem.java @@ -29,6 +29,6 @@ public class MBAsciiToCharTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "mbord(" + value.toString(constants) + ")"; + return hilight("mbord(") + value.toString(constants) + hilight(")"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/MBCharToAsciiTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/MBCharToAsciiTreeItem.java index 5085fc1c9..a412ab0ef 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/MBCharToAsciiTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/MBCharToAsciiTreeItem.java @@ -29,6 +29,6 @@ public class MBCharToAsciiTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "mbchr(" + value.toString(constants) + ")"; + return hilight("mbchr(") + value.toString(constants) + hilight(")"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/MBStringExtractTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/MBStringExtractTreeItem.java index f7eb7176d..25ebc9a52 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/MBStringExtractTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/MBStringExtractTreeItem.java @@ -33,6 +33,6 @@ public class MBStringExtractTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "mbsubstring(" + value.toString(constants) + "," + index.toString(constants) + "," + count.toString(constants) + ")"; + return hilight("mbsubstring(") + value.toString(constants) + hilight(",") + index.toString(constants) + hilight(",") + count.toString(constants) + hilight(")"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/NewMethodTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/NewMethodTreeItem.java index 377c96830..23575b3c6 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/NewMethodTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/NewMethodTreeItem.java @@ -61,6 +61,6 @@ public class NewMethodTreeItem extends TreeItem { if (blankMethod) { return scriptObject.toString(constants) + "(" + paramStr + ")"; } - return "new " + scriptObject.toString(constants) + "." + methodNameStr + "(" + paramStr + ")"; + return hilight("new ") + scriptObject.toString(constants) + hilight(".") + methodNameStr + hilight("(") + paramStr + hilight(")"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/NewObjectTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/NewObjectTreeItem.java index 71d7bfa85..8ea863de5 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/NewObjectTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/NewObjectTreeItem.java @@ -39,6 +39,6 @@ public class NewObjectTreeItem extends TreeItem { } paramStr += arguments.get(t).toString(constants); } - return "new " + stripQuotes(objectName) + "(" + paramStr + ")"; + return hilight("new ") + stripQuotes(objectName) + hilight("(") + paramStr + hilight(")"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/RandomNumberTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/RandomNumberTreeItem.java index db0a35291..e35a5ec0b 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/RandomNumberTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/RandomNumberTreeItem.java @@ -29,6 +29,6 @@ public class RandomNumberTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "random(" + maximum.toString(constants) + ")"; + return hilight("random(") + maximum.toString(constants) + hilight(")"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/RemoveSpriteTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/RemoveSpriteTreeItem.java index 911f0833a..0ddf09608 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/RemoveSpriteTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/RemoveSpriteTreeItem.java @@ -29,6 +29,6 @@ public class RemoveSpriteTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "removeMovieClip(" + target.toString(constants) + ");"; + return hilight("removeMovieClip(") + target.toString(constants) + hilight(")") + ";"; } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ReturnTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/ReturnTreeItem.java index 287c0a760..da2c736f0 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ReturnTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/ReturnTreeItem.java @@ -29,6 +29,6 @@ public class ReturnTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "return " + value.toString(constants) + ";"; + return hilight("return ") + value.toString(constants) + ";"; } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/SetMemberTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/SetMemberTreeItem.java index 2e3260ba7..b64633bc8 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/SetMemberTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/SetMemberTreeItem.java @@ -18,7 +18,7 @@ package com.jpexs.asdec.action.treemodel; import com.jpexs.asdec.action.Action; -public class SetMemberTreeItem extends TreeItem implements SetTypeTreeItem{ +public class SetMemberTreeItem extends TreeItem implements SetTypeTreeItem { public TreeItem object; public TreeItem objectName; @@ -40,6 +40,4 @@ public class SetMemberTreeItem extends TreeItem implements SetTypeTreeItem{ public TreeItem getObject() { return new GetMemberTreeItem(instruction, object, objectName); } - - } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/SetPropertyTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/SetPropertyTreeItem.java index dd84e6a37..ce882815f 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/SetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/SetPropertyTreeItem.java @@ -18,7 +18,7 @@ package com.jpexs.asdec.action.treemodel; import com.jpexs.asdec.action.Action; -public class SetPropertyTreeItem extends TreeItem implements SetTypeTreeItem{ +public class SetPropertyTreeItem extends TreeItem implements SetTypeTreeItem { public TreeItem target; public int propertyIndex; @@ -34,15 +34,13 @@ public class SetPropertyTreeItem extends TreeItem implements SetTypeTreeItem{ @Override public String toString(ConstantPool constants) { if (isEmptyString(target)) { - return Action.propertyNames[propertyIndex] + "=" + value.toString(constants) + ";"; + return hilight(Action.propertyNames[propertyIndex] + "=") + value.toString(constants) + ";"; } - return target.toString(constants) + "." + Action.propertyNames[propertyIndex] + "=" + value.toString(constants) + ";"; + return target.toString(constants) + hilight("." + Action.propertyNames[propertyIndex] + "=") + value.toString(constants) + ";"; } @Override public TreeItem getObject() { return new GetPropertyTreeItem(instruction, target, propertyIndex); } - - } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/SetTarget2TreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/SetTarget2TreeItem.java index 97687958f..a7e64c6de 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/SetTarget2TreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/SetTarget2TreeItem.java @@ -29,6 +29,6 @@ public class SetTarget2TreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "tellTarget(" + target.toString(constants) + ");"; + return hilight("tellTarget(") + target.toString(constants) + hilight(")") + ";"; } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/SetTargetTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/SetTargetTreeItem.java index 3ba23b729..2bdb6ec23 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/SetTargetTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/SetTargetTreeItem.java @@ -30,6 +30,6 @@ public class SetTargetTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "tellTarget(\"" + Helper.escapeString(target) + "\");"; + return hilight("tellTarget(\"") + Helper.escapeString(target) + hilight("\")") + ";"; } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/SetTypeTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/SetTypeTreeItem.java index 5163c6475..7081d9381 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/SetTypeTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/SetTypeTreeItem.java @@ -21,5 +21,6 @@ package com.jpexs.asdec.action.treemodel; * @author JPEXS */ public interface SetTypeTreeItem { + public TreeItem getObject(); } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/StartDragTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/StartDragTreeItem.java index d1e460b0e..5dd951674 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/StartDragTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/StartDragTreeItem.java @@ -54,6 +54,6 @@ public class StartDragTreeItem extends TreeItem { } } } - return "startDrag(" + target.toString(constants) + "," + lockCenter.toString(constants) + (hasConstrains ? "," + x1.toString(constants) + "," + y1.toString(constants) + "," + x2.toString(constants) + "," + y2.toString(constants) : "") + ")"; + return hilight("startDrag(") + target.toString(constants) + hilight(",") + lockCenter.toString(constants) + (hasConstrains ? hilight(",") + x1.toString(constants) + hilight(",") + y1.toString(constants) + hilight(",") + x2.toString(constants) + hilight(",") + y2.toString(constants) : "") + hilight(")"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/StoreRegisterTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/StoreRegisterTreeItem.java index 5d6b79609..7ef4e6103 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/StoreRegisterTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/StoreRegisterTreeItem.java @@ -32,7 +32,7 @@ public class StoreRegisterTreeItem extends TreeItem implements SetTypeTreeItem { @Override public String toString(ConstantPool constants) { - return register.toString() + "=" + value.toString(constants) + ";"; + return hilight(register.toString() + "=") + value.toString(constants) + ";"; } @Override diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ThrowTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/ThrowTreeItem.java index 69b5c141c..d2d28afce 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ThrowTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/ThrowTreeItem.java @@ -29,6 +29,6 @@ public class ThrowTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "throw " + object.toString(constants) + ";"; + return hilight("throw ") + object.toString(constants) + ";"; } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ToIntegerTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/ToIntegerTreeItem.java index bdef272c8..cc31a1a32 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ToIntegerTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/ToIntegerTreeItem.java @@ -29,6 +29,6 @@ public class ToIntegerTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "int(" + value.toString(constants) + ")"; + return hilight("int(") + value.toString(constants) + hilight(")"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ToNumberTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/ToNumberTreeItem.java index 146905657..5ccb963dc 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ToNumberTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/ToNumberTreeItem.java @@ -29,6 +29,6 @@ public class ToNumberTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return value.toString(constants) + ".valueOf()"; + return value.toString(constants) + hilight(".valueOf()"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ToStringTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/ToStringTreeItem.java index 10f3dbe42..45865172a 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ToStringTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/ToStringTreeItem.java @@ -29,6 +29,6 @@ public class ToStringTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return value.toString(constants) + ".toString()"; + return value.toString(constants) + hilight(".toString()"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/TraceTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/TraceTreeItem.java index 6eca5a962..ea39fef81 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/TraceTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/TraceTreeItem.java @@ -29,6 +29,6 @@ public class TraceTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "trace(" + value.toString(constants) + ");"; + return hilight("trace(") + value.toString(constants) + hilight(")") + ";"; } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/TreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/TreeItem.java index ef7998484..2ffbef7ac 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/TreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/TreeItem.java @@ -87,7 +87,7 @@ public abstract class TreeItem { protected String stripQuotes(TreeItem target) { if (target instanceof DirectValueTreeItem) { if (((DirectValueTreeItem) target).value instanceof String) { - return (String) ((DirectValueTreeItem) target).value; + return (String) ((DirectValueTreeItem) target).hilight((String) ((DirectValueTreeItem) target).value); } } if (target == null) { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/TypeOfTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/TypeOfTreeItem.java index f47457628..e9a8fcd38 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/TypeOfTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/TypeOfTreeItem.java @@ -29,6 +29,6 @@ public class TypeOfTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "typeof(" + value.toString(constants) + ")"; + return hilight("typeof(") + value.toString(constants) + hilight(")"); } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrame2TreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrame2TreeItem.java index 74f8e9291..73838a596 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrame2TreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrame2TreeItem.java @@ -31,6 +31,6 @@ public class WaitForFrame2TreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "waitForFrame2(" + frame.toString(constants) + "," + skipCount + ");"; + return hilight("waitForFrame2(") + frame.toString(constants) + "," + skipCount + hilight(")") + ";"; } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrameTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrameTreeItem.java index 7269074c7..5a3bbc0d6 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrameTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrameTreeItem.java @@ -31,6 +31,6 @@ public class WaitForFrameTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - return "waitForFrame(" + frame + "," + skipCount + ");"; + return hilight("waitForFrame(") + frame + "," + skipCount + hilight(")") + ";"; } } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ClassTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ClassTreeItem.java index a386aded3..9e51c64fa 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ClassTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ClassTreeItem.java @@ -35,26 +35,26 @@ public class ClassTreeItem extends TreeItem implements Block { public HashMap vars; public HashMap staticVars; - public ClassTreeItem(TreeItem className, TreeItem extendsOp, List implementsOp, List functions, HashMap vars,List staticFunctions,HashMap staticVars) { + public ClassTreeItem(TreeItem className, TreeItem extendsOp, List implementsOp, List functions, HashMap vars, List staticFunctions, HashMap staticVars) { super(null, NOPRECEDENCE); this.className = className; this.functions = functions; this.vars = vars; this.extendsOp = extendsOp; this.implementsOp = implementsOp; - this.staticFunctions=staticFunctions; - this.staticVars=staticVars; + this.staticFunctions = staticFunctions; + this.staticVars = staticVars; } @Override public String toString(ConstantPool constants) { String ret; - ret = "class " + className.toStringNoQuotes(constants); + ret = hilight("class ") + className.toStringNoQuotes(constants); if (extendsOp != null) { - ret += " extends " + extendsOp.toStringNoQuotes(constants); + ret += hilight(" extends ") + extendsOp.toStringNoQuotes(constants); } if (!implementsOp.isEmpty()) { - ret += " implements "; + ret += hilight(" implements "); boolean first = true; for (TreeItem t : implementsOp) { if (!first) { @@ -69,7 +69,7 @@ public class ClassTreeItem extends TreeItem implements Block { ret += f.toString(constants) + "\r\n"; } for (FunctionTreeItem f : staticFunctions) { - ret += "static "+f.toString(constants) + "\r\n"; + ret += "static " + f.toString(constants) + "\r\n"; } for (TreeItem v : vars.keySet()) { ret += "var " + v.toStringNoQuotes(constants) + " = " + vars.get(v).toStringNoQuotes(constants) + ";\r\n"; diff --git a/trunk/src/com/jpexs/asdec/gui/MainFrame.java b/trunk/src/com/jpexs/asdec/gui/MainFrame.java index 24f3640a9..139e6aebe 100644 --- a/trunk/src/com/jpexs/asdec/gui/MainFrame.java +++ b/trunk/src/com/jpexs/asdec/gui/MainFrame.java @@ -233,7 +233,6 @@ public class MainFrame extends JFrame implements ActionListener { menuDeobfuscation.add(miRenameIdentifiers); - JMenu menuTools = new JMenu("Tools"); JMenuItem miProxy = new JMenuItem("Proxy"); miProxy.setActionCommand("SHOWPROXY"); @@ -313,7 +312,6 @@ public class MainFrame extends JFrame implements ActionListener { } - loadingPanel.setPreferredSize(new Dimension(30, 30)); statusPanel = new JPanel(); statusPanel.setPreferredSize(new Dimension(1, 30)); diff --git a/trunk/src/com/jpexs/asdec/gui/TagPanel.java b/trunk/src/com/jpexs/asdec/gui/TagPanel.java index e73efbb4a..189964f25 100644 --- a/trunk/src/com/jpexs/asdec/gui/TagPanel.java +++ b/trunk/src/com/jpexs/asdec/gui/TagPanel.java @@ -26,11 +26,6 @@ import com.jpexs.asdec.tags.DefineBitsLosslessTag; import com.jpexs.asdec.tags.DefineBitsTag; import com.jpexs.asdec.tags.DefineMorphShape2Tag; import com.jpexs.asdec.tags.DefineMorphShapeTag; -import com.jpexs.asdec.tags.DefineShape2Tag; -import com.jpexs.asdec.tags.DefineShape3Tag; -import com.jpexs.asdec.tags.DefineShape4Tag; -import com.jpexs.asdec.tags.DefineShapeTag; -import com.jpexs.asdec.tags.DefineSpriteTag; import com.jpexs.asdec.tags.DefineTextTag; import com.jpexs.asdec.tags.EndTag; import com.jpexs.asdec.tags.JPEGTablesTag; diff --git a/trunk/src/com/jpexs/asdec/types/shaperecords/SHAPERECORD.java b/trunk/src/com/jpexs/asdec/types/shaperecords/SHAPERECORD.java index 03b420d74..ad66fce6e 100644 --- a/trunk/src/com/jpexs/asdec/types/shaperecords/SHAPERECORD.java +++ b/trunk/src/com/jpexs/asdec/types/shaperecords/SHAPERECORD.java @@ -22,10 +22,8 @@ import com.jpexs.asdec.types.LINESTYLE; import com.jpexs.asdec.types.LINESTYLE2; import com.jpexs.asdec.types.LINESTYLEARRAY; import com.jpexs.asdec.types.RECT; -import com.jpexs.asdec.types.RGB; import java.util.ArrayList; import java.util.List; -import java.util.Random; import java.util.logging.Level; import java.util.logging.Logger;