diff options
author | Markus Keller | 2014-07-23 10:40:32 +0000 |
---|---|---|
committer | Markus Keller | 2014-07-23 10:40:32 +0000 |
commit | d56bba4f24a0146004c81751d1bb9c0766debd3d (patch) | |
tree | 2ece8ba39459bb4588d0d5352064a9c8c56c8a72 /org.eclipse.core.filebuffers | |
parent | a19c8c64d3a29cb93630e7fa887ba37518374a5c (diff) | |
download | eclipse.platform.text-d56bba4f24a0146004c81751d1bb9c0766debd3d.tar.gz eclipse.platform.text-d56bba4f24a0146004c81751d1bb9c0766debd3d.tar.xz eclipse.platform.text-d56bba4f24a0146004c81751d1bb9c0766debd3d.zip |
Bug 436581: Test failure in RenameTests18.testLambda3 and testMethod0-2I20140804-0800I20140803-2000I20140729-0800
Diffstat (limited to 'org.eclipse.core.filebuffers')
5 files changed, 15 insertions, 10 deletions
diff --git a/org.eclipse.core.filebuffers/META-INF/MANIFEST.MF b/org.eclipse.core.filebuffers/META-INF/MANIFEST.MF index 75f1e1ddea0..2664749eab8 100644 --- a/org.eclipse.core.filebuffers/META-INF/MANIFEST.MF +++ b/org.eclipse.core.filebuffers/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.core.filebuffers; singleton:=true -Bundle-Version: 3.5.400.qualifier +Bundle-Version: 3.5.500.qualifier Bundle-Activator: org.eclipse.core.internal.filebuffers.FileBuffersPlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/org.eclipse.core.filebuffers/pom.xml b/org.eclipse.core.filebuffers/pom.xml index d84d7e21e85..f5f3f7cdc86 100644 --- a/org.eclipse.core.filebuffers/pom.xml +++ b/org.eclipse.core.filebuffers/pom.xml @@ -18,6 +18,6 @@ </parent> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.filebuffers</artifactId> - <version>3.5.400-SNAPSHOT</version> + <version>3.5.500-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileBuffersMessages.properties b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileBuffersMessages.properties index 817d8c2362a..d7bf0552424 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileBuffersMessages.properties +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileBuffersMessages.properties @@ -16,7 +16,7 @@ ResourceFileBuffer_error_cannot_determine_URI= Cannot determine URI for ''{0}''. ResourceFileBuffer_warning_fileIsDerived= This file is derived and does not allow to be modified. ResourceFileBuffer_stateValidationFailed= State validation failed. -FileBuffer_error_outOfSync= The file is not synchronized with the local file system. +FileBuffer_error_outOfSync= File is not synchronized with the local file system: {0} FileBuffer_status_error= Error FileBuffer_error_queryContentDescription= Could not query content description for: {0} diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreTextFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreTextFileBuffer.java index dc713540285..74a69a2ba12 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreTextFileBuffer.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreTextFileBuffer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2013 IBM Corporation and others. + * Copyright (c) 2007, 2014 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -418,8 +418,10 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex * @see org.eclipse.core.internal.filebuffers.FileBuffer#commitFileBufferContent(org.eclipse.core.runtime.IProgressMonitor, boolean) */ protected void commitFileBufferContent(IProgressMonitor monitor, boolean overwrite) throws CoreException { - if (!isSynchronized() && !overwrite) - throw new CoreException(new Status(IStatus.WARNING, FileBuffersPlugin.PLUGIN_ID, IResourceStatus.OUT_OF_SYNC_LOCAL, FileBuffersMessages.FileBuffer_error_outOfSync, null)); + if (!isSynchronized() && !overwrite) { + String message= NLSUtility.format(FileBuffersMessages.FileBuffer_error_outOfSync, getFileStore().toURI()); + throw new CoreException(new Status(IStatus.WARNING, FileBuffersPlugin.PLUGIN_ID, IResourceStatus.OUT_OF_SYNC_LOCAL, message, null)); + } String encoding= computeEncoding(); @@ -624,7 +626,8 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex */ private void checkSynchronizationState() throws CoreException { if (!isSynchronized()) { - Status status= new Status(IStatus.ERROR, FileBuffersPlugin.PLUGIN_ID, 274 /* IResourceStatus.OUT_OF_SYNC_LOCAL */, FileBuffersMessages.FileBuffer_error_outOfSync, null); + String message= NLSUtility.format(FileBuffersMessages.FileBuffer_error_outOfSync, getFileStore().toURI()); + Status status= new Status(IStatus.ERROR, FileBuffersPlugin.PLUGIN_ID, 274 /* IResourceStatus.OUT_OF_SYNC_LOCAL */, message, null); throw new CoreException(status); } } diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBuffer.java index a13cff04671..c2de3c73409 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBuffer.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBuffer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2014 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -334,8 +334,10 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF * @see org.eclipse.core.internal.filebuffers.FileBuffer#commitFileBufferContent(org.eclipse.core.runtime.IProgressMonitor, boolean) */ protected void commitFileBufferContent(IProgressMonitor monitor, boolean overwrite) throws CoreException { - if (!isSynchronized() && !overwrite) - throw new CoreException(new Status(IStatus.WARNING, FileBuffersPlugin.PLUGIN_ID, IResourceStatus.OUT_OF_SYNC_LOCAL, FileBuffersMessages.FileBuffer_error_outOfSync, null)); + if (!isSynchronized() && !overwrite) { + String message= NLSUtility.format(FileBuffersMessages.FileBuffer_error_outOfSync, getFileStore().toURI()); + throw new CoreException(new Status(IStatus.WARNING, FileBuffersPlugin.PLUGIN_ID, IResourceStatus.OUT_OF_SYNC_LOCAL, message, null)); + } String encoding= computeEncoding(); |