| commit | cd2809f7b95726edb3231a1e11a208e60acc74d8 | [log] [tgz] |
|---|---|---|
| author | Henrik Rentz-Reichert <hrr@protos.de> | Sat Nov 26 19:30:33 2016 +0100 |
| committer | Henrik Rentz-Reichert <hrr@protos.de> | Sat Nov 26 19:30:33 2016 +0100 |
| tree | 57c8887222274b21831c372724c1caf2bfab3d34 | |
| parent | 0e349e78bdf554a49fc35739e2b1ecc865f4fe3e [diff] |
Added some null checks
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 b848266..912f9f3 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 @@ @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 e7b4e0e..f328a99 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 @@ @Override public final boolean hasDoneChanges() { + if (changeRecorder==null) + return false; + return changeRecorder.hasResourceChanged(); }