Attachment 224667 Details for Bug 395290 – avoids exceptions to be thrown, adds validation on startup.

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] avoids exceptions to be thrown, adds validation on startup.

validationDecorator.patch (text/plain), 2.39 KB, created by Tobias Verhoeven

on 2012-12-13 09:34:00 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Verhoeven

Created: 2012-12-13 09:34:00 EST

Size: 2.39 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.emf.ecp.emfstore.core
>diff --git src/org/eclipse/emf/ecp/emfstore/core/internal/EMFStoreProvider.java src/org/eclipse/emf/ecp/emfstore/core/internal/EMFStoreProvider.java
>index be89696..0a23444 100644
>--- src/org/eclipse/emf/ecp/emfstore/core/internal/EMFStoreProvider.java
>+++ src/org/eclipse/emf/ecp/emfstore/core/internal/EMFStoreProvider.java
>@@ -400,7 +400,12 @@
> 
> 		if (element instanceof EObject) {
> 			EObject eObject = (EObject) element;
>-			ProjectSpace ps = WorkspaceManager.getProjectSpace(eObject);
>+			ProjectSpace ps = null;
>+			try {
>+				ps = WorkspaceManager.getProjectSpace(eObject);
>+			} catch (IllegalArgumentException iae) {
>+				return null;
>+			}
> 			if (ps != null) {
> 				ECPModelContext context = getModelContextFromAdapter(ps.getProject());
> 				if (context != null) {
>#P org.eclipse.emf.ecp.validation.connector
>diff --git src/org/eclipse/emf/ecp/validation/connector/ValidationServiceProvider.java src/org/eclipse/emf/ecp/validation/connector/ValidationServiceProvider.java
>index 80e1e52..b5e6d11 100644
>--- src/org/eclipse/emf/ecp/validation/connector/ValidationServiceProvider.java
>+++ src/org/eclipse/emf/ecp/validation/connector/ValidationServiceProvider.java
>@@ -10,9 +10,14 @@
>  ******************************************************************************/
> package org.eclipse.emf.ecp.validation.connector;
> 
>+import java.util.ArrayList;
>+import java.util.Collection;
> import java.util.HashMap;
>+import java.util.List;
> import java.util.Map;
> 
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.ecp.core.ECPProject;
> import org.eclipse.emf.ecp.ui.common.IExcludedObjectsCallback;
> import org.eclipse.emf.ecp.validation.api.IValidationService;
>@@ -51,10 +56,23 @@
> 				}
> 			});
> 			mapping.put(validationServiceObject, validationService);
>+			if (validationServiceObject instanceof ECPProject) {
>+				ECPProject project = (ECPProject) validationServiceObject;
>+				validationService.validate(getOnlyEobjects(project.getElements()));
>+			}
> 			return validationService;
> 		}
> 		
> 		return mapping.get(validationServiceObject);
> 	}
>-
>+	
>+	private Collection<EObject> getOnlyEobjects(EList<? extends Object> elements) {
>+		List<EObject> result = new ArrayList<EObject>();
>+		for (Object o : elements) {
>+			if (EObject.class.isInstance(o)) {
>+				result.add((EObject) o);
>+			}
>+		}
>+		return result;
>+	}
> }

Flags:

eneufeld: iplog+

Actions: View | Diff

Attachments on bug 395290: 224667