LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-17 13:28:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed some Netbeans code hints

Browse Source
This commit is contained in:
honfika@gmail.com
2014-09-07 22:25:06 +02:00
parent 6c7223bba9
commit 8ae999a617
32 changed files with 507 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java
View File

@@ -154,7 +154,7 @@ public class AVM2Instruction implements Cloneable, GraphSourceItem {
case AVM2Code.OPT_CASE_OFFSETS:
s.add(new Long(operands[i]));
for (int j = i + 1; j < operands.length; j++) {
s.add(new Long(offset + operands[j]));
s.add(offset + operands[j]);
}
break;
default:

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIns.java
View File

@@ -41,16 +41,16 @@ public class AddIns extends InstructionDefinition {
Object o1 = lda.operandStack.pop();
Object o2 = lda.operandStack.pop();
if ((o1 instanceof Long) && ((o2 instanceof Long))) {
Long ret = Long.valueOf(((Long) o1).longValue() + ((Long) o2).longValue());
Long ret = ((Long) o1) + ((Long) o2);
lda.operandStack.push(ret);
} else if ((o1 instanceof Double) && ((o2 instanceof Double))) {
Double ret = Double.valueOf(((Double) o1).doubleValue() + ((Double) o2).doubleValue());
Double ret = ((Double) o1) + ((Double) o2);
lda.operandStack.push(ret);
} else if ((o1 instanceof Long) && ((o2 instanceof Double))) {
Double ret = new Double(((Long) o1).longValue() + ((Double) o2).doubleValue());
Double ret = ((Long) o1) + ((Double) o2);
lda.operandStack.push(ret);
} else if ((o1 instanceof Double) && ((o2 instanceof Long))) {
Double ret = new Double(((Double) o1).doubleValue() + ((Long) o2).longValue());
Double ret = ((Double) o1) + ((Long) o2);
lda.operandStack.push(ret);
} else {
String s = o1.toString() + o2.toString();

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIIns.java
View File

@@ -40,10 +40,10 @@ public class DecrementIIns extends InstructionDefinition {
public void execute(LocalDataArea lda, AVM2ConstantPool constants, List<Object> arguments) {
Object obj = lda.operandStack.pop();
if (obj instanceof Long) {
Long obj2 = ((Long) obj).longValue() - 1;
Long obj2 = ((Long) obj) - 1;
lda.operandStack.push(obj2);
} else if (obj instanceof Double) {
Double obj2 = ((Double) obj).doubleValue() - 1;
Double obj2 = ((Double) obj) - 1;
lda.operandStack.push(obj2);
}
if (obj instanceof String) {

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIns.java
View File

@@ -40,10 +40,10 @@ public class DecrementIns extends InstructionDefinition {
public void execute(LocalDataArea lda, AVM2ConstantPool constants, List<Object> arguments) {
Object obj = lda.operandStack.pop();
if (obj instanceof Long) {
Long obj2 = ((Long) obj).longValue() - 1;
Long obj2 = ((Long) obj) - 1;
lda.operandStack.push(obj2);
} else if (obj instanceof Double) {
Double obj2 = ((Double) obj).doubleValue() - 1;
Double obj2 = ((Double) obj) - 1;
lda.operandStack.push(obj2);
}
if (obj instanceof String) {

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DivideIns.java
View File

@@ -41,16 +41,16 @@ public class DivideIns extends InstructionDefinition {
Object o2 = lda.operandStack.pop();
Object o1 = lda.operandStack.pop();
if ((o1 instanceof Long) && ((o2 instanceof Long))) {
Long ret = Long.valueOf(((Long) o1).longValue() / ((Long) o2).longValue());
Long ret = ((Long) o1) / ((Long) o2);
lda.operandStack.push(ret);
} else if ((o1 instanceof Double) && ((o2 instanceof Double))) {
Double ret = Double.valueOf(((Double) o1).doubleValue() / ((Double) o2).doubleValue());
Double ret = ((Double) o1) / ((Double) o2);
lda.operandStack.push(ret);
} else if ((o1 instanceof Long) && ((o2 instanceof Double))) {
Double ret = new Double(((Long) o1).longValue() / ((Double) o2).doubleValue());
Double ret = ((Long) o1) / ((Double) o2);
lda.operandStack.push(ret);
} else if ((o1 instanceof Double) && ((o2 instanceof Long))) {
Double ret = new Double(((Double) o1).doubleValue() / ((Long) o2).longValue());
Double ret = ((Double) o1) / ((Long) o2);
lda.operandStack.push(ret);
} else {
throw new RuntimeException("Cannot divide");

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/ModuloIns.java
View File

@@ -42,7 +42,7 @@ public class ModuloIns extends InstructionDefinition {
Object o2 = lda.operandStack.pop();
if ((o1 instanceof Long) && ((o2 instanceof Long))) {
Long ret = Long.valueOf(((Long) o2).longValue() % ((Long) o1).longValue());
Long ret = ((Long) o2) % ((Long) o1);
lda.operandStack.push(ret);
} else {
throw new RuntimeException("Cannot modulo");

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIns.java
View File

@@ -41,16 +41,16 @@ public class MultiplyIns extends InstructionDefinition {
Object o1 = lda.operandStack.pop();
Object o2 = lda.operandStack.pop();
if ((o1 instanceof Long) && ((o2 instanceof Long))) {
Long ret = Long.valueOf(((Long) o1).longValue() * ((Long) o2).longValue());
Long ret = ((Long) o1) * ((Long) o2);
lda.operandStack.push(ret);
} else if ((o1 instanceof Double) && ((o2 instanceof Double))) {
Double ret = Double.valueOf(((Double) o1).doubleValue() * ((Double) o2).doubleValue());
Double ret = ((Double) o1) * ((Double) o2);
lda.operandStack.push(ret);
} else if ((o1 instanceof Long) && ((o2 instanceof Double))) {
Double ret = new Double(((Long) o1).longValue() * ((Double) o2).doubleValue());
Double ret = ((Long) o1) * ((Double) o2);
lda.operandStack.push(ret);
} else if ((o1 instanceof Double) && ((o2 instanceof Long))) {
Double ret = new Double(((Double) o1).doubleValue() * ((Long) o2).longValue());
Double ret = ((Double) o1) * ((Long) o2);
lda.operandStack.push(ret);
} else {
throw new RuntimeException("Cannot multiply");

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitNotIns.java
View File

@@ -39,7 +39,7 @@ public class BitNotIns extends InstructionDefinition {
@Override
public void execute(LocalDataArea lda, AVM2ConstantPool constants, List<Object> arguments) {
Long value = (Long) lda.operandStack.pop();
Long ret = Long.valueOf(-value.longValue());
Long ret = -value;
lda.operandStack.push(ret);
}

6
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIIns.java
View File

@@ -43,10 +43,10 @@ public class DecLocalIIns extends InstructionDefinition {
int locRegIndex = (int) ((Long) arguments.get(0)).longValue();
Object obj = lda.localRegisters.get(locRegIndex);
if (obj instanceof Long) {
Long obj2 = ((Long) obj).longValue() - 1;
Long obj2 = ((Long) obj) - 1;
lda.localRegisters.put(locRegIndex, obj2);
} else if (obj instanceof Double) {
Double obj2 = ((Double) obj).doubleValue() - 1;
Double obj2 = ((Double) obj) - 1;
lda.localRegisters.put(locRegIndex, obj2);
}
if (obj instanceof String) {
@@ -62,7 +62,7 @@ public class DecLocalIIns extends InstructionDefinition {
int regId = ins.operands[0];
output.add(new DecLocalAVM2Item(ins, regId));
if (localRegs.containsKey(regId)) {
localRegs.put(regId, new SubtractAVM2Item(ins, localRegs.get(regId), new IntegerValueAVM2Item(ins, Long.valueOf(1))));
localRegs.put(regId, new SubtractAVM2Item(ins, localRegs.get(regId), new IntegerValueAVM2Item(ins, 1L)));
} else {
//localRegs.put(regIndex, new SubtractAVM2Item(ins, new IntegerValueAVM2Item(ins, new Long(0)), new IntegerValueAVM2Item(ins, new Long(1))));
}

6
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIns.java
View File

@@ -43,10 +43,10 @@ public class DecLocalIns extends InstructionDefinition {
int locRegIndex = (int) ((Long) arguments.get(0)).longValue();
Object obj = lda.localRegisters.get(locRegIndex);
if (obj instanceof Long) {
Long obj2 = ((Long) obj).longValue() - 1;
Long obj2 = ((Long) obj) - 1;
lda.localRegisters.put(locRegIndex, obj2);
} else if (obj instanceof Double) {
Double obj2 = ((Double) obj).doubleValue() - 1;
Double obj2 = ((Double) obj) - 1;
lda.localRegisters.put(locRegIndex, obj2);
}
if (obj instanceof String) {
@@ -62,7 +62,7 @@ public class DecLocalIns extends InstructionDefinition {
int regId = ins.operands[0];
output.add(new DecLocalAVM2Item(ins, regId));
if (localRegs.containsKey(regId)) {
localRegs.put(regId, new SubtractAVM2Item(ins, localRegs.get(regId), new IntegerValueAVM2Item(ins, Long.valueOf(1))));
localRegs.put(regId, new SubtractAVM2Item(ins, localRegs.get(regId), new IntegerValueAVM2Item(ins, 1L)));
} else {
//localRegs.put(regIndex, new SubtractAVM2Item(ins, new IntegerValueAVM2Item(ins, new Long(0)), new IntegerValueAVM2Item(ins, new Long(1))));
}

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/IncLocalIIns.java
View File

@@ -42,7 +42,7 @@ public class IncLocalIIns extends InstructionDefinition {
int regId = ins.operands[0];
output.add(new IncLocalAVM2Item(ins, regId));
if (localRegs.containsKey(regId)) {
localRegs.put(regId, new AddAVM2Item(ins, localRegs.get(regId), new IntegerValueAVM2Item(ins, Long.valueOf(1))));
localRegs.put(regId, new AddAVM2Item(ins, localRegs.get(regId), new IntegerValueAVM2Item(ins, 1L)));
} else {
//localRegs.put(regIndex, new AddAVM2Item(ins, null, new IntegerValueAVM2Item(ins, new Long(1))));
}

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/IncLocalIns.java
View File

@@ -42,7 +42,7 @@ public class IncLocalIns extends InstructionDefinition {
int regId = ins.operands[0];
output.add(new IncLocalAVM2Item(ins, regId));
if (localRegs.containsKey(regId)) {
localRegs.put(regId, new AddAVM2Item(ins, localRegs.get(regId), new IntegerValueAVM2Item(ins, Long.valueOf(1))));
localRegs.put(regId, new AddAVM2Item(ins, localRegs.get(regId), new IntegerValueAVM2Item(ins, 1L)));
} else {
//localRegs.put(regIndex, new AddAVM2Item(ins, null, new IntegerValueAVM2Item(ins, new Long(1))));
}

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushByteIns.java
View File

@@ -43,7 +43,7 @@ public class PushByteIns extends InstructionDefinition implements PushIntegerTyp
@Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, TranslateStack stack, ScopeStack scopeStack, AVM2ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
stack.push(new IntegerValueAVM2Item(ins, Long.valueOf(ins.operands[0])));
stack.push(new IntegerValueAVM2Item(ins, (long) ins.operands[0]));
}
@Override

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushShortIns.java
View File

@@ -43,7 +43,7 @@ public class PushShortIns extends InstructionDefinition implements PushIntegerTy
@Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, TranslateStack stack, ScopeStack scopeStack, AVM2ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
stack.push(new IntegerValueAVM2Item(ins, Long.valueOf((long) (short) ins.operands[0])));
stack.push(new IntegerValueAVM2Item(ins, (long) (short) ins.operands[0]));
}
@Override

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertBIns.java
View File

@@ -44,7 +44,7 @@ public class ConvertBIns extends InstructionDefinition implements CoerceOrConver
if (value instanceof Boolean) {
bval = (Boolean) value;
} else if (value instanceof Long) {
bval = ((Long) value).longValue() != 0;
bval = (Long) value != 0;
} else if (value instanceof String) {
bval = !((String) value).isEmpty();
} else {

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertDIns.java
View File

@@ -44,21 +44,21 @@ public class ConvertDIns extends InstructionDefinition implements CoerceOrConver
if (value == null) {
ret = 0;
} else if (value instanceof Boolean) {
if (((Boolean) value).booleanValue()) {
if ((Boolean) value) {
ret = 1;
} else {
ret = 0;
}
} else if (value instanceof Long) {
ret = ((Long) value).longValue();
ret = (Long) value;
} else if (value instanceof Double) {
ret = ((Double) value).doubleValue();
ret = (Double) value;
} else if (value instanceof String) {
ret = Double.parseDouble((String) value);
} else {
ret = 1; //must call toPrimitive
}
lda.operandStack.push(Double.valueOf(ret));
lda.operandStack.push(ret);
}
@Override

6
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertIIns.java
View File

@@ -44,19 +44,19 @@ public class ConvertIIns extends InstructionDefinition implements CoerceOrConver
if (value == null) {
ret = 0;
} else if (value instanceof Boolean) {
if (((Boolean) value).booleanValue()) {
if ((Boolean) value) {
ret = 1;
} else {
ret = 0;
}
} else if (value instanceof Long) {
ret = ((Long) value).longValue();
ret = (Long) value;
} else if (value instanceof String) {
ret = Long.parseLong((String) value);
} else {
ret = 1; //must call toPrimitive
}
lda.operandStack.push(Long.valueOf(ret));
lda.operandStack.push(ret);
}
@Override

6
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/pcode/Flasm3Lexer.java
View File

@@ -3183,7 +3183,7 @@ public final class Flasm3Lexer {
yybegin(PARAMETERS);
// length also includes the trailing quote
if (isMultiname) {
return new ParsedSymbol(ParsedSymbol.TYPE_MULTINAME, new Long(multinameId));
return new ParsedSymbol(ParsedSymbol.TYPE_MULTINAME, multinameId);
} else {
return new ParsedSymbol(ParsedSymbol.TYPE_STRING, string.toString());
}
@@ -3222,7 +3222,7 @@ public final class Flasm3Lexer {
case 140:
break;
case 10: {
return new ParsedSymbol(ParsedSymbol.TYPE_INTEGER, new Long(Long.parseLong((yytext()))));
return new ParsedSymbol(ParsedSymbol.TYPE_INTEGER, Long.parseLong((yytext())));
}
case 141:
break;
@@ -3288,7 +3288,7 @@ public final class Flasm3Lexer {
case 152:
break;
case 29: {
return new ParsedSymbol(ParsedSymbol.TYPE_FLOAT, new Double(Double.parseDouble((yytext()))));
return new ParsedSymbol(ParsedSymbol.TYPE_FLOAT, Double.parseDouble((yytext())));
}
case 153:
break;

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScriptLexer.java
View File

@@ -1383,7 +1383,7 @@ public final class ActionScriptLexer {
case 172:
break;
case 13: {
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, new Long(Long.parseLong((yytext()))));
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong((yytext())));
}
case 173:
break;
@@ -1603,7 +1603,7 @@ public final class ActionScriptLexer {
case 209:
break;
case 50: {
return new ParsedSymbol(SymbolGroup.DOUBLE, SymbolType.DOUBLE, new Double(Double.parseDouble((yytext()))));
return new ParsedSymbol(SymbolGroup.DOUBLE, SymbolType.DOUBLE, Double.parseDouble((yytext())));
}
case 210:
break;
@@ -1670,7 +1670,7 @@ public final class ActionScriptLexer {
case 222:
break;
case 63: {
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, new Long(Long.parseLong(yytext(), 8)));
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong(yytext(), 8));
}
case 223:
break;
@@ -1899,7 +1899,7 @@ public final class ActionScriptLexer {
case 260:
break;
case 101: {
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, new Long(Long.parseLong(yytext().substring(2), 16)));
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong(yytext().substring(2), 16));
}
case 261:
break;

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/MethodInfoLexer.java
View File

@@ -909,7 +909,7 @@ public final class MethodInfoLexer {
case 39:
break;
case 3: {
return new ParsedSymbol(ParsedSymbol.TYPE_INTEGER, new Long(Long.parseLong((yytext()))));
return new ParsedSymbol(ParsedSymbol.TYPE_INTEGER, Long.parseLong((yytext())));
}
case 40:
break;
@@ -967,7 +967,7 @@ public final class MethodInfoLexer {
case 35: {
String s = yytext();
long ns = Long.parseLong(s.substring(3, s.length() - 2));
return new ParsedSymbol(ParsedSymbol.TYPE_NAMESPACE, new Long(ns));
return new ParsedSymbol(ParsedSymbol.TYPE_NAMESPACE, ns);
}
case 51:
break;
@@ -980,7 +980,7 @@ public final class MethodInfoLexer {
yybegin(YYINITIAL);
// length also includes the trailing quote
if (isMultiname) {
return new ParsedSymbol(ParsedSymbol.TYPE_MULTINAME, new Long(multinameId));
return new ParsedSymbol(ParsedSymbol.TYPE_MULTINAME, multinameId);
} else {
return new ParsedSymbol(ParsedSymbol.TYPE_STRING, string.toString());
}
@@ -1015,7 +1015,7 @@ public final class MethodInfoLexer {
case 58:
break;
case 12: {
return new ParsedSymbol(ParsedSymbol.TYPE_FLOAT, new Double(Double.parseDouble((yytext()))));
return new ParsedSymbol(ParsedSymbol.TYPE_FLOAT, Double.parseDouble((yytext())));
}
case 59:
break;

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PostDecrementActionItem.java
View File

@@ -12,7 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.
* License along with this library.
*/
package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.SourceGeneratorLocalData;
@@ -70,7 +71,7 @@ public class PostDecrementActionItem extends ActionItem implements SetTypeAction
@Override
public GraphTargetItem getValue() {
public GraphTargetItem getValue() {
return new SubtractActionItem(null, object, new DirectValueActionItem(null, 0, 1L, null));
}
@Override

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PostIncrementActionItem.java
View File

@@ -12,7 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.
* License along with this library.
*/
package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.SourceGeneratorLocalData;
@@ -70,7 +71,7 @@ public class PostIncrementActionItem extends ActionItem implements SetTypeAction
@Override
public GraphTargetItem getValue() {
public GraphTargetItem getValue() {
return new AddActionItem(null, object, new DirectValueActionItem(null, 0, 1L, null), true);
}
@Override

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/pcode/FlasmLexer.java
View File

@@ -963,7 +963,7 @@ public final class FlasmLexer {
case 44:
break;
case 24: {
return new ASMParsedSymbol(ASMParsedSymbol.TYPE_FLOAT, new Double(Double.parseDouble((yytext()))));
return new ASMParsedSymbol(ASMParsedSymbol.TYPE_FLOAT, Double.parseDouble((yytext())));
}
case 45:
break;
@@ -1017,7 +1017,7 @@ public final class FlasmLexer {
case 54:
break;
case 10: {
return new ASMParsedSymbol(ASMParsedSymbol.TYPE_INTEGER, new Long(Long.parseLong((yytext()))));
return new ASMParsedSymbol(ASMParsedSymbol.TYPE_INTEGER, Long.parseLong((yytext())));
}
case 55:
break;

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptLexer.java
View File

@@ -1629,7 +1629,7 @@ public final class ActionScriptLexer {
case 194:
break;
case 13: {
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, new Long(Long.parseLong((yytext()))));
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong((yytext())));
}
case 195:
break;
@@ -1788,7 +1788,7 @@ public final class ActionScriptLexer {
case 224:
break;
case 43: {
return new ParsedSymbol(SymbolGroup.DOUBLE, SymbolType.DOUBLE, new Double(Double.parseDouble((yytext()))));
return new ParsedSymbol(SymbolGroup.DOUBLE, SymbolType.DOUBLE, Double.parseDouble((yytext())));
}
case 225:
break;
@@ -1823,7 +1823,7 @@ public final class ActionScriptLexer {
case 231:
break;
case 50: {
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, new Long(Long.parseLong(yytext(), 8)));
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong(yytext(), 8));
}
case 232:
break;
@@ -2002,7 +2002,7 @@ public final class ActionScriptLexer {
case 265:
break;
case 84: {
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, new Long(Long.parseLong(yytext().substring(2), 16)));
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong(yytext().substring(2), 16));
}
case 266:
break;

20
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java
View File

@@ -857,7 +857,7 @@ public class ActionScriptParser {
lockCenter = (expression(registerVars, inFunction, inMethod, true, variables));
s = lex();
if (s.type == SymbolType.COMMA) {
constrain = new DirectValueActionItem(null, 0, new Long(1), new ArrayList<String>());
constrain = new DirectValueActionItem(null, 0, 1L, new ArrayList<String>());
x1 = (expression(registerVars, inFunction, inMethod, true, variables));
s = lex();
if (s.type == SymbolType.COMMA) {
@@ -870,28 +870,28 @@ public class ActionScriptParser {
y2 = (expression(registerVars, inFunction, inMethod, true, variables));
} else {
lexer.pushback(s);
y2 = new DirectValueActionItem(null, 0, (Long) 0L, new ArrayList<String>());
y2 = new DirectValueActionItem(null, 0, 0L, new ArrayList<String>());
}
} else {
lexer.pushback(s);
x2 = new DirectValueActionItem(null, 0, (Long) 0L, new ArrayList<String>());
y2 = new DirectValueActionItem(null, 0, (Long) 0L, new ArrayList<String>());
x2 = new DirectValueActionItem(null, 0, 0L, new ArrayList<String>());
y2 = new DirectValueActionItem(null, 0, 0L, new ArrayList<String>());
}
} else {
lexer.pushback(s);
x2 = new DirectValueActionItem(null, 0, (Long) 0L, new ArrayList<String>());
y2 = new DirectValueActionItem(null, 0, (Long) 0L, new ArrayList<String>());
y1 = new DirectValueActionItem(null, 0, (Long) 0L, new ArrayList<String>());
x2 = new DirectValueActionItem(null, 0, 0L, new ArrayList<String>());
y2 = new DirectValueActionItem(null, 0, 0L, new ArrayList<String>());
y1 = new DirectValueActionItem(null, 0, 0L, new ArrayList<String>());
}
} else {
lexer.pushback(s);
constrain = new DirectValueActionItem(null, 0, new Long(0), new ArrayList<String>());
constrain = new DirectValueActionItem(null, 0, 0L, new ArrayList<String>());
//ret.add(new ActionPush(Boolean.FALSE));
}
} else {
lockCenter = new DirectValueActionItem(null, 0, new Long(0), new ArrayList<String>());
constrain = new DirectValueActionItem(null, 0, new Long(0), new ArrayList<String>());
lockCenter = new DirectValueActionItem(null, 0, 0L, new ArrayList<String>());
constrain = new DirectValueActionItem(null, 0, 0L, new ArrayList<String>());
lexer.pushback(s);
}
expectedType(SymbolType.PARENT_CLOSE);

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java
View File

@@ -743,7 +743,7 @@ public class ActionSourceGenerator implements SourceGenerator {
globImp.addAll(impList);
constr.addAll(typeToActions(globImp, null));
}
constr.add(new ActionPush(new Long(implementsStr.size())));
constr.add(new ActionPush((long) implementsStr.size()));
constr.addAll(typeToActions(globalClassTypeStr, null));
constr.add(new ActionImplementsOp());
}

3
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java
View File

@@ -28,7 +28,6 @@ import com.jpexs.decompiler.flash.tags.base.ButtonTag;
import com.jpexs.decompiler.flash.tags.base.CharacterIdTag;
import com.jpexs.decompiler.flash.tags.base.CharacterTag;
import com.jpexs.decompiler.flash.tags.base.DrawableTag;
import com.jpexs.decompiler.flash.tags.base.MorphShapeTag;
import com.jpexs.decompiler.flash.tags.base.PlaceObjectTypeTag;
import com.jpexs.decompiler.flash.tags.base.RemoveTag;
import com.jpexs.decompiler.flash.types.CLIPACTIONS;
@@ -59,7 +58,7 @@ public class Timeline {
public RECT displayRect;
public int frameRate;
public List<Tag> tags;
public Map<Integer,Integer> depthMaxFrame= new HashMap<Integer, Integer>();
public Map<Integer,Integer> depthMaxFrame = new HashMap<>();
public int getMaxDepth() {
int max_depth = 0;

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/IntegerValueItem.java
View File

@@ -12,7 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.
* License along with this library.
*/
package com.jpexs.decompiler.graph.model;
import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
@@ -46,7 +47,7 @@ public class IntegerValueItem extends GraphTargetItem {
@Override
public Object getResult() {
public Object getResult() {
return (double) intValue;
}
@Override