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 185347
Collapse All | Expand All

(-)src/org/eclipse/jface/messages.properties (-1 / +1 lines)
Lines 111-117 Link Here
111
# org.eclipse.jface.action 
111
# org.eclipse.jface.action 
112
#############################################################
112
#############################################################
113
Cancel_Current_Operation = Cancel Current Operation
113
Cancel_Current_Operation = Cancel Current Operation
114
Set_SubTask = {0} {1}
114
Set_SubTask = {0}: {1}
115
Toolbar_Tooltip_Accelerator = {0} ({1})
115
Toolbar_Tooltip_Accelerator = {0} ({1})
116
116
117
#############################################################
117
#############################################################
(-)src/org/eclipse/jface/wizard/ProgressMonitorPart.java (-12 / +21 lines)
Lines 32-38 Link Here
32
/**
32
/**
33
 * A standard implementation of an IProgressMonitor. It consists
33
 * A standard implementation of an IProgressMonitor. It consists
34
 * of a label displaying the task and subtask name, and a
34
 * of a label displaying the task and subtask name, and a
35
 * progress indicator to show progress. In contrast to 
35
 * progress indicator to show progress. In contrast to
36
 * <code>ProgressMonitorDialog</code> this class only implements
36
 * <code>ProgressMonitorDialog</code> this class only implements
37
 * <code>IProgressMonitor</code>.
37
 * <code>IProgressMonitor</code>.
38
 */
38
 */
Lines 54-66 Link Here
54
    /** the cancel component */
54
    /** the cancel component */
55
    protected Control fCancelComponent;
55
    protected Control fCancelComponent;
56
56
57
    /** true if cancled */
57
    /** true if canceled */
58
    protected boolean fIsCanceled;
58
    protected boolean fIsCanceled;
59
59
60
    /** current blocked status */
60
    /** current blocked status */
61
    protected IStatus blockedStatus;
61
    protected IStatus blockedStatus;
62
62
63
    /** the cancle lister attached to the cancle component */
63
    /** the cancel lister attached to the cancel component */
64
    protected Listener fCancelListener = new Listener() {
64
    protected Listener fCancelListener = new Listener() {
65
        public void handleEvent(Event e) {
65
        public void handleEvent(Event e) {
66
            setCanceled(true);
66
            setCanceled(true);
Lines 97-103 Link Here
97
97
98
    /**
98
    /**
99
     * Attaches the progress monitor part to the given cancel
99
     * Attaches the progress monitor part to the given cancel
100
     * component. 
100
     * component.
101
     * @param cancelComponent the control whose selection will
101
     * @param cancelComponent the control whose selection will
102
     * trigger a cancel
102
     * trigger a cancel
103
     */
103
     */
Lines 157-165 Link Here
157
157
158
    /**
158
    /**
159
     * Creates the progress monitor's UI parts and layouts them
159
     * Creates the progress monitor's UI parts and layouts them
160
     * according to the given layout. If the layou is <code>null</code>
160
     * according to the given layout. If the layout is <code>null</code>
161
     * the part's default layout is used.
161
     * the part's default layout is used.
162
     * @param layout The layoutfor the receiver.
162
     * @param layout The layout for the receiver.
163
     * @param progressIndicatorHeight The suggested height of the indicator
163
     * @param progressIndicatorHeight The suggested height of the indicator
164
     */
164
     */
165
    protected void initialize(Layout layout, int progressIndicatorHeight) {
165
    protected void initialize(Layout layout, int progressIndicatorHeight) {
Lines 273-284 Link Here
273
     * @return String
273
     * @return String
274
     */
274
     */
275
    private String taskLabel() {
275
    private String taskLabel() {
276
        String text = fSubTaskName == null ? "" : fSubTaskName; //$NON-NLS-1$
276
    	boolean hasTask= fTaskName != null && fTaskName.length() > 0;
277
        if (fTaskName != null && fTaskName.length() > 0) {
277
    	boolean hasSubtask= fSubTaskName != null && fSubTaskName.length() > 0;
278
            text = JFaceResources.format(
278
    	
279
                    "Set_SubTask", new Object[] { fTaskName, text });//$NON-NLS-1$
279
		if (hasTask) {
280
        }
280
			if (hasSubtask)
281
        return escapeMetaCharacters(text);
281
				return escapeMetaCharacters(JFaceResources.format(
282
    					"Set_SubTask", new Object[] { fTaskName, fSubTaskName }));//$NON-NLS-1$
283
   			return escapeMetaCharacters(fTaskName);
284
   			
285
    	} else if (hasSubtask) {
286
    		return escapeMetaCharacters(fSubTaskName);
287
    	
288
    	} else {
289
    		return ""; //$NON-NLS-1$
290
    	}
282
    }
291
    }
283
292
284
    /**
293
    /**

Return to bug 185347