Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-03-14 20:36:46 +0000
committerMichael Valenta2002-03-14 20:36:46 +0000
commit00642f0d6834aaa2189622063f0809bf05e0f450 (patch)
treed34b59b7ff713d0c65dbf2fbeddfe727165d984f
parent0402f7052ea596c2818f2753f26229e9a3efc167 (diff)
downloadeclipse.platform.team-00642f0d6834aaa2189622063f0809bf05e0f450.tar.gz
eclipse.platform.team-00642f0d6834aaa2189622063f0809bf05e0f450.tar.xz
eclipse.platform.team-00642f0d6834aaa2189622063f0809bf05e0f450.zip
11036: "Very quiet" removes ability to catch up with stream?
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java30
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java4
2 files changed, 13 insertions, 21 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 62bfe8afc..c62ec26c8 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
@@ -125,9 +125,8 @@ public class CVSPreferencesPage
}
});
- // Quietness preference removed: bug 11036
- //createLabel(composite, Policy.bind("CVSPreferencePage.quietness"));
- //quietnessCombo = createCombo(composite);
+ createLabel(composite, Policy.bind("CVSPreferencePage.quietness"));
+ quietnessCombo = createCombo(composite);
historyTracksSelectionButton = createCheckBox(composite, Policy.bind("CVSPreferencePage.historyTracksSelection"));
@@ -174,11 +173,10 @@ public class CVSPreferencesPage
IPreferenceStore store = getPreferenceStore();
pruneEmptyDirectoriesField.setSelection(store.getBoolean(ICVSUIConstants.PREF_PRUNE_EMPTY_DIRECTORIES));
timeoutValue.setText(new Integer(store.getInt(ICVSUIConstants.PREF_TIMEOUT)).toString());
- // Quietness preference removed: bug 11036
- //quietnessCombo.add(Policy.bind("CVSPreferencePage.notquiet"));
- //quietnessCombo.add(Policy.bind("CVSPreferencePage.somewhatquiet"));
- //quietnessCombo.add(Policy.bind("CVSPreferencePage.reallyquiet"));
- //quietnessCombo.select(store.getInt(ICVSUIConstants.PREF_QUIETNESS));
+ quietnessCombo.add(Policy.bind("CVSPreferencePage.notquiet"));
+ quietnessCombo.add(Policy.bind("CVSPreferencePage.somewhatquiet"));
+ quietnessCombo.add(Policy.bind("CVSPreferencePage.reallyquiet"));
+ quietnessCombo.select(store.getInt(ICVSUIConstants.PREF_QUIETNESS));
historyTracksSelectionButton.setSelection(store.getBoolean(ICVSUIConstants.PREF_HISTORY_TRACKS_SELECTION));
considerContentsInCompare.setSelection(store.getBoolean(ICVSUIConstants.PREF_CONSIDER_CONTENTS));
}
@@ -203,8 +201,7 @@ public class CVSPreferencesPage
store.setValue(ICVSUIConstants.PREF_PRUNE_EMPTY_DIRECTORIES, pruneEmptyDirectoriesField.getSelection());
store.setValue(ICVSUIConstants.PREF_TIMEOUT, timeout);
- // Quietness preference removed: bug 11036
- //store.setValue(ICVSUIConstants.PREF_QUIETNESS, quietnessCombo.getSelectionIndex());
+ store.setValue(ICVSUIConstants.PREF_QUIETNESS, quietnessCombo.getSelectionIndex());
store.setValue(ICVSUIConstants.PREF_HISTORY_TRACKS_SELECTION, historyTracksSelectionButton.getSelection());
store.setValue(ICVSUIConstants.PREF_CONSIDER_CONTENTS, considerContentsInCompare.getSelection());
@@ -212,9 +209,8 @@ public class CVSPreferencesPage
store.getBoolean(ICVSUIConstants.PREF_PRUNE_EMPTY_DIRECTORIES));
CVSProviderPlugin.getPlugin().setTimeout(
store.getInt(ICVSUIConstants.PREF_TIMEOUT));
- // Quietness preference removed: bug 11036
- //CVSProviderPlugin.getPlugin().setQuietness(
- // getQuietnessOptionFor(store.getInt(ICVSUIConstants.PREF_QUIETNESS)));
+ CVSProviderPlugin.getPlugin().setQuietness(
+ getQuietnessOptionFor(store.getInt(ICVSUIConstants.PREF_QUIETNESS)));
return true;
}
@@ -229,8 +225,7 @@ public class CVSPreferencesPage
pruneEmptyDirectoriesField.setSelection(
store.getDefaultBoolean(ICVSUIConstants.PREF_PRUNE_EMPTY_DIRECTORIES));
timeoutValue.setText(new Integer(store.getDefaultInt(ICVSUIConstants.PREF_TIMEOUT)).toString());
- // Quietness preference removed: bug 11036
- //quietnessCombo.select(store.getDefaultInt(ICVSUIConstants.PREF_QUIETNESS));
+ quietnessCombo.select(store.getDefaultInt(ICVSUIConstants.PREF_QUIETNESS));
historyTracksSelectionButton.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_HISTORY_TRACKS_SELECTION));
}
@@ -245,13 +240,12 @@ public class CVSPreferencesPage
return CVSUIPlugin.getPlugin().getPreferenceStore();
}
- // Quietness preference removed: bug 11036
- /*protected static QuietOption getQuietnessOptionFor(int option) {
+ protected static QuietOption getQuietnessOptionFor(int option) {
switch (option) {
case 0: return Command.VERBOSE;
case 1: return Command.PARTLY_QUIET;
case 2: return Command.SILENT;
}
return null;
- }*/
+ }
} \ No newline at end of file
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
index a6dd3d465..e7dc55430 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
@@ -192,9 +192,7 @@ public class CVSUIPlugin extends AbstractUIPlugin {
CVSProviderPlugin.getPlugin().setTimeout(store.getInt(ICVSUIConstants.PREF_TIMEOUT));
CVSProviderPlugin.getPlugin().setCvsRshCommand(store.getString(ICVSUIConstants.PREF_CVS_RSH));
CVSProviderPlugin.getPlugin().setCvsServer(store.getString(ICVSUIConstants.PREF_CVS_SERVER));
- // Quietness preference removed: bug 11036
- //CVSProviderPlugin.getPlugin().setQuietness(CVSPreferencesPage.getQuietnessOptionFor(store.getInt(ICVSUIConstants.PREF_QUIETNESS)));
- CVSProviderPlugin.getPlugin().setQuietness(Command.VERBOSE);
+ CVSProviderPlugin.getPlugin().setQuietness(CVSPreferencesPage.getQuietnessOptionFor(store.getInt(ICVSUIConstants.PREF_QUIETNESS)));
}
/**

Back to the top