diff options
| author | james | 2002-08-12 18:22:52 +0000 |
|---|---|---|
| committer | james | 2002-08-12 18:22:52 +0000 |
| commit | 7f0305f66e9e8b9a4d3f33b0f79be6370690fb2f (patch) | |
| tree | 68db35d26ec45eaf840e0fb66dd1197c9b2ce246 /bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java | |
| parent | 4f0e0045a24334f10e989215ea914957a980cd7d (diff) | |
| download | eclipse.platform.team-7f0305f66e9e8b9a4d3f33b0f79be6370690fb2f.tar.gz eclipse.platform.team-7f0305f66e9e8b9a4d3f33b0f79be6370690fb2f.tar.xz eclipse.platform.team-7f0305f66e9e8b9a4d3f33b0f79be6370690fb2f.zip | |
Merge fixes from R2_0_1 branchI20020812
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java index 759b97e26..c69128320 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java @@ -335,7 +335,12 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref store.setValue(ICVSUIConstants.PREF_TIMEOUT, timeout); store.setValue(ICVSUIConstants.PREF_QUIETNESS, quietnessCombo.getSelectionIndex()); store.setValue(ICVSUIConstants.PREF_COMPRESSION_LEVEL, compressionLevelCombo.getSelectionIndex()); - store.setValue(ICVSUIConstants.PREF_TEXT_KSUBST, ((KSubstOption) ksubstOptions.get(ksubstCombo.getSelectionIndex())).toMode()); + // Text mode processed separately to avoid empty string in properties file. + String mode =((KSubstOption)ksubstOptions.get(ksubstCombo.getSelectionIndex())).toMode(); + if (mode.length() == 0) { + mode = "-kkv"; + } + store.setValue(ICVSUIConstants.PREF_TEXT_KSUBST, mode); store.setValue(ICVSUIConstants.PREF_CONSIDER_CONTENTS, considerContentsInCompare.getSelection()); store.setValue(ICVSUIConstants.PREF_SHOW_MARKERS, showMarkers.getSelection()); store.setValue(ICVSUIConstants.PREF_REPLACE_UNMANAGED, replaceUnmanaged.getSelection()); |