Bug 163112 Show history brings two history views to the front

4 files changed, 12 insertions, 15 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AnnotateView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AnnotateView.java
index 1d22acebc..af313884a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AnnotateView.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AnnotateView.java
@@ -25,7 +25,7 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.*;
 import org.eclipse.team.internal.ccvs.core.*;
 import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
-import org.eclipse.team.internal.ui.history.GenericHistoryView;
+import org.eclipse.team.ui.TeamUI;
 import org.eclipse.team.ui.history.IHistoryPage;
 import org.eclipse.team.ui.history.IHistoryView;
 import org.eclipse.ui.*;
@@ -43,7 +43,7 @@ import org.eclipse.ui.texteditor.ITextEditor;
 public class AnnotateView extends ViewPart implements ISelectionChangedListener {
 
 	ITextEditor editor;
-	GenericHistoryView historyView;
+	IHistoryView historyView;
 	IWorkbenchPage page;
 
 	ListViewer viewer;
@@ -154,10 +154,8 @@ public class AnnotateView extends ViewPart implements ISelectionChangedListener
 			return;
 		}
 
-		// Get hook to the HistoryView
-				
-		historyView = (GenericHistoryView) page.showView(IHistoryView.VIEW_ID);
-		historyView.showHistoryFor((ICVSRemoteFile) CVSWorkspaceRoot.getRemoteResourceFor(cvsResource));
+		// Show the history in the history view
+		historyView = TeamUI.showHistoryFor(page, CVSWorkspaceRoot.getRemoteResourceFor(cvsResource));
 	}
 	
 	protected void disconnect() {
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 d854f15e1..8c49ef879 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
@@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.team.internal.ccvs.core.CVSException;
 import org.eclipse.team.internal.ccvs.core.ICVSResource;
 import org.eclipse.team.internal.ccvs.ui.*;
+import org.eclipse.team.internal.ui.TeamUIPlugin;
 import org.eclipse.team.ui.TeamUI;
 import org.eclipse.team.ui.history.*;
 
@@ -46,7 +47,8 @@ public class CompareWithRevisionAction extends WorkspaceAction {
 					IFile file = (IFile) getSelectedResources()[0];
 					showCompareInDialog(getShell(), file);
 				} else {
-					IHistoryPage page = TeamUI.getHistoryView().showHistoryFor((IFile)getSelectedResources()[0]);
+					IHistoryView view = TeamUI.showHistoryFor(TeamUIPlugin.getActivePage(), (IFile)getSelectedResources()[0]);
+					IHistoryPage page = view.getHistoryPage();
 					if (page instanceof CVSHistoryPage){
 						CVSHistoryPage cvsHistoryPage = (CVSHistoryPage) page;
 						cvsHistoryPage.setClickAction(true);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java
index eee9fc56c..3fea8940f 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java
@@ -20,8 +20,8 @@ import org.eclipse.team.internal.ccvs.core.CVSException;
 import org.eclipse.team.internal.ccvs.core.ICVSResource;
 import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
 import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
-import org.eclipse.team.internal.ui.history.GenericHistoryView;
-import org.eclipse.team.ui.history.IHistoryView;
+import org.eclipse.team.internal.ui.TeamUIPlugin;
+import org.eclipse.team.ui.TeamUI;
 
 public class ShowResourceInHistoryAction extends WorkspaceAction {
 	/*
@@ -32,10 +32,7 @@ public class ShowResourceInHistoryAction extends WorkspaceAction {
 			public void run(IProgressMonitor monitor) throws InvocationTargetException {
 				IResource[] resources = getSelectedResources();
 				if (resources.length != 1) return;
-				GenericHistoryView view = (GenericHistoryView)showView(IHistoryView.VIEW_ID);
-				if (view != null) {
-					view.itemDropped(resources[0],true);
-				}
+				TeamUI.showHistoryFor(TeamUIPlugin.getActivePage(), resources[0]);
 			}
 		}, false /* cancelable */, PROGRESS_BUSYCURSOR);
 	}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java
index 5c7cb859e..a8ed06f52 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java
@@ -39,6 +39,7 @@ import org.eclipse.team.internal.ccvs.ui.*;
 import org.eclipse.team.internal.ccvs.ui.Policy;
 import org.eclipse.team.internal.core.TeamPlugin;
 import org.eclipse.team.internal.ui.Utils;
+import org.eclipse.team.ui.TeamUI;
 import org.eclipse.team.ui.history.*;
 import org.eclipse.ui.*;
 import org.eclipse.ui.texteditor.AbstractDecoratedTextEditor;
@@ -125,8 +126,7 @@ public class ShowAnnotationOperation extends CVSOperation {
      * @throws PartInitException
      */
     private IHistoryView showHistoryView(IWorkbenchPage page) throws PartInitException {
-    	final IHistoryView historyView= (IHistoryView)page.showView(IHistoryView.VIEW_ID, null, IWorkbenchPage.VIEW_VISIBLE);
-    	historyView.showHistoryFor(fCVSResource.getIResource());
+    	IHistoryView historyView= TeamUI.showHistoryFor(page, fCVSResource.getIResource());
     	IHistoryPage historyPage = historyView.getHistoryPage();
     	if (historyPage instanceof CVSHistoryPage){
     		CVSHistoryPage cvsHistoryPage = (CVSHistoryPage) historyPage;