Merge pull request #969 from Yakindu/issue_35_openfile_2

Added null tests & error message for file -> open file usage #35

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

@@ -327,7 +327,8 @@ public class StatechartDiagramEditor extends DiagramPartitioningEditor implement
 
 	@Override
 	public void dispose() {
-		validationJob.cancel();
+		if (validationJob != null)
+			validationJob.cancel();
 		getEditingDomain().removeResourceSetListener(validationListener);
 		getEditingDomain().removeResourceSetListener(domainAdapter);
 		if (domainAdapter != null)
@@ -336,7 +337,7 @@ public class StatechartDiagramEditor extends DiagramPartitioningEditor implement
 		try {
 			// Touch the file for revalidation, when the user did not save
 			// the changes
-			if (isDirty() && editorInput.getFile() != null && editorInput.getFile().exists()) {
+			if (editorInput != null && isDirty() && editorInput.getFile() != null && editorInput.getFile().exists()) {
 				editorInput.getFile().touch(new NullProgressMonitor());
 			}
 		} catch (CoreException e) {

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/partitioning/DiagramPartitioningEditor.java

@@ -47,11 +47,13 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorReference;
+import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.FileStoreEditorInput;
 import org.eclipse.xtext.util.Arrays;
 import org.yakindu.base.base.NamedElement;
 import org.yakindu.sct.model.sgraph.Statechart;
@@ -86,6 +88,18 @@ public abstract class DiagramPartitioningEditor extends DiagramDocumentEditor im
 	public IDocumentProvider getDocumentProvider() {
 		return documentProvider;
 	}
+	
+	@Override
+	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
+		if(input instanceof FileStoreEditorInput) {
+			throw new PartInitException(
+					"An error occured while opening the file.\n\n"
+					+ "This might have happened because you tried to open a statechart with File->Open File.\n"
+            		+ "This is not supported. Please import the file into a project instead."
+	            		);
+		}
+		super.init(site, input);
+	}
 
 	@Override
 	public void createPartControl(Composite parent) {
@@ -160,7 +174,7 @@ public abstract class DiagramPartitioningEditor extends DiagramDocumentEditor im
 	}
 
 	protected void closeSubdiagramEditors() {
-		if (getDiagram().getElement() instanceof Statechart) {
+		if (getDiagram() != null && getDiagram().getElement() instanceof Statechart) {
 			List<IEditorReference> references = new ArrayList<IEditorReference>();
 			IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
 			if (workbenchWindow == null)