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%2FDerivedPropertiesSection.java;h=23777604d35e43e6d221a60f7b2908e01566f777;hp=41356de318c949215b97adf970394181703af925;hb=0475b9e2a9331ef8f3dcd61567e5d071ae8ef561;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/DerivedPropertiesSection.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/DerivedPropertiesSection.java
index 41356de31..23777604d 100644
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/DerivedPropertiesSection.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/DerivedPropertiesSection.java
@@ -1,379 +1,475 @@
-package org.simantics.modeling.ui.componentTypeEditor;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.jface.layout.TableColumnLayout;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.forms.widgets.Form;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.simantics.Simantics;
-import org.simantics.db.ReadGraph;
-import org.simantics.db.RequestProcessor;
-import org.simantics.db.Resource;
-import org.simantics.db.WriteGraph;
-import org.simantics.db.common.request.PossibleIndexRoot;
-import org.simantics.db.common.request.UniqueRead;
-import org.simantics.db.common.request.WriteRequest;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.layer0.Layer0;
-import org.simantics.modeling.userComponent.ComponentTypeCommands;
-import org.simantics.scl.runtime.function.Function4;
-import org.simantics.structural.stubs.StructuralResource2;
-
-public class DerivedPropertiesSection implements ComponentTypeViewerSection {
-    private static final String[] COLUMN_NAMES = 
-            new String[] {"Name", "Type", "Expression", "Label", "Description"};
-    private static final int[] COLUMN_LENGTHS =
-            new int[] { 120, 100, 100, 100, 100 };
-    private static final int[] COLUMN_WEIGHTS =
-            new int[] { 0, 0, 100, 0, 0 };
-    private static Function4<RequestProcessor, Resource, Resource, String, String> VALIDATE_MONITOR_EXPRESSION =
-            new Function4<RequestProcessor, Resource, Resource, String, String>() {
-        @Override
-        public String apply(RequestProcessor p0, Resource p1, Resource p2, String p3) {
-            return validateMonitorExpression(p0, p1, p2, p3);
-        }
-    };
-    
-    ComponentTypeViewerData data;
-    Table table;
-    TableColumn[] columns;
-    TableEditor editor;
-    Button newProperty;
-    Button removeProperty;
-    
-    Section section;
-    
-    public DerivedPropertiesSection(ComponentTypeViewerData data) {
-        this.data = data;
-        FormToolkit tk = data.tk;
-        Form form = data.form;
-        section = tk.createSection(form.getBody(), Section.TITLE_BAR | Section.EXPANDED);
-        section.setLayout(new FillLayout());
-        section.setText("Derived properties");
-
-        Composite sectionBody = tk.createComposite(section);
-        GridLayoutFactory.fillDefaults().numColumns(2).applyTo(sectionBody);
-        section.setClient(sectionBody);
-
-        Composite tableComposite = tk.createComposite(sectionBody);
-        GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(tableComposite);
-        TableColumnLayout tcl = new TableColumnLayout();
-        tableComposite.setLayout(tcl);
-
-        table = tk.createTable(tableComposite, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER);
-        table.setLinesVisible(true);
-        table.setHeaderVisible(true);
-
-        columns = new TableColumn[COLUMN_NAMES.length];
-        for(int i=0;i<COLUMN_NAMES.length;++i) {
-            TableColumn column = new TableColumn(table, SWT.NONE);
-            columns[i] = column;
-            tcl.setColumnData(column, new ColumnWeightData(COLUMN_WEIGHTS[i], COLUMN_LENGTHS[i], true));
-            column.setText(COLUMN_NAMES[i]);
-        }
-
-        // Table editor
-        editor = new TableEditor(table);
-        editor.grabHorizontal = true;
-        editor.grabVertical = true;
-        editor.horizontalAlignment = SWT.LEFT;
-        table.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseDown(MouseEvent e) {
-                // Clean up any previous editor control
-                Control oldEditor = editor.getEditor();
-                if (oldEditor != null) oldEditor.dispose();
-
-                if (data.readOnly)
-                    return;
-
-                // Relative position
-                Rectangle tableBounds = table.getClientArea();
-                int rx = e.x - tableBounds.x;
-                int ry = e.y - tableBounds.y;
-
-                // Find cell
-                TableItem selectedItem = null;
-                int selectedColumn = -1;
-                Rectangle selectedItemBounds = null;
-                for(TableItem item : table.getItems()) {
-                    for(int column = 0;column < COLUMN_NAMES.length;++column) {
-                        Rectangle bounds = item.getBounds(column);
-                        if(bounds.contains(rx, ry)) {
-                            selectedItemBounds = bounds;
-                            selectedItem = item;
-                            selectedColumn = column;
-                            break;
-                        }
-                    }
-                }
-                if(selectedItem == null) {
-                    return;
-                }
-
-                // Table editor
-                final int column = selectedColumn; 
-                final ComponentTypeViewerPropertyInfo propertyInfo = (ComponentTypeViewerPropertyInfo)selectedItem.getData();
-                final Resource resource = propertyInfo.resource;
-                switch (column) {
-                case 0:
-                    data.editName(table, editor, propertyInfo, selectedItem, column, ComponentTypeViewerData.PROPERTY_NAME_PATTERN);
-                    break;
-
-                case 1:
-                    data.editType(table, editor, propertyInfo, selectedItem, column, false);
-                    break;
-
-                case 2:
-                    data.editValue(table, editor, propertyInfo, selectedItem, column, propertyInfo.immutable ? null : new StringWriter() {
-                        @Override
-                        public void perform(WriteGraph graph, String newValue) throws DatabaseException {
-                            ComponentTypeCommands.setMonitorExpression(graph, data.componentType, resource, newValue);
-                        }
-                    }, VALIDATE_MONITOR_EXPRESSION);
-                    break;
-
-//                case 3:
-//                    editUnit(table2, editor2, propertyInfo, selectedItem, column);
-//                    break;
-
-                case 3:
-                    data.editValue(table, editor, propertyInfo, selectedItem, column, propertyInfo.immutable ? null : new StringWriter() {
-                        @Override
-                        public void perform(WriteGraph graph, String newValue) throws DatabaseException {
-                            graph.markUndoPoint();
-                            String value = newValue.isEmpty() ? null : newValue;
-                            ComponentTypeCommands.setLabel(graph, resource, value);
-                        }
-                    }, null);
-                    break;
-
-                case 4:
-                    data.editMultilineText(table, editor, propertyInfo, selectedItem, selectedItemBounds, column, new StringWriter() {
-                        @Override
-                        public void perform(WriteGraph graph, String newValue) throws DatabaseException {
-                            graph.markUndoPoint();
-                            String value = newValue.isEmpty() ? null : newValue;
-                            ComponentTypeCommands.setDescription(graph, resource, value);
-                        }
-                    });
-                    break;
-                }
-            }
-
-        });
-
-        // Buttons
-
-        Composite buttons = tk.createComposite(sectionBody);
-        GridDataFactory.fillDefaults().applyTo(buttons);
-        GridLayoutFactory.fillDefaults().applyTo(buttons);
-
-        newProperty = tk.createButton(buttons, "New property", SWT.PUSH);
-        GridDataFactory.fillDefaults().applyTo(newProperty);
-        removeProperty = tk.createButton(buttons, "Remove property", SWT.PUSH);
-        GridDataFactory.fillDefaults().applyTo(removeProperty);
-
-        // Actions
-
-        newProperty.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                if(editor.getEditor() != null)
-                    editor.getEditor().dispose();
-                Simantics.getSession().async(new WriteRequest() {
-                    @Override
-                    public void perform(WriteGraph graph)
-                            throws DatabaseException {
-                        ComponentTypeCommands.createMonitorPropertyWithDefaults(graph, data.componentType);
-                    }
-                });
-            }
-        });
-
-        removeProperty.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                if(editor.getEditor() != null)
-                    editor.getEditor().dispose();
-                final List<Resource> propertiesToBeRemoved = 
-                        new ArrayList<>();
-                for(TableItem item : table.getSelection())
-                    propertiesToBeRemoved.add(((ComponentTypeViewerPropertyInfo)item.getData()).resource);
-                //System.out.println("remove " + propertiesToBeRemoved.size() + " resources");
-                if(!propertiesToBeRemoved.isEmpty())
-                    Simantics.getSession().async(new WriteRequest() {
-                        @Override
-                        public void perform(WriteGraph graph)
-                                throws DatabaseException {
-                            graph.markUndoPoint();
-                            for(Resource property : propertiesToBeRemoved)
-                                ComponentTypeCommands.removeProperty(graph, data.componentType, property);
-                        }
-                    });
-            }
-        });
-    }
-
-    @Override
-    public void setReadOnly(boolean readOnly) {
-        boolean e = !readOnly;
-        newProperty.setEnabled(e);
-        removeProperty.setEnabled(e);
-    }
-
-    public static String validateMonitorExpression(final RequestProcessor processor, final Resource componentType, final Resource relation, final String expression) {
-
-        if (expression.trim().isEmpty()) {
-            return "Expression is empty.";
-        }
-
-        if (expression.trim().isEmpty()) {
-            return "Expression is empty.";
-        }
-        try {
-            return processor.sync(new UniqueRead<String>() {
-
-                @Override
-                public String perform(ReadGraph graph) throws DatabaseException {
-
-                    StructuralResource2 STR = StructuralResource2.getInstance(graph);
-
-                    Resource indexRoot = graph.syncRequest(new PossibleIndexRoot(componentType));
-
-                    for(Resource literal : graph.getAssertedObjects(componentType, relation)) {
-
-                        try {
-                            // TODO validation
-                            if(graph.isInstanceOf(componentType, STR.ProceduralComponentType)) {
-                                //Layer0 L0 = Layer0.getInstance(graph);
-                                //Resource environment = graph.getPossibleObject(literal, L0.SCLValue_environment); 
-                                //ContextModule context = graph.sync(new TypeMonitorContextRequest(componentType));
-                                //String SCLMain = graph.syncRequest(new SCLMainModuleRequest(indexRoot));
-                                //CompilationContext cc = new CompilationContext(environment, context, SCLMain);
-                                //graph.syncRequest(new ActualCompileRequest(expression, cc), TransientCacheListener.<CompiledExpression>instance());
-                            } else {
-                                //CompilationContext cc = new CompileSCLMonitorRequest(literal, componentType, indexRoot).getContext(graph);
-                                //graph.syncRequest(new ActualCompileRequest(expression, cc), TransientCacheListener.<CompiledExpression>instance());
-                                //graph.syncRequest(new CompileSCLMonitorRequest(graph, context));
-                            }
-                            
-                        } catch (Exception e) {
-                            String msg = e.getMessage();
-                            int index = msg.indexOf(":");
-                            if(index > 0) msg = msg.substring(index);
-                            return msg;
-                        }
-                        
-                    }
-                    
-                    return null;
-                    
-                }
-                
-            });
-        } catch (DatabaseException e) {
-            e.printStackTrace();
-        }
-
-        return null;
-
-    }
-
-    @Override
-    public void update(ComponentTypePropertiesResult result) {
-        if (table.isDisposed())
-            return;
-
-        Set<ComponentTypeViewerPropertyInfo> selected = new HashSet<>();
-        List<TableItem> selectedItems = new ArrayList<TableItem>(selected.size());
-        for (int i : table.getSelectionIndices()) {
-            TableItem item = table.getItem(i);
-            selected.add((ComponentTypeViewerPropertyInfo) item.getData());
-        }
-        
-        int topIndex = table.getTopIndex();
-        table.removeAll();
-        if(editor.getEditor() != null)
-            editor.getEditor().dispose();
-        
-        for(ComponentTypeViewerPropertyInfo info : result.getProperties()) {
-            boolean immutable = result.isImmutable() || info.immutable;
-            Color fg = immutable ? table.getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY) : null;
-            if(info.sectionSpecificData != MONITOR)
-                continue;
-
-            TableItem item = new TableItem(table, SWT.NONE);
-
-            item.setText(0, info.valid != null ? info.name + " (!)" : info.name);
-            item.setText(1, info.type);
-            item.setText(2, info.expression);
-            //item.setText(3, unitStr(info));
-            item.setText(3, info.label);
-            item.setText(4, info.description);
-
-            item.setForeground(fg);
-
-            item.setData(info);
-
-            if (selected.contains(info))
-                selectedItems.add(item);
-        }
-        
-        table.setTopIndex(topIndex);
-        table.setSelection(selectedItems.toArray(new TableItem[selectedItems.size()]));
-        table.redraw();
-    }
-
-    @Override
-    public Section getSection() {
-        return section;
-    }
-
-    @Override
-    public double getPriority() {
-        return 100.0;
-    }
-
-    private static final Object MONITOR = new Object();
-    
-    @Override
-    public Object getSectionSpecificData(ReadGraph graph,
-            ComponentTypeViewerPropertyInfo info) throws DatabaseException {
-        Layer0 L0 = Layer0.getInstance(graph);
-        StructuralResource2 STR = StructuralResource2.getInstance(graph);
-        Resource range = graph.getPossibleObject(info.resource, L0.HasRange);
-        if(range != null && graph.isInstanceOf(range, STR.MonitorValueType))
-            return MONITOR;
-        else
-            return null;
-    }
-    
-    @Override
-    public double getDataPriority() {
-        return 100.0;
-    }
-
-}
+package org.simantics.modeling.ui.componentTypeEditor;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.layout.TableColumnLayout;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.window.DefaultToolTip;
+import org.eclipse.jface.window.ToolTip;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.TableEditor;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.ui.forms.widgets.Form;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Section;
+import org.simantics.Simantics;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.RequestProcessor;
+import org.simantics.db.Resource;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.common.procedure.adapter.TransientCacheAsyncListener;
+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.PropertyInfo;
+import org.simantics.db.layer0.request.PropertyInfoRequest;
+import org.simantics.db.layer0.variable.StandardGraphChildVariable;
+import org.simantics.db.layer0.variable.StandardGraphPropertyVariable;
+import org.simantics.db.layer0.variable.Variable;
+import org.simantics.layer0.Layer0;
+import org.simantics.modeling.scl.CompileProceduralSCLMonitorRequest;
+import org.simantics.modeling.scl.CompileSCLMonitorRequest;
+import org.simantics.modeling.userComponent.ComponentTypeCommands;
+import org.simantics.scl.runtime.SCLContext;
+import org.simantics.scl.runtime.function.Function1;
+import org.simantics.scl.runtime.function.Function4;
+import org.simantics.structural.stubs.StructuralResource2;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DerivedPropertiesSection implements ComponentTypeViewerSection {
+    private static final String[] COLUMN_NAMES = {
+            Messages.DerivedPropertiesSection_Name,
+            Messages.DerivedPropertiesSection_Type,
+            Messages.DerivedPropertiesSection_Expression,
+            Messages.DerivedPropertiesSection_Unit,
+            Messages.DerivedPropertiesSection_Label,
+            Messages.DerivedPropertiesSection_Description
+    };
+    private static final int[] COLUMN_LENGTHS =
+            new int[] { 120, 100, 100, 70, 100, 100 };
+    private static final int[] COLUMN_WEIGHTS =
+            new int[] { 0, 0, 100, 0, 0, 0 };
+    private static Function4<RequestProcessor, Resource, Resource, String, String> VALIDATE_MONITOR_EXPRESSION =
+            new Function4<RequestProcessor, Resource, Resource, String, String>() {
+        @Override
+        public String apply(RequestProcessor p0, Resource p1, Resource p2, String p3) {
+            return validateMonitorExpression(p0, p1, p2, p3);
+        }
+    };
+    
+    private static final Logger LOGGER = LoggerFactory.getLogger(DerivedPropertiesSection.class);
+    
+    ComponentTypeViewerData data;
+    Table table;
+    TableColumn[] columns;
+    TableEditor editor;
+    Button newProperty;
+    Button removeProperty;
+    
+    Section section;
+    
+    public DerivedPropertiesSection(ComponentTypeViewerData data) {
+        this.data = data;
+        FormToolkit tk = data.tk;
+        Form form = data.form;
+        section = tk.createSection(form.getBody(), Section.TITLE_BAR | Section.EXPANDED);
+        section.setLayout(new FillLayout());
+        section.setText(Messages.DerivedPropertiesSection_DerivedProperties);
+
+        Composite sectionBody = tk.createComposite(section);
+        GridLayoutFactory.fillDefaults().numColumns(2).applyTo(sectionBody);
+        section.setClient(sectionBody);
+
+        Composite tableComposite = tk.createComposite(sectionBody);
+        GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(tableComposite);
+        TableColumnLayout tcl = new TableColumnLayout();
+        tableComposite.setLayout(tcl);
+
+        table = tk.createTable(tableComposite, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER);
+        table.setLinesVisible(true);
+        table.setHeaderVisible(true);
+
+        columns = new TableColumn[COLUMN_NAMES.length];
+        for(int i=0;i<COLUMN_NAMES.length;++i) {
+            TableColumn column = new TableColumn(table, SWT.NONE);
+            columns[i] = column;
+            tcl.setColumnData(column, new ColumnWeightData(COLUMN_WEIGHTS[i], COLUMN_LENGTHS[i], true));
+            column.setText(COLUMN_NAMES[i]);
+        }
+
+        // Table editor
+        editor = new TableEditor(table);
+        editor.grabHorizontal = true;
+        editor.grabVertical = true;
+        editor.horizontalAlignment = SWT.LEFT;
+        table.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseDown(MouseEvent e) {
+                // Clean up any previous editor control
+                Control oldEditor = editor.getEditor();
+                if (oldEditor != null) oldEditor.dispose();
+
+                if (data.readOnly)
+                    return;
+
+                // Relative position
+                Rectangle tableBounds = table.getClientArea();
+                int rx = e.x - tableBounds.x;
+                int ry = e.y - tableBounds.y;
+
+                // Find cell
+                TableItem selectedItem = null;
+                int selectedColumn = -1;
+                Rectangle selectedItemBounds = null;
+                for(TableItem item : table.getItems()) {
+                    for(int column = 0;column < COLUMN_NAMES.length;++column) {
+                        Rectangle bounds = item.getBounds(column);
+                        if(bounds.contains(rx, ry)) {
+                            selectedItemBounds = bounds;
+                            selectedItem = item;
+                            selectedColumn = column;
+                            break;
+                        }
+                    }
+                }
+                if(selectedItem == null) {
+                    return;
+                }
+
+                // Table editor
+                final int column = selectedColumn; 
+                final ComponentTypeViewerPropertyInfo propertyInfo = (ComponentTypeViewerPropertyInfo)selectedItem.getData();
+                final Resource resource = propertyInfo.resource;
+                switch (column) {
+                case 0:
+                    data.editName(table, editor, propertyInfo, selectedItem, column, ComponentTypeViewerData.PROPERTY_NAME_PATTERN);
+                    break;
+
+                case 1:
+                    data.editType(table, editor, propertyInfo, selectedItem, column, null, false);
+                    break;
+
+                case 2:
+                    data.editValue(table, editor, propertyInfo, selectedItem, column, propertyInfo.immutable ? null : new StringWriter() {
+                        @Override
+                        public void perform(WriteGraph graph, String newValue) throws DatabaseException {
+                            ComponentTypeCommands.setMonitorExpression(graph, data.componentType, resource, newValue);
+                        }
+                    }, VALIDATE_MONITOR_EXPRESSION);
+                    break;
+
+                case 3:
+                    data.editUnit(table, editor, propertyInfo, selectedItem, column);
+                    break;
+
+                case 4:
+                    data.editValue(table, editor, propertyInfo, selectedItem, column, propertyInfo.immutable ? null : new StringWriter() {
+                        @Override
+                        public void perform(WriteGraph graph, String newValue) throws DatabaseException {
+                            graph.markUndoPoint();
+                            String value = newValue.isEmpty() ? null : newValue;
+                            ComponentTypeCommands.setLabel(graph, resource, value);
+                        }
+                    }, null);
+                    break;
+
+                case 5:
+                    data.editMultilineText(table, editor, propertyInfo, selectedItem, selectedItemBounds, column, new StringWriter() {
+                        @Override
+                        public void perform(WriteGraph graph, String newValue) throws DatabaseException {
+                            graph.markUndoPoint();
+                            String value = newValue.isEmpty() ? null : newValue;
+                            ComponentTypeCommands.setDescription(graph, resource, value);
+                        }
+                    });
+                    break;
+                }
+            }
+
+        });
+
+        // Buttons
+
+        Composite buttons = tk.createComposite(sectionBody);
+        GridDataFactory.fillDefaults().applyTo(buttons);
+        GridLayoutFactory.fillDefaults().applyTo(buttons);
+
+        newProperty = tk.createButton(buttons, Messages.DerivedPropertiesSection_NewProperty, SWT.PUSH);
+        GridDataFactory.fillDefaults().applyTo(newProperty);
+        removeProperty = tk.createButton(buttons, Messages.DerivedPropertiesSection_RemoveProperty, SWT.PUSH);
+        GridDataFactory.fillDefaults().applyTo(removeProperty);
+
+        // Actions
+
+        newProperty.addSelectionListener(new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                if(editor.getEditor() != null)
+                    editor.getEditor().dispose();
+                Simantics.getSession().async(new WriteRequest() {
+                    @Override
+                    public void perform(WriteGraph graph)
+                            throws DatabaseException {
+                        ComponentTypeCommands.createMonitorPropertyWithDefaults(graph, data.componentType);
+                    }
+                });
+            }
+        });
+
+        removeProperty.addSelectionListener(new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                if(editor.getEditor() != null)
+                    editor.getEditor().dispose();
+                final List<Resource> propertiesToBeRemoved = 
+                        new ArrayList<>();
+                for(TableItem item : table.getSelection())
+                    propertiesToBeRemoved.add(((ComponentTypeViewerPropertyInfo)item.getData()).resource);
+                //System.out.println("remove " + propertiesToBeRemoved.size() + " resources");
+                if(!propertiesToBeRemoved.isEmpty())
+                    Simantics.getSession().async(new WriteRequest() {
+                        @Override
+                        public void perform(WriteGraph graph)
+                                throws DatabaseException {
+                            graph.markUndoPoint();
+                            for(Resource property : propertiesToBeRemoved)
+                                ComponentTypeCommands.removeProperty(graph, data.componentType, property);
+                        }
+                    });
+            }
+        });
+    }
+
+    @Override
+    public void setReadOnly(boolean readOnly) {
+        boolean e = !readOnly;
+        newProperty.setEnabled(e);
+        removeProperty.setEnabled(e);
+    }
+
+    public static String validateMonitorExpression(final RequestProcessor processor, final Resource componentType, final Resource relation, final String expression) {
+
+        if (expression.trim().isEmpty()) {
+            return Messages.DerivedPropertiesSection_ExpressionIsEmpty;
+        }
+
+        if (expression.trim().isEmpty()) {
+            return Messages.DerivedPropertiesSection_ExpressionIsEmpty;
+        }
+        try {
+            return processor.sync(new UniqueRead<String>() {
+
+                @Override
+                public String perform(ReadGraph graph) throws DatabaseException {
+
+                    StructuralResource2 STR = StructuralResource2.getInstance(graph);
+
+                    // TODO: this is a bit hackish but should get the job done in most parts and
+                    // importantly indicates something for the user
+                    PropertyInfo info = graph.syncRequest(new PropertyInfoRequest(relation), TransientCacheAsyncListener.<PropertyInfo>instance());
+                    Variable parent = new StandardGraphChildVariable(null, null, componentType) {
+                        
+                        public Resource getType(ReadGraph graph) throws DatabaseException {
+                            return componentType;
+                        };
+                        
+                        public Variable getPossibleProperty(ReadGraph graph, String name) throws DatabaseException {
+                            Variable prop = super.getPossibleProperty(graph, name);
+                            if (prop != null) {
+                                return prop;
+                            } else {
+                                return getChild(graph, name);
+                            }
+                        };
+                    };
+                    
+                    for(Resource literal : graph.getAssertedObjects(componentType, relation)) {
+
+                        try {
+                            Variable context = new StandardGraphPropertyVariable(parent, null, null, info, literal);
+                            if(graph.isInstanceOf(componentType, STR.ProceduralComponentType)) {
+                                CompileProceduralSCLMonitorRequest.compileAndEvaluate(graph, context);
+                            } else {
+                                compileAndEvaluate(graph, context, expression);
+                            }
+                            
+                        } catch (Exception e) {
+                            String msg = e.getMessage();
+                            int index = msg.indexOf(":"); //$NON-NLS-1$
+                            if(index > 0) msg = msg.substring(index);
+                            return msg;
+                        }
+                    }
+                    return null;
+                }
+                
+            });
+        } catch (DatabaseException e) {
+            LOGGER.error("Could not validate ", e);
+        }
+        return null;
+    }
+
+    public static void compileAndEvaluate(ReadGraph graph, Variable context, String expression) throws DatabaseException {
+        SCLContext sclContext = SCLContext.getCurrent();
+        Object oldGraph = sclContext.get("graph");
+        try {
+            CompileSCLMonitorRequest compileSCLMonitorRequest = new ValidationCompilationRequest(graph, context, expression);
+            Function1<Variable,Object> exp = graph.syncRequest(compileSCLMonitorRequest);
+            sclContext.put("graph", graph);
+            //return exp.apply(context.getParent(graph));
+        } catch (DatabaseException e) {
+            throw (DatabaseException)e;
+        } catch (Throwable t) {
+            throw new DatabaseException(t);
+        } finally {
+            sclContext.put("graph", oldGraph);
+        }
+    }
+    
+    @Override
+    public void update(ComponentTypePropertiesResult result) {
+        if (table.isDisposed())
+            return;
+
+        Set<ComponentTypeViewerPropertyInfo> selected = new HashSet<>();
+        List<TableItem> selectedItems = new ArrayList<TableItem>(selected.size());
+        for (int i : table.getSelectionIndices()) {
+            TableItem item = table.getItem(i);
+            selected.add((ComponentTypeViewerPropertyInfo) item.getData());
+        }
+        
+        int topIndex = table.getTopIndex();
+        table.removeAll();
+        if(editor.getEditor() != null)
+            editor.getEditor().dispose();
+        
+        for(ComponentTypeViewerPropertyInfo info : result.getProperties()) {
+            boolean immutable = result.isImmutable() || info.immutable;
+            Color fg = immutable ? table.getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY) : null;
+            if(info.sectionSpecificData != MONITOR)
+                continue;
+
+            TableItem item = new TableItem(table, SWT.NONE);
+
+            item.setText(0, info.valid != null ? info.name + " (!)" : info.name); //$NON-NLS-1$
+            item.setText(1, info.type);
+            item.setText(2, info.expression);
+            item.setText(3, info.unitString());
+            item.setText(4, info.label);
+            item.setText(5, info.description);
+
+            if (info.valid != null)
+                item.setBackground(table.getDisplay().getSystemColor(SWT.COLOR_RED));
+            
+            item.setForeground(fg);
+
+            item.setData(info);
+
+            if (selected.contains(info))
+                selectedItems.add(item);
+        }
+        
+        new DefaultToolTip(table, ToolTip.NO_RECREATE, false) {
+
+            @Override
+            protected boolean shouldCreateToolTip(Event event) {
+                TableItem item = table.getItem(new Point(event.x, event.y));
+                if (item != null) {
+                    ComponentTypeViewerPropertyInfo info = (ComponentTypeViewerPropertyInfo) item.getData();
+                    return info.valid != null;
+                }
+                return false;
+            }
+
+            @Override
+            protected String getText(Event event) {
+                TableItem item = table.getItem(new Point(event.x, event.y));
+                if (item != null) {
+                    ComponentTypeViewerPropertyInfo info = (ComponentTypeViewerPropertyInfo) item.getData();
+                    return info.valid.replaceAll("\n", "");
+                }
+                return super.getText(event);
+            }
+        };
+        
+        table.setTopIndex(topIndex);
+        table.setSelection(selectedItems.toArray(new TableItem[selectedItems.size()]));
+        table.redraw();
+    }
+
+    @Override
+    public Section getSection() {
+        return section;
+    }
+
+    @Override
+    public double getPriority() {
+        return 100.0;
+    }
+
+    private static final Object MONITOR = new Object();
+    
+    @Override
+    public Object getSectionSpecificData(ReadGraph graph,
+            ComponentTypeViewerPropertyInfo info) throws DatabaseException {
+        Layer0 L0 = Layer0.getInstance(graph);
+        StructuralResource2 STR = StructuralResource2.getInstance(graph);
+        Resource range = graph.getPossibleObject(info.resource, L0.HasRange);
+        if(range != null && graph.isInstanceOf(range, STR.MonitorValueType))
+            return MONITOR;
+        else
+            return null;
+    }
+    
+    @Override
+    public double getDataPriority() {
+        return 100.0;
+    }
+
+    private static final class ValidationCompilationRequest extends CompileSCLMonitorRequest {
+        private final String expression;
+    
+        private ValidationCompilationRequest(ReadGraph graph, Variable context, String expression)
+                throws DatabaseException {
+            super(graph, context);
+            this.expression = expression;
+        }
+    
+        @Override
+        protected String getExpressionText(ReadGraph graph) throws DatabaseException {
+            return expression;
+        }
+    
+        @Override
+        public int hashCode() {
+            return super.hashCode() + 37 * expression.hashCode();
+        }
+    
+        @Override
+        public boolean equals(Object obj) {
+            return super.equals(obj) && ((ValidationCompilationRequest)obj).expression.equals(expression);
+        }
+    }
+
+}
\ No newline at end of file