diff options
author | james | 2002-05-06 19:52:44 +0000 |
---|---|---|
committer | james | 2002-05-06 19:52:44 +0000 |
commit | 50f444750a1a0df3e4d66cde84d950bde2e82410 (patch) | |
tree | 13a919cfde29d14fb450db8fe8f411ffd84532dd | |
parent | 77ac53500fbc8a37038e9af03607fc92abddadf9 (diff) | |
download | eclipse.platform.team-50f444750a1a0df3e4d66cde84d950bde2e82410.tar.gz eclipse.platform.team-50f444750a1a0df3e4d66cde84d950bde2e82410.tar.xz eclipse.platform.team-50f444750a1a0df3e4d66cde84d950bde2e82410.zip |
Refactor sync view parts
27 files changed, 57 insertions, 82 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLocalCompareEditorInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLocalCompareEditorInput.java index eee0a059a..f38b90806 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLocalCompareEditorInput.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLocalCompareEditorInput.java @@ -18,7 +18,7 @@ import org.eclipse.team.internal.ccvs.core.resources.CVSRemoteSyncElement; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.util.Assert; import org.eclipse.team.internal.ccvs.ui.sync.CVSSyncCompareInput; -import org.eclipse.team.ui.sync.SyncView; +import org.eclipse.team.internal.ui.sync.SyncView; public class CVSLocalCompareEditorInput extends CVSSyncCompareInput { CVSTag[] tags; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java index c5013faf1..714bb3393 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java @@ -10,16 +10,13 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.team.core.RepositoryProvider; import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; import org.eclipse.team.internal.ccvs.core.CVSTag; import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; import org.eclipse.team.internal.ccvs.ui.CVSLocalCompareEditorInput; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.TagSelectionDialog; -import org.eclipse.team.ui.actions.TeamAction; public class CompareWithTagAction extends CVSAction { 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 1a742ce09..c9cf3da67 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 @@ -12,8 +12,7 @@ import org.eclipse.team.internal.ccvs.core.ICVSResource; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.sync.CVSSyncCompareInput; -import org.eclipse.team.ui.actions.TeamAction; -import org.eclipse.team.ui.sync.SyncView; +import org.eclipse.team.internal.ui.sync.SyncView; import org.eclipse.ui.PartInitException; /** diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeEditorInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeEditorInput.java index 8244650c0..bdb35a6d8 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeEditorInput.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeEditorInput.java @@ -5,8 +5,6 @@ package org.eclipse.team.internal.ccvs.ui.merge; * All Rights Reserved. */ -import java.lang.reflect.InvocationTargetException; - import org.eclipse.compare.structuremergeviewer.ICompareInput; import org.eclipse.compare.structuremergeviewer.IDiffContainer; import org.eclipse.compare.structuremergeviewer.IDiffElement; @@ -17,18 +15,15 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.sync.IRemoteResource; import org.eclipse.team.core.sync.IRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.CVSException; import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRunnable; -import org.eclipse.team.internal.ccvs.core.client.Session; import org.eclipse.team.internal.ccvs.core.resources.CVSRemoteSyncElement; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.resources.RemoteFile; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.sync.CVSSyncCompareInput; -import org.eclipse.team.ui.sync.MergeResource; -import org.eclipse.team.ui.sync.SyncView; -import org.eclipse.team.ui.sync.TeamFile; +import org.eclipse.team.internal.ui.sync.MergeResource; +import org.eclipse.team.internal.ui.sync.SyncView; +import org.eclipse.team.internal.ui.sync.TeamFile; public class MergeEditorInput extends CVSSyncCompareInput { CVSTag start; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/OverrideUpdateMergeAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/OverrideUpdateMergeAction.java index 8a3ec6ede..098f1a364 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/OverrideUpdateMergeAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/OverrideUpdateMergeAction.java @@ -9,8 +9,8 @@ import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.internal.ccvs.ui.sync.CVSSyncCompareInput; -import org.eclipse.team.ui.sync.ITeamNode; -import org.eclipse.team.ui.sync.SyncSet; +import org.eclipse.team.internal.ui.sync.ITeamNode; +import org.eclipse.team.internal.ui.sync.SyncSet; public class OverrideUpdateMergeAction extends UpdateMergeAction { public OverrideUpdateMergeAction(CVSSyncCompareInput model, ISelectionProvider sp, String label, Shell shell) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateMergeAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateMergeAction.java index d2ec1aeef..781ad44b3 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateMergeAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateMergeAction.java @@ -5,22 +5,17 @@ package org.eclipse.team.internal.ccvs.ui.merge; * All Rights Reserved. */ -import java.util.ArrayList; -import java.util.List; - import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.sync.IRemoteResource; -import org.eclipse.team.core.sync.RemoteSyncElement; import org.eclipse.team.internal.ccvs.core.CVSException; import org.eclipse.team.internal.ccvs.core.CVSTag; import org.eclipse.team.internal.ccvs.core.ICVSFolder; @@ -33,7 +28,7 @@ import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.RepositoryManager; import org.eclipse.team.internal.ccvs.ui.sync.CVSSyncCompareInput; import org.eclipse.team.internal.ccvs.ui.sync.UpdateSyncAction; -import org.eclipse.team.ui.sync.ITeamNode; +import org.eclipse.team.internal.ui.sync.ITeamNode; /* * To be done: diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateWithForcedJoinAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateWithForcedJoinAction.java index 48f6a2276..6dcbb2d66 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateWithForcedJoinAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateWithForcedJoinAction.java @@ -13,8 +13,8 @@ import org.eclipse.team.core.sync.IRemoteSyncElement; import org.eclipse.team.internal.ccvs.core.util.Assert; import org.eclipse.team.internal.ccvs.ui.RepositoryManager; import org.eclipse.team.internal.ccvs.ui.sync.CVSSyncCompareInput; -import org.eclipse.team.ui.sync.ITeamNode; -import org.eclipse.team.ui.sync.SyncSet; +import org.eclipse.team.internal.ui.sync.ITeamNode; +import org.eclipse.team.internal.ui.sync.SyncSet; /* * Used only in the merge editor. This action allows the user to select a single conflict and use diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java index 2565ef915..7918b6fc2 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java @@ -29,7 +29,6 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.graphics.Point; @@ -56,11 +55,11 @@ import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.merge.OverrideUpdateMergeAction; import org.eclipse.team.internal.ccvs.ui.merge.UpdateMergeAction; import org.eclipse.team.internal.ccvs.ui.merge.UpdateWithForcedJoinAction; -import org.eclipse.team.ui.sync.CatchupReleaseViewer; -import org.eclipse.team.ui.sync.ITeamNode; -import org.eclipse.team.ui.sync.MergeResource; -import org.eclipse.team.ui.sync.SyncView; -import org.eclipse.team.ui.sync.TeamFile; +import org.eclipse.team.internal.ui.sync.CatchupReleaseViewer; +import org.eclipse.team.internal.ui.sync.ITeamNode; +import org.eclipse.team.internal.ui.sync.MergeResource; +import org.eclipse.team.internal.ui.sync.SyncView; +import org.eclipse.team.internal.ui.sync.TeamFile; public class CVSCatchupReleaseViewer extends CatchupReleaseViewer { // Actions diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncCompareInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncCompareInput.java index ffbb61d43..54b3cf1b5 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncCompareInput.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncCompareInput.java @@ -28,10 +28,10 @@ import org.eclipse.team.internal.ccvs.ui.AvoidableMessageDialog; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.ui.sync.CatchupReleaseViewer; -import org.eclipse.team.ui.sync.ChangedTeamContainer; -import org.eclipse.team.ui.sync.SyncCompareInput; -import org.eclipse.team.ui.sync.TeamFile; +import org.eclipse.team.internal.ui.sync.CatchupReleaseViewer; +import org.eclipse.team.internal.ui.sync.ChangedTeamContainer; +import org.eclipse.team.internal.ui.sync.SyncCompareInput; +import org.eclipse.team.internal.ui.sync.TeamFile; public class CVSSyncCompareInput extends SyncCompareInput { private IResource[] resources; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CommitSyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CommitSyncAction.java index 53181ccd4..e740e4a23 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CommitSyncAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CommitSyncAction.java @@ -27,16 +27,15 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.sync.IRemoteSyncElement; import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.client.Command; import org.eclipse.team.internal.ccvs.core.resources.CVSRemoteSyncElement; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.RepositoryManager; -import org.eclipse.team.ui.sync.ChangedTeamContainer; -import org.eclipse.team.ui.sync.ITeamNode; -import org.eclipse.team.ui.sync.SyncSet; -import org.eclipse.team.ui.sync.TeamFile; +import org.eclipse.team.internal.ui.sync.ChangedTeamContainer; +import org.eclipse.team.internal.ui.sync.ITeamNode; +import org.eclipse.team.internal.ui.sync.SyncSet; +import org.eclipse.team.internal.ui.sync.TeamFile; public class CommitSyncAction extends MergeAction { public CommitSyncAction(CVSSyncCompareInput model, ISelectionProvider sp, String label, Shell shell) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceCommitSyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceCommitSyncAction.java index 0f7eba7bf..8631bdacb 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceCommitSyncAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceCommitSyncAction.java @@ -15,7 +15,6 @@ import java.util.Vector; import org.eclipse.compare.structuremergeviewer.Differencer; import org.eclipse.compare.structuremergeviewer.IDiffContainer; import org.eclipse.compare.structuremergeviewer.IDiffElement; -import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; @@ -27,18 +26,16 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.sync.IRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; import org.eclipse.team.internal.ccvs.core.resources.CVSRemoteSyncElement; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.RepositoryManager; -import org.eclipse.team.ui.sync.ChangedTeamContainer; -import org.eclipse.team.ui.sync.ITeamNode; -import org.eclipse.team.ui.sync.SyncSet; -import org.eclipse.team.ui.sync.SyncView; -import org.eclipse.team.ui.sync.TeamFile; +import org.eclipse.team.internal.ui.sync.ChangedTeamContainer; +import org.eclipse.team.internal.ui.sync.ITeamNode; +import org.eclipse.team.internal.ui.sync.SyncSet; +import org.eclipse.team.internal.ui.sync.SyncView; +import org.eclipse.team.internal.ui.sync.TeamFile; public class ForceCommitSyncAction extends MergeAction { public ForceCommitSyncAction(CVSSyncCompareInput model, ISelectionProvider sp, String label, Shell shell) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceUpdateSyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceUpdateSyncAction.java index 7b2d0deb9..569469c94 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceUpdateSyncAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceUpdateSyncAction.java @@ -19,7 +19,6 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.IDialogConstants; @@ -43,11 +42,11 @@ import org.eclipse.team.internal.ccvs.core.resources.CVSRemoteSyncElement; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.RepositoryManager; -import org.eclipse.team.ui.sync.ChangedTeamContainer; -import org.eclipse.team.ui.sync.ITeamNode; -import org.eclipse.team.ui.sync.SyncSet; -import org.eclipse.team.ui.sync.SyncView; -import org.eclipse.team.ui.sync.TeamFile; +import org.eclipse.team.internal.ui.sync.ChangedTeamContainer; +import org.eclipse.team.internal.ui.sync.ITeamNode; +import org.eclipse.team.internal.ui.sync.SyncSet; +import org.eclipse.team.internal.ui.sync.SyncView; +import org.eclipse.team.internal.ui.sync.TeamFile; /** * UpdateSyncAction is run on a set of sync nodes when the "Update" menu item is performed diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/IgnoreAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/IgnoreAction.java index 58a194a17..c71754001 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/IgnoreAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/IgnoreAction.java @@ -19,11 +19,11 @@ import org.eclipse.team.core.sync.IRemoteSyncElement; import org.eclipse.team.internal.ccvs.core.CVSException; import org.eclipse.team.internal.ccvs.core.ICVSResource; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.ui.sync.ChangedTeamContainer; -import org.eclipse.team.ui.sync.ITeamNode; -import org.eclipse.team.ui.sync.SyncSet; -import org.eclipse.team.ui.sync.TeamFile; -import org.eclipse.team.ui.sync.UnchangedTeamContainer; +import org.eclipse.team.internal.ui.sync.ChangedTeamContainer; +import org.eclipse.team.internal.ui.sync.ITeamNode; +import org.eclipse.team.internal.ui.sync.SyncSet; +import org.eclipse.team.internal.ui.sync.TeamFile; +import org.eclipse.team.internal.ui.sync.UnchangedTeamContainer; public class IgnoreAction extends Action { Shell shell; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/MergeAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/MergeAction.java index 3e2bda2bf..73a019319 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/MergeAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/MergeAction.java @@ -23,10 +23,10 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.ui.sync.ChangedTeamContainer; -import org.eclipse.team.ui.sync.ITeamNode; -import org.eclipse.team.ui.sync.SyncSet; -import org.eclipse.team.ui.sync.UnchangedTeamContainer; +import org.eclipse.team.internal.ui.sync.ChangedTeamContainer; +import org.eclipse.team.internal.ui.sync.ITeamNode; +import org.eclipse.team.internal.ui.sync.SyncSet; +import org.eclipse.team.internal.ui.sync.UnchangedTeamContainer; import org.eclipse.ui.actions.WorkspaceModifyOperation; /** diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/UpdateSyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/UpdateSyncAction.java index 4fb136aac..9724097a8 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/UpdateSyncAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/UpdateSyncAction.java @@ -19,7 +19,6 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.IDialogConstants; @@ -43,11 +42,9 @@ import org.eclipse.team.internal.ccvs.core.resources.CVSRemoteSyncElement; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.RepositoryManager; -import org.eclipse.team.ui.sync.ChangedTeamContainer; -import org.eclipse.team.ui.sync.ITeamNode; -import org.eclipse.team.ui.sync.SyncSet; -import org.eclipse.team.ui.sync.TeamFile; -import org.eclipse.team.ui.sync.UnchangedTeamContainer; +import org.eclipse.team.internal.ui.sync.ChangedTeamContainer; +import org.eclipse.team.internal.ui.sync.ITeamNode; +import org.eclipse.team.internal.ui.sync.SyncSet; /** * UpdateSyncAction is run on a set of sync nodes when the "Update" menu item is performed diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java index 8e7bd6563..c1f51efff 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java @@ -21,20 +21,18 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.sync.IRemoteResource; import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; import org.eclipse.team.internal.ccvs.core.ICVSFolder; import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; -import org.eclipse.team.internal.ccvs.ui.CVSDecorator; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.sync.CVSSyncCompareInput; +import org.eclipse.team.internal.ui.sync.SyncView; import org.eclipse.team.ui.IConfigurationWizard; -import org.eclipse.team.ui.sync.SyncView; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.PartInitException; diff --git a/bundles/org.eclipse.team.ui/plugin.xml b/bundles/org.eclipse.team.ui/plugin.xml index 57634d3a1..cab7bc46e 100644 --- a/bundles/org.eclipse.team.ui/plugin.xml +++ b/bundles/org.eclipse.team.ui/plugin.xml @@ -85,7 +85,7 @@ icon="icons/full/cview16/synch_synch.gif" name="Synchronize" category="org.eclipse.team.ui" - class="org.eclipse.team.ui.sync.SyncView"> + class="org.eclipse.team.internal.ui.sync.SyncView"> </view> </extension> diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/CatchupReleaseViewer.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/CatchupReleaseViewer.java index d7108effa..09ab74e54 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/CatchupReleaseViewer.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/CatchupReleaseViewer.java @@ -1,4 +1,4 @@ -package org.eclipse.team.ui.sync; +package org.eclipse.team.internal.ui.sync; /* * (c) Copyright IBM Corp. 2000, 2002. diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/ChangedTeamContainer.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/ChangedTeamContainer.java index 0d35f6e89..d2b40fa6e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/ChangedTeamContainer.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/ChangedTeamContainer.java @@ -1,4 +1,4 @@ -package org.eclipse.team.ui.sync; +package org.eclipse.team.internal.ui.sync; /* * (c) Copyright IBM Corp. 2000, 2002. diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/ITeamNode.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/ITeamNode.java index 583153159..0d438994b 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/ITeamNode.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/ITeamNode.java @@ -1,4 +1,4 @@ -package org.eclipse.team.ui.sync; +package org.eclipse.team.internal.ui.sync; /* * (c) Copyright IBM Corp. 2000, 2002. diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/MergeResource.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/MergeResource.java index 9d335e1a3..1e31d5a98 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/MergeResource.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/MergeResource.java @@ -1,4 +1,4 @@ -package org.eclipse.team.ui.sync; +package org.eclipse.team.internal.ui.sync; /* * (c) Copyright IBM Corp. 2000, 2002. diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/SyncCompareInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/SyncCompareInput.java index aff8ab516..915798d55 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/SyncCompareInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/SyncCompareInput.java @@ -1,4 +1,4 @@ -package org.eclipse.team.ui.sync; +package org.eclipse.team.internal.ui.sync; /* * (c) Copyright IBM Corp. 2000, 2002. diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/SyncSet.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/SyncSet.java index 240aa5103..b5c715874 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/SyncSet.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/SyncSet.java @@ -1,4 +1,4 @@ -package org.eclipse.team.ui.sync; +package org.eclipse.team.internal.ui.sync; /* * (c) Copyright IBM Corp. 2000, 2002. diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/SyncView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/SyncView.java index e740db35b..44aff9bf1 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/SyncView.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/SyncView.java @@ -1,4 +1,4 @@ -package org.eclipse.team.ui.sync; +package org.eclipse.team.internal.ui.sync; /* * (c) Copyright IBM Corp. 2000, 2002. diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/TeamFile.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/TeamFile.java index 30f29bbf4..35fd1c6e3 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/TeamFile.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/TeamFile.java @@ -1,4 +1,4 @@ -package org.eclipse.team.ui.sync; +package org.eclipse.team.internal.ui.sync; /* * (c) Copyright IBM Corp. 2000, 2002. diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/TypedBufferedContent.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/TypedBufferedContent.java index abca5e7fb..6c739f918 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/TypedBufferedContent.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/TypedBufferedContent.java @@ -1,4 +1,4 @@ -package org.eclipse.team.ui.sync; +package org.eclipse.team.internal.ui.sync; /* * (c) Copyright IBM Corp. 2000, 2002. diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/UnchangedTeamContainer.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/UnchangedTeamContainer.java index 5d42369a0..39ab24651 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/UnchangedTeamContainer.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/UnchangedTeamContainer.java @@ -1,4 +1,4 @@ -package org.eclipse.team.ui.sync; +package org.eclipse.team.internal.ui.sync; /* * (c) Copyright IBM Corp. 2000, 2002. |