removed deprecated API

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/editor/StatechartDiagramEditor.java

@@ -36,10 +36,10 @@ import org.eclipse.ui.help.IWorkbenchHelpSystem;
 import org.eclipse.ui.ide.IGotoMarker;
 import org.eclipse.xtext.ui.XtextProjectHelper;
 import org.yakindu.sct.model.sgraph.SGraphPackage;
+import org.yakindu.sct.model.sgraph.Statechart;
 import org.yakindu.sct.ui.editor.DiagramActivator;
 import org.yakindu.sct.ui.editor.editor.proposals.ContentProposalViewerKeyHandler;
 import org.yakindu.sct.ui.editor.extensions.ExpressionLanguageProviderExtensions;
-import org.yakindu.sct.ui.editor.extensions.ExpressionLanguageProviderExtensions.SemanticTarget;
 import org.yakindu.sct.ui.editor.extensions.IExpressionLanguageProvider;
 import org.yakindu.sct.ui.editor.partitioning.DiagramPartitioningEditor;
 import org.yakindu.sct.ui.editor.partitioning.DiagramPartitioningUtil;
@@ -106,8 +106,8 @@ public class StatechartDiagramEditor extends DiagramPartitioningEditor implement
 		final IFile file = ((IFileEditorInput) getEditorInput()).getFile();
 		validationJob = new SCTValidationJob();
 		validationJob.setResource(getDiagram().eResource());
-		IExpressionLanguageProvider registeredProvider = ExpressionLanguageProviderExtensions.getRegisteredProvider(
-				SemanticTarget.StatechartSpecification, file.getFileExtension());
+		IExpressionLanguageProvider registeredProvider = ExpressionLanguageProviderExtensions.getLanguageProvider(
+				Statechart.class.getName(), file.getFileExtension());
 		Injector injector = registeredProvider.getInjector();
 		injector.injectMembers(validationJob);
 		validationJob.setRule(file);
@@ -197,9 +197,4 @@ public class StatechartDiagramEditor extends DiagramPartitioningEditor implement
 		}
 		super.dispose();
 	}
-
-	public SCTValidationJob getValidationJob() {
-		return validationJob;
-	}
-
 }

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

@@ -25,7 +25,6 @@ import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.yakindu.sct.model.sgraph.SpecificationElement;
 import org.yakindu.sct.ui.editor.DiagramActivator;
 import org.yakindu.sct.ui.editor.extensions.ExpressionLanguageProviderExtensions;
-import org.yakindu.sct.ui.editor.extensions.ExpressionLanguageProviderExtensions.SemanticTarget;
 import org.yakindu.sct.ui.editor.extensions.IExpressionLanguageProvider;
 import org.yakindu.sct.ui.editor.policies.EAttributeDirectEditPolicy;
 
@@ -51,7 +50,7 @@ public abstract class PlugableExternalXtextLabelEditPart extends ExternalXtextLa
 
 	protected abstract int getEditorStyles();
 
-	public PlugableExternalXtextLabelEditPart(View view, SemanticTarget target) {
+	public PlugableExternalXtextLabelEditPart(View view, String target) {
 		super(view);
 		init(target);
 	}
@@ -68,8 +67,8 @@ public abstract class PlugableExternalXtextLabelEditPart extends ExternalXtextLa
 		super.removeNotationalListeners();
 	}
 
-	private void init(SemanticTarget target) {
-		IExpressionLanguageProvider registeredProvider = ExpressionLanguageProviderExtensions.getRegisteredProvider(
+	private void init(String target) {
+		IExpressionLanguageProvider registeredProvider = ExpressionLanguageProviderExtensions.getLanguageProvider(
 				target, resolveSemanticElement().eResource().getURI().fileExtension());
 		injector = registeredProvider.getInjector();
 	}

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

@@ -25,7 +25,6 @@ import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.yakindu.sct.model.sgraph.SpecificationElement;
 import org.yakindu.sct.ui.editor.DiagramActivator;
 import org.yakindu.sct.ui.editor.extensions.ExpressionLanguageProviderExtensions;
-import org.yakindu.sct.ui.editor.extensions.ExpressionLanguageProviderExtensions.SemanticTarget;
 import org.yakindu.sct.ui.editor.extensions.IExpressionLanguageProvider;
 import org.yakindu.sct.ui.editor.policies.EAttributeDirectEditPolicy;
 
@@ -51,7 +50,7 @@ public abstract class PlugableXtextLabelEditPart extends XtextLabelEditPart impl
 
 	protected abstract int getEditorStyles();
 
-	public PlugableXtextLabelEditPart(View view, SemanticTarget target) {
+	public PlugableXtextLabelEditPart(View view, String target) {
 		super(view);
 		init(target);
 	}
@@ -68,8 +67,8 @@ public abstract class PlugableXtextLabelEditPart extends XtextLabelEditPart impl
 		super.removeNotationalListeners();
 	}
 
-	private void init(SemanticTarget target) {
-		IExpressionLanguageProvider registeredProvider = ExpressionLanguageProviderExtensions.getRegisteredProvider(
+	private void init(String target) {
+		IExpressionLanguageProvider registeredProvider = ExpressionLanguageProviderExtensions.getLanguageProvider(
 				target, resolveSemanticElement().eResource().getURI().fileExtension());
 		injector = registeredProvider.getInjector();
 	}

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/editparts/SpecificationElementEditPart.java

@@ -24,7 +24,6 @@ import org.eclipse.gmf.runtime.notation.StringValueStyle;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
-import org.yakindu.sct.ui.editor.extensions.ExpressionLanguageProviderExtensions.SemanticTarget;
 import org.yakindu.sct.ui.editor.utils.GMFNotationUtil;
 
 /**
@@ -57,7 +56,7 @@ public abstract class SpecificationElementEditPart extends PlugableXtextLabelEdi
 		}
 	}
 
-	public SpecificationElementEditPart(View view, SemanticTarget target) {
+	public SpecificationElementEditPart(View view, String target) {
 		super(view, target);
 	}
 

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/editparts/StateTextCompartmentExpressionEditPart.java

@@ -13,7 +13,7 @@ package org.yakindu.sct.ui.editor.editparts;
 import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.swt.SWT;
-import org.yakindu.sct.ui.editor.extensions.ExpressionLanguageProviderExtensions.SemanticTarget;
+import org.yakindu.sct.model.sgraph.State;
 import org.yakindu.sct.ui.editor.policies.ContextSensitiveHelpPolicy;
 import org.yakindu.sct.ui.editor.utils.HelpContextIds;
 
@@ -27,7 +27,7 @@ import de.itemis.xtext.utils.gmf.directedit.IXtextAwareEditPart;
 public class StateTextCompartmentExpressionEditPart extends SpecificationElementEditPart implements IXtextAwareEditPart {
 
 	public StateTextCompartmentExpressionEditPart(View view) {
-		super(view, SemanticTarget.StateSpecification);
+		super(view, State.class.getName());
 	}
 
 	@Override

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/editparts/StatechartTextExpressionEditPart.java

@@ -19,7 +19,7 @@ import org.eclipse.gef.editpolicies.RootComponentEditPolicy;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.swt.SWT;
-import org.yakindu.sct.ui.editor.extensions.ExpressionLanguageProviderExtensions.SemanticTarget;
+import org.yakindu.sct.model.sgraph.Statechart;
 import org.yakindu.sct.ui.editor.policies.ContextSensitiveHelpPolicy;
 import org.yakindu.sct.ui.editor.utils.HelpContextIds;
 
@@ -31,9 +31,9 @@ import org.yakindu.sct.ui.editor.utils.HelpContextIds;
 public class StatechartTextExpressionEditPart extends SpecificationElementEditPart {
 
 	public StatechartTextExpressionEditPart(View view) {
-		super(view, SemanticTarget.StatechartSpecification);
+		super(view, Statechart.class.getName());
 	}
-	
+
 	@Override
 	public WrappingLabel getFigure() {
 		// TODO Auto-generated method stub

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/editparts/TransitionExpressionEditPart.java

@@ -30,7 +30,6 @@ import org.yakindu.sct.model.sgraph.SGraphPackage;
 import org.yakindu.sct.model.sgraph.Transition;
 import org.yakindu.sct.ui.editor.commands.ToggleShowDocumentationCommand;
 import org.yakindu.sct.ui.editor.editparts.SpecificationElementEditPart.MultilineTextCellEditor;
-import org.yakindu.sct.ui.editor.extensions.ExpressionLanguageProviderExtensions.SemanticTarget;
 import org.yakindu.sct.ui.editor.policies.ContextSensitiveHelpPolicy;
 import org.yakindu.sct.ui.editor.policies.TransitionExpressionComponentEditPolicy;
 import org.yakindu.sct.ui.editor.utils.GMFNotationUtil;
@@ -46,7 +45,7 @@ import de.itemis.xtext.utils.gmf.directedit.IXtextAwareEditPart;
 public class TransitionExpressionEditPart extends PlugableExternalXtextLabelEditPart implements IXtextAwareEditPart {
 
 	public TransitionExpressionEditPart(View view) {
-		super(view, SemanticTarget.TransitionSpecification);
+		super(view, Transition.class.getName());
 	}
 
 	@Override
@@ -63,13 +62,14 @@ public class TransitionExpressionEditPart extends PlugableExternalXtextLabelEdit
 		installEditPolicy(EditPolicy.COMPONENT_ROLE, new TransitionExpressionComponentEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new ContextSensitiveHelpPolicy(
 				HelpContextIds.SC_PROPERTIES_TRANSITION_EXPRESSION));
-		//BUGFIX: https://code.google.com/a/eclipselabs.org/p/yakindu/issues/detail?id=26
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new NonResizableLabelEditPolicy(){
+		// BUGFIX:
+		// https://code.google.com/a/eclipselabs.org/p/yakindu/issues/detail?id=26
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new NonResizableLabelEditPolicy() {
 			@Override
 			protected void replaceHandleDragEditPartsTracker(Handle handle) {
 				if (handle instanceof AbstractHandle) {
 					AbstractHandle h = (AbstractHandle) handle;
-					h.setDragTracker(new DragEditPartsTrackerEx(getHost()){
+					h.setDragTracker(new DragEditPartsTrackerEx(getHost()) {
 						protected boolean isMove() {
 							return true;
 						};

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/extensions/AbstractExpressionsProvider.java

@@ -1,47 +0,0 @@
-/**
- * Copyright (c) 2011 committers of YAKINDU and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * Contributors:
- * 	committers of YAKINDU - initial API and implementation
- * 
- */
-package org.yakindu.sct.ui.editor.extensions;
-
-import org.eclipse.xtext.ui.shared.SharedStateModule;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Module;
-import com.google.inject.util.Modules;
-
-/**
- * Base class for all {@link IExpressionLanguageProvider}s, provides caching of
- * the Injector.
- * 
- * @author andreas muelder - Initial contribution and API
- * 
- */
-public abstract class AbstractExpressionsProvider implements
-		IExpressionLanguageProvider {
-
-	private Injector injector = null;
-
-	protected abstract Module getRuntimeModule();
-
-	protected abstract Module getUIModule();
-
-	protected Injector createInjector() {
-		return Guice.createInjector(Modules.override(
-				Modules.override(getRuntimeModule()).with(getUIModule())).with(
-				new SharedStateModule()));
-	}
-
-	public Injector getInjector() {
-		if (injector == null)
-			injector = createInjector();
-		return injector;
-	}
-}

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

@@ -34,11 +34,6 @@ public class ExpressionLanguageProviderExtensions {
 
 	private static final Map<String, IExpressionLanguageProvider> providerMap = new HashMap<String, IExpressionLanguageProvider>();
 
-	@Deprecated
-	public enum SemanticTarget {
-		StatechartSpecification, StateSpecification, TransitionSpecification
-	}
-
 	protected ExpressionLanguageProviderExtensions() {
 		// Not intended to be instantiated
 	}
@@ -68,12 +63,4 @@ public class ExpressionLanguageProviderExtensions {
 		}
 		return new IExpressionLanguageProvider.NullLanguageProvider();
 	}
-
-	@Deprecated
-	/**
-	 * Deprecated, use getLanguageProvider instead.
-	 */
-	public static IExpressionLanguageProvider getRegisteredProvider(SemanticTarget target, String resourceExtension) {
-		return getLanguageProvider(target.name(), resourceExtension);
-	}
 }

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

@@ -41,7 +41,6 @@ import org.eclipse.ui.forms.widgets.ImageHyperlink;
 import org.eclipse.ui.help.IWorkbenchHelpSystem;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 import org.yakindu.sct.ui.editor.extensions.ExpressionLanguageProviderExtensions;
-import org.yakindu.sct.ui.editor.extensions.ExpressionLanguageProviderExtensions.SemanticTarget;
 import org.yakindu.sct.ui.editor.extensions.IExpressionLanguageProvider;
 
 import com.google.inject.Injector;
@@ -139,13 +138,13 @@ public abstract class AbstractEditorPropertySection extends AbstractModelerPrope
 		return completionProposalAdapter;
 	}
 
-	protected Injector getInjector(SemanticTarget semanticTarget) {
+	protected Injector getInjector(String semanticTarget) {
 		IEditorPart editor = ActiveEditorTracker.getLastActiveEditor();
 		IEditorInput editorInput = editor.getEditorInput();
 		if (editorInput instanceof IFileEditorInput) {
 			String extension = ((IFileEditorInput) editorInput).getFile().getFileExtension();
 			IExpressionLanguageProvider registeredProvider = ExpressionLanguageProviderExtensions
-					.getRegisteredProvider(semanticTarget, extension);
+					.getLanguageProvider(semanticTarget, extension);
 			return registeredProvider.getInjector();
 		}
 		return null;

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/propertysheets/StatePropertySection.java

@@ -33,7 +33,6 @@ import org.eclipse.swt.widgets.Text;
 import org.yakindu.base.base.BasePackage;
 import org.yakindu.sct.model.sgraph.SGraphPackage;
 import org.yakindu.sct.model.sgraph.State;
-import org.yakindu.sct.ui.editor.extensions.ExpressionLanguageProviderExtensions.SemanticTarget;
 import org.yakindu.sct.ui.editor.propertysheets.OrderElementControl.ISourceObjectCallback;
 import org.yakindu.sct.ui.editor.utils.HelpContextIds;
 
@@ -93,7 +92,7 @@ public class StatePropertySection extends AbstractTwoColumnEditorPropertySection
 	}
 
 	protected void createSpecificationControl(final Composite parent) {
-		Injector injector = getInjector(SemanticTarget.StateSpecification);
+		Injector injector = getInjector(State.class.getName());
 		if (injector != null) {
 			txtSpecification = new StyledText(parent, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.WRAP);
 			((StyledText) txtSpecification).setAlwaysShowScrollBars(false);

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/propertysheets/StatechartPropertySection.java

@@ -39,11 +39,10 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Layout;
 import org.eclipse.swt.widgets.Text;
 import org.yakindu.base.base.BasePackage;
-import org.yakindu.sct.domain.extension.DefaultDomain;
 import org.yakindu.sct.domain.extension.DomainRegistry;
 import org.yakindu.sct.domain.extension.DomainRegistry.DomainDescriptor;
 import org.yakindu.sct.model.sgraph.SGraphPackage;
-import org.yakindu.sct.ui.editor.extensions.ExpressionLanguageProviderExtensions.SemanticTarget;
+import org.yakindu.sct.model.sgraph.Statechart;
 import org.yakindu.sct.ui.editor.propertysheets.OrderElementControl.ISourceObjectCallback;
 import org.yakindu.sct.ui.editor.utils.HelpContextIds;
 
@@ -93,7 +92,8 @@ public class StatechartPropertySection extends AbstractTwoColumnEditorPropertySe
 		for (DomainDescriptor domainDescriptor : domains) {
 			domainCombo.add(domainDescriptor);
 		}
-		domainCombo.setSelection(new StructuredSelection(DomainRegistry.getDomainDescriptor(DefaultDomain.DOMAIN_ID)));
+		domainCombo.setSelection(new StructuredSelection(DomainRegistry
+				.getDomainDescriptor(SGraphPackage.Literals.STATECHART__DOMAIN_ID.getDefaultValueLiteral())));
 
 	}
 
@@ -130,7 +130,7 @@ public class StatechartPropertySection extends AbstractTwoColumnEditorPropertySe
 
 	protected void createSpecificationControl(final Composite parent) {
 
-		Injector injector = getInjector(SemanticTarget.StatechartSpecification);
+		Injector injector = getInjector(Statechart.class.getName());
 		if (injector != null) {
 			textControl = new StyledText(parent, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.WRAP);
 			((StyledText) textControl).setAlwaysShowScrollBars(false);

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/propertysheets/TransitionPropertySection.java

@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Layout;
 import org.eclipse.swt.widgets.Text;
 import org.yakindu.base.base.BasePackage;
 import org.yakindu.sct.model.sgraph.SGraphPackage;
-import org.yakindu.sct.ui.editor.extensions.ExpressionLanguageProviderExtensions.SemanticTarget;
+import org.yakindu.sct.model.sgraph.Transition;
 import org.yakindu.sct.ui.editor.utils.HelpContextIds;
 
 import com.google.inject.Injector;
@@ -55,7 +55,7 @@ public class TransitionPropertySection extends AbstractTwoColumnEditorPropertySe
 		Label lblExpression = getToolkit().createLabel(parent, "Expression: ");
 		GridDataFactory.fillDefaults().span(2, 1).applyTo(lblExpression);
 
-		Injector injector = getInjector(SemanticTarget.TransitionSpecification);
+		Injector injector = getInjector(Transition.class.getName());
 		if (injector != null) {
 			textControl = new StyledText(parent, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.WRAP);
 			((StyledText) textControl).setAlwaysShowScrollBars(false);

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/wizards/DomainWizardPage.java

@@ -27,9 +27,9 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Link;
-import org.yakindu.sct.domain.extension.DefaultDomain;
 import org.yakindu.sct.domain.extension.DomainRegistry;
 import org.yakindu.sct.domain.extension.DomainRegistry.DomainDescriptor;
+import org.yakindu.sct.model.sgraph.SGraphPackage;
 
 /**
  * 
@@ -91,7 +91,8 @@ public class DomainWizardPage extends WizardPage {
 			}
 
 		});
-		domainCombo.setSelection(new StructuredSelection(DomainRegistry.getDomainDescriptor(DefaultDomain.DOMAIN_ID)));
+		domainCombo.setSelection(new StructuredSelection(DomainRegistry
+				.getDomainDescriptor(SGraphPackage.Literals.STATECHART__DOMAIN_ID.getDefaultValueLiteral())));
 
 		Link sctLink = new Link(composite, SWT.NONE);
 		sctLink.setText("<a>Get additional Statechart Domain Extensions</a>");

plugins/org.yakindu.sct.ui.integration.stext/plugin.xml

@@ -6,17 +6,17 @@
       <ExpressionLanguageProvider
             class="org.yakindu.sct.ui.integration.stext.StatechartExpressionProvider"
             resourceExtension="sct"
-            semanticTarget="StatechartSpecification">
+            semanticTarget="org.yakindu.sct.model.sgraph.Statechart">
       </ExpressionLanguageProvider>
       <ExpressionLanguageProvider
             class="org.yakindu.sct.ui.integration.stext.StateExpressionProvider"
             resourceExtension="sct"
-            semanticTarget="StateSpecification">
+            semanticTarget="org.yakindu.sct.model.sgraph.State">
       </ExpressionLanguageProvider>
       <ExpressionLanguageProvider
             class="org.yakindu.sct.ui.integration.stext.TransitionExpressionProvider"
             resourceExtension="sct"
-            semanticTarget="TransitionSpecification">
+            semanticTarget="org.yakindu.sct.model.sgraph.Transition">
       </ExpressionLanguageProvider>
       <ExpressionLanguageProvider
             class="org.yakindu.sct.ui.integration.stext.ExpressionExpressionProvider"