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

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

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

Log Message:
-----------
cleanup src output

Modified Paths:
--------------
    trunk/dashg/src/com/mebigfatguy/dashg/DashGClassSourcePrintingVisitor.java
    trunk/dashg/src/com/mebigfatguy/dashg/DashGMethodSourcePrintingVisitor.java

Modified: trunk/dashg/src/com/mebigfatguy/dashg/DashGClassSourcePrintingVisitor.java
===================================================================
--- trunk/dashg/src/com/mebigfatguy/dashg/DashGClassSourcePrintingVisitor.java	2008-10-28 22:05:17 UTC (rev 38)
+++ trunk/dashg/src/com/mebigfatguy/dashg/DashGClassSourcePrintingVisitor.java	2008-10-28 22:19:03 UTC (rev 39)
@@ -71,7 +71,7 @@
 			
 		pw.print(DashGUtils.getAttribute(access));
 		
-		pw.print(clsName + ' ');
+		pw.print("class " + clsName + ' ');
 		
 		if (!superName.equals("java/lang/Object"))
 			pw.print("extends " + superName.replace('/', '.') + ' ');
@@ -126,7 +126,8 @@
 			name = clsName;
 		pw.print(name);
 		List<String> args = DashGUtils.getArguments(desc);
-		String comma = "(";
+		pw.print('(');
+		String comma = "";
 		int parmNum = ((access & Opcodes.ACC_STATIC) != 0) ? 0 : 1;
 		for (String a : args) {
 			pw.print(comma);

Modified: trunk/dashg/src/com/mebigfatguy/dashg/DashGMethodSourcePrintingVisitor.java
===================================================================
--- trunk/dashg/src/com/mebigfatguy/dashg/DashGMethodSourcePrintingVisitor.java	2008-10-28 22:05:17 UTC (rev 38)
+++ trunk/dashg/src/com/mebigfatguy/dashg/DashGMethodSourcePrintingVisitor.java	2008-10-28 22:19:03 UTC (rev 39)
@@ -19,6 +19,7 @@
 package com.mebigfatguy.dashg;
 
 import java.io.PrintWriter;
+import java.text.MessageFormat;
 import java.text.NumberFormat;
 import java.util.HashMap;
 import java.util.Map;
@@ -31,19 +32,17 @@
 
 public class DashGMethodSourcePrintingVisitor implements MethodVisitor {
 
+	private static final String BLANKS = "     ";
+	
 	private MethodVisitor mv;
 	private PrintWriter pw;
 	private DashGLineNumberer ln;
-	private NumberFormat nf;
 	private Map<String, Integer> labelsToOffset;
 	
 	public DashGMethodSourcePrintingVisitor(MethodVisitor mVisitor, PrintWriter pWriter, DashGLineNumberer lineNumberer) {
 		mv = mVisitor;
 		pw = pWriter;
 		ln = lineNumberer;
-		nf = NumberFormat.getIntegerInstance();
-		nf.setMinimumIntegerDigits(5);
-		nf.setGroupingUsed(false);
 		labelsToOffset = new HashMap<String, Integer>();
 	}
 
@@ -208,7 +207,12 @@
 		Label l = new Label();
 		mv.visitLabel(l);
 		mv.visitLineNumber(ln.getLineNumber(), l);
-		pw.println("\t\tpc = " + nf.format(l.getOffset()) + "   // \t\t" + insn);
+		pw.println("\t\tpc = " + formatOffset(l.getOffset()) + ";   // \t\t" + insn);
 		ln.inc();
 	}
+	
+	private String formatOffset(int offset) {
+		String offsetString = String.valueOf(offset);
+		return BLANKS.substring(0, BLANKS.length() - offsetString.length()) + offsetString;
+	}
 }


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