From 5e5b51e35a69ecf319a8f68c5d226c06a2eae502 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Tue, 18 May 2010 02:08:11 +0000 Subject: [PATCH] Bug 313038 - Includes path lost on restart. Moved the init of the config data provider to bundle start time so it's ready in time for first project creation. --- .../settings/model/CConfigurationDataProviderDescriptor.java | 5 +++++ .../core/settings/model/CProjectDescriptionManager.java | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDataProviderDescriptor.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDataProviderDescriptor.java index 2a2cd85d3c6..fd58e12d23d 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDataProviderDescriptor.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDataProviderDescriptor.java @@ -51,6 +51,11 @@ public class CConfigurationDataProviderDescriptor { fNatureIds = new String[0]; fConflictingNatureIds = new String[0]; } + try { + fProvider = createProvider(extension); + } catch (CoreException e) { + CCorePlugin.log(e.getStatus()); + } } private static String[] toArray(String value){ diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java index ea6fee5879e..6f6eae2dbc2 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java @@ -268,8 +268,10 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { public static CProjectDescriptionManager getInstance(){ if(fInstance == null) synchronized(CProjectDescriptionManager.class) { - if (fInstance == null) + if (fInstance == null) { fInstance = new CProjectDescriptionManager(); + fInstance.initProviderInfo(); + } } return fInstance; }