From d77c7c28d6f751df23beec08df03f072bd1ac593 Mon Sep 17 00:00:00 2001 From: mvelten Date: Tue, 26 Mar 2013 14:22:38 +0000 Subject: 396735: [Read only] corrupted model because of half saved model https://bugs.eclipse.org/bugs/show_bug.cgi?id=396735 simplify IReadOnlyHandler (remove editing domain in the interface methods since we retrieve it by adapting an editing domain) move most EMFHelper methods in infra.tools handle trackingModification in the modelset in a way similar to the one used in ResourceImpl, setTrackingModification can now be called directly on the ModelSet --- .../src/org/eclipse/papyrus/team/svn/SVNLockHandler.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'plugins/team') diff --git a/plugins/team/org.eclipse.papyrus.team.svn/src/org/eclipse/papyrus/team/svn/SVNLockHandler.java b/plugins/team/org.eclipse.papyrus.team.svn/src/org/eclipse/papyrus/team/svn/SVNLockHandler.java index fd82e369c43..f40ac894de2 100644 --- a/plugins/team/org.eclipse.papyrus.team.svn/src/org/eclipse/papyrus/team/svn/SVNLockHandler.java +++ b/plugins/team/org.eclipse.papyrus.team.svn/src/org/eclipse/papyrus/team/svn/SVNLockHandler.java @@ -36,14 +36,15 @@ public class SVNLockHandler extends AbstractReadOnlyHandler { FileModificationValidator validator = null; - public SVNLockHandler() { + public SVNLockHandler(EditingDomain editingDomain) { + super(editingDomain); try { validator = new SVNTeamModificationValidator(); } catch (NoClassDefFoundError e) { } } - public Optional anyReadOnly(URI[] uris, EditingDomain editingDomain) { + public Optional anyReadOnly(URI[] uris) { if (validator != null) { IResource[] needsLockResources = FileUtility.filterResources(getIFiles(uris), IStateFilter.SF_NEEDS_LOCK, IResource.DEPTH_ZERO); @@ -57,7 +58,7 @@ public class SVNLockHandler extends AbstractReadOnlyHandler { return Optional.absent(); } - public Optional makeWritable(URI[] uris, EditingDomain editingDomain) { + public Optional makeWritable(URI[] uris) { if (validator != null) { IStatus result = validator.validateEdit(getIFiles(uris), FileModificationValidationContext.VALIDATE_PROMPT); return Optional.of(result.isOK()); -- cgit v1.2.3