added ecu defs parsing to logger for calid display

git-svn-id: http://svn.3splooges.com/romraider-arch/trunk@627 d2e2e1cd-ba16-0410-be16-b7c4453c7c2d
This commit is contained in:
kascade 2007-04-19 00:58:12 +00:00
parent b7ce1e91fe
commit 9ea4395d05
2 changed files with 10 additions and 3 deletions

View File

@ -197,10 +197,13 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
SwingUtilities.invokeLater(new Runnable() {
public void run() {
String ecuId = ecuInit.getEcuId();
String calId = settings.getLoggerEcuDefinitionMap().get(ecuId).getCalId();
calIdLabel.setText(buildEcuInfoLabelText(CAL_ID_LABEL, calId));
Map<String, EcuDefinition> ecuDefinitionMap = settings.getLoggerEcuDefinitionMap();
if (!isNullOrEmpty(ecuDefinitionMap)) {
String calId = ecuDefinitionMap.get(ecuId).getCalId();
calIdLabel.setText(buildEcuInfoLabelText(CAL_ID_LABEL, calId));
}
ecuIdLabel.setText(buildEcuInfoLabelText(ECU_ID_LABEL, ecuId));
System.out.println("Loading logger config for new ECU (calid: " + calId + ", ecuid: " + ecuId + ")...");
System.out.println("Loading logger config for new ECU (ecuid: " + ecuId + ")...");
loadLoggerConfig();
}
});

View File

@ -91,6 +91,10 @@ public final class ParamChecker {
return param == null || param.isEmpty();
}
public static boolean isNullOrEmpty(Map<?, ?> param) {
return param == null || param.isEmpty();
}
public static boolean isValidBit(int bit) {
return bit >= 0 && bit <= 7;
}