Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-03-01 15:17:59 +0000
committerMichael Valenta2004-03-01 15:17:59 +0000
commit699c5d9fd519aec16c0f812436cd838d18d4159c (patch)
tree4bae9159a6100453c571654fc5cd87a1a229ddc5
parent9ba92683deacc3eff5ed25eca7a0565b216ccdc1 (diff)
downloadeclipse.platform.team-699c5d9fd519aec16c0f812436cd838d18d4159c.tar.gz
eclipse.platform.team-699c5d9fd519aec16c0f812436cd838d18d4159c.tar.xz
eclipse.platform.team-699c5d9fd519aec16c0f812436cd838d18d4159c.zip
53185: [Decorators] NPE and SWTException while applying decorationsRoot_branch_20040301_changeLogModelProvider
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java7
1 files changed, 4 insertions, 3 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 7c9f7694e..e9334f94d 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
@@ -104,6 +104,10 @@ public class CVSUIPlugin extends AbstractUIPlugin {
*/
public CVSUIPlugin(IPluginDescriptor descriptor) {
super(descriptor);
+ // Initialize the images before the singleton is set
+ // to avoid accesses before they are initialized
+ initializeImages();
+ initializePreferences();
plugin = this;
}
@@ -678,9 +682,6 @@ public class CVSUIPlugin extends AbstractUIPlugin {
Platform.getAdapterManager().registerAdapters(factory, ICVSRepositoryLocation.class);
Platform.getAdapterManager().registerAdapters(factory, RepositoryRoot.class);
- initializeImages();
- initializePreferences();
-
console = new CVSOutputConsole();
ConsolePlugin.getDefault().getConsoleManager().addConsoles(new IConsole[] {console});
}

Back to the top