X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.browsing.ui.nattable%2Fsrc%2Forg%2Fsimantics%2Fbrowsing%2Fui%2Fnattable%2FNatTableGraphExplorer.java;h=be6a73a0c05dbff44a460e4b5de85bd9000947fb;hp=3bb05553dc7456e073d52b44e526688c2beffdc0;hb=6a6726b1ee9c2e78971d26b50f15b867cc7c5a02;hpb=c26409b1caf2f1e560d37c5befd11b442399c3fe

diff --git a/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/NatTableGraphExplorer.java b/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/NatTableGraphExplorer.java
index 3bb05553d..be6a73a0c 100644
--- a/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/NatTableGraphExplorer.java
+++ b/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/NatTableGraphExplorer.java
@@ -141,6 +141,7 @@ import org.simantics.browsing.ui.PrimitiveQueryUpdater;
 import org.simantics.browsing.ui.SelectionDataResolver;
 import org.simantics.browsing.ui.SelectionFilter;
 import org.simantics.browsing.ui.StatePersistor;
+import org.simantics.browsing.ui.common.AdaptableHintContext;
 import org.simantics.browsing.ui.common.ColumnKeys;
 import org.simantics.browsing.ui.common.ErrorLogger;
 import org.simantics.browsing.ui.common.NodeContextBuilder;
@@ -178,7 +179,6 @@ import org.simantics.browsing.ui.content.Labeler.EnumerationModifier;
 import org.simantics.browsing.ui.content.Labeler.Modifier;
 import org.simantics.browsing.ui.nattable.override.DefaultTreeLayerConfiguration2;
 import org.simantics.browsing.ui.swt.Activator;
-import org.simantics.browsing.ui.swt.AdaptableHintContext;
 import org.simantics.browsing.ui.swt.DefaultImageDecoratorsProcessor;
 import org.simantics.browsing.ui.swt.DefaultIsExpandedProcessor;
 import org.simantics.browsing.ui.swt.DefaultLabelDecoratorsProcessor;
@@ -1313,6 +1313,7 @@ public class NatTableGraphExplorer extends GraphExplorerImplBase implements Grap
 //	    			} else {
 //	    				viewer.refresh(element,true);
 //	    			}
+    				element.initData();
     				natTable.redraw();
     			}
     			
@@ -1505,7 +1506,7 @@ public class NatTableGraphExplorer extends GraphExplorerImplBase implements Grap
     final ExecutorService                        queryUpdateScheduler = Threads.getExecutor();
     
     
-	private double getDisplayScale() {
+    public static double getDisplayScale() {
 		Point dpi = Display.getCurrent().getDPI();
 		return (double)dpi.x/96.0;
 	}
@@ -1858,10 +1859,9 @@ public class NatTableGraphExplorer extends GraphExplorerImplBase implements Grap
 			if (modifier == null)
 				return false;
 			
-			String err =  modifier.isValid(newValue.toString());
+			String err =  modifier.isValid(newValue != null ? newValue.toString() : "");
 			if (err == null)
 				return true;
-			modifier.isValid(newValue.toString());
 			throw new ValidationFailedException(err);
     	}
     }