diff options
| author | Henrik Rentz-Reichert | 2016-11-26 18:30:33 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2016-11-26 18:30:33 +0000 |
| commit | cd2809f7b95726edb3231a1e11a208e60acc74d8 (patch) | |
| tree | 57c8887222274b21831c372724c1caf2bfab3d34 /plugins/org.eclipse.etrice.ui.common.base | |
| parent | 0e349e78bdf554a49fc35739e2b1ecc865f4fe3e (diff) | |
| download | org.eclipse.etrice-cd2809f7b95726edb3231a1e11a208e60acc74d8.tar.gz org.eclipse.etrice-cd2809f7b95726edb3231a1e11a208e60acc74d8.tar.xz org.eclipse.etrice-cd2809f7b95726edb3231a1e11a208e60acc74d8.zip | |
Added some null checks
Diffstat (limited to 'plugins/org.eclipse.etrice.ui.common.base')
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(); } |