diff options
author | Lars Vogel | 2019-09-14 03:15:08 +0000 |
---|---|---|
committer | Karsten Thoms | 2019-09-16 13:30:50 +0000 |
commit | e3e7d2ec4094bef4e9ea0cc5e733be3fff74fd9a (patch) | |
tree | 24eeaa4bf95b057df330daf04697c34d92c28e1e | |
parent | 0aaf26bd4d6fca6e5f422776da29d4bd9b37aa42 (diff) | |
download | eclipse.platform.text-e3e7d2ec4094bef4e9ea0cc5e733be3fff74fd9a.tar.gz eclipse.platform.text-e3e7d2ec4094bef4e9ea0cc5e733be3fff74fd9a.tar.xz eclipse.platform.text-e3e7d2ec4094bef4e9ea0cc5e733be3fff74fd9a.zip |
Bug 551070 - Use multicatch blocks if possible
Version bump for 4.14
Change-Id: I7d029cc8e464524f07c7ac9bb2a943fd2305ebb8
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Also-by: Karsten Thoms <karsten.thoms@itemis.de>
6 files changed, 6 insertions, 16 deletions
diff --git a/org.eclipse.core.filebuffers/META-INF/MANIFEST.MF b/org.eclipse.core.filebuffers/META-INF/MANIFEST.MF index 1289335be54..a017a7bcb57 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.6.700.qualifier +Bundle-Version: 3.6.800.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 b79bab3acff..6ff12059f39 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.6.700-SNAPSHOT</version> + <version>3.6.800-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreFileBuffer.java index 5136d4fad34..c2f7a6c4a67 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreFileBuffer.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreFileBuffer.java @@ -126,10 +126,7 @@ public abstract class FileStoreFileBuffer extends AbstractFileBuffer { try { commitFileBufferContent(monitor, overwrite); - } catch (CoreException x) { - fManager.fireStateChangeFailed(this); - throw x; - } catch (RuntimeException x) { + } catch (CoreException | RuntimeException x) { fManager.fireStateChangeFailed(this); throw x; } 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 06f91f8c374..289de5dcf0f 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 @@ -353,9 +353,7 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex if (fEncoding == null) fEncoding= description.getCharset(); } - } catch (CoreException e) { - // do nothing - } catch (IOException e) { + } catch (CoreException | IOException e) { // do nothing } diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java index 200695559bb..49371841ee6 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java @@ -315,10 +315,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { try { commitFileBufferContent(monitor, overwrite); - } catch (CoreException x) { - fManager.fireStateChangeFailed(this); - throw x; - } catch (RuntimeException x) { + } catch (CoreException | RuntimeException x) { fManager.fireStateChangeFailed(this); throw x; } diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java index 64d10a357b4..089709dcb7c 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java @@ -276,9 +276,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { if (type != null) return type.isKindOf(TEXT_CONTENT_TYPE); } - } catch (CoreException ex) { - // ignore: API specification tells return true if content type can't be determined - } catch (IOException ex) { + } catch (CoreException | IOException ex) { // ignore: API specification tells return true if content type can't be determined } |