Verified Commit 1a3be71f authored by Carlos Galindo's avatar Carlos Galindo
Browse files

dependencies: update javaparser to 3.17.0

parent 087c1d72

sdg-cli/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
        <dependency>

            <groupId>com.github.javaparser</groupId>

            <artifactId>javaparser-core</artifactId>

            <version>3.9.1</version>

            <version>3.17.0</version>

        </dependency>

        <dependency>

            <groupId>es.upv.mist.slicing</groupId>

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

+4 −4
Original line number Diff line number Diff line 
package es.upv.mist.slicing.cli;



import com.github.javaparser.JavaParser;

import com.github.javaparser.StaticJavaParser;

import com.github.javaparser.ast.CompilationUnit;

import com.github.javaparser.ast.NodeList;

import com.github.javaparser.ast.comments.BlockComment;
@@ -90,13 +90,13 @@ public class PHPSlice { 
        // Configure JavaParser

        CombinedTypeSolver combinedTypeSolver = new CombinedTypeSolver();

        combinedTypeSolver.add(new ReflectionTypeSolver(true));

        JavaParser.getStaticConfiguration().setSymbolResolver(new JavaSymbolSolver(combinedTypeSolver));

        JavaParser.getStaticConfiguration().setAttributeComments(false);

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

        StaticJavaParser.getConfiguration().setAttributeComments(false);



        // Build the SDG

        NodeList<CompilationUnit> units = new NodeList<>();

        try {

            units.add(JavaParser.parse(scFile));

            units.add(StaticJavaParser.parse(scFile));

        } catch (FileNotFoundException e) {

            throw new ParseException(e.getMessage());

        }

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

+5 −5
Original line number Diff line number Diff line 
package es.upv.mist.slicing.cli;



import com.github.javaparser.JavaParser;

import com.github.javaparser.StaticJavaParser;

import com.github.javaparser.ast.CompilationUnit;

import com.github.javaparser.ast.NodeList;

import com.github.javaparser.ast.comments.BlockComment;
@@ -215,15 +215,15 @@ public class Slicer { 
        combinedTypeSolver.add(new ReflectionTypeSolver(true));

        for (File directory : dirIncludeSet)

            combinedTypeSolver.add(new JavaParserTypeSolver(directory));

        JavaParser.getStaticConfiguration().setSymbolResolver(new JavaSymbolSolver(combinedTypeSolver));

        JavaParser.getStaticConfiguration().setAttributeComments(false);

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

        StaticJavaParser.getConfiguration().setAttributeComments(false);



        // Build the SDG

        NodeList<CompilationUnit> units = new NodeList<>();

        try {

            for (File directory : dirIncludeSet)

                units.add(JavaParser.parse(directory));

            CompilationUnit scUnit = JavaParser.parse(scFile);

                units.add(StaticJavaParser.parse(directory));

            CompilationUnit scUnit = StaticJavaParser.parse(scFile);

            if (!units.contains(scUnit))

                units.add(scUnit);

        } catch (FileNotFoundException e) {

sdg-core/pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ 
        <dependency>

            <groupId>com.github.javaparser</groupId>

            <artifactId>javaparser-core</artifactId>

            <version>3.9.1</version>

            <version>3.17.0</version>

        </dependency>

        <dependency>

            <groupId>com.github.javaparser</groupId>

            <artifactId>javaparser-symbol-solver-core</artifactId>

            <version>3.9.1</version>

            <version>3.17.0</version>

        </dependency>

        <dependency>

            <groupId>org.jgrapht</groupId>

sdg-core/src/main/java/es/upv/mist/slicing/graphs/GraphNodeContentVisitor.java

+2 −2
Original line number Diff line number Diff line
@@ -123,8 +123,8 @@ public class GraphNodeContentVisitor<A> extends VoidVisitorAdapter<A> { 
    }



    @Override

    public void visit(SwitchEntryStmt n, A arg) {

        n.getLabel().ifPresent(l -> l.accept(this, arg));

    public void visit(SwitchEntry n, A arg) {

        n.getLabels().forEach(l -> l.accept(this, arg));

    }



    @Override