aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSzymon Ptaszkiewicz2012-10-08 05:49:12 (EDT)
committerDani Megert2012-10-08 05:49:12 (EDT)
commit832c044aa40d6a87878fe23f8c85621f76a8646c (patch)
tree2253f8721f709a7136346e2050f232ee0d24ea71
parent2c322c815d744bd5b5f2a3afe0bf1865e6f73a6d (diff)
downloadeclipse.platform.ui-832c044aa40d6a87878fe23f8c85621f76a8646c.zip
eclipse.platform.ui-832c044aa40d6a87878fe23f8c85621f76a8646c.tar.gz
eclipse.platform.ui-832c044aa40d6a87878fe23f8c85621f76a8646c.tar.bz2
Fixed bug 287579: Unable to set text file line delimiter with av20121008-094912I20121009-0800
plugin_customization.ini file
-rw-r--r--bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/LineDelimiterEditor.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/LineDelimiterEditor.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/LineDelimiterEditor.java
index ae2e996..d7a463a 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/LineDelimiterEditor.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/LineDelimiterEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2011 IBM Corporation and others.
+ * Copyright (c) 2005, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -17,6 +17,7 @@ import java.util.Set;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ProjectScope;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.preferences.DefaultScope;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
@@ -158,6 +159,9 @@ public class LineDelimiterEditor {
if (project != null) {
value = getStoredValue(getPreferences(null));
}
+ if (value == null) {
+ value = getStoredValue(Platform.getPreferencesService().getRootNode().node(DefaultScope.SCOPE));
+ }
return value != null ? value : System.getProperty(Platform.PREF_LINE_SEPARATOR);
}