Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-06-17 02:32:54 +02:00
commit 6ce99abf89

View file

@ -96,9 +96,8 @@ public class ColorDialogs {
public static String colorToString(int color) {
if ((0xFF000000 & color) == 0xFF000000) {
private final static String ZEROES = "000000"; //$NON-NLS-1$
String c = Integer.toHexString(color & 0x00FFFFFF); //$NON-NLS-1$
return "#" + c.length() <= 6 ? ZEROES.substring(c.length()) + c : c; //$NON-NLS-1$
private String c = Integer.toHexString(color & 0x00FFFFFF);
return "#" + c.length() <= 6 ? "000000".substring(c.length()) + c : c; //$NON-NLS-1$
} else {
return "#" + Integer.toHexString(color); //$NON-NLS-1$
}