ASDec: Small changes to eliminate notices

trunk/src/com/jpexs/asdec/action/Action.java

@@ -350,7 +350,7 @@ public class Action {
     */
    public static String actionsToString(List<Action> list, List<Long> importantOffsets, List<String> constantPool, int version) {
       String ret = "";
-      long offset = 0;
+      long offset;
       if (importantOffsets == null) {
          setActionsAddresses(list, 0, version);
          importantOffsets = getActionsAllRefs(list, version);
@@ -437,7 +437,7 @@ public class Action {
     */
    public static long ip2adr(List<Action> actions, int ip, int version) {
       if (ip >= actions.size()) {
-         if (actions.size() == 0) {
+         if (actions.isEmpty()) {
             return 0;
          }
          return actions.get(actions.size() - 1).getAddress() + actions.get(actions.size() - 1).getBytes(version).length;
@@ -715,7 +715,6 @@ public class Action {
             if (!unknownJumps.contains(((ActionJump) action).getRef(version))) {
                unknownJumps.add(((ActionJump) action).getRef(version));
             }
-            ip = ip + 1;
             break;
 
          } else if (action instanceof ActionIf) {
@@ -776,7 +775,7 @@ public class Action {
             try {
 
                onTrue = actionsToTree(registerNames, unknownJumps, loopList, jumpsOrIfs, trueStack, constants, actions, ip + 1, jumpIp - 1 - (hasElse || isWhile || isForIn ? 1 : 0), version);
-               if (onTrue.size() == 0 && trueStack.size() > 0) {
+               if (onTrue.isEmpty() && trueStack.size() > 0) {
                   isTernar = true;
                }
             } catch (UnknownJumpException uje) {

trunk/src/com/jpexs/asdec/action/TagNode.java

@@ -104,7 +104,7 @@ public class TagNode {
                continue;
             }
          }
-         if (ret.get(i).subItems.size() == 0) {
+         if (ret.get(i).subItems.isEmpty()) {
             ret.remove(i);
          }
       }

trunk/src/com/jpexs/asdec/action/flashlite/ActionStrictMode.java

@@ -43,6 +43,7 @@ public class ActionStrictMode extends Action {
       mode = (int) lexLong(lexer);
    }
 
+   @Override
    public byte[] getBytes(int version) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       SWFOutputStream sos = new SWFOutputStream(baos, version);

trunk/src/com/jpexs/asdec/action/swf3/ActionGetURL.java

@@ -50,6 +50,7 @@ public class ActionGetURL extends Action {
       targetString = lexString(lexer);
    }
 
+   @Override
    public byte[] getBytes(int version) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       SWFOutputStream sos = new SWFOutputStream(baos, version);

trunk/src/com/jpexs/asdec/action/swf3/ActionGoToLabel.java

@@ -47,6 +47,7 @@ public class ActionGoToLabel extends Action {
       return "GoToLabel \"" + Helper.escapeString(label) + "\"";
    }
 
+   @Override
    public byte[] getBytes(int version) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       SWFOutputStream sos = new SWFOutputStream(baos, version);

trunk/src/com/jpexs/asdec/action/swf3/ActionGotoFrame.java

@@ -43,6 +43,7 @@ public class ActionGotoFrame extends Action {
       return "GotoFrame " + frame;
    }
 
+   @Override
    public byte[] getBytes(int version) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       SWFOutputStream sos = new SWFOutputStream(baos, version);

trunk/src/com/jpexs/asdec/action/swf3/ActionSetTarget.java

@@ -47,6 +47,7 @@ public class ActionSetTarget extends Action {
       return "SetTarget \"" + Helper.escapeString(targetName) + "\"";
    }
 
+   @Override
    public byte[] getBytes(int version) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       SWFOutputStream sos = new SWFOutputStream(baos, version);

trunk/src/com/jpexs/asdec/action/swf3/ActionWaitForFrame.java

@@ -45,6 +45,7 @@ public class ActionWaitForFrame extends Action {
       return "WaitForFrame " + frame + " " + skipCount;
    }
 
+   @Override
    public byte[] getBytes(int version) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       SWFOutputStream sos = new SWFOutputStream(baos, version);

trunk/src/com/jpexs/asdec/action/swf4/ActionGetURL2.java

@@ -50,6 +50,7 @@ public class ActionGetURL2 extends Action {
       return "GetURL2 " + sendVarsMethod + " " + loadTargetFlag + " " + loadVariablesFlag;
    }
 
+   @Override
    public byte[] getBytes(int version) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       SWFOutputStream sos = new SWFOutputStream(baos, version);

trunk/src/com/jpexs/asdec/action/swf4/ActionGotoFrame2.java

@@ -45,6 +45,7 @@ public class ActionGotoFrame2 extends Action {
       }
    }
 
+   @Override
    public byte[] getBytes(int version) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       SWFOutputStream sos = new SWFOutputStream(baos, version);

trunk/src/com/jpexs/asdec/action/swf4/ActionIf.java

@@ -48,6 +48,7 @@ public class ActionIf extends Action {
       return getAddress() + getBytes(version).length + offset;
    }
 
+   @Override
    public byte[] getBytes(int version) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       SWFOutputStream sos = new SWFOutputStream(baos, version);

trunk/src/com/jpexs/asdec/action/swf4/ActionJump.java

@@ -48,6 +48,7 @@ public class ActionJump extends Action {
       return getAddress() + getBytes(version).length + offset;
    }
 
+   @Override
    public byte[] getBytes(int version) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       SWFOutputStream sos = new SWFOutputStream(baos, version);

trunk/src/com/jpexs/asdec/action/swf4/ActionPush.java

@@ -61,7 +61,7 @@ public class ActionPush extends Action {
                values.add(new RegisterNumber(sis.readUI8()));
                break;
             case 5:
-               values.add(new Boolean(sis.readUI8() == 1));
+               values.add((Boolean)(sis.readUI8() == 1));
                break;
             case 6:
                values.add(sis.readDOUBLE());
@@ -79,6 +79,7 @@ public class ActionPush extends Action {
       }
    }
 
+   @Override
    public byte[] getBytes(int version) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       SWFOutputStream sos = new SWFOutputStream(baos, version);
@@ -142,7 +143,7 @@ public class ActionPush extends Action {
          switch (symb.type) {
             case ParsedSymbol.TYPE_STRING:
                count++;
-               if (constantPool.contains(symb.value)) {
+               if (constantPool.contains((String)symb.value)) {
                   values.add(new ConstantIndex(constantPool.indexOf(symb.value), constantPool));
                } else {
                   values.add(symb.value);

trunk/src/com/jpexs/asdec/action/swf4/ActionWaitForFrame2.java

@@ -43,6 +43,7 @@ public class ActionWaitForFrame2 extends Action {
       skipCount = (int) lexLong(lexer);
    }
 
+   @Override
    public byte[] getBytes(int version) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       SWFOutputStream sos = new SWFOutputStream(baos, version);

trunk/src/com/jpexs/asdec/action/swf5/ActionConstantPool.java

@@ -58,6 +58,7 @@ public class ActionConstantPool extends Action {
       }
    }
 
+   @Override
    public byte[] getBytes(int version) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       SWFOutputStream sos = new SWFOutputStream(baos, version);

trunk/src/com/jpexs/asdec/action/swf5/ActionDefineFunction.java

@@ -62,6 +62,7 @@ public class ActionDefineFunction extends Action {
       code = ASMParser.parse(labels, address + getPreLen(version), lexer, constantPool, version);
    }
 
+   @Override
    public byte[] getBytes(int version) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       SWFOutputStream sos = new SWFOutputStream(baos, version);

trunk/src/com/jpexs/asdec/action/swf5/ActionStoreRegister.java

@@ -44,6 +44,7 @@ public class ActionStoreRegister extends Action {
       registerNumber = (int) lexLong(lexer);
    }
 
+   @Override
    public byte[] getBytes(int version) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       SWFOutputStream sos = new SWFOutputStream(baos, version);

trunk/src/com/jpexs/asdec/action/swf5/ActionWith.java

@@ -52,6 +52,7 @@ public class ActionWith extends Action {
       Action.setActionsAddresses(actions, address + 5, version);
    }
 
+   @Override
    public byte[] getBytes(int version) {
       ByteArrayOutputStream baos2 = new ByteArrayOutputStream();
       ByteArrayOutputStream baos = new ByteArrayOutputStream();

trunk/src/com/jpexs/asdec/action/swf7/ActionTry.java

@@ -92,6 +92,7 @@ public class ActionTry extends Action {
       }
    }
 
+   @Override
    public byte[] getBytes(int version) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       SWFOutputStream sos = new SWFOutputStream(baos, version);

trunk/src/com/jpexs/asdec/action/treemodel/TreeItem.java

@@ -48,6 +48,7 @@ public abstract class TreeItem {
 
    public abstract String toString(ConstantPool constants);
 
+   @Override
    public String toString() {
       return toString(null);
    }

trunk/src/com/jpexs/asdec/action/treemodel/clauses/IfTreeItem.java

@@ -38,8 +38,8 @@ public class IfTreeItem extends TreeItem implements Block {
 
    @Override
    public String toString(ConstantPool constants) {
-      String ret = "";
-      ret = hilight("if(") + expression.toString(constants) + hilight(")\r\n{\r\n");
+      String ret;
+      ret = hilight("if(") + expression.toString(constants) + hilight(")")+"\r\n{\r\n";
       for (TreeItem ti : onTrue) {
          ret += ti.toString(constants) + "\r\n";
       }

trunk/src/com/jpexs/asdec/action/treemodel/clauses/WithTreeItem.java

@@ -41,7 +41,7 @@ public class WithTreeItem extends TreeItem {
 
    @Override
    public String toString(ConstantPool constants) {
-      String ret = "";
+      String ret;
       ret = hilight("with(") + scope.toString(constants) + hilight(")\r\n{\r\n");
       for (TreeItem ti : items) {
          ret += ti.toString(constants) + "\r\n";