Warnings removed

plugins/org.yakindu.sct.ui.editor/META-INF/MANIFEST.MF

@@ -41,7 +41,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.gmf.runtime.notation.providers;bundle-version="1.3.0",
  org.eclipse.help;bundle-version="3.5.100",
  org.yakindu.sct.ui;bundle-version="1.0.0",
- org.eclipse.debug.ui;bundle-version="3.7.0"
+ org.eclipse.debug.ui;bundle-version="3.7.0",
+ org.yakindu.sct.model.sgraph.resource;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.yakindu.sct.ui.editor,

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/breadcrumb/BreadcrumbDiagramEditor.java

@@ -20,7 +20,6 @@ import org.eclipse.jface.viewers.TreePath;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerLabel;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IEditorInput;

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

@@ -33,6 +33,7 @@ public class RegionCompartmentEditPart extends ShapeCompartmentEditPart {
 	public RegionCompartmentEditPart(View view) {
 		super(view);
 	}
+	
 
 	@Override
 	protected void createDefaultEditPolicies() {

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

@@ -39,6 +39,7 @@ public class RegionEditPart extends ShapeNodeEditPart {
 		super(view);
 	}
 
+	
 	@Override
 	protected NodeFigure createNodeFigure() {
 		final NodeFigure figure = new NodeFigure();
@@ -47,6 +48,7 @@ public class RegionEditPart extends ShapeNodeEditPart {
 		figure.add(new RegionFigure(getMapMode()));
 		return figure;
 	}
+	
 
 	@Override
 	protected void createDefaultEditPolicies() {
@@ -66,7 +68,6 @@ public class RegionEditPart extends ShapeNodeEditPart {
 				}
 			}
 		}
-
 		return super.getTargetEditPart(request);
 	}
 

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/policies/ExpressionDirectEditPolicy.java

@@ -17,10 +17,13 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.swt.custom.StyledText;
 import org.yakindu.sct.model.sgraph.SGraphPackage;
 import org.yakindu.sct.ui.editor.validation.IMarkerType;
 
 import de.itemis.xtext.utils.gmf.directedit.IXtextAwareEditPart;
+import de.itemis.xtext.utils.gmf.experimental.StyledLabel;
+import de.itemis.xtext.utils.jface.viewers.XtextStyledTextCellEditor;
 
 /**
  * 
@@ -47,8 +50,12 @@ public class ExpressionDirectEditPolicy extends DirectEditPolicy implements
 
 	@Override
 	protected void showCurrentEditValue(DirectEditRequest request) {
-		String value = (String) request.getCellEditor().getValue();
+		XtextStyledTextCellEditor cellEditor = (XtextStyledTextCellEditor) request.getCellEditor();
+		String value = (String) cellEditor.getValue();
 		((IXtextAwareEditPart) getHost()).setLabelText(value);
+		StyledText text = (StyledText)cellEditor.getControl();
+		StyledLabel figure = (StyledLabel)getHost().getFigure();
+		figure.setRanges(text.getStyleRanges());
 	}
 
 }

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

@@ -19,7 +19,6 @@ import org.yakindu.sct.ui.editor.utils.IYakinduSctHelpContextIds;
 import de.itemis.gmf.runtime.commons.properties.descriptors.IFormPropertyDescriptor;
 import de.itemis.gmf.runtime.commons.properties.descriptors.TextPropertyDescriptor;
 import de.itemis.gmf.runtime.commons.properties.descriptors.XtextPropertyDescriptor;
-import de.itemis.xtext.utils.jface.viewers.context.IXtextFakeContextResourcesProvider;
 
 /**
  * Property Section for {@link StatechartTextEditPart}s. Consists of a

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/validation/ValidationAction.java

@@ -15,23 +15,14 @@ import java.util.List;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.emf.common.util.BasicDiagnostic;
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.Diagnostician;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
 import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
-import org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor;
 
 import de.itemis.xtext.utils.gmf.resource.InjectMembersResource;
-import de.itemis.xtext.utils.jface.viewers.util.ActiveEditorTracker;
 
 /**
  * Executes the Validation and creates Problem Markers on the resource.
@@ -41,49 +32,12 @@ import de.itemis.xtext.utils.jface.viewers.util.ActiveEditorTracker;
  */
 public class ValidationAction implements IMarkerType {
 
-	private static ISchedulingRule IDENTITY_RULE = new ISchedulingRule() {
-		public boolean contains(ISchedulingRule rule) {
-			return rule == this;
-		}
-
-		public boolean isConflicting(ISchedulingRule rule) {
-			return rule == this;
-		}
-	};
-
 	/**
 	 * Perform the validation as a job to avoid blocking the UI Thread.
 	 */
 	public static void validate(DiagramEditPart diagramEditPart,
 			final Diagram view) {
 
-		final IEditorPart editor = ActiveEditorTracker
-				.getLastEditor(StatechartDiagramEditor.ID);
-		if (editor == null) {
-			// should actually never happen..
-			return;
-		}
-		final IWorkbenchSiteProgressService service = (IWorkbenchSiteProgressService) editor
-				.getSite().getService(IWorkbenchSiteProgressService.class);
-		Job job = new Job("Diagram validation") {
-			@Override
-			protected IStatus run(IProgressMonitor monitor) {
-				monitor.beginTask("Validating diagram...", 4);
-				monitor.worked(1);
-				try {
-					doValidate(view);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-				monitor.done();
-				return Status.OK_STATUS;
-			}
-		};
-		job.setRule(IDENTITY_RULE);
-		service.schedule(job);
-	}
-
-	public static void doValidate(Diagram view) {
 		IFile target = GMFMarkerUtil.getTargetFile(view);
 		if (target != null) {
 			try {
@@ -118,5 +72,4 @@ public class ValidationAction implements IMarkerType {
 			}
 		}
 	}
-
 }