From 61d8ee1b02ab600db7cf590a37ae6b3d861c5a65 Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Mon, 29 Jan 2018 13:07:41 -0600 Subject: [PATCH] Fix various warnings produced by "./gradlew javadoc" Three stubborn warnings remain, but this is progress! --- com.ibm.wala.cast.js/build.gradle | 8 ++++++++ .../callgraph/JSSSAPropagationCallGraphBuilder.java | 2 +- com.ibm.wala.cast/build.gradle | 12 +++++++++--- com.ibm.wala.core/build.gradle | 5 +++-- .../wala/util/ssa/TypeSafeInstructionFactory.java | 5 ++--- .../androidModel/structure/AbstractAndroidModel.java | 2 +- .../dalvik/ipa/callgraph/impl/AndroidEntryPoint.java | 8 ++++---- com.ibm.wala.util/build.gradle | 2 +- 8 files changed, 29 insertions(+), 15 deletions(-) diff --git a/com.ibm.wala.cast.js/build.gradle b/com.ibm.wala.cast.js/build.gradle index 522232a5e..b1bd6091b 100644 --- a/com.ibm.wala.cast.js/build.gradle +++ b/com.ibm.wala.cast.js/build.gradle @@ -13,3 +13,11 @@ dependencies { project(':com.ibm.wala.util'), ) } + +javadoc { + def rhino = project(':com.ibm.wala.cast.js.rhino').compileJava + dependsOn rhino + doFirst { + classpath += files rhino + } +} diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java index 2c082c44a..ba3076336 100755 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java @@ -104,7 +104,7 @@ import com.ibm.wala.util.strings.Atom; * {@link JSImplicitPointsToSetVisitor#visitAstGlobalRead(AstGlobalRead)}. * Finally, we need to represent direct flow of the global object to handle * receiver argument semantics (see - * {@link org.mozilla.javascript.RhinoToAstTranslator}). To do so, we create a + * {@link com.ibm.wala.cast.js.translator.RhinoToAstTranslator}). To do so, we create a * reference to a global named {@link #GLOBAL_OBJ_VAR_NAME}, which is handled * specially in {@link JSConstraintVisitor#visitAstGlobalRead(AstGlobalRead)}. */ diff --git a/com.ibm.wala.cast/build.gradle b/com.ibm.wala.cast/build.gradle index 13742f949..2f3dab2ba 100644 --- a/com.ibm.wala.cast/build.gradle +++ b/com.ibm.wala.cast/build.gradle @@ -15,11 +15,17 @@ dependencies { } javadoc { - dependsOn ':com.ibm.wala.cast.js:compileJava' - + def js = ':com.ibm.wala.cast.js' + dependsOn "$js:compileJava" doFirst { - classpath += files(project(':com.ibm.wala.cast.js').compileJava) + classpath += files project(js).compileJava } + /* + // creates circular dependency + def jsDoc = project(js).javadoc + dependsOn jsDoc + options.links jsDoc.outputDirectory.path + */ } def currentJavaHome = org.gradle.internal.jvm.Jvm.current().javaHome diff --git a/com.ibm.wala.core/build.gradle b/com.ibm.wala.core/build.gradle index 8b1af4b1e..7aabb7ed1 100644 --- a/com.ibm.wala.core/build.gradle +++ b/com.ibm.wala.core/build.gradle @@ -18,9 +18,10 @@ dependencies { } javadoc { - dependsOn ':com.ibm.wala.dalvik:compileJava' + def dalvik = ':com.ibm.wala.dalvik' + dependsOn "$dalvik:compileJava" doFirst { - classpath += files(project(':com.ibm.wala.dalvik').compileJava) + classpath += files project(dalvik).compileJava } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java index f4e3de829..b71f9f706 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java +++ b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java @@ -52,7 +52,6 @@ import com.ibm.wala.classLoader.NewSiteReference; import com.ibm.wala.ipa.cha.IClassHierarchy; import com.ibm.wala.shrikeBT.IConditionalBranchInstruction; import com.ibm.wala.shrikeBT.IInvokeInstruction; -import com.ibm.wala.shrikeCT.BootstrapMethodsReader.BootstrapMethod; import com.ibm.wala.ssa.SSAAbstractInvokeInstruction; import com.ibm.wala.ssa.SSAArrayLoadInstruction; import com.ibm.wala.ssa.SSAArrayStoreInstruction; @@ -102,7 +101,7 @@ public class TypeSafeInstructionFactory { * * Calls result.setAssigned() * - * @see com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory#InvokeInstruction(int, int, int[], int, CallSiteReference, BootstrapMethod) + * @see com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory#InvokeInstruction(int, int, int[], int, CallSiteReference, com.ibm.wala.shrikeCT.BootstrapMethodsReader.BootstrapMethod) * * @param iindex Zero or a positive number unique to any instruction of the same method * @param result Where to place the return-value of the called method. Is SSAValue.setAssigned() automatically. @@ -215,7 +214,7 @@ public class TypeSafeInstructionFactory { * All parameters (but exception) are typechecked first. If the check passes they get unpacked and handed over * to the corresponding JavaInstructionFactory.InvokeInstruction. * - * @see com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory#InvokeInstruction(int, int[], int, CallSiteReference, BootstrapMethod) + * @see com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory#InvokeInstruction(int, int[], int, CallSiteReference, com.ibm.wala.shrikeCT.BootstrapMethodsReader.BootstrapMethod) * * @param iindex Zero or a positive number unique to any instruction of the same method * @param params Parameters to the call starting with the implicit this-pointer if necessary 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 07dd3903d..85f7048cc 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 @@ -159,7 +159,7 @@ public abstract class AbstractAndroidModel { * * This function is expected to be called on entrypoints in ascending order. * - * You are expected to call {@link #enter(ExecutionOrder, int)} iff a + * You are expected to call {@link #enter(com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.ExecutionOrder, int)} iff a * Label got skipped over. * * @param order The entrypoint in question diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/AndroidEntryPoint.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/AndroidEntryPoint.java index 782cdbcfa..0059351fc 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/AndroidEntryPoint.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/AndroidEntryPoint.java @@ -214,7 +214,7 @@ public class AndroidEntryPoint extends DexEntryPoint { * Unrecommended way to generate the Order based on an Integer. * * This method is handy when reading back files. In your code you should prefer the methods - * {@link #after(IExecutionOrder)} and {@link #between(IExecutionOrder, IExecutionOrder)}. + * {@link #after(com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.IExecutionOrder)} and {@link #between(com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.IExecutionOrder, com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.IExecutionOrder)}. */ public ExecutionOrder(int val) { this.value=val; @@ -264,7 +264,7 @@ public class AndroidEntryPoint extends DexEntryPoint { * Use this to place a call to an EntryPoint between two other EntryPoint calls or ExecutionOrder "labels". * between() does not care about section-boundaries by itself! * - * Use {@link #between(IExecutionOrder[], IExecutionOrder[])} and use labels as additional placement-information + * Use {@link #between(com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.IExecutionOrder[], com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.IExecutionOrder[])} and use labels as additional placement-information * to prevent unexpected misplacement. * * @param after the call or "label" to be executed before this one @@ -299,7 +299,7 @@ public class AndroidEntryPoint extends DexEntryPoint { * This method is intended to be more robust when changing the position-information of referred-to * ExecutionOrders. * - * In any other means it behaves exactly like {@link #between(IExecutionOrder, IExecutionOrder)}. + * In any other means it behaves exactly like {@link #between(com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.IExecutionOrder, com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.IExecutionOrder)}. * * @param after the calls or "labels" to be executed before this one * @param before the calls or "labels" to be executed after this one (inclusive) @@ -359,7 +359,7 @@ public class AndroidEntryPoint extends DexEntryPoint { } /** - * Prefer {@link #after(IExecutionOrder)} whenever possible. + * Prefer {@link #after(com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.IExecutionOrder)} whenever possible. */ public static ExecutionOrder after (int after) { return between(after, ((after / (Integer.MAX_VALUE / 8)) + 1) * (Integer.MAX_VALUE / 8)); diff --git a/com.ibm.wala.util/build.gradle b/com.ibm.wala.util/build.gradle index 9456f074f..fac74fe4b 100644 --- a/com.ibm.wala.util/build.gradle +++ b/com.ibm.wala.util/build.gradle @@ -8,7 +8,7 @@ javadoc { def coreCompileJava = project(':com.ibm.wala.core').compileJava dependsOn coreCompileJava doFirst { - classpath += files(coreCompileJava) + classpath += files coreCompileJava } options.links 'https://docs.oracle.com/javase/8/docs/api/' }