Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2004-05-10 16:02:38 -0400
committerJean Michel-Lemieux2004-05-10 16:02:38 -0400
commitd1eda25f4b245ceeacfaf708d590becd3be12394 (patch)
treeccffbdc48d9861112e9730a7d1894d21681e432a
parent6939d31fd20fea6b762b67bef5941338063d538e (diff)
downloadeclipse.platform.team-branch_20040505_scopedSyncParticipants.tar.gz
eclipse.platform.team-branch_20040505_scopedSyncParticipants.tar.xz
eclipse.platform.team-branch_20040505_scopedSyncParticipants.zip
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/DateTagDialog.java10
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java2
-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.ui/src/org/eclipse/team/internal/ui/messages.properties75
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshResourceSelectionPage.java61
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberParticipantWizard.java7
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveFromViewAction.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java27
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelAction.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkingSetScope.java16
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkspaceScope.java3
15 files changed, 112 insertions, 113 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/DateTagDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/DateTagDialog.java
index 3167c5322..1a3378e49 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/DateTagDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/DateTagDialog.java
@@ -52,7 +52,7 @@ public class DateTagDialog extends Dialog {
public void createArea(Composite parent) {
Composite composite = createComposite(parent, 4);
initializeDialogUnits(composite);
- createLabel(composite, "Date (M/D/Y):", 1);
+ createLabel(composite, "Date (M/D/Y):", 1); //$NON-NLS-1$
fromMonthCombo = new Combo(composite, SWT.READ_ONLY);
fromDayCombo = new Combo(composite, SWT.READ_ONLY);
fromYearCombo = new Combo(composite, SWT.NONE);
@@ -126,8 +126,8 @@ public class DateTagDialog extends Dialog {
public void createArea(Composite parent) {
Composite composite = createComposite(parent, 2);
initializeDialogUnits(composite);
- includeTime = createCheckbox(composite, "Include time component in tag", 2);
- createLabel(composite, "Time (HH:MM:SS):", 1);
+ includeTime = createCheckbox(composite, "Include time component in tag", 2); //$NON-NLS-1$
+ createLabel(composite, "Time (HH:MM:SS):", 1); //$NON-NLS-1$
Composite dateComposite = new Composite(composite, SWT.NONE);
GridLayout dateLayout = new GridLayout();
dateLayout.numColumns = 3;
@@ -135,8 +135,8 @@ public class DateTagDialog extends Dialog {
hourCombo = new Combo(dateComposite, SWT.READ_ONLY);
minuteCombo = new Combo(dateComposite, SWT.READ_ONLY);
secondCombo = new Combo(dateComposite, SWT.READ_ONLY);
- localTime = createRadioButton(composite, "Time is local", 2);
- utcTime = createRadioButton(composite, "Time is in universal time coordinates (UTC)", 2);
+ localTime = createRadioButton(composite, "Time is local", 2); //$NON-NLS-1$
+ utcTime = createRadioButton(composite, "Time is in universal time coordinates (UTC)", 2); //$NON-NLS-1$
String sixty[] = new String[60];
for (int i = 0; i < 60; i++) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java
index 5bbb7a174..7aa7f39c8 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java
@@ -259,7 +259,7 @@ public class RemoteRevisionQuickDiffProvider implements IQuickDiffReferenceProvi
if(monitor.isCanceled()) return;
fReference.set(""); //$NON-NLS-1$
}
- if(DEBUG) System.out.println("+ CVSQuickDiff: updating document " + (fReference!=null ? "remote found" : "remote empty")); //$NON-NLS-1$ //$NON-NLS-2$
+ if(DEBUG) System.out.println("+ CVSQuickDiff: updating document " + (fReference!=null ? "remote found" : "remote empty")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java
index 7c5aed8fc..45876e135 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java
@@ -113,7 +113,7 @@ public class CompareWithRevisionAction extends WorkspaceAction {
* Return the text describing this action
*/
protected String getActionTitle() {
- return Policy.bind("CompareWithRevisionAction.4");
+ return Policy.bind("CompareWithRevisionAction.4"); //$NON-NLS-1$
}
/* (non-Javadoc)
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java
index 0e18e46e9..a0a65a413 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java
@@ -69,7 +69,7 @@ public class SyncAction extends WorkspaceAction {
shell.getDisplay().syncExec(new Runnable() {
public void run() {
if (info.getKind() == SyncInfo.IN_SYNC) {
- MessageDialog.openInformation(shell, "No Changes", "There are no changes between the workspace resource and the remote.");
+ MessageDialog.openInformation(shell, Policy.bind("SyncAction.noChangesTitle"), Policy.bind("SyncAction.noChangesMessage")); //$NON-NLS-1$ //$NON-NLS-2$
} else {
SyncInfoCompareInput input = new SyncInfoCompareInput(subscriber.getName(), info);
CompareUI.openCompareEditor(input);
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 6c0c1c0a9..7a039e1ef 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
@@ -603,6 +603,8 @@ ShowHistoryAction.noHistoryLong=No resource history available for selected resou
SyncAction.sync=Synchronize
SyncAction.workingSetName=Latest CVS Synchronize
+SyncAction.noChangesTitle=No Changes
+SyncAction.noChangesMessage=There are no changes between the workspace resource and the remote.
TagAction.tagErrorTitle=Tagging Error
TagAction.tagWarningTitle=Tagging Warning
@@ -1175,3 +1177,6 @@ CVSTeamProvider.makeBranch=Creating branch
CVSTeamProvider.folderInfo=Updating folder synchronization information for project {0}
CVSTeamProvider.updatingFolder=Updating {0}
BranchOperation.0=Branching
+
+
+
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
index b3c3ff6e8..281357618 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
@@ -185,9 +185,9 @@ action.collapseAll.image=collapseall.gif
action.configureSchedulel.label=Schedule...
action.configureSchedulel.tooltip=Configure the Synchronize Schedule...
-action.refreshWithRemote.label=&Synchronize
-action.refreshWithRemote.tooltip=Synchronize
-action.refreshWithRemote.description=Synchronize
+action.refreshWithRemote.label=&Synchronize...
+action.refreshWithRemote.tooltip=Synchronize...
+action.refreshWithRemote.description=Synchronize...
action.refreshWithRemote.image=refresh_remote.gif
action.directionFilterIncoming.label=Incoming
@@ -210,9 +210,9 @@ action.directionFilterBoth.tooltip=Incoming/Outgoing mode
action.directionFilterBoth.description=Incoming/Outgoing mode (shows outgoing changes, incoming changes, and conflicts)
action.directionFilterBoth.image=catchuprelease_rls.gif
-action.refreshSubscriber.label=Synchronize Participants
-action.refreshSubscriber.tooltip=Synchronize Participants
-action.refreshSubscriber.description=Synchronize Participants
+action.refreshSubscriber.label=Synchronizations
+action.refreshSubscriber.tooltip=Synchronizations
+action.refreshSubscriber.description=Synchronizations
action.refreshSubscriber.image=synch_participants.gif
action.comparisonCriteria.label=Comparison Criteria
@@ -230,19 +230,19 @@ action.navigatePrevious.tooltip=Go to Previous Difference
action.navigatePrevious.description=Go to Next Difference
action.navigatePrevious.image=prev_nav.gif
-action.removePage.label=Remove Current Participant
-action.removePage.tooltip=Remove Current Participant
-action.removePage.description=Remove Current Participant
+action.removePage.label=Remove Current Synchronization
+action.removePage.tooltip=Remove Current Synchronization
+action.removePage.description=Remove Current Synchronization
action.removePage.image=participant_rem.gif
-action.removeAllPage.label=Remove Un-Pinned Participants
-action.removeAllPage.tooltip=Remove Un-Pinned Participants
-action.removeAllPage.description=Remove Un-Pinned Participants
+action.removeAllPage.label=Remove Un-Pinned Synchronizations
+action.removeAllPage.tooltip=Remove Un-Pinned Synchronizations
+action.removeAllPage.description=Remove Un-Pinned Synchronizations
action.removeAllPage.image=participant_remall.gif
-action.pinParticipant.label=Pin Current Participant
-action.pinParticipant.tooltip=Pin Current Participant
-action.pinParticipant.description=Pin Current Participant
+action.pinParticipant.label=Pin Current Synchronization
+action.pinParticipant.tooltip=Pin Current Synchronization
+action.pinParticipant.description=Pin Current Synchronization
action.pinParticipant.image=pin.gif
action.expandAll.label=E&xpand All
@@ -257,7 +257,8 @@ action.changeFilterShowDeletions.label=Show Deletions
action.changeFilterShowChanges.label=Show Changes
action.layout.label=Layout
action.modes.label=Modes
-action.removeFromView.label=Remove from View
+
+action.removeFromView.label=&Remove from View
###############################################
# Misc
@@ -301,19 +302,19 @@ CopyAction.errorMessage=There was a problem when accessing the system clipboard.
PasteAction.title=&Paste
PasteAction.toolTip=Paste
RefactorActionGroup.0=Edi&t
-SynchronizeManager.7=Error notifying of added/removal of synchronize participants
-SynchronizeManager.8=Error initializing participants
-SynchronizeManager.9=Synchronize participant with id {0} is not in the registry
-SynchronizeManager.10=Error saving synchronize participants
+SynchronizeManager.7=Error notifying of added/removal of synchronization
+SynchronizeManager.8=Error initializing Synchronization
+SynchronizeManager.9=Synchronization with id {0} is not in the registry
+SynchronizeManager.10=Error saving synchronization
SynchronizeView.1=Synchronize
SynchronizeView.2={1}
SyncViewerPreferencePage.19=Show all synchronization information in a resource\'s text label
TeamSubscriberParticipantPage.7=Resource
TeamSubscriberParticipantPage.8=In Folder
TeamSubscriberSyncPage.labelWithSyncKind={0} {1}
-AbstractSynchronizeParticipant.4=Cannot initialize participant. Wrong descriptor type
+AbstractSynchronizeParticipant.4=Cannot initialize synchronization. Wrong descriptor type
-SynchronizeManager.11=Error creating participant {0}:
+SynchronizeManager.11=Error creating Synchronization {0}:
AbstractSynchronizeParticipant.5=Exception notifying participant listeners of changes.
SynchronizeManager.13=Error initializing synchronize participant
@@ -369,7 +370,7 @@ OpenComparedDialog.diffViewTitleOne=Changes
OpenComparedDialog.noChangeTitle=Operation Complete
OpenComparedDialog.noChangesMessage=No Changes Found.
GlobalRefreshAction.4=Synchronize...
-GlobalRefreshAction.5=Synchronize {0}...
+GlobalRefreshAction.5=Synchronize {0}
SubscriberRefreshWizard.0=Synchronize
ParticipantCompareDialog.1=Remember this result by placing it in the Synchronize View.
ParticipantCompareDialog.2=Confirm Save
@@ -399,10 +400,18 @@ GlobalRefreshResourceSelectionPage.8=&Selected Resources
GlobalRefreshResourceSelectionPage.9=&Enclosing Projects
GlobalRefreshResourceSelectionPage.10=&Working Set:
GlobalRefreshResourceSelectionPage.11=&Choose...
+GlobalRefreshResourceSelectionPage.12=Select &All
+GlobalRefreshResourceSelectionPage.13=&Deselect All
GlobalRefreshParticipantSelectionPage.0=Synchronize
-GlobalRefreshParticipantSelectionPage.1=Select the participant type to create
-GlobalRefreshParticipantSelectionPage.2=Create a Synchronize Participant
-GlobalRefreshParticipantSelectionPage.3=Available synchronize participants:
+GlobalRefreshParticipantSelectionPage.1=Select the type of synchronization
+GlobalRefreshParticipantSelectionPage.2=Synchronize
+GlobalRefreshParticipantSelectionPage.3=Available synchronization types:
+
+GlobalRefreshSubscriberPage.0=Synchronize
+GlobalRefreshSubscriberPage.1=Synchronize {0}
+GlobalRefreshSubscriberPage.2=Select the resources or working sets to be synchronized.
+
+
SyncViewerPreferencePage.31=Prompt at the end of a synchronize operation.
SyncViewerPreferencePage.12=Prompt at the end of a scheduled synchronize operation.
SyncViewerPreferencePage.13=Switch to the associated perspective when a synchronize operation completes
@@ -413,6 +422,14 @@ GlobalRefreshSchedulePage.0=Configure a scheduled synchronization
GlobalRefreshSchedulePage.1=Synchronize Schedule
GlobalRefreshSchedulePage.2=Set the interval at which the resources associated with {0} will be synchronized in the background.
SynchronizeManager.18=Could not cast {0} as ISynchronizeView
-GlobalSynchronizeWizard.11=Create Synchronize Participant
-SynchronizeManager.19=Could not create participant: {0}
-SynchronizeManager.20=Not allowed to create multiple participant instances of this type: {0}
+GlobalSynchronizeWizard.11=Synchronize
+SynchronizeManager.19=Could not create synchronization: {0}
+SynchronizeManager.20=Not allowed to create multiple synchronize instances of this type: {0}
+WorkspaceScope.0=Workspace
+WorkingSetScope.0=Workspace
+SubscriberParticipant.namePattern={0} ({1})
+
+RemoveFromView.warningTitle=Confirm Remove
+RemoveFromView.warningMessage=The selected resources will be removed from the view. A resource will reappear if it is modified or if its synchronization state changes.
+RemoveFromView.warningDontShow=Don't show me this again
+
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshResourceSelectionPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshResourceSelectionPage.java
index 47ca699ad..7febaad28 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshResourceSelectionPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshResourceSelectionPage.java
@@ -10,21 +10,13 @@
*******************************************************************************/
package org.eclipse.team.internal.ui.synchronize;
-import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.*;
import java.util.List;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IResource;
import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.*;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
@@ -32,23 +24,11 @@ import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.TreeItem;
+import org.eclipse.swt.widgets.*;
import org.eclipse.team.internal.ui.Policy;
import org.eclipse.team.internal.ui.Utils;
-import org.eclipse.team.ui.synchronize.ISynchronizeScope;
-import org.eclipse.team.ui.synchronize.ResourceScope;
-import org.eclipse.team.ui.synchronize.WorkingSetScope;
-import org.eclipse.team.ui.synchronize.WorkspaceScope;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.IWorkingSetManager;
-import org.eclipse.ui.PlatformUI;
+import org.eclipse.team.ui.synchronize.*;
+import org.eclipse.ui.*;
import org.eclipse.ui.dialogs.IWorkingSetSelectionDialog;
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.internal.dialogs.ContainerCheckedTreeViewer;
@@ -80,7 +60,7 @@ public class GlobalRefreshResourceSelectionPage extends WizardPage {
// Working set label and holder
private Text workingSetLabel;
- private IWorkingSet workingSet;
+ private IWorkingSet[] workingSets;
private List resources;
/**
@@ -235,7 +215,7 @@ public class GlobalRefreshResourceSelectionPage extends WizardPage {
selectGroup.setLayoutData(data);
Button selectAll = new Button(selectGroup, SWT.NULL);
- selectAll.setText("&Select All");
+ selectAll.setText(Policy.bind("GlobalRefreshResourceSelectionPage.12")); //$NON-NLS-1$
selectAll.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
participantScope.setSelection(true);
@@ -250,7 +230,7 @@ public class GlobalRefreshResourceSelectionPage extends WizardPage {
selectAll.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
Button deSelectAll = new Button(selectGroup, SWT.NULL);
- deSelectAll.setText("&Deselect All");
+ deSelectAll.setText(Policy.bind("GlobalRefreshResourceSelectionPage.13")); //$NON-NLS-1$
deSelectAll.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
fViewer.setCheckedElements(new Object[0]);
@@ -319,7 +299,7 @@ public class GlobalRefreshResourceSelectionPage extends WizardPage {
public ISynchronizeScope getSynchronizeScope() {
if (workingSetScope.getSelection()) {
- return new WorkingSetScope(new IWorkingSet[] { workingSet });
+ return new WorkingSetScope(workingSets);
}
if (participantScope.getSelection()) {
return new WorkspaceScope();
@@ -349,11 +329,11 @@ public class GlobalRefreshResourceSelectionPage extends WizardPage {
private void selectWorkingSetAction() {
IWorkingSetManager manager = PlatformUI.getWorkbench().getWorkingSetManager();
- IWorkingSetSelectionDialog dialog = manager.createWorkingSetSelectionDialog(getShell(), false);
+ IWorkingSetSelectionDialog dialog = manager.createWorkingSetSelectionDialog(getShell(), true);
dialog.open();
IWorkingSet[] sets = dialog.getSelection();
if(sets != null) {
- workingSet = sets[0];
+ workingSets = sets;
} else {
// dialog cancelled
return;
@@ -367,16 +347,19 @@ public class GlobalRefreshResourceSelectionPage extends WizardPage {
}
private void updateWorkingSetScope() {
- if(workingSet != null) {
- List resources = IDE.computeSelectedResources(new StructuredSelection(workingSet.getElements()));
+ if(workingSets != null) {
+ for (int i = 0; i < workingSets.length; i++) {
+ IWorkingSet set = workingSets[i];
+ List resources = IDE.computeSelectedResources(new StructuredSelection(set.getElements()));
if(! resources.isEmpty()) {
IResource[] resources2 = (IResource[])resources.toArray(new IResource[resources.size()]);
scopeCheckingElement = true;
fViewer.setCheckedElements(resources2);
scopeCheckingElement = false;
intializeSelectionInViewer(resources2);
- setPageComplete(true);
}
+ }
+ setPageComplete(true);
} else {
scopeCheckingElement = true;
fViewer.setCheckedElements(new Object[0]);
@@ -415,10 +398,16 @@ public class GlobalRefreshResourceSelectionPage extends WizardPage {
}
private void updateWorkingSetLabel() {
- if (workingSet == null) {
+ if (workingSets == null) {
workingSetLabel.setText(Policy.bind("StatisticsPanel.noWorkingSet")); //$NON-NLS-1$
} else {
- workingSetLabel.setText(workingSet.getName());
+ StringBuffer buffer = new StringBuffer();
+ for (int i = 0; i < workingSets.length; i++) {
+ IWorkingSet set = workingSets[i];
+ if(i != 0) buffer.append(" ,"); //$NON-NLS-1$
+ buffer.append(set.getName());
+ }
+ workingSetLabel.setText(buffer.toString());
}
}
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberParticipantWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberParticipantWizard.java
index 35121d66a..871f03548 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberParticipantWizard.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberParticipantWizard.java
@@ -12,6 +12,7 @@ package org.eclipse.team.internal.ui.synchronize;
import org.eclipse.core.resources.IResource;
import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.team.internal.ui.Policy;
import org.eclipse.team.ui.*;
import org.eclipse.team.ui.synchronize.ISynchronizeParticipant;
import org.eclipse.team.ui.synchronize.ISynchronizeScope;
@@ -33,7 +34,7 @@ public abstract class SubscriberParticipantWizard extends Wizard {
* @see org.eclipse.jface.wizard.Wizard#getWindowTitle()
*/
public String getWindowTitle() {
- return "Create a " + getName() + " Synchronize Participant";
+ return Policy.bind("GlobalRefreshSubscriberPage.0"); //$NON-NLS-1$
}
/* (non-Javadoc)
@@ -41,8 +42,8 @@ public abstract class SubscriberParticipantWizard extends Wizard {
*/
public void addPages() {
selectionPage = new GlobalRefreshResourceSelectionPage(getRootResources());
- selectionPage.setTitle("Create");
- selectionPage.setMessage("Select the resources that will be synchronized by the newly created synchronize participant.");
+ selectionPage.setTitle(Policy.bind("GlobalRefreshSubscriberPage.1", getName())); //$NON-NLS-1$
+ selectionPage.setMessage(Policy.bind("GlobalRefreshSubscriberPage.2")); //$NON-NLS-1$
addPage(selectionPage);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveFromViewAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveFromViewAction.java
index 9a61475b9..6abdfc091 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveFromViewAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveFromViewAction.java
@@ -94,9 +94,9 @@ public class RemoveFromViewAction extends SynchronizeModelAction {
} else {
MessageDialogWithToggle dialog = MessageDialogWithToggle.openOkCancelConfirm(
getConfiguration().getSite().getShell(),
- "Confirm Remove",
- "The selected resources will be removed from the view. A resource will reappear if it is modified or if its synchronization state changes",
- "Don't show me this again",
+ Policy.bind("RemoveFromView.warningTitle"), //$NON-NLS-1$
+ Policy.bind("RemoveFromView.warningMessage"), //$NON-NLS-1$
+ Policy.bind("RemoveFromView.warningDontShow"), //$NON-NLS-1$
false,
null,
null);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java
index 12792a3cb..cbd664810 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java
@@ -94,8 +94,7 @@ public class RemoveSynchronizeParticipantAction extends Action {
ISynchronizeParticipant p;
try {
p = reference.getParticipant();
-
- if (p.isPinned())
+ if (! p.isPinned())
removals.add(p);
} catch (TeamException e) {
// keep going
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java
index 0b008e8f2..4f598fc68 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java
@@ -164,11 +164,11 @@ public class SynchronizePageDropDownAction extends Action implements IMenuCreato
ISynchronizeParticipant current = fView.getParticipant();
String text = null;
if(current != null) {
- text = "Synchronize " + current.getName();
+ text = Policy.bind("GlobalRefreshAction.4", current.getName()); //$NON-NLS-1$
setToolTipText(text);
setText(text);
} else {
- text = "Synchronize";
+ text = Policy.bind("GlobalRefreshAction.4"); //$NON-NLS-1$
setToolTipText(text);
setText(text);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java
index f7d45e1ac..747a1ced7 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java
@@ -13,9 +13,7 @@ package org.eclipse.team.ui.synchronize;
import java.util.Arrays;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.*;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.swt.widgets.Shell;
@@ -24,21 +22,10 @@ import org.eclipse.team.core.subscribers.Subscriber;
import org.eclipse.team.core.synchronize.SyncInfoFilter;
import org.eclipse.team.core.synchronize.SyncInfoTree;
import org.eclipse.team.internal.core.subscribers.SubscriberSyncInfoCollector;
-import org.eclipse.team.internal.ui.Policy;
-import org.eclipse.team.internal.ui.TeamUIPlugin;
-import org.eclipse.team.internal.ui.Utils;
-import org.eclipse.team.internal.ui.synchronize.IRefreshSubscriberListener;
-import org.eclipse.team.internal.ui.synchronize.RefreshSubscriberJob;
-import org.eclipse.team.internal.ui.synchronize.RefreshUserNotificationPolicy;
-import org.eclipse.team.internal.ui.synchronize.RefreshUserNotificationPolicyInModalDialog;
-import org.eclipse.team.internal.ui.synchronize.SubscriberParticipantPage;
-import org.eclipse.team.internal.ui.synchronize.SubscriberRefreshSchedule;
-import org.eclipse.team.internal.ui.synchronize.SynchronizePageConfiguration;
+import org.eclipse.team.internal.ui.*;
+import org.eclipse.team.internal.ui.synchronize.*;
import org.eclipse.team.ui.TeamUI;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchSite;
-import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.*;
import org.eclipse.ui.part.IPageBookViewPage;
/**
@@ -177,7 +164,7 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
*/
public String getName() {
String name = super.getName();
- return name + " (" + scope.getName() + ")";
+ return Policy.bind("SubscriberParticipant.namePattern", name, scope.getName()); //$NON-NLS-1$
}
/**
@@ -319,7 +306,7 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
* @return the short task name to show in the status line.
*/
protected String getShortTaskName() {
- return Policy.bind("Participant.synchronizing");
+ return Policy.bind("Participant.synchronizing"); //$NON-NLS-1$
}
/**
@@ -330,7 +317,7 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
* @return the short task name to show in the status line.
*/
protected String getLongTaskName() {
- return Policy.bind("Participant.synchronizing");
+ return Policy.bind("Participant.synchronizing"); //$NON-NLS-1$
}
/**
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelAction.java
index 70ec55d21..6080021a0 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelAction.java
@@ -238,7 +238,7 @@ public abstract class SynchronizeModelAction extends BaseSelectionListenerAction
final boolean[] result = new boolean[1];
result[0] = true;
- Platform.run(new SafeRunnable("Error") {
+ Platform.run(new SafeRunnable("Error") { //$NON-NLS-1$
public void run() {
IResource[] resources = Utils.getResources(getFilteredDiffElements());
if (resources.length == 0) return;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkingSetScope.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkingSetScope.java
index 7de7738b7..e438328b5 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkingSetScope.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkingSetScope.java
@@ -18,6 +18,7 @@ import java.util.List;
import org.eclipse.core.resources.IResource;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.team.internal.ui.Policy;
import org.eclipse.team.internal.ui.Utils;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.IWorkingSet;
@@ -66,7 +67,7 @@ public class WorkingSetScope extends AbstractSynchronizeScope implements IProper
*/
public String getName() {
if (sets.length == 0) {
- return "Workspace";
+ return Policy.bind("WorkingSetScope.0"); //$NON-NLS-1$
}
StringBuffer name = new StringBuffer();
for (int i = 0; i < sets.length; i++) {
@@ -91,7 +92,7 @@ public class WorkingSetScope extends AbstractSynchronizeScope implements IProper
IWorkingSet set = sets[i];
IResource[] resources = Utils.getResources(set.getElements());
addNonOverlapping(roots, resources);
- }
+ }
return (IResource[]) roots.toArray(new IResource[roots.size()]);
}
@@ -131,13 +132,13 @@ public class WorkingSetScope extends AbstractSynchronizeScope implements IProper
IWorkingSet newSet = (IWorkingSet)event.getNewValue();
for (int i = 0; i < sets.length; i++) {
IWorkingSet set = sets[i];
- if (newSet == set) {
- fireRootsChanges();
+ if (newSet == set) {
+ fireRootsChanges();
return;
- }
}
}
}
+ }
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.ScopableSubscriberParticipant.SubscriberScope#dispose()
@@ -173,9 +174,8 @@ public class WorkingSetScope extends AbstractSynchronizeScope implements IProper
IWorkingSet set = PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSet(setName);
if (set != null) {
sets.add(set);
- }
- }
- this.sets = (IWorkingSet[]) sets.toArray(new IWorkingSet[sets.size()]);
}
}
+ this.sets = (IWorkingSet[]) sets.toArray(new IWorkingSet[sets.size()]);
+} }
} \ No newline at end of file
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkspaceScope.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkspaceScope.java
index 882cf42ea..30fabebd3 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkspaceScope.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkspaceScope.java
@@ -11,6 +11,7 @@
package org.eclipse.team.ui.synchronize;
import org.eclipse.core.resources.IResource;
+import org.eclipse.team.internal.ui.Policy;
/**
* A synchronize scope whose roots are the workspace.
@@ -30,7 +31,7 @@ public class WorkspaceScope extends AbstractSynchronizeScope {
* @see org.eclipse.team.internal.ui.synchronize.ScopableSubscriberParticipant.ISynchronizeScope#getName()
*/
public String getName() {
- return "Workspace";
+ return Policy.bind("WorkspaceScope.0"); //$NON-NLS-1$
}
/* (non-Javadoc)

Back to the top