Revision 12126
trunk/frameworks/_fwAndami/src/com/iver/andami/ui/mdiFrame/MDIFrame.java | ||
---|---|---|
287 | 287 |
btn.setToolTipText(selectableTool.getTooltip()); |
288 | 288 |
btn.setEnabled(false); |
289 | 289 |
btn.setVisible(false); |
290 |
String name = toolBar.getName(); |
|
290 | 291 |
|
291 |
//String name = getName(toolBar.getName(), loader); |
|
292 |
String name = toolBar.getName(); |
|
293 |
|
|
294 | 292 |
SelectableToolBar jtb = (SelectableToolBar) toolBarMap.get(name); |
295 | 293 |
|
296 | 294 |
if (jtb == null) { |
... | ... | |
319 | 317 |
} |
320 | 318 |
|
321 | 319 |
controlClass.put(btn, loader.loadClass(ext.getClassName())); |
320 |
|
|
321 |
if (selectableTool.getName() != null) { |
|
322 |
btn.setName(selectableTool.getName()); |
|
323 |
} |
|
322 | 324 |
|
323 | 325 |
if (selectableTool.getTooltip() != null) { |
324 | 326 |
btn.setToolTip(ps.getText(selectableTool.getTooltip())); |
... | ... | |
372 | 374 |
btn.setEnabled(false); |
373 | 375 |
btn.setVisible(false); |
374 | 376 |
|
375 |
//String name = getName(toolBar.getName(), loader); |
|
376 | 377 |
String name = toolBar.getName(); |
377 | 378 |
|
378 | 379 |
SelectableToolBar jtb = (SelectableToolBar) toolBarMap.get(name); |
... | ... | |
388 | 389 |
jtb.add(btn); |
389 | 390 |
|
390 | 391 |
controlClass.put(btn, loader.loadClass(ext.getClassName())); |
392 |
|
|
393 |
if (actionTool.getName() != null) { |
|
394 |
btn.setName(actionTool.getName()); |
|
395 |
} |
|
391 | 396 |
|
392 | 397 |
if (actionTool.getTooltip() != null) { |
393 | 398 |
btn.setToolTip(ps.getText(actionTool.getTooltip())); |
Also available in: Unified diff