@@ -325,39 +325,39 @@ protected Object getnewDefaultObject() {
325
325
private void setTheLabelCombos () {
326
326
327
327
saveUsedOptionValues ();
328
- BoardDescription boardDesc = ( BoardDescription ) getDescription ( getConfdesc () );
328
+ BoardDescription boardOnScreen = getBoardFromScreen ( );
329
329
330
- File newLabelComboBoardFile = boardDesc .getReferencingBoardsFile ();
331
- String newOptionBoardID = boardDesc .getBoardID ();
332
- boolean boardsFileChanged = !newLabelComboBoardFile .equals (myCurrentLabelComboBoardFile );
333
- boolean boardIDChanged = !newOptionBoardID .equals (myCurrentOptionBoardID );
330
+ File onScreenComboBoardFile = boardOnScreen .getReferencingBoardsFile ();
331
+ String onScreenBoardID = boardOnScreen .getBoardID ();
332
+ boolean boardsFileChanged = !onScreenComboBoardFile .equals (myCurrentLabelComboBoardFile );
333
+ boolean boardIDChanged = !onScreenBoardID .equals (myCurrentOptionBoardID );
334
334
if (boardsFileChanged || boardIDChanged ) {
335
- myCurrentLabelComboBoardFile = newLabelComboBoardFile ;
336
- myCurrentOptionBoardID = newOptionBoardID ;
335
+ myCurrentLabelComboBoardFile = onScreenComboBoardFile ;
336
+ myCurrentOptionBoardID = onScreenBoardID ;
337
337
338
338
saveUsedOptionValues ();
339
339
for (LabelCombo labelCombo : myBoardOptionCombos .values ()) {
340
340
labelCombo .dispose ();
341
341
}
342
342
myBoardOptionCombos .clear ();
343
343
344
- Map <String , String > menus = boardDesc .getAllMenus ();
345
- Map <String , String > boardOptions = boardDesc .getOptions ();
344
+ Map <String , String > menus = boardOnScreen .getAllMenus ();
345
+ Map <String , String > boardOptions = boardOnScreen .getOptions ();
346
346
347
347
for (Map .Entry <String , String > curMenu : menus .entrySet ()) {
348
348
String menuName = curMenu .getValue ();
349
349
String menuID = curMenu .getKey ();
350
- String [] menuItemNames = boardDesc .getMenuItemNamesFromMenuID (menuID );
350
+ String [] menuItemNames = boardOnScreen .getMenuItemNamesFromMenuID (menuID );
351
351
if (menuItemNames .length > 0 ) {
352
352
LabelCombo newLabelCombo = new LabelCombo (myComposite , menuName , 2 , true );
353
353
myBoardOptionCombos .put (menuID , newLabelCombo );
354
354
355
- newLabelCombo .setItems (boardDesc .getMenuItemNamesFromMenuID (menuID ));
355
+ newLabelCombo .setItems (boardOnScreen .getMenuItemNamesFromMenuID (menuID ));
356
356
newLabelCombo .setLabel (menuName );
357
357
String optionValue = boardOptions .get (menuID );
358
358
if (optionValue != null ) {
359
359
// convert the ID to a name
360
- optionValue = boardDesc .getMenuItemNamedFromMenuItemID (optionValue , menuID );
360
+ optionValue = boardOnScreen .getMenuItemNamedFromMenuItemID (optionValue , menuID );
361
361
} else {
362
362
// use last used name for this menu ID
363
363
optionValue = myUsedOptionValues .get (menuID );
@@ -376,14 +376,14 @@ private void setTheLabelCombos() {
376
376
myScrollComposite .setMinSize (point );
377
377
}
378
378
else {
379
- Map <String , String > boardOptions = boardDesc .getOptions ();
379
+ Map <String , String > boardOptions = boardOnScreen .getOptions ();
380
380
for (Entry <String , LabelCombo > curOptionCombo : myBoardOptionCombos .entrySet ()) {
381
381
String curMenuID = curOptionCombo .getKey ();
382
382
LabelCombo curLabelCombo = curOptionCombo .getValue ();
383
383
String optionValue = boardOptions .get (curMenuID );
384
384
if (optionValue != null ) {
385
385
// convert the ID to a name
386
- optionValue = boardDesc .getMenuItemNamedFromMenuItemID (optionValue , curMenuID );
386
+ optionValue = boardOnScreen .getMenuItemNamedFromMenuItemID (optionValue , curMenuID );
387
387
} else {
388
388
// use last used name for this menu ID
389
389
optionValue = myUsedOptionValues .get (curMenuID );
0 commit comments