Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Barnes2004-12-15 16:23:41 +0000
committerKevin Barnes2004-12-15 16:23:41 +0000
commit07b30beea4a3ea2ef38a66a6e5e4b1793cec7d42 (patch)
treee90852a7b71a469f73694aca49efe201be47f951 /org.eclipse.ui.console
parent5cf0cde45fcaac946976d3335bfc0232fcfb877b (diff)
downloadeclipse.platform.debug-07b30beea4a3ea2ef38a66a6e5e4b1793cec7d42.tar.gz
eclipse.platform.debug-07b30beea4a3ea2ef38a66a6e5e4b1793cec7d42.tar.xz
eclipse.platform.debug-07b30beea4a3ea2ef38a66a6e5e4b1793cec7d42.zip
Bug 80721 - Conflicting key binding for 'org.eclipse.debug.ui.commands.eof' and 'org.eclipse.ui.edit.text.delete.line'
Diffstat (limited to 'org.eclipse.ui.console')
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java
index 7ee9c3407..57a5e05bc 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java
@@ -552,10 +552,10 @@ public class ConsoleView extends PageBookView implements IConsoleView, IConsoleL
if (getSite() instanceof IViewSite) {
mySec = ((IViewSite)getSite()).getSecondaryId();
}
- if (secId == null) {
- return secId == mySec;
+ if (mySec == null) {
+ return secId == null;
}
- return secId.equals(mySec);
+ return mySec.equals(secId);
}
}
return false;

Back to the top