LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-01 10:55:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge fixes

Browse Source
This commit is contained in:
honfika@gmail.com
2015-07-03 20:48:23 +02:00
parent 3494556c52
commit 6f4da26453
2 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java
View File

@@ -74,9 +74,9 @@ import com.jpexs.decompiler.graph.model.CommentItem;
import com.jpexs.decompiler.graph.model.IfItem;
import com.jpexs.decompiler.graph.model.LocalData;
import com.jpexs.decompiler.graph.model.NotItem;
import com.jpexs.helpers.ByteArrayRange;
import com.jpexs.decompiler.graph.model.PopItem;
import com.jpexs.decompiler.graph.model.ScriptEndItem;
import com.jpexs.helpers.ByteArrayRange;
import com.jpexs.helpers.CancellableWorker;
import com.jpexs.helpers.Helper;
import java.io.ByteArrayOutputStream;
@@ -997,15 +997,9 @@ public abstract class Action implements GraphSourceItem {
List<GraphTargetItem> tryCommands = ActionGraph.translateViaGraph(registerNames, variables, functions, atry.tryBody, version);
ActionItem catchName;
if (atry.catchInRegisterFlag) {
<<<<<<< HEAD
catchName = new DirectValueActionItem(atry, -1, new RegisterNumber(atry.catchRegister), new ArrayList<>());
} else {
catchName = new DirectValueActionItem(atry, -1, atry.catchName, new ArrayList<>());
=======
catchName = new DirectValueActionItem(atry, -1, new RegisterNumber(atry.catchRegister), new ArrayList<String>());
} else {
catchName = new DirectValueActionItem(atry, -1, atry.catchName, new ArrayList<String>());
>>>>>>> v6
}
List<GraphTargetItem> catchExceptions = new ArrayList<GraphTargetItem>();
catchExceptions.add(catchName);

16
libsrc/ffdec_lib/src/com/jpexs/helpers/Helper.java
View File

@@ -143,13 +143,8 @@ public class Helper {
}
/**
* <<<<<<< HEAD
* Formats specified address to four numbers xxxx (or five numbers when
* showing decimal addresses)
* =======
* Formats specified address to four numbers xxxx
* (or five numbers when showing decimal addresses)
* >>>>>>> v6
*
* @param number Address to format
* @return String representation of the address
@@ -159,13 +154,8 @@ public class Helper {
}
/**
* <<<<<<< HEAD
* Formats specified address to four numbers xxxx (or five numbers when
* showing decimal addresses)
* =======
* Formats specified address to four numbers xxxx
* (or five numbers when showing decimal addresses)
* >>>>>>> v6
*
* @param number Address to format
* @param decimal Use decimal format
@@ -292,12 +282,7 @@ public class Helper {
* character.</li>
* </ul>
*
* <<<<<<< HEAD
*
* @param st A string optionally containing standard java escape sequences.
* =======
* @param st A string optionally containing standard java escape sequences.
* >>>>>>> v6
* @return The translated string.
*/
public static String unescapeJavaString(String st) {
@@ -1362,5 +1347,4 @@ public class Helper {
}
return data;
}
}