From 267083fbb41edab3ac683e0fb26b316d8828c140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Pl=C3=BCmicke?= <pl@dhbw.de>
Date: Sat, 7 Feb 2015 15:19:10 +0100
Subject: [PATCH] debug Ausgabe korriegiert!

---
 .../typeinference/unify/Unify.java            | 38 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/de/dhbwstuttgart/typeinference/unify/Unify.java b/src/de/dhbwstuttgart/typeinference/unify/Unify.java
index 9a990f4c4..4cfc0fbee 100755
--- a/src/de/dhbwstuttgart/typeinference/unify/Unify.java
+++ b/src/de/dhbwstuttgart/typeinference/unify/Unify.java
@@ -1499,6 +1499,42 @@ throws MatchException
                     bRegel = true;
                     continue;
                 }
+                
+                if (P.OperatorSmallerExtends())    //PL 15-02-03 Es muessen noch  
+                {	
+                	if(P.TA1 instanceof ExtendsWildcardType && P.TA2 instanceof ExtendsWildcardType)
+                	{                		
+                	
+                		inferencelog.debug("  Extends <? Extends");
+                    
+                		H.add(new Pair(((WildcardType)P.TA1).GetWildcardType(),((WildcardType)P.TA2).GetWildcardType(), PairOperator.Equal));
+                		bRegel = true;
+                		continue;
+                		
+                	}
+                	
+                	if(P.TA1 instanceof SuperWildcardType && P.TA2 instanceof SuperWildcardType)
+                	{                		
+                	
+                		inferencelog.debug("  Super <? Super");
+                    
+                		H.add(new Pair(((WildcardType)P.TA1).GetWildcardType(),((WildcardType)P.TA2).GetWildcardType(), PairOperator.Equal));
+                		bRegel = true;
+                		continue;
+                		
+                	}
+                	
+                	if(P.TA1 instanceof ExtendsWildcardType && P.TA2 instanceof SuperWildcardType)
+                	{                		
+                	
+                		inferencelog.debug("  Extends <? Super");
+                    
+                		H.add(new Pair(((WildcardType)P.TA1).GetWildcardType(),((WildcardType)P.TA2).GetWildcardType(), PairOperator.Smaller));
+                		bRegel = true;
+                		continue;
+                		
+                	}
+                }
     
                 // Subst --> noch zu pr�fen
                 if( P.TA1 instanceof TypePlaceholder && P.OperatorEqual() && useSubst) //&& P.TA2 instanceof RefType )
@@ -1539,7 +1575,7 @@ throws MatchException
                         if( !P.bSubst )
                         {
                             inferencelog.debug("  ================================");
-                            inferencelog.debug("  SUBSTITUTE: in " + E.elementAt(q).toString() + " alle " + P.TA1.getName() + " durch " + P.TA2.getName());
+                            inferencelog.debug("  SUBSTITUTE: in " + H.elementAt(q).toString() + " alle " + P.TA1.getName() + " durch " + P.TA2.getName());
                             inferencelog.debug("  ================================");
                             bRegel  = true;
                             bTempSubst = true;