From 5b9cabb3e16331b01071b6a8c97b6bc72f82937f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Pl=C3=BCmicke?= <pl@dhbw.de>
Date: Fri, 5 Dec 2014 17:47:34 +0100
Subject: [PATCH 1/3] Wildcards im Subst im Unify eingefuegt Kommentare

---
 src/de/dhbwstuttgart/typeinference/unify/Unify.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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();

From e8b03d5717c79ea996af15642b0f7c9ee4abc693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Pl=C3=BCmicke?= <pl@dhbw.de>
Date: Fri, 2 Jan 2015 15:54:59 +0100
Subject: [PATCH 2/3] Pfad in Bytecode/Classfile angepasst

---
 bin/.gitignore                               | 4 +++-
 src/de/dhbwstuttgart/bytecode/ClassFile.java | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/.gitignore b/bin/.gitignore
index ba369ba7..a3254800 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,6 +1,8 @@
+/bytecode/
 /de/
+/log4j.xml
+/log4jTesting.xml
 /mycompiler/
 /parser/
 /plugindevelopment/
 /syntaxTree/
-/bytecode/
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);
     

From e49a8463b8369f43660bfad133ab8b58736e6cf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Pl=C3=BCmicke?= <pl@dhbw.de>
Date: Fri, 2 Jan 2015 16:13:03 +0100
Subject: [PATCH 3/3] merge conlict in bin/.gitignore behoben

---
 bin/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/.gitignore b/bin/.gitignore
index 1431cd5f..fb7b1f33 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -2,3 +2,4 @@
 /de/
 /plugindevelopment/
 /syntaxTree/
+/mycompiler/