[Dashg-commit] SF.net SVN: dashg:[28] trunk/dashg/src/com/mebigfatguy/dashg

[<dbr...@us...>]

Revision: 28
          http://dashg.svn.sourceforge.net/dashg/?rev=28&view=rev
Author:   dbrosius
Date:     2008-10-28 17:40:18 +0000 (Tue, 28 Oct 2008)

Log Message:
-----------
strip the offsets stuff, in lieu of moving to asm

Modified Paths:
--------------
    trunk/dashg/src/com/mebigfatguy/dashg/DashGClassAdapter.java
    trunk/dashg/src/com/mebigfatguy/dashg/DashGMethodAdapter.java
    trunk/dashg/src/com/mebigfatguy/dashg/DashGTask.java

Modified: trunk/dashg/src/com/mebigfatguy/dashg/DashGClassAdapter.java
===================================================================
--- trunk/dashg/src/com/mebigfatguy/dashg/DashGClassAdapter.java	2008-10-28 17:29:39 UTC (rev 27)
+++ trunk/dashg/src/com/mebigfatguy/dashg/DashGClassAdapter.java	2008-10-28 17:40:18 UTC (rev 28)
@@ -25,9 +25,12 @@
 
 public class DashGClassAdapter extends ClassAdapter {
 	
-	public DashGClassAdapter(ClassVisitor visitor, String fileName) {
+	private DashGLineNumberer lineNumberer;
+	
+	public DashGClassAdapter(ClassVisitor visitor, DashGLineNumberer ln, String fileName) {
 		super(visitor);
 		super.visitSource(fileName, null);
+		lineNumberer = ln;
 	}
 
 	@Override
@@ -40,6 +43,6 @@
 			return super.visitMethod(access, name, desc, signature, exceptions);
 		
 		MethodVisitor mv = super.visitMethod(access, name, desc, signature, exceptions);
-		return new DashGMethodAdapter(mv, name+desc);
+		return new DashGMethodAdapter(mv, lineNumberer, name+desc);
 	}
 }

Modified: trunk/dashg/src/com/mebigfatguy/dashg/DashGMethodAdapter.java
===================================================================
--- trunk/dashg/src/com/mebigfatguy/dashg/DashGMethodAdapter.java	2008-10-28 17:29:39 UTC (rev 27)
+++ trunk/dashg/src/com/mebigfatguy/dashg/DashGMethodAdapter.java	2008-10-28 17:40:18 UTC (rev 28)
@@ -24,10 +24,12 @@
 
 public class DashGMethodAdapter extends MethodAdapter {
 
+	DashGLineNumberer lineNumberer;
 	String methodName;
 	
-	public DashGMethodAdapter(MethodVisitor mv, String name) {
+	public DashGMethodAdapter(MethodVisitor mv, DashGLineNumberer ln, String name) {
 		super(mv);
+		lineNumberer = ln;
 		methodName = name;
 	}
 
@@ -110,8 +112,6 @@
 	private void addLine() {
 		Label l = new Label();
 		super.visitLabel(l);
-		Integer srcLine = Integer.valueOf(0);
-		if (srcLine != null)
-			super.visitLineNumber(srcLine.intValue(), l);
+		super.visitLineNumber(lineNumberer.getLineNumber(), l);
 	}
 }

Modified: trunk/dashg/src/com/mebigfatguy/dashg/DashGTask.java
===================================================================
--- trunk/dashg/src/com/mebigfatguy/dashg/DashGTask.java	2008-10-28 17:29:39 UTC (rev 27)
+++ trunk/dashg/src/com/mebigfatguy/dashg/DashGTask.java	2008-10-28 17:40:18 UTC (rev 28)
@@ -115,7 +115,8 @@
 			ClassReader cr = new ClassReader(bis);
 			ClassWriter cw = new ClassWriter(cr, ClassWriter.COMPUTE_MAXS);
 			
-			ClassAdapter ca = new DashGClassAdapter(new TraceClassVisitor(cw, new DashGSourceWriter(pw, packageName)), baseName);
+			DashGSourceWriter sw = new DashGSourceWriter(pw, packageName);
+			ClassAdapter ca = new DashGClassAdapter(new TraceClassVisitor(cw, sw), sw, baseName);
 			cr.accept(ca, 0);
 			
 			byte[] classData = cw.toByteArray();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.