Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-05-16 13:54:35 -0400
committerjames2002-05-16 13:54:35 -0400
commit8a2eadaca6a8458fdb2a7aa3edcbe0e290d9723d (patch)
treee9953d5a93c85b83bd002d523f454eb6af1ba0d6
parent673a7e57ff1849fad0945bd36736c4b8faa299fe (diff)
downloadeclipse.platform.team-8a2eadaca6a8458fdb2a7aa3edcbe0e290d9723d.tar.gz
eclipse.platform.team-8a2eadaca6a8458fdb2a7aa3edcbe0e290d9723d.tar.xz
eclipse.platform.team-8a2eadaca6a8458fdb2a7aa3edcbe0e290d9723d.zip
14742: Ignore whitespace preference
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/CatchupReleaseViewer.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/CatchupReleaseViewer.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/CatchupReleaseViewer.java
index 08d14ee89..3a3f58228 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/CatchupReleaseViewer.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/CatchupReleaseViewer.java
@@ -12,6 +12,7 @@ import org.eclipse.compare.BufferedContent;
import org.eclipse.compare.CompareConfiguration;
import org.eclipse.compare.IEditableContent;
import org.eclipse.compare.ITypedElement;
+import org.eclipse.compare.internal.CompareUIPlugin;
import org.eclipse.compare.structuremergeviewer.DiffContainer;
import org.eclipse.compare.structuremergeviewer.DiffElement;
import org.eclipse.compare.structuremergeviewer.DiffTreeViewer;
@@ -373,7 +374,8 @@ public abstract class CatchupReleaseViewer extends DiffTreeViewer implements ISe
}
};
ignoreWhiteSpace.setId("team.ignoreWhiteSpace"); //$NON-NLS-1$
- ignoreWhiteSpace.setChecked(false);
+ boolean ignore = CompareUIPlugin.getDefault().getPreferenceStore().getBoolean(CompareConfiguration.IGNORE_WHITESPACE);
+ ignoreWhiteSpace.setChecked(ignore);
// Add a selection listener to set the left label
addSelectionChangedListener(this);

Back to the top