Attachment #59302 for bug #168580

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 168580
Collapse All | Expand All




import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.ProgressBar;
import org.eclipse.tptp.test.manual.runner.ui.internal.util.SWTUtilities;
import org.eclipse.tptp.test.manual.runner.ui.internal.widgets.SimpleProgressBar;

/**********************************************************************
 * Copyright (c) 2005, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 * 
 * 
 * @author  Paul E. Slauenwhite
 * @version February 19, 2007
 * @since   September 19, 2005
 */
public class ProgressBarPane extends Composite {


	private int totalErrorTestInvocations = 0;

	private SimpleProgressBar progressBar = null;
	
	public ProgressBarPane(Composite parent){		
		this(parent, SWT.BORDER);		

		progressBar.setSelection(totalCompletedTestInvocations);

		//Step 3: Update the color:		
		progressBar.setColor(progressBarColor);
	}

	public void setTotalTestInvocations(int totalTestInvocations){		

		setLayout(SWTUtilities.getGridLayout(1,5,10));
		setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
		
		progressBar = new SimpleProgressBar(this);
		progressBar.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));	 
		progressBar.setMinimum(0);

		Composite totalTestInvocationsLabelPane = new Composite(this, SWT.SHADOW_NONE);




package org.eclipse.tptp.test.manual.runner.ui.internal.widgets;

import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ControlEvent;
import org.eclipse.swt.events.ControlListener;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Layout;

/**********************************************************************
 * Copyright (c) 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id$
 * 
 * Contributors: 
 * IBM - Initial API and implementation
 **********************************************************************/

/**
 * Simple by customizable progress bar. The progress bar has the
 * following customizable properties:
 * <p>
 * <ul>
 * <li>Minimum value.</li>
 * <li>Maximum value.</li>
 * <li>Current selection value.</li>
 * <li>Color.</li>
 * </ul>
 * <p>
 * This progress bar should be used instead of the SWT
 * {@link org.eclipse.swt.widgets.ProgressBar} when color customization is
 * required (see {@link https://bugs.eclipse.org/bugs/show_bug.cgi?id=168738}.
 * <p>
 * Note: The layout can not be set on a this class.
 * <p>
 * 
 * 
 * @author Paul E. Slauenwhite
 * @version February 19, 2007
 * @since February 16, 2007
 */
public class SimpleProgressBar extends Composite {

	private int minimum = 0;

	private int maximum = 0;

	private int selection = 0;

	private Composite progressBar = null;

	private static final Color DEFAULT_PROGRESS_BAR_COLOR = Display.getDefault().getSystemColor(SWT.COLOR_DARK_BLUE);

	public SimpleProgressBar(Composite parent) {

		super(parent, (SWT.BORDER | SWT.SMOOTH));

		buildProgressBar();
	}

	/**
	 * Returns the maximum value of the progress bar.
	 * <p>
	 * 
	 * @return Maximum value of the progress bar.
	 */
	public int getMaximum() {
		return maximum;
	}

	/**
	 * Returns the minimum value of the progress bar.
	 * <p>
	 * 
	 * @return Minimum value of the progress bar.
	 */
	public int getMinimum() {
		return minimum;
	}

	/**
	 * Returns the current selected value of the progress bar.
	 * <p>
	 * 
	 * @return Current selected value of the progress bar.
	 */
	public int getSelection() {
		return selection;
	}

	/**
	 * Returns the color of the progress bar.
	 * <p>
	 * 
	 * @return Color of the progress bar.
	 */
	public Color getColor() {
		return (progressBar.getBackground());
	}

	/**
	 * Sets the maximum value of the progress bar. The parameter value is
	 * ignored if any of the following conditions are true:
	 * <p>
	 * <ul>
	 * <li>The maximum value is less than the minimum value.</li>
	 * <li>The maximum value is less than zero.</li>
	 * <p>
	 * Note: Set the maximum value causes the current selected value to be reset
	 * to the minimum value.
	 * <p>
	 * 
	 * @param maximum
	 *            Maximum value of the progress bar.
	 */
	public void setMaximum(int maximum) {

		if ((maximum >= 0) && (maximum >= minimum)) {

			this.maximum = maximum;
			this.selection = minimum;
		}
	}

	/**
	 * Sets the minimum value of the progress bar. The parameter value is
	 * ignored if any of the following conditions are true:
	 * <p>
	 * <ul>
	 * <li>The minimum value is greater than the maximum value.</li>
	 * <li>The minimum value is less than zero.</li>
	 * <p>
	 * Note: Set the minimum value causes the current selected value to be reset
	 * to the new minimum value.
	 * <p>
	 * 
	 * @param minimum
	 *            Minimum value of the progress bar.
	 */
	public void setMinimum(int minimum) {

		if ((minimum >= 0) && (minimum <= maximum)) {

			this.minimum = minimum;
			this.selection = minimum;
		}
	}

	/**
	 * Sets the current selected value of the progress bar. The parameter value
	 * is ignored if any of the following conditions are true:
	 * <p>
	 * <ul>
	 * <li>The current selected value is less than the minimum value.</li>
	 * <li>The current selected value is greater than the maximum value.</li>
	 * <li>The current selected value is less than zero.</li>
	 * <p>
	 * 
	 * @param selection
	 *            Current selected value of the progress bar.
	 */
	public void setSelection(int selection) {

		if ((selection >= 0) && (selection >= minimum) && (selection <= maximum)) {

			this.selection = selection;

			updateProgress();
		}
	}

	/**
	 * Sets the color of the progress bar. If the parameter value is
	 * <code>null</code>, the color is set to a default color ({@link SWT.COLOR_DARK_BLUE}).
	 * <p>
	 * 
	 * @param color
	 *            Color of the progress bar.
	 */
	public void setColor(Color color) {

		if (color != null) {
			progressBar.setBackground(color);
		} else {
			progressBar.setBackground(DEFAULT_PROGRESS_BAR_COLOR);
		}

		updateProgress();
	}

	/**
	 * Increments the current selected value of the progress bar by one.
	 * <p>
	 */
	public void incrementSelection() {
		setSelection(getSelection() + 1);
	}

	/**
	 * No-operation.
	 * <p>
	 * Note: The layout can not be set on a this class.
	 * <p>
	 * 
	 * @see org.eclipse.swt.widgets.Composite#setLayout(org.eclipse.swt.widgets.Layout)
	 */
	public void setLayout(Layout layout) {
		// No-operation.
	}

	private void buildProgressBar() {

		progressBar = new Composite(this, SWT.NONE);
		progressBar.setBackground(DEFAULT_PROGRESS_BAR_COLOR);

		layout(false, true);

		addControlListener(new ControlListener() {

			public void controlMoved(ControlEvent con) {
				// No-operation.
			}

			public void controlResized(ControlEvent e) {
				updateProgress();
			}
		});
	}

	private void updateProgress() {

		progressBar.setBounds(0, 0, Math.round((((float)(selection - minimum)) / ((float)(maximum - minimum))) * ((float)(getBounds().width))), 17);

		layout(true, true);
	}
}

Return to bug 168580

Lines 6-16 Link Here

(-)src-manual-runner/org/eclipse/tptp/test/manual/runner/ui/internal/ProgressBarPane.java (-7 / +7 lines)
6	import org.eclipse.swt.graphics.Color;	6	import org.eclipse.swt.graphics.Color;
7	import org.eclipse.swt.layout.GridData;	7	import org.eclipse.swt.layout.GridData;
8	import org.eclipse.swt.widgets.Composite;	8	import org.eclipse.swt.widgets.Composite;
9	import org.eclipse.swt.widgets.ProgressBar;
10	import org.eclipse.tptp.test.manual.runner.ui.internal.util.SWTUtilities;	9	import org.eclipse.tptp.test.manual.runner.ui.internal.util.SWTUtilities;
		10	import org.eclipse.tptp.test.manual.runner.ui.internal.widgets.SimpleProgressBar;
11		11
12	/**********************************************************************	12	/**********************************************************************
13	* Copyright (c) 2005, 2006 IBM Corporation and others.	13	* Copyright (c) 2005, 2007 IBM Corporation and others.
14	* All rights reserved. This program and the accompanying materials	14	* All rights reserved. This program and the accompanying materials
15	* are made available under the terms of the Eclipse Public License v1.0	15	* are made available under the terms of the Eclipse Public License v1.0
16	* which accompanies this distribution, and is available at	16	* which accompanies this distribution, and is available at
Lines 27-33 Link Here
27	*	27	*
28	*	28	*
29	* @author Paul E. Slauenwhite	29	* @author Paul E. Slauenwhite
30	* @version May 14, 2006	30	* @version February 19, 2007
31	* @since September 19, 2005	31	* @since September 19, 2005
32	*/	32	*/
33	public class ProgressBarPane extends Composite {	33	public class ProgressBarPane extends Composite {
Lines 50-56 Link Here
50		50
51	private int totalErrorTestInvocations = 0;	51	private int totalErrorTestInvocations = 0;
52		52
53	private ProgressBar progressBar = null;	53	private SimpleProgressBar progressBar = null;
54		54
55	public ProgressBarPane(Composite parent){	55	public ProgressBarPane(Composite parent){
56	this(parent, SWT.BORDER);	56	this(parent, SWT.BORDER);
Lines 162-168 Link Here
162	progressBar.setSelection(totalCompletedTestInvocations);	162	progressBar.setSelection(totalCompletedTestInvocations);
163		163
164	//Step 3: Update the color:	164	//Step 3: Update the color:
165	progressBar.setForeground(progressBarColor);	165	progressBar.setColor(progressBarColor);
166	}	166	}
167		167
168	public void setTotalTestInvocations(int totalTestInvocations){	168	public void setTotalTestInvocations(int totalTestInvocations){
Lines 194-201 Link Here
194	setLayout(SWTUtilities.getGridLayout(1,5,10));	194	setLayout(SWTUtilities.getGridLayout(1,5,10));
195	setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));	195	setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
196		196
197	progressBar = new ProgressBar(this, SWT.SMOOTH);	197	progressBar = new SimpleProgressBar(this);
198	progressBar.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));	198	progressBar.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
199	progressBar.setMinimum(0);	199	progressBar.setMinimum(0);
200		200
201	Composite totalTestInvocationsLabelPane = new Composite(this, SWT.SHADOW_NONE);	201	Composite totalTestInvocationsLabelPane = new Composite(this, SWT.SHADOW_NONE);

Added Link Here

(-)src-manual-runner/org/eclipse/tptp/test/manual/runner/ui/internal/widgets/SimpleProgressBar.java (+240 lines)
1	package org.eclipse.tptp.test.manual.runner.ui.internal.widgets;
2
3	import org.eclipse.swt.SWT;
4	import org.eclipse.swt.events.ControlEvent;
5	import org.eclipse.swt.events.ControlListener;
6	import org.eclipse.swt.graphics.Color;
7	import org.eclipse.swt.widgets.Composite;
8	import org.eclipse.swt.widgets.Display;
9	import org.eclipse.swt.widgets.Layout;
10
11	/**********************************************************************
12	* Copyright (c) 2007 IBM Corporation and others.
13	* All rights reserved. This program and the accompanying materials
14	* are made available under the terms of the Eclipse Public License v1.0
15	* which accompanies this distribution, and is available at
16	* http://www.eclipse.org/legal/epl-v10.html
17	* $Id$
18	*
19	* Contributors:
20	* IBM - Initial API and implementation
21	**********************************************************************/
22
23	/**
24	* Simple by customizable progress bar. The progress bar has the
25	* following customizable properties:
26	* <p>
27	* <ul>
28	* <li>Minimum value.</li>
29	* <li>Maximum value.</li>
30	* <li>Current selection value.</li>
31	* <li>Color.</li>
32	* </ul>
33	* <p>
34	* This progress bar should be used instead of the SWT
35	* {@link org.eclipse.swt.widgets.ProgressBar} when color customization is
36	* required (see {@link https://bugs.eclipse.org/bugs/show_bug.cgi?id=168738}.
37	* <p>
38	* Note: The layout can not be set on a this class.
39	* <p>
40	*
41	*
42	* @author Paul E. Slauenwhite
43	* @version February 19, 2007
44	* @since February 16, 2007
45	*/
46	public class SimpleProgressBar extends Composite {
47
48	private int minimum = 0;
49
50	private int maximum = 0;
51
52	private int selection = 0;
53
54	private Composite progressBar = null;
55
56	private static final Color DEFAULT_PROGRESS_BAR_COLOR = Display.getDefault().getSystemColor(SWT.COLOR_DARK_BLUE);
57
58	public SimpleProgressBar(Composite parent) {
59
60	super(parent, (SWT.BORDER \| SWT.SMOOTH));
61
62	buildProgressBar();
63	}
64
65	/**
66	* Returns the maximum value of the progress bar.
67	* <p>
68	*
69	* @return Maximum value of the progress bar.
70	*/
71	public int getMaximum() {
72	return maximum;
73	}
74
75	/**
76	* Returns the minimum value of the progress bar.
77	* <p>
78	*
79	* @return Minimum value of the progress bar.
80	*/
81	public int getMinimum() {
82	return minimum;
83	}
84
85	/**
86	* Returns the current selected value of the progress bar.
87	* <p>
88	*
89	* @return Current selected value of the progress bar.
90	*/
91	public int getSelection() {
92	return selection;
93	}
94
95	/**
96	* Returns the color of the progress bar.
97	* <p>
98	*
99	* @return Color of the progress bar.
100	*/
101	public Color getColor() {
102	return (progressBar.getBackground());
103	}
104
105	/**
106	* Sets the maximum value of the progress bar. The parameter value is
107	* ignored if any of the following conditions are true:
108	* <p>
109	* <ul>
110	* <li>The maximum value is less than the minimum value.</li>
111	* <li>The maximum value is less than zero.</li>
112	* <p>
113	* Note: Set the maximum value causes the current selected value to be reset
114	* to the minimum value.
115	* <p>
116	*
117	* @param maximum
118	* Maximum value of the progress bar.
119	*/
120	public void setMaximum(int maximum) {
121
122	if ((maximum >= 0) && (maximum >= minimum)) {
123
124	this.maximum = maximum;
125	this.selection = minimum;
126	}
127	}
128
129	/**
130	* Sets the minimum value of the progress bar. The parameter value is
131	* ignored if any of the following conditions are true:
132	* <p>
133	* <ul>
134	* <li>The minimum value is greater than the maximum value.</li>
135	* <li>The minimum value is less than zero.</li>
136	* <p>
137	* Note: Set the minimum value causes the current selected value to be reset
138	* to the new minimum value.
139	* <p>
140	*
141	* @param minimum
142	* Minimum value of the progress bar.
143	*/
144	public void setMinimum(int minimum) {
145
146	if ((minimum >= 0) && (minimum <= maximum)) {
147
148	this.minimum = minimum;
149	this.selection = minimum;
150	}
151	}
152
153	/**
154	* Sets the current selected value of the progress bar. The parameter value
155	* is ignored if any of the following conditions are true:
156	* <p>
157	* <ul>
158	* <li>The current selected value is less than the minimum value.</li>
159	* <li>The current selected value is greater than the maximum value.</li>
160	* <li>The current selected value is less than zero.</li>
161	* <p>
162	*
163	* @param selection
164	* Current selected value of the progress bar.
165	*/
166	public void setSelection(int selection) {
167
168	if ((selection >= 0) && (selection >= minimum) && (selection <= maximum)) {
169
170	this.selection = selection;
171
172	updateProgress();
173	}
174	}
175
176	/**
177	* Sets the color of the progress bar. If the parameter value is
178	* <code>null</code>, the color is set to a default color ({@link SWT.COLOR_DARK_BLUE}).
179	* <p>
180	*
181	* @param color
182	* Color of the progress bar.
183	*/
184	public void setColor(Color color) {
185
186	if (color != null) {
187	progressBar.setBackground(color);
188	} else {
189	progressBar.setBackground(DEFAULT_PROGRESS_BAR_COLOR);
190	}
191
192	updateProgress();
193	}
194
195	/**
196	* Increments the current selected value of the progress bar by one.
197	* <p>
198	*/
199	public void incrementSelection() {
200	setSelection(getSelection() + 1);
201	}
202
203	/**
204	* No-operation.
205	* <p>
206	* Note: The layout can not be set on a this class.
207	* <p>
208	*
209	* @see org.eclipse.swt.widgets.Composite#setLayout(org.eclipse.swt.widgets.Layout)
210	*/
211	public void setLayout(Layout layout) {
212	// No-operation.
213	}
214
215	private void buildProgressBar() {
216
217	progressBar = new Composite(this, SWT.NONE);
218	progressBar.setBackground(DEFAULT_PROGRESS_BAR_COLOR);
219
220	layout(false, true);
221
222	addControlListener(new ControlListener() {
223
224	public void controlMoved(ControlEvent con) {
225	// No-operation.
226	}
227
228	public void controlResized(ControlEvent e) {
229	updateProgress();
230	}
231	});
232	}
233
234	private void updateProgress() {
235
236	progressBar.setBounds(0, 0, Math.round((((float)(selection - minimum)) / ((float)(maximum - minimum))) * ((float)(getBounds().width))), 17);
237
238	layout(true, true);
239	}
240	}