Attachment 65766 Details for Bug 185347 – Fix

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

[patch] Fix

185347_patch.txt (text/plain), 3.89 KB, created by Markus Keller

on 2007-05-03 10:21:14 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Keller

Created: 2007-05-03 10:21:14 EDT

Size: 3.89 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jface
>Index: src/org/eclipse/jface/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface/src/org/eclipse/jface/messages.properties,v
>retrieving revision 1.26
>diff -u -r1.26 messages.properties
>--- src/org/eclipse/jface/messages.properties	12 Apr 2007 18:56:50 -0000	1.26
>+++ src/org/eclipse/jface/messages.properties	3 May 2007 14:22:20 -0000
>@@ -111,7 +111,7 @@
> # org.eclipse.jface.action 
> #############################################################
> Cancel_Current_Operation = Cancel Current Operation
>-Set_SubTask = {0} {1}
>+Set_SubTask = {0}: {1}
> Toolbar_Tooltip_Accelerator = {0} ({1})
> 
> #############################################################
>Index: src/org/eclipse/jface/wizard/ProgressMonitorPart.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface/src/org/eclipse/jface/wizard/ProgressMonitorPart.java,v
>retrieving revision 1.11
>diff -u -r1.11 ProgressMonitorPart.java
>--- src/org/eclipse/jface/wizard/ProgressMonitorPart.java	10 Nov 2006 17:42:10 -0000	1.11
>+++ src/org/eclipse/jface/wizard/ProgressMonitorPart.java	3 May 2007 14:22:20 -0000
>@@ -32,7 +32,7 @@
> /**
>  * A standard implementation of an IProgressMonitor. It consists
>  * of a label displaying the task and subtask name, and a
>- * progress indicator to show progress. In contrast to 
>+ * progress indicator to show progress. In contrast to
>  * <code>ProgressMonitorDialog</code> this class only implements
>  * <code>IProgressMonitor</code>.
>  */
>@@ -54,13 +54,13 @@
>     /** the cancel component */
>     protected Control fCancelComponent;
> 
>-    /** true if cancled */
>+    /** true if canceled */
>     protected boolean fIsCanceled;
> 
>     /** current blocked status */
>     protected IStatus blockedStatus;
> 
>-    /** the cancle lister attached to the cancle component */
>+    /** the cancel lister attached to the cancel component */
>     protected Listener fCancelListener = new Listener() {
>         public void handleEvent(Event e) {
>             setCanceled(true);
>@@ -97,7 +97,7 @@
> 
>     /**
>      * Attaches the progress monitor part to the given cancel
>-     * component. 
>+     * component.
>      * @param cancelComponent the control whose selection will
>      * trigger a cancel
>      */
>@@ -157,9 +157,9 @@
> 
>     /**
>      * Creates the progress monitor's UI parts and layouts them
>-     * according to the given layout. If the layou is <code>null</code>
>+     * according to the given layout. If the layout is <code>null</code>
>      * the part's default layout is used.
>-     * @param layout The layoutfor the receiver.
>+     * @param layout The layout for the receiver.
>      * @param progressIndicatorHeight The suggested height of the indicator
>      */
>     protected void initialize(Layout layout, int progressIndicatorHeight) {
>@@ -273,12 +273,21 @@
>      * @return String
>      */
>     private String taskLabel() {
>-        String text = fSubTaskName == null ? "" : fSubTaskName; //$NON-NLS-1$
>-        if (fTaskName != null && fTaskName.length() > 0) {
>-            text = JFaceResources.format(
>-                    "Set_SubTask", new Object[] { fTaskName, text });//$NON-NLS-1$
>-        }
>-        return escapeMetaCharacters(text);
>+    	boolean hasTask= fTaskName != null && fTaskName.length() > 0;
>+    	boolean hasSubtask= fSubTaskName != null && fSubTaskName.length() > 0;
>+    	
>+		if (hasTask) {
>+			if (hasSubtask)
>+				return escapeMetaCharacters(JFaceResources.format(
>+    					"Set_SubTask", new Object[] { fTaskName, fSubTaskName }));//$NON-NLS-1$
>+   			return escapeMetaCharacters(fTaskName);
>+   			
>+    	} else if (hasSubtask) {
>+    		return escapeMetaCharacters(fSubTaskName);
>+    	
>+    	} else {
>+    		return ""; //$NON-NLS-1$
>+    	}
>     }
> 
>     /**

Actions: View | Diff

Attachments on bug 185347: 65766