From 5a00b70ea80176f6d5f4c83a3d397c46f707d8c1 Mon Sep 17 00:00:00 2001 From: "pl@gohorb.ba-horb.de" Date: Fri, 16 Oct 2020 14:54:36 +0200 Subject: [PATCH] modified: ../../../../main/java/de/dhbwstuttgart/bytecode/TPHExtractor.java modified: ../../../../main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java modified: ../../../java/AllgemeinTest.java modified: ../../bytecode/javFiles/FieldTphConsMeth.jav --- src/main/java/de/dhbwstuttgart/bytecode/TPHExtractor.java | 2 +- .../bytecode/genericsGenerator/GeneratedGenericsFinder.java | 2 +- src/test/java/AllgemeinTest.java | 3 ++- src/test/resources/bytecode/javFiles/FieldTphConsMeth.jav | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/dhbwstuttgart/bytecode/TPHExtractor.java b/src/main/java/de/dhbwstuttgart/bytecode/TPHExtractor.java index 9e73fb03..f6292f3b 100644 --- a/src/main/java/de/dhbwstuttgart/bytecode/TPHExtractor.java +++ b/src/main/java/de/dhbwstuttgart/bytecode/TPHExtractor.java @@ -196,7 +196,7 @@ public class TPHExtractor extends AbstractASTWalker { cons.getParameterList().accept(this); if(cons.block != null) cons.block.accept(this); - inMethod = true; + inMethod = true; } @Override diff --git a/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java b/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java index ba55c4c7..c8d9b2e0 100644 --- a/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java +++ b/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java @@ -71,7 +71,7 @@ public class GeneratedGenericsFinder implements ASTVisitor { private Collection listOfResultSets; private SourceFile sf; private List tphsClass; - private GenericGenratorResultForSourceFile generatedGenericsForSF; + private GenericGenratorResultForSourceFile generatedGenericsForSF;//Ergebnis des GGenerics private ResultSet resultSet; private final List methodNameAndParamsT = new ArrayList<>(); diff --git a/src/test/java/AllgemeinTest.java b/src/test/java/AllgemeinTest.java index 73f29ea9..c937035e 100644 --- a/src/test/java/AllgemeinTest.java +++ b/src/test/java/AllgemeinTest.java @@ -39,7 +39,8 @@ public class AllgemeinTest { //String className = "Pair"; //String className = "FCTest3"; //String className = "Var"; - String className = "Put"; + //String className = "Put"; + String className = "Twice"; //PL 2019-10-24: genutzt fuer unterschiedliche Tests path = System.getProperty("user.dir")+"/src/test/resources/AllgemeinTest/" + className + ".jav"; //path = System.getProperty("user.dir")+"/src/test/resources/AllgemeinTest/Overloading_Generics.jav"; diff --git a/src/test/resources/bytecode/javFiles/FieldTphConsMeth.jav b/src/test/resources/bytecode/javFiles/FieldTphConsMeth.jav index dd4d9bde..cf195bd2 100644 --- a/src/test/resources/bytecode/javFiles/FieldTphConsMeth.jav +++ b/src/test/resources/bytecode/javFiles/FieldTphConsMeth.jav @@ -9,10 +9,10 @@ public class FieldTphConsMeth { return b; } - /*setA(x) { + setA(x) { a = x; return a; - }*/ + } m(x,y) { x = id(y);