From c785f8985e2ddd1d84be8fd3b03edb62c208ed18 Mon Sep 17 00:00:00 2001
From: Kevin Glynn <kevin.glynn@twigletsoftware.com>
Date: Tue, 31 May 2011 09:16:48 +0200
Subject: [PATCH] Add missing import, support another format type

---
 CS2JLibrary/NetFramework/System/Int32.xml     |  8 +++--
 .../src/CS2JNet/System/IntegerSupport.java    | 33 ++++++++++++++-----
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/CS2JLibrary/NetFramework/System/Int32.xml b/CS2JLibrary/NetFramework/System/Int32.xml
index 77d7465..b295b16 100644
--- a/CS2JLibrary/NetFramework/System/Int32.xml
+++ b/CS2JLibrary/NetFramework/System/Int32.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -28,7 +28,9 @@
       <Return>System.String</Return>
     </Method>
     <Method>
-      <Imports />
+      <Imports>
+        <Import>CS2JNet.System.IntegerSupport</Import>
+      </Imports>
       <Java>IntegerSupport.mkString(${this}, ${str})</Java>
       <Params>
         <Param>
@@ -53,7 +55,7 @@
     </Method>
     <Method>
       <Imports>
-        <Import>CS2JNet.System.*</Import>
+        <Import>CS2JNet.System.IntegerSupport</Import>
       </Imports>
       <Java>IntegerSupport.parse(${str}, ${style})</Java>
       <Params>
diff --git a/CS2JLibrary/src/CS2JNet/System/IntegerSupport.java b/CS2JLibrary/src/CS2JNet/System/IntegerSupport.java
index 1859004..c711cf8 100644
--- a/CS2JLibrary/src/CS2JNet/System/IntegerSupport.java
+++ b/CS2JLibrary/src/CS2JNet/System/IntegerSupport.java
@@ -52,15 +52,32 @@ public class IntegerSupport {
 
 	public static String mkString(int i, String style) throws NotImplementedException
 	{
-		if (style.toLowerCase().equals("x")) {
-			String retStr = Integer.toHexString(i);
-			if (style.equals("X")) {
-				return retStr.toUpperCase();
-			}
-			return retStr;
-		}
-		
+		if (style.toLowerCase().equals("x")) {
+			String retStr = Integer.toHexString(i);
+			if (style.equals("X")) {
+				return retStr.toUpperCase();
+			}
+			return retStr;
+		}
+		
+		if (style.toLowerCase().startsWith("d")) {
+			String width = "";
+			if (style.length() > 1)
+				width = "0" + String.valueOf(Integer.valueOf(style.substring(1)) + (i < 0 ? 1 : 0));
+			String fmt = "%0$"+width+"d";
+			String retStr = String.format(fmt, i);
+			return retStr;
+		}
+		
 		throw new NotImplementedException("IntegerSupport.mkString does not support format string  '" + style + "'");
+	}
+	
+	public static void main(String[] args) throws NotImplementedException {
+		int integral = 8395;
+	    System.out.printf("D: %0$s\n", mkString(integral, "D"));
+	    System.out.printf("D: %0$s\n", mkString(integral, "D6"));
+	    System.out.printf("D: %0$s\n", mkString(-integral, "D6"));
+	
 	}
 
 }