diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java index fb2c5232d..c0d79d468 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java @@ -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(")"); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java index 5bba9def2..38a2a03f7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java @@ -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(")"); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/DeclarationAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/DeclarationAVM2Item.java index 5a72b5b00..6f4386dec 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/DeclarationAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/DeclarationAVM2Item.java @@ -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; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java index 89e52afa5..826a7ba6d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java @@ -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(")"); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DivideAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DivideAVM2Item.java index 2396d5b27..1821d330b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DivideAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DivideAVM2Item.java @@ -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(")"); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/ModuloAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/ModuloAVM2Item.java index 04c6d3ea9..24107a256 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/ModuloAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/ModuloAVM2Item.java @@ -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(")"); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/MultiplyAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/MultiplyAVM2Item.java index 85c3a7005..a499d9cb3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/MultiplyAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/MultiplyAVM2Item.java @@ -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(")"); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/SubtractAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/SubtractAVM2Item.java index 1a1b78b6c..acb699c01 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/SubtractAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/SubtractAVM2Item.java @@ -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(")"); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java index d4205474b..332488e97 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java @@ -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(")"); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java index 9db260cea..6acc67822 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java @@ -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(")"); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/TemporaryRegister.java b/trunk/src/com/jpexs/decompiler/flash/action/model/TemporaryRegister.java index 366e0d4a9..b7959b940 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/TemporaryRegister.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/TemporaryRegister.java @@ -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; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AddActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AddActionItem.java index 1baca85eb..2e9b814d0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AddActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AddActionItem.java @@ -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(")"); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/SubtractActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/SubtractActionItem.java index 7d163997d..7282111bc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/SubtractActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/SubtractActionItem.java @@ -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(")"); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/SelectLanguageDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/SelectLanguageDialog.java index af3706d11..f0eeabfcc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/SelectLanguageDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/SelectLanguageDialog.java @@ -43,7 +43,7 @@ public class SelectLanguageDialog extends AppDialog implements ActionListener { JComboBox 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; diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/locales/FontEmbedDialog_de.properties b/trunk/src/com/jpexs/decompiler/flash/gui/locales/FontEmbedDialog_de.properties index fb2e1b4e2..63b9c4b3f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/locales/FontEmbedDialog_de.properties +++ b/trunk/src/com/jpexs/decompiler/flash/gui/locales/FontEmbedDialog_de.properties @@ -15,4 +15,4 @@ range.description = %name% (%available% von %total% Buchstaben) dialog.title = Schriftarten einbetten -label.idividual = Individelle Buchstaben: \ No newline at end of file +label.individual = Individelle Buchstaben: \ No newline at end of file diff --git a/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java b/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java index bdc6761e1..fb8f2e559 100644 --- a/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java @@ -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 moreSrc = new ArrayList<>(); public GraphPart firstPart; public GraphTargetItem value; diff --git a/trunk/src/com/jpexs/decompiler/graph/model/DuplicateItem.java b/trunk/src/com/jpexs/decompiler/graph/model/DuplicateItem.java index e2a2bd32f..5bdcd6b37 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/DuplicateItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/DuplicateItem.java @@ -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; } diff --git a/trunk/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java b/trunk/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java index d6b0aefb5..0788820f3 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java @@ -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(")");