Skip to content

Commit 62a57bd

Browse files
Simplify getMaxNumberOfMainFieldLines() logic
1 parent 8fed860 commit 62a57bd

1 file changed

Lines changed: 19 additions & 9 deletions

File tree

base/src/main/java/com/smartdevicelink/managers/ManagerUtility.java

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,27 @@ public static boolean hasTextFieldOfName(WindowCapability windowCapability, Text
6565
*/
6666
public static int getMaxNumberOfMainFieldLines(WindowCapability windowCapability) {
6767
int highestFound = 0;
68-
TextFieldName name;
6968
if (windowCapability != null && windowCapability.getTextFields() != null) {
7069
for (TextField field : windowCapability.getTextFields()) {
71-
if (field.getName() != null) {
72-
name = field.getName();
73-
if (name == TextFieldName.mainField1 || name == TextFieldName.mainField2 || name == TextFieldName.mainField3 || name == TextFieldName.mainField4) {
74-
int fieldNumber = Integer.parseInt(name.toString().substring(name.toString().length() - 1));
75-
highestFound = Math.max(highestFound, fieldNumber);
76-
if (highestFound == 4) {
77-
break;
78-
}
70+
int fieldNumber = 0;
71+
switch (field.getName()) {
72+
case mainField1:
73+
fieldNumber = 1;
74+
break;
75+
case mainField2:
76+
fieldNumber = 2;
77+
break;
78+
case mainField3:
79+
fieldNumber = 3;
80+
break;
81+
case mainField4:
82+
fieldNumber = 4;
83+
break;
84+
}
85+
if (fieldNumber > 0) {
86+
highestFound = Math.max(highestFound, fieldNumber);
87+
if (highestFound == 4) {
88+
break;
7989
}
8090
}
8191
}

0 commit comments

Comments
 (0)