From fbc1bc5b5bd30ee8f106db9f4e74d0d3ccc1ac10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Pl=C3=BCmicke?= <pl@dhbw.de>
Date: Thu, 16 Jul 2015 01:16:06 +0200
Subject: [PATCH] Cloner durch Unify.deepClone in UndMenge.java ersetzt

---
 src/de/dhbwstuttgart/typeinference/UndMenge.java    | 9 +++++----
 src/de/dhbwstuttgart/typeinference/unify/Unify.java | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/de/dhbwstuttgart/typeinference/UndMenge.java b/src/de/dhbwstuttgart/typeinference/UndMenge.java
index 0dd2c06c9..6771bf186 100644
--- a/src/de/dhbwstuttgart/typeinference/UndMenge.java
+++ b/src/de/dhbwstuttgart/typeinference/UndMenge.java
@@ -1,18 +1,19 @@
 package de.dhbwstuttgart.typeinference;
 
+import de.dhbwstuttgart.typeinference.unify.Unify;
 import java.util.Collection;
 import java.util.Iterator;
 
-import com.rits.cloning.Cloner;
+//import com.rits.cloning.Cloner;
 
-public abstract class UndMenge<A> implements KomplexeMenge<A>{
+public abstract class UndMenge<A extends DeepCloneable> implements KomplexeMenge<A>{
 
 	public abstract Menge<? extends KomplexeMenge<A>> getSet();
 
 	@Override
 	public Menge<Menge<A>> cartesianProduct() {
 		Menge<Menge<A>> ret = null;
-		Cloner cloner = new Cloner();
+		//Cloner cloner = new Cloner();
 		for(KomplexeMenge<A> km : this.getSet()){
 			if(ret == null){
 				ret = km.cartesianProduct();
@@ -20,7 +21,7 @@ public abstract class UndMenge<A> implements KomplexeMenge<A>{
 				Menge<Menge<A>> cartesianProduct = new Menge<>();
 				for(Menge<A> r : ret)for(Menge<A> m : km.cartesianProduct()){ //Für jedes Element aus dem Karthesischen Produkt:
 					Menge<A> undElement = new Menge<A>();
-					undElement.addAll(cloner.deepClone(r));
+					undElement.addAll(Unify.deepClone(r));
 					undElement.addAll(m);
 					cartesianProduct.add(undElement);
 				}
diff --git a/src/de/dhbwstuttgart/typeinference/unify/Unify.java b/src/de/dhbwstuttgart/typeinference/unify/Unify.java
index bb561cbf8..dbe8d5e18 100755
--- a/src/de/dhbwstuttgart/typeinference/unify/Unify.java
+++ b/src/de/dhbwstuttgart/typeinference/unify/Unify.java
@@ -3648,7 +3648,7 @@ tempKlasse.get_Superclass_Name() );                 System.out.println( "P. S.:
     	return T instanceof FreshWildcardType;
     }
     
-    private static <A extends DeepCloneable> Menge<A> deepClone(Menge<A> m){
+    public static <A extends DeepCloneable> Menge<A> deepClone(Menge<A> m){
     	
     	Menge<A> ret = m.stream().<A>map((Function<A,A>)(x -> x.deepClone())).<Menge<A>>collect(Menge::new, Menge::add, Menge::addAll);