Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2003-07-24 11:25:42 -0400
committerJean Michel-Lemieux2003-07-24 11:25:42 -0400
commit1d77e09dc1f44cf0e8c624b08bad3bfc2a0511bd (patch)
tree18734a828046f0dd760708013ce90d522b74ae47
parenta7c21049d5e7c8dd8ca50519d05c99c5f7398358 (diff)
downloadeclipse.platform.team-1d77e09dc1f44cf0e8c624b08bad3bfc2a0511bd.tar.gz
eclipse.platform.team-1d77e09dc1f44cf0e8c624b08bad3bfc2a0511bd.tar.xz
eclipse.platform.team-1d77e09dc1f44cf0e8c624b08bad3bfc2a0511bd.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/SyncViewerActions.java36
2 files changed, 22 insertions, 17 deletions
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 91fedb8ed..d76b21eb4 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
@@ -103,7 +103,7 @@ LiveSyncView.titleChangeNumbersNoWorkingSet=mode matched {0} of {1} changes
LiveSyncView.titleWithSubscriber={0} ({1}) - {2}
SubscriberEventHandler.jobName=Updating synchronization state
-SubscriberEventHandler.errors=Errors have occured while calculating the synchronization state. The Synchronize View may be out-of-date.
+SubscriberEventHandler.errors=Errors have occured while calculating the synchronization state. The Synchronize View may be out-of-date. Refresh the view or fix the errors and re-run the Synchronize command.
SyncInfoCompareInput.localLabel=Local File
SyncInfoCompareInput.remoteLabel=Remote File
@@ -379,6 +379,7 @@ action.cancelSubscriber.label=Cancel
action.selectNextChange.label=Select Next Change
action.selectPreviousChange.label=Select Previous Change
action.syncViewPreferences.label=Preferences...
+action.refreshViewContents.label=Refresh View Contents
action.changeFilterShowAdditions.label=Show Additions
action.changeFilterShowDeletions.label=Show Deletions
action.changeFilterShowChanges.label=Show Changes
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/SyncViewerActions.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/SyncViewerActions.java
index ce6b359af..da15d5841 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/SyncViewerActions.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/SyncViewerActions.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.team.internal.ui.sync.actions;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.Separator;
@@ -22,11 +22,6 @@ import org.eclipse.team.internal.ui.Utils;
import org.eclipse.team.internal.ui.sync.sets.SubscriberInput;
import org.eclipse.team.internal.ui.sync.views.INavigableControl;
import org.eclipse.team.internal.ui.sync.views.SynchronizeView;
-import org.eclipse.team.ui.sync.AndSyncInfoFilter;
-import org.eclipse.team.ui.sync.PseudoConflictFilter;
-import org.eclipse.team.ui.sync.SyncInfoChangeTypeFilter;
-import org.eclipse.team.ui.sync.SyncInfoDirectionFilter;
-import org.eclipse.team.ui.sync.SyncInfoFilter;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IKeyBindingService;
import org.eclipse.ui.IMemento;
@@ -60,6 +55,7 @@ public class SyncViewerActions extends SyncViewerActionGroup {
private Action refreshSelectionAction;
private Action toggleViewerType;
private Action open;
+ private Action refreshViewContents;
private ExpandAllAction expandAll;
private SelectAllAction selectAllAction;
@@ -102,20 +98,11 @@ public class SyncViewerActions extends SyncViewerActionGroup {
selectAllAction = new SelectAllAction(getSyncView());
getSyncView().getViewSite().getActionBars().setGlobalActionHandler(ITextEditorActionConstants.SELECT_ALL, selectAllAction);
-
-
- Action a= new Action() {
- public void run() {
- getSyncView().collapseAll();
- }
- };
- Utils.initAction(a, "action.collapseAll."); //$NON-NLS-1$
-
expandAll = new ExpandAllAction(this);
IKeyBindingService kbs = getSyncView().getSite().getKeyBindingService();
- a= new Action() {
+ IAction a= new Action() {
public void run() {
getSyncView().gotoDifference(INavigableControl.NEXT);
}
@@ -140,6 +127,21 @@ public class SyncViewerActions extends SyncViewerActionGroup {
};
Utils.initAction(collapseAll, "action.collapseAll."); //$NON-NLS-1$
+ refreshViewContents = new Action() {
+ public void run() {
+ SubscriberInput input = getSyncView().getInput();
+ if(input != null) {
+ try {
+ input.reset();
+ } catch (TeamException e) {
+ Utils.handle(e);
+ }
+ }
+ }
+ };
+ Utils.initAction(refreshViewContents, "action.refreshViewContents."); //$NON-NLS-1$
+
+
toggleViewerType = new ToggleViewAction(getSyncView(), getSyncView().getCurrentViewType());
open = new OpenInCompareAction(syncView);
@@ -181,6 +183,8 @@ public class SyncViewerActions extends SyncViewerActionGroup {
IMenuManager dropDownMenu = actionBars.getMenuManager();
workingSetGroup.fillActionBars(actionBars);
+ dropDownMenu.add(refreshViewContents);
+ dropDownMenu.add(new Separator());
dropDownMenu.add(new SyncViewerShowPreferencesAction(getSyncView().getSite().getShell()));
}

Back to the top