Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/rpm
diff options
context:
space:
mode:
authorAlexander Kurtakov2016-01-25 20:43:58 +0000
committerAlexander Kurtakov2016-01-25 21:11:26 +0000
commitfd6ff358e48e1ba3fc414d505f40d7ab44d18247 (patch)
tree6e59cc1ef3047408ecdfa16c3d43cc70a78c8083 /rpm
parent518cad290c7adf017237c8e5e6be9b5630ead334 (diff)
downloadorg.eclipse.linuxtools-fd6ff358e48e1ba3fc414d505f40d7ab44d18247.tar.gz
org.eclipse.linuxtools-fd6ff358e48e1ba3fc414d505f40d7ab44d18247.tar.xz
org.eclipse.linuxtools-fd6ff358e48e1ba3fc414d505f40d7ab44d18247.zip
rpm: Cleanups.
Stricter compiler settings and fixing them. Change-Id: I32c94bf2d9b0fda421ff66e09122651b435ab134 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com> Reviewed-on: https://git.eclipse.org/r/65136 Tested-by: Hudson CI
Diffstat (limited to 'rpm')
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.core.tests/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/DownloadPrepareSourcesTest.java6
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.core/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.createrepo.tests/.settings/org.eclipse.jdt.core.prefs4
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.createrepo/.settings/org.eclipse.jdt.core.prefs4
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.rpmlint/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/tests/SpecfileChangelogParserTest.java7
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.eclipse.jdt.core.prefs11
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/SpecfileDocumentProvider.java178
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/SpecfileHover.java11
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileChangelogParser.java19
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorOrganizePatchesActionDelegate.java25
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorPrepareSourcesActionDelegate.java5
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorShowOutlineActionDelegate.java25
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java133
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/compare/SpecStructureCreator.java430
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java5
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.ui/.settings/org.eclipse.jdt.core.prefs10
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/handlers/SpecfileEditorRPMBuildHandler.java5
-rw-r--r--rpm/org.eclipse.linuxtools.rpmstubby/.settings/org.eclipse.jdt.core.prefs4
22 files changed, 467 insertions, 459 deletions
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.core.tests/.settings/org.eclipse.jdt.core.prefs
index 8fcd5a68c5..080126d489 100644
--- a/rpm/org.eclipse.linuxtools.rpm.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -2,8 +2,11 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
@@ -17,7 +20,7 @@ org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -77,9 +80,10 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/DownloadPrepareSourcesTest.java b/rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/DownloadPrepareSourcesTest.java
index 31f35bc061..43b99f0a50 100644
--- a/rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/DownloadPrepareSourcesTest.java
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/DownloadPrepareSourcesTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013 Red Hat, Inc.
+ * Copyright (c) 2013, 2016 Red Hat, Inc.
* 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
@@ -59,11 +59,9 @@ public class DownloadPrepareSourcesTest {
/**
* Prepare the workspace
- *
- * @throws java.lang.Exception
*/
@BeforeClass
- public static void setUpBeforeClass() throws Exception {
+ public static void setUpBeforeClass() {
workspace = ResourcesPlugin.getWorkspace();
root = workspace.getRoot();
monitor = new NullProgressMonitor();
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.core/.settings/org.eclipse.jdt.core.prefs
index d6da2aecef..6149eb984b 100644
--- a/rpm/org.eclipse.linuxtools.rpm.core/.settings/org.eclipse.jdt.core.prefs
+++ b/rpm/org.eclipse.linuxtools.rpm.core/.settings/org.eclipse.jdt.core.prefs
@@ -2,8 +2,11 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
@@ -97,10 +100,11 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=disabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/.settings/org.eclipse.jdt.core.prefs
index 96cc3e033c..53b13434f5 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/.settings/org.eclipse.jdt.core.prefs
@@ -2,8 +2,11 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
@@ -84,6 +87,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.createrepo/.settings/org.eclipse.jdt.core.prefs
index e3ec9f228f..9c6a776ab4 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo/.settings/org.eclipse.jdt.core.prefs
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo/.settings/org.eclipse.jdt.core.prefs
@@ -2,8 +2,11 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -99,6 +102,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.rpmlint/.settings/org.eclipse.jdt.core.prefs
index c6b735f448..fc6bb24700 100644
--- a/rpm/org.eclipse.linuxtools.rpm.rpmlint/.settings/org.eclipse.jdt.core.prefs
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/.settings/org.eclipse.jdt.core.prefs
@@ -2,8 +2,11 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
@@ -22,7 +25,7 @@ org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -95,9 +98,10 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.settings/org.eclipse.jdt.core.prefs
index ae1984a15d..093d05df80 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.settings/org.eclipse.jdt.core.prefs
@@ -2,8 +2,11 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
@@ -21,7 +24,7 @@ org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -81,9 +84,10 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/tests/SpecfileChangelogParserTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/tests/SpecfileChangelogParserTest.java
index 5c23916485..95ed4d6180 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/tests/SpecfileChangelogParserTest.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/tests/SpecfileChangelogParserTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Red Hat, Inc.
+ * Copyright (c) 2009, 2016 Red Hat, Inc.
* 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
@@ -12,7 +12,6 @@ package org.eclipse.linuxtools.internal.rpm.ui.editor.actions.tests;
import static org.junit.Assert.assertEquals;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.linuxtools.internal.rpm.ui.editor.actions.SpecfileChangelogParser;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -27,12 +26,12 @@ public class SpecfileChangelogParserTest {
}
@Test
- public void testParseCurrentFunctionIEditorPart() throws CoreException {
+ public void testParseCurrentFunctionIEditorPart() {
assertEquals("", parser.parseCurrentFunction(null));
}
@Test
- public void testParseCurrentFunctionIEditorInputInt() throws CoreException {
+ public void testParseCurrentFunctionIEditorInputInt() {
assertEquals("", parser.parseCurrentFunction(null, 0));
}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.eclipse.jdt.core.prefs
index f4861fd46f..2dbb62c3fe 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.eclipse.jdt.core.prefs
@@ -2,10 +2,14 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
@@ -95,9 +99,10 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.eclipse.jdt.ui.prefs b/rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.eclipse.jdt.ui.prefs
index 0155b0043d..79c3cc3e2d 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.eclipse.jdt.ui.prefs
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.eclipse.jdt.ui.prefs
@@ -17,7 +17,7 @@ sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.format_source_code_changes_only=false
sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=false
sp_cleanup.make_parameters_final=false
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/SpecfileDocumentProvider.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/SpecfileDocumentProvider.java
index 7946f70e94..01a1df1aed 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/SpecfileDocumentProvider.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/SpecfileDocumentProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 Red Hat, Inc.
+ * Copyright (c) 2007, 2016 Red Hat, Inc.
* 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
@@ -30,102 +30,102 @@ import org.eclipse.ui.ide.FileStoreEditorInput;
public class SpecfileDocumentProvider extends TextFileDocumentProvider {
- private int originalLength;
+ private int originalLength;
- private void setDocumentLength(Object element) {
- IDocument doc = getDocument(element);
- if (doc == null) {
- originalLength = 0;
- } else {
- originalLength = doc.getLength();
- }
- }
+ private void setDocumentLength(Object element) {
+ IDocument doc = getDocument(element);
+ if (doc == null) {
+ originalLength = 0;
+ } else {
+ originalLength = doc.getLength();
+ }
+ }
- @Override
- public IDocument getDocument(Object element) {
- IDocument document = super.getDocument(element);
- if (document != null && document.getDocumentPartitioner() == null) {
- FastPartitioner partitioner = new FastPartitioner(
- new SpecfilePartitionScanner(),
- SpecfilePartitionScanner.SPEC_PARTITION_TYPES);
- partitioner.connect(document, false);
- document.setDocumentPartitioner(partitioner);
- }
- return document;
- }
+ @Override
+ public IDocument getDocument(Object element) {
+ IDocument document = super.getDocument(element);
+ if (document != null && document.getDocumentPartitioner() == null) {
+ FastPartitioner partitioner = new FastPartitioner(new SpecfilePartitionScanner(),
+ SpecfilePartitionScanner.SPEC_PARTITION_TYPES);
+ partitioner.connect(document, false);
+ document.setDocumentPartitioner(partitioner);
+ }
+ return document;
+ }
- @Override
- public void connect(Object element) throws CoreException {
- super.connect(element);
- setDocumentLength(element);
- }
+ @Override
+ public void connect(Object element) throws CoreException {
+ super.connect(element);
+ setDocumentLength(element);
+ }
- @Override
- public boolean canSaveDocument(Object element) {
- if (element instanceof FileStoreEditorInput) {
- FileStoreEditorInput fei = (FileStoreEditorInput) element;
- IDocument doc = getDocument(element);
- if (!super.canSaveDocument(element)) {
- return false;
- }
- if (doc.getLength() != originalLength) {
- return true;
- }
- URI uri = fei.getURI();
- File f = URIUtil.toFile(uri);
- if (originalLength != 0) {
- try (BufferedReader input = new BufferedReader(
- new FileReader(f))) {
- boolean finished = false;
- char[] buffer = new char[100];
- int curoffset = 0;
- while (!finished) {
- int len = input.read(buffer);
- if (len <= 0) {
- break;
- }
- String origbytes = new String(buffer, 0, len);
- String curbytes = doc.get(curoffset, len);
- if (!curbytes.equals(origbytes)) {
- return true;
- }
- curoffset += len;
- }
- resetDocument(element);
- return false;
- } catch (Exception e) {
- return true;
- }
- }
- }
- return super.canSaveDocument(element);
- }
+ @Override
+ public boolean canSaveDocument(Object element) {
+ if (element instanceof FileStoreEditorInput) {
+ FileStoreEditorInput fei = (FileStoreEditorInput) element;
+ IDocument doc = getDocument(element);
+ if (!super.canSaveDocument(element)) {
+ return false;
+ }
+ if (doc.getLength() != originalLength) {
+ return true;
+ }
+ URI uri = fei.getURI();
+ File f = URIUtil.toFile(uri);
+ if (originalLength != 0) {
+ try (BufferedReader input = new BufferedReader(new FileReader(f))) {
+ boolean finished = false;
+ char[] buffer = new char[100];
+ int curoffset = 0;
+ while (!finished) {
+ int len = input.read(buffer);
+ if (len <= 0) {
+ break;
+ }
+ String origbytes = new String(buffer, 0, len);
+ String curbytes = doc.get(curoffset, len);
+ if (!curbytes.equals(origbytes)) {
+ return true;
+ }
+ curoffset += len;
+ }
+ resetDocument(element);
+ return false;
+ } catch (Exception e) {
+ return true;
+ }
+ }
+ }
+ return super.canSaveDocument(element);
+ }
- @Override
- protected DocumentProviderOperation createSaveOperation(final Object element, final IDocument document, final boolean overwrite) throws CoreException {
- final DocumentProviderOperation saveOperation = super.createSaveOperation(element, document, overwrite);
+ @Override
+ protected DocumentProviderOperation createSaveOperation(final Object element, final IDocument document,
+ final boolean overwrite) throws CoreException {
+ final DocumentProviderOperation saveOperation = super.createSaveOperation(element, document, overwrite);
- if (element instanceof IURIEditorInput) {
- return new DocumentProviderOperation() {
+ if (element instanceof IURIEditorInput) {
+ return new DocumentProviderOperation() {
- @Override
- public void execute(IProgressMonitor monitor) throws CoreException {
- }
+ @Override
+ public void execute(IProgressMonitor monitor) {
+ }
- @Override
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- saveOperation.run(monitor);
- // Here's where we sneak in resetting the original document length
- setDocumentLength(element);
- }
+ @Override
+ public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+ saveOperation.run(monitor);
+ // Here's where we sneak in resetting the original document
+ // length
+ setDocumentLength(element);
+ }
- @Override
- public ISchedulingRule getSchedulingRule() {
- return saveOperation.getSchedulingRule();
- }
- };
- }
+ @Override
+ public ISchedulingRule getSchedulingRule() {
+ return saveOperation.getSchedulingRule();
+ }
+ };
+ }
- return saveOperation;
- }
+ return saveOperation;
+ }
} \ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/SpecfileHover.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/SpecfileHover.java
index b9f6c0c1ab..872b5015df 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/SpecfileHover.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/SpecfileHover.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * Copyright (c) 2007, 2016 Red Hat, Inc.
* 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
@@ -18,7 +18,6 @@ import java.util.regex.Pattern;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.DefaultInformationControl;
import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IInformationControl;
import org.eclipse.jface.text.IInformationControlCreator;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.ITextHover;
@@ -31,7 +30,6 @@ import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileDefine;
import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Shell;
public class SpecfileHover implements ITextHover, ITextHoverExtension {
@@ -122,12 +120,7 @@ public class SpecfileHover implements ITextHover, ITextHoverExtension {
@Override
public IInformationControlCreator getHoverControlCreator() {
- return new IInformationControlCreator() {
- @Override
- public IInformationControl createInformationControl(Shell parent) {
- return new DefaultInformationControl(parent, false);
- }
- };
+ return parent -> new DefaultInformationControl(parent, false);
}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileChangelogParser.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileChangelogParser.java
index e99c29da2d..f18ef67fd1 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileChangelogParser.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileChangelogParser.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * Copyright (c) 2007, 2016 Red Hat, Inc.
* 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
@@ -11,21 +11,20 @@
package org.eclipse.linuxtools.internal.rpm.ui.editor.actions;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.linuxtools.changelog.core.IParserChangeLogContrib;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
public class SpecfileChangelogParser implements IParserChangeLogContrib {
- @Override
- public String parseCurrentFunction(IEditorPart editor) throws CoreException {
- return ""; //$NON-NLS-1$
- }
+ @Override
+ public String parseCurrentFunction(IEditorPart editor) {
+ return ""; //$NON-NLS-1$
+ }
- @Override
- public String parseCurrentFunction(IEditorInput input, int offset) throws CoreException {
- return ""; //$NON-NLS-1$
- }
+ @Override
+ public String parseCurrentFunction(IEditorInput input, int offset) {
+ return ""; //$NON-NLS-1$
+ }
}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorOrganizePatchesActionDelegate.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorOrganizePatchesActionDelegate.java
index e6e8d8a8f6..b3dc58b004 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorOrganizePatchesActionDelegate.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorOrganizePatchesActionDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * Copyright (c) 2007, 2016 Red Hat, Inc.
* 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
@@ -13,7 +13,6 @@ package org.eclipse.linuxtools.internal.rpm.ui.editor.actions;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
import org.eclipse.ui.IEditorPart;
@@ -21,15 +20,15 @@ import org.eclipse.ui.handlers.HandlerUtil;
public class SpecfileEditorOrganizePatchesActionDelegate extends AbstractHandler {
- @Override
- public Object execute(ExecutionEvent event) throws ExecutionException {
- IEditorPart editor = HandlerUtil.getActiveEditor(event);
- if (editor instanceof SpecfileEditor) {
- Specfile specfile = ((SpecfileEditor) editor).getSpecfile();
- if (specfile != null) {
- specfile.organizePatches();
- }
- }
- return null;
- }
+ @Override
+ public Object execute(ExecutionEvent event) {
+ IEditorPart editor = HandlerUtil.getActiveEditor(event);
+ if (editor instanceof SpecfileEditor) {
+ Specfile specfile = ((SpecfileEditor) editor).getSpecfile();
+ if (specfile != null) {
+ specfile.organizePatches();
+ }
+ }
+ return null;
+ }
}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorPrepareSourcesActionDelegate.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorPrepareSourcesActionDelegate.java
index e4e90eeb4a..e686cbcc0d 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorPrepareSourcesActionDelegate.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorPrepareSourcesActionDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013 Red Hat, Inc.
+ * Copyright (c) 2013, 2016 Red Hat, Inc.
* 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
@@ -94,8 +94,7 @@ public class SpecfileEditorPrepareSourcesActionDelegate extends AbstractHandler
public boolean downloadFile(Shell shell, RPMProject rpj, Specfile specfile) {
// retrieve source(s) from specfile
- final List<SpecfileSource> sourceURLList = specfile != null ? (List<SpecfileSource>) specfile
- .getSources() : null;
+ final List<SpecfileSource> sourceURLList = specfile != null ? specfile.getSources() : null;
for (final SpecfileSource sourceurls : sourceURLList) {
try {
String resolvedURL = UiUtils.resolveDefines(specfile, sourceurls.getFileName());
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorShowOutlineActionDelegate.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorShowOutlineActionDelegate.java
index 814d5ae585..a9f8d52749 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorShowOutlineActionDelegate.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorShowOutlineActionDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 Alexander Kurtakov.
+ * Copyright (c) 2008, 2016 Alexander Kurtakov.
* 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
@@ -12,7 +12,6 @@ package org.eclipse.linuxtools.internal.rpm.ui.editor.actions;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
import org.eclipse.linuxtools.internal.rpm.ui.editor.outline.SpecfileQuickOutlineDialog;
import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
import org.eclipse.swt.SWT;
@@ -21,16 +20,16 @@ import org.eclipse.ui.handlers.HandlerUtil;
public class SpecfileEditorShowOutlineActionDelegate extends AbstractHandler {
- @Override
- public Object execute(ExecutionEvent event) throws ExecutionException {
- IEditorPart editor = HandlerUtil.getActiveEditor(event);
- if (editor instanceof SpecfileEditor) {
- SpecfileQuickOutlineDialog quickOutlinePopupDialog = new SpecfileQuickOutlineDialog(
- editor.getSite().getShell(), SWT.NONE, (SpecfileEditor) editor);
- quickOutlinePopupDialog.setSize(400, 200);
- quickOutlinePopupDialog.setVisible(true);
- }
- return null;
- }
+ @Override
+ public Object execute(ExecutionEvent event) {
+ IEditorPart editor = HandlerUtil.getActiveEditor(event);
+ if (editor instanceof SpecfileEditor) {
+ SpecfileQuickOutlineDialog quickOutlinePopupDialog = new SpecfileQuickOutlineDialog(
+ editor.getSite().getShell(), SWT.NONE, (SpecfileEditor) editor);
+ quickOutlinePopupDialog.setSize(400, 200);
+ quickOutlinePopupDialog.setVisible(true);
+ }
+ return null;
+ }
}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java
index b5edf2108a..d87f5b2d88 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Alphonse Van Assche.
+ * Copyright (c) 2007, 2016 Alphonse Van Assche.
* 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
@@ -17,7 +17,6 @@ import java.io.StringReader;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextSelection;
@@ -30,75 +29,69 @@ import org.eclipse.ui.handlers.HandlerUtil;
public class SpecfileEditorToggleCommentActionDelegate extends AbstractHandler {
- @Override
- public Object execute(ExecutionEvent event) throws ExecutionException {
- IEditorPart editor = HandlerUtil.getActiveEditor(event);
- if (!(editor instanceof SpecfileEditor)) {
- return null;
- }
+ @Override
+ public Object execute(ExecutionEvent event) {
+ IEditorPart editor = HandlerUtil.getActiveEditor(event);
+ if (!(editor instanceof SpecfileEditor)) {
+ return null;
+ }
- SpecfileEditor specfileEditor = (SpecfileEditor) editor;
- IDocument document = specfileEditor.getAdapter(IDocument.class);
- ISelection currentSelection = specfileEditor.getSpecfileSourceViewer()
- .getSelection();
- if (currentSelection instanceof ITextSelection) {
- ITextSelection selection = (ITextSelection) currentSelection;
- String selectedContent = ""; //$NON-NLS-1$
- try {
- int begin = document.getLineOffset(selection.getStartLine());
- StringBuilder sb = new StringBuilder(document.get().substring(0,
- begin));
- String content = document.get().substring(begin,
- selection.getOffset() + selection.getLength());
- if (linesContentCommentChar(content)) {
- if (selection.getStartLine() == selection.getEndLine()) {
- selectedContent = ISpecfileSpecialSymbols.COMMENT_START + content;
- } else {
- selectedContent = ISpecfileSpecialSymbols.COMMENT_START + content.replaceAll("\n", "\n#"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- } else {
- selectedContent = content.replaceFirst(ISpecfileSpecialSymbols.COMMENT_START, "").replaceAll( //$NON-NLS-1$
- "\n#", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- sb.append(selectedContent);
- sb.append(document.get().substring(
- selection.getOffset() + selection.getLength(),
- document.get().length()));
- document.set(sb.toString());
- specfileEditor.setHighlightRange(selection.getOffset(), selection
- .getLength(), true);
- } catch (BadLocationException e) {
- SpecfileLog.logError(e);
- }
- }
- return null;
- }
+ SpecfileEditor specfileEditor = (SpecfileEditor) editor;
+ IDocument document = specfileEditor.getAdapter(IDocument.class);
+ ISelection currentSelection = specfileEditor.getSpecfileSourceViewer().getSelection();
+ if (currentSelection instanceof ITextSelection) {
+ ITextSelection selection = (ITextSelection) currentSelection;
+ String selectedContent = ""; //$NON-NLS-1$
+ try {
+ int begin = document.getLineOffset(selection.getStartLine());
+ StringBuilder sb = new StringBuilder(document.get().substring(0, begin));
+ String content = document.get().substring(begin, selection.getOffset() + selection.getLength());
+ if (linesContentCommentChar(content)) {
+ if (selection.getStartLine() == selection.getEndLine()) {
+ selectedContent = ISpecfileSpecialSymbols.COMMENT_START + content;
+ } else {
+ selectedContent = ISpecfileSpecialSymbols.COMMENT_START + content.replaceAll("\n", "\n#"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ } else {
+ selectedContent = content.replaceFirst(ISpecfileSpecialSymbols.COMMENT_START, "").replaceAll( //$NON-NLS-1$
+ "\n#", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ sb.append(selectedContent);
+ sb.append(document.get().substring(selection.getOffset() + selection.getLength(),
+ document.get().length()));
+ document.set(sb.toString());
+ specfileEditor.setHighlightRange(selection.getOffset(), selection.getLength(), true);
+ } catch (BadLocationException e) {
+ SpecfileLog.logError(e);
+ }
+ }
+ return null;
+ }
- /**
- * Check if all lines are commented
- *
- * @param content
- * to check
- * @return true if all lines begin with '#' char
- */
- private boolean linesContentCommentChar(String content) {
- LineNumberReader reader = new LineNumberReader(
- new StringReader(content));
- String line;
- boolean ret = false;
- try {
- while ((line = reader.readLine()) != null) {
- if (line.startsWith(ISpecfileSpecialSymbols.COMMENT_START)) {
- ret = false;
- } else {
- return true;
- }
- }
- } catch (IOException e) {
- SpecfileLog.logError(e);
- return false;
- }
- return ret;
- }
+ /**
+ * Check if all lines are commented
+ *
+ * @param content
+ * to check
+ * @return true if all lines begin with '#' char
+ */
+ private boolean linesContentCommentChar(String content) {
+ LineNumberReader reader = new LineNumberReader(new StringReader(content));
+ String line;
+ boolean ret = false;
+ try {
+ while ((line = reader.readLine()) != null) {
+ if (line.startsWith(ISpecfileSpecialSymbols.COMMENT_START)) {
+ ret = false;
+ } else {
+ return true;
+ }
+ }
+ } catch (IOException e) {
+ SpecfileLog.logError(e);
+ return false;
+ }
+ return ret;
+ }
}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/compare/SpecStructureCreator.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/compare/SpecStructureCreator.java
index b0834b3b4b..3189255682 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/compare/SpecStructureCreator.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/compare/SpecStructureCreator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2013 Red Hat, Inc.
+ * Copyright (c) 2009, 2016 Red Hat, Inc.
* 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
@@ -62,221 +62,215 @@ import org.eclipse.ui.part.FileEditorInput;
*/
public class SpecStructureCreator extends StructureCreator {
- private static class SpecNode extends DocumentRangeNode implements ITypedElement {
-
- public SpecNode(DocumentRangeNode parent, int type, String id,
- IDocument doc, int start, int length) {
- super(parent, type, id, doc, start, length);
- if (parent != null) {
- parent.addChild(this);
- }
- }
-
- @Override
- public String getName() {
- return getId();
- }
-
- @Override
- public String getType() {
- return "spec2"; //$NON-NLS-1$
- }
-
- @Override
- public Image getImage() {
- return CompareUI.getImage(getType());
- }
- }
-
- private static final String SPECFILE_ROOT_NODE = "Specfile Sections"; //$NON-NLS-1$
-
- @Override
- public String getName() {
- return Messages.SpecStructureCreator_0;
- }
-
- @Override
- public IStructureComparator locate(Object path, Object input) {
- return null;
- }
-
- @Override
- public String getContents(Object node, boolean ignoreWhitespace) {
- if (node instanceof IStreamContentAccessor) {
- IStreamContentAccessor sca = (IStreamContentAccessor) node;
- try {
- return readString(sca);
- } catch (CoreException e) {
- SpecfileLog.logError(e);
- }
- }
- return null;
- }
-
- private void parseSpecfile(DocumentRangeNode root, IDocument doc, IFile file) {
- SpecfileParser parser = new SpecfileParser();
-
- // setup the error and task handlers
- // FIXME: error markers do not show
- if (file != null) {
- FileEditorInput fei = new FileEditorInput(file);
- // this allows compare editor to work with specfiles with errors
- // without it, the compare editor is blank
- try {
- SpecfileEditor.getSpecfileDocumentProvider().disconnect(fei);
- SpecfileEditor.getSpecfileDocumentProvider().connect(fei);
- } catch (CoreException e) {
- SpecfileLog.logError(e);
- }
- parser.setErrorHandler(new SpecfileErrorHandler(fei, doc));
- parser.setTaskHandler(new SpecfileTaskHandler(fei, doc));
-
- Specfile specfile = parser.parse(doc);
- String id = specfile.getName();
- // Be a child under parent node of specfileSectionRoot (would be rootNode)
- SpecNode fileNode = new SpecNode((DocumentRangeNode) root.getParentNode(), 1, id, doc, 0, doc.getLength());
- for (SpecfileSection sec : specfile.getSections()) {
- try {
- addNode(root, doc, sec.getName(),
- doc.getLineOffset(sec.getLineNumber()),
- doc.getLineOffset(sec.getSectionEndLine()) - doc.getLineOffset(sec.getLineNumber()),
- 2);
- } catch (BadLocationException e) {
- SpecfileLog.logError(e);
- }
- }
-
- // Be a child under the parent file node
- for (SpecfilePackage sPackage : specfile.getPackages()
- .getPackages()) {
- try {
- SpecNode pNode = addNode(fileNode, doc, sPackage.getPackageName(),
- doc.getLineOffset(sPackage.getLineNumber()),
- doc.getLineOffset(sPackage.getSectionEndLine()) - doc.getLineOffset(sPackage.getLineNumber()),
- 3);
- for (SpecfileSection section : sPackage.getSections()) {
- addNode(pNode, doc, section.getName(),
- doc.getLineOffset(section.getLineNumber()),
- doc.getLineOffset(section.getSectionEndLine()) - doc.getLineOffset(section.getLineNumber()),
- 4);
- }
- } catch (BadLocationException e) {
- SpecfileLog.logError(e);
- }
- }
-
- }
- }
-
- private IProgressMonitor beginWork(IProgressMonitor monitor) {
- if (monitor == null) {
- return new NullProgressMonitor();
- }
- return SubMonitor.convert(monitor);
- }
-
- private SpecNode addNode(DocumentRangeNode parent, IDocument doc,
- String name, int start, int end, int type) {
- return new SpecNode(parent, type, name, doc, start, end);
- }
-
- private static String readString(InputStream is, String encoding) {
- if (is == null) {
- return null;
- }
- BufferedReader reader = null;
- try {
- StringBuffer buffer = new StringBuffer();
- char[] part = new char[2048];
- int read = 0;
- reader = new BufferedReader(new InputStreamReader(is, encoding));
-
- while ((read = reader.read(part)) != -1) {
- buffer.append(part, 0, read);
- }
-
- return buffer.toString();
-
- } catch (IOException ex) {
- // NeedWork
- SpecfileLog.logError(ex);
- } finally {
- if (reader != null) {
- try {
- reader.close();
- } catch (IOException ex) {
- SpecfileLog.logError(ex);
- }
- }
- }
- return null;
- }
-
- public static String readString(IStreamContentAccessor sa)
- throws CoreException {
- InputStream is = sa.getContents();
- if (is != null) {
- String encoding = null;
- if (sa instanceof IEncodedStreamContentAccessor) {
- encoding = ((IEncodedStreamContentAccessor) sa)
- .getCharset();
- }
- if (encoding == null) {
- encoding = ResourcesPlugin.getEncoding();
- }
- return readString(is, encoding);
- }
- return null;
- }
-
- @Override
- protected IDocumentPartitioner getDocumentPartitioner() {
- return new FastPartitioner(new SpecfilePartitionScanner(),
- SpecfilePartitionScanner.SPEC_PARTITION_TYPES);
- }
-
- @Override
- protected String getDocumentPartitioning() {
- return SpecfilePartitionScanner.SPEC_FILE_PARTITIONING;
- }
-
- @Override
- protected IStructureComparator createStructureComparator(Object input,
- IDocument document, ISharedDocumentAdapter adapter,
- IProgressMonitor monitor) throws CoreException {
-
- final boolean isEditable;
- if (input instanceof IEditableContent) {
- isEditable = ((IEditableContent) input).isEditable();
- } else {
- isEditable = false;
- }
-
- // get the resource being compared, but treat compare with history as null resource
- IFile file = null;
- if (input instanceof IResourceProvider) {
- IResource res = ((IResourceProvider)input).getResource();
- file = res.getAdapter(IFile.class);
- }
-
- DocumentRangeNode rootNode = new StructureRootNode(document, input, this, adapter) {
- @Override
- public boolean isEditable() {
- return isEditable;
- }
- };
-
- try {
- monitor = beginWork(monitor);
- // Section Root
- SpecNode specfileSectionRoot = new SpecNode(rootNode, 0, SPECFILE_ROOT_NODE, document, 0, document.getLength());
- parseSpecfile(specfileSectionRoot, document, file);
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
-
- return rootNode;
- }
+ private static class SpecNode extends DocumentRangeNode implements ITypedElement {
+
+ public SpecNode(DocumentRangeNode parent, int type, String id, IDocument doc, int start, int length) {
+ super(parent, type, id, doc, start, length);
+ if (parent != null) {
+ parent.addChild(this);
+ }
+ }
+
+ @Override
+ public String getName() {
+ return getId();
+ }
+
+ @Override
+ public String getType() {
+ return "spec2"; //$NON-NLS-1$
+ }
+
+ @Override
+ public Image getImage() {
+ return CompareUI.getImage(getType());
+ }
+ }
+
+ private static final String SPECFILE_ROOT_NODE = "Specfile Sections"; //$NON-NLS-1$
+
+ @Override
+ public String getName() {
+ return Messages.SpecStructureCreator_0;
+ }
+
+ @Override
+ public IStructureComparator locate(Object path, Object input) {
+ return null;
+ }
+
+ @Override
+ public String getContents(Object node, boolean ignoreWhitespace) {
+ if (node instanceof IStreamContentAccessor) {
+ IStreamContentAccessor sca = (IStreamContentAccessor) node;
+ try {
+ return readString(sca);
+ } catch (CoreException e) {
+ SpecfileLog.logError(e);
+ }
+ }
+ return null;
+ }
+
+ private void parseSpecfile(DocumentRangeNode root, IDocument doc, IFile file) {
+ SpecfileParser parser = new SpecfileParser();
+
+ // setup the error and task handlers
+ // FIXME: error markers do not show
+ if (file != null) {
+ FileEditorInput fei = new FileEditorInput(file);
+ // this allows compare editor to work with specfiles with errors
+ // without it, the compare editor is blank
+ try {
+ SpecfileEditor.getSpecfileDocumentProvider().disconnect(fei);
+ SpecfileEditor.getSpecfileDocumentProvider().connect(fei);
+ } catch (CoreException e) {
+ SpecfileLog.logError(e);
+ }
+ parser.setErrorHandler(new SpecfileErrorHandler(fei, doc));
+ parser.setTaskHandler(new SpecfileTaskHandler(fei, doc));
+
+ Specfile specfile = parser.parse(doc);
+ String id = specfile.getName();
+ // Be a child under parent node of specfileSectionRoot (would be
+ // rootNode)
+ SpecNode fileNode = new SpecNode((DocumentRangeNode) root.getParentNode(), 1, id, doc, 0, doc.getLength());
+ for (SpecfileSection sec : specfile.getSections()) {
+ try {
+ addNode(root, doc, sec.getName(), doc.getLineOffset(sec.getLineNumber()),
+ doc.getLineOffset(sec.getSectionEndLine()) - doc.getLineOffset(sec.getLineNumber()), 2);
+ } catch (BadLocationException e) {
+ SpecfileLog.logError(e);
+ }
+ }
+
+ // Be a child under the parent file node
+ for (SpecfilePackage sPackage : specfile.getPackages().getPackages()) {
+ try {
+ SpecNode pNode = addNode(fileNode, doc, sPackage.getPackageName(),
+ doc.getLineOffset(sPackage.getLineNumber()), doc.getLineOffset(sPackage.getSectionEndLine())
+ - doc.getLineOffset(sPackage.getLineNumber()),
+ 3);
+ for (SpecfileSection section : sPackage.getSections()) {
+ addNode(pNode, doc, section.getName(), doc.getLineOffset(section.getLineNumber()),
+ doc.getLineOffset(section.getSectionEndLine())
+ - doc.getLineOffset(section.getLineNumber()),
+ 4);
+ }
+ } catch (BadLocationException e) {
+ SpecfileLog.logError(e);
+ }
+ }
+
+ }
+ }
+
+ private IProgressMonitor beginWork(IProgressMonitor monitor) {
+ if (monitor == null) {
+ return new NullProgressMonitor();
+ }
+ return SubMonitor.convert(monitor);
+ }
+
+ private SpecNode addNode(DocumentRangeNode parent, IDocument doc, String name, int start, int end, int type) {
+ return new SpecNode(parent, type, name, doc, start, end);
+ }
+
+ private static String readString(InputStream is, String encoding) {
+ if (is == null) {
+ return null;
+ }
+ BufferedReader reader = null;
+ try {
+ StringBuffer buffer = new StringBuffer();
+ char[] part = new char[2048];
+ int read = 0;
+ reader = new BufferedReader(new InputStreamReader(is, encoding));
+
+ while ((read = reader.read(part)) != -1) {
+ buffer.append(part, 0, read);
+ }
+
+ return buffer.toString();
+
+ } catch (IOException ex) {
+ // NeedWork
+ SpecfileLog.logError(ex);
+ } finally {
+ if (reader != null) {
+ try {
+ reader.close();
+ } catch (IOException ex) {
+ SpecfileLog.logError(ex);
+ }
+ }
+ }
+ return null;
+ }
+
+ public static String readString(IStreamContentAccessor sa) throws CoreException {
+ InputStream is = sa.getContents();
+ if (is != null) {
+ String encoding = null;
+ if (sa instanceof IEncodedStreamContentAccessor) {
+ encoding = ((IEncodedStreamContentAccessor) sa).getCharset();
+ }
+ if (encoding == null) {
+ encoding = ResourcesPlugin.getEncoding();
+ }
+ return readString(is, encoding);
+ }
+ return null;
+ }
+
+ @Override
+ protected IDocumentPartitioner getDocumentPartitioner() {
+ return new FastPartitioner(new SpecfilePartitionScanner(), SpecfilePartitionScanner.SPEC_PARTITION_TYPES);
+ }
+
+ @Override
+ protected String getDocumentPartitioning() {
+ return SpecfilePartitionScanner.SPEC_FILE_PARTITIONING;
+ }
+
+ @Override
+ protected IStructureComparator createStructureComparator(Object input, IDocument document,
+ ISharedDocumentAdapter adapter, IProgressMonitor monitor) {
+
+ final boolean isEditable;
+ if (input instanceof IEditableContent) {
+ isEditable = ((IEditableContent) input).isEditable();
+ } else {
+ isEditable = false;
+ }
+
+ // get the resource being compared, but treat compare with history as
+ // null resource
+ IFile file = null;
+ if (input instanceof IResourceProvider) {
+ IResource res = ((IResourceProvider) input).getResource();
+ file = res.getAdapter(IFile.class);
+ }
+
+ DocumentRangeNode rootNode = new StructureRootNode(document, input, this, adapter) {
+ @Override
+ public boolean isEditable() {
+ return isEditable;
+ }
+ };
+
+ try {
+ monitor = beginWork(monitor);
+ // Section Root
+ SpecNode specfileSectionRoot = new SpecNode(rootNode, 0, SPECFILE_ROOT_NODE, document, 0,
+ document.getLength());
+ parseSpecfile(specfileSectionRoot, document, file);
+ } finally {
+ if (monitor != null) {
+ monitor.done();
+ }
+ }
+
+ return rootNode;
+ }
}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java
index 074b2b6e97..b57deff9b5 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * Copyright (c) 2007, 2016 Red Hat, Inc.
* 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
@@ -13,7 +13,6 @@
package org.eclipse.linuxtools.rpm.ui.editor.parser;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -174,7 +173,7 @@ public class Specfile {
return patchesList;
}
- public Collection<SpecfileSource> getSources() {
+ public List<SpecfileSource> getSources() {
List<SpecfileSource> sourcesList = new ArrayList<>(sources.values());
Collections.sort(sourcesList, new SourceComparator());
return sourcesList;
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.ui/.settings/org.eclipse.jdt.core.prefs
index 6dfdbc6a63..b6d5473ae9 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/.settings/org.eclipse.jdt.core.prefs
@@ -2,8 +2,11 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
@@ -94,9 +97,10 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/handlers/SpecfileEditorRPMBuildHandler.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/handlers/SpecfileEditorRPMBuildHandler.java
index 678adc9e60..eba176a60d 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/handlers/SpecfileEditorRPMBuildHandler.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/handlers/SpecfileEditorRPMBuildHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013 Red Hat, Inc.
+ * Copyright (c) 2013, 2016 Red Hat, Inc.
* 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
@@ -12,7 +12,6 @@ package org.eclipse.linuxtools.internal.rpm.ui.handlers;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
@@ -48,7 +47,7 @@ public class SpecfileEditorRPMBuildHandler extends AbstractHandler {
protected RPMProject rpj;
@Override
- public Object execute(ExecutionEvent event) throws ExecutionException {
+ public Object execute(ExecutionEvent event) {
final IResource resource = getResource(event);
rpj = getRPMProject(resource);
if (rpj != null) {
diff --git a/rpm/org.eclipse.linuxtools.rpmstubby/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpmstubby/.settings/org.eclipse.jdt.core.prefs
index 60d8f7e667..d4b4965c37 100644
--- a/rpm/org.eclipse.linuxtools.rpmstubby/.settings/org.eclipse.jdt.core.prefs
+++ b/rpm/org.eclipse.linuxtools.rpmstubby/.settings/org.eclipse.jdt.core.prefs
@@ -3,8 +3,11 @@ instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
@@ -98,6 +101,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

Back to the top