From 258757431cd240f5ff4728b99d88a2c80b1a44ac Mon Sep 17 00:00:00 2001 From: Mikhail Sennikovsky Date: Wed, 28 Feb 2007 11:59:16 +0000 Subject: Additional fix for [Bug 175087] [New project model] PathEntry not converted --- .../cdt/internal/core/cdtvariables/UserDefinedVariableSupplier.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserDefinedVariableSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserDefinedVariableSupplier.java index 15e5c5fc7e7..a2e500961f5 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserDefinedVariableSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserDefinedVariableSupplier.java @@ -509,7 +509,7 @@ public class UserDefinedVariableSupplier extends CoreMacroSupplierBase { InputStream stream = loadInputStream(getWorkspaceNode(),PREFNAME_WORKSPACE); if(stream == null) return new StorableCdtVariables(false); - return loadMacrosFromStream(stream); + return loadMacrosFromStream(stream, false); } @@ -526,7 +526,7 @@ public class UserDefinedVariableSupplier extends CoreMacroSupplierBase { storeOutputStream(stream,getWorkspaceNode(),PREFNAME_WORKSPACE); } - private StorableCdtVariables loadMacrosFromStream(InputStream stream){ + private StorableCdtVariables loadMacrosFromStream(InputStream stream, boolean readOnly){ try{ DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder(); InputSource inputSource = new InputSource(stream); @@ -536,7 +536,7 @@ public class UserDefinedVariableSupplier extends CoreMacroSupplierBase { if(!StorableCdtVariables.MACROS_ELEMENT_NAME.equals(rootElement.getNodeName())) return null; - return new StorableCdtVariables(new XmlStorageElement(rootElement), true); + return new StorableCdtVariables(new XmlStorageElement(rootElement), readOnly); } catch(ParserConfigurationException e){ -- cgit v1.2.1