Systemtap: Allow refresh & syncing to filesystem.

Change STPDocumentProvider's superclass from SimpleDocumentProvider
to TextFileDocumentProvider, to make use of the latter's resource-
syncing methods.

Also change the contributor class of the STP Editor so that
pressing F5 will refresh the the active editor's target file.

Change-Id: Id2d6efefdf100e1c962ec8d7fff43a77867d3fc0
Signed-off-by: Andrew Ferrazzutti <aferrazz@redhat.com>
Reviewed-on: https://git.eclipse.org/r/19596
Tested-by: Hudson CI
Reviewed-by: Sami Wagiaalla <swagiaal@redhat.com>
IP-Clean: Sami Wagiaalla <swagiaal@redhat.com>
Tested-by: Sami Wagiaalla <swagiaal@redhat.com>

5 files changed, 19 insertions, 22 deletions

diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPCompletionProcessorTest.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPCompletionProcessorTest.java
index 9a9de08627..fbdcc8c304 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPCompletionProcessorTest.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPCompletionProcessorTest.java
@@ -44,7 +44,6 @@ public class STPCompletionProcessorTest extends SystemtapTest{
 			this.setupDocument(document);
 		}
 
-		@Override
 		protected IDocument createDocument(Object element) {
 			return document;
 		}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPIndenterTest.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPIndenterTest.java
index daca30cc3f..43667254c8 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPIndenterTest.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPIndenterTest.java
@@ -40,17 +40,9 @@ import org.osgi.framework.BundleReference;
 public class STPIndenterTest extends TestCase {
 
 	private static class MockSTPDocumentProvider extends STPDocumentProvider{
-		private IDocument document;
-
 		MockSTPDocumentProvider(IDocument document){
-			this.document = document;
 			this.setupDocument(document);
 		}
-
-		@Override
-		protected IDocument createDocument(Object element) {
-			return document;
-		}
 	}
 
     /**
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPToggleCommentTest.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPToggleCommentTest.java
index bd21333734..a9a8d2007e 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPToggleCommentTest.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPToggleCommentTest.java
@@ -60,12 +60,11 @@ public class STPToggleCommentTest {
 			this.setupDocument(document);
 		}
 
-		@Override
-		protected IDocument createDocument(Object element) {
+		private IDocument createDocument(Object element) {
 			return document;
 		}
 	}
-	
+
 	@Test
 	public void getFirstCompleteLineOfRegionTest() {
 		IRegion scriptRegion;
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml
index e18337135f..fc650c9ef6 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml
@@ -93,13 +93,13 @@
 	<extension
 		point="org.eclipse.ui.editors">
 		<editor
-        class="org.eclipse.linuxtools.internal.systemtap.ui.ide.editors.stp.STPEditor"
-        contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
-        default="true"
-        extensions="stp"
-        icon="icons/views/page_obj.gif"
-        id="org.eclipse.linuxtools.internal.systemtap.ui.ide.editors.stp.STPEditor"
-        name="%editor.stp.name"/>
+	        class="org.eclipse.linuxtools.internal.systemtap.ui.ide.editors.stp.STPEditor"
+	        contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
+	        default="true"
+	        extensions="stp"
+	        icon="icons/views/page_obj.gif"
+	        id="org.eclipse.linuxtools.internal.systemtap.ui.ide.editors.stp.STPEditor"
+	        name="%editor.stp.name"/>
 		<editor
 			name="%editor.simple.name"
 			id="org.eclipse.linuxtools.systemtap.ui.editor.SimpleEditor"
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPDocumentProvider.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPDocumentProvider.java
index 868f7829f3..1e7feb9970 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPDocumentProvider.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPDocumentProvider.java
@@ -12,17 +12,24 @@
 
 package org.eclipse.linuxtools.internal.systemtap.ui.ide.editors.stp;
 
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentExtension3;
 import org.eclipse.jface.text.IDocumentPartitioner;
 import org.eclipse.jface.text.rules.FastPartitioner;
 import org.eclipse.jface.text.source.AnnotationModel;
 import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.linuxtools.systemtap.ui.editor.SimpleDocumentProvider;
+import org.eclipse.ui.editors.text.TextFileDocumentProvider;
 
-public class STPDocumentProvider extends SimpleDocumentProvider {
+public class STPDocumentProvider extends TextFileDocumentProvider {
 
 	@Override
+	public void connect(Object element) throws CoreException {
+		super.connect(element);
+		setupDocument(this.getDocument(element));
+	}
+
 	protected void setupDocument(IDocument document) {
 		if (document != null) {
 			IDocumentPartitioner partitioner = new FastPartitioner(
@@ -40,7 +47,7 @@ public class STPDocumentProvider extends SimpleDocumentProvider {
 	 * Instantiates and returns a new AnnotationModel object.
 	 */
 	@Override
-	protected IAnnotationModel createAnnotationModel(Object element) {
+	protected IAnnotationModel createAnnotationModel(IFile file) {
 		return new AnnotationModel();
 	}