Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2015-08-24 14:41:47 +0000
committerCamille Letavernier2015-08-24 14:41:47 +0000
commit47e635da078cf3584d9ab2616b7b75314226a9bf (patch)
tree827b047201197a4750fe680ecc12f6e68853b64d /plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus
parent196f62bbe97d1c2b68144929ebd0e3e0221e6f2c (diff)
downloadorg.eclipse.papyrus-47e635da078cf3584d9ab2616b7b75314226a9bf.tar.gz
org.eclipse.papyrus-47e635da078cf3584d9ab2616b7b75314226a9bf.tar.xz
org.eclipse.papyrus-47e635da078cf3584d9ab2616b7b75314226a9bf.zip
475724: NullPointerException in
CSSStyleSheetContentProvider$1.getElements (54) https://bugs.eclipse.org/bugs/show_bug.cgi?id=475724 Change-Id: If997742a062391bbd5266c16dc17bdbb4fd5bb54 Signed-off-by: Camille Letavernier <camille.letavernier@cea.fr>
Diffstat (limited to 'plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus')
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/provider/CSSStyleSheetContentProvider.java17
1 files changed, 15 insertions, 2 deletions
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/provider/CSSStyleSheetContentProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/provider/CSSStyleSheetContentProvider.java
index 5547ba24edc..a0e22b1551d 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/provider/CSSStyleSheetContentProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/provider/CSSStyleSheetContentProvider.java
@@ -11,6 +11,8 @@
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.css.properties.provider;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -42,7 +44,7 @@ public class CSSStyleSheetContentProvider extends EMFContentProvider {
* @param feature
* The object's feature being edited
* @return
- * A content provider returning all the values valid for the given feature
+ * A content provider returning all the values valid for the given feature
*/
@Override
protected IStructuredContentProvider getSemanticProvider(EObject editedEObject, EStructuralFeature feature) {
@@ -51,7 +53,18 @@ public class CSSStyleSheetContentProvider extends EMFContentProvider {
public Object[] getElements() {
List<Object> result = new LinkedList<Object>();
- for (Resource resource : CSSStyleSheetContentProvider.this.context.eResource().getResourceSet().getResources()) {
+ if (context == null || context.eResource() == null) {
+ return new Object[0];
+ }
+ Resource contextResource = context.eResource();
+ List<Resource> resources;
+ if (contextResource.getResourceSet() == null) {
+ resources = Collections.singletonList(contextResource);
+ } else {
+ resources = new ArrayList<Resource>(contextResource.getResourceSet().getResources());
+ }
+
+ for (Resource resource : resources) {
for (Object object : resource.getContents()) {
if (object instanceof ModelStyleSheets) {
ModelStyleSheets styleSheets = (ModelStyleSheets) object;

Back to the top