lots of refactoring going

src/dot/APatternBuilder.java

@@ -16,13 +16,13 @@ public ClassVisitor getVisitor() {
 	}
 
 	@Override
-	protected IClassRecord applyDecoration(IClassRecord record) {
-		if (this.isPattern(record)) {
-			this.applyPattern(record);
-		}
+	public IClassRecord applyDecoration(IClassRecord record) {
+//		if (this.isPattern(record)) {
+//			this.applyPattern(record);
+//		}
 		return record;
 	}
 
-	abstract protected boolean isPattern(IClassRecord record);
-	abstract protected void applyPattern(IClassRecord record);
+	public abstract boolean isPattern(IClassRecord record);
+	public abstract void applyPattern(IClassRecord record);
 }

src/dot/AbstractBuilderDecorator.java

@@ -1,16 +1,17 @@
 package dot;
 
+import java.util.HashMap;
 import java.util.HashSet;
 
 import org.objectweb.asm.ClassVisitor;
 
 import records.ClassRecord;
 import records.IClassRecord;
 
-abstract public class AbstractBuilderDecorator implements IBuilder{
+abstract public class AbstractBuilderDecorator implements IBuilder {
 	protected IBuilder builder;
 	protected IClassRecord record;
-	
+
 	public AbstractBuilderDecorator(String className, HashSet<String> classNames) {
 		this(new UmlBuilder(className, classNames));
 	}
@@ -30,9 +31,9 @@ public IClassRecord build(ClassVisitor visitor) {
 	}
 
 	abstract public ClassVisitor getVisitor();
-//	public ClassVisitor getVisitor() {
-//		return builder.getVisitor();
-//	}
+	// public ClassVisitor getVisitor() {
+	// return builder.getVisitor();
+	// }
 
 	public String getClassUML() {
 		return this.record.getClassUml();
@@ -41,11 +42,24 @@ public String getClassUML() {
 	public HashSet<String> getClassList() {
 		return builder.getClassList();
 	}
-	
+
 	public ClassRecord getClassRecord() {
 		return this.builder.getClassRecord();
 	}
-
-	protected abstract IClassRecord applyDecoration(IClassRecord record);
+
+	public abstract IClassRecord applyDecoration(IClassRecord record);
+
+	public void calculatePattern(IClassRecord record, HashMap<String, IClassRecord> records) {
+		if (this.isPattern(record)) {
+			this.applyPattern(record);
+		}
+	}
+
+	public boolean isPattern(IClassRecord record) {
+		return false;
+	};
+
+	public void applyPattern(IClassRecord record) {
+	};
 
 }

src/dot/AdapterBuilder.java

@@ -2,38 +2,66 @@
 
 import java.util.HashSet;
 
-import org.objectweb.asm.ClassVisitor;
-
-import records.ClassRecord;
+import records.ExtendedClassRecord;
 import records.IClassRecord;
-import records.SingletonRecord;
+import records.ImplementsClassRecord;
+import records.InstanceVarRecord;
+import records.MethodRecord;
 
-public class AdapterBuilder extends PatternDetection {
-	private UmlBuilder builder;
-	private ClassRecord record;
-
-	public AdapterBuilder(String className, HashSet<String> classNameList) {
-		super(className, classNameList);
-		// TODO Auto-generated constructor stub
+public class AdapterBuilder extends APatternBuilder {
+	public AdapterBuilder(IBuilder b) {
+		super(b);
 	}
+
 	@Override
-	public ClassRecord build(ClassVisitor visitor){
-		this.record =this.builder.build(visitor);
-		if(this.isPattern()){
-			this.record.setBoxColor("red1");
-			this.record.addPattern("Decorator");
-
+	public boolean isPattern(IClassRecord record) {
+		boolean hasAdapteeFieldAndConstructor = false;
+		boolean extendsImplementsOtherClass = false;
+		HashSet<String> possibles = new HashSet<String>();
+		if (record.canConvertRecord(ExtendedClassRecord.class)) {
+			ExtendedClassRecord extendedClassRecord = (ExtendedClassRecord) record
+					.tryConvertRecord(ExtendedClassRecord.class);
+			possibles.add(extendedClassRecord.getExtendsName());
+		}
+		if (record.canConvertRecord(ImplementsClassRecord.class)) {
+			ImplementsClassRecord implementsClassRecord = (ImplementsClassRecord) record
+					.tryConvertRecord(ImplementsClassRecord.class);
+			possibles.addAll(implementsClassRecord.getImplementsList());
 		}
-//		for(String s:){
-//			this.record.addEdge(s);
-//		}
-
-		return record;
+		for (String possible : possibles) {
+			if (record.getClassList().contains(possible.replace("/", "."))) {
+				extendsImplementsOtherClass = true;
+			}
+		}
+		System.out.println("\nin is pattern");
+		System.out.println(this.getClassRecord().getClassName());
+		System.out.println(record.getClassList());
+		HashSet<String> fields = new HashSet<String>();
+		if (extendsImplementsOtherClass) {
+			for (InstanceVarRecord field : record.getBaseRecord().getFieldsList()) {
+				fields.add(field.getType());
+			}
+
+			for (MethodRecord methodRecord : record.getBaseRecord().getMethodsList()) {
+				System.out.println(methodRecord.getName());
+				if (methodRecord.getName().equals("<init>")) {
+					System.out.println(methodRecord.getStypes());
+					System.out.println("init");
+					for (String arg : methodRecord.getStypes()) {
+						if (fields.contains(arg)) {
+							hasAdapteeFieldAndConstructor = true;
+						}
+					}
+				}
+			}
+		}
+		System.out.println("hasAdapteeFieldAndConstructor: " + hasAdapteeFieldAndConstructor
+				+ " && extendsImplementsOtherClass: " + extendsImplementsOtherClass);
+		return hasAdapteeFieldAndConstructor && extendsImplementsOtherClass;
 	}
+
 	@Override
-	public boolean isPattern() {
-		// TODO Auto-generated method stub
-		return false;
-	}
+	public void applyPattern(IClassRecord record) {
 
+	}
 }

src/dot/AssociationBuilder.java

@@ -28,7 +28,7 @@ public ClassVisitor getVisitor() {
 	}
 
 	@Override
-	protected IClassRecord applyDecoration(IClassRecord record) {
+	public IClassRecord applyDecoration(IClassRecord record) {
 		AssociationClassRecord associationRecord = new AssociationClassRecord(record);
 		associationRecord.setAssociationNames(this.visitor.getAssociationNames());
 		return associationRecord;

src/dot/DecoratorBuilder.java

@@ -34,7 +34,7 @@ public boolean isPattern(IClassRecord record) {
 	}
 
 	@Override
-	protected void applyPattern(IClassRecord record) {
+	public void applyPattern(IClassRecord record) {
 		// TODO Auto-generated method stub
 	}
 

src/dot/ExtensionBuilder.java

@@ -27,7 +27,7 @@ public ClassVisitor getVisitor() {
 	}
 
 	@Override
-	protected IClassRecord applyDecoration(IClassRecord record) {
+	public IClassRecord applyDecoration(IClassRecord record) {
 		ExtendedClassRecord extendedRecord = new ExtendedClassRecord(record);
 		extendedRecord.setExtendsName(this.visitor.getExtendsName());
 		return extendedRecord;

src/dot/IBuilder.java

@@ -1,5 +1,6 @@
 package dot;
 
+import java.util.HashMap;
 import java.util.HashSet;
 
 import org.objectweb.asm.ClassVisitor;
@@ -22,4 +23,6 @@ public interface IBuilder {
 	String getClassUML();
 	HashSet<String> getClassList();
 	ClassRecord getClassRecord();
+	public IClassRecord applyDecoration(IClassRecord record);
+	public void calculatePattern(IClassRecord record, HashMap<String, IClassRecord> records);
 }

src/dot/ImplementsBuilder.java

@@ -26,7 +26,7 @@ public ClassVisitor getVisitor() {
 	}
 
 	@Override
-	protected IClassRecord applyDecoration(IClassRecord record) {
+	public IClassRecord applyDecoration(IClassRecord record) {
 		ImplementsClassRecord implementsRecord = new ImplementsClassRecord(record);
 		implementsRecord.setImplementsList(this.visitor.getImplementsList());
 		return implementsRecord;

src/dot/SingletonBuilder.java

@@ -13,7 +13,7 @@ public SingletonBuilder(IBuilder b) {
 		super(b);
 	}
 
-	protected void applyPattern(IClassRecord record) {
+	public void applyPattern(IClassRecord record) {
 		ClassRecord baseRecord = record.getBaseRecord();
 		baseRecord.setBoxColor("blue1");
 		baseRecord.addPattern("Singleton");
@@ -22,7 +22,7 @@ protected void applyPattern(IClassRecord record) {
 		baseRecord.addEdge(shortClassName + " -> " + shortClassName + "\n");
 	};
 
-	protected boolean isPattern(IClassRecord record) {
+	public boolean isPattern(IClassRecord record) {
 		ClassRecord baseRecord = record.getBaseRecord();
 		boolean hasField = false;
 		for (InstanceVarRecord field : baseRecord.getFieldsList()) {

src/dot/UmlBuilder.java

@@ -1,6 +1,7 @@
 package dot;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.HashSet;
 
 import org.objectweb.asm.ClassReader;
@@ -11,6 +12,7 @@
 import asm.ClassFieldVisitor;
 import asm.ClassMethodVisitor;
 import records.ClassRecord;
+import records.IClassRecord;
 
 public class UmlBuilder implements IBuilder {
 	private ClassRecord record;
@@ -77,4 +79,13 @@ public String getClassUML() {
 	public ClassRecord getClassRecord() {
 		return this.record;
 	}
+
+	@Override
+	public IClassRecord applyDecoration(IClassRecord record) {
+		return record;
+	}
+
+	@Override
+	public void calculatePattern(IClassRecord record, HashMap<String, IClassRecord> records) {
+	}
 }

src/dot/UsesBuilder.java

@@ -32,7 +32,7 @@ public ClassVisitor getVisitor() {
 	}
 
 	@Override
-	protected IClassRecord applyDecoration(IClassRecord record) {
+	public IClassRecord applyDecoration(IClassRecord record) {
 		UsesClassRecord usesClassRecord = new UsesClassRecord(record);
 		usesClassRecord.setUsesNamesList(this.visitor.getUsesNames());
 		return usesClassRecord;