diff options
Diffstat (limited to 'bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal')
-rw-r--r-- | bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/DefaultFileModificationValidator.java | 14 | ||||
-rw-r--r-- | bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/FileModificationValidatorManager.java (renamed from bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/FileModificationValidator.java) | 9 | ||||
-rw-r--r-- | bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/messages.properties | 4 |
3 files changed, 14 insertions, 13 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/DefaultFileModificationValidator.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/DefaultFileModificationValidator.java index 0afef8cab..554850edb 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/DefaultFileModificationValidator.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/DefaultFileModificationValidator.java @@ -19,11 +19,10 @@ import org.eclipse.team.core.TeamPlugin; public class DefaultFileModificationValidator implements IFileModificationValidator { private static final Status OK = new Status(Status.OK, TeamPlugin.ID, Status.OK, Policy.bind("FileModificationValidator.ok"), null); //$NON-NLS-1$ - private static final Status READ_ONLY = new Status(Status.ERROR, TeamPlugin.ID, Status.ERROR, Policy.bind("FileModificationValidator.isReadOnly"), null); //$NON-NLS-1$ private IStatus getDefaultStatus(IFile file) { return file.isReadOnly() - ? READ_ONLY + ? new Status(Status.ERROR, TeamPlugin.ID, Status.ERROR, Policy.bind("FileModificationValidator.fileIsReadOnly", file.getFullPath().toString()), null) //$NON-NLS-1$ : OK; } @@ -36,12 +35,21 @@ public class DefaultFileModificationValidator implements IFileModificationValida } IStatus[] stati = new Status[files.length]; + boolean allOK = true; for (int i = 0; i < files.length; i++) { stati[i] = getDefaultStatus(files[i]); + if(! stati[i].isOK()) + allOK = false; } - return new MultiStatus(TeamPlugin.ID, 0, stati, Policy.bind("FileModificationValidator.validateEdit"), null); //$NON-NLS-1$ + return new MultiStatus(TeamPlugin.ID, + 0, stati, + Policy.bind( + allOK + ? "FileModificationValidator.ok" //$NON-NLS-1$ + : "FileModificationValidator.someReadOnly" ), //$NON-NLS-1$ + null); } /** diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/FileModificationValidator.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/FileModificationValidatorManager.java index dab2c7fb5..13ec6971c 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/FileModificationValidator.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/FileModificationValidatorManager.java @@ -18,16 +18,9 @@ import org.eclipse.core.runtime.Status; import org.eclipse.team.core.RepositoryProvider; import org.eclipse.team.core.TeamPlugin; -public class FileModificationValidator implements IFileModificationValidator { +public class FileModificationValidatorManager implements IFileModificationValidator { private static final IFileModificationValidator DEFAULT_VALIDATOR = new DefaultFileModificationValidator(); - - private static final Status OK = new Status(Status.OK, TeamPlugin.ID, - Status.OK, - Policy.bind("FileModificationValidator.ok"), null); //$NON-NLS-1$ - private static final Status READ_ONLY = new Status(Status.ERROR, TeamPlugin.ID, - Status.ERROR, - Policy.bind("FileModificationValidator.isReadOnly"), null); //$NON-NLS-1$ /* * @see IFileModificationValidator#validateEdit(IFile[], Object) diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/messages.properties b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/messages.properties index 61e92c662..adad17eed 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/messages.properties +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/messages.properties @@ -16,8 +16,8 @@ manager.errorRemovingNature=Error removing nature {1} on project {0}. manager.badClassType=Error creating validator decorator: bad class type manager.coreException=Error creating validator decorator: core exception -FileModificationValidator.validateEdit=Validate Edit -FileModificationValidator.isReadOnly=File is Read Only. +FileModificationValidator.someReadOnly=Some files are read-only. +FileModificationValidator.fileIsReadOnly=File {0} is read-only. FileModificationValidator.ok=OK RepositoryProvider_Error_removing_nature_from_project___1=Error removing nature from project: |