From 65dc4d50df9b839c8cb0f3024c8cbb5feb811627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= Date: Sun, 25 Aug 2013 17:15:23 +0200 Subject: [PATCH] removed old duplicated files (probably left after merge) --- .../avm2/model/NewFunctionAVM2Item.java.orig | 43 ----------- .../model/FSCommandActionItem.java.orig | 52 ------------- .../LoadVariablesNumActionItem.java.orig | 75 ------------------- .../model/UnLoadMovieNumActionItem.java.orig | 64 ---------------- 4 files changed, 234 deletions(-) delete mode 100644 trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java.orig delete mode 100644 trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java.orig delete mode 100644 trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java.orig delete mode 100644 trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java.orig diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java.orig b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java.orig deleted file mode 100644 index fc61430d9..000000000 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java.orig +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2010-2013 JPEXS - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.jpexs.decompiler.flash.abc.avm2.model; - -import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; -import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import java.util.HashMap; -import java.util.List; - -public class NewFunctionAVM2Item extends AVM2Item { - - public String paramStr; - public String returnStr; - public String functionBody; - public String functionName; - - public NewFunctionAVM2Item(AVM2Instruction instruction, String functionName, String paramStr, String returnStr, String functionBody) { - super(instruction, PRECEDENCE_PRIMARY); - this.paramStr = paramStr; - this.returnStr = returnStr; - this.functionBody = functionBody; - this.functionName = functionName; - } - - @Override - public String toString(boolean highlight, ConstantPool constants, HashMap localRegNames, List fullyQualifiedNames) { - return hilight("function" + (!functionName.equals("") ? " " + functionName : "") + "(" + paramStr + "):" + returnStr, highlight) + "\r\n" + hilight("{", highlight) + "\r\n" + hilight(functionBody, highlight) + "\r\n" + hilight("}", highlight); - } -} diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java.orig b/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java.orig deleted file mode 100644 index 35109a05f..000000000 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java.orig +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2013 JPEXS - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.jpexs.decompiler.flash.action.model; - -import com.jpexs.decompiler.flash.action.swf3.ActionGetURL; -import com.jpexs.decompiler.graph.GraphSourceItem; -import com.jpexs.decompiler.graph.SourceGenerator; -import com.jpexs.helpers.Helper; -import java.util.List; - -/** - * - * @author JPEXS - */ -public class FSCommandActionItem extends ActionItem { - - private String command; - - public FSCommandActionItem(GraphSourceItem instruction, String command) { - super(instruction, PRECEDENCE_PRIMARY); - this.command = command; - } - - @Override - public String toString(boolean highlight, ConstantPool constants) { - return hilight("fscommand(\"", highlight) + hilight(Helper.escapeString(command), highlight) + hilight("\", highlight)", highlight); - } - - @Override - public List toSource(List localData, SourceGenerator generator) { - return toSourceMerge(localData, generator, new ActionGetURL("FSCommand:" + command, "")); - } - - @Override - public boolean hasReturnValue() { - return false; - } -} diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java.orig b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java.orig deleted file mode 100644 index 3c3917cfd..000000000 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java.orig +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (C) 2013 JPEXS - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.jpexs.decompiler.flash.action.model; - -import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; -import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; -import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; -import com.jpexs.decompiler.graph.GraphSourceItem; -import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.graph.SourceGenerator; -import java.util.ArrayList; -import java.util.List; - -/** - * - * @author JPEXS - */ -public class LoadVariablesNumActionItem extends ActionItem { - - private GraphTargetItem urlString; - private GraphTargetItem num; - private int method; - - @Override - public List getAllSubItems() { - List ret = new ArrayList<>(); - ret.add(urlString); - ret.add(num); - return ret; - } - - public LoadVariablesNumActionItem(GraphSourceItem instruction, GraphTargetItem urlString, GraphTargetItem num, int method) { - super(instruction, PRECEDENCE_PRIMARY); - this.urlString = urlString; - this.num = num; - this.method = method; - } - - @Override - public String toString(boolean highlight, ConstantPool constants) { - String methodStr = ""; - if (method == 1) { - methodStr = ",\"GET\""; - } - if (method == 2) { - methodStr = ",\"POST\""; - } - return hilight("loadVariablesNum(", highlight) + urlString.toString(highlight, constants) + hilight(",", highlight) + hilight("" + num, highlight) + hilight(methodStr + ")", highlight); - } - - @Override - public List toSource(List localData, SourceGenerator generator) { - ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; - return toSourceMerge(localData, generator, urlString, new AddActionItem(src, asGenerator.pushConstTargetItem("_level"), num, true), new ActionGetURL2(method, false, true)); - } - - @Override - public boolean hasReturnValue() { - return false; - } -} diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java.orig b/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java.orig deleted file mode 100644 index 23c08e40d..000000000 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java.orig +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2013 JPEXS - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.jpexs.decompiler.flash.action.model; - -import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; -import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; -import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; -import com.jpexs.decompiler.flash.action.swf4.ActionPush; -import com.jpexs.decompiler.graph.GraphSourceItem; -import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.graph.SourceGenerator; -import java.util.ArrayList; -import java.util.List; - -/** - * - * @author JPEXS - */ -public class UnLoadMovieNumActionItem extends ActionItem { - - private GraphTargetItem num; - - @Override - public List getAllSubItems() { - List ret = new ArrayList<>(); - ret.add(num); - return ret; - } - - public UnLoadMovieNumActionItem(GraphSourceItem instruction, GraphTargetItem num) { - super(instruction, PRECEDENCE_PRIMARY); - this.num = num; - } - - @Override - public String toString(boolean highlight, ConstantPool constants) { - return hilight("unloadMovieNum(", highlight) + hilight("" + num, highlight) + hilight(")", highlight); - } - - @Override - public List toSource(List localData, SourceGenerator generator) { - ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; - return toSourceMerge(localData, generator, new ActionPush(""), new AddActionItem(src, asGenerator.pushConstTargetItem("_level"), num, true), new ActionGetURL2(0, true, false)); - } - - @Override - public boolean hasReturnValue() { - return false; - } -}