Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2003-11-17 17:45:46 +0000
committerJean Michel-Lemieux2003-11-17 17:45:46 +0000
commitf278bbbfd5f05a40f395e6b65a27e23ddca55d8c (patch)
tree63f654fcce3c652686bf37f9e5b5f4ccaee0f4e5
parent3548f94b3225f04dae62d235389502f68fe1f1af (diff)
downloadeclipse.platform.team-f278bbbfd5f05a40f395e6b65a27e23ddca55d8c.tar.gz
eclipse.platform.team-f278bbbfd5f05a40f395e6b65a27e23ddca55d8c.tar.xz
eclipse.platform.team-f278bbbfd5f05a40f395e6b65a27e23ddca55d8c.zip
Added methods for including new generic consoleI20031118
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java21
1 files changed, 21 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
index 362e32bb8..b3213d8ff 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
@@ -33,6 +33,7 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.internal.ccvs.core.*;
import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption;
+import org.eclipse.team.internal.ccvs.ui.console.CVSOutputConsole;
import org.eclipse.team.internal.ccvs.ui.model.CVSAdapterFactory;
import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager;
import org.eclipse.team.internal.ccvs.ui.repo.RepositoryRoot;
@@ -43,6 +44,8 @@ import org.eclipse.team.ui.TeamUI;
import org.eclipse.team.ui.synchronize.ISynchronizeParticipant;
import org.eclipse.team.ui.synchronize.ISynchronizeView;
import org.eclipse.ui.*;
+import org.eclipse.ui.console.ConsolePlugin;
+import org.eclipse.ui.console.IConsole;
import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -69,6 +72,11 @@ public class CVSUIPlugin extends AbstractUIPlugin {
private static CVSUIPlugin plugin;
/**
+ * The CVS console
+ */
+ private CVSOutputConsole console;
+
+ /**
* The repository manager
*/
private RepositoryManager repositoryManager;
@@ -88,6 +96,19 @@ public class CVSUIPlugin extends AbstractUIPlugin {
}
/**
+ * Returns the standard display to be used. The method first checks, if
+ * the thread calling this method has an associated display. If so, this
+ * display is returned. Otherwise the method returns the default display.
+ */
+ public static Display getStandardDisplay() {
+ Display display= Display.getCurrent();
+ if (display == null) {
+ display= Display.getDefault();
+ }
+ return display;
+ }
+
+ /**
* Creates an image and places it in the image registry.
*/
protected void createImageDescriptor(String id, URL baseURL) {

Back to the top