Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2003-10-23 20:56:37 +0000
committerJean Michel-Lemieux2003-10-23 20:56:37 +0000
commit58d7f9e1f85d8e1b357fe03a602d1e6adfca7d4e (patch)
treec76b82c58b16918b753c75001ed688a1d37ad361
parent88c86e63c3a449623fd24f96ef7685382e12ab69 (diff)
downloadeclipse.platform.team-58d7f9e1f85d8e1b357fe03a602d1e6adfca7d4e.tar.gz
eclipse.platform.team-58d7f9e1f85d8e1b357fe03a602d1e6adfca7d4e.tar.xz
eclipse.platform.team-58d7f9e1f85d8e1b357fe03a602d1e6adfca7d4e.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.team.cvs.ui/.classpath1
-rw-r--r--bundles/org.eclipse.team.cvs.ui/.project1
-rw-r--r--bundles/org.eclipse.team.cvs.ui/plugin.properties2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/plugin.xml69
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java1
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AlternateUserValidationDialog.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/BranchPromptDialog.java7
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java5
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java1
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java1
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsDialog.java7
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterDialog.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SynchronizeProjectsDialog.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagAsVersionDialog.java7
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java18
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java16
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java49
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java63
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java65
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties5
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java1
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java15
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java5
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java5
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSWorkingSetPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CommentHistoryContentHandler.java24
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java1
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java48
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java21
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSMergeSynchronizeParticipant.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeParticipant.java10
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndCommitAction.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateAction.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitAction.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberConfirmMergedAction.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardCommitCommentPage.java1
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RepositorySelectionPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java2
66 files changed, 358 insertions, 200 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/.classpath b/bundles/org.eclipse.team.cvs.ui/.classpath
index 99cb73b4a..1049098b9 100644
--- a/bundles/org.eclipse.team.cvs.ui/.classpath
+++ b/bundles/org.eclipse.team.cvs.ui/.classpath
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="/org.apache.xerces"/>
<classpathentry kind="src" path="/org.eclipse.core.runtime"/>
<classpathentry kind="src" path="/org.eclipse.core.resources"/>
<classpathentry kind="src" path="/org.eclipse.ui"/>
diff --git a/bundles/org.eclipse.team.cvs.ui/.project b/bundles/org.eclipse.team.cvs.ui/.project
index 9ca902df0..49e69c4d8 100644
--- a/bundles/org.eclipse.team.cvs.ui/.project
+++ b/bundles/org.eclipse.team.cvs.ui/.project
@@ -3,7 +3,6 @@
<name>org.eclipse.team.cvs.ui</name>
<comment></comment>
<projects>
- <project>org.apache.xerces</project>
<project>org.eclipse.compare</project>
<project>org.eclipse.core.boot</project>
<project>org.eclipse.core.resources</project>
diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.properties b/bundles/org.eclipse.team.cvs.ui/plugin.properties
index d471dc353..cd07223f8 100644
--- a/bundles/org.eclipse.team.cvs.ui/plugin.properties
+++ b/bundles/org.eclipse.team.cvs.ui/plugin.properties
@@ -172,7 +172,7 @@ CVSConsoleFont.description=The font for the CVS console.
CVSWorkspaceSubscriber.update.label=&Update
CVSWorkspaceSubscriber.update.tooltip=Perform an update on the visible resources
-CVSWorkspaceSubscriber.commit.label=&Commit
+CVSWorkspaceSubscriber.commit.label=&Commit...
CVSWorkspaceSubscriber.commit.tooltip=Perform a commit on the visible resources
CVSWorkspaceSubscriber.overcommit.label=&Override and Commit
diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.xml b/bundles/org.eclipse.team.cvs.ui/plugin.xml
index 31ee59109..8b2ad3634 100644
--- a/bundles/org.eclipse.team.cvs.ui/plugin.xml
+++ b/bundles/org.eclipse.team.cvs.ui/plugin.xml
@@ -13,7 +13,6 @@
</library>
</runtime>
<requires>
- <import plugin="org.apache.xerces"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.ui"/>
@@ -578,9 +577,7 @@
</action>
</objectContribution>
</extension>
-
-
-
+
<!-- ************* Subscriber Menus ************ -->
<extension
@@ -589,15 +586,6 @@
id="org.eclipse.team.ccvs.ui.CVSWorkspaceSubscriberContributions"
targetID="org.eclipse.team.cvs.ui.cvsworkspace-participant">
<action
- label="%CVSWorkspaceSubscriber.update.label"
- menubarPath="SubscriberActionsGroup1"
- tooltip="%CVSWorkspaceSubscriber.update.tooltip"
- class="org.eclipse.team.internal.ccvs.ui.subscriber.WorkspaceUpdateAction"
- overrideActionId="org.eclipse.team.ccvs.ui.update"
- helpContextId="org.eclipse.team.cvs.ui.workspace_subscriber_update_action"
- id="org.eclipse.team.ccvs.ui.CVSWorkspaceSubscriber.update">
- </action>
- <action
label="%CVSWorkspaceSubscriber.commit.label"
menubarPath="SubscriberActionsGroup1"
tooltip="%CVSWorkspaceSubscriber.commit.tooltip"
@@ -606,16 +594,23 @@
helpContextId="org.eclipse.team.cvs.ui.workspace_subscriber_commit_action"
id="org.eclipse.team.ccvs.ui.CVSWorkspaceSubscriber.commit">
</action>
-
-
<action
- label="%CVSWorkspaceSubscriber.overupdate.label"
- menubarPath="SubscriberActionsGroup2"
- tooltip="%CVSWorkspaceSubscriber.overupdate.tooltip"
- class="org.eclipse.team.internal.ccvs.ui.subscriber.OverrideAndUpdateAction"
- helpContextId="org.eclipse.team.cvs.ui.workspace_subscriber_overupdate_action"
- id="org.eclipse.team.ccvs.ui.CVSWorkspaceSubscriber.overupdate">
- </action>
+ label="%CVSWorkspaceSubscriber.update.label"
+ menubarPath="SubscriberActionsGroup1"
+ tooltip="%CVSWorkspaceSubscriber.update.tooltip"
+ class="org.eclipse.team.internal.ccvs.ui.subscriber.WorkspaceUpdateAction"
+ overrideActionId="org.eclipse.team.ccvs.ui.update"
+ helpContextId="org.eclipse.team.cvs.ui.workspace_subscriber_update_action"
+ id="org.eclipse.team.ccvs.ui.CVSWorkspaceSubscriber.update">
+ </action>
+ <action
+ label="%CVSWorkspaceSubscriber.confirmMerged.label"
+ menubarPath="SubscriberActionsGroup2"
+ tooltip="%CVSWorkspaceSubscriber.confirmMerged.tooltip"
+ class="org.eclipse.team.internal.ccvs.ui.subscriber.SubscriberConfirmMergedAction"
+ helpContextId="org.eclipse.team.cvs.ui.workspace_subscriber_confirm_merged_action"
+ id="org.eclipse.team.ccvs.ui.CVSWorkspaceSubscriber.confirmMerged">
+ </action>
<action
label="%CVSWorkspaceSubscriber.overcommit.label"
menubarPath="SubscriberActionsGroup2"
@@ -625,24 +620,19 @@
id="org.eclipse.team.ccvs.ui.CVSWorkspaceSubscriber.overcommit">
</action>
<action
- label="%CVSWorkspaceSubscriber.confirmMerged.label"
- menubarPath="SubscriberActionsGroup2"
- tooltip="%CVSWorkspaceSubscriber.confirmMerged.tooltip"
- class="org.eclipse.team.internal.ccvs.ui.subscriber.SubscriberConfirmMergedAction"
- helpContextId="org.eclipse.team.cvs.ui.workspace_subscriber_confirm_merged_action"
- id="org.eclipse.team.ccvs.ui.CVSWorkspaceSubscriber.confirmMerged">
- </action>
-
+ label="%CVSWorkspaceSubscriber.overupdate.label"
+ menubarPath="SubscriberActionsGroup2"
+ tooltip="%CVSWorkspaceSubscriber.overupdate.tooltip"
+ class="org.eclipse.team.internal.ccvs.ui.subscriber.OverrideAndUpdateAction"
+ helpContextId="org.eclipse.team.cvs.ui.workspace_subscriber_overupdate_action"
+ id="org.eclipse.team.ccvs.ui.CVSWorkspaceSubscriber.overupdate">
+ </action>
</viewerContribution>
- <objectContribution
- objectClass="org.eclipse.team.ui.sync.ISynchronizeViewNode"
- id="org.eclipse.team.ccvs.ui.CVSMergeSubscriberContributions"
- adaptable="true">
-
- <filter name="equals" value="org.eclipse.team.cvs.ui.cvsmerge-participant" />
-
- <action
+ <viewerContribution
+ id="org.eclipse.team.ccvs.ui.CVSMergeSubscriberContributions"
+ targetID="org.eclipse.team.cvs.ui.cvsmerge-participant">
+ <action
label="%CVSWorkspaceSubscriber.confirmMerged.label"
menubarPath="SubscriberActionsGroup1"
tooltip="%CVSWorkspaceSubscriber.confirmMerged.tooltip"
@@ -650,7 +640,6 @@
helpContextId="org.eclipse.team.cvs.ui.workspace_subscriber_confirm_merged_action"
id="org.eclipse.team.ccvs.ui.CVSMergeSubscriber.confirmMerged">
</action>
-
<action
label="%CVSWorkspaceSubscriber.merge.label"
menubarPath="SubscriberActionsGroup1"
@@ -660,7 +649,7 @@
helpContextId="org.eclipse.team.cvs.ui.workspace_subscriber_merge_action"
id="org.eclipse.team.ccvs.ui.CVSMergeSubscriber.merge">
</action>
- </objectContribution>
+ </viewerContribution>
</extension>
<!-- ************** Views ********************** -->
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java
index f6a310d44..a6d7d48d3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java
@@ -87,7 +87,6 @@ public class AddToVersionControlDialog extends DetailsDialog {
layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
composite.setLayout(layout);
composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
addUnaddedResourcesArea(composite);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AlternateUserValidationDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AlternateUserValidationDialog.java
index 520278890..6f4e08eb2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AlternateUserValidationDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AlternateUserValidationDialog.java
@@ -17,7 +17,6 @@ import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.VerifyEvent;
import org.eclipse.swt.events.VerifyListener;
-import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
@@ -25,7 +24,6 @@ import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
@@ -36,7 +34,6 @@ public class AlternateUserValidationDialog extends Dialog {
String user;
String password = ""; //$NON-NLS-1$
List numXs = new ArrayList();
- Font font;
Label icon1;
Label icon2;
Label icon3;
@@ -90,7 +87,6 @@ public class AlternateUserValidationDialog extends Dialog {
data.widthHint = 250;
passwordText.setLayoutData(data);
- passwordText.setFont(font);
passwordText.addVerifyListener(new VerifyListener() {
public void verifyText(VerifyEvent e) {
if (inUpdate) return;
@@ -160,13 +156,12 @@ public class AlternateUserValidationDialog extends Dialog {
cancelPressed();
}
});
-
+ Dialog.applyDialogFont(parent);
return main;
}
public boolean close() {
boolean result = super.close();
- if (font != null) font.dispose();
if (images != null) {
for (int i = 0; i < images.length; i++) {
images[i].dispose();
@@ -207,7 +202,6 @@ public class AlternateUserValidationDialog extends Dialog {
if (System.getProperty("os.name").indexOf("Windows") != -1) { //$NON-NLS-1$ //$NON-NLS-2$
fd.setName("Microsoft Sans Serif"); //$NON-NLS-1$
}
- font = new Font(Display.getDefault(), fd);
}
void updateImages() {
icon1.setImage(getImage());
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/BranchPromptDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/BranchPromptDialog.java
index 8547bc65a..fea313b87 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/BranchPromptDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/BranchPromptDialog.java
@@ -11,6 +11,7 @@
package org.eclipse.team.internal.ccvs.ui;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -81,7 +82,6 @@ public class BranchPromptDialog extends DetailsDialog {
GridData.VERTICAL_ALIGN_CENTER);
data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);;
label.setLayoutData(data);
- label.setFont(composite.getFont());
CVSWizardPage.createLabel(composite, Policy.bind("BranchWizardPage.branchName")); //$NON-NLS-1$
branchText = CVSWizardPage.createTextField(composite);
@@ -129,7 +129,7 @@ public class BranchPromptDialog extends DetailsDialog {
// F1 Help
WorkbenchHelp.setHelp(composite, IHelpContextIds.BRANCH_DIALOG);
-
+ Dialog.applyDialogFont(composite);
branchText.setFocus();
}
@@ -156,7 +156,6 @@ public class BranchPromptDialog extends DetailsDialog {
layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
composite.setLayout(layout);
composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
Label label = new Label(composite, SWT.WRAP);
label.setText(Policy.bind("BranchWizardPage.existingVersionsAndBranches")); //$NON-NLS-1$
@@ -167,7 +166,6 @@ public class BranchPromptDialog extends DetailsDialog {
GridData.VERTICAL_ALIGN_CENTER);
data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);;
label.setLayoutData(data);
- label.setFont(composite.getFont());
tagTree = createTree(composite);
tagTree.setInput(new ProjectElement(folder, ProjectElement.INCLUDE_BRANCHES | ProjectElement.INCLUDE_VERSIONS));
@@ -184,6 +182,7 @@ public class BranchPromptDialog extends DetailsDialog {
convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT),
convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH),
refresh, refresh);
+ Dialog.applyDialogFont(parent);
return composite;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java
index 0c6fd9019..b700f744c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java
@@ -16,6 +16,7 @@ import java.util.Date;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -100,6 +101,7 @@ public class CVSFilePropertiesPage extends CVSPropertiesPage {
createLabel(composite, ""); //$NON-NLS-1$
}
WorkbenchHelp.setHelp(getControl(), IHelpContextIds.FILE_PROPERTY_PAGE);
+ Dialog.applyDialogFont(parent);
return composite;
}
/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java
index 3f373141e..ac4d9c648 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java
@@ -12,6 +12,7 @@ package org.eclipse.team.internal.ccvs.ui;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.SWT;
@@ -111,6 +112,7 @@ public class CVSFolderPropertiesPage extends CVSPropertiesPage {
createLabel(composite, Policy.bind("CVSFilePropertiesPage.error"), 2); //$NON-NLS-1$
}
WorkbenchHelp.setHelp(getControl(), IHelpContextIds.FOLDER_PROPERTY_PAGE);
+ Dialog.applyDialogFont(parent);
return composite;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java
index 74508cfe1..ceb1d565b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java
@@ -46,6 +46,7 @@ import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption;
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo;
import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
+import org.eclipse.team.internal.ccvs.core.util.ResourceStateChangeListeners;
import org.eclipse.team.internal.core.ExceptionCollector;
import org.eclipse.team.internal.ui.TeamUIPlugin;
import org.eclipse.team.ui.ISharedImages;
@@ -93,7 +94,7 @@ public class CVSLightweightDecorator
}
public CVSLightweightDecorator() {
- CVSProviderPlugin.addResourceStateChangeListener(this);
+ ResourceStateChangeListeners.getListener().addResourceStateChangeListener(this);
CVSProviderPlugin.broadcastDecoratorEnablementChanged(true /* enabled */);
exceptions = new ExceptionCollector(Policy.bind("CVSDecorator.exceptionMessage"), CVSUIPlugin.ID, IStatus.ERROR, CVSUIPlugin.getPlugin().getLog()); //$NON-NLS-1$
}
@@ -399,7 +400,7 @@ public class CVSLightweightDecorator
ICVSFolder cvsFolder = CVSWorkspaceRoot.getCVSFolderFor((IContainer)resource);
try {
FolderSyncInfo folderSyncInfo = cvsFolder.getFolderSyncInfo();
- if (folderSyncInfo != null && folderSyncInfo.getRepository().equals(FolderSyncInfo.VIRTUAL_DIRECTORY)) {
+ if (folderSyncInfo != null && folderSyncInfo.isVirtualDirectory()) {
return noRemoteDir;
}
} catch (CVSException e) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java
index cef9cf736..5d6417a08 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java
@@ -241,6 +241,7 @@ public class CVSProjectPropertiesPage extends CVSPropertiesPage {
initializeValues(oldLocation);
WorkbenchHelp.setHelp(getControl(), IHelpContextIds.PROJECT_PROPERTY_PAGE);
+ Dialog.applyDialogFont(parent);
return composite;
}
/**
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 0ba80e6a9..5a23da7e3 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
@@ -626,7 +626,7 @@ public class CVSUIPlugin extends AbstractUIPlugin {
CVSProviderPlugin.getPlugin().setRepositoriesAreBinary(store.getBoolean(ICVSUIConstants.PREF_REPOSITORIES_ARE_BINARY));
CVSProviderPlugin.getPlugin().setDetermineVersionEnabled(store.getBoolean(ICVSUIConstants.PREF_DETERMINE_SERVER_VERSION));
CVSProviderPlugin.getPlugin().setConfirmMoveTagEnabled(store.getBoolean(ICVSUIConstants.PREF_CONFIRM_MOVE_TAG));
- CVSProviderPlugin.getPlugin().setDebugProtocol(store.getBoolean(ICVSUIConstants.PREF_DEBUG_PROTOCOL));
+ CVSProviderPlugin.getPlugin().setDebugProtocol(CVSProviderPlugin.getPlugin().isDebugProtocol() || store.getBoolean(ICVSUIConstants.PREF_DEBUG_PROTOCOL));
}
/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java
index 4b52fca16..430c19c53 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java
@@ -63,6 +63,7 @@ public class CommitCommentArea extends DialogArea {
* @see org.eclipse.team.internal.ccvs.ui.DialogArea#createArea(org.eclipse.swt.widgets.Composite)
*/
public Control createArea(Composite parent) {
+ Dialog.applyDialogFont(parent);
Composite composite = createGrabbingComposite(parent, 1);
initializeDialogUnits(composite);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsDialog.java
index 25636bd57..cdf63f8fe 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsDialog.java
@@ -42,7 +42,6 @@ public class EditorsDialog extends Dialog {
public EditorsDialog(Shell shell, EditorsInfo[] infos) {
super(shell);
editorsInfo = infos;
-
}
protected Control createDialogArea(Composite container) {
@@ -59,6 +58,8 @@ public class EditorsDialog extends Dialog {
// set F1 help
WorkbenchHelp.setHelp(parent, IHelpContextIds.EDITORS_DIALOG);
+ Dialog.applyDialogFont(parent);
+
return parent;
}
/**
@@ -67,9 +68,7 @@ public class EditorsDialog extends Dialog {
*/
private void createMessageArea(Composite parent) {
Label label = new Label(parent, SWT.NONE);
- label.setText(Policy.bind("EditorsDialog.question")); //$NON-NLS-1$
- label.setFont(parent.getFont());
-
+ label.setText(Policy.bind("EditorsDialog.question")); //$NON-NLS-1$
}
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterDialog.java
index 089eeb543..892860fd7 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterDialog.java
@@ -60,6 +60,8 @@ public class HistoryFilterDialog extends Dialog {
Composite topLevel = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout();
layout.numColumns = 2;
+ layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
+ layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
topLevel.setLayout(layout);
//"and" and "or" search radio buttons
@@ -158,7 +160,7 @@ public class HistoryFilterDialog extends Dialog {
// set F1 help
WorkbenchHelp.setHelp(topLevel, IHelpContextIds.HISTORY_FILTER_DIALOG);
-
+ Dialog.applyDialogFont(parent);
return topLevel;
}
void initializeValues() {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java
index caccc1fe5..a8d331bab 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java
@@ -168,7 +168,7 @@ public class IgnoreResourcesDialog extends Dialog {
customEntryText.addListener(SWT.Modify, modifyListener);
statusMessageLabel = createIndentedLabel(top, "", 0); //$NON-NLS-1$
- statusMessageLabel.setFont(parent.getFont());
+ Dialog.applyDialogFont(parent);
return top;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java
index bab62a4dc..5fe2e8595 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java
@@ -76,6 +76,7 @@ public class ListSelectionArea extends DialogArea {
* @see org.eclipse.team.internal.ccvs.ui.DialogArea#createArea(org.eclipse.swt.widgets.Composite)
*/
public Control createArea(Composite parent) {
+ Dialog.applyDialogFont(parent);
Composite composite = createComposite(parent, 1);
initializeDialogUnits(composite);
@@ -90,7 +91,6 @@ public class ListSelectionArea extends DialogArea {
listViewer.setLabelProvider(labelProvider);
listViewer.setContentProvider(contentProvider);
- listViewer.getControl().setFont(composite.getFont());
listViewer.addCheckStateListener(new ICheckStateListener() {
public void checkStateChanged(CheckStateChangedEvent event) {
@@ -135,7 +135,6 @@ public class ListSelectionArea extends DialogArea {
*/
private void addSelectionButtons(Composite composite) {
Composite buttonComposite = new Composite(composite, SWT.RIGHT);
- buttonComposite.setFont(composite.getFont());
GridLayout layout = new GridLayout();
layout.numColumns = 2;
buttonComposite.setLayout(layout);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java
index d7b8c40ac..f870f30d0 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java
@@ -63,7 +63,8 @@ public class ReleaseCommentDialog extends Dialog {
// set F1 help
WorkbenchHelp.setHelp(composite, IHelpContextIds.RELEASE_COMMENT_DIALOG);
-
+ Dialog.applyDialogFont(parent);
+
return composite;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java
index f3da7e29b..35c401709 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java
@@ -13,6 +13,7 @@ package org.eclipse.team.internal.ccvs.ui;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -67,6 +68,7 @@ public class ResourcePropertiesPage extends PropertyPage {
} catch (TeamException e) {
createPair(composite, Policy.bind("ResourcePropertiesPage.error"), e.getMessage()); //$NON-NLS-1$
}
+ Dialog.applyDialogFont(parent);
return composite;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SynchronizeProjectsDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SynchronizeProjectsDialog.java
index 9c3465f68..410f1321b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SynchronizeProjectsDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SynchronizeProjectsDialog.java
@@ -17,7 +17,6 @@ import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
@@ -70,9 +69,6 @@ public class SynchronizeProjectsDialog extends Dialog {
protected Control createDialogArea(Composite parent) {
// page group
Composite composite = (Composite)super.createDialogArea(parent);
-
- Font font = parent.getFont();
- composite.setFont(font);
workingSetArea = new WorkingSetSelectionArea(this, Policy.bind("SynchronizeProjectsDialog.allSharedProjects"), Policy.bind("SynchronizeProjectsDialog.sharedWorkingSetProjects"), settings); //$NON-NLS-1$ //$NON-NLS-2$
setWorkingSet(workingSet);
@@ -97,7 +93,8 @@ public class SynchronizeProjectsDialog extends Dialog {
// F1 Help
WorkbenchHelp.setHelp(composite, IHelpContextIds.SYNCHRONIZE_PROJECTS_DIALOG);
-
+ Dialog.applyDialogFont(parent);
+
return composite;
}
@@ -152,7 +149,6 @@ public class SynchronizeProjectsDialog extends Dialog {
protected Button createCheckbox(Composite parent, String label) {
Button button = new Button(parent, SWT.CHECK | SWT.LEFT);
button.setText(label);
- button.setFont(parent.getFont());
GridData data = new GridData();
button.setLayoutData(data);
return button;
@@ -163,7 +159,6 @@ public class SynchronizeProjectsDialog extends Dialog {
if (text != null) {
label.setText(text);
}
- label.setFont(composite.getFont());
return label;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagAsVersionDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagAsVersionDialog.java
index 189affb77..778cba445 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagAsVersionDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagAsVersionDialog.java
@@ -11,6 +11,7 @@
package org.eclipse.team.internal.ccvs.ui;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.viewers.ColumnWeightData;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -89,7 +90,6 @@ public class TagAsVersionDialog extends DetailsDialog {
GridData.VERTICAL_ALIGN_CENTER);
data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);;
label.setLayoutData(data);
- label.setFont(parent.getFont());
tagText = new Text(parent, SWT.SINGLE | SWT.BORDER);
tagText.setLayoutData(new GridData(
@@ -120,6 +120,7 @@ public class TagAsVersionDialog extends DetailsDialog {
// Add F1 help
WorkbenchHelp.setHelp(parent, IHelpContextIds.TAG_AS_VERSION_DIALOG);
+ Dialog.applyDialogFont(parent);
}
public boolean shouldMoveTag() {
@@ -152,7 +153,6 @@ public class TagAsVersionDialog extends DetailsDialog {
layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
composite.setLayout(layout);
composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
Label label = new Label(composite, SWT.WRAP);
label.setText(Policy.bind("TagAction.existingVersions")); //$NON-NLS-1$
@@ -163,7 +163,6 @@ public class TagAsVersionDialog extends DetailsDialog {
GridData.VERTICAL_ALIGN_CENTER);
data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);;
label.setLayoutData(data);
- label.setFont(composite.getFont());
existingVersionTable = createTable(composite);
existingVersionTable.setContentProvider(new WorkbenchContentProvider());
@@ -215,7 +214,7 @@ public class TagAsVersionDialog extends DetailsDialog {
afterRefresh, afterConfigure);
existingVersionTable.setInput(new TagRootElement(folder, CVSTag.VERSION));
-
+ Dialog.applyDialogFont(parent);
return composite;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java
index 9fab2799a..85aa153c4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java
@@ -160,6 +160,8 @@ public class TagConfigurationDialog extends Dialog {
GridLayout gridLayout = new GridLayout();
gridLayout.numColumns = 2;
gridLayout.makeColumnsEqualWidth = true;
+ gridLayout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
+ gridLayout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
shell.setLayout (gridLayout);
Composite comp = new Composite(shell, SWT.NULL);
@@ -424,6 +426,7 @@ public class TagConfigurationDialog extends Dialog {
WorkbenchHelp.setHelp(shell, IHelpContextIds.TAG_CONFIGURATION_OVERVIEW);
updateEnablements();
+ Dialog.applyDialogFont(parent);
return shell;
}
@@ -686,8 +689,9 @@ public class TagConfigurationDialog extends Dialog {
data = new GridData();
if(hHint!=0 && wHint!=0) {
data.heightHint = hHint;
- int widthHint = wHint;
- data.widthHint = Math.max(widthHint, refreshButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
+ //don't crop labels with large font
+ //int widthHint = wHint;
+ //data.widthHint = Math.max(widthHint, refreshButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
}
data.horizontalAlignment = GridData.END;
data.horizontalSpan = 1;
@@ -698,8 +702,9 @@ public class TagConfigurationDialog extends Dialog {
data = new GridData ();
if(hHint!=0 && wHint!=0) {
data.heightHint = hHint;
- int widthHint = wHint;
- data.widthHint = Math.max(widthHint, addButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
+ //don't crop labels with large font
+ //int widthHint = wHint;
+ //data.widthHint = Math.max(widthHint, addButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
}
data.horizontalAlignment = GridData.END;
data.horizontalSpan = 1;
@@ -761,8 +766,9 @@ public class TagConfigurationDialog extends Dialog {
private GridData getStandardButtonData(Button button) {
GridData data = new GridData();
data.heightHint = convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT);
- int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
- data.widthHint = Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
+ //don't crop labels with large font
+ //int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
+ //data.widthHint = Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
return data;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java
index a57449ee3..109bd5e43 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java
@@ -225,7 +225,8 @@ public class TagSelectionDialog extends Dialog {
seperator.setLayoutData(data);
updateEnablement();
-
+ Dialog.applyDialogFont(parent);
+
return top;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java
index f449c2583..1d2fad012 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java
@@ -114,6 +114,8 @@ public class UserValidationDialog extends Dialog {
createUsernameFields(main);
createPasswordFields(main);
+ Dialog.applyDialogFont(parent);
+
return main;
}
/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java
index b7dd0f871..1dbfb0f8a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java
@@ -99,6 +99,7 @@ public class WorkingSetSelectionArea extends DialogArea {
* @see org.eclipse.jface.dialogs.Dialog#createDialogArea(Composite)
*/
public Control createArea(Composite parent) {
+ Dialog.applyDialogFont(parent);
Composite composite = createComposite(parent, 2);
initializeDialogUnits(composite);
GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
@@ -129,7 +130,6 @@ public class WorkingSetSelectionArea extends DialogArea {
data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
data.horizontalIndent=15;
mruList.setLayoutData(data);
- mruList.setFont(composite.getFont());
selectButton = createButton(composite, Policy.bind("WorkingSetSelectionArea.workingSetOther"), GridData.HORIZONTAL_ALIGN_FILL); //$NON-NLS-1$
selectButton.addSelectionListener(new SelectionAdapter() {
@@ -146,7 +146,7 @@ public class WorkingSetSelectionArea extends DialogArea {
handleMruSelection();
}
});
-
+
return composite;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
index cd83fe363..58d40796e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
@@ -48,7 +48,7 @@ import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager;
import org.eclipse.team.internal.ui.actions.TeamAction;
import org.eclipse.team.internal.ui.dialogs.IPromptCondition;
-import org.eclipse.team.ui.synchronize.ISynchronizeViewNode;
+import org.eclipse.team.ui.synchronize.ITeamSubscriberParticipantNode;
import org.eclipse.ui.PlatformUI;
/**
@@ -244,6 +244,16 @@ abstract public class CVSAction extends TeamAction {
};
switch (progressKind) {
+ case PROGRESS_WORKBENCH_WINDOW :
+ try {
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().run(true, true, runnable);
+ } catch (InterruptedException e1) {
+ exceptions[0] = null;
+ e1.printStackTrace();
+ } catch (InvocationTargetException e) {
+ exceptions[0] = e;
+ }
+ break;
case PROGRESS_BUSYCURSOR :
BusyIndicator.showWhile(Display.getCurrent(), new Runnable() {
public void run() {
@@ -289,8 +299,8 @@ abstract public class CVSAction extends TeamAction {
Iterator elements = ((IStructuredSelection) selection).iterator();
while (elements.hasNext()) {
Object next = elements.next();
- if(next instanceof ISynchronizeViewNode) {
- resources.add(((ISynchronizeViewNode)next).getSyncInfo().getRemote());
+ if(next instanceof ITeamSubscriberParticipantNode) {
+ resources.add(((ITeamSubscriberParticipantNode)next).getSyncInfo().getRemote());
continue;
}
if (next instanceof ICVSResource) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java
index 1ccf064e5..039f9eee7 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java
@@ -18,10 +18,16 @@ import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.team.core.TeamException;
+import org.eclipse.team.internal.ccvs.core.CVSException;
+import org.eclipse.team.internal.ccvs.core.CVSTag;
+import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile;
+import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder;
import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource;
+import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
import org.eclipse.team.internal.ccvs.ui.CVSCompareEditorInput;
import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.team.internal.ccvs.ui.ResourceEditionNode;
+import org.eclipse.team.internal.ccvs.ui.operations.RemoteCompareOperation;
/**
* This action is used for comparing two arbitrary remote resources. This is
@@ -37,22 +43,53 @@ public class CompareRemoteResourcesAction extends CVSAction {
MessageDialog.openError(getShell(), Policy.bind("CompareRemoteResourcesAction.unableToCompare"), Policy.bind("CompareRemoteResourcesAction.selectTwoResources")); //$NON-NLS-1$ //$NON-NLS-2$
return;
}
- ResourceEditionNode left = new ResourceEditionNode(editions[0]);
- ResourceEditionNode right = new ResourceEditionNode(editions[1]);
- CompareUI.openCompareEditorOnPage(
- new CVSCompareEditorInput(left, right),
- getTargetPage());
+ if (isSameFolder(editions)) {
+ // Run the compare operation in the background
+ try {
+ new RemoteCompareOperation(null, editions[0], getTag(editions[1]))
+ .run();
+ } catch (CVSException e) {
+ throw new InvocationTargetException(e);
+ } catch (InterruptedException e) {
+ // Ignored
+ }
+ } else {
+ ResourceEditionNode left = new ResourceEditionNode(editions[0]);
+ ResourceEditionNode right = new ResourceEditionNode(editions[1]);
+ CompareUI.openCompareEditorOnPage(
+ new CVSCompareEditorInput(left, right),
+ getTargetPage());
+ }
}
}, false /* cancelable */, PROGRESS_BUSYCURSOR);
}
+ protected CVSTag getTag(ICVSRemoteResource resource) throws CVSException {
+ CVSTag tag = null;
+ if (resource.isContainer()) {
+ tag = ((ICVSRemoteFolder)resource).getTag();
+ } else {
+ ResourceSyncInfo info = ((ICVSRemoteFile)resource).getSyncInfo();
+ if (info != null) tag = info.getTag();
+ }
+ if (tag == null) tag = CVSTag.DEFAULT;
+ return tag;
+ }
+
+ protected boolean isSameFolder(ICVSRemoteResource[] editions) {
+ return editions[0].getRepository().equals(editions[1].getRepository())
+ && editions[0].getRepositoryRelativePath().equals(editions[1].getRepositoryRelativePath());
+ }
+
/*
* @see TeamAction#isEnabled()
*/
protected boolean isEnabled() throws TeamException {
ICVSRemoteResource[] resources = getSelectedRemoteResources();
if (resources.length != 2) return false;
- return resources[0].isContainer() == resources[1].isContainer();
+ if (resources[0].isContainer() != resources[1].isContainer()) return false;
+ // Don't allow comparisons of two unrelated remote projects
+ return !resources[0].isContainer() || isSameFolder(resources);
}
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java
index 3eadde99f..75132bde9 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java
@@ -12,31 +12,19 @@ package org.eclipse.team.internal.ccvs.ui.actions;
import java.lang.reflect.InvocationTargetException;
-import org.eclipse.compare.CompareUI;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.team.core.TeamException;
import org.eclipse.team.internal.ccvs.core.CVSException;
import org.eclipse.team.internal.ccvs.core.CVSTag;
-import org.eclipse.team.internal.ccvs.core.ICVSFile;
import org.eclipse.team.internal.ccvs.core.ICVSFolder;
import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder;
import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource;
-import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation;
-import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation;
-import org.eclipse.team.internal.ccvs.core.resources.RemoteFolderTreeBuilder;
-import org.eclipse.team.internal.ccvs.ui.CVSCompareEditorInput;
-import org.eclipse.team.internal.ccvs.ui.ResourceEditionNode;
import org.eclipse.team.internal.ccvs.ui.TagSelectionDialog;
+import org.eclipse.team.internal.ccvs.ui.operations.RemoteCompareOperation;
/**
- * @author Administrator
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
+ * Compare to versions of a remote resource.
*/
public class CompareRemoteWithTagAction extends CVSAction {
@@ -45,15 +33,14 @@ public class CompareRemoteWithTagAction extends CVSAction {
*/
protected void execute(IAction action) throws InvocationTargetException, InterruptedException {
- ICVSRemoteResource[] editions = getSelectedRemoteResources();
- if (editions.length == 0) return;
- final ICVSRemoteResource resource = editions[0];
+ ICVSRemoteResource[] resources = getSelectedRemoteResources();
+ if (resources.length == 0) return;
- final ResourceEditionNode[] input = new ResourceEditionNode[] { null /* left */, null /* right */};
+ // Obtain the tag to compare against
+ final ICVSRemoteResource resource = resources[0];
final CVSTag[] tag = new CVSTag[] { null};
-
run(new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor) throws InvocationTargetException {
+ public void run(IProgressMonitor monitor) {
ICVSFolder folder;
if (resource instanceof ICVSRemoteFolder) {
folder = (ICVSFolder)resource;
@@ -63,43 +50,21 @@ public class CompareRemoteWithTagAction extends CVSAction {
tag[0] = TagSelectionDialog.getTagToCompareWith(getShell(), new ICVSFolder[] {folder});
}
}, false /* cancelable */, PROGRESS_BUSYCURSOR);
-
if (tag[0] == null) return;
- final ICVSRemoteResource[] remote = new ICVSRemoteResource[] { null };
- if (resource.isFolder()) {
- remote[0] = resource.forTag(tag[0]);
- } else {
- run(new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor) throws InvocationTargetException {
- try {
- ICVSRepositoryLocation location = resource.getRepository();
- remote[0] = RemoteFolderTreeBuilder.buildRemoteTree((CVSRepositoryLocation)location, (ICVSFile)resource, tag[0], monitor);
- } catch (CVSException e) {
- throw new InvocationTargetException(e);
- }
- }
- }, false /* cancelable */, PROGRESS_DIALOG);
+ // Run the compare operation in the background
+ try {
+ new RemoteCompareOperation(null, resource, tag[0])
+ .run();
+ } catch (CVSException e) {
+ throw new InvocationTargetException(e);
}
-
- input[0] = new ResourceEditionNode(resource);
- input[1] = new ResourceEditionNode(remote[0]);
-
- if (input[0] == null || input[1] == null) return;
-
- run(new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor) throws InvocationTargetException {
- CompareUI.openCompareEditorOnPage(
- new CVSCompareEditorInput(input[0] /* left */, input[1] /* right */),
- getTargetPage());
- }
- }, false /* cancelable */, PROGRESS_BUSYCURSOR);
}
/**
* @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled()
*/
- protected boolean isEnabled() throws TeamException {
+ protected boolean isEnabled() {
ICVSRemoteResource[] resources = getSelectedRemoteResources();
// Only support single select for now.
// Need to avoid overlap if multi-select is supported
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java
index 9196cd564..008e56447 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java
@@ -21,6 +21,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceStatus;
@@ -28,9 +29,11 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.team.core.RepositoryProvider;
@@ -66,6 +69,10 @@ public abstract class WorkspaceAction extends CVSAction {
if (super.beginExecution(action)) {
// Ensure that the required sync info is loaded
if (requiresLocalSyncInfo()) {
+ // There is a possibility of the selection containing an orphaned subtree.
+ // If it does, they will be purged and enablement rechecked before the
+ // operation is performed.
+ handleOrphanedSubtrees();
// Check enablement just in case the sync info wasn't loaded
if (!isEnabled()) {
MessageDialog.openInformation(getShell(), Policy.bind("CVSAction.disabledTitle"), Policy.bind("CVSAction.disabledMessage")); //$NON-NLS-1$ //$NON-NLS-2$
@@ -78,6 +85,64 @@ public abstract class WorkspaceAction extends CVSAction {
}
}
+ /*
+ * Determine if any of the selected resources are deascendants of
+ * an orphaned CVS subtree and if they are, purge the CVS folders.
+ */
+ private boolean handleOrphanedSubtrees() {
+ // invoke the inherited method so that overlaps are maintained
+ IResource[] resources = getSelectedResources();
+ for (int i = 0; i < resources.length; i++) {
+ IResource resource = resources[i];
+ handleOrphanedSubtree(resource);
+ }
+ return false;
+ }
+
+ /*
+ * Determine if the resource is a descendant of an orphaned subtree.
+ * If it is, purge the CVS folders of the subtree.
+ */
+ private void handleOrphanedSubtree(IResource resource) {
+ try {
+ if (!CVSWorkspaceRoot.isSharedWithCVS(resource)) return ;
+ ICVSFolder folder;
+ if (resource.getType() == IResource.FILE) {
+ folder = CVSWorkspaceRoot.getCVSFolderFor(resource.getParent());
+ } else {
+ folder = CVSWorkspaceRoot.getCVSFolderFor((IContainer)resource);
+ }
+ handleOrphanedSubtree(folder);
+ } catch (CVSException e) {
+ CVSProviderPlugin.log(e);
+ }
+ }
+
+ /*
+ * Recursively check for and handle orphaned CVS folders
+ */
+ private void handleOrphanedSubtree(final ICVSFolder folder) throws CVSException {
+ if (folder.getIResource().getType() == IResource.PROJECT) return;
+ if (CVSWorkspaceRoot.isOrphanedSubtree((IContainer)folder.getIResource())) {
+ try {
+ run(new IRunnableWithProgress() {
+ public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+ try {
+ folder.unmanage(null);
+ } catch (CVSException e) {
+ CVSProviderPlugin.log(e);
+ }
+ }
+ }, true, PROGRESS_WORKBENCH_WINDOW);
+ } catch (InvocationTargetException e) {
+ // Ignore this since we logged the one we care about above
+ } catch (InterruptedException e) {
+ throw new OperationCanceledException();
+ }
+ }
+ handleOrphanedSubtree(folder.getParent());
+ }
+
/**
* Return true if the sync info is loaded for all selected resources.
* The purpose of this method is to allow enablement code to be as fast
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
index 5bc3477a0..8cfaeafba 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
@@ -279,7 +279,7 @@ CompareWithRevisionAction.noRevisions=No Revisions
CompareWithRevisionAction.noRevisionsLong=The selected resource has no revisions to compare with.
CompareWithRevisionAction.fetching=Fetching revisions from repository...
-CompareWithTagAction.message=Compare with Branch or Version
+CompareWithTagAction.message=Compare With Branch or Version
CompareWithTagAction.replace=Error Comparing With Branch or Version
CompareWithTagAction.noRemote=No Remote Resource
CompareWithTagAction.noRemoteLong=The selected tag has no remote resource to compare with.
@@ -743,7 +743,7 @@ TagConfigurationDialog.12=A&dd Selected Files
TagConfigurationDialog.13=Rem&ove
TagConfigurationDialog.14=Error fetching tags from remote CVS files
TagConfigurationDialog.20=&Refresh from Repository
-TagConfigurationDialog.21=&Configure Tags
+TagConfigurationDialog.21=&Configure Tags...
TagConfigurationDialog.22=Updating Tags
ChangeListener.Deleting_CVS_folders_1=Deleting CVS folders
@@ -1030,6 +1030,7 @@ FetchMembersOperation.0=Fetching members of {0};
RemoteRevisionQuickDiffProvider.readingFile=Error reading remote file
RemoteRevisionQuickDiffProvider.closingFile=Error closing remote file
RemoteRevisionQuickDiffProvider.fetchingFile=CVS QuickDiff: fetching remote contents for ''{0}''
+RemoteCompareOperation.0=Comparing tags {0} and {1} of {2}
action.SynchronizeViewCommit.label=Commit
action.SynchronizeViewCommit.tooltip=Commit All Outgoing Changes
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java
index 152d3a55a..55be0a62e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java
@@ -356,7 +356,7 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation {
IProjectDescription desc = getDescriptionFor(project);
if (desc != null) {
File localLocation = desc.getLocation().toFile();
- return localLocation.exists();
+ if (localLocation.exists()) return true;
}
// Next, check if the resource itself exists
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java
index 9f4e7bb1a..c49567055 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java
@@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.team.internal.ccvs.core.CVSException;
import org.eclipse.team.internal.ccvs.core.CVSTag;
import org.eclipse.team.internal.ccvs.core.CVSTeamProvider;
+import org.eclipse.team.internal.ccvs.core.ICVSResource;
import org.eclipse.team.internal.ccvs.core.client.Command;
import org.eclipse.team.internal.ccvs.core.client.Session;
import org.eclipse.team.internal.ccvs.core.client.Update;
@@ -64,7 +65,7 @@ public class ReplaceOperation extends UpdateOperation {
protected IStatus executeCommand(
Session session,
CVSTeamProvider provider,
- IResource[] resources,
+ ICVSResource[] resources,
IProgressMonitor monitor)
throws CVSException, InterruptedException {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java
index 5b8f0715b..c4bcf15e1 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java
@@ -62,7 +62,6 @@ public abstract class RepositoryProviderOperation extends CVSOperation {
IResource[] providerResources = (IResource[])list.toArray(new IResource[list.size()]);
execute(provider, providerResources, subMonitor);
}
-
}
/*
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java
index de2f9a8c5..e1a725adb 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java
@@ -17,6 +17,7 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.team.internal.ccvs.core.CVSException;
import org.eclipse.team.internal.ccvs.core.CVSStatus;
import org.eclipse.team.internal.ccvs.core.CVSTeamProvider;
+import org.eclipse.team.internal.ccvs.core.ICVSResource;
import org.eclipse.team.internal.ccvs.core.client.Command;
import org.eclipse.team.internal.ccvs.core.client.Session;
import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
@@ -24,7 +25,7 @@ import org.eclipse.team.internal.ccvs.ui.Policy;
public abstract class SingleCommandOperation extends RepositoryProviderOperation {
- LocalOption[] options = Command.NO_LOCAL_OPTIONS;
+ private LocalOption[] options = Command.NO_LOCAL_OPTIONS;
public SingleCommandOperation(Shell shell, IResource[] resources, LocalOption[] options) {
super(shell, resources);
@@ -41,7 +42,9 @@ public abstract class SingleCommandOperation extends RepositoryProviderOperation
Session session = new Session(getRemoteLocation(provider), getLocalRoot(provider), true /* output to console */);
session.open(Policy.subMonitorFor(monitor, 10), isServerModificationOperation());
try {
- IStatus status = executeCommand(session, provider, resources, Policy.subMonitorFor(monitor, 90));
+ // TODO: This does not properly count the number of operations
+ // Changing it causes an error in the test cases
+ IStatus status = executeCommand(session, provider, getCVSArguments(resources), Policy.subMonitorFor(monitor, 90));
if (status.getCode() == CVSStatus.SERVER_ERROR) {
addError(status);
}
@@ -62,7 +65,7 @@ public abstract class SingleCommandOperation extends RepositoryProviderOperation
/**
* Method overridden by subclasses to issue the command to the CVS repository using the given session.
*/
- protected abstract IStatus executeCommand(Session session, CVSTeamProvider provider, IResource[] resources, IProgressMonitor monitor) throws CVSException, InterruptedException;
+ protected abstract IStatus executeCommand(Session session, CVSTeamProvider provider, ICVSResource[] resources, IProgressMonitor monitor) throws CVSException, InterruptedException;
protected LocalOption[] getLocalOptions() {
return options;
@@ -72,4 +75,10 @@ public abstract class SingleCommandOperation extends RepositoryProviderOperation
this.options = options;
}
+ protected void addLocalOption(LocalOption option) {
+ LocalOption[] newOptions = new LocalOption[options.length + 1];
+ System.arraycopy(options, 0, newOptions, 0, options.length);
+ newOptions[options.length] = option;
+ options = newOptions;
+ }
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java
index cfecbfcc8..ed56623e0 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java
@@ -21,6 +21,7 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.team.internal.ccvs.core.CVSException;
import org.eclipse.team.internal.ccvs.core.CVSTeamProvider;
+import org.eclipse.team.internal.ccvs.core.ICVSResource;
import org.eclipse.team.internal.ccvs.core.client.Command;
import org.eclipse.team.internal.ccvs.core.client.Session;
import org.eclipse.team.internal.ccvs.core.client.UpdateMergableOnly;
@@ -42,13 +43,13 @@ public class UpdateOnlyMergableOperation extends SingleCommandOperation {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.ui.operations.SingleCommandOperation#executeCommand(org.eclipse.team.internal.ccvs.core.client.Session, org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource[], org.eclipse.core.runtime.IProgressMonitor)
*/
- protected IStatus executeCommand(Session session, CVSTeamProvider provider, IResource[] resources, IProgressMonitor monitor) throws CVSException, InterruptedException {
+ protected IStatus executeCommand(Session session, CVSTeamProvider provider, ICVSResource[] resources, IProgressMonitor monitor) throws CVSException, InterruptedException {
UpdateMergableOnly update = new UpdateMergableOnly();
IStatus status = update.execute(
session,
Command.NO_GLOBAL_OPTIONS,
getLocalOptions(),
- getCVSArguments(resources),
+ resources,
null,
Policy.subMonitorFor(monitor, 90));
if (status.getCode() != IStatus.ERROR) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java
index da17e6076..bdbe5b081 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java
@@ -50,7 +50,7 @@ public class UpdateOperation extends SingleCommandOperation {
protected IStatus executeCommand(
Session session,
CVSTeamProvider provider,
- IResource[] resources,
+ ICVSResource[] resources,
IProgressMonitor monitor)
throws CVSException, InterruptedException {
@@ -65,13 +65,12 @@ public class UpdateOperation extends SingleCommandOperation {
// Build the arguments list
localOptions.addAll(Arrays.asList(getLocalOptions()));
LocalOption[] commandOptions = (LocalOption[])localOptions.toArray(new LocalOption[localOptions.size()]);
- ICVSResource[] arguments = getCVSArguments(resources);
return Command.UPDATE.execute(
session,
Command.NO_GLOBAL_OPTIONS,
commandOptions,
- arguments,
+ resources,
null,
monitor);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java
index e1ec233d3..e4dc665cb 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java
@@ -19,6 +19,7 @@ import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.swt.SWT;
@@ -171,6 +172,7 @@ public class CVSRepositoryPropertiesPage extends PropertyPage {
});
WorkbenchHelp.setHelp(getControl(), IHelpContextIds.REPOSITORY_LOCATION_PROPERTY_PAGE);
+ Dialog.applyDialogFont(parent);
return composite;
}
/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSWorkingSetPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSWorkingSetPage.java
index 812182947..f2b225d90 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSWorkingSetPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSWorkingSetPage.java
@@ -21,6 +21,7 @@ import java.util.Map;
import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
@@ -134,6 +135,7 @@ public class CVSWorkingSetPage extends CVSWizardPage implements IWorkingSetPage
initializeValues();
updateWidgetEnablements();
nameField.setFocus();
+ Dialog.applyDialogFont(parent);
}
/**
* Method handleExpansion.
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CommentHistoryContentHandler.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CommentHistoryContentHandler.java
index bbcc4c963..f3f3d58f2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CommentHistoryContentHandler.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CommentHistoryContentHandler.java
@@ -41,11 +41,13 @@ class CommentHistoryContentHandler extends DefaultHandler {
String qName,
Attributes atts)
throws SAXException {
- if (localName.equals(RepositoryManager.ELEMENT_COMMIT_COMMENT)) {
+
+ String elementName = getElementName(namespaceURI, localName, qName);
+ if (elementName.equals(RepositoryManager.ELEMENT_COMMIT_COMMENT)) {
buffer = new StringBuffer();
return;
}
- if (localName.equals(RepositoryManager.ELEMENT_COMMIT_HISTORY)) {
+ if (elementName.equals(RepositoryManager.ELEMENT_COMMIT_HISTORY)) {
comments = new Vector(RepositoryManager.MAX_COMMENTS);
return;
}
@@ -55,15 +57,29 @@ class CommentHistoryContentHandler extends DefaultHandler {
* @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
*/
public void endElement(String namespaceURI, String localName, String qName) {
- if (localName.equals(RepositoryManager.ELEMENT_COMMIT_COMMENT)) {
+ String elementName = getElementName(namespaceURI, localName, qName);
+ if (elementName.equals(RepositoryManager.ELEMENT_COMMIT_COMMENT)) {
comments.add(buffer.toString());
buffer = null;
return;
}
- if (localName.equals(RepositoryManager.ELEMENT_COMMIT_HISTORY)) {
+ if (elementName.equals(RepositoryManager.ELEMENT_COMMIT_HISTORY)) {
RepositoryManager.previousComments = new String[comments.size()];
comments.copyInto(RepositoryManager.previousComments);
return;
}
}
+
+ /*
+ * Couldn't figure out from the SAX API exactly when localName vs. qName is used.
+ * However, the XML for project sets doesn't use namespaces so either of the two names
+ * is fine. Therefore, use whichever one is provided.
+ */
+ private String getElementName(String namespaceURI, String localName, String qName) {
+ if (localName != null && localName.length() > 0) {
+ return localName;
+ } else {
+ return qName;
+ }
+ }
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java
index 5437518ad..f3243b702 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java
@@ -123,6 +123,7 @@ public class RefreshRemoteProjectSelectionPage extends CVSWizardPage {
}
});
workingSetArea.createArea(composite);
+ Dialog.applyDialogFont(parent);
}
/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java
index d40b0cfdb..75288c944 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java
@@ -72,25 +72,26 @@ public class RepositoriesViewContentHandler extends DefaultHandler {
* @see ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
*/
public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
-
- if (!localName.equals(tagStack.peek())) {
- throw new SAXException(Policy.bind("RepositoriesViewContentHandler.unmatchedTag", localName)); //$NON-NLS-1$
+
+ String elementName = getElementName(namespaceURI, localName, qName);
+ if (!elementName.equals(tagStack.peek())) {
+ throw new SAXException(Policy.bind("RepositoriesViewContentHandler.unmatchedTag", elementName)); //$NON-NLS-1$
}
- if (localName.equals(REPOSITORIES_VIEW_TAG)) {
+ if (elementName.equals(REPOSITORIES_VIEW_TAG)) {
// all done
- } else if (localName.equals(REPOSITORY_TAG)) {
+ } else if (elementName.equals(REPOSITORY_TAG)) {
if (!ignoreElements) {
manager.add(currentRepositoryRoot);
}
currentRepositoryRoot = null;
- } else if (localName.equals(WORKING_SET_TAG)) {
+ } else if (elementName.equals(WORKING_SET_TAG)) {
// This tag is no longer used
ignoreElements = false;
- } else if (localName.equals(CURRENT_WORKING_SET_TAG)) {
+ } else if (elementName.equals(CURRENT_WORKING_SET_TAG)) {
// This tag is no longer used
ignoreElements = false;
- } else if (localName.equals(MODULE_TAG)) {
+ } else if (elementName.equals(MODULE_TAG)) {
if (! ignoreElements && currentRepositoryRoot != null) {
currentRepositoryRoot.addTags(currentRemotePath,
(CVSTag[]) tags.toArray(new CVSTag[tags.size()]));
@@ -110,10 +111,11 @@ public class RepositoriesViewContentHandler extends DefaultHandler {
String qName,
Attributes atts)
throws SAXException {
-
- if (localName.equals(REPOSITORIES_VIEW_TAG)) {
+
+ String elementName = getElementName(namespaceURI, localName, qName);
+ if (elementName.equals(REPOSITORIES_VIEW_TAG)) {
// just started
- } else if (localName.equals(REPOSITORY_TAG)) {
+ } else if (elementName.equals(REPOSITORY_TAG)) {
String id = atts.getValue(ID_ATTRIBUTE);
if (id == null) {
throw new SAXException(Policy.bind("RepositoriesViewContentHandler.missingAttribute", REPOSITORY_TAG, ID_ATTRIBUTE)); //$NON-NLS-1$
@@ -133,14 +135,14 @@ public class RepositoriesViewContentHandler extends DefaultHandler {
((CVSRepositoryLocation)root).setReadLocation(readLocation);
String writeLocation = atts.getValue(WRITE_ID_ATTRIBUTE);
((CVSRepositoryLocation)root).setWriteLocation(writeLocation);
- } else if (localName.equals(WORKING_SET_TAG)) {
+ } else if (elementName.equals(WORKING_SET_TAG)) {
String name = atts.getValue(NAME_ATTRIBUTE);
if (name == null) {
throw new SAXException(Policy.bind("RepositoriesViewContentHandler.missingAttribute", WORKING_SET_TAG, NAME_ATTRIBUTE)); //$NON-NLS-1$
}
// Ignore any elements until the corresponding end tag is reached
ignoreElements = true;
- } else if (localName.equals(MODULE_TAG)) {
+ } else if (elementName.equals(MODULE_TAG)) {
String path = atts.getValue(PATH_ATTRIBUTE);
if (path == null) {
throw new SAXException(Policy.bind("RepositoriesViewContentHandler.missingAttribute", MODULE_TAG, PATH_ATTRIBUTE)); //$NON-NLS-1$
@@ -150,7 +152,7 @@ public class RepositoriesViewContentHandler extends DefaultHandler {
path = RepositoryRoot.asDefinedModulePath(path);
}
startModule(path);
- } else if (localName.equals(TAG_TAG)) {
+ } else if (elementName.equals(TAG_TAG)) {
String type = atts.getValue(TYPE_ATTRIBUTE);
if (type == null) {
type = DEFAULT_TAG_TYPE;
@@ -160,7 +162,7 @@ public class RepositoriesViewContentHandler extends DefaultHandler {
throw new SAXException(Policy.bind("RepositoriesViewContentHandler.missingAttribute", TAG_TAG, NAME_ATTRIBUTE)); //$NON-NLS-1$
}
tags.add(new CVSTag(name, getCVSTagType(type)));
- } else if (localName.equals(AUTO_REFRESH_FILE_TAG)) {
+ } else if (elementName.equals(AUTO_REFRESH_FILE_TAG)) {
String path = atts.getValue(FULL_PATH_ATTRIBUTE);
if (path == null) {
// get the old path attribute format which was relative to the module
@@ -175,13 +177,13 @@ public class RepositoriesViewContentHandler extends DefaultHandler {
}
}
if (path != null) autoRefreshFiles.add(path);
- } else if (localName.equals(CURRENT_WORKING_SET_TAG)) {
+ } else if (elementName.equals(CURRENT_WORKING_SET_TAG)) {
// Ignore any elements until the corresponding end tag is reached
ignoreElements = true;
}
// empty buffer
buffer = new StringBuffer();
- tagStack.push(localName);
+ tagStack.push(elementName);
}
private void startModule(String path) {
@@ -202,4 +204,16 @@ public class RepositoriesViewContentHandler extends DefaultHandler {
return CVSTag.VERSION;
}
+ /*
+ * Couldn't figure out from the SAX API exactly when localName vs. qName is used.
+ * However, the XML for project sets doesn't use namespaces so either of the two names
+ * is fine. Therefore, use whichever one is provided.
+ */
+ private String getElementName(String namespaceURI, String localName, String qName) {
+ if (localName != null && localName.length() > 0) {
+ return localName;
+ } else {
+ return qName;
+ }
+ }
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java
index eee7f8953..b2420f74f 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java
@@ -31,7 +31,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.xerces.parsers.SAXParser;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IAdaptable;
@@ -428,21 +431,25 @@ public class RepositoryManager {
}
private void readState(InputStream stream) throws IOException, TeamException {
- SAXParser parser = new SAXParser();
- parser.setContentHandler(new RepositoriesViewContentHandler(this));
try {
- parser.parse(new InputSource(stream));
+ SAXParserFactory factory = SAXParserFactory.newInstance();
+ SAXParser parser = factory.newSAXParser();
+ parser.parse(new InputSource(stream), new RepositoriesViewContentHandler(this));
} catch (SAXException ex) {
throw new CVSException(Policy.bind("RepositoryManager.parsingProblem", REPOSITORIES_VIEW_FILE), ex); //$NON-NLS-1$
+ } catch (ParserConfigurationException ex) {
+ throw new CVSException(Policy.bind("RepositoryManager.parsingProblem", REPOSITORIES_VIEW_FILE), ex); //$NON-NLS-1$
}
}
private void readCommentHistory(InputStream stream) throws IOException, TeamException {
- SAXParser parser = new SAXParser();
- parser.setContentHandler(new CommentHistoryContentHandler());
try {
- parser.parse(new InputSource(stream));
+ SAXParserFactory factory = SAXParserFactory.newInstance();
+ SAXParser parser = factory.newSAXParser();
+ parser.parse(new InputSource(stream), new CommentHistoryContentHandler());
} catch (SAXException ex) {
throw new CVSException(Policy.bind("RepositoryManager.parsingProblem", COMMENT_HIST_FILE), ex); //$NON-NLS-1$
+ } catch (ParserConfigurationException ex) {
+ throw new CVSException(Policy.bind("RepositoryManager.parsingProblem", COMMENT_HIST_FILE), ex); //$NON-NLS-1$
}
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSMergeSynchronizeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSMergeSynchronizeParticipant.java
index b301c0ebd..bb6dafba9 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSMergeSynchronizeParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSMergeSynchronizeParticipant.java
@@ -22,13 +22,13 @@ import org.eclipse.team.internal.ui.TeamUIPlugin;
import org.eclipse.team.internal.ui.synchronize.sets.SubscriberInput;
import org.eclipse.team.ui.Utilities;
import org.eclipse.team.ui.synchronize.actions.DirectionFilterActionGroup;
-import org.eclipse.team.ui.synchronize.actions.RemoveSynchronizeViewPageAction;
+import org.eclipse.team.ui.synchronize.actions.RemoveSynchronizeParticipantAction;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.PartInitException;
public class CVSMergeSynchronizeParticipant extends CVSSynchronizeParticipant {
- private RemoveSynchronizeViewPageAction removeAction;
+ private RemoveSynchronizeParticipantAction removeAction;
private DirectionFilterActionGroup modes;
private Action updateAdapter;
@@ -53,7 +53,7 @@ public class CVSMergeSynchronizeParticipant extends CVSSynchronizeParticipant {
}
private void makeActions() {
- removeAction = new RemoveSynchronizeViewPageAction(this);
+ removeAction = new RemoveSynchronizeParticipantAction(this);
modes = new DirectionFilterActionGroup(this, INCOMING_MODE | CONFLICTING_MODE);
updateAdapter = new CVSActionDelegate(new MergeUpdateAction(), this);
Utilities.initAction(updateAdapter, "action.SynchronizeViewUpdate.", Policy.getBundle());
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeParticipant.java
index 2cc744674..2728520c1 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeParticipant.java
@@ -19,6 +19,7 @@ import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.team.internal.ui.synchronize.sets.ISyncSetChangedListener;
+import org.eclipse.team.internal.ui.synchronize.sets.SubscriberInput;
import org.eclipse.team.internal.ui.synchronize.sets.SyncSetChangedEvent;
import org.eclipse.team.ui.synchronize.TeamSubscriberParticipant;
import org.eclipse.ui.IActionDelegate;
@@ -40,7 +41,7 @@ public abstract class CVSSynchronizeParticipant extends TeamSubscriberParticipan
public void run() {
IStructuredContentProvider cp = (IStructuredContentProvider)participant.getPage().getViewer().getContentProvider();
- StructuredSelection selection = new StructuredSelection(cp.getElements(participant.getInput()));
+ StructuredSelection selection = new StructuredSelection(cp.getElements(CVSSynchronizeParticipant.this.getInput()));
if(! selection.isEmpty()) {
delegate.selectionChanged(this, selection);
delegate.run(this);
@@ -106,4 +107,11 @@ public abstract class CVSSynchronizeParticipant extends TeamSubscriberParticipan
super.init();
getInput().getFilteredSyncSet().addSyncSetChangedListener(this);
}
+
+ /**
+ * A hook for testing only!
+ */
+ public SubscriberInput getSubscriberInput() {
+ return getInput();
+ }
} \ No newline at end of file
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java
index 3b0a2af74..fd12b787d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java
@@ -31,10 +31,10 @@ import org.eclipse.team.internal.ccvs.core.client.Command;
import org.eclipse.team.internal.ccvs.core.client.Update;
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.ui.Policy;
-import org.eclipse.team.ui.synchronize.actions.OrSyncInfoFilter;
-import org.eclipse.team.ui.synchronize.actions.SyncInfoDirectionFilter;
import org.eclipse.team.ui.synchronize.actions.SyncInfoFilter;
import org.eclipse.team.ui.synchronize.actions.SyncInfoSet;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoFilter.OrSyncInfoFilter;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoFilter.SyncInfoDirectionFilter;
/**
* This action performs a "cvs update -j start -j end ..." to merge changes
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndCommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndCommitAction.java
index acef00c5c..915a207fd 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndCommitAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndCommitAction.java
@@ -11,9 +11,9 @@
package org.eclipse.team.internal.ccvs.ui.subscriber;
import org.eclipse.team.core.subscribers.SyncInfo;
-import org.eclipse.team.ui.synchronize.actions.SyncInfoDirectionFilter;
import org.eclipse.team.ui.synchronize.actions.SyncInfoFilter;
import org.eclipse.team.ui.synchronize.actions.SyncInfoSet;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoFilter.SyncInfoDirectionFilter;
public class OverrideAndCommitAction extends SubscriberCommitAction {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java
index 277d9952a..ee498f1a5 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java
@@ -18,9 +18,9 @@ import org.eclipse.team.core.subscribers.SyncInfo;
import org.eclipse.team.internal.ccvs.core.CVSException;
import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.team.internal.ccvs.ui.operations.ReplaceOperation;
-import org.eclipse.team.ui.synchronize.actions.SyncInfoDirectionFilter;
import org.eclipse.team.ui.synchronize.actions.SyncInfoFilter;
import org.eclipse.team.ui.synchronize.actions.SyncInfoSet;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoFilter.SyncInfoDirectionFilter;
/**
* Runs an update command that will prompt the user for overwritting local
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateAction.java
index f8ee211f7..e885ca707 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateAction.java
@@ -30,11 +30,11 @@ import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.team.internal.ccvs.ui.operations.UpdateOnlyMergableOperation;
import org.eclipse.team.internal.ui.TeamUIPlugin;
-import org.eclipse.team.ui.synchronize.actions.AndSyncInfoFilter;
-import org.eclipse.team.ui.synchronize.actions.OrSyncInfoFilter;
-import org.eclipse.team.ui.synchronize.actions.SyncInfoDirectionFilter;
import org.eclipse.team.ui.synchronize.actions.SyncInfoFilter;
import org.eclipse.team.ui.synchronize.actions.SyncInfoSet;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoFilter.AndSyncInfoFilter;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoFilter.OrSyncInfoFilter;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoFilter.SyncInfoDirectionFilter;
/**
* This update action will update all mergable resources first and then prompt the
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitAction.java
index 4416364d8..2216abdf3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitAction.java
@@ -31,9 +31,9 @@ import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager;
import org.eclipse.team.internal.ccvs.ui.sync.ToolTipMessageDialog;
import org.eclipse.team.internal.ui.Utils;
-import org.eclipse.team.ui.synchronize.actions.SyncInfoDirectionFilter;
import org.eclipse.team.ui.synchronize.actions.SyncInfoFilter;
import org.eclipse.team.ui.synchronize.actions.SyncInfoSet;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoFilter.SyncInfoDirectionFilter;
public class SubscriberCommitAction extends CVSSubscriberAction {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberConfirmMergedAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberConfirmMergedAction.java
index 22c8db012..06d0a0516 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberConfirmMergedAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberConfirmMergedAction.java
@@ -19,9 +19,9 @@ import org.eclipse.team.core.subscribers.SyncInfo;
import org.eclipse.team.internal.ccvs.core.CVSException;
import org.eclipse.team.internal.ccvs.core.CVSSyncInfo;
import org.eclipse.team.internal.ccvs.ui.Policy;
-import org.eclipse.team.ui.synchronize.actions.SyncInfoDirectionFilter;
import org.eclipse.team.ui.synchronize.actions.SyncInfoFilter;
import org.eclipse.team.ui.synchronize.actions.SyncInfoSet;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoFilter.SyncInfoDirectionFilter;
/**
* This action marks the local resource as merged by updating the base
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java
index f5faea4f0..a6b604f8d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java
@@ -25,9 +25,9 @@ import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.team.internal.ccvs.ui.operations.ReplaceOperation;
-import org.eclipse.team.ui.synchronize.actions.SyncInfoDirectionFilter;
import org.eclipse.team.ui.synchronize.actions.SyncInfoFilter;
import org.eclipse.team.ui.synchronize.actions.SyncInfoSet;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoFilter.SyncInfoDirectionFilter;
/**
* This action performs an update for the CVSWorkspaceSubscriber.
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java
index d8b708067..6c67e66b5 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
@@ -126,6 +127,7 @@ public class CheckoutAsLocationSelectionPage extends CVSWizardPage {
}
};
useDefaultsButton.addSelectionListener(listener);
+ Dialog.applyDialogFont(parent);
}
/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java
index 58e3f2e2e..ed4a34fb0 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java
@@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
@@ -76,6 +77,7 @@ public class CheckoutAsMainPage extends CVSWizardPage {
}
updateEnablements();
+ Dialog.applyDialogFont(parent);
}
/*
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java
index 9b57d1958..4eea0bbd3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java
@@ -19,6 +19,7 @@ import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -152,6 +153,7 @@ public class CheckoutAsProjectSelectionPage extends CVSWizardPage {
initializeValues();
updateWidgetEnablements();
tree.getControl().setFocus();
+ Dialog.applyDialogFont(parent);
}
/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java
index 3170b7265..ed7ab50df 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java
@@ -12,6 +12,7 @@ package org.eclipse.team.internal.ccvs.ui.wizards;
import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -102,6 +103,7 @@ public class ConfigurationWizardAutoconnectPage extends CVSWizardPage {
}
});
check.setSelection(true);
+ Dialog.applyDialogFont(parent);
}
public FolderSyncInfo getFolderSyncInfo() {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java
index 289364c37..e2ddae19b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java
@@ -19,6 +19,7 @@ import java.util.Properties;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -218,6 +219,7 @@ public class ConfigurationWizardMainPage extends CVSWizardPage {
hostCombo.setFocus();
setControl(composite);
+ Dialog.applyDialogFont(parent);
}
/**
* Utility method to create an editable combo box
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardCommitCommentPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardCommitCommentPage.java
index 5597ff55d..d5727e2dc 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardCommitCommentPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardCommitCommentPage.java
@@ -51,6 +51,7 @@ public class KSubstWizardCommitCommentPage extends CVSWizardPage {
// set F1 help
WorkbenchHelp.setHelp(top, IHelpContextIds.KEYWORD_SUBSTITUTION_COMMIT_COMMENT_PAGE);
commitCommentArea.createArea(top);
+ Dialog.applyDialogFont(parent);
}
/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java
index d057e3af4..7df0ba1e6 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java
@@ -15,6 +15,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ListViewer;
import org.eclipse.swt.SWT;
@@ -63,6 +64,7 @@ public class KSubstWizardDirtyFilesPage extends CVSWizardPage {
createSeparator(top, SPACER_HEIGHT);
listViewer = createFileListViewer(top,
Policy.bind("KSubstWizardDirtyFilesPage.dirtyFilesViewer.title"), LIST_HEIGHT_HINT); //$NON-NLS-1$
+ Dialog.applyDialogFont(parent);
}
public boolean includeDirtyFiles() {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java
index 56d2ed994..4fec08d51 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java
@@ -16,6 +16,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -128,6 +129,7 @@ public class KSubstWizardSelectionPage extends CVSWizardPage {
}
}
updateEnablements();
+ Dialog.applyDialogFont(parent);
}
/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java
index 2bf2bd94e..de8f0e67a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java
@@ -15,6 +15,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ListViewer;
import org.eclipse.swt.SWT;
@@ -63,6 +64,7 @@ public class KSubstWizardSharedFilesPage extends CVSWizardPage {
createSeparator(top, SPACER_HEIGHT);
listViewer = createFileListViewer(top,
Policy.bind("KSubstWizardSharedFilesPage.sharedFilesViewer.title"), LIST_HEIGHT_HINT); //$NON-NLS-1$
+ Dialog.applyDialogFont(parent);
}
public boolean includeSharedFiles() {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java
index 3e9ad5bf3..b605bbf15 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java
@@ -16,6 +16,7 @@ import java.util.Comparator;
import java.util.List;
import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
@@ -108,6 +109,7 @@ public class KSubstWizardSummaryPage extends CVSWizardPage {
Policy.bind("KSubstWizardSummaryPage.summaryViewer.fileHeader"), //$NON-NLS-1$
Policy.bind("KSubstWizardSummaryPage.summaryViewer.ksubstHeader"), //$NON-NLS-1$
LIST_HEIGHT_HINT);
+ Dialog.applyDialogFont(parent);
}
/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java
index d34a3bf52..67c881dd4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java
@@ -11,6 +11,7 @@
package org.eclipse.team.internal.ccvs.ui.wizards;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Button;
@@ -78,6 +79,7 @@ public class ModuleSelectionPage extends CVSWizardPage {
useProjectNameButton.setSelection(true);
setControl(composite);
setPageComplete(true);
+ Dialog.applyDialogFont(parent);
}
public String getModuleName() {
return result;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RepositorySelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RepositorySelectionPage.java
index 120c3acab..7ce1652a4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RepositorySelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RepositorySelectionPage.java
@@ -11,6 +11,7 @@
package org.eclipse.team.internal.ccvs.ui.wizards;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ColumnWeightData;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -113,6 +114,7 @@ public class RepositorySelectionPage extends CVSWizardPage {
setControl(composite);
initializeValues();
+ Dialog.applyDialogFont(parent);
}
/**
* Initializes states of the controls.
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java
index ed926953f..124a788e9 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java
@@ -32,6 +32,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
@@ -176,6 +177,7 @@ public class RestoreFromRepositoryFileSelectionPage extends CVSWizardPage {
initializeValues();
updateWidgetEnablements();
+ Dialog.applyDialogFont(parent);
}
protected CheckboxTableViewer createRevisionSelectionTable(CompareViewerPane composite, HistoryTableProvider tableProvider) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java
index ad12bc7b8..269f3ab74 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java
@@ -11,6 +11,7 @@
package org.eclipse.team.internal.ccvs.ui.wizards;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -38,5 +39,6 @@ public class SharingWizardFinishPage extends CVSWizardPage {
data.widthHint = 350;
label.setLayoutData(data);
setControl(composite);
+ Dialog.applyDialogFont(parent);
}
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java
index 1ea941248..e5cc80c6c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java
@@ -12,6 +12,7 @@ package org.eclipse.team.internal.ccvs.ui.wizards;
import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -129,6 +130,7 @@ public class UpdateWizardPage extends CVSWizardPage {
seperator.setLayoutData(data);
setPageComplete(false);
+ Dialog.applyDialogFont(parent);
}
protected TreeViewer createTree(Composite parent) {

Back to the top