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

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

Revision: 15
          http://dashg.svn.sourceforge.net/dashg/?rev=15&view=rev
Author:   dbrosius
Date:     2008-10-25 21:14:02 +0000 (Sat, 25 Oct 2008)

Log Message:
-----------
remove unused

Modified Paths:
--------------
    trunk/dashg/src/com/mebigfatguy/dashg/DashGClassAdapter.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-25 14:29:48 UTC (rev 14)
+++ trunk/dashg/src/com/mebigfatguy/dashg/DashGClassAdapter.java	2008-10-25 21:14:02 UTC (rev 15)
@@ -30,14 +30,12 @@
 public class DashGClassAdapter extends ClassAdapter {
 	
 	private final String fullyQualifiedName;
-	private final String className;
 	private final Map<String, Map<Integer, Integer>> methodOffsets;
 	private final Pattern parmsPattern = Pattern.compile("(\\[*)([IJFDBCZS]|L[^;]*;)");
 	
-	public DashGClassAdapter(ClassVisitor visitor, String fileName, String fqn, String clsName, Map<String, Map<Integer, Integer>> offsets) {
+	public DashGClassAdapter(ClassVisitor visitor, String fileName, String fqn, Map<String, Map<Integer, Integer>> offsets) {
 		super(visitor);
 		fullyQualifiedName = fqn;
-		className = clsName;
 		methodOffsets = offsets;
 		super.visitSource(fileName, null);
 	}

Modified: trunk/dashg/src/com/mebigfatguy/dashg/DashGTask.java
===================================================================
--- trunk/dashg/src/com/mebigfatguy/dashg/DashGTask.java	2008-10-25 14:29:48 UTC (rev 14)
+++ trunk/dashg/src/com/mebigfatguy/dashg/DashGTask.java	2008-10-25 21:14:02 UTC (rev 15)
@@ -41,6 +41,7 @@
 import org.objectweb.asm.ClassAdapter;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.util.TraceClassVisitor;
 
 
 public class DashGTask extends Task {
@@ -107,7 +108,7 @@
 			parseJavaPFile(p.getInputStream(), destSrcFile, packageName, fileBaseName);
 			p.waitFor();
 			
-			buildNewClass(new File(baseDirectory, fName), dstClsFile, fileBaseName + ".java", (packageName == null) ? fileBaseName : packageName + "." + fileBaseName, fileBaseName);
+			buildNewClass(new File(baseDirectory, fName), dstClsFile, fileBaseName + ".java", (packageName == null) ? fileBaseName : packageName + "." + fileBaseName);
 		} catch (Exception ioe) {
 			throw new BuildException("Failed generating output files for file " + fName, ioe);
 		}
@@ -175,7 +176,7 @@
 		}
 	}
 
-	public void buildNewClass(File inputClass, File outputClass, String sourceName, String fqn, String className) throws IOException {
+	public void buildNewClass(File inputClass, File outputClass, String sourceName, String fqn) throws IOException {
 		BufferedInputStream bis = null;
 		BufferedOutputStream bos = null;
 		
@@ -183,7 +184,7 @@
 			bis = new BufferedInputStream(new FileInputStream(inputClass));
 			ClassReader cr = new ClassReader(bis);
 			ClassWriter cw = new ClassWriter(cr, ClassWriter.COMPUTE_MAXS);
-			ClassAdapter ca = new DashGClassAdapter(cw, sourceName, fqn, className, methodOffsets);
+			ClassAdapter ca = new DashGClassAdapter(new TraceClassVisitor(cw, new PrintWriter(System.err)), sourceName, fqn, methodOffsets);
 			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.