removed third party libraries (moving them upstream), renamed project

DynamicSupport/.classpath → com.ensoftcorp.open.sid.support/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

DynamicSupport/.project → com.ensoftcorp.open.sid.support/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>DynamicSupport</name>
+	<name>com.ensoftcorp.open.sid.support</name>
 	<comment></comment>
 	<projects>
 	</projects>

DynamicSupport/.settings/org.eclipse.jdt.core.prefs → com.ensoftcorp.open.sid.support/.settings/org.eclipse.jdt.core.prefs

@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

third-party-plugins/org.jgrapht/.project → com.ensoftcorp.open.sid/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.jgrapht</name>
+	<name>com.ensoftcorp.open.sid</name>
 	<comment></comment>
 	<projects>
 	</projects>

SID/META-INF/MANIFEST.MF → com.ensoftcorp.open.sid/META-INF/MANIFEST.MF

@@ -1,21 +1,22 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SID
-Bundle-SymbolicName: SID;singleton:=true
+Bundle-SymbolicName: com.ensoftcorp.open.sid;singleton:=true
 Bundle-Version: 3.0.10.qualifier
 Bundle-Activator: sid.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.jdt,
  org.eclipse.jdt.core,
  org.eclipse.jdt.launching,
- com.ensoftcorp.open.commons;bundle-version="3.0.8",
- com.ensoftcorp.abp;bundle-version="3.0.10",
- com.ensoftcorp.abp.common;bundle-version="3.0.10",
+ com.ensoftcorp.abp;bundle-version="3.0.13",
+ com.ensoftcorp.abp.common;bundle-version="3.0.13",
+ com.ensoftcorp.open.commons;bundle-version="3.0.13",
  ca.mcgill.sable.soot;bundle-version="2.5.2",
  ca.mcgill.sable.soot.lib;bundle-version="2.5.2",
  net.ontopia.utils;bundle-version="1.0.0",
- org.jgrapht;bundle-version="0.9.1"
+ org.jgrapht;bundle-version="0.9.1",
+ com.ensoftcorp.open.java.commons
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: sid,

SID/build.properties → com.ensoftcorp.open.sid/build.properties

@@ -3,6 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               support/DynamicSupport.zip,\
+               support/com.ensoftcorp.open.sid.support.zip,\
                icons/clone.png,\
                icons/gears.png

SID/src/sid/dynamic/phases/Compilation.java → com.ensoftcorp.open.sid/src/sid/dynamic/phases/Compilation.java

@@ -19,7 +19,7 @@
 import org.eclipse.jdt.core.JavaModelException;
 
 import com.ensoftcorp.abp.common.soot.ConfigManager;
-import com.ensoftcorp.open.commons.utils.DisplayUtils;
+import com.ensoftcorp.open.commons.utilities.DisplayUtils;
 
 import sid.log.Log;
 import soot.G;

SID/src/sid/dynamic/phases/Instrumentation.java → com.ensoftcorp.open.sid/src/sid/dynamic/phases/Instrumentation.java

@@ -19,7 +19,7 @@
 import com.ensoftcorp.atlas.core.query.Q;
 import com.ensoftcorp.atlas.core.script.Common;
 import com.ensoftcorp.atlas.core.xcsg.XCSG;
-import com.ensoftcorp.open.commons.analysis.utils.StandardQueries;
+import com.ensoftcorp.open.commons.analysis.StandardQueries;
 
 import sid.dynamic.instruments.Instrument;
 import sid.dynamic.instruments.counters.LoopIterationCounter;
@@ -97,7 +97,7 @@ public static HashMap<GraphElement,LinkedList<Instrument>> instrumentContainedLo
 				counterInstrument.performInstrumentation();
 				Instrument timerInstrument = new LoopIterationTimer(project, loopHeader);
 				timerInstrument.performInstrumentation();
-				GraphElement method = StandardQueries.getContainingMethod(loopHeader);
+				GraphElement method = StandardQueries.getContainingFunction(loopHeader);
 				if(result.containsKey(method)){
 					LinkedList<Instrument> instruments = result.get(method);
 					instruments.add(counterInstrument);

SID/src/sid/dynamic/phases/Setup.java → com.ensoftcorp.open.sid/src/sid/dynamic/phases/Setup.java

@@ -18,10 +18,10 @@
 public class Setup {
 
 	public static IProject getOrCreateDynamicSupportProject() throws InvocationTargetException, InterruptedException, CoreException, IOException{
-		IProject dynamicSupportProject = ResourcesPlugin.getWorkspace().getRoot().getProject("DynamicSupport");
+		IProject dynamicSupportProject = ResourcesPlugin.getWorkspace().getRoot().getProject("com.ensoftcorp.open.sid.support");
 		if(!dynamicSupportProject.exists()){
 			Bundle dynamicBundle = Activator.getDefault().getBundle();
-			dynamicSupportProject = ProjectImporter.importProject(new NullProgressMonitor(), dynamicBundle, "/support/" + "DynamicSupport.zip", "DynamicSupport");
+			dynamicSupportProject = ProjectImporter.importProject(new NullProgressMonitor(), dynamicBundle, "/support/" + "com.ensoftcorp.open.sid.support.zip", "com.ensoftcorp.open.sid.support");
 		}
 		return dynamicSupportProject;
 	}

SID/src/sid/handlers/CloneProjectHandler.java → com.ensoftcorp.open.sid/src/sid/handlers/CloneProjectHandler.java

@@ -12,7 +12,7 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 
-import com.ensoftcorp.open.commons.utils.DisplayUtils;
+import com.ensoftcorp.open.commons.utilities.DisplayUtils;
 
 import sid.dynamic.phases.Cloning;
 import sid.dynamic.phases.Instrumentation;

SID/src/sid/handlers/CreateDriverProjectHandler.java → com.ensoftcorp.open.sid/src/sid/handlers/CreateDriverProjectHandler.java

@@ -38,8 +38,8 @@
 import com.ensoftcorp.atlas.core.query.Q;
 import com.ensoftcorp.atlas.core.script.Common;
 import com.ensoftcorp.atlas.core.xcsg.XCSG;
-import com.ensoftcorp.open.commons.analysis.DiscoverMainMethods;
-import com.ensoftcorp.open.commons.utils.DisplayUtils;
+import com.ensoftcorp.open.commons.utilities.DisplayUtils;
+import com.ensoftcorp.open.java.commons.analyzers.JavaProgramEntryPoints;
 
 import sid.dynamic.phases.Cloning;
 import sid.dynamic.phases.Compilation;
@@ -205,8 +205,8 @@ public static void addSupportClasses(IJavaProject jDriverProject, IFolder source
 				StringBuilder callsites = new StringBuilder();
 				content = content.replace("TCA_TARGET_METHOD_CALLSITE", "// TODO: call method with parameters for a given workload");
 				if(content.contains(TCA_MAIN_METHOD_INJECTION_SITE)){
-					AtlasSet<Node> mainMethods = DiscoverMainMethods.findMainMethods().eval().nodes();
-					for(GraphElement mainMethod : mainMethods){
+					AtlasSet<Node> mainMethods = JavaProgramEntryPoints.findMainMethods().eval().nodes();
+					for(Node mainMethod : mainMethods){
 						callsites.append("				// " + createMainMethodCallsite(mainMethod) + "\n");
 					}
 				}

SID/src/sid/handlers/CreateMethodDriverProjectHandler.java → com.ensoftcorp.open.sid/src/sid/handlers/CreateMethodDriverProjectHandler.java

@@ -46,8 +46,8 @@
 import com.ensoftcorp.atlas.core.xcsg.XCSG;
 import com.ensoftcorp.atlas.ui.selection.SelectionUtil;
 import com.ensoftcorp.atlas.ui.selection.event.IAtlasSelectionEvent;
-import com.ensoftcorp.open.commons.analysis.DiscoverMainMethods;
-import com.ensoftcorp.open.commons.utils.DisplayUtils;
+import com.ensoftcorp.open.commons.utilities.DisplayUtils;
+import com.ensoftcorp.open.java.commons.analyzers.JavaProgramEntryPoints;
 
 import sid.dynamic.instruments.Instrument;
 import sid.dynamic.phases.Cloning;
@@ -252,8 +252,8 @@ public static void addSupportClasses(IJavaProject jDriverProject, IFolder source
 				}
 
 				if(content.contains(TCA_MAIN_METHOD_INJECTION_SITE)){
-					AtlasSet<Node> mainMethods = DiscoverMainMethods.findMainMethods().eval().nodes();
-					for(GraphElement mainMethod : mainMethods){
+					AtlasSet<Node> mainMethods = JavaProgramEntryPoints.findMainMethods().eval().nodes();
+					for(Node mainMethod : mainMethods){
 						callsites.append("				// " + createMainMethodCallsite(mainMethod) + "\n");
 					}
 				}

SID/src/sid/handlers/InstrumentAllLoopHeadersProjectHandler.java → com.ensoftcorp.open.sid/src/sid/handlers/InstrumentAllLoopHeadersProjectHandler.java

@@ -17,7 +17,7 @@
 import org.eclipse.ui.PlatformUI;
 
 import com.ensoftcorp.atlas.core.db.graph.GraphElement;
-import com.ensoftcorp.open.commons.utils.DisplayUtils;
+import com.ensoftcorp.open.commons.utilities.DisplayUtils;
 
 import sid.dynamic.instruments.Instrument;
 import sid.dynamic.phases.Instrumentation;

SID/src/sid/setup/ProjectImporter.java → com.ensoftcorp.open.sid/src/sid/setup/ProjectImporter.java

@@ -31,6 +31,7 @@
 
 import sid.log.Log;
 
+@SuppressWarnings({"restriction", "rawtypes"})
 public class ProjectImporter {
 
 	public static IProject importProject(IProgressMonitor monitor, Bundle bundle, String bundlePath, String newProjectName) throws InvocationTargetException, InterruptedException, CoreException, IOException {

SID/src/sid/statics/CallSite.java → com.ensoftcorp.open.sid/src/sid/statics/CallSite.java

@@ -12,7 +12,7 @@
 import com.ensoftcorp.atlas.core.query.Q;
 import com.ensoftcorp.atlas.core.script.Common;
 import com.ensoftcorp.atlas.core.xcsg.XCSG;
-import com.ensoftcorp.open.commons.analysis.utils.StandardQueries;
+import com.ensoftcorp.open.commons.analysis.StandardQueries;
 
 import sid.log.Log;
 
@@ -69,7 +69,7 @@ private static Q getTargetMethods(IProgressMonitor monitor, Graph dataFlowGraph,
 			AtlasSet<GraphElement> targetMethods = new AtlasHashSet<GraphElement>();
 			AtlasSet<Node> targetIdentities = getIdentity(dataFlowGraph, callsite).eval().nodes();
 			for (Node targetIdentity : targetIdentities) {
-				Node targetMethod = StandardQueries.getContainingMethod(targetIdentity);
+				Node targetMethod = StandardQueries.getContainingFunction(targetIdentity);
 				if (targetMethod != null){
 					targetMethods.add(targetMethod);
 				} else {

SID/src/sid/statics/LoopCallGraph.java → com.ensoftcorp.open.sid/src/sid/statics/LoopCallGraph.java

@@ -27,9 +27,8 @@
 import com.ensoftcorp.atlas.core.script.Common;
 import com.ensoftcorp.atlas.core.script.StyledResult;
 import com.ensoftcorp.atlas.core.xcsg.XCSG;
-import com.ensoftcorp.open.commons.analysis.SetDefinitions;
-import com.ensoftcorp.open.commons.analysis.utils.StandardQueries;
-import com.ensoftcorp.open.commons.utils.DisplayUtils;
+import com.ensoftcorp.open.commons.analysis.StandardQueries;
+import com.ensoftcorp.open.commons.utilities.DisplayUtils;
 
 import sid.statics.LoopAnalyzer.CFGNode;
 
@@ -93,7 +92,7 @@ public Highlighter colorMethodsCalledFromWithinLoops(){
 		//Iterate through the looping CFG nodes and compute the call graph for the methods called from within loops
 		for(GraphElement cfgNode : loopingCFGNodes.eval().nodes()){
 			// Get the methods containing the current cfgNode
-			Q caller = StandardQueries.getContainingMethods(toQ(cfgNode));
+			Q caller = StandardQueries.getContainingFunctions(toQ(cfgNode));
 
 			// Get the call site contained within the cfgNode
 			AtlasSet<Node> loopingCallsites = toQ(cfgNode).children().nodesTaggedWithAll(XCSG.CallSite).eval().nodes();
@@ -146,7 +145,7 @@ public void calculateLoopNestingHeight(){
 		///Iterate through the looping CFG nodes and compute the call graph for the methods called from within loops 
 		for(GraphElement cfgNode : loopingCFGNodes.eval().nodes()){
 			// Get the methods containing the current cfgNode
-			Q caller = StandardQueries.getContainingMethods(toQ(cfgNode));
+			Q caller = StandardQueries.getContainingFunctions(toQ(cfgNode));
 
 			// Get the call sites containing within the cfgNode
 			Q loopingCallsites = toQ(cfgNode).children().nodesTaggedWithAll(XCSG.CallSite);
@@ -297,7 +296,7 @@ private Q TagCallSitesIntraprocedualNestingLoopingDepth(){
 
 		// Iterate through the looping CFG nodes and add the NESTING_DEPTH attribute
 		for(GraphElement node : nodes){
-			Q loopHeaders = getLoopHeadersForMethod(StandardQueries.getContainingMethods(toQ(node)));
+			Q loopHeaders = getLoopHeadersForMethod(StandardQueries.getContainingFunctions(toQ(node)));
 			int depth = calculateIntraproceduralLoopNestingDepth(node, 0, loopHeaders);
 			node.putAttr(NESTING_DEPTH, depth);
 		}
@@ -312,7 +311,7 @@ public Q getNestedLoopHeaders(){
 		Q loopHeaders = universe().nodesTaggedWithAll(CFGNode.LOOP_HEADER);
 		Q nestedLoopHeaders = Common.empty();
 		for(GraphElement header : loopHeaders.eval().nodes()){
-			Q method = StandardQueries.getContainingMethods(toQ(header));
+			Q method = StandardQueries.getContainingFunctions(toQ(header));
 			Q headersInMethods = getLoopHeadersForMethod(method);
 			int depth = calculateIntraproceduralLoopNestingDepth(header, 1, headersInMethods);
 			if(depth > 0){
@@ -354,7 +353,7 @@ public Q getCallGraph(){
 	 */
 	public static Q getMethodsContainingLoops(){
 		Q headers = Common.universe().nodesTaggedWithAny(LoopAnalyzer.CFGNode.LOOP_HEADER);
-		Q loopingMethods = StandardQueries.getContainingMethods(headers);
+		Q loopingMethods = StandardQueries.getContainingFunctions(headers);
 		return loopingMethods;
 	}
 
@@ -400,7 +399,7 @@ public Q getCallEdgesFromWithinLoops(){
 		//Iterate through the looping CFG nodes and compute the call graph for the methods called from within loops
 		for(GraphElement cfgNode : loopingCFGNodes.eval().nodes()){
 			// Get the methods containing the current cfgNode
-			Q caller = StandardQueries.getContainingMethods(toQ(cfgNode));
+			Q caller = StandardQueries.getContainingFunctions(toQ(cfgNode));
 
 			// Get the call sites containing within the cfgNode
 			Q loopingCallsites = toQ(cfgNode).children().nodesTaggedWithAll(XCSG.CallSite);

SID/src/sid/ui/smart/LoopCallGraphSmartView.java → com.ensoftcorp.open.sid/src/sid/ui/smart/LoopCallGraphSmartView.java

@@ -1,7 +1,5 @@
 package sid.ui.smart;
 
-import java.awt.Color;
-
 import com.ensoftcorp.atlas.core.highlight.Highlighter;
 import com.ensoftcorp.atlas.core.query.Q;
 import com.ensoftcorp.atlas.core.query.Query;