Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormvelten2013-03-26 10:22:38 -0400
committermvelten2013-03-26 10:22:38 -0400
commitd77c7c28d6f751df23beec08df03f072bd1ac593 (patch)
treeb73207b7bca136384a0aeaf80ea1c01492c9cfcd /plugins/team
parent37f2a2d722aecfd6c0e18e484de5a581098369a3 (diff)
downloadorg.eclipse.papyrus-d77c7c28d6f751df23beec08df03f072bd1ac593.tar.gz
org.eclipse.papyrus-d77c7c28d6f751df23beec08df03f072bd1ac593.tar.xz
org.eclipse.papyrus-d77c7c28d6f751df23beec08df03f072bd1ac593.zip
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
Diffstat (limited to 'plugins/team')
-rw-r--r--plugins/team/org.eclipse.papyrus.team.svn/src/org/eclipse/papyrus/team/svn/SVNLockHandler.java7
1 files changed, 4 insertions, 3 deletions
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<Boolean> anyReadOnly(URI[] uris, EditingDomain editingDomain) {
+ public Optional<Boolean> 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<Boolean> makeWritable(URI[] uris, EditingDomain editingDomain) {
+ public Optional<Boolean> makeWritable(URI[] uris) {
if (validator != null) {
IStatus result = validator.validateEdit(getIFiles(uris), FileModificationValidationContext.VALIDATE_PROMPT);
return Optional.of(result.isOK());

Back to the top