Dispose toolkit
diff --git a/org.eclipse.ua.tests/forms/org/eclipse/ua/tests/forms/performance/FormsPerformanceTest.java b/org.eclipse.ua.tests/forms/org/eclipse/ua/tests/forms/performance/FormsPerformanceTest.java index d66a980..052d4e3 100644 --- a/org.eclipse.ua.tests/forms/org/eclipse/ua/tests/forms/performance/FormsPerformanceTest.java +++ b/org.eclipse.ua.tests/forms/org/eclipse/ua/tests/forms/performance/FormsPerformanceTest.java
@@ -48,6 +48,9 @@ // Warm up. Display display = PlatformUI.getWorkbench().getDisplay(); + + FormToolkit toolkit; + toolkit = new FormToolkit(display); for(int samples = 0; samples < 2; samples++) { Shell shell = new Shell(display); shell.setSize(400, 300); @@ -57,7 +60,7 @@ for (int i = 0; i < 5; i++) { Composite c = new Composite(shell, SWT.H_SCROLL + SWT.V_SCROLL); c.setLayout(new FillLayout()); - createPartControl(c); + createPartControl(c, toolkit); shell.layout(true); while(display.readAndDispatch()){/*empty*/} c.dispose(); @@ -75,7 +78,7 @@ for (int i = 0; i < 3; i++) { Composite c = new Composite(shell, SWT.H_SCROLL + SWT.V_SCROLL); c.setLayout(new FillLayout()); - createPartControl(c); + createPartControl(c, toolkit); shell.layout(true); while(display.readAndDispatch()){/*empty*/} c.dispose(); @@ -84,16 +87,15 @@ shell.dispose(); while(display.readAndDispatch()){/*empty*/} } + toolkit.dispose(); commitMeasurements(); assertPerformance(); } - public void createPartControl(Composite parent) { + public void createPartControl(Composite parent, FormToolkit toolkit) { //Label l = new Label(parent, SWT.NULL); //l.setText ("a label"); - FormToolkit toolkit; ScrolledForm form; - toolkit = new FormToolkit(parent.getDisplay()); form = toolkit.createScrolledForm(parent); form.setText("Hello, Eclipse Forms"); TableWrapLayout layout = new TableWrapLayout();