Fixing odd merge.

Author: CJ Miller

src/edu/rosehulman/cjjb/asm/ClassMethodVisitor.java

@@ -33,7 +33,7 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
 		if (name.contains("<"))
 			return toDecorate;
 
-		MethodCallGroup method = new MethodCallGroup(className, name);
+		MethodCallGroup method = new MethodCallGroup(className, new QualifiedMethod(name, desc));
 		toDecorate = new ClassMethodLineVisitor(this.api, toDecorate, method, this.model);
 
 

src/edu/rosehulman/cjjb/asm/MethodCallGroup.java

@@ -13,7 +13,6 @@ public MethodCallGroup(String classCaller, QualifiedMethod method) {
 		this.classCaller = classCaller;
 		this.method = method;
 		lines = new LinkedList<MethodCallLine>();
-		this.name = name;
 	}
 
 	public void addLine(MethodCallLine line) {

test/SDTest.java

@@ -9,6 +9,7 @@
 import org.junit.Test;
 
 import edu.rosehulman.cjjb.JavaModelClassVisitor;
+import edu.rosehulman.cjjb.asm.QualifiedMethod;
 import edu.rosehulman.cjjb.javaModel.visitor.ISequenceVisitor;
 import edu.rosehulman.cjjb.javaModel.visitor.SDSequenceVisitor;
 
@@ -19,9 +20,9 @@ public void testSDDiagram() throws IOException {
 		classes.add("Class1");
 		classes.add("Class2");
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		JavaModelClassVisitor vis = new JavaModelClassVisitor(classes, out, "sampleClasses.Class1", "publicVoidMethod", 2);
+		JavaModelClassVisitor vis = new JavaModelClassVisitor(classes, out, "sampleClasses.Class1", new QualifiedMethod("publicVoidMethod", "TO CHANGE"), 2);
 		vis.buildSeqModel();
-		ISequenceVisitor seqVisitor = new SDSequenceVisitor("sampleClasses.Class1", "publicVoidMethod", 2, out);
+		ISequenceVisitor seqVisitor = new SDSequenceVisitor("sampleClasses.Class1", new QualifiedMethod("publicVoidMethod", "TO CHANGE"), 2, out);
 		vis.getModel().accept(seqVisitor);
 		String result = new String(out.toByteArray());