Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 395290
Collapse All | Expand All

(-)src/org/eclipse/emf/ecp/emfstore/core/internal/EMFStoreProvider.java (-1 / +6 lines)
Lines 400-406 Link Here
400
400
401
		if (element instanceof EObject) {
401
		if (element instanceof EObject) {
402
			EObject eObject = (EObject) element;
402
			EObject eObject = (EObject) element;
403
			ProjectSpace ps = WorkspaceManager.getProjectSpace(eObject);
403
			ProjectSpace ps = null;
404
			try {
405
				ps = WorkspaceManager.getProjectSpace(eObject);
406
			} catch (IllegalArgumentException iae) {
407
				return null;
408
			}
404
			if (ps != null) {
409
			if (ps != null) {
405
				ECPModelContext context = getModelContextFromAdapter(ps.getProject());
410
				ECPModelContext context = getModelContextFromAdapter(ps.getProject());
406
				if (context != null) {
411
				if (context != null) {
(-)src/org/eclipse/emf/ecp/validation/connector/ValidationServiceProvider.java (-1 / +19 lines)
Lines 10-18 Link Here
10
 ******************************************************************************/
10
 ******************************************************************************/
11
package org.eclipse.emf.ecp.validation.connector;
11
package org.eclipse.emf.ecp.validation.connector;
12
12
13
import java.util.ArrayList;
14
import java.util.Collection;
13
import java.util.HashMap;
15
import java.util.HashMap;
16
import java.util.List;
14
import java.util.Map;
17
import java.util.Map;
15
18
19
import org.eclipse.emf.common.util.EList;
20
import org.eclipse.emf.ecore.EObject;
16
import org.eclipse.emf.ecp.core.ECPProject;
21
import org.eclipse.emf.ecp.core.ECPProject;
17
import org.eclipse.emf.ecp.ui.common.IExcludedObjectsCallback;
22
import org.eclipse.emf.ecp.ui.common.IExcludedObjectsCallback;
18
import org.eclipse.emf.ecp.validation.api.IValidationService;
23
import org.eclipse.emf.ecp.validation.api.IValidationService;
Lines 51-60 Link Here
51
				}
56
				}
52
			});
57
			});
53
			mapping.put(validationServiceObject, validationService);
58
			mapping.put(validationServiceObject, validationService);
59
			if (validationServiceObject instanceof ECPProject) {
60
				ECPProject project = (ECPProject) validationServiceObject;
61
				validationService.validate(getOnlyEobjects(project.getElements()));
62
			}
54
			return validationService;
63
			return validationService;
55
		}
64
		}
56
		
65
		
57
		return mapping.get(validationServiceObject);
66
		return mapping.get(validationServiceObject);
58
	}
67
	}
59
68
	
69
	private Collection<EObject> getOnlyEobjects(EList<? extends Object> elements) {
70
		List<EObject> result = new ArrayList<EObject>();
71
		for (Object o : elements) {
72
			if (EObject.class.isInstance(o)) {
73
				result.add((EObject) o);
74
			}
75
		}
76
		return result;
77
	}
60
}
78
}

Return to bug 395290