Attachment 222466 Details for Bug 387783 – Patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch

patch387783.txt (text/plain), 1.53 KB, created by Szymon Ptaszkiewicz

on 2012-10-17 07:58:14 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Szymon Ptaszkiewicz

Created: 2012-10-17 07:58:14 EDT

Size: 1.53 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/FileUtil.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/FileUtil.java
>index 864d074..6ef0e93 100644
>--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/FileUtil.java
>+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/FileUtil.java
>@@ -20,6 +20,7 @@
> import org.eclipse.core.internal.resources.Workspace;
> import org.eclipse.core.resources.*;
> import org.eclipse.core.runtime.*;
>+import org.eclipse.core.runtime.preferences.DefaultScope;
> import org.eclipse.core.runtime.preferences.InstanceScope;
> import org.eclipse.osgi.util.NLS;
> import org.osgi.service.prefs.BackingStoreException;
>@@ -181,6 +182,7 @@
> 	 *   <li> Line separator currently used in that file.
> 	 *   <li> Line separator defined in project preferences.
> 	 *   <li> Line separator defined in instance preferences.
>+	 *   <li> Line separator defined in default preferences.
> 	 *   <li> Operating system default line separator.
> 	 * </ol>
> 	 * @param file the file for which line separator should be returned
>@@ -219,6 +221,10 @@
> 		value = getLineSeparatorFromPreferences(rootNode.node(InstanceScope.SCOPE));
> 		if (value != null)
> 			return value;
>+		// try with default preferences
>+		value = getLineSeparatorFromPreferences(rootNode.node(DefaultScope.SCOPE));
>+		if (value != null)
>+			return value;
> 		// if there is no preference set, fall back to OS default value
> 		return System.getProperty("line.separator"); //$NON-NLS-1$
> 	}

Actions: View | Diff

Attachments on bug 387783: 222466