git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '77d3a60869e7a780c6ae069e51530e1eacece5e2'
[nikiroo-utils.git]
/
src
/
jexer
/
bits
/
StringUtils.java
diff --git
a/src/jexer/bits/StringUtils.java
b/src/jexer/bits/StringUtils.java
index 58c35de82726408b7c9b69eee7a1bf5bee5a38b8..d33f71f4e0031710e52ed008fefa0f37f28883c4 100644
(file)
--- a/
src/jexer/bits/StringUtils.java
+++ b/
src/jexer/bits/StringUtils.java
@@
-42,6
+42,11
@@
import java.util.Arrays;
*
* - Read/write a line of RFC4180 comma-separated values strings to/from a
* list of strings.
*
* - Read/write a line of RFC4180 comma-separated values strings to/from a
* list of strings.
+ *
+ * - Compute number of visible text cells for a given Unicode codepoint or
+ * string.
+ *
+ * - Convert bytes to and from base-64 encoding.
*/
public class StringUtils {
*/
public class StringUtils {
@@
-467,6
+472,10
@@
public class StringUtils {
* @return the number of text cell columns required to display this string
*/
public static int width(final String str) {
* @return the number of text cell columns required to display this string
*/
public static int width(final String str) {
+ if (str == null) {
+ return 0;
+ }
+
int n = 0;
for (int i = 0; i < str.length();) {
int ch = str.codePointAt(i);
int n = 0;
for (int i = 0; i < str.length();) {
int ch = str.codePointAt(i);
@@
-609,9
+618,6
@@
public class StringUtils {
* representation i accordance with RFC 2045.
* @param sArr The bytes to convert. If <code>null</code> or length 0
* an empty array will be returned.
* representation i accordance with RFC 2045.
* @param sArr The bytes to convert. If <code>null</code> or length 0
* an empty array will be returned.
- * @param lineSep Optional "\r\n" after 76 characters, unless end of
- * file.<br> No line separator will be in breach of RFC 2045 which
- * specifies max 76 per line but will be a little faster.
* @return A BASE64 encoded array. Never <code>null</code>.
*/
public final static String toBase64(byte[] sArr) {
* @return A BASE64 encoded array. Never <code>null</code>.
*/
public final static String toBase64(byte[] sArr) {