Clean Up: Add final modifier to private fields

TextMergeViewer, EditionSelectionDialog manually excluded due to dead
code compilation error

ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java

@@ -81,7 +81,7 @@
 public class AntCorePreferences implements IPropertyChangeListener {
 
 	static class WrappedClassLoader extends ClassLoader {
-		private Bundle bundle;
+		private final Bundle bundle;
 
 		public WrappedClassLoader(Bundle bundle) {
 			super();
@@ -137,7 +137,7 @@ public String toString() {
 		}
 	}
 
-	private IPreferenceChangeListener prefListener = event -> {
+	private final IPreferenceChangeListener prefListener = event -> {
 		String property = event.getKey();
 		if (property.equals(IAntCoreConstants.PREFERENCE_TASKS) || property.startsWith(IAntCoreConstants.PREFIX_TASK)) {
 			restoreTasks();
@@ -156,9 +156,9 @@ public String toString() {
 		}
 	};
 
-	private List<Task> defaultTasks;
-	private List<Type> defaultTypes;
-	private List<AntClasspathEntry> extraClasspathURLs;
+	private final List<Task> defaultTasks;
+	private final List<Type> defaultTypes;
+	private final List<AntClasspathEntry> extraClasspathURLs;
 	private List<Property> defaultProperties;
 	private IAntClasspathEntry[] defaultAntHomeEntries;
 

ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/EclipseAntMain.java

@@ -20,7 +20,7 @@
 
 public class EclipseAntMain extends Main {
 
-	private Project fEclipseAntProject;
+	private final Project fEclipseAntProject;
 
 	public EclipseAntMain(Project eclipseAntProject) {
 		super();

ant/org.eclipse.ant.launching/common/org/eclipse/ant/internal/launching/debug/AntDebugState.java

@@ -34,11 +34,11 @@ public class AntDebugState {
 	private static final String fgAntTaskName = "ant"; //$NON-NLS-1$
 	private static final String fgAntCallTaskName = "antcall"; //$NON-NLS-1$
 
-	private IDebugBuildLogger fLogger;
+	private final IDebugBuildLogger fLogger;
 	@SuppressWarnings("unused")
-	private Stack<Task> fTasks = new Stack<Task>();
+	private final Stack<Task> fTasks = new Stack<Task>();
 	@SuppressWarnings("unused")
-	private Map<Task, Object> fTaskToProxies = new HashMap<Task, Object>();
+	private final Map<Task, Object> fTaskToProxies = new HashMap<Task, Object>();
 	private Task fCurrentTask;
 	private Task fStepOverTask;
 	private Task fStepIntoTask;
@@ -51,9 +51,9 @@ public class AntDebugState {
 	private Map<Project, Vector<?>> fProjectToTargetNames = null;
 	private Map<Project, Map<Target, Vector<Target>>> fProjectToMapOfTargetToBuildSequence = null;
 	@SuppressWarnings("unused")
-	private Stack<Target> fTargetsToExecute = new Stack<Target>();
+	private final Stack<Target> fTargetsToExecute = new Stack<Target>();
 	@SuppressWarnings("unused")
-	private Stack<Target> fTargetsExecuting = new Stack<Target>();
+	private final Stack<Target> fTargetsExecuting = new Stack<Target>();
 
 	private boolean fConsiderTargetBreakpoints = false;
 	private boolean fShouldSuspend;

ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/InternalAntRunner.java

@@ -110,12 +110,12 @@ public class InternalAntRunner {
 	private String loggerClassname = null;
 
 	/** Extra arguments to be parsed as command line arguments. */
-	private String[] extraArguments = null;
+	private final String[] extraArguments = null;
 
 	private boolean scriptExecuted = false;
 
 	@SuppressWarnings("unused")
-	private List<String> propertyFiles = new ArrayList<String>();
+	private final List<String> propertyFiles = new ArrayList<String>();
 
 	/**
 	 * The Ant InputHandler class. There may be only one input handler.

ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntBreakpoint.java

@@ -19,9 +19,9 @@
 
 public class RemoteAntBreakpoint {
 
-	private File fFile;
-	private int fLineNumber;
-	private String fFileName;
+	private final File fFile;
+	private final int fLineNumber;
+	private final String fFileName;
 
 	public RemoteAntBreakpoint(String breakpointRepresentation) {
 		String[] data = breakpointRepresentation.split(DebugMessageIds.MESSAGE_DELIMITER);

ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntBuildLogger.java

@@ -43,7 +43,7 @@
 public class RemoteAntBuildLogger extends DefaultLogger {
 
 	/** Time of the start of the build */
-	private long fStartTime = System.currentTimeMillis();
+	private final long fStartTime = System.currentTimeMillis();
 
 	/**
 	 * The client socket.

ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/AntSourceContainer.java

@@ -30,7 +30,7 @@
 
 public class AntSourceContainer extends AbstractSourceContainer {
 
-	private IWorkspaceRoot fRoot;
+	private final IWorkspaceRoot fRoot;
 
 	public AntSourceContainer() {
 		fRoot = ResourcesPlugin.getWorkspace().getRoot();

ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntDebugTarget.java

@@ -43,10 +43,10 @@
 public class AntDebugTarget extends AntDebugElement implements IDebugTarget, IDebugEventSetListener, IBreakpointManagerListener {
 
 	// associated system process (Ant Build)
-	private IProcess fProcess;
+	private final IProcess fProcess;
 
 	// containing launch object
-	private ILaunch fLaunch;
+	private final ILaunch fLaunch;
 
 	// Build file name
 	private String fName;
@@ -58,10 +58,10 @@ public class AntDebugTarget extends AntDebugElement implements IDebugTarget, IDe
 	private boolean fTerminated = false;
 
 	// threads
-	private AntThread fThread;
+	private final AntThread fThread;
 	private IThread[] fThreads;
 
-	private IAntDebugController fController;
+	private final IAntDebugController fController;
 
 	private List<IBreakpoint> fRunToLineBreakpoints;
 

ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntProperties.java

@@ -20,7 +20,7 @@
 public class AntProperties extends AntDebugElement implements IVariable {
 
 	private IValue fValue;
-	private String fName;
+	private final String fName;
 	private boolean fValid = true;
 
 	public AntProperties(AntDebugTarget target, String name) {

ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntPropertiesValue.java

@@ -23,7 +23,7 @@
 
 public class AntPropertiesValue extends AntDebugElement implements IValue {
 
-	private List<AntProperty> fProperties = new ArrayList<>();
+	private final List<AntProperty> fProperties = new ArrayList<>();
 
 	public AntPropertiesValue(AntDebugTarget target) {
 		super(target);

ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntProperty.java

@@ -22,8 +22,8 @@
  */
 public class AntProperty extends AntDebugElement implements IVariable, Comparable<AntProperty> {
 
-	private String fName;
-	private AntValue fValue;
+	private final String fName;
+	private final AntValue fValue;
 	private String fLabel;
 
 	/**

ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntStackFrame.java

@@ -27,7 +27,7 @@
  */
 public class AntStackFrame extends AntDebugElement implements IStackFrame {
 
-	private AntThread fThread;
+	private final AntThread fThread;
 	private String fName;
 	private int fLineNumber;
 	private String fFilePath;

ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntThread.java

@@ -38,7 +38,7 @@ public class AntThread extends AntDebugElement implements IThread {
 	/**
 	 * The stackframes associated with this thread
 	 */
-	private List<AntStackFrame> fFrames = new ArrayList<>(1);
+	private final List<AntStackFrame> fFrames = new ArrayList<>(1);
 
 	/**
 	 * The stackframes to be reused on suspension
@@ -67,7 +67,7 @@ public class AntThread extends AntDebugElement implements IThread {
 	 */
 	private AntProperties fRuntimeProperties;
 
-	private Object fPropertiesLock = new Object();
+	private final Object fPropertiesLock = new Object();
 
 	/**
 	 * Constructs a new thread for the given target

ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntValue.java

@@ -19,7 +19,7 @@
 
 public class AntValue extends AntDebugElement implements IValue {
 
-	private String fValueString;
+	private final String fValueString;
 	protected static final IVariable[] EMPTY = new IVariable[0];
 
 	public AntValue(AntDebugTarget target, String value) {

ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/AntStreamMonitor.java

@@ -22,8 +22,8 @@
  */
 public class AntStreamMonitor implements IFlushableStreamMonitor {
 
-	private StringBuffer fContents = new StringBuffer();
-	private ListenerList<IStreamListener> fListeners = new ListenerList<>(1);
+	private final StringBuffer fContents = new StringBuffer();
+	private final ListenerList<IStreamListener> fListeners = new ListenerList<>(1);
 	private boolean fBuffered = true;
 
 	@Override

ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/AntStreamsProxy.java

@@ -22,16 +22,16 @@
  */
 public class AntStreamsProxy implements IStreamsProxy {
 
-	private AntStreamMonitor fErrorMonitor = new AntStreamMonitor();
-	private AntStreamMonitor fOutputMonitor = new AntStreamMonitor();
+	private final AntStreamMonitor fErrorMonitor = new AntStreamMonitor();
+	private final AntStreamMonitor fOutputMonitor = new AntStreamMonitor();
 
 	public static final String ANT_DEBUG_STREAM = AntLaunching.PLUGIN_ID + ".ANT_DEBUG_STREAM"; //$NON-NLS-1$
 	public static final String ANT_VERBOSE_STREAM = AntLaunching.PLUGIN_ID + ".ANT_VERBOSE_STREAM"; //$NON-NLS-1$
 	public static final String ANT_WARNING_STREAM = AntLaunching.PLUGIN_ID + ".ANT_WARNING_STREAM"; //$NON-NLS-1$
 
-	private AntStreamMonitor fDebugMonitor = new AntStreamMonitor();
-	private AntStreamMonitor fVerboseMonitor = new AntStreamMonitor();
-	private AntStreamMonitor fWarningMonitor = new AntStreamMonitor();
+	private final AntStreamMonitor fDebugMonitor = new AntStreamMonitor();
+	private final AntStreamMonitor fVerboseMonitor = new AntStreamMonitor();
+	private final AntStreamMonitor fWarningMonitor = new AntStreamMonitor();
 
 	@Override
 	public IStreamMonitor getErrorStreamMonitor() {

ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/RemoteAntBuildListener.java

@@ -68,13 +68,13 @@ public void handleException(Throwable exception) {
 	 *
 	 * @since 3.7
 	 */
-	private String fEncoding;
+	private final String fEncoding;
 
 	/**
 	 * Reads the message stream from the RemoteAntBuildLogger
 	 */
 	private class ServerConnection extends Thread {
-		private int fServerPort;
+		private final int fServerPort;
 
 		public ServerConnection(int port) {
 			super("Ant Build Server Connection"); //$NON-NLS-1$

ant/org.eclipse.ant.tests.ui/Ant Debug Tests/org/eclipse/ant/tests/ui/debug/RunToLineTests.java

@@ -46,7 +46,7 @@ public RunToLineTests(String name) {
 		super(name);
 	}
 
-	private Object fLock = new Object();
+	private final Object fLock = new Object();
 	private IEditorPart fEditor = null;
 
 	class MyListener implements IPerspectiveListener2 {

ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/support/TestLocationProvider.java

@@ -21,7 +21,7 @@
 
 public class TestLocationProvider extends LocationProvider {
 
-	private File buildFile;
+	private final File buildFile;
 
 	public TestLocationProvider(File buildFile) {
 		super(null);

ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/Parser.java

@@ -177,7 +177,7 @@ public ISchema parseDTD(Reader reader, String root) throws ParseError, IOExcepti
 	}
 
 	private static class DTDReader extends Reader {
-		private Reader fDelegate;
+		private final Reader fDelegate;
 
 		public DTDReader(String pub, String sys, String root) {
 			String document = "<!DOCTYPE " + root + " PUBLIC '" + pub + "' '" + sys + "'><" + root + "/>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
@@ -196,7 +196,7 @@ public int read(char[] cbuf, int off, int len) throws IOException {
 	}
 
 	private static class DTDEntityResolver implements EntityResolver {
-		private Reader reader;
+		private final Reader reader;
 
 		public DTDEntityResolver(Reader reader) {
 			this.reader = reader;

ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Attribute.java

@@ -24,7 +24,7 @@
 public class Attribute extends Atom implements IAttribute {
 	private String fType;
 	private String[] fEnum;
-	private IElement fElement;
+	private final IElement fElement;
 	private String fDefault;
 	private boolean fFixed;
 	private boolean fRequired;

ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Element.java

@@ -27,7 +27,7 @@ public class Element extends Atom implements IElement {
 	private boolean fUndefined = true;
 	private boolean fText;
 	private IModel fModel;
-	private Map<String, IAttribute> fMap = new HashMap<>(4);
+	private final Map<String, IAttribute> fMap = new HashMap<>(4);
 	private Dfm fElementDfm;
 
 	/**

ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Schema.java

@@ -25,7 +25,7 @@
  * @author Bob Foster
  */
 public class Schema implements ISchema {
-	private HashMap<String, IElement> fElementMap = new HashMap<>();
+	private final HashMap<String, IElement> fElementMap = new HashMap<>();
 	private Exception fErrorException;
 
 	@Override

ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/SchemaFactory.java

@@ -37,7 +37,7 @@ public class SchemaFactory implements DeclHandler {
 	private int fPos;
 	private Element fElement;
 
-	private Schema fSchema;
+	private final Schema fSchema;
 	private static HashSet<String> fTypes = new HashSet<>();
 	private Exception fErrorException;
 	static {

ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/SortedMap.java

@@ -22,7 +22,7 @@
  */
 public class SortedMap implements FactoryObject {
 
-	private SortedSet fSet;
+	private final SortedSet fSet;
 	private IMapHolder fHolder;
 	private SortedMap fNext;
 

ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntAutoEditStrategy.java

@@ -32,7 +32,7 @@
  */
 public class AntAutoEditStrategy extends DefaultIndentLineAutoEditStrategy {
 
-	private AntModel fModel;
+	private final AntModel fModel;
 	private int fAccumulatedChange = 0;
 
 	public AntAutoEditStrategy(AntModel model) {

ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntCompletionProposal.java

@@ -32,21 +32,21 @@ public class AntCompletionProposal implements ICompletionProposal, ICompletionPr
 	public static final int PROPERTY_PROPOSAL = 2;
 
 	/** The string to be displayed in the completion proposal popup */
-	private String fDisplayString;
+	private final String fDisplayString;
 	/** The replacement string */
-	private String fReplacementString;
+	private final String fReplacementString;
 	/** The replacement offset */
-	private int fReplacementOffset;
+	private final int fReplacementOffset;
 	/** The replacement length */
 	private int fReplacementLength;
 	/** The cursor position after this proposal has been applied */
-	private int fCursorPosition;
+	private final int fCursorPosition;
 	/** The image to be displayed in the completion proposal popup */
-	private Image fImage;
+	private final Image fImage;
 	/** The additional info of this proposal */
-	private String fAdditionalProposalInfo;
+	private final String fAdditionalProposalInfo;
 
-	private int fType;
+	private final int fType;
 
 	/**
 	 * Creates a new Ant completion proposal. All fields are initialized based on the provided information.

ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditor.java

@@ -218,12 +218,12 @@ public void doOperation(int operation) {
 	 */
 	class OccurrencesFinderJob extends Job {
 
-		private IDocument fDocument;
-		private ISelection fSelection;
+		private final IDocument fDocument;
+		private final ISelection fSelection;
 		private ISelectionValidator fPostSelectionValidator;
 		private boolean fCanceled = false;
 		private IProgressMonitor fProgressMonitor;
-		private List<Position> fPositions;
+		private final List<Position> fPositions;
 
 		public OccurrencesFinderJob(IDocument document, List<Position> positions, ISelection selection) {
 			super("Occurrences Marker"); //$NON-NLS-1$