Browse Source

Moved binding for SCTFileEditorOpener to executable extension factory in order to fix hyperlink from SGen model to statechart.

Thomas Kutz 9 years ago
parent
commit
6dc1f6fd0e

+ 2 - 1
plugins/org.yakindu.sct.model.resource/META-INF/MANIFEST.MF

@@ -14,7 +14,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.xtext.ui.shared,
  org.yakindu.sct.model.sgraph.ui,
  org.yakindu.sct.model.stext.ui,
- org.yakindu.sct.model.stext
+ org.yakindu.sct.model.stext,
+ org.yakindu.sct.ui.editor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: org.yakindu.sct.model.resource,

+ 4 - 0
plugins/org.yakindu.sct.model.resource/src/org/yakindu/sct/model/resource/SCTExecutableExtensionFactory.java

@@ -13,6 +13,8 @@ import org.eclipse.xtext.Constants;
 import org.eclipse.xtext.naming.IQualifiedNameProvider;
 import org.eclipse.xtext.parser.IEncodingProvider;
 import org.eclipse.xtext.resource.IDefaultResourceDescriptionStrategy;
+import org.eclipse.xtext.ui.LanguageSpecific;
+import org.eclipse.xtext.ui.editor.IURIEditorOpener;
 import org.eclipse.xtext.ui.editor.validation.MarkerCreator;
 import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;
 import org.eclipse.xtext.ui.label.DefaultDescriptionLabelProvider;
@@ -26,6 +28,7 @@ import org.yakindu.sct.model.sgraph.ui.validation.SCTDiagnosticConverterImpl;
 import org.yakindu.sct.model.sgraph.ui.validation.SCTMarkerCreator;
 import org.yakindu.sct.model.sgraph.ui.validation.SCTMarkerTypeProvider;
 import org.yakindu.sct.model.stext.naming.StextNameProvider;
+import org.yakindu.sct.ui.editor.editor.SCTFileEditorOpener;
 
 import com.google.inject.Binder;
 import com.google.inject.Guice;
@@ -64,6 +67,7 @@ public class SCTExecutableExtensionFactory extends AbstractGuiceAwareExecutableE
 				binder.bind(MarkerCreator.class).to(SCTMarkerCreator.class);
 				binder.bind(MarkerTypeProvider.class).to(SCTMarkerTypeProvider.class);
 				binder.bind(IDiagnosticConverter.class).to(SCTDiagnosticConverterImpl.class);
+				binder.bind(IURIEditorOpener.class).annotatedWith(LanguageSpecific.class).to(SCTFileEditorOpener.class);
 			}
 		});
 	}

+ 0 - 8
plugins/org.yakindu.sct.model.stext.ui/src/org/yakindu/sct/model/stext/ui/STextUiModule.java

@@ -13,8 +13,6 @@ package org.yakindu.sct.model.stext.ui;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.xtext.documentation.IEObjectDocumentationProvider;
 import org.eclipse.xtext.tasks.ITaskFinder;
-import org.eclipse.xtext.ui.LanguageSpecific;
-import org.eclipse.xtext.ui.editor.IURIEditorOpener;
 import org.eclipse.xtext.ui.editor.contentassist.antlr.ParserBasedContentAssistContextFactory.StatefulFactory;
 import org.eclipse.xtext.ui.editor.hover.DispatchingEObjectTextHover;
 import org.eclipse.xtext.ui.editor.hover.IEObjectHover;
@@ -34,7 +32,6 @@ import org.yakindu.sct.model.stext.ui.help.CustomCSSHelpHoverProvider;
 import org.yakindu.sct.model.stext.ui.help.STextUserHelpDocumentationProvider;
 import org.yakindu.sct.model.stext.ui.highlighting.SCTHighlightingConfiguration;
 import org.yakindu.sct.model.stext.ui.tasks.STextTaskFinder;
-import org.yakindu.sct.ui.editor.editor.SCTFileEditorOpener;
 
 import com.google.inject.Binder;
 import com.google.inject.name.Names;
@@ -115,9 +112,4 @@ public class STextUiModule extends org.yakindu.sct.model.stext.ui.AbstractSTextU
 		return STextTaskFinder.class;
 	}
 
-	@Override
-	public void configureLanguageSpecificURIEditorOpener(com.google.inject.Binder binder) {
-		binder.bind(IURIEditorOpener.class).annotatedWith(LanguageSpecific.class).to(SCTFileEditorOpener.class);
-	}
-
 }