Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikhail Sennikovsky2007-02-28 11:59:16 +0000
committerMikhail Sennikovsky2007-02-28 11:59:16 +0000
commit258757431cd240f5ff4728b99d88a2c80b1a44ac (patch)
tree399bb7b658b8ea00a180047f52d1e067acf07016
parent01ed38e9da08320a736474652d6e4f7fff473d99 (diff)
downloadorg.eclipse.cdt-258757431cd240f5ff4728b99d88a2c80b1a44ac.tar.gz
org.eclipse.cdt-258757431cd240f5ff4728b99d88a2c80b1a44ac.tar.xz
org.eclipse.cdt-258757431cd240f5ff4728b99d88a2c80b1a44ac.zip
Additional fix for [Bug 175087] [New project model] PathEntry not converted
-rw-r--r--core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserDefinedVariableSupplier.java6
1 files 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){

Back to the top