Changelog warning fixes.

As found by sonar.

Change-Id: I2932fab8f9f048e10cf05b85dc13648779d0ff15
Reviewed-on: https://git.eclipse.org/r/9461
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>

10 files changed, 22 insertions, 29 deletions

diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/ChangeLogExtensionManager.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/ChangeLogExtensionManager.java
index 7e398c7079..c0588f6929 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/ChangeLogExtensionManager.java
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/ChangeLogExtensionManager.java
@@ -32,7 +32,7 @@ import org.eclipse.linuxtools.changelog.core.IParserChangeLogContrib;
  * @author klee
  * 
  */
-public class ChangeLogExtensionManager {
+public final class ChangeLogExtensionManager {
 
 	
 	private static final ChangeLogExtensionManager exm = new ChangeLogExtensionManager();
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/ChangelogPlugin.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/ChangelogPlugin.java
index 492322c36a..28dcb5c2b3 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/ChangelogPlugin.java
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/ChangelogPlugin.java
@@ -23,7 +23,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
  */
 public class ChangelogPlugin extends AbstractUIPlugin {
 	
-	public final static String PLUGIN_ID = "org.eclipse.linuxtools.changelog.core"; // $NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.changelog.core"; // $NON-NLS-1$
 	
 	// The shared instance.
 	private static ChangelogPlugin plugin;
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/Messages.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/Messages.java
index c67782edfa..b1c18c83fd 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/Messages.java
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/Messages.java
@@ -16,10 +16,8 @@ import java.util.ResourceBundle;
 /**
  * @author pmuldoon
  *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
  */
-public class Messages {
+public final class Messages {
 
 	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.changelog.core.strings"; //$NON-NLS-1$
 
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/actions/PrepareChangeLogAction.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/actions/PrepareChangeLogAction.java
index fce533c993..7e4118b5d6 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/actions/PrepareChangeLogAction.java
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/actions/PrepareChangeLogAction.java
@@ -324,16 +324,20 @@ public class PrepareChangeLogAction extends ChangeLogAction {
 				// Check the type of entry and sort into lists.  Do not add an entry
 				// for ChangeLog files.
 				if (!(p.getPath().lastSegment().equals("ChangeLog"))) { // $NON-NLS-1$
-					if (kind == SyncInfo.ADDITION) {
+					switch (kind) {
+					case SyncInfo.ADDITION:
 						p.setNewfile(true);
 						newList.add(p);
-					} else if (kind == SyncInfo.DELETION) {
+						break;
+					case SyncInfo.DELETION:
 						p.setRemovedFile(true);
 						removeList.add(p);
-					} else if (kind == SyncInfo.CHANGE) {
+						break;
+					case SyncInfo.CHANGE:
 						if (info.getLocal().getType() == IResource.FILE) {
 							changeList.add(p);
 						}
+						break;
 					}
 				} else {
 					this.changeLogModified = true;
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/actions/PrepareChangelogKeyHandler.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/actions/PrepareChangelogKeyHandler.java
index 9a6a9614bf..3fb40b2198 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/actions/PrepareChangelogKeyHandler.java
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/actions/PrepareChangelogKeyHandler.java
@@ -83,7 +83,7 @@ public class PrepareChangelogKeyHandler extends AbstractHandler {
 						if (sp != null) {
 							s = sp.getSelection();
 						}
-						if (s != null && s instanceof IStructuredSelection) {
+						if (s instanceof IStructuredSelection) {
 							IStructuredSelection ss = (IStructuredSelection)s;
 							Object element = ss.getFirstElement();
 							IResource r = null;
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/actions/StorageEditorInput.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/actions/StorageEditorInput.java
index c1b2c481b0..d44ebfdabb 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/actions/StorageEditorInput.java
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/actions/StorageEditorInput.java
@@ -20,7 +20,7 @@ import org.eclipse.ui.IStorageEditorInput;
 /**
  * Abstract implementation of <code>IStorageEditorInput</code>.
  */
-abstract public class StorageEditorInput implements IStorageEditorInput {
+public abstract class StorageEditorInput implements IStorageEditorInput {
 
 	/**
 	 * Storage associated with this editor input
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/editors/ChangeLogFormattingStrategy.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/editors/ChangeLogFormattingStrategy.java
index 8269e0a0cc..82d840e98a 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/editors/ChangeLogFormattingStrategy.java
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/editors/ChangeLogFormattingStrategy.java
@@ -20,11 +20,11 @@ import org.eclipse.jface.text.formatter.IFormattingStrategy;
 
 public class ChangeLogFormattingStrategy implements IFormattingStrategy {
 
-	private final String NEW_LINE_CHAR = "\n";
+	private static final String NEW_LINE_CHAR = "\n";
 
-	private final String WHITE_SPACE_CHAR = " ";
+	private static final String WHITE_SPACE_CHAR = " ";
 
-	private final String TAB_SPACE_CHAR = "\t";
+	private static final String TAB_SPACE_CHAR = "\t";
 
 	public String format(String content, boolean isLineStart,
 			String indentation, int[] positions) {
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/editors/GNUEditorConfiguration.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/editors/GNUEditorConfiguration.java
index 4c2a48fd7b..8026a53232 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/editors/GNUEditorConfiguration.java
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/editors/GNUEditorConfiguration.java
@@ -38,7 +38,7 @@ import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
 public class GNUEditorConfiguration extends TextSourceViewerConfiguration implements
 		IEditorChangeLogContrib, IEditorChangeLogContrib2 {
 
-	public final static String CHANGELOG_PARTITIONING= "gnu_changelog_partitioning";  //$NON-NLS-1$
+	public static final String CHANGELOG_PARTITIONING= "gnu_changelog_partitioning";  //$NON-NLS-1$
 
 	private GNUElementScanner scanner;
 
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/editors/GNUPartitionScanner.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/editors/GNUPartitionScanner.java
index 176698199f..4c828a6b7d 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/editors/GNUPartitionScanner.java
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/editors/GNUPartitionScanner.java
@@ -14,7 +14,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jface.text.rules.IPredicateRule;
-import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.MultiLineRule;
 import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
 import org.eclipse.jface.text.rules.SingleLineRule;
@@ -25,9 +24,9 @@ public class GNUPartitionScanner extends RuleBasedPartitionScanner {
 	// a change occurs within the area.  In this case, we are only interested in
 	// email entries which are surrounded by < and > and source entries which
 	// have one or more file names which may extend across lines.
-	public final static String CHANGELOG_EMAIL = "changelog_email"; //$NON-NLS-1$
-	public final static String CHANGELOG_SRC_ENTRY = "changelog_src_entry"; //$NON-NLS-1$
-	public final static String[] CHANGELOG_PARTITION_TYPES= 
+	public static final String CHANGELOG_EMAIL = "changelog_email"; //$NON-NLS-1$
+	public static final String CHANGELOG_SRC_ENTRY = "changelog_src_entry"; //$NON-NLS-1$
+	public static final String[] CHANGELOG_PARTITION_TYPES= 
 		new String[] { CHANGELOG_EMAIL, CHANGELOG_SRC_ENTRY };
 	
 	/**
@@ -48,10 +47,4 @@ public class GNUPartitionScanner extends RuleBasedPartitionScanner {
 		setPredicateRules(result);
 	}
 	
-	@Override
-	public IToken nextToken() {
-		return super.nextToken();
-	}
-
-
 }
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/formatters/GNUFormat.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/formatters/GNUFormat.java
index 8bf6b786ac..28f8bbe72f 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/formatters/GNUFormat.java
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/formatters/GNUFormat.java
@@ -39,7 +39,7 @@ public class GNUFormat implements IFormatterChangeLogContrib {
 	
 	final String line_sep = System.getProperty("line.separator"); //$NON-NLS-1$
 	
-	final String TAB = "\t"; // $NON-NLS-1$
+	final static String TAB = "\t"; // $NON-NLS-1$
 	
 	
 	public String formatDateLine(String authorName, String authorEmail) {
@@ -106,12 +106,10 @@ public class GNUFormat implements IFormatterChangeLogContrib {
 						// Check for the case where the default content (e.g. new or removed file)
 						// is being caught again because user has prepared the ChangeLog more than once.
 						// In such a case, just return.  We don't need to repeat ourselves.
-						if (defaultContent.length() > 0) {
-							if (entry.lastIndexOf(defaultContent) > 0)
+						if (defaultContent.length() > 0 && entry.lastIndexOf(defaultContent) > 0) {
 								return ""; // $NON-NLS-1$
 						}
-						int nextFunctLoc = functLogEntry + fileDetail.length()
-						+ 2;
+						int nextFunctLoc = functLogEntry + fileDetail.length() + 2;
 						String nextFunc = ""; // $NON-NLS-1$
 						try {
 							nextFunc = changelog_doc.get(nextFunctLoc,