rpm: Start using 1.7. (part 1)

Bump BREE, update class setting, enable 1.7 warnings and fix them.

Change-Id: I525a2696e257a3fc595aab11629705764c6ebcc7
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/19953
Tested-by: Hudson CI

11 files changed, 112 insertions, 47 deletions

diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/.classpath b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/.classpath
index ad32c83a78..098194ca4b 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/.classpath
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
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 8000cd6ca6..d03a4f42dc 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
@@ -1,11 +1,99 @@
 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.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+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=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+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=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+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=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/META-INF/MANIFEST.MF b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/META-INF/MANIFEST.MF
index 7f5e815f1f..908edb06da 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/META-INF/MANIFEST.MF
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.linuxtools.rpm.createrepo.tests
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: org.eclipse.linuxtools.rpm.createrepo;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.junit;bundle-version="4.8.1",
  org.eclipse.swtbot.eclipse.finder,
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/tests/CreaterepoImportRPMsPageTest.java b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/tests/CreaterepoImportRPMsPageTest.java
index 5b87fe2156..b160eeccc2 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/tests/CreaterepoImportRPMsPageTest.java
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/tests/CreaterepoImportRPMsPageTest.java
@@ -123,11 +123,9 @@ public class CreaterepoImportRPMsPageTest {
 
 	/**
 	 * Test out the remove RPMs button.
-	 *
-	 * @throws CoreException
 	 */
 	@Test
-	public void testRemoveRPMs() throws CoreException {
+	public void testRemoveRPMs() {
 		// run in UI thread because accessing the tree in the import RPMs page
 		Display.getDefault().syncExec(new Runnable() {
 			@Override
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/tests/CreaterepoMetadataPageTest.java b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/tests/CreaterepoMetadataPageTest.java
index fc82d93c2b..f6acdc6833 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/tests/CreaterepoMetadataPageTest.java
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/tests/CreaterepoMetadataPageTest.java
@@ -16,8 +16,6 @@ import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import java.io.IOException;
-
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -93,10 +91,9 @@ public class CreaterepoMetadataPageTest {
 	 * well as import some test RPMs.
 	 *
 	 * @throws CoreException
-	 * @throws IOException
 	 */
 	@Before
-	public void setUp() throws CoreException, IOException {
+	public void setUp() throws CoreException {
 		project = testProject.getCreaterepoProject();
 		assertNotNull(project);
 		initializeMetadataPage();
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/listener/tests/CreaterepoResourceListenerTest.java b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/listener/tests/CreaterepoResourceListenerTest.java
index 32eebd4f96..5c2a947d4a 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/listener/tests/CreaterepoResourceListenerTest.java
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/listener/tests/CreaterepoResourceListenerTest.java
@@ -48,11 +48,9 @@ public class CreaterepoResourceListenerTest {
 
 	/**
 	 * Initialize the bot.
-	 *
-	 * @throws CoreException
 	 */
 	@BeforeClass
-	public static void setUpBeforeClass() throws CoreException {
+	public static void setUpBeforeClass() {
 		bot = new SWTWorkbenchBot();
 		monitor = new NullProgressMonitor();
 		try {
@@ -120,7 +118,7 @@ public class CreaterepoResourceListenerTest {
 	/**
 	 * Helper method to help setup the test by opening the .repo file.
 	 */
-	private void openRepoFile() {
+	private static void openRepoFile() {
 		// open the package explorer view
 		bot.menu(ICreaterepoTestConstants.WINDOW).menu(ICreaterepoTestConstants.SHOW_VIEW)
 		.menu(ICreaterepoTestConstants.OTHER).click();
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/tests/CreaterepoCommandCreatorTest.java b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/tests/CreaterepoCommandCreatorTest.java
index eb6b3f8b33..c19eec8502 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/tests/CreaterepoCommandCreatorTest.java
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/tests/CreaterepoCommandCreatorTest.java
@@ -130,7 +130,7 @@ public class CreaterepoCommandCreatorTest {
 	/**
 	 * Set test workspace preferences.
 	 */
-	private void setWorkspacePreferences() {
+	private static void setWorkspacePreferences() {
 		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();
 		// --simple-md-filenames
 		prefStore.setValue(CreaterepoPreferenceConstants.PREF_UNIQUE_MD_NAME, false);
@@ -248,7 +248,7 @@ public class CreaterepoCommandCreatorTest {
 	 * @param list A list of strings.
 	 * @return A string.
 	 */
-	private String createStringFromList(List<String> list) {
+	private static String createStringFromList(List<String> list) {
 		String str = ""; //$NON-NLS-1$
 		if (!list.isEmpty()) {
 			for (String temp : list) {
@@ -268,7 +268,7 @@ public class CreaterepoCommandCreatorTest {
 	 * @param switchPattern The switch to look for.
 	 * @return 0 if switch cannot be found, 1 if single found, >1 if multiple found.
 	 */
-	private int findCommandSwitch(String command, String switchPattern) {
+	private static int findCommandSwitch(String command, String switchPattern) {
 		int matches = 0;
 		Pattern pattern = Pattern.compile(switchPattern, Pattern.CASE_INSENSITIVE);
 		Matcher variableMatcher = pattern.matcher(command);
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/tree/tests/CreaterepoTreeCategoryTest.java b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/tree/tests/CreaterepoTreeCategoryTest.java
index 695d95cd6e..97e601a815 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/tree/tests/CreaterepoTreeCategoryTest.java
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/tree/tests/CreaterepoTreeCategoryTest.java
@@ -34,7 +34,7 @@ public class CreaterepoTreeCategoryTest {
 	 */
 	@Test
 	public void testCreaterepoTreeCategory() {
-		List<String> tagsToCheck = new ArrayList<String>();
+		List<String> tagsToCheck = new ArrayList<>();
 		tagsToCheck.add(TAG1);
 		tagsToCheck.add(TAG2);
 		CreaterepoTreeCategory categoryTest = new CreaterepoTreeCategory(CATEGORY_NAME);
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/tree/tests/CreaterepoTreeTest.java b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/tree/tests/CreaterepoTreeTest.java
index 9bfe013095..115145dbe9 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/tree/tests/CreaterepoTreeTest.java
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/tree/tests/CreaterepoTreeTest.java
@@ -14,7 +14,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -62,7 +61,7 @@ public class CreaterepoTreeTest {
 	 */
 	private static final Map<String, Integer> CORRECT_CATEGORIES;
 	static {
-		Map<String, Integer> temp = new HashMap<String, Integer>();
+		Map<String, Integer> temp = new HashMap<>();
 		temp.put(CreaterepoPreferenceConstants.PREF_DISTRO_TAG, DISTRO_TAGS.length);
 		temp.put(CreaterepoPreferenceConstants.PREF_CONTENT_TAG, CONTENT_TAGS.length);
 		temp.put(CreaterepoPreferenceConstants.PREF_REPO_TAG, REPO_TAGS.length);
@@ -122,19 +121,13 @@ public class CreaterepoTreeTest {
 
 	/**
 	 * Test if the treeviewer is initialized properly with the correct labels.
-	 *
-	 * @throws CoreException
 	 */
 	@Test
-	public void testTreeViewerInitialization() throws CoreException {
+	public void testTreeViewerInitialization() {
 		Display.getDefault().syncExec(new Runnable() {
 			@Override
 			public void run() {
-				try {
-					initViewer();
-				} catch (CoreException e) {
-					fail();
-				}
+				initViewer();
 				// there should only be 3 categories
 				assertEquals(3, tree.getItemCount());
 				// and these should be the correct categories
@@ -148,20 +141,15 @@ public class CreaterepoTreeTest {
 	/**
 	 * Test if the treeviewer properly loads the preferences.
 	 *
-	 * @throws CoreException
 	 * @throws BackingStoreException
 	 */
 	@Test
-	public void testTreeViewerPreferences() throws CoreException, BackingStoreException {
+	public void testTreeViewerPreferences() throws BackingStoreException {
 		addTestPreferences();
 		Display.getDefault().syncExec(new Runnable() {
 			@Override
 			public void run() {
-				try {
-					initViewer();
-				} catch (CoreException e) {
-					fail();
-				}
+				initViewer();
 				for (TreeItem treeItem : tree.getItems()) {
 					if (treeItem.getData() instanceof CreaterepoTreeCategory) {
 						CreaterepoTreeCategory category = (CreaterepoTreeCategory) treeItem.getData();
@@ -189,10 +177,8 @@ public class CreaterepoTreeTest {
 	/**
 	 * Initialize the treeviewer and tree. Needs access to UI thread when using
 	 * SWTBot tests. Need to wrap tests in Display.getDefault().syncExec().
-	 *
-	 * @throws CoreException
 	 */
-	private void initViewer() throws CoreException {
+	private void initViewer() {
 		viewer = new TreeViewer(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
 		viewer.setContentProvider(new CreaterepoTreeContentProvider());
 		viewer.setLabelProvider(new CreaterepoTreeLabelProvider());
@@ -205,9 +191,8 @@ public class CreaterepoTreeTest {
 	 * Add some test tags in the preferences.
 	 *
 	 * @throws BackingStoreException
-	 * @throws CoreException
 	 */
-	private void addTestPreferences() throws BackingStoreException, CoreException {
+	private void addTestPreferences() throws BackingStoreException {
 		IEclipsePreferences pref = project.getEclipsePreferences();
 		pref.put(CreaterepoPreferenceConstants.PREF_DISTRO_TAG, preparePrefValue(DISTRO_TAGS));
 		pref.put(CreaterepoPreferenceConstants.PREF_CONTENT_TAG, preparePrefValue(CONTENT_TAGS));
@@ -221,7 +206,7 @@ public class CreaterepoTreeTest {
 	 * @param values The values to store.
 	 * @return The string as it should be stored.
 	 */
-	private String preparePrefValue(String[] values) {
+	private static String preparePrefValue(String[] values) {
 		String str = ICreaterepoConstants.EMPTY_STRING;
 		if (values.length > 0) {
 			for (String temp : values) {
@@ -238,7 +223,7 @@ public class CreaterepoTreeTest {
 	 * @param itemToCheck The item to check.
 	 * @return True if the item should exist, false otherwise.
 	 */
-	private boolean inCategory(String itemToCheck) {
+	private static boolean inCategory(String itemToCheck) {
 		for (String str : CORRECT_CATEGORIES.keySet()) {
 			if (str.equals(itemToCheck)) {
 				return true;
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/rpm/createrepo/tests/AllTests.java b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/rpm/createrepo/tests/AllTests.java
index 95913083ae..ba1b260aaf 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/rpm/createrepo/tests/AllTests.java
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/rpm/createrepo/tests/AllTests.java
@@ -31,4 +31,5 @@ import org.junit.runners.Suite.SuiteClasses;
 	CreaterepoRepoFormEditorTest.class, CreaterepoImportRPMsPageTest.class, CreaterepoMetadataPageTest.class,
 	CreaterepoResourceListenerTest.class, CreaterepoCommandCreatorTest.class})
 public class AllTests {
+	//Nothing here as annotation is important
 }
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/rpm/createrepo/tests/CreaterepoProjectTest.java b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/rpm/createrepo/tests/CreaterepoProjectTest.java
index ab43a26f5b..feac02a1bf 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/rpm/createrepo/tests/CreaterepoProjectTest.java
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/rpm/createrepo/tests/CreaterepoProjectTest.java
@@ -42,7 +42,6 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.osgi.framework.FrameworkUtil;
-import org.osgi.service.prefs.BackingStoreException;
 
 /**
  * Tests for CreaterepoProject.
@@ -120,10 +119,9 @@ public class CreaterepoProjectTest {
 	 * without specifying .repo file.
 	 *
 	 * @throws CoreException
-	 * @throws BackingStoreException
 	 */
 	@Test
-	public void testInitializeNoRepoFileSpecfied() throws CoreException, BackingStoreException {
+	public void testInitializeNoRepoFileSpecfied() throws CoreException {
 		// repo file will be found rather than initialized
 		CreaterepoProject createrepoProject = new CreaterepoProject(project);
 		// content folder is defined, but not created (wizard does that)