Attachment 86925 Details for Bug 213703 – Proposed patch

[patch] Proposed patch

v01.txt (text/plain), 3.74 KB, created by Frederic Fusier

on 2008-01-15 05:16:07 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2008-01-15 05:16:07 EST

Size: 3.74 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: search/org/eclipse/jdt/internal/core/search/processing/JobManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/processing/JobManager.java,v
>retrieving revision 1.92
>diff -u -r1.92 JobManager.java
>--- search/org/eclipse/jdt/internal/core/search/processing/JobManager.java	19 Oct 2007 15:57:22 -0000	1.92
>+++ search/org/eclipse/jdt/internal/core/search/processing/JobManager.java	15 Jan 2008 08:23:09 -0000
>@@ -11,9 +11,6 @@
> package org.eclipse.jdt.internal.core.search.processing;
> 
> import org.eclipse.core.runtime.*;
>-import org.eclipse.core.runtime.IProgressMonitor;
>-import org.eclipse.core.runtime.OperationCanceledException;
>-import org.eclipse.core.runtime.SubProgressMonitor;
> import org.eclipse.core.runtime.jobs.Job;
> import org.eclipse.jdt.internal.core.util.Messages;
> import org.eclipse.jdt.internal.core.util.Util;
>@@ -237,8 +234,8 @@
> 										if (VERBOSE)
> 											Util.verbose("-> NOT READY - waiting until ready - " + searchJob);//$NON-NLS-1$
> 										if (subProgress != null) {
>-											subProgress.subTask(
>-												Messages.bind(Messages.jobmanager_filesToIndex, Integer.toString(awaitingJobsCount)));
>+											String indexing = Messages.bind(Messages.jobmanager_filesToIndex, currentJob.getJobFamily(), Integer.toString(awaitingJobsCount));
>+											subProgress.subTask(indexing);
> 											// ratio of the amount of work relative to the total work
> 											float ratio = awaitingJobsCount < totalWork ? 1 : ((float) totalWork) / awaitingJobsCount;
> 											if (lastJobsCount > awaitingJobsCount) {
>@@ -337,10 +334,13 @@
> 				}
> 				protected IStatus run(IProgressMonitor monitor) {
> 					IJob job = currentJob();
>+					StringBuffer prefix = new StringBuffer(Messages.jobmanager_indexing);
> 					while (!monitor.isCanceled() && job != null) {
>-						String indexing = Messages.bind(Messages.jobmanager_indexing, job.getJobFamily());
>-						monitor.subTask(indexing);
>-						setName(indexing); 
>+						 String taskName = prefix
>+							.append(Messages.bind(Messages.jobmanager_filesToIndex, job.getJobFamily(), Integer.toString(awaitingJobsCount())))
>+							.toString();
>+						monitor.subTask(taskName);
>+						setName(taskName); 
> 						try {
> 							Thread.sleep(500);
> 						} catch (InterruptedException e) {
>@@ -387,7 +387,7 @@
> 					try {
> 						this.executing = true;
> 						if (this.progressJob == null) {
>-							this.progressJob = new ProgressJob(Messages.bind(Messages.jobmanager_indexing, "")); //$NON-NLS-1$
>+							this.progressJob = new ProgressJob(Messages.bind(Messages.jobmanager_indexing, "", "")); //$NON-NLS-1$ //$NON-NLS-2$
> 							this.progressJob.setPriority(Job.LONG);
> 							this.progressJob.setSystem(true);
> 							this.progressJob.schedule();
>Index: model/org/eclipse/jdt/internal/core/util/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/messages.properties,v
>retrieving revision 1.68
>diff -u -r1.68 messages.properties
>--- model/org/eclipse/jdt/internal/core/util/messages.properties	19 Oct 2007 15:57:22 -0000	1.68
>+++ model/org/eclipse/jdt/internal/core/util/messages.properties	15 Jan 2008 08:23:08 -0000
>@@ -242,8 +242,8 @@
> engine_searching_matching = Locating {0} matches...
> exception_wrongFormat = Wrong format
> process_name = Java indexing
>-jobmanager_filesToIndex = {0} files to index
>-jobmanager_indexing = Java indexing {0}
>+jobmanager_filesToIndex = {1} files to index ({0})
>+jobmanager_indexing = Java indexing... 
> 
> ### Disassembler messages
>

Actions: View | Diff

Attachments on bug 213703: 86925