From 038523cdff2fdf0d2f2c7e2df1d2896aabb4796c Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Fri, 24 Apr 2020 20:34:14 +0300 Subject: [PATCH] UC SCL script/procedural code editors respect L0.readOnly Marking the input resource with L0.readOnly now makes the editors consider the input immutable in the document provider. gitlab #526 (cherry picked from commit 36e865dac0ec2db530fabc6fd9ea9841c3e812ae) --- .../ComponentTypeScriptDocumentProvider.java | 4 +- .../ComponentTypeScriptEditor.java | 38 +++++++++++++------ ...uralComponentTypeCodeDocumentProvider.java | 2 + 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeScriptDocumentProvider.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeScriptDocumentProvider.java index 57d0aa69a..a8e637a04 100644 --- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeScriptDocumentProvider.java +++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeScriptDocumentProvider.java @@ -21,6 +21,7 @@ import org.simantics.db.WriteGraph; 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.util.Layer0Utils; import org.simantics.db.procedure.Listener; import org.simantics.db.request.Read; import org.simantics.modeling.ComponentTypeScriptRequest; @@ -60,7 +61,8 @@ public class ComponentTypeScriptDocumentProvider extends AbstractDocumentProvide StructuralResource2 STR = StructuralResource2.getInstance(graph); currentText = graph.getRelatedValue(resource, STR.ComponentTypeScript_code, Bindings.STRING); Resource owner = graph.getPossibleObject(resource, STR.ComponentType_hasScript_Inverse); - immutable = owner != null && StructuralUtils.isImmutable(graph, owner); + immutable = Layer0Utils.isMarkedReadOnly(graph, resource) + || owner != null && StructuralUtils.isImmutable(graph, owner); errorHappened = false; return new Document(currentText != null ? currentText : ""); //$NON-NLS-1$ } 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 6ee5ec77a..ec82da5f3 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 @@ -31,13 +31,13 @@ import org.simantics.db.common.request.ReadRequest; import org.simantics.db.common.request.UniqueRead; 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.structural.stubs.StructuralResource2; import org.simantics.ui.workbench.IResourceEditorInput; import org.simantics.ui.workbench.TitleUpdater; import org.simantics.ui.workbench.ToolTipRequest; +import org.simantics.utils.ui.ExceptionUtils; /** * @author Hannu Niemistö @@ -45,25 +45,25 @@ import org.simantics.ui.workbench.ToolTipRequest; */ public class ComponentTypeScriptEditor extends SCLModuleEditor { + protected ComponentTypeScriptDocumentProvider docProvider; + protected String scriptType = ""; + protected int scriptTypeIndex = 0; + public ComponentTypeScriptEditor() { super(); } @Override protected void preInitialize() { - setDocumentProvider(new ComponentTypeScriptDocumentProvider(this)); + docProvider = new ComponentTypeScriptDocumentProvider(this); + setDocumentProvider(docProvider); SCLSourceViewerConfigurationNew sourceViewerConfiguration = new SCLSourceViewerConfigurationNew(resourceManager); setSourceViewerConfiguration(sourceViewerConfiguration); - } protected ParametrizedRead getInputValidator() { - return new ParametrizedRead() { - @Override - public Read get(IResourceEditorInput parameter) { - return Combinators.constant(Boolean.TRUE); - } - }; + // No-op validator that always returns true + return param -> Combinators.constant(Boolean.TRUE); } @Override @@ -131,12 +131,14 @@ public class ComponentTypeScriptEditor extends SCLModuleEditor { @Override public void run(ReadGraph graph) throws DatabaseException { StructuralResource2 STR = StructuralResource2.getInstance(graph); - final String type = graph.getPossibleRelatedValue(script, STR.ComponentTypeScript_type); + String type = graph.getPossibleRelatedValue(script, STR.ComponentTypeScript_type); if(type != null) + scriptType = type; combo.getDisplay().asyncExec(() -> { for(int i=0;i { int id = combo.getSelectionIndex(); + if (id == scriptTypeIndex) + return; + if (docProvider.isReadOnly(getEditorInput())) { + // Return configured selection + combo.select(scriptTypeIndex); + return; + } + String newType = EXECUTION_PHASES[id]; 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); + }, exc -> { + if (exc == null) { + scriptType = newType; + scriptTypeIndex = id; + } else { + ExceptionUtils.logError(exc); + } }); })); GridDataFactory.fillDefaults().grab(true, false).applyTo(combo); diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ProceduralComponentTypeCodeDocumentProvider.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ProceduralComponentTypeCodeDocumentProvider.java index 1a1eb723f..5cc209943 100644 --- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ProceduralComponentTypeCodeDocumentProvider.java +++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ProceduralComponentTypeCodeDocumentProvider.java @@ -31,6 +31,7 @@ import org.simantics.scl.ui.editor.SCLSourceViewerConfigurationNew; import org.simantics.scl.ui.editor.TextAndErrors; import org.simantics.structural2.scl.procedural.CompileProceduralComponentTypeRequest; import org.simantics.structural2.scl.procedural.ProceduralComponentTypeCompilationException; +import org.simantics.structural2.utils.StructuralUtils; import org.simantics.ui.workbench.ResourceEditorInput; import org.simantics.utils.logging.TimeLogger; import org.simantics.utils.ui.SWTUtils; @@ -55,6 +56,7 @@ public class ProceduralComponentTypeCodeDocumentProvider extends SCLModuleEditor @Override public Document perform(ReadGraph graph) throws DatabaseException { currentText = graph.getValue(resource, Bindings.STRING); + immutable = StructuralUtils.isImmutable(graph, resource); errorHappened = false; return new Document(currentText != null ? currentText : ""); //$NON-NLS-1$ } -- 2.47.1