diff options
author | Michael Valenta | 2006-04-03 14:35:36 +0000 |
---|---|---|
committer | Michael Valenta | 2006-04-03 14:35:36 +0000 |
commit | d536c14bc4b1ddafcdaecd05186d40b6ad9e2311 (patch) | |
tree | 7285af67d17ced3a0c7aed7652c64cab0e05e52b /bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings | |
parent | 5d52e3f08a64c4d5618d86c59526dd4c49a19643 (diff) | |
download | eclipse.platform.team-d536c14bc4b1ddafcdaecd05186d40b6ad9e2311.tar.gz eclipse.platform.team-d536c14bc4b1ddafcdaecd05186d40b6ad9e2311.tar.xz eclipse.platform.team-d536c14bc4b1ddafcdaecd05186d40b6ad9e2311.zip |
Refactoring change set support
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings')
4 files changed, 10 insertions, 9 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java index 2b044d34e..04d4f5a4d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java @@ -371,7 +371,7 @@ public class ChangeSetActionProvider extends SynchronizationActionProvider { Utils.syncExec(runnable, ctrl); } - private SubscriberChangeSetCollector getActiveChangeSetManager() { + private ActiveChangeSetManager getActiveChangeSetManager() { return CVSUIPlugin.getPlugin().getChangeSetManager(); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java index 5ebe273d4..9a78846d2 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java @@ -24,7 +24,7 @@ import org.eclipse.team.core.mapping.ISynchronizationContext; import org.eclipse.team.core.mapping.provider.ResourceDiffTree; import org.eclipse.team.internal.ccvs.core.mapping.ChangeSetModelProvider; import org.eclipse.team.internal.core.subscribers.*; -import org.eclipse.team.internal.core.subscribers.BatchedChangeSetCollector.CollectorChangeEvent; +import org.eclipse.team.internal.core.subscribers.BatchingChangeSetManager.CollectorChangeEvent; import org.eclipse.team.internal.ui.Utils; import org.eclipse.team.internal.ui.mapping.ResourceModelContentProvider; import org.eclipse.team.internal.ui.synchronize.ChangeSetCapability; @@ -35,7 +35,7 @@ import org.eclipse.ui.navigator.ICommonContentExtensionSite; public class ChangeSetContentProvider extends ResourceModelContentProvider implements ITreePathContentProvider { - private final class CollectorListener implements IChangeSetChangeListener, BatchedChangeSetCollector.IChangeSetCollectorChangeListener { + private final class CollectorListener implements IChangeSetChangeListener, BatchingChangeSetManager.IChangeSetCollectorChangeListener { /* (non-Javadoc) * @see org.eclipse.team.internal.core.subscribers.IChangeSetChangeListener#setAdded(org.eclipse.team.internal.core.subscribers.ChangeSet) */ @@ -472,7 +472,7 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple List result = new ArrayList(); ChangeSetCapability csc = getChangeSetCapability(); if (csc.supportsActiveChangeSets()) { - SubscriberChangeSetCollector collector = csc.getActiveChangeSetManager(); + ActiveChangeSetManager collector = csc.getActiveChangeSetManager(); ChangeSet[] sets = collector.getSets(); for (int i = 0; i < sets.length; i++) { ChangeSet set = sets[i]; @@ -498,7 +498,7 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple super.init(site); ChangeSetCapability csc = getChangeSetCapability(); if (csc.supportsActiveChangeSets()) { - SubscriberChangeSetCollector collector = csc.getActiveChangeSetManager(); + ActiveChangeSetManager collector = csc.getActiveChangeSetManager(); collector.addListener(collectorListener); } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CheckedInChangeSetCollector.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CheckedInChangeSetCollector.java index e67599e1b..f76261932 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CheckedInChangeSetCollector.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CheckedInChangeSetCollector.java @@ -38,7 +38,7 @@ import org.eclipse.team.internal.ui.Utils; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; import org.eclipse.team.ui.synchronize.SynchronizePageActionGroup; -public class CheckedInChangeSetCollector extends BatchedChangeSetCollector implements ILogsFetchedListener { +public class CheckedInChangeSetCollector extends BatchingChangeSetManager implements ILogsFetchedListener { /* * Constant used to store the log entry handler in the configuration so it can diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceChangeSetCapability.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceChangeSetCapability.java index ef455b69d..1aca894b9 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceChangeSetCapability.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceChangeSetCapability.java @@ -18,10 +18,11 @@ import org.eclipse.jface.window.Window; import org.eclipse.team.core.diff.IDiff; import org.eclipse.team.core.mapping.provider.ResourceDiffTree; import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.ui.*; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; +import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.subscriber.CommitSetDialog; import org.eclipse.team.internal.core.subscribers.ActiveChangeSet; -import org.eclipse.team.internal.core.subscribers.SubscriberChangeSetCollector; +import org.eclipse.team.internal.core.subscribers.ActiveChangeSetManager; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; public class WorkspaceChangeSetCapability extends ModelParticipantChangeSetCapability { @@ -79,7 +80,7 @@ public class WorkspaceChangeSetCapability extends ModelParticipantChangeSetCapab /* (non-Javadoc) * @see org.eclipse.team.ui.synchronize.ChangeSetCapability#getActiveChangeSetManager() */ - public SubscriberChangeSetCollector getActiveChangeSetManager() { + public ActiveChangeSetManager getActiveChangeSetManager() { return CVSUIPlugin.getPlugin().getChangeSetManager(); } |