diff options
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java')
-rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java | 364 |
1 files changed, 182 insertions, 182 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java index a9b59a959..65839d020 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java @@ -66,103 +66,103 @@ import org.eclipse.ui.actions.BaseSelectionListenerAction; */ public class ChangeSetActionGroup extends SynchronizePageActionGroup { - /** - * Menu group that can be added to the context menu - */ - public final static String CHANGE_SET_GROUP = "change_set_group"; //$NON-NLS-1$ + /** + * Menu group that can be added to the context menu + */ + public final static String CHANGE_SET_GROUP = "change_set_group"; //$NON-NLS-1$ // Constants for persisting sorting options private static final String P_LAST_COMMENTSORT = TeamUIPlugin.ID + ".P_LAST_COMMENT_SORT"; //$NON-NLS-1$ - public static final FastSyncInfoFilter OUTGOING_RESOURCE_FILTER = new SyncInfoDirectionFilter( - new int[] { SyncInfo.OUTGOING, SyncInfo.CONFLICTING }); + public static final FastSyncInfoFilter OUTGOING_RESOURCE_FILTER = new SyncInfoDirectionFilter( + new int[] { SyncInfo.OUTGOING, SyncInfo.CONFLICTING }); private class CreateChangeSetAction extends SynchronizeModelAction { - public CreateChangeSetAction(ISynchronizePageConfiguration configuration) { - super(TeamUIMessages.ChangeLogModelProvider_0, configuration); - } + public CreateChangeSetAction(ISynchronizePageConfiguration configuration) { + super(TeamUIMessages.ChangeLogModelProvider_0, configuration); + } @Override protected boolean needsToSaveDirtyEditors() { return false; } - @Override + @Override protected FastSyncInfoFilter getSyncInfoFilter() { - return OUTGOING_RESOURCE_FILTER; - } + return OUTGOING_RESOURCE_FILTER; + } - @Override + @Override protected SynchronizeModelOperation getSubscriberOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements) { - return new SynchronizeModelOperation(configuration, elements) { - @Override + return new SynchronizeModelOperation(configuration, elements) { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - syncExec(() -> { - ActiveChangeSet set = createChangeSet(getDiffs(getSyncInfoSet().getResources())); - if (set != null) { - getActiveChangeSetManager().add(set); - } + syncExec(() -> { + ActiveChangeSet set = createChangeSet(getDiffs(getSyncInfoSet().getResources())); + if (set != null) { + getActiveChangeSetManager().add(set); + } }); - } - }; - } + } + }; + } } private abstract class ChangeSetAction extends BaseSelectionListenerAction { - public ChangeSetAction(String title, ISynchronizePageConfiguration configuration) { - super(title); - } + public ChangeSetAction(String title, ISynchronizePageConfiguration configuration) { + super(title); + } - @Override + @Override protected boolean updateSelection(IStructuredSelection selection) { - return getSelectedSet() != null; - } - - protected ActiveChangeSet getSelectedSet() { - IStructuredSelection selection = getStructuredSelection(); - if (selection.size() == 1) { - Object first = selection.getFirstElement(); - if (first instanceof IAdaptable) { - Object adapter = ((IAdaptable)first).getAdapter(ChangeSet.class); - if (adapter instanceof ActiveChangeSet) { - return (ActiveChangeSet)adapter; - } - } - } - return null; - } + return getSelectedSet() != null; + } + + protected ActiveChangeSet getSelectedSet() { + IStructuredSelection selection = getStructuredSelection(); + if (selection.size() == 1) { + Object first = selection.getFirstElement(); + if (first instanceof IAdaptable) { + Object adapter = ((IAdaptable)first).getAdapter(ChangeSet.class); + if (adapter instanceof ActiveChangeSet) { + return (ActiveChangeSet)adapter; + } + } + } + return null; + } } private class EditChangeSetAction extends ChangeSetAction { - public EditChangeSetAction(ISynchronizePageConfiguration configuration) { - super(TeamUIMessages.ChangeLogModelProvider_6, configuration); - } + public EditChangeSetAction(ISynchronizePageConfiguration configuration) { + super(TeamUIMessages.ChangeLogModelProvider_6, configuration); + } - @Override + @Override public void run() { - ActiveChangeSet set = getSelectedSet(); - if (set == null) return; - editChangeSet(set); - } + ActiveChangeSet set = getSelectedSet(); + if (set == null) return; + editChangeSet(set); + } } private class RemoveChangeSetAction extends ChangeSetAction { - public RemoveChangeSetAction(ISynchronizePageConfiguration configuration) { - super(TeamUIMessages.ChangeLogModelProvider_7, configuration); - } + public RemoveChangeSetAction(ISynchronizePageConfiguration configuration) { + super(TeamUIMessages.ChangeLogModelProvider_7, configuration); + } - @Override + @Override public void run() { - ActiveChangeSet set = getSelectedSet(); - if (set == null) return; - if (MessageDialog.openConfirm(getConfiguration().getSite().getShell(), TeamUIMessages.ChangeSetActionGroup_0, NLS.bind(TeamUIMessages.ChangeSetActionGroup_1, new String[] { LegacyActionTools.escapeMnemonics(set.getTitle()) }))) { // - getActiveChangeSetManager().remove(set); - } - } + ActiveChangeSet set = getSelectedSet(); + if (set == null) return; + if (MessageDialog.openConfirm(getConfiguration().getSite().getShell(), TeamUIMessages.ChangeSetActionGroup_0, NLS.bind(TeamUIMessages.ChangeSetActionGroup_1, new String[] { LegacyActionTools.escapeMnemonics(set.getTitle()) }))) { // + getActiveChangeSetManager().remove(set); + } + } } private class MakeDefaultChangeSetAction extends ChangeSetAction { @@ -198,44 +198,44 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup { private class AddToChangeSetAction extends SynchronizeModelAction { - private final ActiveChangeSet set; + private final ActiveChangeSet set; - public AddToChangeSetAction(ISynchronizePageConfiguration configuration, ActiveChangeSet set, ISelection selection) { - super(set == null ? TeamUIMessages.ChangeSetActionGroup_2 : LegacyActionTools.escapeMnemonics(set.getTitle()), configuration); - this.set = set; - selectionChanged(selection); - } + public AddToChangeSetAction(ISynchronizePageConfiguration configuration, ActiveChangeSet set, ISelection selection) { + super(set == null ? TeamUIMessages.ChangeSetActionGroup_2 : LegacyActionTools.escapeMnemonics(set.getTitle()), configuration); + this.set = set; + selectionChanged(selection); + } - @Override + @Override protected FastSyncInfoFilter getSyncInfoFilter() { - return OUTGOING_RESOURCE_FILTER; - } + return OUTGOING_RESOURCE_FILTER; + } @Override protected boolean needsToSaveDirtyEditors() { return false; } - @Override + @Override protected SynchronizeModelOperation getSubscriberOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements) { - return new SynchronizeModelOperation(configuration, elements) { - @Override + return new SynchronizeModelOperation(configuration, elements) { + @Override public void run(IProgressMonitor monitor) - throws InvocationTargetException, InterruptedException { - IResource[] resources = getSyncInfoSet().getResources(); - if (set != null) { - IDiff[] diffArray = getDiffs(resources); + throws InvocationTargetException, InterruptedException { + IResource[] resources = getSyncInfoSet().getResources(); + if (set != null) { + IDiff[] diffArray = getDiffs(resources); set.add(diffArray); - } else { - ChangeSet[] sets = getActiveChangeSetManager().getSets(); - for (int i = 0; i < sets.length; i++) { - ActiveChangeSet activeSet = (ActiveChangeSet)sets[i]; + } else { + ChangeSet[] sets = getActiveChangeSetManager().getSets(); + for (int i = 0; i < sets.length; i++) { + ActiveChangeSet activeSet = (ActiveChangeSet)sets[i]; activeSet.remove(resources); - } - } - } - }; - } + } + } + } + }; + } } /* ***************************************************************************** @@ -252,7 +252,7 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup { @Override public void run() { if (isChecked() && sortCriteria != criteria) { - sortCriteria = criteria; + sortCriteria = criteria; String key = getSettingsKey(); IDialogSettings pageSettings = getConfiguration().getSite().getPageSettings(); if(pageSettings != null) { @@ -264,11 +264,11 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup { } public void update() { - setChecked(criteria == sortCriteria); + setChecked(criteria == sortCriteria); } protected String getSettingsKey() { - return P_LAST_COMMENTSORT; + return P_LAST_COMMENTSORT; } } @@ -283,19 +283,19 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup { private MenuManager sortByComment; private CreateChangeSetAction createChangeSet; private MenuManager addToChangeSet; - private EditChangeSetAction editChangeSet; - private RemoveChangeSetAction removeChangeSet; - private MakeDefaultChangeSetAction makeDefault; + private EditChangeSetAction editChangeSet; + private RemoveChangeSetAction removeChangeSet; + private MakeDefaultChangeSetAction makeDefault; - private SynchronizePageActionGroup subActions; + private SynchronizePageActionGroup subActions; - /* - * The currently chosen sort criteria - */ - private int sortCriteria = ChangeSetModelSorter.DATE; + /* + * The currently chosen sort criteria + */ + private int sortCriteria = ChangeSetModelSorter.DATE; - public static int getSortCriteria(ISynchronizePageConfiguration configuration) { - int sortCriteria = ChangeSetModelSorter.DATE; + public static int getSortCriteria(ISynchronizePageConfiguration configuration) { + int sortCriteria = ChangeSetModelSorter.DATE; try { IDialogSettings pageSettings = configuration.getSite().getPageSettings(); if(pageSettings != null) { @@ -305,27 +305,27 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup { // ignore and use the defaults. } switch (sortCriteria) { - case ChangeSetModelSorter.COMMENT: - case ChangeSetModelSorter.DATE: - case ChangeSetModelSorter.USER: - break; - default: - sortCriteria = ChangeSetModelSorter.DATE; - break; - } + case ChangeSetModelSorter.COMMENT: + case ChangeSetModelSorter.DATE: + case ChangeSetModelSorter.USER: + break; + default: + sortCriteria = ChangeSetModelSorter.DATE; + break; + } return sortCriteria; - } + } - public ChangeSetActionGroup(ChangeSetModelProvider provider) { - this.provider = provider; - } + public ChangeSetActionGroup(ChangeSetModelProvider provider) { + this.provider = provider; + } @Override public void initialize(ISynchronizePageConfiguration configuration) { super.initialize(configuration); if (getChangeSetCapability().supportsCheckedInChangeSets()) { - sortCriteria = getSortCriteria(configuration); + sortCriteria = getSortCriteria(configuration); sortByComment = new MenuManager(TeamUIMessages.ChangeLogModelProvider_0a); sortByComment.add(new ToggleSortOrderAction(TeamUIMessages.ChangeLogModelProvider_1a, ChangeSetModelSorter.COMMENT)); sortByComment.add(new ToggleSortOrderAction(TeamUIMessages.ChangeLogModelProvider_2a, ChangeSetModelSorter.DATE)); @@ -346,16 +346,16 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup { subActions = getChangeSetCapability().getActionGroup(); if (subActions != null) { - subActions.initialize(configuration); + subActions.initialize(configuration); } } - @Override + @Override public void fillContextMenu(IMenuManager menu) { - if (getChangeSetCapability().enableCheckedInChangeSetsFor(getConfiguration())) { - appendToGroup(menu, ISynchronizePageConfiguration.SORT_GROUP, sortByComment); - } - if (getChangeSetCapability().enableActiveChangeSetsFor(getConfiguration())) { + if (getChangeSetCapability().enableCheckedInChangeSetsFor(getConfiguration())) { + appendToGroup(menu, ISynchronizePageConfiguration.SORT_GROUP, sortByComment); + } + if (getChangeSetCapability().enableActiveChangeSetsFor(getConfiguration())) { appendToGroup( menu, CHANGE_SET_GROUP, @@ -372,102 +372,102 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup { menu, CHANGE_SET_GROUP, makeDefault); - } + } if (subActions != null) { - subActions.fillContextMenu(menu); + subActions.fillContextMenu(menu); } - } + } - protected void addChangeSets(IMenuManager manager) { - ChangeSet[] sets = getActiveChangeSetManager().getSets(); - Arrays.sort(sets, new Comparator<ChangeSet>() { - private Collator collator = Collator.getInstance(); - @Override + protected void addChangeSets(IMenuManager manager) { + ChangeSet[] sets = getActiveChangeSetManager().getSets(); + Arrays.sort(sets, new Comparator<ChangeSet>() { + private Collator collator = Collator.getInstance(); + @Override public int compare(ChangeSet o1, ChangeSet o2) { - return collator.compare(o1.getName(), o2.getName()); - } - }); - ISelection selection = getContext().getSelection(); - createChangeSet.selectionChanged(selection); + return collator.compare(o1.getName(), o2.getName()); + } + }); + ISelection selection = getContext().getSelection(); + createChangeSet.selectionChanged(selection); addToChangeSet.add(createChangeSet); addToChangeSet.add(new Separator()); - for (int i = 0; i < sets.length; i++) { - ActiveChangeSet set = (ActiveChangeSet)sets[i]; - AddToChangeSetAction action = new AddToChangeSetAction(getConfiguration(), set, selection); - manager.add(action); - } - addToChangeSet.add(new Separator()); - // Action that removes change set resources - addToChangeSet.add(new AddToChangeSetAction(getConfiguration(), null, selection)); - } - - /** - * Return the change set manager for the current page. - * @return the change set manager for the current page - */ - protected ActiveChangeSetManager getActiveChangeSetManager() { - return getChangeSetCapability().getActiveChangeSetManager(); - } + for (int i = 0; i < sets.length; i++) { + ActiveChangeSet set = (ActiveChangeSet)sets[i]; + AddToChangeSetAction action = new AddToChangeSetAction(getConfiguration(), set, selection); + manager.add(action); + } + addToChangeSet.add(new Separator()); + // Action that removes change set resources + addToChangeSet.add(new AddToChangeSetAction(getConfiguration(), null, selection)); + } + + /** + * Return the change set manager for the current page. + * @return the change set manager for the current page + */ + protected ActiveChangeSetManager getActiveChangeSetManager() { + return getChangeSetCapability().getActiveChangeSetManager(); + } @Override public void dispose() { - if (addToChangeSet != null) { + if (addToChangeSet != null) { addToChangeSet.dispose(); addToChangeSet.removeAll(); - } - if (sortByComment != null) { + } + if (sortByComment != null) { sortByComment.dispose(); sortByComment.removeAll(); - } - if (subActions != null) { - subActions.dispose(); - } + } + if (subActions != null) { + subActions.dispose(); + } super.dispose(); } - @Override + @Override public void updateActionBars() { - if (editChangeSet != null) - editChangeSet.selectionChanged((IStructuredSelection)getContext().getSelection()); - if (removeChangeSet != null) - removeChangeSet.selectionChanged((IStructuredSelection)getContext().getSelection()); - if (makeDefault != null) - makeDefault.selectionChanged((IStructuredSelection)getContext().getSelection()); - super.updateActionBars(); - } - - private void syncExec(final Runnable runnable) { + if (editChangeSet != null) + editChangeSet.selectionChanged((IStructuredSelection)getContext().getSelection()); + if (removeChangeSet != null) + removeChangeSet.selectionChanged((IStructuredSelection)getContext().getSelection()); + if (makeDefault != null) + makeDefault.selectionChanged((IStructuredSelection)getContext().getSelection()); + super.updateActionBars(); + } + + private void syncExec(final Runnable runnable) { final Control ctrl = getConfiguration().getPage().getViewer().getControl(); if (ctrl != null && !ctrl.isDisposed()) { ctrl.getDisplay().syncExec(() -> { if (!ctrl.isDisposed()) { - runnable.run(); + runnable.run(); } }); } - } + } - /** - * Return a viewer sorter that utilizes the sort criteria - * selected by the user. - * @return a sorter - */ + /** + * Return a viewer sorter that utilizes the sort criteria + * selected by the user. + * @return a sorter + */ public ViewerSorter getViewerSorter() { return new ChangeSetModelSorter(provider, sortCriteria); } - private ActiveChangeSet createChangeSet(IDiff[] diffs) { - return getChangeSetCapability().createChangeSet(getConfiguration(), diffs); - } + private ActiveChangeSet createChangeSet(IDiff[] diffs) { + return getChangeSetCapability().createChangeSet(getConfiguration(), diffs); + } - private void editChangeSet(ActiveChangeSet set) { - getChangeSetCapability().editChangeSet(getConfiguration(), set); - } + private void editChangeSet(ActiveChangeSet set) { + getChangeSetCapability().editChangeSet(getConfiguration(), set); + } - private ChangeSetCapability getChangeSetCapability() { - return provider.getChangeSetCapability(); - } + private ChangeSetCapability getChangeSetCapability() { + return provider.getChangeSetCapability(); + } private IDiff[] getDiffs(IResource[] resources) { List<IDiff> diffs = new ArrayList<>(); |