From 0fc818ad2cba4dd70a00cf0706f0bfdd458842f6 Mon Sep 17 00:00:00 2001 From: Sean Evoy Date: Thu, 21 Oct 2004 17:45:11 +0000 Subject: [PATCH] Fix for 76715 -- After reopening Eclipse, a C++ managed project is not usable in any language other than English --- .../cdt/managedbuilder/core/ManagedBuildManager.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java index 0d3e4eeca98..6df1ead75f8 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java @@ -47,8 +47,8 @@ import org.eclipse.cdt.managedbuilder.internal.core.ManagedBuildInfo; import org.eclipse.cdt.managedbuilder.internal.core.ManagedMakeMessages; import org.eclipse.cdt.managedbuilder.internal.core.Target; import org.eclipse.cdt.managedbuilder.internal.core.Tool; -import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGenerator; import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator; +import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGenerator; import org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator; import org.eclipse.cdt.managedbuilder.scannerconfig.IManagedScannerInfoCollector; import org.eclipse.core.resources.IFile; @@ -532,6 +532,7 @@ public class ManagedBuildManager extends AbstractCExtension implements IScannerI ByteArrayOutputStream stream = new ByteArrayOutputStream(); Transformer transformer = TransformerFactory.newInstance().newTransformer(); transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$ + transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); //$NON-NLS-1$ transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$ DOMSource source = new DOMSource(doc); StreamResult result = new StreamResult(stream); @@ -540,10 +541,11 @@ public class ManagedBuildManager extends AbstractCExtension implements IScannerI // Save the document IFile projectFile = project.getFile(SETTINGS_FILE_NAME); String utfString = stream.toString("UTF8"); //$NON-NLS-1$ + if (projectFile.exists()) { - projectFile.setContents(new ByteArrayInputStream(utfString.getBytes()), IResource.FORCE, null); + projectFile.setContents(new ByteArrayInputStream(utfString.getBytes("UTF8")), IResource.FORCE, new NullProgressMonitor()); } else { - projectFile.create(new ByteArrayInputStream(utfString.getBytes()), IResource.FORCE, null); + projectFile.create(new ByteArrayInputStream(utfString.getBytes("UTF8")), IResource.FORCE, new NullProgressMonitor()); } // Close the streams @@ -794,7 +796,6 @@ public class ManagedBuildManager extends AbstractCExtension implements IScannerI project.setSessionProperty(buildInfoProperty, buildInfo); } } catch (Exception e) { - buildInfo = null; } return buildInfo; }