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

Issue #67 Fixed skipping rename occasionally

Browse Source
This commit is contained in:
Jindra Petk
2013-06-22 19:25:08 +02:00
parent d9bbc1b214
commit 43ffd2ce51
2 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
trunk/src/com/jpexs/decompiler/flash/SWF.java
View File

@@ -1359,21 +1359,32 @@ public class SWF {
String name = ti.toStringNoH(allVariableNames.get(ti));
String changed = deobfuscateName(deobfuscated, name, false);
if (changed != null) {
/*boolean addNew=false;
for (DirectValueTreeItem snv : stringsNoVar.keySet()) {
if (stringsNoVar.get(snv) == allVariableNames.get(ti)) { //Same constantpool
if(snv.toStringNoH(stringsNoVar.get(snv)).equals(name)){ //Same string
addNew = true;
break;
}
}
}*/
boolean addNew = false;
for (DirectValueTreeItem snv : stringsNoVar.keySet()) {
if (stringsNoVar.get(snv) == allVariableNames.get(ti)) { //Same constantpool
if (snv.toStringNoH(stringsNoVar.get(snv)).equals(name)) { //Same string
addNew = true;
break;
}
}
}
ActionPush pu = (ActionPush) ti.src;
if (pu.replacement == null) {
pu.replacement = new ArrayList<>();
pu.replacement.addAll(pu.values);
}
pu.replacement.set(ti.pos, changed);
if (pu.replacement.get(ti.pos) instanceof ConstantIndex) {
ConstantIndex ci = (ConstantIndex) pu.replacement.get(ti.pos);
ConstantPool pool = allVariableNames.get(ti);
if (addNew) {
pool.constants.add(changed);
ci.index = pool.constants.size() - 1;
} else {
pool.constants.set(ci.index, changed);
}
} else {
pu.replacement.set(ti.pos, changed);
}
ret++;
}
}

11
trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java
View File

@@ -22,6 +22,7 @@ import com.jpexs.decompiler.flash.graph.GraphSourceItem;
import com.jpexs.decompiler.flash.graph.GraphTargetItem;
import com.jpexs.decompiler.flash.helpers.Helper;
import java.util.List;
import java.util.Objects;
public class DirectValueTreeItem extends TreeItem {
@@ -194,7 +195,6 @@ public class DirectValueTreeItem extends TreeItem {
@Override
public int hashCode() {
int hash = 7;
hash = 97 * hash + (this.value != null ? this.value.hashCode() : 0);
return hash;
}
@@ -207,9 +207,16 @@ public class DirectValueTreeItem extends TreeItem {
return false;
}
final DirectValueTreeItem other = (DirectValueTreeItem) obj;
if (this.value != other.value && (this.value == null || !this.value.equals(other.value))) {
if (!Objects.equals(this.value, other.value)) {
return false;
}
if (!Objects.equals(this.constants, other.constants)) {
return false;
}
if(other.pos!=this.pos){
return false;
}
return true;
}
}