mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 10:16:03 +02:00
Code Issues Wiki Activity

Fix for 76715 -- After reopening Eclipse, a C++ managed project is not usable in any language other than English

Browse source
This commit is contained in:
Sean Evoy 2004-10-21 17:45:11 +00:00
parent 8e22cf635e
commit 0fc818ad2c
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
View file

@ -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.ManagedMakeMessages;
import org.eclipse.cdt.managedbuilder.internal.core.Target; import org.eclipse.cdt.managedbuilder.internal.core.Target;
import org.eclipse.cdt.managedbuilder.internal.core.Tool; 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.IManagedBuilderMakefileGenerator;
import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGenerator;
import org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator; import org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator;
import org.eclipse.cdt.managedbuilder.scannerconfig.IManagedScannerInfoCollector; import org.eclipse.cdt.managedbuilder.scannerconfig.IManagedScannerInfoCollector;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
@ -532,6 +532,7 @@ public class ManagedBuildManager extends AbstractCExtension implements IScannerI
ByteArrayOutputStream stream = new ByteArrayOutputStream(); ByteArrayOutputStream stream = new ByteArrayOutputStream();
Transformer transformer = TransformerFactory.newInstance().newTransformer(); Transformer transformer = TransformerFactory.newInstance().newTransformer();
transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$ 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$ transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
DOMSource source = new DOMSource(doc); DOMSource source = new DOMSource(doc);
StreamResult result = new StreamResult(stream); StreamResult result = new StreamResult(stream);
@ -540,10 +541,11 @@ public class ManagedBuildManager extends AbstractCExtension implements IScannerI
// Save the document // Save the document
IFile projectFile = project.getFile(SETTINGS_FILE_NAME); IFile projectFile = project.getFile(SETTINGS_FILE_NAME);
String utfString = stream.toString("UTF8"); //$NON-NLS-1$ String utfString = stream.toString("UTF8"); //$NON-NLS-1$
if (projectFile.exists()) { if (projectFile.exists()) {
projectFile.setContents(new ByteArrayInputStream(utfString.getBytes()), IResource.FORCE, null); projectFile.setContents(new ByteArrayInputStream(utfString.getBytes("UTF8")), IResource.FORCE, new NullProgressMonitor());
} else { } else {
projectFile.create(new ByteArrayInputStream(utfString.getBytes()), IResource.FORCE, null); projectFile.create(new ByteArrayInputStream(utfString.getBytes("UTF8")), IResource.FORCE, new NullProgressMonitor());
} }
// Close the streams // Close the streams
@ -794,7 +796,6 @@ public class ManagedBuildManager extends AbstractCExtension implements IScannerI
project.setSessionProperty(buildInfoProperty, buildInfo); project.setSessionProperty(buildInfoProperty, buildInfo);
} }
} catch (Exception e) { } catch (Exception e) {
buildInfo = null;
} }
return buildInfo; return buildInfo;
} }