JAL-1807 explicit imports (jalview.appletgui)

[jalview.git] / src / jalview / util / Format.java

diff --git a/src/jalview/util/Format.java b/src/jalview/util/Format.java
index d490df8..1c8e444 100755 (executable)
--- a/src/jalview/util/Format.java
+++ b/src/jalview/util/Format.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -54,6 +54,8 @@ public class Format
 
   private char fmt; // one of cdeEfgGiosxXos
 
+  private final String formatString;
+
   /**
    * Creates a new Format object.
    * 
@@ -62,6 +64,7 @@ public class Format
    */
   public Format(String s)
   {
+    formatString = s;
     width = 0;
     precision = -1;
     pre = "";
@@ -306,9 +309,9 @@ public class Format
    * @param x
    *          the double to print
    */
-  public static void print(java.io.PrintStream s, String fmt, double x)
+  public static void printDouble(java.io.PrintStream s, String fmt, double x)
   {
-    s.print(new Format(fmt).form(x));
+    s.print(new Format(fmt).formDouble(x));
   }
 
   /**
@@ -321,9 +324,9 @@ public class Format
    * @param x
    *          the long to print
    */
-  public static void print(java.io.PrintStream s, String fmt, long x)
+  public static void printLong(java.io.PrintStream s, String fmt, long x)
   {
-    s.print(new Format(fmt).form(x));
+    s.print(new Format(fmt).formLong(x));
   }
 
   /**
@@ -336,9 +339,9 @@ public class Format
    * @param x
    *          the character to
    */
-  public static void print(java.io.PrintStream s, String fmt, char x)
+  public static void printChar(java.io.PrintStream s, String fmt, char x)
   {
-    s.print(new Format(fmt).form(x));
+    s.print(new Format(fmt).formChar(x));
   }
 
   /**
@@ -541,7 +544,7 @@ public class Format
    * @exception IllegalArgumentException
    *              if bad argument
    */
-  public String form(double x)
+  public String formDouble(double x)
   {
     String r;
 
@@ -581,7 +584,7 @@ public class Format
    *          the number to format
    * @return the formatted string
    */
-  public String form(long x)
+  public String formLong(long x)
   {
     String r;
     int s = 0;
@@ -626,7 +629,7 @@ public class Format
    *          the value to format
    * @return the formatted string
    */
-  public String form(char c)
+  public String formChar(char c)
   {
     if (fmt != 'c')
     {
@@ -938,4 +941,10 @@ public class Format
 
     return f + p.substring(p.length() - 3, p.length());
   }
+
+  @Override
+  public String toString()
+  {
+    return formatString;
+  }
 }