Added inline filtering support for property name editing in UC editor

[simantics/platform.git] / bundles / org.simantics.modeling.ui / src / org / simantics / modeling / ui / componentTypeEditor / ComponentTypeViewerData.java

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeViewerData.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeViewerData.java
index ea3f61e80fe0904251ac2cd4af2a44581717f392..b64380b285d7b76593060b2e40a6a7d09f502b8f 100644 (file)
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeViewerData.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeViewerData.java
@@ -97,6 +97,14 @@ public class ComponentTypeViewerData {
     public void editName(Table table, TableEditor editor, final ComponentTypeViewerPropertyInfo propertyInfo, TableItem selectedItem, int column,
             Pattern namePattern, DbConsumer<WriteGraph> extraWriter) {
         editName(table, editor, propertyInfo, selectedItem, column,
+                null,
+                (pInfo, name) -> validatePropertyName(pInfo, name, namePattern),
+                extraWriter);
+    }
+
+    public void editName(Table table, TableEditor editor, final ComponentTypeViewerPropertyInfo propertyInfo, TableItem selectedItem, int column,
+            Function2<ComponentTypeViewerPropertyInfo, String, String> nameFilter, Pattern namePattern, DbConsumer<WriteGraph> extraWriter) {
+        editName(table, editor, propertyInfo, selectedItem, column, nameFilter,
                 (pInfo, name) -> validatePropertyName(pInfo, name, namePattern),
                 extraWriter);
     }
@@ -109,6 +117,18 @@ public class ComponentTypeViewerData {
 
     public void editName(Table table, TableEditor editor, final ComponentTypeViewerPropertyInfo propertyInfo, TableItem selectedItem, int column,
             Function2<ComponentTypeViewerPropertyInfo, String, String> nameValidator, DbConsumer<WriteGraph> extraWriter) {
+        editName(table, editor, propertyInfo, selectedItem, column, null, nameValidator, extraWriter);
+    }
+
+    public void editName(
+            Table table,
+            TableEditor editor,
+            final ComponentTypeViewerPropertyInfo propertyInfo,
+            TableItem selectedItem,
+            int column,
+            Function2<ComponentTypeViewerPropertyInfo, String, String> nameFilter,
+            Function2<ComponentTypeViewerPropertyInfo, String, String> nameValidator,
+            DbConsumer<WriteGraph> extraWriter) {
         int extraStyle = propertyInfo.immutable ? SWT.READ_ONLY : 0;
         final Text text = new Text(table, SWT.NONE | extraStyle);
         org.eclipse.swt.widgets.Listener listener = 
@@ -118,9 +138,11 @@ public class ComponentTypeViewerData {
                 if (e.type == SWT.Dispose) {
                     form.setMessage(null);
                     return;
-                }
-
-                if (e.type == SWT.Modify) {
+                } else if (e.type == SWT.Verify) {
+                    // Filter input if necessary
+                    e.text = nameFilter != null ? nameFilter.apply(propertyInfo, e.text) : e.text;
+                    return;
+                } else if (e.type == SWT.Modify) {
                     // validate current name
                     String error = nameValidator.apply(propertyInfo, text.getText());
                     if (error != null) {
@@ -131,9 +153,7 @@ public class ComponentTypeViewerData {
                         form.setMessage(null);
                     }
                     return;
-                }
-
-                if (e.type == SWT.Traverse) {
+                } else if (e.type == SWT.Traverse) {
                     if (e.detail == SWT.TRAVERSE_ESCAPE) {
                         text.dispose();
                         e.doit = false;
@@ -177,6 +197,8 @@ public class ComponentTypeViewerData {
                 });
             }
         };
+        if (nameFilter != null)
+            text.addListener(SWT.Verify, listener);
         text.addListener(SWT.Modify, listener);
         text.addListener(SWT.Deactivate, listener);
         text.addListener(SWT.Traverse, listener);
@@ -497,7 +519,7 @@ public class ComponentTypeViewerData {
         shell.open();
     }
 
-    protected void editMultilineText(Table table, TableEditor editor,
+    public void editMultilineText(Table table, TableEditor editor,
             final ComponentTypeViewerPropertyInfo propertyInfo, TableItem selectedItem,
             Rectangle selectedItemBounds, int column, final StringWriter writer)
     {