git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into releases/Release_2_10_Branch
[jalview.git]
/
src
/
jalview
/
util
/
Format.java
diff --git
a/src/jalview/util/Format.java
b/src/jalview/util/Format.java
index
d4e3729
..
d14e4ad
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.2b1)
- * 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.
*
*
* This file is part of Jalview.
*
@@
-54,6
+54,8
@@
public class Format
private char fmt; // one of cdeEfgGiosxXos
private char fmt; // one of cdeEfgGiosxXos
+ private final String formatString;
+
/**
* Creates a new Format object.
*
/**
* Creates a new Format object.
*
@@
-62,6
+64,7
@@
public class Format
*/
public Format(String s)
{
*/
public Format(String s)
{
+ formatString = s;
width = 0;
precision = -1;
pre = "";
width = 0;
precision = -1;
pre = "";
@@
-622,7
+625,7
@@
public class Format
/**
* Formats a character into a string (like sprintf in C)
*
/**
* Formats a character into a string (like sprintf in C)
*
- * @param x
+ * @param debounceTrap
* the value to format
* @return the formatted string
*/
* the value to format
* @return the formatted string
*/
@@
-641,7
+644,7
@@
public class Format
/**
* Formats a string into a larger string (like sprintf in C)
*
/**
* Formats a string into a larger string (like sprintf in C)
*
- * @param x
+ * @param debounceTrap
* the value to format
* @return the formatted string
*/
* the value to format
* @return the formatted string
*/
@@
-938,4
+941,10
@@
public class Format
return f + p.substring(p.length() - 3, p.length());
}
return f + p.substring(p.length() - 3, p.length());
}
+
+ @Override
+ public String toString()
+ {
+ return formatString;
+ }
}
}