Commit 7063f160 authored by Sergio Pérez's avatar Sergio Pérez
Browse files

Merge remote-tracking branch 'origin/develop' into Sergio 

# Conflicts:
#	sdg-core/src/main/java/es/upv/mist/slicing/graphs/ClassGraph.java
#	sdg-core/src/main/java/es/upv/mist/slicing/nodes/VariableVisitor.java
#	sdg-core/src/main/java/es/upv/mist/slicing/utils/ASTUtils.java
parents 83db3876 52f3a6cd

LICENSE

0 → 100644
+661 −0

File added.

Preview size limit exceeded, changes collapsed.

sdg-cli/src/main/java/es/upv/mist/slicing/cli/PHPSlice.java

+2 −6
Original line number Diff line number Diff line
@@ -4,9 +4,6 @@ import com.github.javaparser.StaticJavaParser; 
import com.github.javaparser.ast.CompilationUnit;

import com.github.javaparser.ast.NodeList;

import com.github.javaparser.ast.comments.BlockComment;

import com.github.javaparser.symbolsolver.JavaSymbolSolver;

import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;

import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;

import es.upv.mist.slicing.graphs.augmented.ASDG;

import es.upv.mist.slicing.graphs.augmented.PSDG;

import es.upv.mist.slicing.graphs.cfg.CFG;
@@ -16,6 +13,7 @@ import es.upv.mist.slicing.slicing.FileLineSlicingCriterion; 
import es.upv.mist.slicing.slicing.NodeIdSlicingCriterion;

import es.upv.mist.slicing.slicing.Slice;

import es.upv.mist.slicing.slicing.SlicingCriterion;

import es.upv.mist.slicing.utils.StaticTypeSolver;

import org.apache.commons.cli.*;



import java.io.File;
@@ -88,9 +86,7 @@ public class PHPSlice { 


    public void slice() throws ParseException, IOException {

        // Configure JavaParser

        CombinedTypeSolver combinedTypeSolver = new CombinedTypeSolver();

        combinedTypeSolver.add(new ReflectionTypeSolver(true));

        StaticJavaParser.getConfiguration().setSymbolResolver(new JavaSymbolSolver(combinedTypeSolver));

        StaticTypeSolver.addTypeSolverJRE();

        StaticJavaParser.getConfiguration().setAttributeComments(false);



        // Build the SDG

sdg-cli/src/main/java/es/upv/mist/slicing/cli/Slicer.java

+5 −9
Original line number Diff line number Diff line
@@ -5,10 +5,7 @@ import com.github.javaparser.ast.CompilationUnit; 
import com.github.javaparser.ast.NodeList;

import com.github.javaparser.ast.comments.BlockComment;

import com.github.javaparser.ast.nodeTypes.NodeWithName;

import com.github.javaparser.symbolsolver.JavaSymbolSolver;

import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;

import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver;

import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;

import es.upv.mist.slicing.graphs.augmented.ASDG;

import es.upv.mist.slicing.graphs.jsysdg.JSysDG;

import es.upv.mist.slicing.graphs.augmented.PSDG;
@@ -17,6 +14,7 @@ import es.upv.mist.slicing.graphs.sdg.SDG; 
import es.upv.mist.slicing.slicing.FileLineSlicingCriterion;

import es.upv.mist.slicing.slicing.Slice;

import es.upv.mist.slicing.slicing.SlicingCriterion;

import es.upv.mist.slicing.utils.StaticTypeSolver;

import org.apache.commons.cli.*;



import java.io.File;
@@ -50,7 +48,7 @@ public class Slicer { 
                .build());

        OPTIONS.addOption(Option

                .builder("l").longOpt("line")

                .hasArg().argName("lineNumber").type(Integer.class)

                .hasArg().argName("lineNumber").type(Number.class)

                .desc("The line that contains the statement of the slicing criterion.")

                .build());

        OPTIONS.addOption(Option
@@ -127,7 +125,7 @@ public class Slicer { 
            }

        } else if (cliOpts.hasOption('f') && cliOpts.hasOption('l')) {

            setScFile(cliOpts.getOptionValue('f'));

            setScLine((Integer) cliOpts.getParsedOptionValue("l"));

            setScLine(((Number) cliOpts.getParsedOptionValue("l")).intValue());

            if (cliOpts.hasOption('v')) {

                if (cliOpts.hasOption('n'))

                    setScVars(cliOpts.getOptionValues('v'), cliOpts.getOptionValues('n'));
@@ -212,11 +210,9 @@ public class Slicer { 


    public void slice() throws ParseException {

        // Configure JavaParser

        CombinedTypeSolver combinedTypeSolver = new CombinedTypeSolver();

        combinedTypeSolver.add(new ReflectionTypeSolver(true));

        StaticTypeSolver.addTypeSolverJRE();

        for (File directory : dirIncludeSet)

            combinedTypeSolver.add(new JavaParserTypeSolver(directory));

        StaticJavaParser.getConfiguration().setSymbolResolver(new JavaSymbolSolver(combinedTypeSolver));

            StaticTypeSolver.addTypeSolver(new JavaParserTypeSolver(directory));

        StaticJavaParser.getConfiguration().setAttributeComments(false);



        // Build the SDG

sdg-core/src/main/java/es/upv/mist/slicing/arcs/clg/ExtendsArc.java

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
package es.upv.mist.slicing.arcs.clg;



import es.upv.mist.slicing.arcs.Arc;

import es.upv.mist.slicing.graphs.ClassGraph;

import org.jgrapht.nio.Attribute;

import org.jgrapht.nio.DefaultAttribute;





import java.util.Map;





/**

 * An edge of the {@link ClassGraph}. Represents the inheritance relationship in Java.

 * It goes from the base class to the derived class

 */



public class ExtendsArc extends Arc {

    public Map<String, Attribute> getDotAttributes() {

        Map<String, Attribute> map = super.getDotAttributes();

        map.put("style", DefaultAttribute.createAttribute("dashed"));

        return map;

    }

}

sdg-core/src/main/java/es/upv/mist/slicing/arcs/clg/ImplementsArc.java

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
package es.upv.mist.slicing.arcs.clg;



import es.upv.mist.slicing.arcs.Arc;

import es.upv.mist.slicing.graphs.ClassGraph;

import org.jgrapht.nio.Attribute;

import org.jgrapht.nio.DefaultAttribute;



import java.util.Map;



/**

 * An edge of the {@link ClassGraph}. Represents the implements relationship in Java.

 * It goes from the interface to the class that implements it.

 */



public class ImplementsArc extends Arc {

    public Map<String, Attribute> getDotAttributes() {

        Map<String, Attribute> map = super.getDotAttributes();

        map.put("style", DefaultAttribute.createAttribute("dashed"));

        return map;

    }

}