diff options
10 files changed, 10 insertions, 41 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java index 513589fb08..7b3efaba40 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java @@ -181,9 +181,7 @@ public class ProjectReferenceImporter { } projectReferences.add(projectReference); - } catch (final IllegalArgumentException e) { - throw new TeamException(reference, e); - } catch (final URISyntaxException e) { + } catch (final IllegalArgumentException | URISyntaxException e) { throw new TeamException(reference, e); } } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/AssumeUnchangedOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/AssumeUnchangedOperation.java index f2f435b356..03af6b2c89 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/AssumeUnchangedOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/AssumeUnchangedOperation.java @@ -120,9 +120,7 @@ public class AssumeUnchangedOperation implements IEGitOperation { editor.commit(); progress.worked(1); } - } catch (RuntimeException e) { - throw new CoreException(Activator.error(CoreText.UntrackOperation_failed, e)); - } catch (IOException e) { + } catch (RuntimeException | IOException e) { throw new CoreException(Activator.error(CoreText.UntrackOperation_failed, e)); } finally { for (DirCache cache : caches.values()) { diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/UntrackOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/UntrackOperation.java index 34bc1d35e2..97cfe4135b 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/UntrackOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/UntrackOperation.java @@ -111,9 +111,7 @@ public class UntrackOperation implements IEGitOperation { editor.commit(); progress.worked(1); } - } catch (RuntimeException e) { - throw new CoreException(Activator.error(CoreText.UntrackOperation_failed, e)); - } catch (IOException e) { + } catch (RuntimeException | IOException e) { throw new CoreException(Activator.error(CoreText.UntrackOperation_failed, e)); } finally { for (DirCacheEditor editor : edits.values()) { diff --git a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/commit/TaskReferenceFactory.java b/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/commit/TaskReferenceFactory.java index eb1dd8b85e..d1b8455dbc 100644 --- a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/commit/TaskReferenceFactory.java +++ b/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/commit/TaskReferenceFactory.java @@ -92,9 +92,7 @@ public class TaskReferenceFactory implements IAdapterFactory { repoUrl = getRepoUrl(r); message = revCommit.getFullMessage(); timestamp = (long) revCommit.getCommitTime() * 1000; - } catch (IOException e) { - continue; - } catch (RuntimeException e) { + } catch (IOException | RuntimeException e) { continue; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/AbstractGitCloneWizard.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/AbstractGitCloneWizard.java index c7fa26d74a..e739c62598 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/AbstractGitCloneWizard.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/AbstractGitCloneWizard.java @@ -416,9 +416,7 @@ public abstract class AbstractGitCloneWizard extends Wizard { try { ProjectUtils.createProjects(records, sets, progress.newChild(1)); - } catch (InvocationTargetException e) { - Activator.logError(e.getLocalizedMessage(), e); - } catch (InterruptedException e) { + } catch (InvocationTargetException | InterruptedException e) { Activator.logError(e.getLocalizedMessage(), e); } return Status.OK_STATUS; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/HeaderText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/HeaderText.java index 81e4ea05ad..cffeeb916d 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/HeaderText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/HeaderText.java @@ -117,11 +117,7 @@ public class HeaderText { } }); updateSizeAndLocations(); - } catch (NoSuchFieldException e) { - form.setText(text); - } catch (IllegalArgumentException e) { - form.setText(text); - } catch (IllegalAccessException e) { + } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) { form.setText(text); } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchConfigurationDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchConfigurationDialog.java index 367592b7cb..900bca7abd 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchConfigurationDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchConfigurationDialog.java @@ -157,10 +157,7 @@ public class BranchConfigurationDialog extends TitleAreaDialog { addBranchItemsForLocal(); else addBranchItemsForRemote(remote); - } catch (IOException e) { - Activator.logError( - UIText.BranchConfigurationDialog_ExceptionGettingRefs, e); - } catch (URISyntaxException e) { + } catch (IOException | URISyntaxException e) { Activator.logError( UIText.BranchConfigurationDialog_ExceptionGettingRefs, e); } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java index 69c067be75..884959df4e 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java @@ -1259,10 +1259,7 @@ public class FetchGerritChangePage extends WizardPage { } Integer patchSetNumber = Integer.valueOf(m.group(3)); return new Change(refName, changeNumber, patchSetNumber); - } catch (NumberFormatException e) { - // if we can't parse this, just return null - return null; - } catch (IndexOutOfBoundsException e) { + } catch (NumberFormatException | IndexOutOfBoundsException e) { // if we can't parse this, just return null return null; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullWizard.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullWizard.java index d2bd5f32e6..be5bbb4201 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullWizard.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullWizard.java @@ -75,10 +75,7 @@ public class PullWizard extends Wizard { } startPull(); return true; - } catch (IOException e) { - Activator.logError(e.getMessage(), e); - return false; - } catch (URISyntaxException e) { + } catch (IOException | URISyntaxException e) { Activator.logError(e.getMessage(), e); return false; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitTreeCompareNavigator.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitTreeCompareNavigator.java index 07130ab55a..bbb07fb182 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitTreeCompareNavigator.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitTreeCompareNavigator.java @@ -43,15 +43,7 @@ class GitTreeCompareNavigator extends CompareNavigator { baseNavigables.setAccessible(true); return (INavigatable[]) baseNavigables.invoke(mainNavigator, Void.class); - } catch (SecurityException e) { - // should never happen - } catch (NoSuchMethodException e) { - // should never happen - } catch (IllegalArgumentException e) { - // should never happen - } catch (IllegalAccessException e) { - // should never happen - } catch (InvocationTargetException e) { + } catch (SecurityException | NoSuchMethodException | IllegalArgumentException | IllegalAccessException | InvocationTargetException e) { // should never happen } return new INavigatable[0]; |