diff options
author | Andrey Loskutov | 2016-08-17 14:35:24 +0000 |
---|---|---|
committer | Andrey Loskutov | 2016-08-24 07:44:33 +0000 |
commit | 60e34dbeeeb3d5c8a2fe7f2e81a93bcdbd2b7b00 (patch) | |
tree | f4aa838177ccb6477c05c8d7fe3ef35897ba89ad | |
parent | 36cf11dd466102e4d772a27044ed9a6f652b7ff7 (diff) | |
download | eclipse.platform.debug-60e34dbeeeb3d5c8a2fe7f2e81a93bcdbd2b7b00.tar.gz eclipse.platform.debug-60e34dbeeeb3d5c8a2fe7f2e81a93bcdbd2b7b00.tar.xz eclipse.platform.debug-60e34dbeeeb3d5c8a2fe7f2e81a93bcdbd2b7b00.zip |
Bug 451797 - [platform] UI freezes inY20160825-1000
IOConsolePartitioner$TrimJob.runInUIThread
Reverting the main part of the change from bug 108568 commit
8b377c8203a4054eebd2bb3740bf40296b63d3d8.
Change-Id: I306f6d66de31d1787e40b8da0dda60fa66986c6a
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
-rw-r--r-- | org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePatternMatcher.java | 4 | ||||
-rw-r--r-- | org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePartitioner.java | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePatternMatcher.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePatternMatcher.java index d445277c0..3289b751b 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePatternMatcher.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePatternMatcher.java @@ -31,7 +31,7 @@ import org.eclipse.ui.console.TextConsole; public class ConsolePatternMatcher implements IDocumentListener { - private MatchJob fMatchJob = new MatchJob(); + private MatchJob fMatchJob; /** * Collection of compiled pattern match listeners @@ -46,12 +46,14 @@ public class ConsolePatternMatcher implements IDocumentListener { public ConsolePatternMatcher(TextConsole console) { fConsole = console; + fMatchJob = new MatchJob(); } private class MatchJob extends Job { MatchJob() { super("Match Job"); //$NON-NLS-1$ setSystem(true); + setRule(fConsole.getSchedulingRule()); } /* diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePartitioner.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePartitioner.java index 6f32defb7..b02fe4f57 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePartitioner.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePartitioner.java @@ -17,9 +17,7 @@ import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.IJobManager; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.DocumentEvent; @@ -627,14 +625,6 @@ public class IOConsolePartitioner implements IConsoleDocumentPartitioner, IDocum */ @Override public IStatus runInUIThread(IProgressMonitor monitor) { - IJobManager jobManager = Job.getJobManager(); - try { - jobManager.join(console, monitor); - } catch (OperationCanceledException e1) { - return Status.CANCEL_STATUS; - } catch (InterruptedException e1) { - return Status.CANCEL_STATUS; - } if (document == null) { return Status.OK_STATUS; } |