deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[cooja] plugins/VariableWatcher: fixed handling of unknown variable sizes

Browse source
This commit is contained in:
Enrico Joerns 2014-03-06 03:06:15 +01:00
parent 7ac14fae60
commit 490bc6c5cb
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tools/cooja/java/org/contikios/cooja/plugins/VariableWatcher.java
View file

@ -254,7 +254,7 @@ public class VariableWatcher extends VisPlugin implements MotePlugin {
String currentItem = (String)varNameCombo.getSelectedItem(); String currentItem = (String)varNameCombo.getSelectedItem();
/* If item did not changed, skip! */ /* If item did not changed, skip! */
if (currentItem.equals(lastItem)) { if (currentItem == null || currentItem.equals(lastItem)) {
return; return;
} }
lastItem = currentItem; lastItem = currentItem;
@ -265,7 +265,19 @@ public class VariableWatcher extends VisPlugin implements MotePlugin {
/* calculate number of elements required to show the value in the given size */ /* calculate number of elements required to show the value in the given size */
updateNumberOfValues(); updateNumberOfValues();
varAddressField.setText(String.format("0x%04x", moteMemory.getVariableAddress(currentItem))); varAddressField.setText(String.format("0x%04x", moteMemory.getVariableAddress(currentItem)));
varSizeField.setText(String.valueOf(moteMemory.getVariableSize(currentItem))); long size = moteMemory.getVariableSize(currentItem);
/* Disable buttons if variable reported size < 1, activate otherwise */
if (size < 1) {
varSizeField.setText("N/A");
readButton.setEnabled(false);
monitorButton.setEnabled(false);
writeButton.setEnabled(false);
} else {
varSizeField.setText(String.valueOf(size));
readButton.setEnabled(true);
monitorButton.setEnabled(true);
writeButton.setEnabled(true);
}
} }
catch (UnknownVariableException ex) { catch (UnknownVariableException ex) {
((JTextField) varNameCombo.getEditor().getEditorComponent()).setForeground(Color.RED); ((JTextField) varNameCombo.getEditor().getEditorComponent()).setForeground(Color.RED);