|
Lines 32-38
Link Here
|
| 32 |
import java.awt.event.ItemListener; |
32 |
import java.awt.event.ItemListener; |
| 33 |
import java.io.IOException; |
33 |
import java.io.IOException; |
| 34 |
import java.util.Collections; |
34 |
import java.util.Collections; |
|
|
35 |
import java.util.HashMap; |
| 35 |
import java.util.List; |
36 |
import java.util.List; |
|
|
37 |
import java.util.Map; |
| 36 |
|
38 |
|
| 37 |
import javax.swing.ComboBoxModel; |
39 |
import javax.swing.ComboBoxModel; |
| 38 |
import javax.swing.DefaultComboBoxModel; |
40 |
import javax.swing.DefaultComboBoxModel; |
|
Lines 108-113
Link Here
|
| 108 |
private static final int MAX_DISPLAY_SIZE = |
110 |
private static final int MAX_DISPLAY_SIZE = |
| 109 |
JMeterUtils.getPropDefault("view.results.tree.max_size", 200 * 1024); // $NON-NLS-1$ |
111 |
JMeterUtils.getPropDefault("view.results.tree.max_size", 200 * 1024); // $NON-NLS-1$ |
| 110 |
|
112 |
|
|
|
113 |
// default display order |
| 114 |
private static final String VIEWERS_ORDER = |
| 115 |
JMeterUtils.getPropDefault("view.results.tree.renderers_order", ""); // $NON-NLS-1$ //$NON-NLS-2$ |
| 116 |
|
| 111 |
private ResultRenderer resultsRender = null; |
117 |
private ResultRenderer resultsRender = null; |
| 112 |
|
118 |
|
| 113 |
private TreeSelectionEvent lastSelectionEvent; |
119 |
private TreeSelectionEvent lastSelectionEvent; |
|
Lines 288-300
Link Here
|
| 288 |
|
294 |
|
| 289 |
VerticalPanel leftPane = new VerticalPanel(); |
295 |
VerticalPanel leftPane = new VerticalPanel(); |
| 290 |
leftPane.add(treePane, BorderLayout.CENTER); |
296 |
leftPane.add(treePane, BorderLayout.CENTER); |
| 291 |
VerticalPanel leftDownPane = new VerticalPanel(); |
297 |
leftPane.add(createComboRender(), BorderLayout.NORTH); |
| 292 |
leftDownPane.add(createComboRender(), BorderLayout.NORTH); |
|
|
| 293 |
autoScrollCB = new JCheckBox(JMeterUtils.getResString("view_results_autoscroll")); // $NON-NLS-1$ |
298 |
autoScrollCB = new JCheckBox(JMeterUtils.getResString("view_results_autoscroll")); // $NON-NLS-1$ |
| 294 |
autoScrollCB.setSelected(false); |
299 |
autoScrollCB.setSelected(false); |
| 295 |
autoScrollCB.addItemListener(this); |
300 |
autoScrollCB.addItemListener(this); |
| 296 |
leftDownPane.add(autoScrollCB, BorderLayout.SOUTH); |
301 |
leftPane.add(autoScrollCB, BorderLayout.SOUTH); |
| 297 |
leftPane.add(leftDownPane, BorderLayout.SOUTH); |
|
|
| 298 |
return leftPane; |
302 |
return leftPane; |
| 299 |
} |
303 |
} |
| 300 |
|
304 |
|
|
Lines 318-323
Link Here
|
| 318 |
} |
322 |
} |
| 319 |
String textRenderer = JMeterUtils.getResString("view_results_render_text"); // $NON-NLS-1$ |
323 |
String textRenderer = JMeterUtils.getResString("view_results_render_text"); // $NON-NLS-1$ |
| 320 |
Object textObject = null; |
324 |
Object textObject = null; |
|
|
325 |
Map<String, ResultRenderer> map = new HashMap<String, ResultRenderer>(classesToAdd.size()); |
| 321 |
for (String clazz : classesToAdd) { |
326 |
for (String clazz : classesToAdd) { |
| 322 |
try { |
327 |
try { |
| 323 |
// Instantiate render classes |
328 |
// Instantiate render classes |
|
Lines 326-336
Link Here
|
| 326 |
textObject=renderer; |
331 |
textObject=renderer; |
| 327 |
} |
332 |
} |
| 328 |
renderer.setBackgroundColor(getBackground()); |
333 |
renderer.setBackgroundColor(getBackground()); |
| 329 |
selectRenderPanel.addItem(renderer); |
334 |
map.put(renderer.getClass().getName(), renderer); |
| 330 |
} catch (Exception e) { |
335 |
} catch (Exception e) { |
| 331 |
log.warn("Error in load result render:" + clazz, e); |
336 |
log.warn("Error loading result renderer:" + clazz, e); |
|
|
337 |
} |
| 338 |
} |
| 339 |
if(VIEWERS_ORDER.length()>0) { |
| 340 |
String[] keys = VIEWERS_ORDER.split(","); |
| 341 |
for (String key : keys) { |
| 342 |
ResultRenderer renderer = map.remove(key); |
| 343 |
if(renderer != null) { |
| 344 |
selectRenderPanel.addItem(renderer); |
| 345 |
} else { |
| 346 |
log.warn("Missing (check spelling error in renderer name) or already added(check doublon) " + |
| 347 |
"result renderer, check property 'view.results.tree.renderers_order', renderer name:'"+key+"'"); |
| 348 |
} |
| 332 |
} |
349 |
} |
| 333 |
} |
350 |
} |
|
|
351 |
// Add remaining (plugins or missed in property) |
| 352 |
for (ResultRenderer renderer : map.values()) { |
| 353 |
selectRenderPanel.addItem(renderer); |
| 354 |
} |
| 334 |
nodesModel.setSelectedItem(textObject); // preset to "Text" option |
355 |
nodesModel.setSelectedItem(textObject); // preset to "Text" option |
| 335 |
return selectRenderPanel; |
356 |
return selectRenderPanel; |
| 336 |
} |
357 |
} |