diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index 34ddca33..00000000 --- a/bin/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/de/ -/plugindevelopment/ diff --git a/src/de/dhbwstuttgart/bytecode/ClassFile.java b/src/de/dhbwstuttgart/bytecode/ClassFile.java index d5165110..9fc2cd91 100755 --- a/src/de/dhbwstuttgart/bytecode/ClassFile.java +++ b/src/de/dhbwstuttgart/bytecode/ClassFile.java @@ -744,7 +744,8 @@ public class ClassFile // Datei vorbereiten //File file = new File(MyCompiler.getAPI().getOutputDir() - File file = new File ("/Users/pl/forschung/PIZZA+/JVM_Generics/Testfiles/" + File file = new File ("/Users/pl/ResearchPapers/PIZZA+/Intersection_Types/" + //File file = new File ("/Users/pl/ResearchPapers/PIZZA+/JVM_Generics/Testfiles/" + class_name + ".class"); FileOutputStream f = new FileOutputStream(file); diff --git a/src/de/dhbwstuttgart/typeinference/unify/Unify.java b/src/de/dhbwstuttgart/typeinference/unify/Unify.java index 3c281407..af749307 100755 --- a/src/de/dhbwstuttgart/typeinference/unify/Unify.java +++ b/src/de/dhbwstuttgart/typeinference/unify/Unify.java @@ -2400,7 +2400,7 @@ throws MatchException return true; } } - //Wildcard ergänzt PL 12-12-05 + //Wildcard ergänzt PL 14-12-05 if ( T instanceof ExtendsWildcardType ) { Type Temp = ((ExtendsWildcardType) T).get_ExtendsType(); @@ -2415,7 +2415,7 @@ throws MatchException } } } - + //Wildcard ergänzt PL 14-12-05 if ( T instanceof SuperWildcardType ) { Type Temp = ((SuperWildcardType) T).get_SuperType();