diff --git a/src/com/avast/android/butterknifezelezny/Settings.form b/src/com/avast/android/butterknifezelezny/Settings.form index 4961084..79639dc 100644 --- a/src/com/avast/android/butterknifezelezny/Settings.form +++ b/src/com/avast/android/butterknifezelezny/Settings.form @@ -19,7 +19,7 @@ - + @@ -38,7 +38,9 @@ - + + + diff --git a/src/com/avast/android/butterknifezelezny/model/Element.java b/src/com/avast/android/butterknifezelezny/model/Element.java index 590fe4b..8958f0b 100644 --- a/src/com/avast/android/butterknifezelezny/model/Element.java +++ b/src/com/avast/android/butterknifezelezny/model/Element.java @@ -71,20 +71,19 @@ public String getFullID() { */ private String getFieldName() { String[] words = this.id.split("_"); - StringBuilder sb = new StringBuilder(); - sb.append(Utils.getPrefix()); + StringBuilder nameFromID = new StringBuilder(); for (int i = 0; i < words.length; i++) { String[] idTokens = words[i].split("\\."); char[] chars = idTokens[idTokens.length - 1].toCharArray(); - if (i > 0 || !Utils.isEmptyString(Utils.getPrefix())) { + if (i > 0 && !Utils.isEmptyString(Utils.getPrefix())) { chars[0] = Character.toUpperCase(chars[0]); } - sb.append(chars); + nameFromID.append(chars); } - return sb.toString(); + return (Utils.isEmptyString(Utils.getPrefix())) ? nameFromID.toString() : Utils.getPrefix().replace("${ID}", nameFromID).replace("${TYPE}", name); } /**