Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Barnes2006-03-17 17:44:11 -0500
committerKevin Barnes2006-03-17 17:44:11 -0500
commitfd77cfe1dbace0a25d5f64c3cb287ee6cc30e92e (patch)
tree5715a54f19fb6a98c3780f3e47d865a3fab32df9 /org.eclipse.ui.console
parent0333874414126dba03539b0cd8d0017025ad832a (diff)
downloadeclipse.platform.debug-fd77cfe1dbace0a25d5f64c3cb287ee6cc30e92e.tar.gz
eclipse.platform.debug-fd77cfe1dbace0a25d5f64c3cb287ee6cc30e92e.tar.xz
eclipse.platform.debug-fd77cfe1dbace0a25d5f64c3cb287ee6cc30e92e.zip
Bug 132398 - Console Performance Test failures on fast windows box
Diffstat (limited to 'org.eclipse.ui.console')
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleDocument.java2
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleManager.java5
2 files changed, 3 insertions, 4 deletions
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleDocument.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleDocument.java
index bb7631a48..781725f17 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleDocument.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleDocument.java
@@ -67,7 +67,7 @@ public class ConsoleDocument extends Document {
/* (non-Javadoc)
* @see org.eclipse.jface.text.IDocument#getLineOfOffset(int)
*/
- public synchronized int getLineOfOffset(int pos) throws BadLocationException {
+ public int getLineOfOffset(int pos) throws BadLocationException {
return super.getLineOfOffset(pos);
}
/* (non-Javadoc)
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleManager.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleManager.java
index 76a266947..77da839a6 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleManager.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleManager.java
@@ -281,7 +281,7 @@ public class ConsoleManager implements IConsoleManager {
public IStatus runInUIThread(IProgressMonitor monitor) {
boolean consoleFound = false;
IWorkbenchWindow window= PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- if (window != null) {
+ if (window != null && console != null) {
IWorkbenchPage page= window.getActivePage();
if (page != null) {
synchronized (fConsoleViews) {
@@ -290,12 +290,10 @@ public class ConsoleManager implements IConsoleManager {
boolean consoleVisible = page.isPartVisible(consoleView);
if (consoleVisible) {
consoleFound = true;
-
boolean bringToTop = shouldBringToTop(console, consoleView);
if (bringToTop) {
page.bringToTop(consoleView);
}
-
consoleView.display(console);
}
}
@@ -315,6 +313,7 @@ public class ConsoleManager implements IConsoleManager {
}
}
}
+ console = null;
return Status.OK_STATUS;
}
}

Back to the top