From eeb60dc5c5a78cba0628e074b37519e9e8d65bde Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Sat, 16 Apr 2005 09:08:56 +0000
Subject: [PATCH] fixing nfc()

---
 build/shared/revisions.txt |  2 ++
 core/PApplet.java          | 24 +++++++++++-------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index 42aebcc05..39b9a884f 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -69,6 +69,8 @@ ABOUT REV 0083 -
   using the shell, or open(String args[]) which will do the same
   with several command line args.
 
+- nfc() joins the nf() family to format integers and floats with commas.
+
 
 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 
 
diff --git a/core/PApplet.java b/core/PApplet.java
index 74bc27ec2..453c791a8 100644
--- a/core/PApplet.java
+++ b/core/PApplet.java
@@ -4505,18 +4505,18 @@ public class PApplet extends Applet
   }
 
 
-  static public String[] nfc(int num[], int digits) {
+  static public String[] nfc(int num[]) {
     String formatted[] = new String[num.length];
     for (int i = 0; i < formatted.length; i++) {
-      formatted[i] = nfc(num[i], digits);
+      formatted[i] = nfc(num[i]);
     }
     return formatted;
   }
 
 
-  static public String nfc(int num, int digits) {
+  static public String nfc(int num) {
     if ((int_nf != null) &&
-        (int_nf_digits == digits) &&
+        (int_nf_digits == 0) &&
         int_nf_commas) {
       return int_nf.format(num);
     }
@@ -4524,8 +4524,8 @@ public class PApplet extends Applet
     int_nf = NumberFormat.getInstance();
     int_nf.setGroupingUsed(true);
     int_nf_commas = true;
-    int_nf.setMinimumIntegerDigits(digits);
-    int_nf_digits = digits;
+    int_nf.setMinimumIntegerDigits(0);
+    int_nf_digits = 0;
     return int_nf.format(num);
   }
 
@@ -4611,19 +4611,18 @@ public class PApplet extends Applet
   }
 
 
-
-  static public String[] nfc(float num[], int left, int right) {
+  static public String[] nfc(float num[], int right) {
     String formatted[] = new String[num.length];
     for (int i = 0; i < formatted.length; i++) {
-      formatted[i] = nfc(num[i], left, right);
+      formatted[i] = nfc(num[i], right);
     }
     return formatted;
   }
 
 
-  static public String nfc(float num, int left, int right) {
+  static public String nfc(float num, int right) {
     if ((float_nf != null) &&
-        (float_nf_left == left) &&
+        (float_nf_left == 0) &&
         (float_nf_right == right) &&
         float_nf_commas) {
       return float_nf.format(num);
@@ -4633,12 +4632,11 @@ public class PApplet extends Applet
     float_nf.setGroupingUsed(true);
     float_nf_commas = true;
 
-    if (left != 0) float_nf.setMinimumIntegerDigits(left);
     if (right != 0) {
       float_nf.setMinimumFractionDigits(right);
       float_nf.setMaximumFractionDigits(right);
     }
-    float_nf_left = left;
+    float_nf_left = 0;
     float_nf_right = right;
     return float_nf.format(num);
   }