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

precedence field is protected now

Browse Source
This commit is contained in:
Honfika
2013-12-27 15:07:07 +01:00
parent 6b1ebb910c
commit ff6f875c07
18 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java
View File

@@ -49,7 +49,7 @@ public abstract class AVM2Item extends GraphTargetItem {
}
if (!empty) {
if (object.precedence > PRECEDENCE_PRIMARY) {
if (object.getPrecedence() > PRECEDENCE_PRIMARY) {
writer.append("(");
object.toString(writer, localData);
writer.append(")");

2
trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java
View File

@@ -44,7 +44,7 @@ public class CallAVM2Item extends AVM2Item {
if (receiver instanceof ThisAVM2Item) {
recPart = "";
}*/
if (function.precedence > precedence) {
if (function.getPrecedence() > precedence) {
writer.append("(");
function.toString(writer, localData);
writer.append(")");

2
trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/DeclarationAVM2Item.java
View File

@@ -35,7 +35,7 @@ public class DeclarationAVM2Item extends AVM2Item {
public String type;
public DeclarationAVM2Item(GraphTargetItem assignment, String type) {
super(assignment.src, assignment.precedence);
super(assignment.src, assignment.getPrecedence());
this.type = type;
this.assignment = assignment;
}

4
trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java
View File

@@ -32,8 +32,8 @@ public class AddAVM2Item extends BinaryOpItem {
@Override
protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
if (rightSide.precedence >= precedence) { //string + vs number +
if (leftSide.precedence > precedence) {
if (rightSide.getPrecedence() >= precedence) { //string + vs number +
if (leftSide.getPrecedence() > precedence) {
writer.append("(");
leftSide.toString(writer, localData);
writer.append(")");

4
trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DivideAVM2Item.java
View File

@@ -39,8 +39,8 @@ public class DivideAVM2Item extends BinaryOpItem {
@Override
protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
if (rightSide.precedence >= precedence) { // >= add or subtract too
if (leftSide.precedence > precedence) {
if (rightSide.getPrecedence() >= precedence) { // >= add or subtract too
if (leftSide.getPrecedence() > precedence) {
writer.append("(");
leftSide.toString(writer, localData);
writer.append(")");

4
trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/ModuloAVM2Item.java
View File

@@ -39,8 +39,8 @@ public class ModuloAVM2Item extends BinaryOpItem {
@Override
protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
if (rightSide.precedence >= precedence) { // >= add or subtract too
if (leftSide.precedence > precedence) {
if (rightSide.getPrecedence() >= precedence) { // >= add or subtract too
if (leftSide.getPrecedence() > precedence) {
writer.append("(");
leftSide.toString(writer, localData);
writer.append(")");

2
trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/MultiplyAVM2Item.java
View File

@@ -37,7 +37,7 @@ public class MultiplyAVM2Item extends BinaryOpItem {
@Override
protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
if (rightSide instanceof ModuloAVM2Item) {
if (leftSide.precedence > precedence) {
if (leftSide.getPrecedence() > precedence) {
writer.append("(");
leftSide.toString(writer, localData);
writer.append(")");

4
trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/SubtractAVM2Item.java
View File

@@ -36,8 +36,8 @@ public class SubtractAVM2Item extends BinaryOpItem {
@Override
protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
if (rightSide.precedence >= precedence) { // >= add or subtract too
if (leftSide.precedence > precedence) {
if (rightSide.getPrecedence() >= precedence) { // >= add or subtract too
if (leftSide.getPrecedence() > precedence) {
writer.append("(");
leftSide.toString(writer, localData);
writer.append(")");

2
trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java
View File

@@ -62,7 +62,7 @@ public class CallMethodActionItem extends ActionItem {
}
}
if (!blankMethod) {
if (scriptObject.precedence > this.precedence) {
if (scriptObject.getPrecedence() > this.precedence) {
writer.append("(");
scriptObject.toString(writer, localData);
writer.append(")");

2
trunk/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java
View File

@@ -36,7 +36,7 @@ public class MBStringLengthActionItem extends ActionItem {
@Override
protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
writer.append("mblength(");
if (value.precedence > precedence) {
if (value.getPrecedence() > precedence) {
writer.append("(");
value.toString(writer, localData);
writer.append(")");

2
trunk/src/com/jpexs/decompiler/flash/action/model/TemporaryRegister.java
View File

@@ -31,7 +31,7 @@ public class TemporaryRegister extends GraphTargetItem {
private int regId;
public TemporaryRegister(int regId, GraphTargetItem value) {
super(value.src, value.precedence);
super(value.src, value.getPrecedence());
this.value = value;
this.regId = regId;
}

4
trunk/src/com/jpexs/decompiler/flash/action/model/operations/AddActionItem.java
View File

@@ -39,9 +39,9 @@ public class AddActionItem extends BinaryOpItem {
@Override
protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
if (rightSide.precedence >= precedence) { //string + vs number +
if (rightSide.getPrecedence() >= precedence) { //string + vs number +
String ret = "";
if (leftSide.precedence > precedence) {
if (leftSide.getPrecedence() > precedence) {
writer.append("(");
leftSide.toString(writer, localData);
writer.append(")");

4
trunk/src/com/jpexs/decompiler/flash/action/model/operations/SubtractActionItem.java
View File

@@ -39,9 +39,9 @@ public class SubtractActionItem extends BinaryOpItem {
@Override
protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
if (rightSide.precedence >= precedence) { // >= add or subtract too
if (rightSide.getPrecedence() >= precedence) { // >= add or subtract too
String ret = "";
if (leftSide.precedence > precedence) {
if (leftSide.getPrecedence() > precedence) {
writer.append("(");
leftSide.toString(writer, localData);
writer.append(")");

6
trunk/src/com/jpexs/decompiler/flash/gui/SelectLanguageDialog.java
View File

@@ -43,7 +43,7 @@ public class SelectLanguageDialog extends AppDialog implements ActionListener {
JComboBox<Language> languageCombobox = new JComboBox<>();
public String languageCode = null;
private String[] languages = new String[]{"en", "cs", "zh", "de", "es", "hu", "nl", "pt", "ru", "sv", "uk"};
private static String[] languages = new String[]{"en", "cs", "zh", "de", "es", "hu", "nl", "pt", "ru", "sv", "uk"};
public SelectLanguageDialog() {
setSize(350, 130);
@@ -133,6 +133,10 @@ public class SelectLanguageDialog extends AppDialog implements ActionListener {
Main.reloadApp();
}
public static String[] getAvailableLanguages() {
return languages;
}
public String display() {
setVisible(true);
return languageCode;

2
trunk/src/com/jpexs/decompiler/flash/gui/locales/FontEmbedDialog_de.properties
View File

@@ -15,4 +15,4 @@
range.description = %name% (%available% von %total% Buchstaben)
dialog.title = Schriftarten einbetten
label.idividual = Individelle Buchstaben:
label.individual = Individelle Buchstaben:

2
trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java
View File

@@ -51,7 +51,7 @@ public abstract class GraphTargetItem implements Serializable {
public static final int NOPRECEDENCE = 16;
public GraphSourceItem src;
public int pos = -1;
public int precedence;
protected int precedence;
public List<GraphSourceItemPos> moreSrc = new ArrayList<>();
public GraphPart firstPart;
public GraphTargetItem value;

2
trunk/src/com/jpexs/decompiler/graph/model/DuplicateItem.java
View File

@@ -30,7 +30,7 @@ import java.util.Set;
public class DuplicateItem extends GraphTargetItem {
public DuplicateItem(GraphSourceItem src, GraphTargetItem value) {
super(src, value.precedence);
super(src, value.getPrecedence());
this.value = value;
}

2
trunk/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java
View File

@@ -38,7 +38,7 @@ public abstract class UnaryOpItem extends GraphTargetItem implements UnaryOp {
protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
writer.append(operator);
if (value != null) {
if (value.precedence > precedence) {
if (value.getPrecedence() > precedence) {
writer.append("(");
value.toString(writer, localData);
writer.append(")");