X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop.update%2Fsrc%2Forg%2Fsimantics%2Finterop%2Fupdate%2Feditor%2FModelUpdateEditor.java;fp=org.simantics.interop.update%2Fsrc%2Forg%2Fsimantics%2Finterop%2Fupdate%2Feditor%2FModelUpdateEditor.java;h=ea14039eecb0bbe3fc1c65f5c45cdf8a6c225d60;hb=0403f09aa2c8b17a99acdd6f82d893bc1cdf88fb;hp=efe67a76d96a66360baf7959e40d5def3c7a9da3;hpb=5274548dca947158883acf2565ef41ebfbf49330;p=simantics%2Finterop.git 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 efe67a7..ea14039 100644 --- 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 @@ -100,6 +100,7 @@ public abstract class ModelUpdateEditor extends Composite implements WarningList super(parent,SWT.NONE); checked = manager.createImage(Activator.imageDescriptorFromPlugin("com.famfamfam.silk", "icons/tick.png")); unchecked = manager.createImage(Activator.imageDescriptorFromPlugin("com.famfamfam.silk", "icons/cross.png")); + unchecked = manager.createImage(Activator.imageDescriptorFromPlugin("com.famfamfam.silk", "icons/cross.png")); warning = manager.createImage(Activator.imageDescriptorFromPlugin("com.famfamfam.silk", "icons/error.png")); @@ -427,6 +428,8 @@ public abstract class ModelUpdateEditor extends Composite implements WarningList protected void setInputs() { changeViewer.setInput(update.getUpdateList().getChanges()); changeBrowser.setInput(update.getUpdateTree()); + updateAllButton.setEnabled(true); + updateSelectedButton.setEnabled(true); } private void applyAll() { @@ -556,6 +559,8 @@ public abstract class ModelUpdateEditor extends Composite implements WarningList if (update == null || !update.isInit()) return null; PropertyChange pc = (PropertyChange)element; + if (pc.applied()) + return null; if (pc.selected()) return checked; else