| commit | bb09ba3c5603715de67748073faaf9de5c806402 | [log] [tgz] |
|---|---|---|
| author | eneufeld <neufeld.eugen@googlemail.com> | Tue Oct 15 20:58:50 2013 +0200 |
| committer | eneufeld <neufeld.eugen@googlemail.com> | Tue Oct 15 20:58:50 2013 +0200 |
| tree | aab7ed172f2d2d8b07dfa31c2a40149a8e5e9d53 | |
| parent | 8e7f433d30cfdaaac939693af944484a94f635ad [diff] |
Bug 419116 - AddReferenceAction and NewReferenceAction throw ClassCastException
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/actions/AddReferenceAction.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/actions/AddReferenceAction.java index 0949e96..327e901 100644 --- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/actions/AddReferenceAction.java +++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/actions/AddReferenceAction.java
@@ -70,7 +70,9 @@ } } if (URL.class.isInstance(labelProviderImageResult)) { - image = Activator.getImage(obj == null ? null : (URL) labelProviderImageResult); + image = Activator.getImage((URL) labelProviderImageResult); + } else { + image = Activator.getImage((URL) null); } String overlayString = "icons/link_overlay.png";//$NON-NLS-1$ if (eReference.isContainment()) {
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/actions/NewReferenceAction.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/actions/NewReferenceAction.java index c1703b7..1fa054b 100644 --- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/actions/NewReferenceAction.java +++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/actions/NewReferenceAction.java
@@ -72,7 +72,9 @@ } } if (URL.class.isInstance(labelProviderImageResult)) { - image = Activator.getImage(obj == null ? null : (URL) labelProviderImageResult); + image = Activator.getImage((URL) labelProviderImageResult); + } else { + image = Activator.getImage((URL) null); } ImageDescriptor addOverlay = Activator.getImageDescriptor("icons/add_overlay.png");//$NON-NLS-1$