Improve matching logic for three way UpdateTree nodes.

[simantics/interop.git] / org.simantics.interop.update / src / org / simantics / interop / update / editor / ModelUpdateEditor.java

diff --git a/org.simantics.interop.update/src/org/simantics/interop/update/editor/ModelUpdateEditor.java b/org.simantics.interop.update/src/org/simantics/interop/update/editor/ModelUpdateEditor.java
index 1779b8f6bbdaf188b1556a2c61d69669a3035374..f79b1c19dac103684dd78e01dc1a1163327159a4 100644 (file)
--- a/org.simantics.interop.update/src/org/simantics/interop/update/editor/ModelUpdateEditor.java
+++ b/org.simantics.interop.update/src/org/simantics/interop/update/editor/ModelUpdateEditor.java
@@ -40,6 +40,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
+import org.simantics.Simantics;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.Session;
@@ -51,16 +52,14 @@ import org.simantics.db.request.Read;
 import org.simantics.interop.test.GraphChanges;
 import org.simantics.interop.update.Activator;
 import org.simantics.interop.update.model.ModelUpdate;
-import org.simantics.interop.update.model.PropertyChange;
 import org.simantics.interop.update.model.ModelUpdate.WarningListener;
+import org.simantics.interop.update.model.PropertyChange;
 import org.simantics.interop.update.model.UpdateList;
 import org.simantics.interop.update.model.UpdateNode;
 import org.simantics.interop.update.model.UpdateOp;
 import org.simantics.interop.update.model.UpdateStatus;
 import org.simantics.interop.update.model.UpdateTree;
 import org.simantics.interop.utils.TableUtils;
-import org.simantics.ui.SimanticsUI;
-import org.simantics.utils.datastructures.Callback;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.ui.ExceptionUtils;
 
@@ -266,7 +265,7 @@ public abstract class ModelUpdateEditor extends Composite implements WarningList
        }
        
        protected Session getSession() {
-               return SimanticsUI.getSession();
+               return Simantics.getSession();
        }
        
        protected String getColumntTitle(int i) {
@@ -433,12 +432,9 @@ public abstract class ModelUpdateEditor extends Composite implements WarningList
                        }
                        
                        
-               }, new Callback<DatabaseException>() {
-                       @Override
-                       public void run(DatabaseException parameter) {
-                               if (parameter != null)
-                                       ExceptionUtils.logAndShowError("Cannot update model", parameter);
-                       }
+               }, e -> {
+                       if (e != null)
+                               ExceptionUtils.logAndShowError("Cannot update model", e);
                });
        }
        
@@ -609,10 +605,8 @@ public abstract class ModelUpdateEditor extends Composite implements WarningList
        private class SelectionEditingSupport extends EditingSupport {
                
                
-               @SuppressWarnings("rawtypes")
                public SelectionEditingSupport(ColumnViewer viewer) {
                        super(viewer);
-                       
                }
 
                @Override
@@ -633,7 +627,6 @@ public abstract class ModelUpdateEditor extends Composite implements WarningList
                        return pc.selected();
                }
                
-               @SuppressWarnings("unchecked")
                @Override
                protected void setValue(Object element, Object value) {
                        if (update == null || !update.isInit())