Various warnings found by sonar in rpm module.

Change-Id: Ie15790dc2c31c194a37782c639b03e2505b4d4df
Reviewed-on: https://git.eclipse.org/r/11510
Tested-by: Hudson CI
Reviewed-by: Camilo Bernal <cabernal@redhat.com>
IP-Clean: Camilo Bernal <cabernal@redhat.com>
Tested-by: Camilo Bernal <cabernal@redhat.com>

12 files changed, 66 insertions, 63 deletions

diff --git a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/internal/rpm/core/RPMCoreInitializer.java b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/internal/rpm/core/RPMCoreInitializer.java
index ed802a7f79..7a7898a190 100644
--- a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/internal/rpm/core/RPMCoreInitializer.java
+++ b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/internal/rpm/core/RPMCoreInitializer.java
@@ -25,9 +25,9 @@ public class RPMCoreInitializer extends AbstractPreferenceInitializer {
 	@Override
 	public void initializeDefaultPreferences() {
 		IPreferenceStore store = new ScopedPreferenceStore(InstanceScope.INSTANCE,IRPMConstants.RPM_CORE_ID);
-		String user_name = System.getProperty("user.name"); //$NON-NLS-1$
+		String userName = System.getProperty("user.name"); //$NON-NLS-1$
 		store.setDefault(IRPMConstants.RPM_DISPLAYED_LOG_NAME, ".logfilename_" //$NON-NLS-1$
-				+ user_name);
+				+ userName);
 		store.setDefault(IRPMConstants.RPM_LOG_NAME, "rpmbuild.log"); //$NON-NLS-1$
 
 		store.setDefault(IRPMConstants.RPM_CMD, "/bin/rpm"); //$NON-NLS-1$
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/internal/rpm/core/utils/RPMBuild.java b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/internal/rpm/core/utils/RPMBuild.java
index cbd858454c..c8c4e16014 100644
--- a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/internal/rpm/core/utils/RPMBuild.java
+++ b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/internal/rpm/core/utils/RPMBuild.java
@@ -60,8 +60,9 @@ public class RPMBuild {
 	public RPMBuild(IProjectConfiguration config) {
 		IEclipsePreferences node = DefaultScope.INSTANCE
 				.getNode(IRPMConstants.RPM_CORE_ID);
-		if (config.getBuildFolder().getLocation() == null)
+		if (config.getBuildFolder().getLocation() == null) {
 			mainFolder = config.getSourcesFolder().getLocationURI().toString();
+		}
 		rpmBuildCmd = node.get(IRPMConstants.RPMBUILD_CMD, ""); //$NON-NLS-1$
 		String[] tmpMacroDefines = { rpmBuildCmd, "-v" }; //$NON-NLS-1$
 		macroDefines.addAll(Arrays.asList(tmpMacroDefines));
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMProject.java b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMProject.java
index a5fe65dea5..f0ef542fa7 100644
--- a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMProject.java
+++ b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMProject.java
@@ -110,11 +110,11 @@ public class RPMProject {
 		try {
 			srpmFile.create(new FileInputStream(externalFile), false, null);
 		} catch (FileNotFoundException e) {
-			String throw_message = Messages
+			String throwMessage = Messages
 					.getString("RPMCore.Error_trying_to_copy__") + //$NON-NLS-1$
 					rpmConfig.getSpecsFolder().getLocation().toOSString();
 			IStatus error = new Status(IStatus.ERROR, IRPMConstants.ERROR, 1,
-					throw_message, null);
+					throwMessage, e);
 			throw new CoreException(error);
 		}
 
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMProjectNature.java b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMProjectNature.java
index 03f7b70af0..31d4081135 100644
--- a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMProjectNature.java
+++ b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMProjectNature.java
@@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
  */
 public class RPMProjectNature implements IProjectNature {
 
-	IProject project;
+	private IProject project;
 	
 	/**
 	 * Adds the RPM project nature to a given workspace project.
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/internal/rpm/rpmlint/actions/RunRpmlintAction.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/internal/rpm/rpmlint/actions/RunRpmlintAction.java
index 763065fbd0..6ea9b86200 100644
--- a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/internal/rpm/rpmlint/actions/RunRpmlintAction.java
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/internal/rpm/rpmlint/actions/RunRpmlintAction.java
@@ -114,9 +114,11 @@ public class RunRpmlintAction extends AbstractHandler{
 		ConsolePlugin plugin = ConsolePlugin.getDefault();
 		IConsoleManager conMan = plugin.getConsoleManager();
 		IConsole[] existing = conMan.getConsoles();
-		for (int i = 0; i < existing.length; i++)
-			if (name.equals(existing[i].getName()))
+		for (int i = 0; i < existing.length; i++) {
+			if (name.equals(existing[i].getName())) {
 				return (MessageConsole) existing[i];
+			}
+		}
 		// no console found, so create a new one
 		MessageConsole myConsole = new MessageConsole(name, null);
 		conMan.addConsoles(new IConsole[] { myConsole });
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/internal/rpm/rpmlint/resolutions/ARpmlintResolution.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/internal/rpm/rpmlint/resolutions/ARpmlintResolution.java
index 141170a102..58d14fa428 100644
--- a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/internal/rpm/rpmlint/resolutions/ARpmlintResolution.java
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/internal/rpm/rpmlint/resolutions/ARpmlintResolution.java
@@ -23,23 +23,23 @@ import org.eclipse.ui.ide.IDE;
 
 /**
  * Base class providing common functionality for rpmlint resolution.
- * 
+ *
  */
 public abstract class ARpmlintResolution implements IMarkerResolution2 {
 
-	
+
 	/**
-	 * No image for rpmlint resolutions for now. 
-	 * 
+	 * No image for rpmlint resolutions for now.
+	 *
 	 * @see org.eclipse.ui.IMarkerResolution2#getImage()
 	 */
 	public Image getImage() {
 		return null;
 	}
-	
+
 	/**
 	 * Returns the SpecfileEditor for the given IMarker if any.
-	 * 
+	 *
 	 * @param marker The marker to use for retrieving the editor.
 	 * @return The SpecfileEditor this marker is from or null if it's not a SpecfileEditor.
 	 */
@@ -58,7 +58,6 @@ public abstract class ARpmlintResolution implements IMarkerResolution2 {
 		if (!(part instanceof SpecfileEditor)) {
 			return null;
 		}
-		SpecfileEditor editor = (SpecfileEditor) part;
-		return editor;
+		return (SpecfileEditor) part;
 	}
 }
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/ColorManager.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/ColorManager.java
index 7edc992814..2298c365ed 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/ColorManager.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/ColorManager.java
@@ -20,7 +20,7 @@ import org.eclipse.swt.widgets.Display;
 
 public class ColorManager {
 
-	protected Map<RGB, Color> fColorTable = new HashMap<RGB, Color>(10);
+	private Map<RGB, Color> fColorTable = new HashMap<RGB, Color>(10);
 
 	public void dispose() {
 		for (Map.Entry<RGB, Color> entry:fColorTable.entrySet()){
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/compare/SpecMergeViewer.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/compare/SpecMergeViewer.java
index 940c8449da..bf8e134ada 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/compare/SpecMergeViewer.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/compare/SpecMergeViewer.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     Red Hat - initial API and implementation
  *******************************************************************************/
@@ -25,17 +25,17 @@ import org.eclipse.swt.widgets.Composite;
 
 /**
  * Merge viewer for the files.
- * 
+ *
  */
 public class SpecMergeViewer extends TextMergeViewer {
 	private ColorManager colorManager;
 
 	/**
 	 * Creates a new SpecMergeViewer.
-	 * 
+	 *
 	 * @param parent The parent control.
 	 * @param configuration The compare configuration.
-	 * 
+	 *
 	 * @see TextMergeViewer#TextMergeViewer(Composite, CompareConfiguration)
 	 */
 	public SpecMergeViewer(Composite parent, CompareConfiguration configuration) {
@@ -65,13 +65,14 @@ public class SpecMergeViewer extends TextMergeViewer {
 
 	/**
 	 * Dispose the color manager and invoke the super method.
-	 * 
+	 *
 	 * @see org.eclipse.compare.contentmergeviewer.TextMergeViewer#handleDispose(org.eclipse.swt.events.DisposeEvent)
 	 */
 	@Override
 	protected void handleDispose(DisposeEvent event) {
-		if (colorManager != null)
+		if (colorManager != null) {
 			colorManager.dispose();
+		}
 		super.handleDispose(event);
 	}
 }
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/outline/SpecfileContentOutlinePage.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/outline/SpecfileContentOutlinePage.java
index 77059389b9..0820f0f04f 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/outline/SpecfileContentOutlinePage.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/outline/SpecfileContentOutlinePage.java
@@ -27,7 +27,7 @@ public class SpecfileContentOutlinePage extends ContentOutlinePage {
 
 	private ITextEditor editor;
 	private IEditorInput input;
-	
+
 	public SpecfileContentOutlinePage(SpecfileEditor editor) {
 		super();
 		this.editor = editor;
@@ -52,8 +52,9 @@ public class SpecfileContentOutlinePage extends ContentOutlinePage {
 					public void run() {
 						if (!control.isDisposed()) {
 							control.setRedraw(false);
-							if (input != null)
+							if (input != null) {
 								viewer.setInput(input);
+							}
 							viewer.expandAll();
 							control.setRedraw(true);
 						}
@@ -62,7 +63,7 @@ public class SpecfileContentOutlinePage extends ContentOutlinePage {
 			}
 		}
 	}
-	
+
 	@Override
 	public void createControl(Composite parent) {
 
@@ -73,10 +74,11 @@ public class SpecfileContentOutlinePage extends ContentOutlinePage {
 		viewer.setLabelProvider(new SpecfileLabelProvider());
 		viewer.addSelectionChangedListener(this);
 
-		if (input != null)
+		if (input != null) {
 			viewer.setInput(input);
+		}
 	}
-	
+
 	/*
 	 * Change in selection
 	 */
@@ -84,23 +86,19 @@ public class SpecfileContentOutlinePage extends ContentOutlinePage {
 	public void selectionChanged(SelectionChangedEvent event)
 	{
 		super.selectionChanged(event);
-		
+
 		//find out which item in tree viewer we have selected, and set highlight range accordingly
 		ISelection selection = event.getSelection();
-		if (selection.isEmpty())
+		if (selection.isEmpty()) {
 			editor.resetHighlightRange();
-		else
-		{
+		} else {
 			SpecfileElement element = (SpecfileElement) ((IStructuredSelection) selection)
-					.getFirstElement();		
-			
+					.getFirstElement();
+
 			int start = element.getLineStartPosition();
-			try
-			{
+			try	{
 				editor.setHighlightRange(start, 1, true);
-			}
-			catch (IllegalArgumentException e)
-			{
+			} catch (IllegalArgumentException e) {
 				editor.resetHighlightRange();
 			}
 		}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/scanners/SpecfilePartitionScanner.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/scanners/SpecfilePartitionScanner.java
index 2aab7972d9..5026cb3c70 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/scanners/SpecfilePartitionScanner.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/scanners/SpecfilePartitionScanner.java
@@ -50,58 +50,59 @@ public class SpecfilePartitionScanner extends RuleBasedPartitionScanner {
 	public static final String SPEC_PACKAGES = "__spec_packages"; //$NON-NLS-1$
 	public static final String SPEC_GROUP = "__spec_group"; //$NON-NLS-1$
 	public static final String SPEC_FILE_PARTITIONING = "___spec_partitioning"; //$NON-NLS-1$
-	
+
 	public static final String[] SPEC_PARTITION_TYPES = { IDocument.DEFAULT_CONTENT_TYPE, SPEC_PREP, SPEC_SCRIPT,
 			SPEC_FILES, SPEC_CHANGELOG, SPEC_PACKAGES, SPEC_GROUP};
-	
+
 	/** All possible headers for sections of the type SPEC_SCRIPT */
-	private static final String[] SECTION_HEADERS = { BUILD_SECTION, INSTALL_SECTION, 
+	private static final String[] SECTION_HEADERS = { BUILD_SECTION, INSTALL_SECTION,
 		PRETRANS_SECTION, PRE_SECTION, PREUN_SECTION, POST_SECTION, POSTUN_SECTION,
 		POSTTRANS_SECTION, CLEAN_SECTION};
 
 	/** All possible headers for section that can come after sections of the type SPEC_SCRIPT */
-	private static final String[] SECTION_ENDING_HEADERS = { BUILD_SECTION, INSTALL_SECTION, 
-		PRETRANS_SECTION, PRE_SECTION, PREUN_SECTION, POST_SECTION, POSTUN_SECTION, POSTTRANS_SECTION, 
+	private static final String[] SECTION_ENDING_HEADERS = { BUILD_SECTION, INSTALL_SECTION,
+		PRETRANS_SECTION, PRE_SECTION, PREUN_SECTION, POST_SECTION, POSTUN_SECTION, POSTTRANS_SECTION,
 		CLEAN_SECTION, FILES_SECTION};
-	
+
 	public SpecfilePartitionScanner() {
 		super();
-		
+
 		IToken specPrep = new Token(SPEC_PREP);
 		IToken specScript = new Token(SPEC_SCRIPT);
 		IToken specFiles = new Token(SPEC_FILES);
 		IToken specChangelog = new Token(SPEC_CHANGELOG);
 		IToken specPackages = new Token(SPEC_PACKAGES);
 		IToken specGroup = new Token(SPEC_GROUP);
-		
+
 		List<IRule> rules = new ArrayList<IRule>();
-		
+
 		// RPM packages
 		for (String packageTag : SpecfilePackagesScanner.PACKAGES_TAGS) {
 			rules.add(new SingleLineRule(packageTag, "", specPackages, (char)0 , true));		 //$NON-NLS-1$
 		}
-		
+
 		// %prep
 		rules.add(new SectionRule(PREP_SECTION, new String[] { BUILD_SECTION }, specPrep));
-		
+
 		// %changelog
 		rules.add(new MultiLineRule(RpmSections.CHANGELOG_SECTION, "", specChangelog, (char)0 , true)); //$NON-NLS-1$
-		
+
 		// "%build", "%install", "%pre", "%preun", "%post", "%postun"
-		for (String sectionHeader : SECTION_HEADERS)
+		for (String sectionHeader : SECTION_HEADERS) {
 			rules.add(new SectionRule(sectionHeader, SECTION_ENDING_HEADERS, specScript));
+		}
 
 		// comments
 		rules.add(new CommentRule(specScript));
-		
+
 		// group tag
 		rules.add(new EndOfLineRule("Group:", specGroup)); //$NON-NLS-1$
-		
-		
+
+
 		// %files
 		rules.add(new SectionRule(FILES_SECTION, new String[] { FILES_SECTION,
 				CHANGELOG_SECTION }, specFiles));
-		
+
 		IPredicateRule[] result= new IPredicateRule[rules.size()];
 		rules.toArray(result);
 		setPredicateRules(result);
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackage.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackage.java
index 7612fb7427..f35e2ddb46 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackage.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackage.java
@@ -40,7 +40,7 @@ public class SpecfilePackage extends SpecfileSection {
 	public void setDescription(String description) {
 		this.description = description;
 	}
-	
+
 	@Override
 	public String toString() {
 		return getPackageName();
@@ -50,15 +50,16 @@ public class SpecfilePackage extends SpecfileSection {
 		sections.add(section);
 	}
 
-	
+
 	public SpecfileSection[] getSections() {
 		SpecfileSection[] toReturn = new SpecfileSection[sections.size()];
 		return sections.toArray(toReturn);
 	}
 
 	public boolean hasChildren() {
-		if (sections != null && sections.size() > 0)
+		if (sections != null && sections.size() > 0) {
 			return true;
+		}
 		return false;
 	}
 
@@ -71,10 +72,10 @@ public class SpecfilePackage extends SpecfileSection {
 	public String getPackageName() {
 		return resolve(this.packageName);
 	}
-	
+
 	/**
-	 * Returns the full package name. 
-	 * 
+	 * Returns the full package name.
+	 *
 	 * @return The name of the package with the common part appended in front.
 	 */
 	public String getFullPackageName() {
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/RPMNewProject.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/RPMNewProject.java
index bd1ad13c3d..b65ae41a3f 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/RPMNewProject.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/RPMNewProject.java
@@ -28,7 +28,7 @@ import org.eclipse.ui.actions.WorkspaceModifyOperation;
  *
  */
 public class RPMNewProject extends Wizard implements INewWizard {
-	NewProjectCreationPage namePage;
+	private NewProjectCreationPage namePage;
 
 	@Override
 	public boolean performFinish() {