diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIContextInterpreter.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIContextInterpreter.java index a7de71e0d..03449dc16 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIContextInterpreter.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIContextInterpreter.java @@ -133,4 +133,4 @@ public class DexIContextInterpreter implements SSAContextInterpreter { IR ir = getIR(n); return ir.getControlFlowGraph(); } -}; +} diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIMethod.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIMethod.java index fdc8e46ad..3b6010d10 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIMethod.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIMethod.java @@ -395,7 +395,7 @@ public class DexIMethod implements IBytecodeMethod { * @see com.ibm.wala.classLoader.IMethod#hasExceptionHandler() */ public boolean hasExceptionHandler() { - TryItem[] tries = eMethod.codeItem.getTries();; + TryItem[] tries = eMethod.codeItem.getTries(); return tries==null?false:tries.length > 0; } diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayGet.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayGet.java index ea2eb8594..5857671cd 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayGet.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayGet.java @@ -55,7 +55,7 @@ import com.ibm.wala.types.TypeReference; public class ArrayGet extends Instruction { - public enum Type{t_int,t_wide,t_boolean,t_byte,t_char, t_object, t_short}; + public enum Type{t_int,t_wide,t_boolean,t_byte,t_char, t_object, t_short} public final int destination; public final int array; diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/BinaryLiteralOperation.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/BinaryLiteralOperation.java index 8619805bb..9d8fbbd97 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/BinaryLiteralOperation.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/BinaryLiteralOperation.java @@ -65,7 +65,7 @@ public class BinaryLiteralOperation extends Instruction { ADD_INT,RSUB_INT,MUL_INT,DIV_INT,REM_INT,AND_INT,OR_INT,XOR_INT,SHL_INT,SHR_INT,USHR_INT, ADD_LONG,RSUB_LONG,MUL_LONG,DIV_LONG,REM_LONG,AND_LONG,OR_LONG,XOR_LONG,SHL_LONG,SHR_LONG,USHR_LONG, ADD_FLOAT,RSUB_FLOAT,MUL_FLOAT,DIV_FLOAT,REM_FLOAT, - ADD_DOUBLE,RSUB_DOUBLE,MUL_DOUBLE,DIV_DOUBLE,REM_DOUBLE}; + ADD_DOUBLE,RSUB_DOUBLE,MUL_DOUBLE,DIV_DOUBLE,REM_DOUBLE} public final OpID op; public final int oper1; diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/BinaryOperation.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/BinaryOperation.java index 964040a2a..39841a004 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/BinaryOperation.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/BinaryOperation.java @@ -64,7 +64,7 @@ public class BinaryOperation extends Instruction { ADD_INT,SUB_INT,MUL_INT,DIV_INT,REM_INT,AND_INT,OR_INT,XOR_INT,SHL_INT,SHR_INT,USHR_INT, ADD_LONG,SUB_LONG,MUL_LONG,DIV_LONG,REM_LONG,AND_LONG,OR_LONG,XOR_LONG,SHL_LONG,SHR_LONG,USHR_LONG, ADD_FLOAT,SUB_FLOAT,MUL_FLOAT,DIV_FLOAT,REM_FLOAT, - ADD_DOUBLE,SUB_DOUBLE,MUL_DOUBLE,DIV_DOUBLE,REM_DOUBLE}; + ADD_DOUBLE,SUB_DOUBLE,MUL_DOUBLE,DIV_DOUBLE,REM_DOUBLE} public final OpID op; public final int oper1; diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Branch.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Branch.java index 806aca2db..a8bac5e45 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Branch.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Branch.java @@ -68,7 +68,7 @@ public abstract class Branch extends Instruction { public static class UnaryBranch extends Branch { - public enum CompareOp {EQZ,NEZ,LTZ,LEZ,GTZ,GEZ}; + public enum CompareOp {EQZ,NEZ,LTZ,LEZ,GTZ,GEZ} public final int oper1; public final CompareOp op; @@ -103,7 +103,7 @@ public abstract class Branch extends Instruction { public static class BinaryBranch extends Branch { - public enum CompareOp {EQ,NE,LT,LE,GT,GE}; + public enum CompareOp {EQ,NE,LT,LE,GT,GE} public final int oper1; public final int oper2; public final CompareOp op; diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/UnaryOperation.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/UnaryOperation.java index c496c4300..d6319b7cd 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/UnaryOperation.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/UnaryOperation.java @@ -58,7 +58,7 @@ import com.ibm.wala.util.debug.Assertions; public class UnaryOperation extends Instruction { - public static enum OpID {MOVE, MOVE_WIDE, MOVE_EXCEPTION, NOT, NEGINT, NOTINT, NEGLONG, NOTLONG, NEGFLOAT, NEGDOUBLE, DOUBLETOLONG, DOUBLETOFLOAT, INTTOBYTE, INTTOCHAR, INTTOSHORT, DOUBLETOINT, FLOATTODOUBLE, FLOATTOLONG, FLOATTOINT, LONGTODOUBLE, LONGTOFLOAT, LONGTOINT, INTTODOUBLE, INTTOFLOAT, INTTOLONG}; + public static enum OpID {MOVE, MOVE_WIDE, MOVE_EXCEPTION, NOT, NEGINT, NOTINT, NEGLONG, NOTLONG, NEGFLOAT, NEGDOUBLE, DOUBLETOLONG, DOUBLETOFLOAT, INTTOBYTE, INTTOCHAR, INTTOSHORT, DOUBLETOINT, FLOATTODOUBLE, FLOATTOLONG, FLOATTOINT, LONGTODOUBLE, LONGTOFLOAT, LONGTOINT, INTTODOUBLE, INTTOFLOAT, INTTOLONG} public final OpID op; public final int source; diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/AbstractAndroidModel.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/AbstractAndroidModel.java index 01b0d77b9..3dce2e314 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/AbstractAndroidModel.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/AbstractAndroidModel.java @@ -205,7 +205,7 @@ public abstract class AbstractAndroidModel { * you'll simply pass body.getNextProgramCounter() * @return Program Counter after insertion of the code */ - protected int enterAT_FIRST(int PC) { return PC; }; + protected int enterAT_FIRST(int PC) { return PC; } /** * Gets called when Label ExecutionOrder.BEFORE_LOOP got stepped over. @@ -219,7 +219,7 @@ public abstract class AbstractAndroidModel { * you'll simply pass body.getNextProgramCounter() * @return Program Counter after insertion of the code */ - protected int enterBEFORE_LOOP (int PC) { return PC; }; + protected int enterBEFORE_LOOP (int PC) { return PC; } /** * Gets called when Label ExecutionOrder.START_OF_LOOP got stepped over. @@ -233,7 +233,7 @@ public abstract class AbstractAndroidModel { * you'll simply pass body.getNextProgramCounter() * @return Program Counter after insertion of the code */ - protected int enterSTART_OF_LOOP (int PC) { return PC; }; + protected int enterSTART_OF_LOOP (int PC) { return PC; } /** * Gets called when Label ExecutionOrder.MIDDLE_OF_LOOP got stepped over. @@ -247,7 +247,7 @@ public abstract class AbstractAndroidModel { * you'll simply pass body.getNextProgramCounter() * @return Program Counter after insertion of the code */ - protected int enterMIDDLE_OF_LOOP (int PC) { return PC; }; + protected int enterMIDDLE_OF_LOOP (int PC) { return PC; } /** * Gets called when Label ExecutionOrder.MULTIPLE_TIMES_IN_LOOP got stepped over. @@ -261,7 +261,7 @@ public abstract class AbstractAndroidModel { * you'll simply pass body.getNextProgramCounter() * @return Program Counter after insertion of the code */ - protected int enterMULTIPLE_TIMES_IN_LOOP (int PC) { return PC; }; + protected int enterMULTIPLE_TIMES_IN_LOOP (int PC) { return PC; } /** * Gets called when Label ExecutionOrder.END_OF_LOOP got stepped over. @@ -275,7 +275,7 @@ public abstract class AbstractAndroidModel { * you'll simply pass body.getNextProgramCounter() * @return Program Counter after insertion of the code */ - protected int enterEND_OF_LOOP (int PC) { return PC; }; + protected int enterEND_OF_LOOP (int PC) { return PC; } /** * Gets called when Label ExecutionOrder.AFTER_LOOP got stepped over. @@ -289,7 +289,7 @@ public abstract class AbstractAndroidModel { * you'll simply pass body.getNextProgramCounter() * @return Program Counter after insertion of the code */ - protected int enterAFTER_LOOP (int PC) { return PC; }; + protected int enterAFTER_LOOP (int PC) { return PC; } /** * Gets called when Label ExecutionOrder.AT_LAST got stepped over. @@ -303,7 +303,7 @@ public abstract class AbstractAndroidModel { * you'll simply pass body.getNextProgramCounter() * @return Program Counter after insertion of the code */ - protected int enterAT_LAST (int PC) { return PC; }; + protected int enterAT_LAST (int PC) { return PC; } /** * Gets called when the model gets finished. @@ -317,7 +317,7 @@ public abstract class AbstractAndroidModel { * you'll simply pass body.getNextProgramCounter() * @return Program Counter after insertion of the code */ - protected int leaveAT_LAST (int PC) { return PC; }; + protected int leaveAT_LAST (int PC) { return PC; } /** * Dispatches to the enterLABEL-functions. Does also call functions to any labels that diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/Intent.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/Intent.java index 2f06fec0c..36c8d9c09 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/Intent.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/Intent.java @@ -90,7 +90,7 @@ public class Intent implements ContextItem, Comparable { BROADCAST, /** Do not handle intent */ IGNORE - }; + } private enum Explicit { UNSET, diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java index 8541d1c88..ee554c54a 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java @@ -134,7 +134,7 @@ public class AndroidManifestXMLReader { public Set getSubTags(); } - private interface HistoryKey {} ; + private interface HistoryKey {} /** * Only includes relevant tags. */