Remove unnecessary PerfProfileView reference in PerfPlugin.

Change-Id: Iecc4f1ae636c36e03e4cfad20ec5263b04486e47
Reviewed-on: https://git.eclipse.org/r/14278
Tested-by: Hudson CI
Reviewed-by: Camilo Bernal <cabernal@redhat.com>
IP-Clean: Camilo Bernal <cabernal@redhat.com>
Tested-by: Camilo Bernal <cabernal@redhat.com>

5 files changed, 33 insertions, 32 deletions

diff --git a/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/ModelTest.java b/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/ModelTest.java
index fb76197847..f0124699e1 100644
--- a/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/ModelTest.java
+++ b/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/ModelTest.java
@@ -39,7 +39,10 @@ import org.eclipse.linuxtools.internal.perf.model.PMFile;
 import org.eclipse.linuxtools.internal.perf.model.PMSymbol;
 import org.eclipse.linuxtools.internal.perf.model.TreeParent;
 import org.eclipse.linuxtools.internal.perf.ui.PerfDoubleClickAction;
+import org.eclipse.linuxtools.internal.perf.ui.PerfProfileView;
 import org.eclipse.linuxtools.profiling.tests.AbstractTest;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
 import org.osgi.framework.FrameworkUtil;
 
 public class ModelTest extends AbstractTest {
@@ -119,15 +122,22 @@ public class ModelTest extends AbstractTest {
 		int numOfParents = getNumberOfParents(invisibleRoot) - 1;
 
 		// create a double click action to act on the tree viewer
-		TreeViewer tv = PerfPlugin.getDefault().getProfileView().getTreeViewer();
-		PerfDoubleClickAction dblClick = new PerfDoubleClickAction(tv);
-
-		// double click every element
-		doubleClickAllChildren(invisibleRoot, tv, dblClick);
-
-		// If all elements are expanded, this is the number of elements
-		// in our model that have children.
-		assertEquals(numOfParents, tv.getExpandedElements().length);
+		try {
+			PerfProfileView view = (PerfProfileView) PlatformUI.getWorkbench()
+					.getActiveWorkbenchWindow().getActivePage()
+					.showView(PerfPlugin.VIEW_ID);
+			TreeViewer tv = view.getTreeViewer();
+			PerfDoubleClickAction dblClick = new PerfDoubleClickAction(tv);
+
+			// double click every element
+			doubleClickAllChildren(invisibleRoot, tv, dblClick);
+
+			// If all elements are expanded, this is the number of elements
+			// in our model that have children.
+			assertEquals(numOfParents, tv.getExpandedElements().length);
+		} catch (PartInitException e) {
+			fail("Failed to open the Profiling View.");
+		}
 	}
 
 	public void testParserMultiEvent() {
diff --git a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
index cc6be2d8bc..468db9b197 100644
--- a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
+++ b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
@@ -678,8 +678,9 @@ public class PerfCore {
 			@Override
 			public void run() {
 				try {
-					PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(PerfPlugin.VIEW_ID);
-					PerfProfileView view = PerfPlugin.getDefault().getProfileView();
+					PerfProfileView view = (PerfProfileView) PlatformUI
+							.getWorkbench().getActiveWorkbenchWindow()
+							.getActivePage().showView(PerfPlugin.VIEW_ID);
 					view.setContentDescription(title);
 					view.refreshModel();
 				} catch (PartInitException e) {
diff --git a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfPlugin.java b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfPlugin.java
index 8083ab33a6..7a666f269c 100644
--- a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfPlugin.java
+++ b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfPlugin.java
@@ -124,9 +124,6 @@ public class PerfPlugin extends AbstractUIPlugin {
 	// Stat Data
 	private IPerfData statData;
 
-	// Profile view
-	private PerfProfileView _ProfileView = null;
-
 	// Current profile data
 	private IPath curProfileData;
 
@@ -224,21 +221,6 @@ public class PerfPlugin extends AbstractUIPlugin {
 	public void setWorkingDir(IPath workingDir){
 		curWorkingDir = workingDir;
 	}
-
-	public PerfProfileView getProfileView() {
-		if (_ProfileView == null) {
-			try {
-				PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(PerfPlugin.VIEW_ID);
-			} catch (PartInitException e2) {
-				e2.printStackTrace();
-			}
-		}
-		return _ProfileView;
-	}
-
-	public void setProfileView(PerfProfileView profileView) {
-		this._ProfileView = profileView;
-	}
 	
 	/* Basic cache access methods. */
 
diff --git a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/handlers/PerfSaveSessionHandler.java b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/handlers/PerfSaveSessionHandler.java
index 5e729efa95..9d5e00c91e 100644
--- a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/handlers/PerfSaveSessionHandler.java
+++ b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/handlers/PerfSaveSessionHandler.java
@@ -14,6 +14,9 @@ import java.io.File;
 import java.io.IOException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.linuxtools.internal.perf.PerfPlugin;
+import org.eclipse.linuxtools.internal.perf.ui.PerfProfileView;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
 
 /**
  * Handler for saving a perf profile session.
@@ -38,8 +41,14 @@ public class PerfSaveSessionHandler extends AbstractSaveDataHandler {
 				newDataFile.createNewFile();
 				copyFile(defaultDataFile, newDataFile);
 				PerfPlugin.getDefault().setPerfProfileData(newDataLoc);
-				PerfPlugin.getDefault().getProfileView()
-						.setContentDescription(newDataLoc.toOSString());
+				try {
+					PerfProfileView view = (PerfProfileView) PlatformUI
+							.getWorkbench().getActiveWorkbenchWindow()
+							.getActivePage().showView(PerfPlugin.VIEW_ID);
+					view.setContentDescription(newDataLoc.toOSString());
+				} catch (PartInitException e) {
+					// fail silently
+				}
 
 				return newDataFile;
 			} catch (IOException e) {
diff --git a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/ui/PerfProfileView.java b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/ui/PerfProfileView.java
index 6757ca0f9b..0b9672c5e9 100644
--- a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/ui/PerfProfileView.java
+++ b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/ui/PerfProfileView.java
@@ -70,7 +70,6 @@ public class PerfProfileView extends ViewPart {
 		hookContextMenu();
 		hookDoubleClickAction();
 		contributeToActionBars();
-		PerfPlugin.getDefault().setProfileView(this);
 	}
 	
 	public void refreshModel() {