From e090629a8b552538c9c5eba3aa6a72e4546dac83 Mon Sep 17 00:00:00 2001 From: Mikhail Sennikovsky Date: Thu, 3 May 2007 17:23:20 +0000 Subject: [PATCH] Externalization fixes --- .../managedbuilder/internal/buildmodel/BuildStateManager.java | 2 +- .../internal/buildmodel/ConfigurationBuildState.java | 2 +- .../managedbuilder/internal/buildmodel/ProjectBuildState.java | 2 +- .../eclipse/cdt/managedbuilder/internal/core/ToolChain.java | 4 ++-- .../core/settings/model/CProjectDescriptionManager.java | 2 +- .../core/settings/model/SettingsModelMessages.properties | 1 + 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildStateManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildStateManager.java index 68527d20e1a..4fdc523c34d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildStateManager.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildStateManager.java @@ -26,7 +26,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; public class BuildStateManager { - private static final String PREFS_LOCATION = "buildState"; + private static final String PREFS_LOCATION = "buildState"; //$NON-NLS-1$ private static BuildStateManager fInstance; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/ConfigurationBuildState.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/ConfigurationBuildState.java index f9cd8e90c00..ef7c48930fa 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/ConfigurationBuildState.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/ConfigurationBuildState.java @@ -148,7 +148,7 @@ public class ConfigurationBuildState implements IConfigurationBuildState { public void store(OutputStream oStream) throws IOException{ if(fPathToStateProps != null) - fPathToStateProps.store(oStream, ""); + fPathToStateProps.store(oStream, ""); //$NON-NLS-1$ // Properties props = new Properties(); // store(props); // props.store(oStream, ""); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/ProjectBuildState.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/ProjectBuildState.java index 82f803db908..ddf0151e4df 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/ProjectBuildState.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/ProjectBuildState.java @@ -144,7 +144,7 @@ public class ProjectBuildState implements IProjectBuildState { try { OutputStream oStream = new FileOutputStream(file); - fCfgIdToFileNameProps.store(oStream, ""); + fCfgIdToFileNameProps.store(oStream, ""); //$NON-NLS-1$ oStream.close(); } catch (FileNotFoundException e) { ManagedBuilderCorePlugin.log(e); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java index c8d15087d1a..934a9e57339 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java @@ -2702,7 +2702,7 @@ public class ToolChain extends HoldsOptions implements IToolChain, IBuildPropert private Set getUnusedChilrenSet(){ if(unusedChildrenSet == null){ - String childIds[] = CDataUtil.stringToArray(unusedChildren, ";"); + String childIds[] = CDataUtil.stringToArray(unusedChildren, ";"); //$NON-NLS-1$ if(childIds == null) unusedChildrenSet = new HashSet(); else { @@ -2721,6 +2721,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IBuildPropert } private String translateUnusedIdSetToString(Set set){ - return CDataUtil.arrayToString(set.toArray(), ";"); + return CDataUtil.arrayToString(set.toArray(), ";"); //$NON-NLS-1$ } } 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 f1757a28be4..a7623bf1f87 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 @@ -3395,6 +3395,6 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { } if(createIfNotFound) return el.createChild(PREFERENCES_ELEMENT); - throw ExceptionFactory.createCoreException("workspace info element does not exist"); + throw ExceptionFactory.createCoreException(SettingsModelMessages.getString("CProjectDescriptionManager.14")); //$NON-NLS-1$ } } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsModelMessages.properties b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsModelMessages.properties index 69bcaf1f6e8..a02fd8eb4a2 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsModelMessages.properties +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsModelMessages.properties @@ -31,6 +31,7 @@ CProjectDescriptionManager.10=invalid project file format CProjectDescriptionManager.11=storage file not found CProjectDescriptionManager.12=Serialing CDT Project settings.. CProjectDescriptionManager.13=Refreshing the project settings +CProjectDescriptionManager.14=workspace info element does not exist CFolderDescription.0=data was not created CFolderDescription.1=expected proxy of type ICLanguageSetting, but was CFolderDescription.2=data was not created