From 11713e6a622aae92fda37d83a84bcfc1375b8394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= Date: Sat, 26 Jan 2013 20:34:47 +0100 Subject: [PATCH] AS3 XML fix, jump trait fix --- .../jpexs/asdec/abc/avm2/treemodel/ConstructPropTreeItem.java | 2 +- .../com/jpexs/asdec/abc/avm2/treemodel/ConstructTreeItem.java | 1 - trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java | 4 +--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructPropTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructPropTreeItem.java index e15591bcf..c73571261 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructPropTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructPropTreeItem.java @@ -46,7 +46,7 @@ public class ConstructPropTreeItem extends TreeItem { String objstr = object.toString(constants, localRegNames, fullyQualifiedNames); if (!objstr.equals("")) { objstr += "."; - } + } return hilight("new ") + objstr + propertyName.toString(constants, localRegNames, fullyQualifiedNames) + hilight("(") + argStr + hilight(")"); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructTreeItem.java index b455569ae..b0c55119b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructTreeItem.java @@ -45,7 +45,6 @@ public class ConstructTreeItem extends TreeItem { return object.toString(constants, localRegNames, fullyQualifiedNames); } String obStr = object.toString(constants, localRegNames, fullyQualifiedNames); - obStr = "(" + obStr + ")"; return hilight("new ") + obStr + hilight("(") + argStr + hilight(")"); } diff --git a/trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java b/trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java index eb639ea6a..ff4f33ec2 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java @@ -218,9 +218,7 @@ public class DecompiledEditorPane extends LineMarkedEditorPane implements CaretL new Timer().schedule(new TimerTask() { public void run() { try { - ignoreCarret=true; - setCaretPosition(pos); - ignoreCarret=false; + setCaretPosition(pos); } catch (IllegalArgumentException iae) { } }