code format, organize imports

This commit is contained in:
Jindra Petřík
2014-10-25 21:32:16 +02:00
parent 8fd683d019
commit bcfb4a1c01
17 changed files with 86 additions and 119 deletions
@@ -467,7 +467,7 @@ public class Configuration {
}
return result;
}
public static Map<String, String> getFontIdToFaceMap() {
String fonts = fontPairing.get();
if (fonts == null) {
@@ -478,7 +478,7 @@ public class Configuration {
for (String pair : fonts.split("::")) {
if (!pair.isEmpty()) {
String[] splittedPair = pair.split("=");
result.put(splittedPair[0], splittedPair.length<3?"":splittedPair[2]);
result.put(splittedPair[0], splittedPair.length < 3 ? "" : splittedPair[2]);
}
}
return result;
@@ -489,8 +489,8 @@ public class Configuration {
Map<String, String> fontPairs = getFontIdToFamilyMap();
fontPairs.put(key, installedFontFamily);
fontPairs.put(fontName, installedFontFamily);
Map<String,String> facePairs = getFontIdToFaceMap();
Map<String, String> facePairs = getFontIdToFaceMap();
facePairs.put(key, installedFontFace);
facePairs.put(fontName, installedFontFace);
StringBuilder sb = new StringBuilder();
@@ -499,7 +499,7 @@ public class Configuration {
if (i != 0) {
sb.append("::");
}
sb.append(pair.getKey()).append("=").append(pair.getValue()).append("=").append(facePairs.containsKey(pair.getKey())?facePairs.get(pair.getKey()):"");
sb.append(pair.getKey()).append("=").append(pair.getValue()).append("=").append(facePairs.containsKey(pair.getKey()) ? facePairs.get(pair.getKey()) : "");
i++;
}
fontPairing.set(sb.toString());