diff options
Diffstat (limited to 'plugins/org.eclipse.etrice.ui.common.base/src')
2 files changed, 6 insertions, 0 deletions
diff --git a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/AbstractPropertyDialog.java b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/AbstractPropertyDialog.java index b8482662d..912f9f31a 100644 --- a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/AbstractPropertyDialog.java +++ b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/AbstractPropertyDialog.java @@ -205,6 +205,9 @@ public abstract class AbstractPropertyDialog extends FormDialog { @Override public Object convert(Object fromObject) { + if (fromObject==null) + return ""; + return ((Enumerator)fromObject).getLiteral(); } } diff --git a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/support/ChangeAwareCreateConnectionFeature.java b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/support/ChangeAwareCreateConnectionFeature.java index e7b4e0e4a..f328a9986 100644 --- a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/support/ChangeAwareCreateConnectionFeature.java +++ b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/support/ChangeAwareCreateConnectionFeature.java @@ -45,6 +45,9 @@ public abstract class ChangeAwareCreateConnectionFeature extends @Override public final boolean hasDoneChanges() { + if (changeRecorder==null) + return false; + return changeRecorder.hasResourceChanged(); } |