瀏覽代碼

Bugfix: when extending sct editor and using fileextensions ending with 'sct'

Andreas Mülder 13 年之前
父節點
當前提交
9682c255b3

+ 1 - 1
plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/editparts/PlugableExternalXtextLabelEditPart.java

@@ -60,7 +60,7 @@ public abstract class PlugableExternalXtextLabelEditPart extends
 	private void init(SemanticTarget target) {
 		IExpressionLanguageProvider registeredProvider = ExpressionLanguageProviderExtensions
 				.getRegisteredProvider(target, resolveSemanticElement()
-						.eResource().getURI().lastSegment());
+						.eResource().getURI().fileExtension());
 		injector = registeredProvider.getInjector();
 	}
 

+ 1 - 1
plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/editparts/PlugableXtextLabelEditPart.java

@@ -59,7 +59,7 @@ public abstract class PlugableXtextLabelEditPart extends XtextLabelEditPart
 	private void init(SemanticTarget target) {
 		IExpressionLanguageProvider registeredProvider = ExpressionLanguageProviderExtensions
 				.getRegisteredProvider(target, resolveSemanticElement()
-						.eResource().getURI().lastSegment());
+						.eResource().getURI().fileExtension());
 		injector = registeredProvider.getInjector();
 	}
 

+ 1 - 1
plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/extensions/ExpressionLanguageProviderExtensions.java

@@ -58,7 +58,7 @@ public class ExpressionLanguageProviderExtensions {
 				String registeredExtension = configurationElement
 						.getAttribute(ATTR_RESOURCE_EXTENSION);
 				if (SemanticTarget.valueOf(semanticTarget) == target
-						&& resourceExtension.endsWith(registeredExtension)) {
+						&& resourceExtension.equals(registeredExtension)) {
 					
 					String key = target.name()+configurationElement.getNamespaceIdentifier();
 					if (providerMap.get(key)!=null) {

+ 1 - 1
plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/propertysheets/AbstractEditorPropertySection.java

@@ -143,7 +143,7 @@ public abstract class AbstractEditorPropertySection extends
 	protected Injector getInjector(SemanticTarget semanticTarget) {
 		IExpressionLanguageProvider registeredProvider = ExpressionLanguageProviderExtensions
 				.getRegisteredProvider(semanticTarget,
-						getActiveEditorResource().getURI().lastSegment());
+						getActiveEditorResource().getURI().fileExtension());
 		return registeredProvider.getInjector();
 	}