Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-05-14 14:22:33 -0400
committerjames2002-05-14 14:22:33 -0400
commita95bda4baacef07858c1523d96d3386a4349cfb1 (patch)
treee78deeadc2a2c0a6e01c9299e1b497f7c0cdaab7 /bundles/org.eclipse.team.cvs.ui
parent522b5020ac6e44d5a79338a25679d1cdedbc65e3 (diff)
downloadeclipse.platform.team-a95bda4baacef07858c1523d96d3386a4349cfb1.tar.gz
eclipse.platform.team-a95bda4baacef07858c1523d96d3386a4349cfb1.tar.xz
eclipse.platform.team-a95bda4baacef07858c1523d96d3386a4349cfb1.zip
12381: "Open in both mode" preference missing
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/plugin.xml2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java20
2 files changed, 11 insertions, 11 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.xml b/bundles/org.eclipse.team.cvs.ui/plugin.xml
index 8ec311973..7d9e5e50c 100644
--- a/bundles/org.eclipse.team.cvs.ui/plugin.xml
+++ b/bundles/org.eclipse.team.cvs.ui/plugin.xml
@@ -479,7 +479,7 @@
point="org.eclipse.ui.preferencePages">
<page
name="%PreferencePage.name"
- category="org.eclipse.team.ui.TextPreferences"
+ category="org.eclipse.team.ui.TeamPreferences"
class="org.eclipse.team.internal.ccvs.ui.CVSPreferencesPage"
id="org.eclipse.team.cvs.ui.CVSPreferences">
</page>
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 87f295010..68921c0e2 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
@@ -57,7 +57,7 @@ import org.eclipse.ui.help.WorkbenchHelp;
* 1. The Repository view is not refreshed when the show CVSROOT option is changed
* 2. There is no help associated with the page
*/
-public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPreferencePage, ICVSUIConstants {
+public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPreferencePage {
private Button pruneEmptyDirectoriesField;
private Text timeoutValue;
@@ -292,7 +292,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref
showMarkers.setSelection(store.getBoolean(ICVSUIConstants.PREF_SHOW_MARKERS));
replaceUnmanaged.setSelection(store.getBoolean(ICVSUIConstants.PREF_REPLACE_UNMANAGED));
- initializeSaveRadios(store.getInt(PREF_SAVE_DIRTY_EDITORS));
+ initializeSaveRadios(store.getInt(ICVSUIConstants.PREF_SAVE_DIRTY_EDITORS));
}
/**
@@ -327,7 +327,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref
store.setValue(ICVSUIConstants.PREF_CONSIDER_CONTENTS, considerContentsInCompare.getSelection());
store.setValue(ICVSUIConstants.PREF_SHOW_MARKERS, showMarkers.getSelection());
store.setValue(ICVSUIConstants.PREF_REPLACE_UNMANAGED, replaceUnmanaged.getSelection());
- store.setValue(PREF_SAVE_DIRTY_EDITORS, getSaveRadio());
+ store.setValue(ICVSUIConstants.PREF_SAVE_DIRTY_EDITORS, getSaveRadio());
CVSProviderPlugin.getPlugin().setReplaceUnmanaged(
store.getBoolean(ICVSUIConstants.PREF_REPLACE_UNMANAGED));
@@ -364,7 +364,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref
ksubstCombo.select(getKSubstComboIndexFor(store.getDefaultString(ICVSUIConstants.PREF_TEXT_KSUBST)));
showMarkers.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_SHOW_MARKERS));
replaceUnmanaged.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_REPLACE_UNMANAGED));
- initializeSaveRadios(store.getDefaultInt(PREF_SAVE_DIRTY_EDITORS));
+ initializeSaveRadios(store.getDefaultInt(ICVSUIConstants.PREF_SAVE_DIRTY_EDITORS));
}
private void createSaveCombo(Composite composite) {
@@ -428,22 +428,22 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref
never.setSelection(false);
prompt.setSelection(false);
switch(option) {
- case OPTION_AUTOMATIC:
+ case ICVSUIConstants.OPTION_AUTOMATIC:
auto.setSelection(true); break;
- case OPTION_NEVER:
+ case ICVSUIConstants.OPTION_NEVER:
never.setSelection(true); break;
- case OPTION_PROMPT:
+ case ICVSUIConstants.OPTION_PROMPT:
prompt.setSelection(true); break;
}
}
protected int getSaveRadio() {
if(auto.getSelection()) {
- return OPTION_AUTOMATIC;
+ return ICVSUIConstants.OPTION_AUTOMATIC;
} else if(never.getSelection()) {
- return OPTION_NEVER;
+ return ICVSUIConstants.OPTION_NEVER;
} else {
- return OPTION_PROMPT;
+ return ICVSUIConstants.OPTION_PROMPT;
}
}
} \ No newline at end of file

Back to the top