Reduce coupling by using PlatformUI helper class.

Activator.getDefault is not supposed to be the way to find the active
page.

7 files changed, 34 insertions, 37 deletions

diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/AScannerTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/AScannerTest.java
index 0197f11522..c15429cde9 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/AScannerTest.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/AScannerTest.java
@@ -13,9 +13,10 @@ package org.eclipse.linuxtools.rpm.ui.editor.tests;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.RuleBasedScanner;
-import org.eclipse.linuxtools.rpm.ui.editor.Activator;
 import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
 import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
 import org.junit.Before;
 
 public abstract class AScannerTest extends FileTestCase {
@@ -34,9 +35,8 @@ public abstract class AScannerTest extends FileTestCase {
 		super.setUp();
 		newFile(getContents());
 		testProject.refresh();
-		IEditorPart openEditor = org.eclipse.ui.ide.IDE.openEditor(Activator
-				.getDefault().getWorkbench().getActiveWorkbenchWindow()
-				.getActivePage(), testFile,
+		IEditorPart openEditor = IDE.openEditor(PlatformUI.getWorkbench()
+				.getActiveWorkbenchWindow().getActivePage(), testFile,
 				"org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor");
 		editor = (SpecfileEditor) openEditor;
 		editor.doRevertToSaved();
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmPackageProposalsListTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmPackageProposalsListTest.java
index ee3f922f22..699810cd65 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmPackageProposalsListTest.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmPackageProposalsListTest.java
@@ -18,10 +18,10 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
+import org.eclipse.linuxtools.internal.rpm.ui.editor.RpmPackageProposalsList;
 import org.eclipse.linuxtools.internal.rpm.ui.editor.preferences.PreferenceConstants;
 import org.eclipse.linuxtools.rpm.core.utils.Utils;
 import org.eclipse.linuxtools.rpm.ui.editor.Activator;
-import org.eclipse.linuxtools.rpm.ui.editor.RpmPackageProposalsList;
 
 public class RpmPackageProposalsListTest extends TestCase {
 
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/SpecfileChangelogFormatterTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/SpecfileChangelogFormatterTest.java
index bec51131c2..98b8a78730 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/SpecfileChangelogFormatterTest.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/SpecfileChangelogFormatterTest.java
@@ -17,9 +17,9 @@ import java.util.Date;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.linuxtools.internal.rpm.ui.editor.actions.SpecfileChangelogFormatter;
-import org.eclipse.linuxtools.rpm.ui.editor.Activator;
 import org.eclipse.linuxtools.rpm.ui.editor.tests.FileTestCase;
 import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.IDE;
 import org.junit.Before;
 import org.junit.Test;
@@ -36,7 +36,7 @@ public class SpecfileChangelogFormatterTest extends FileTestCase {
 	public void setUp() throws CoreException {
 		super.setUp();
 		newFile("%changelog");
-		editor = IDE.openEditor(Activator.getDefault().getWorkbench()
+		editor = IDE.openEditor(PlatformUI.getWorkbench()
 				.getActiveWorkbenchWindow().getActivePage(), testFile,
 				"org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor");
 		formatter = new SpecfileChangelogFormatter();
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/MailHyperlinkDetectorTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/MailHyperlinkDetectorTest.java
index 7013ea9ddf..ec6aca211e 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/MailHyperlinkDetectorTest.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/MailHyperlinkDetectorTest.java
@@ -19,11 +19,11 @@ import org.eclipse.jface.text.Region;
 import org.eclipse.jface.text.hyperlink.IHyperlink;
 import org.eclipse.linuxtools.internal.rpm.ui.editor.hyperlink.MailHyperlink;
 import org.eclipse.linuxtools.internal.rpm.ui.editor.hyperlink.MailHyperlinkDetector;
-import org.eclipse.linuxtools.rpm.ui.editor.Activator;
 import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
 import org.eclipse.linuxtools.rpm.ui.editor.tests.FileTestCase;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.IDE;
 import org.junit.Test;
 
@@ -36,10 +36,9 @@ public class MailHyperlinkDetectorTest extends FileTestCase {
 				+ "* Fri Feb 27 2009 Test someone@smth.com 3.3.2.4-6\n-\n";
 		newFile(testText);
 
-		IEditorPart openEditor = IDE
-				.openEditor(Activator.getDefault().getWorkbench()
-						.getActiveWorkbenchWindow().getActivePage(), testFile,
-						"org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor");
+		IEditorPart openEditor = IDE.openEditor(PlatformUI.getWorkbench()
+				.getActiveWorkbenchWindow().getActivePage(), testFile,
+				"org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor");
 
 		editor = (SpecfileEditor) openEditor;
 		editor.doRevertToSaved();
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/SourcesFileHyperlinkDetectorTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/SourcesFileHyperlinkDetectorTest.java
index 272fb5763a..7bb7b5df7f 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/SourcesFileHyperlinkDetectorTest.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/SourcesFileHyperlinkDetectorTest.java
@@ -18,11 +18,11 @@ import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.Region;
 import org.eclipse.jface.text.hyperlink.IHyperlink;
 import org.eclipse.linuxtools.internal.rpm.ui.editor.hyperlink.SourcesFileHyperlinkDetector;
-import org.eclipse.linuxtools.rpm.ui.editor.Activator;
 import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
 import org.eclipse.linuxtools.rpm.ui.editor.tests.FileTestCase;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.IDE;
 import org.junit.Before;
 import org.junit.Test;
@@ -38,10 +38,9 @@ public class SourcesFileHyperlinkDetectorTest extends FileTestCase {
 		String testText = "Source0: test.zip\n";
 		newFile(testText);
 
-		IEditorPart openEditor = IDE
-				.openEditor(Activator.getDefault().getWorkbench()
-						.getActiveWorkbenchWindow().getActivePage(), testFile,
-						"org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor");
+		IEditorPart openEditor = IDE.openEditor(PlatformUI.getWorkbench()
+				.getActiveWorkbenchWindow().getActivePage(), testFile,
+				"org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor");
 
 		editor = (SpecfileEditor) openEditor;
 		editor.doRevertToSaved();
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/SpecfileElementHyperlinkDetectorTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/SpecfileElementHyperlinkDetectorTest.java
index 376d7f4d34..c85a43fb4d 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/SpecfileElementHyperlinkDetectorTest.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/SpecfileElementHyperlinkDetectorTest.java
@@ -19,13 +19,13 @@ import org.eclipse.jface.text.Region;
 import org.eclipse.jface.text.hyperlink.IHyperlink;
 import org.eclipse.linuxtools.internal.rpm.ui.editor.hyperlink.SpecfileElementHyperlink;
 import org.eclipse.linuxtools.internal.rpm.ui.editor.hyperlink.SpecfileElementHyperlinkDetector;
-import org.eclipse.linuxtools.rpm.ui.editor.Activator;
 import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
 import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileDefine;
 import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSource;
 import org.eclipse.linuxtools.rpm.ui.editor.tests.FileTestCase;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.IDE;
 import org.junit.Test;
 
@@ -39,17 +39,16 @@ public class SpecfileElementHyperlinkDetectorTest extends FileTestCase {
 		SpecfileElementHyperlinkDetector elementDetector = new SpecfileElementHyperlinkDetector();
 		elementDetector.setSpecfile(specfile);
 
-		IEditorPart openEditor = IDE
-				.openEditor(Activator.getDefault().getWorkbench()
-						.getActiveWorkbenchWindow().getActivePage(), testFile,
-						"org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor");
+		IEditorPart openEditor = IDE.openEditor(PlatformUI.getWorkbench()
+				.getActiveWorkbenchWindow().getActivePage(), testFile,
+				"org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor");
 
 		editor = (SpecfileEditor) openEditor;
 		editor.doRevertToSaved();
 		// test source element
 		IRegion region = new Region(74, 0);
-		IHyperlink[] returned = elementDetector.detectHyperlinks(editor
-				.getSpecfileSourceViewer(), region, false);
+		IHyperlink[] returned = elementDetector.detectHyperlinks(
+				editor.getSpecfileSourceViewer(), region, false);
 		SpecfileElementHyperlink element = (SpecfileElementHyperlink) returned[0];
 		assertTrue(element.getSource() instanceof SpecfileSource);
 		SpecfileSource source = (SpecfileSource) element.getSource();
@@ -58,8 +57,8 @@ public class SpecfileElementHyperlinkDetectorTest extends FileTestCase {
 
 		// test patch element
 		region = new Region(83, 0);
-		returned = elementDetector.detectHyperlinks(editor
-				.getSpecfileSourceViewer(), region, false);
+		returned = elementDetector.detectHyperlinks(
+				editor.getSpecfileSourceViewer(), region, false);
 		element = (SpecfileElementHyperlink) returned[0];
 		assertTrue(element.getSource() instanceof SpecfileSource);
 		source = (SpecfileSource) element.getSource();
@@ -68,20 +67,21 @@ public class SpecfileElementHyperlinkDetectorTest extends FileTestCase {
 
 		// test define
 		region = new Region(89, 0);
-		returned = elementDetector.detectHyperlinks(editor
-				.getSpecfileSourceViewer(), region, false);
+		returned = elementDetector.detectHyperlinks(
+				editor.getSpecfileSourceViewer(), region, false);
 		element = (SpecfileElementHyperlink) returned[0];
 		assertTrue(element.getSource() instanceof SpecfileDefine);
 		SpecfileDefine define = (SpecfileDefine) element.getSource();
 		assertEquals(define.getName(), "smth");
 		assertEquals(define.getStringValue(), "other");
 	}
-	
+
 	@Test
 	public void testDetectHyperlinksNoRegionAndTextViewer() {
 		SpecfileElementHyperlinkDetector elementDetector = new SpecfileElementHyperlinkDetector();
 		elementDetector.setSpecfile(specfile);
-		IHyperlink[] returned = elementDetector.detectHyperlinks(null, null, false);
+		IHyperlink[] returned = elementDetector.detectHyperlinks(null, null,
+				false);
 		assertNull(returned);
 	}
 }
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/URLHyperlinkWithMacroDetectorTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/URLHyperlinkWithMacroDetectorTest.java
index 8d3fd3fb75..7a1796790d 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/URLHyperlinkWithMacroDetectorTest.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/URLHyperlinkWithMacroDetectorTest.java
@@ -17,11 +17,11 @@ import org.eclipse.jface.text.Region;
 import org.eclipse.jface.text.hyperlink.IHyperlink;
 import org.eclipse.jface.text.hyperlink.URLHyperlink;
 import org.eclipse.linuxtools.internal.rpm.ui.editor.hyperlink.URLHyperlinkWithMacroDetector;
-import org.eclipse.linuxtools.rpm.ui.editor.Activator;
 import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
 import org.eclipse.linuxtools.rpm.ui.editor.tests.FileTestCase;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.IDE;
 import org.junit.Test;
 
@@ -34,15 +34,14 @@ public class URLHyperlinkWithMacroDetectorTest extends FileTestCase {
 		URLHyperlinkWithMacroDetector macroDetector = new URLHyperlinkWithMacroDetector();
 		macroDetector.setSpecfile(specfile);
 		IRegion region = new Region(20, 0);
-		IEditorPart openEditor = IDE
-				.openEditor(Activator.getDefault().getWorkbench()
-						.getActiveWorkbenchWindow().getActivePage(), testFile,
-						"org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor");
+		IEditorPart openEditor = IDE.openEditor(PlatformUI.getWorkbench()
+				.getActiveWorkbenchWindow().getActivePage(), testFile,
+				"org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor");
 
 		editor = (SpecfileEditor) openEditor;
 		editor.doRevertToSaved();
-		IHyperlink[] returned = macroDetector.detectHyperlinks(editor
-				.getSpecfileSourceViewer(), region, false);
+		IHyperlink[] returned = macroDetector.detectHyperlinks(
+				editor.getSpecfileSourceViewer(), region, false);
 		URLHyperlink url = (URLHyperlink) returned[0];
 		assertEquals("http://www.eclipse.org/", url.getURLString());
 	}