X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2FcomponentTypeEditor%2FComponentTypeScriptEditor.java;h=6ee5ec77abe89da85f4b41313ea45a5182fdca7e;hp=c3152692d097dc91f26407cf8e28f00102d3eaf3;hb=efefe85bb75819bff218921d9f75a1592cff575f;hpb=47269fe0acb894f346810417d950a1ab59cdc0ea

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeScriptEditor.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeScriptEditor.java
index c3152692d..6ee5ec77a 100644
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeScriptEditor.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeScriptEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2015 Association for Decentralized Information Management in
+ * Copyright (c) 2013, 2019 Association for Decentralized Information Management in
  * Industry THTH ry.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -18,12 +18,8 @@ import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
 import org.simantics.Simantics;
 import org.simantics.databoard.Bindings;
 import org.simantics.db.ReadGraph;
@@ -33,13 +29,11 @@ import org.simantics.db.WriteGraph;
 import org.simantics.db.common.request.ParametrizedRead;
 import org.simantics.db.common.request.ReadRequest;
 import org.simantics.db.common.request.UniqueRead;
-import org.simantics.db.common.request.WriteRequest;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.request.combinations.Combinators;
 import org.simantics.db.request.Read;
 import org.simantics.layer0.Layer0;
 import org.simantics.scl.ui.editor.SCLSourceViewerConfigurationNew;
-import org.simantics.scl.ui.editor.SharedTextColorsNew;
 import org.simantics.structural.stubs.StructuralResource2;
 import org.simantics.ui.workbench.IResourceEditorInput;
 import org.simantics.ui.workbench.TitleUpdater;
@@ -58,7 +52,6 @@ public class ComponentTypeScriptEditor extends SCLModuleEditor {
     @Override
     protected void preInitialize() {
         setDocumentProvider(new ComponentTypeScriptDocumentProvider(this));
-        Display display = PlatformUI.getWorkbench().getDisplay();
         SCLSourceViewerConfigurationNew sourceViewerConfiguration = new SCLSourceViewerConfigurationNew(resourceManager);
         setSourceViewerConfiguration(sourceViewerConfiguration);
         
@@ -103,17 +96,25 @@ public class ComponentTypeScriptEditor extends SCLModuleEditor {
     }
     
     private static final String[] EXECUTION_PHASES = new String[] {
+        "pre-step", //$NON-NLS-1$
         "step", //$NON-NLS-1$
+        "post-step", //$NON-NLS-1$
         "analogAutomation", //$NON-NLS-1$
         "binaryAutomation", //$NON-NLS-1$
-        "preparation" //$NON-NLS-1$
+        "preparation", //$NON-NLS-1$
+        "post-preparation", //$NON-NLS-1$
+        "cleanup", //$NON-NLS-1$
     };
     
     private static final String[] EXECUTION_PHASE_LABELS = new String[] {
+        Messages.ComponentTypeScriptEditor_ExecuteBeforeEachStep,
         Messages.ComponentTypeScriptEditor_ExecuteAtEachStep,
+        Messages.ComponentTypeScriptEditor_ExecuteAfterEachStep,
         Messages.ComponentTypeScriptEditor_ExecuteAnalogAutomation,
         Messages.ComponentTypeScriptEditor_ExecuteBinaryAutomation,
-        Messages.ComponentTypeScriptEditor_ExecuteDuringPreparation
+        Messages.ComponentTypeScriptEditor_ExecuteBeforePreparation,
+        Messages.ComponentTypeScriptEditor_ExecuteAfterPreparation,
+        Messages.ComponentTypeScriptEditor_ExecuteBeforeRemoval,
     };
     
     @Override
@@ -132,36 +133,26 @@ public class ComponentTypeScriptEditor extends SCLModuleEditor {
                     StructuralResource2 STR = StructuralResource2.getInstance(graph);
                     final String type = graph.getPossibleRelatedValue(script, STR.ComponentTypeScript_type);
                     if(type != null)
-                        combo.getDisplay().asyncExec(new Runnable() {
-                            @Override
-                            public void run() {
-                                for(int i=0;i<EXECUTION_PHASES.length;++i)
-                                    if(EXECUTION_PHASES[i].equals(type)) {
-                                        combo.select(i);
-                                        return;
-                                    }
-                            }
+                        combo.getDisplay().asyncExec(() -> {
+                            for(int i=0;i<EXECUTION_PHASES.length;++i)
+                                if(EXECUTION_PHASES[i].equals(type)) {
+                                    combo.select(i);
+                                    return;
+                                }
                         });
                 }
             });
         }
-        combo.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                final int id = combo.getSelectionIndex();
-                Simantics.getSession().asyncRequest(new WriteRequest() {
-                    @Override
-                    public void perform(WriteGraph graph)
-                            throws DatabaseException {
-                        StructuralResource2 STR = StructuralResource2.getInstance(graph);
-                        String currentType = graph.getPossibleRelatedValue(script, STR.ComponentTypeScript_type);
-                        String newType = EXECUTION_PHASES[id];
-                        if(!newType.equals(currentType))
-                            graph.claimLiteral(script, STR.ComponentTypeScript_type, newType, Bindings.STRING);
-                    }
-                });
-            }
-        });
+        combo.addSelectionListener(org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter(e -> {
+            int id = combo.getSelectionIndex();
+            Simantics.getSession().asyncRequest((WriteGraph graph) -> {
+                StructuralResource2 STR = StructuralResource2.getInstance(graph);
+                String currentType = graph.getPossibleRelatedValue(script, STR.ComponentTypeScript_type);
+                String newType = EXECUTION_PHASES[id];
+                if(!newType.equals(currentType))
+                    graph.claimLiteral(script, STR.ComponentTypeScript_type, newType, Bindings.STRING);
+            });
+        }));
         GridDataFactory.fillDefaults().grab(true, false).applyTo(combo);
         
         Composite editorComposite = new Composite(parent, SWT.NONE);