diff options
| author | Lars Vogel | 2020-10-20 11:07:00 +0000 |
|---|---|---|
| committer | Lars Vogel | 2020-10-20 11:07:00 +0000 |
| commit | a65e4561cb976450a9143634b5c0fd67c19f84b9 (patch) | |
| tree | c25feea4dca8ef478971b964ca859e2d6c505def /bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java | |
| parent | b74f7528de85755033a3a40f0a70439287c61f39 (diff) | |
| download | eclipse.platform.team-a65e4561cb976450a9143634b5c0fd67c19f84b9.tar.gz eclipse.platform.team-a65e4561cb976450a9143634b5c0fd67c19f84b9.tar.xz eclipse.platform.team-a65e4561cb976450a9143634b5c0fd67c19f84b9.zip | |
Bug 568029 - Replace activator with settings classY20201103-1200Y20201102-1200Y20201101-1200Y20201031-1200Y20201030-1200Y20201029-1200Y20201028-1200Y20201027-1200Y20201026-1200Y20201025-1200Y20201024-1200Y20201023-1200I20201103-1800I20201103-0030I20201102-1910I20201101-1800I20201031-1800I20201030-1800I20201029-1800I20201028-1800I20201028-0800I20201028-0610I20201028-0130I20201028-0020I20201027-2350I20201027-1800I20201026-1850I20201026-0840I20201026-0650I20201025-1800I20201025-0040I20201024-1800I20201023-1800I20201023-0250
Change-Id: Iad08bbf575d5de507c24361dbee055c773167639
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java')
| -rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java index caa454ed1..a0e0e9452 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java @@ -27,7 +27,7 @@ import org.eclipse.compare.CompareConfiguration; import org.eclipse.compare.IEncodedStreamContentAccessor; import org.eclipse.compare.ITypedElement; import org.eclipse.compare.contentmergeviewer.TextMergeViewer; -import org.eclipse.compare.internal.core.ComparePlugin; +import org.eclipse.compare.internal.core.CompareSettings; import org.eclipse.compare.structuremergeviewer.DiffNode; import org.eclipse.compare.structuremergeviewer.Differencer; import org.eclipse.jface.dialogs.Dialog; @@ -207,7 +207,7 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP editors.forEach(FieldEditor::store); fOverlayStore.propagate(); - ComparePlugin.getDefault().setCappingDisabled( + CompareSettings.getDefault().setCappingDisabled( getPreferenceStore().getBoolean( ComparePreferencePage.CAPPING_DISABLED)); return true; |