More sonar QA

Author: jonathanaustin

src/main/java/com/github/bordertech/config/Config.java

@@ -160,8 +160,7 @@ public static void notifyListeners() {
 		// If we get here, then there is at least one listener who wants to be notified when a refresh occurs. The first
 		// step in this notification process is to create the PropertyChangeEvent object that will be sent to each of
 		// the registered PropertyChangeListeners.
-		//
-		// PropertyChangeEvent event = new PropertyChangeEvent(this, "propertiesRefresh", null, null);
+		// <code>PropertyChangeEvent event = new PropertyChangeEvent(this, "propertiesRefresh", null, null);</code>
 		//
 		// Finally, iterate through the complete set of PropertyChangeListeners and notify them that a change has
 		// occurred.

src/main/java/com/github/bordertech/config/DefaultConfiguration.java

@@ -14,9 +14,11 @@
 import java.nio.charset.StandardCharsets;
 import java.security.CodeSource;
 import java.security.ProtectionDomain;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Deque;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -26,7 +28,6 @@
 import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
-import java.util.Stack;
 import java.util.StringTokenizer;
 import java.util.TreeSet;
 import org.apache.commons.configuration.Configuration;
@@ -141,7 +142,7 @@ public class DefaultConfiguration implements Configuration {
 	/**
 	 * The resource being loaded. This is used for the relative form of resource loading.
 	 */
-	private final Stack<String> resources = new Stack<>();
+	private final Deque<String> resources = new ArrayDeque<>();
 
 	/**
 	 * A generic object that allows us to synchronized refreshes. Required so that gets and refreshes are threadsafe

src/main/java/com/github/bordertech/config/Touchfile.java

@@ -15,7 +15,7 @@ public class Touchfile {
 	/**
 	 * The touch file.
 	 */
-	private final File touchfile;
+	private final File file;
 
 	/**
 	 * Check interval in milli seconds.
@@ -41,10 +41,10 @@ public Touchfile(final String filename, final long checkInterval) {
 			throw new IllegalArgumentException("A touch filename must be provided.");
 		}
 		this.filename = filename;
-		this.touchfile = new File(filename);
+		this.file = new File(filename);
 		this.checkInterval = checkInterval < 0 ? 0 : checkInterval;
 		this.lastChecked = System.currentTimeMillis();
-		this.lastModified = touchfile.lastModified();
+		this.lastModified = file.lastModified();
 	}
 
 	/**
@@ -61,7 +61,7 @@ public boolean hasChanged() {
 		lastChecked = now;
 
 		// Has the file changed?
-		long modified = touchfile.lastModified();
+		long modified = file.lastModified();
 		if (lastModified == modified) {
 			// No Change
 			return false;