diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/ApiTestingEnvironment.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/ApiTestingEnvironment.java
index ea921d02c6..8694441a47 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/ApiTestingEnvironment.java
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/ApiTestingEnvironment.java
@@ -75,9 +75,9 @@ public class ApiTestingEnvironment extends TestingEnvironment {
 	 * Modified files for each build so that we can undo the changes
 	 * incrementally rather than recreating the workspace for each test.
 	 */
-	private List<IPath> fAdded = new ArrayList<>();
-	private List<IPath> fChanged = new ArrayList<>();
-	private List<IPath> fRemoved = new ArrayList<>();
+	private final List<IPath> fAdded = new ArrayList<>();
+	private final List<IPath> fChanged = new ArrayList<>();
+	private final List<IPath> fRemoved = new ArrayList<>();
 
 	public ApiTestingEnvironment() throws Exception {
 		super();
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/usage/UnusedApiProblemFilterTests.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/usage/UnusedApiProblemFilterTests.java
index 1619bb6420..d4d584f4e7 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/usage/UnusedApiProblemFilterTests.java
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/usage/UnusedApiProblemFilterTests.java
@@ -41,8 +41,8 @@ public class UnusedApiProblemFilterTests extends UsageTest {
 	private static final String BEFORE = "before"; //$NON-NLS-1$
 	private static final String AFTER = "after"; //$NON-NLS-1$
 
-	private IPath fRootPath = super.getTestSourcePath().append("filters"); //$NON-NLS-1$
-	private IPath fFiltersPath = IPath.fromOSString("/usagetests/.settings/.api_filters"); //$NON-NLS-1$
+	private final IPath fRootPath = super.getTestSourcePath().append("filters"); //$NON-NLS-1$
+	private final IPath fFiltersPath = IPath.fromOSString("/usagetests/.settings/.api_filters"); //$NON-NLS-1$
 
 	public UnusedApiProblemFilterTests(String name) {
 		super(name);
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ApiDescriptionTests.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ApiDescriptionTests.java
index 2c3ff64748..8a31d2c225 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ApiDescriptionTests.java
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ApiDescriptionTests.java
@@ -57,7 +57,7 @@
  */
 public class ApiDescriptionTests {
 
-	private IApiDescription fManifest = buildManifest();
+	private final IApiDescription fManifest = buildManifest();
 
 	/**
 	 * Wraps an element with its API description
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/util/tests/ApiBaselineManagerTests.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/util/tests/ApiBaselineManagerTests.java
index bc3c1ce9dd..9aabd14557 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/util/tests/ApiBaselineManagerTests.java
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/util/tests/ApiBaselineManagerTests.java
@@ -178,9 +178,9 @@ private void updateTag(BodyDeclaration body) {
 		}
 	}
 
-	private IPath SRC_LOC = TestSuiteHelper.getPluginDirectoryPath().append("test-source").append("a").append("b").append("c"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	private IPath PLUGIN_LOC = TestSuiteHelper.getPluginDirectoryPath().append("test-plugins"); //$NON-NLS-1$
-	private IApiBaselineManager fPMmanager = ApiPlugin.getDefault().getApiBaselineManager();
+	private final IPath SRC_LOC = TestSuiteHelper.getPluginDirectoryPath().append("test-source").append("a").append("b").append("c"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+	private final IPath PLUGIN_LOC = TestSuiteHelper.getPluginDirectoryPath().append("test-plugins"); //$NON-NLS-1$
+	private final IApiBaselineManager fPMmanager = ApiPlugin.getDefault().getApiBaselineManager();
 	private final String TESTING_PACKAGE = "a.b.c"; //$NON-NLS-1$
 
 	/**
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/util/tests/HeadlessApiBaselineManagerTests.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/util/tests/HeadlessApiBaselineManagerTests.java
index 8565671b95..e9142fc0b0 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/util/tests/HeadlessApiBaselineManagerTests.java
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/util/tests/HeadlessApiBaselineManagerTests.java
@@ -34,7 +34,7 @@
  */
 public class HeadlessApiBaselineManagerTests extends AbstractApiTest {
 
-	private ApiBaselineManager fManager = ApiBaselineManager.getManager();
+	private final ApiBaselineManager fManager = ApiBaselineManager.getManager();
 
 	@Override
 	@After
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/ApiUIPlugin.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/ApiUIPlugin.java
index 65fa711eca..4874ce1307 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/ApiUIPlugin.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/ApiUIPlugin.java
@@ -235,7 +235,7 @@ public static IStatus newErrorStatus(String message, Throwable exception) {
 		return Status.error(message, exception);
 	}
 
-	private ISessionListener sessionListener = new ISessionListener() {
+	private final ISessionListener sessionListener = new ISessionListener() {
 		@Override
 		public void sessionAdded(ISession addedSession) {
 			Display.getDefault().asyncExec(() -> showAPIToolingView());
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/CompositeApiImageDescriptor.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/CompositeApiImageDescriptor.java
index 09d304a471..035ce32cd2 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/CompositeApiImageDescriptor.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/CompositeApiImageDescriptor.java
@@ -31,7 +31,7 @@ public class CompositeApiImageDescriptor extends CompositeImageDescriptor {
 	public static final int WARNING = 0x0002;
 
 	private Image fOriginalImage = null;
-	private int fFlags;
+	private final int fFlags;
 	private Point fSize;
 
 	/**
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/CollapseAllAction.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/CollapseAllAction.java
index 75f6b1b5fa..15a5f6dcc0 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/CollapseAllAction.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/CollapseAllAction.java
@@ -24,7 +24,7 @@
  */
 public class CollapseAllAction extends Action {
 
-	private TreeViewer fViewer;
+	private final TreeViewer fViewer;
 
 	public CollapseAllAction(TreeViewer viewer) {
 		setText(ActionMessages.CollapseAllAction_label);
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/ExpandAllAction.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/ExpandAllAction.java
index 5293841815..a1b440cf54 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/ExpandAllAction.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/ExpandAllAction.java
@@ -24,7 +24,7 @@
  */
 public class ExpandAllAction extends Action {
 
-	private TreeViewer fViewer;
+	private final TreeViewer fViewer;
 
 	public ExpandAllAction(TreeViewer viewer) {
 		setText(ActionMessages.ExpandAllAction_label);
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/ExportDialog.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/ExportDialog.java
index 820d630d98..39b80da768 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/ExportDialog.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/ExportDialog.java
@@ -53,12 +53,12 @@ public class ExportDialog extends Dialog {
 	/**
 	 * The title of the dialog.
 	 */
-	private String title;
+	private final String title;
 
 	/**
 	 * The message to display, or <code>null</code> if none.
 	 */
-	private String message;
+	private final String message;
 
 	/**
 	 * The input value; the empty string by default.
@@ -68,7 +68,7 @@ public class ExportDialog extends Dialog {
 	/**
 	 * The input validator, or <code>null</code> if none.
 	 */
-	private IInputValidator validator;
+	private final IInputValidator validator;
 
 	/**
 	 * Ok button widget.
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/NavigateAction.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/NavigateAction.java
index 8b6f823655..901e81ac6c 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/NavigateAction.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/NavigateAction.java
@@ -28,8 +28,8 @@
  */
 public class NavigateAction extends Action {
 	private final boolean next;
-	private IViewSite site;
-	private TreeViewer viewer;
+	private final IViewSite site;
+	private final TreeViewer viewer;
 
 	public NavigateAction(APIToolingView view, boolean next) {
 		this.site = view.getViewSite();
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/TreeViewerNavigator.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/TreeViewerNavigator.java
index f2186bb2b5..775735c363 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/TreeViewerNavigator.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/TreeViewerNavigator.java
@@ -24,7 +24,7 @@
  * Navigation in the tree viewer.
  */
 class TreeViewerNavigator {
-	private TreeViewer fViewer;
+	private final TreeViewer fViewer;
 
 	public TreeViewerNavigator(TreeViewer viewer) {
 		fViewer = viewer;
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/ApiMarkerResolutionGenerator.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/ApiMarkerResolutionGenerator.java
index 7423744a0a..7360be5037 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/ApiMarkerResolutionGenerator.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/ApiMarkerResolutionGenerator.java
@@ -47,7 +47,7 @@ public class ApiMarkerResolutionGenerator implements IMarkerResolutionGenerator2
 	 */
 	private final IMarkerResolution[] NO_RESOLUTIONS = new IMarkerResolution[0];
 
-	private DefaultApiProfileResolution profileResolution = new DefaultApiProfileResolution();
+	private final DefaultApiProfileResolution profileResolution = new DefaultApiProfileResolution();
 
 	@Override
 	public IMarkerResolution[] getResolutions(IMarker marker) {
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/NodeFinder.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/NodeFinder.java
index 58cf8c4ff3..3bcce03cd6 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/NodeFinder.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/NodeFinder.java
@@ -36,7 +36,7 @@
 public class NodeFinder extends ASTVisitor {
 
 	private BodyDeclaration declaration;
-	private int position;
+	private final int position;
 
 	/**
 	 * Constructor
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/PDEConfigureProblemSeverityAction.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/PDEConfigureProblemSeverityAction.java
index 2354bcafdf..011413fb7c 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/PDEConfigureProblemSeverityAction.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/PDEConfigureProblemSeverityAction.java
@@ -43,7 +43,7 @@ public class PDEConfigureProblemSeverityAction extends Action {
 
 	private final String fOptionId;
 
-	private int tab;
+	private final int tab;
 
 
 	public PDEConfigureProblemSeverityAction(IJavaProject project, String optionId, int t) {
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/UpdateSinceTagOperation.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/UpdateSinceTagOperation.java
index 1a1a20da00..52268d1c12 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/UpdateSinceTagOperation.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/UpdateSinceTagOperation.java
@@ -43,10 +43,10 @@
 
 public class UpdateSinceTagOperation {
 
-	private IMarker fMarker;
+	private final IMarker fMarker;
 	private IMarker[] otherIMarkers;
-	private int sinceTagType;
-	private String sinceTagVersion;
+	private final int sinceTagType;
+	private final String sinceTagVersion;
 
 	public UpdateSinceTagOperation(IMarker marker, IMarker[] otherMarkers, int sinceTagType, String sinceTagVersion) {
 		this.fMarker = marker;
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/VersionNumberingResolution.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/VersionNumberingResolution.java
index 308c38a615..0be3cccbb4 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/VersionNumberingResolution.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/VersionNumberingResolution.java
@@ -35,7 +35,7 @@
 public class VersionNumberingResolution implements IMarkerResolution2 {
 	String newVersionValue;
 	// major or minor version
-	private int kind;
+	private final int kind;
 	private String description;
 
 	public VersionNumberingResolution(IMarker marker) {
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiBaselinesConfigurationBlock.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiBaselinesConfigurationBlock.java
index b0f24b27a2..5674b96132 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiBaselinesConfigurationBlock.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiBaselinesConfigurationBlock.java
@@ -66,7 +66,7 @@ public class ApiBaselinesConfigurationBlock extends ConfigurationBlock {
 	 */
 	protected static class ControlData {
 		Key key;
-		private String[] values;
+		private final String[] values;
 
 		/**
 		 * Constructor
@@ -110,8 +110,8 @@ public int getSelection(String value) {
 	 */
 	protected static class Key {
 
-		private String qualifier;
-		private String key;
+		private final String qualifier;
+		private final String key;
 
 		/**
 		 * Constructor
@@ -237,7 +237,7 @@ protected final static Key getApiToolsKey(String key) {
 	/**
 	 * Default selection listener for controls on the page
 	 */
-	private SelectionListener selectionlistener = new SelectionAdapter() {
+	private final SelectionListener selectionlistener = new SelectionAdapter() {
 		@Override
 		public void widgetSelected(SelectionEvent e) {
 			if (e.widget instanceof Combo) {
@@ -254,11 +254,11 @@ public void widgetSelected(SelectionEvent e) {
 	 * Listing of all of the {@link Combo}s added to the block
 	 */
 
-	private ArrayList<Combo> fCombos = new ArrayList<>();
+	private final ArrayList<Combo> fCombos = new ArrayList<>();
 	/**
 	 * Listing of the label in the block
 	 */
-	private ArrayList<Label> fLabels = new ArrayList<>();
+	private final ArrayList<Label> fLabels = new ArrayList<>();
 
 	/**
 	 * The context of settings locations to search for values in
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiErrorsWarningsConfigurationBlock.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiErrorsWarningsConfigurationBlock.java
index e6a288177a..cc7b6fcc12 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiErrorsWarningsConfigurationBlock.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiErrorsWarningsConfigurationBlock.java
@@ -91,8 +91,8 @@ public class ApiErrorsWarningsConfigurationBlock extends ConfigurationBlock {
 	 * Provides data information for created controls
 	 */
 	protected static class ControlData {
-		private Key key;
-		private String[] values;
+		private final Key key;
+		private final String[] values;
 
 		/**
 		 * Constructor
@@ -136,8 +136,8 @@ public int getSelection(String value) {
 	 */
 	public static class Key {
 
-		private String qualifier;
-		private String key;
+		private final String qualifier;
+		private final String key;
 
 		/**
 		 * Constructor
@@ -596,7 +596,7 @@ protected final static Key getApiToolsKey(String key) {
 	/**
 	 * Default selection listener for controls on the page
 	 */
-	private SelectionListener selectionlistener = new SelectionAdapter() {
+	private final SelectionListener selectionlistener = new SelectionAdapter() {
 		@Override
 		public void widgetSelected(SelectionEvent e) {
 			Widget widget = e.widget;
@@ -695,22 +695,22 @@ public void widgetSelected(SelectionEvent e) {
 	/**
 	 * Listing of all of the {@link ExpandableComposite}s in the block
 	 */
-	private ArrayList<ExpandableComposite> fExpComps = new ArrayList<>();
+	private final ArrayList<ExpandableComposite> fExpComps = new ArrayList<>();
 
 	/**
 	 * Listing of all of the {@link Combo}s added to the block
 	 */
-	private ArrayList<Combo> fCombos = new ArrayList<>();
+	private final ArrayList<Combo> fCombos = new ArrayList<>();
 
 	/**
 	 * Map of combo and label
 	 */
-	private HashMap<Combo, Label> fComboLabelMap = new HashMap<>();
+	private final HashMap<Combo, Label> fComboLabelMap = new HashMap<>();
 
 	/**
 	 * Listing of all of the {@link Button} with SWT.check added to the block
 	 */
-	private ArrayList<Button> fCheckBoxes = new ArrayList<>();
+	private final ArrayList<Button> fCheckBoxes = new ArrayList<>();
 
 	/**
 	 * Control used inside the system library ee group
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiUseScanConfigurationBlock.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiUseScanConfigurationBlock.java
index 0dbea930f0..ec2c0bcfaf 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiUseScanConfigurationBlock.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiUseScanConfigurationBlock.java
@@ -48,7 +48,7 @@ public class ApiUseScanConfigurationBlock {
 	 */
 	protected static class ControlData {
 		Key key;
-		private String[] values;
+		private final String[] values;
 
 		/**
 		 * Constructor
@@ -92,8 +92,8 @@ public int getSelection(String value) {
 	 */
 	protected static class Key {
 
-		private String qualifier;
-		private String key;
+		private final String qualifier;
+		private final String key;
 
 		/**
 		 * Constructor
@@ -222,7 +222,7 @@ protected final static Key getApiToolsKey(String key) {
 	/**
 	 * Default selection listener for controls on the page
 	 */
-	private SelectionListener selectionlistener = new SelectionAdapter() {
+	private final SelectionListener selectionlistener = new SelectionAdapter() {
 		@Override
 		public void widgetSelected(SelectionEvent e) {
 			if (e.widget instanceof Combo) {
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/refactoring/CreateFileChange.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/refactoring/CreateFileChange.java
index 386828c8ff..a78aca46e4 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/refactoring/CreateFileChange.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/refactoring/CreateFileChange.java
@@ -48,7 +48,7 @@ public class CreateFileChange extends ResourceChange {
 	private String fSource;
 	private String fEncoding;
 	private boolean fExplicitEncoding;
-	private long fStampToRestore;
+	private final long fStampToRestore;
 
 	public CreateFileChange(IPath path, String source, String encoding) {
 		this(path, source, encoding, IResource.NULL_STAMP);
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/use/DescriptionPatternPage.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/use/DescriptionPatternPage.java
index 3bb4b3c74a..28555fc3e4 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/use/DescriptionPatternPage.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/use/DescriptionPatternPage.java
@@ -36,7 +36,7 @@ public class DescriptionPatternPage extends UsePatternPage {
 
 	static final String PAGE_NAME = "description"; //$NON-NLS-1$
 
-	private int kind = -1;
+	private final int kind = -1;
 	private Button kbutton = null;
 	private Text patterntext = null;
 	private String pattern = null;
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/DirectoryBasedApiBaselineWizardPage.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/DirectoryBasedApiBaselineWizardPage.java
index 88f1400ef5..beeb217da5 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/DirectoryBasedApiBaselineWizardPage.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/DirectoryBasedApiBaselineWizardPage.java
@@ -70,7 +70,7 @@ public static boolean isApplicable(IApiBaseline profile) {
 	 * from which to read plug-ins.
 	 */
 	class ReloadOperation implements IRunnableWithProgress {
-		private String location, name;
+		private final String location, name;
 
 		/**
 		 * Constructor
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/JavadocConversionRefactoring.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/JavadocConversionRefactoring.java
index a93296c177..a8b710ce7c 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/JavadocConversionRefactoring.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/JavadocConversionRefactoring.java
@@ -107,7 +107,7 @@ public class JavadocConversionRefactoring extends Refactoring {
 	/**
 	 * The projects to check
 	 */
-	private HashSet<IProject> projects = new HashSet<>();
+	private final HashSet<IProject> projects = new HashSet<>();
 
 	/**
 	 * Whether to remove the existing javadoc tags
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/TargetBasedApiBaselineWizardPage.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/TargetBasedApiBaselineWizardPage.java
index 71c4b8474a..8ff4ddb8d5 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/TargetBasedApiBaselineWizardPage.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/TargetBasedApiBaselineWizardPage.java
@@ -73,8 +73,8 @@ public static boolean isApplicable(IApiBaseline profile) {
 	 * definition from which to read plug-ins.
 	 */
 	class ReloadTargetOperation implements IRunnableWithProgress {
-		private ITargetDefinition definition;
-		private String name;
+		private final ITargetDefinition definition;
+		private final String name;
 
 		/**
 		 * Constructor
@@ -153,7 +153,7 @@ public void dispose() {
 	 * Initial collection of targets (handles are realized into definitions as
 	 * working copies)
 	 */
-	private List<ITargetDefinition> fTargets = new ArrayList<>();
+	private final List<ITargetDefinition> fTargets = new ArrayList<>();
 
 	private ITargetDefinition selectedTargetDefinition;
 
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiAnnotations.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiAnnotations.java
index a6ae6501d6..48a88f295c 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiAnnotations.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiAnnotations.java
@@ -28,7 +28,7 @@ public class ApiAnnotations implements IApiAnnotations {
 	public static final int RESTRICTIONS_MASK = 0x01F0;
 	public static final int OFFSET_VISIBILITY = 0;
 	public static final int OFFSET_RESTRICTIONS = 4;
-	private int bits;
+	private final int bits;
 	boolean isExact;
 
 	public ApiAnnotations(int visibility, int restrictions) {
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiDescriptionManager.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiDescriptionManager.java
index ef227a61c3..e27f59b44b 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiDescriptionManager.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiDescriptionManager.java
@@ -71,7 +71,7 @@ public final class ApiDescriptionManager implements ISaveParticipant {
 	/**
 	 * Maps Java projects to API descriptions
 	 */
-	private Map<IJavaProject, IApiDescription> fDescriptions = new HashMap<>();
+	private final Map<IJavaProject, IApiDescription> fDescriptions = new HashMap<>();
 
 	/**
 	 * Path to the local directory where API descriptions are cached per
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiDescriptionProcessor.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiDescriptionProcessor.java
index 6282cfb4eb..8539d760d7 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiDescriptionProcessor.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiDescriptionProcessor.java
@@ -110,7 +110,7 @@ static class DescriptionVisitor extends ApiDescriptionVisitor {
 		/**
 		 * Members collected from current type.
 		 */
-		private List<IElementDescriptor> members = new ArrayList<>();
+		private final List<IElementDescriptor> members = new ArrayList<>();
 
 		/**
 		 * List of exception statuses that occurred, or <code>null</code> if
@@ -212,7 +212,7 @@ static class ASTTagVisitor extends ASTVisitor {
 		private List<IElementDescriptor> apis = null;
 		private IApiDescription description = null;
 		private ASTRewrite rewrite = null;
-		private Stack<Integer> typeStack;
+		private final Stack<Integer> typeStack;
 
 		/**
 		 * Constructor
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiDescriptionXmlCreator.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiDescriptionXmlCreator.java
index f9659b1da7..9b66805843 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiDescriptionXmlCreator.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiDescriptionXmlCreator.java
@@ -43,12 +43,12 @@ public class ApiDescriptionXmlCreator extends ApiDescriptionVisitor {
 	/**
 	 * Component element
 	 */
-	private Element fComponent;
+	private final Element fComponent;
 
 	/**
 	 * XML doc being generated
 	 */
-	private Document fDoc;
+	private final Document fDoc;
 
 	/**
 	 * Current package node being created
@@ -63,12 +63,12 @@ public class ApiDescriptionXmlCreator extends ApiDescriptionVisitor {
 	/**
 	 * The stack of current type node being visited
 	 */
-	private Stack<Element> fTypeStack;
+	private final Stack<Element> fTypeStack;
 
 	/**
 	 * Set of package names already visited (to avoid re-visiting same package)
 	 */
-	private Set<String> fVisitedPackages;
+	private final Set<String> fVisitedPackages;
 
 	/**
 	 * Constructs a new visitor for the given component.
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/BundleListTargetLocation.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/BundleListTargetLocation.java
index 17c64ea25a..70d0bd808b 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/BundleListTargetLocation.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/BundleListTargetLocation.java
@@ -24,7 +24,7 @@
 
 public class BundleListTargetLocation implements ITargetLocation {
 
-	private TargetBundle[] bundles;
+	private final TargetBundle[] bundles;
 
 	public BundleListTargetLocation(TargetBundle[] bundles) {
 		this.bundles = bundles;
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/BundleVersionRange.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/BundleVersionRange.java
index 7f2a837c96..87b0d63278 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/BundleVersionRange.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/BundleVersionRange.java
@@ -24,7 +24,7 @@
  */
 public class BundleVersionRange implements IVersionRange {
 
-	private VersionRange fRange;
+	private final VersionRange fRange;
 
 	/**
 	 * Constructs a new version range based on the given required bundle version
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/CRCVisitor.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/CRCVisitor.java
index 66781e5f99..d85b88f7da 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/CRCVisitor.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/CRCVisitor.java
@@ -27,7 +27,7 @@
  */
 public class CRCVisitor extends ApiDescriptionVisitor {
 
-	private CRC32 fCrc = new CRC32();
+	private final CRC32 fCrc = new CRC32();
 
 	@Override
 	public boolean visitElement(IElementDescriptor element, IApiAnnotations description) {
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/CompositeApiDescription.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/CompositeApiDescription.java
index 8a004541e4..f434df56b0 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/CompositeApiDescription.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/CompositeApiDescription.java
@@ -31,7 +31,7 @@
  */
 public class CompositeApiDescription implements IApiDescription {
 
-	private IApiDescription[] fDescriptions;
+	private final IApiDescription[] fDescriptions;
 
 	/**
 	 * Constructs a composite API description out of the given descriptions.
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ProjectApiDescription.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ProjectApiDescription.java
index 773ea3d304..feacdf7fbb 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ProjectApiDescription.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ProjectApiDescription.java
@@ -67,7 +67,7 @@ public class ProjectApiDescription extends ApiDescription {
 	/**
 	 * Associated Java project
 	 */
-	private IJavaProject fProject;
+	private final IJavaProject fProject;
 
 	/**
 	 * Time stamp at which package information was created
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/RequiredComponentDescription.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/RequiredComponentDescription.java
index 41e021c0a8..87a0a229a2 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/RequiredComponentDescription.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/RequiredComponentDescription.java
@@ -23,10 +23,10 @@
  */
 public class RequiredComponentDescription implements IRequiredComponentDescription {
 
-	private String fId;
-	private boolean fIsOptional;
-	private boolean fIsExprted;
-	private IVersionRange fRange;
+	private final String fId;
+	private final boolean fIsOptional;
+	private final boolean fIsExprted;
+	private final IVersionRange fRange;
 
 	/**
 	 * Constructs a new required component description based on the given
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/SessionManager.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/SessionManager.java
index b04740ae2d..30fa78f270 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/SessionManager.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/SessionManager.java
@@ -29,8 +29,8 @@
 public class SessionManager implements ISessionManager {
 
 	// use a list so that we can preserve the order
-	private List<ISession> sessions = new ArrayList<>();
-	private Set<ISessionListener> listeners = new HashSet<>();
+	private final List<ISession> sessions = new ArrayList<>();
+	private final Set<ISessionListener> listeners = new HashSet<>();
 	private ISession activeSession;
 
 	@Override
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/TypeAnnotations.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/TypeAnnotations.java
index f48819ea1b..e6d624558f 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/TypeAnnotations.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/TypeAnnotations.java
@@ -20,8 +20,8 @@
  */
 public class TypeAnnotations implements IApiAnnotations {
 
-	private IApiAnnotations fAnnotations;
-	private long fBuildStamp;
+	private final IApiAnnotations fAnnotations;
+	private final long fBuildStamp;
 
 	/**
 	 * @param visibility
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractIllegalMethodReference.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractIllegalMethodReference.java
index bc2b57d84c..0eb0c0ebfe 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractIllegalMethodReference.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractIllegalMethodReference.java
@@ -38,14 +38,14 @@ public abstract class AbstractIllegalMethodReference extends AbstractProblemDete
 	 * Map of {@link org.eclipse.pde.api.tools.internal.model.MethodKey} to
 	 * {@link org.eclipse.pde.api.tools.internal.provisional.descriptors.IMethodDescriptor}
 	 */
-	private Map<MethodKey, IMethodDescriptor> fIllegalMethods = new HashMap<>();
+	private final Map<MethodKey, IMethodDescriptor> fIllegalMethods = new HashMap<>();
 
 	/**
 	 * Map of
 	 * {@link org.eclipse.pde.api.tools.internal.provisional.descriptors.IMethodDescriptor}
 	 * to associated component IDs
 	 */
-	private Map<IMethodDescriptor, String> fMethodComponents = new HashMap<>();
+	private final Map<IMethodDescriptor, String> fMethodComponents = new HashMap<>();
 
 	/**
 	 * Adds the given type as not to be extended.
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractIllegalTypeReference.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractIllegalTypeReference.java
index 499c084858..2eec36a17e 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractIllegalTypeReference.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractIllegalTypeReference.java
@@ -49,7 +49,7 @@ public abstract class AbstractIllegalTypeReference extends AbstractProblemDetect
 	 * Map of fully qualified type names to associated component IDs that
 	 * represent illegal references
 	 */
-	private Map<String, String> fIllegalTypes = new HashMap<>();
+	private final Map<String, String> fIllegalTypes = new HashMap<>();
 
 	/**
 	 * Adds the given type as not to be extended.
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractLeakProblemDetector.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractLeakProblemDetector.java
index efd395f885..015e423b00 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractLeakProblemDetector.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractLeakProblemDetector.java
@@ -33,7 +33,7 @@
  */
 public abstract class AbstractLeakProblemDetector extends AbstractProblemDetector {
 
-	private Set<String> fNonApiPackageNames;
+	private final Set<String> fNonApiPackageNames;
 
 	public AbstractLeakProblemDetector(Set<String> nonApiPackageNames) {
 		fNonApiPackageNames = nonApiPackageNames;
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractProblemDetector.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractProblemDetector.java
index 34244994a3..138fd84809 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractProblemDetector.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractProblemDetector.java
@@ -139,7 +139,7 @@ public boolean visit(TypeDeclaration node) {
 	/**
 	 * List of potential {@link IReference} problems
 	 */
-	private List<IReference> fPotentialProblems = new LinkedList<>();
+	private final List<IReference> fPotentialProblems = new LinkedList<>();
 
 	/**
 	 * Retains the reference for further analysis.
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ApiAnalysisBuilder.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ApiAnalysisBuilder.java
index b6845ac9e0..591b15dbd7 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ApiAnalysisBuilder.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ApiAnalysisBuilder.java
@@ -173,7 +173,7 @@ public class ApiAnalysisBuilder extends IncrementalProjectBuilder {
 	 */
 	private BuildState buildstate = null;
 
-	private ConcurrentLinkedQueue<Runnable> markersQueue = new ConcurrentLinkedQueue<>();
+	private final ConcurrentLinkedQueue<Runnable> markersQueue = new ConcurrentLinkedQueue<>();
 
 	/**
 	 * Bug 549838:  In case auto-building on a API tools settings change  is not desired,
@@ -545,10 +545,10 @@ protected void work(final boolean fullBuild, IApiBaseline wbaseline, IProject[]
 
 	public class ApiAnalysisJob extends Job {
 
-		private boolean fullBuild;
-		private IApiBaseline wbaseline;
-		private IProject[] projects;
-		private IProject project;
+		private final boolean fullBuild;
+		private final IApiBaseline wbaseline;
+		private final IProject[] projects;
+		private final IProject project;
 
 		public ApiAnalysisJob(String name, IProject project, boolean fullBuild, IApiBaseline wbaseline,
 				IProject[] projects) {
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/BuildState.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/BuildState.java
index d6234f0505..593cd55d47 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/BuildState.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/BuildState.java
@@ -61,8 +61,8 @@ public class BuildState {
 	private static final String[] NO_REEXPORTED_COMPONENTS = new String[0];
 	private static final int VERSION = 33;
 
-	private Map<String, Set<IDelta>> compatibleChanges;
-	private Map<String, Set<IDelta>> breakingChanges;
+	private final Map<String, Set<IDelta>> compatibleChanges;
+	private final Map<String, Set<IDelta>> breakingChanges;
 	/**
 	 * Map of the last saved state of the manifest file
 	 *
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/IllegalFieldReferenceDetector.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/IllegalFieldReferenceDetector.java
index 0868fa9b6d..5de542b280 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/IllegalFieldReferenceDetector.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/IllegalFieldReferenceDetector.java
@@ -43,16 +43,16 @@ public class IllegalFieldReferenceDetector extends AbstractProblemDetector {
 	 * Map of {@link org.eclipse.pde.api.tools.internal.model.MethodKey} to
 	 * {@link org.eclipse.pde.api.tools.internal.provisional.descriptors.IFieldDescriptor}
 	 */
-	private Map<MethodKey, IFieldDescriptor> fIllegalFields = new HashMap<>();
+	private final Map<MethodKey, IFieldDescriptor> fIllegalFields = new HashMap<>();
 
-	private Map<String, String> fIllegalTypes = new HashMap<>();
+	private final Map<String, String> fIllegalTypes = new HashMap<>();
 
 	/**
 	 * Map of
 	 * {@link org.eclipse.pde.api.tools.internal.provisional.descriptors.IFieldDescriptor}
 	 * to associated component IDs
 	 */
-	private Map<IFieldDescriptor, String> fFieldComponents = new HashMap<>();
+	private final Map<IFieldDescriptor, String> fFieldComponents = new HashMap<>();
 
 	/**
 	 * Adds the given field as not to be referenced
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/IllegalImplementsProblemDetector.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/IllegalImplementsProblemDetector.java
index 1edde8cfb8..5d5863d00a 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/IllegalImplementsProblemDetector.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/IllegalImplementsProblemDetector.java
@@ -40,7 +40,7 @@ public class IllegalImplementsProblemDetector extends AbstractIllegalTypeReferen
 	 * Map of directly implemented interfaces to implement restricted
 	 * super-interfaces
 	 */
-	private HashMap<String, IApiType> fRestrictedInterfaces = new HashMap<>();
+	private final HashMap<String, IApiType> fRestrictedInterfaces = new HashMap<>();
 
 	@Override
 	public int getReferenceKinds() {
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/IllegalMethodReferenceDetector.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/IllegalMethodReferenceDetector.java
index d120b0944f..06aaf69b40 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/IllegalMethodReferenceDetector.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/IllegalMethodReferenceDetector.java
@@ -37,7 +37,7 @@
  */
 public class IllegalMethodReferenceDetector extends AbstractIllegalMethodReference {
 
-	private Map<String, String> fIllegalTypes = new HashMap<>();
+	private final Map<String, String> fIllegalTypes = new HashMap<>();
 
 	/**
 	 * Adds an {@link IReferenceTypeDescriptor} that is reference-restricted
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ProblemDetectorBuilder.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ProblemDetectorBuilder.java
index 0bb636b416..9054a2ee00 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ProblemDetectorBuilder.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ProblemDetectorBuilder.java
@@ -78,7 +78,7 @@ public class ProblemDetectorBuilder extends ApiDescriptionVisitor {
 	/**
 	 * Cache of non-API package names visited
 	 */
-	private Set<String> fNonApiPackageNames = new HashSet<>();
+	private final Set<String> fNonApiPackageNames = new HashSet<>();
 
 	/**
 	 * The owning {@link IApiComponent} of this builder
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java
index 3cd2fde2ab..4e966ca924 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java
@@ -886,7 +886,7 @@ public int hashCode() {
 	 * Whether to extract references to elements within the classfile being
 	 * scanned.
 	 */
-	private boolean fIncludeLocalRefs = false;
+	private final boolean fIncludeLocalRefs = false;
 
 	/**
 	 * Bit mask of {@link ReferenceModifiers} to extract.
@@ -921,7 +921,7 @@ public int hashCode() {
 	 * Current field being visited, or <code>null</code> (when not within a
 	 * field).
 	 */
-	private ClassFileSignatureVisitor signaturevisitor = new ClassFileSignatureVisitor();
+	private final ClassFileSignatureVisitor signaturevisitor = new ClassFileSignatureVisitor();
 	static int TYPE = 0, FIELD = 1, METHOD = 2;
 
 	/**
@@ -930,7 +930,7 @@ public int hashCode() {
 	 *
 	 * @since 1.0.600
 	 */
-	private ClassFileFieldVisitor fieldvisitor = new ClassFileFieldVisitor();
+	private final ClassFileFieldVisitor fieldvisitor = new ClassFileFieldVisitor();
 
 	/**
 	 * Constructor
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/SinceTagChecker.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/SinceTagChecker.java
index 1b1bb70694..e780de5f98 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/SinceTagChecker.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/SinceTagChecker.java
@@ -47,7 +47,7 @@ public class SinceTagChecker extends ASTVisitor {
 	private static final int HAS_JAVA_DOC = 0x04;
 	private static final int HAS_NO_COMMENT = 0x10;
 
-	private int nameStart;
+	private final int nameStart;
 	int bits;
 	private String sinceVersion;
 
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/TagValidator.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/TagValidator.java
index 6bcac0b04e..bcdf5eff12 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/TagValidator.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/TagValidator.java
@@ -67,7 +67,7 @@ public class TagValidator extends Validator {
 	/**
 	 * A collection of annotation names so we can detect multiple usage
 	 */
-	private Set<String> fProcessedAnnotations = new HashSet<>();
+	private final Set<String> fProcessedAnnotations = new HashSet<>();
 
 	/**
 	 * Constructor
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/TypeScope.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/TypeScope.java
index a957f7222a..b384dc8248 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/TypeScope.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/TypeScope.java
@@ -40,12 +40,12 @@ public class TypeScope extends ApiElement implements IApiTypeContainer {
 	/**
 	 * Associated component
 	 */
-	private IApiComponent fComponent;
+	private final IApiComponent fComponent;
 
 	/**
 	 * Map of package names to associated type descriptors
 	 */
-	private Map<String, Set<IReferenceTypeDescriptor>> fPackageToTypes;
+	private final Map<String, Set<IReferenceTypeDescriptor>> fPackageToTypes;
 
 	/**
 	 * Constructs a new class file container/search scope on the given types.
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/Validator.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/Validator.java
index 01c71c0049..81498ff2f6 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/Validator.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/Validator.java
@@ -52,7 +52,7 @@ static class Item {
 	/**
 	 * Type stack that tracks types as the visitor descends
 	 */
-	private Stack<Item> fStack = new Stack<>();
+	private final Stack<Item> fStack = new Stack<>();
 	/**
 	 * The compilation unit we are scanning
 	 */
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/ClassFileComparator.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/ClassFileComparator.java
index 9392760094..3acf6606db 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/ClassFileComparator.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/ClassFileComparator.java
@@ -108,7 +108,7 @@ private boolean isCheckedException(IApiBaseline baseline, IApiComponent apiCompo
 
 	private IApiType type2 = null;
 
-	private int visibilityModifiers;
+	private final int visibilityModifiers;
 	private int currentDescriptorRestrictions;
 	private int initialDescriptorRestrictions;
 	private MultiStatus status = null;
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/DeltaXmlVisitor.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/DeltaXmlVisitor.java
index 75f5b3afba..8e07173c45 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/DeltaXmlVisitor.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/DeltaXmlVisitor.java
@@ -32,12 +32,12 @@ public class DeltaXmlVisitor extends DeltaVisitor {
 	/**
 	 * XML doc being generated
 	 */
-	private Document fDoc;
+	private final Document fDoc;
 
 	/**
 	 * Top deltas element
 	 */
-	private Element fDeltas;
+	private final Element fDeltas;
 
 	/**
 	 * Constructs a new visitor for the given component.
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/MemberDescriptorImpl.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/MemberDescriptorImpl.java
index f38203e758..cb094eaf55 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/MemberDescriptorImpl.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/MemberDescriptorImpl.java
@@ -28,7 +28,7 @@ public abstract class MemberDescriptorImpl extends NamedElementDescriptorImpl im
 	/**
 	 * parent element or <code>null</code>
 	 */
-	private IElementDescriptor fParent;
+	private final IElementDescriptor fParent;
 
 	/**
 	 * Constructs a member with the given name and parent
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/MethodDescriptorImpl.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/MethodDescriptorImpl.java
index 7ce2b4743c..a9ffad3eb3 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/MethodDescriptorImpl.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/MethodDescriptorImpl.java
@@ -28,7 +28,7 @@ public class MethodDescriptorImpl extends MemberDescriptorImpl implements IMetho
 	/**
 	 * Method signature
 	 */
-	private String fSignature;
+	private final String fSignature;
 
 	/**
 	 * Constructs a method descriptor.
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/NamedElementDescriptorImpl.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/NamedElementDescriptorImpl.java
index e43b730645..58bfadf746 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/NamedElementDescriptorImpl.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/NamedElementDescriptorImpl.java
@@ -26,7 +26,7 @@ public abstract class NamedElementDescriptorImpl extends ElementDescriptorImpl {
 	/**
 	 * element name
 	 */
-	private String fName;
+	private final String fName;
 
 	/**
 	 * Constructs an element descriptor with the given name and parent.
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiBaseline.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiBaseline.java
index 3e08708251..373b11d44a 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiBaseline.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiBaseline.java
@@ -120,7 +120,7 @@ public class ApiBaseline extends ApiElement implements IApiBaseline, IVMInstallC
 	/**
 	 * Constant to match any value for ws, os, arch.
 	 */
-	private AnyValue ANY_VALUE = new AnyValue("*"); //$NON-NLS-1$
+	private final AnyValue ANY_VALUE = new AnyValue("*"); //$NON-NLS-1$
 
 	/**
 	 * Cache of resolved packages.
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiField.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiField.java
index 2691b79737..cbd08cfd7c 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiField.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiField.java
@@ -35,7 +35,7 @@ public class ApiField extends ApiMember implements IApiField {
 	/**
 	 * Constant value
 	 */
-	private Object fValue;
+	private final Object fValue;
 
 	private IFieldDescriptor fHandle;
 
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiMember.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiMember.java
index 7452818232..e413115c45 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiMember.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiMember.java
@@ -29,8 +29,8 @@
 public abstract class ApiMember extends ApiElement implements IApiMember {
 
 	private int fFlags = -1;
-	private String fSignature;
-	private String fGenericSignature;
+	private final String fSignature;
+	private final String fGenericSignature;
 
 	/**
 	 * Constructs a member enclosed by the given type with the specified name,
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiMethod.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiMethod.java
index 990cdce347..d398df3c05 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiMethod.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiMethod.java
@@ -41,7 +41,7 @@ public class ApiMethod extends ApiMember implements IApiMethod {
 	private static final String INIT = "<init>"; //$NON-NLS-1$
 	private static final String CLINIT = "<clinit>"; //$NON-NLS-1$
 
-	private String[] fExceptions;
+	private final String[] fExceptions;
 	private String fDefaultValue;
 
 	private IMethodDescriptor fHandle;
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiType.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiType.java
index bfea24f05a..5267349af6 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiType.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiType.java
@@ -52,7 +52,7 @@ public class ApiType extends ApiMember implements IApiType {
 
 	private String fSuperclassName;
 	private String[] fSuperInterfaceNames;
-	private String fEnclosingTypeName;
+	private final String fEnclosingTypeName;
 	private String fSimpleName;
 
 	private static final IApiMethod[] EMPTY_METHODS = new IApiMethod[0];
@@ -98,7 +98,7 @@ public class ApiType extends ApiMember implements IApiType {
 	/**
 	 * The storage this type structure originated from
 	 */
-	private IApiTypeRoot fStorage;
+	private final IApiTypeRoot fStorage;
 
 	/**
 	 * The signature of the enclosing method if this is a local type
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ArchiveApiTypeContainer.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ArchiveApiTypeContainer.java
index 6bb37240ae..91b66a95b9 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ArchiveApiTypeContainer.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ArchiveApiTypeContainer.java
@@ -55,7 +55,7 @@ public class ArchiveApiTypeContainer extends ApiElement implements IApiTypeConta
 	 */
 	static class ArchiveApiTypeRoot extends AbstractApiTypeRoot implements Comparable<Object> {
 
-		private String fTypeName;
+		private final String fTypeName;
 		private byte[] fContents = null;
 
 		/**
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/BundleComponent.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/BundleComponent.java
index 7f1bbe469c..a94f5ea628 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/BundleComponent.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/BundleComponent.java
@@ -114,7 +114,7 @@ public class BundleComponent extends Component {
 	/**
 	 * Root location of component in the file system
 	 */
-	private String fLocation;
+	private final String fLocation;
 
 	/**
 	 * Underlying bundle description (OSGi model of a bundle)
@@ -140,12 +140,12 @@ public class BundleComponent extends Component {
 	 * Flag to know if this component is a binary bundle in the workspace i.e.
 	 * an imported binary bundle
 	 */
-	private boolean fWorkspaceBinary;
+	private final boolean fWorkspaceBinary;
 
 	/**
 	 * The id of this component
 	 */
-	private long fBundleId;
+	private final long fBundleId;
 
 	/**
 	 * Constructs a new API component from the specified location in the file
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/CompositeApiTypeContainer.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/CompositeApiTypeContainer.java
index cdcbfd7220..110503add9 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/CompositeApiTypeContainer.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/CompositeApiTypeContainer.java
@@ -27,7 +27,7 @@
  */
 public class CompositeApiTypeContainer extends AbstractApiTypeContainer {
 
-	private List<IApiTypeContainer> fContainers;
+	private final List<IApiTypeContainer> fContainers;
 
 	/**
 	 * Constructs a composite container on the given list of containers.
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/MethodKey.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/MethodKey.java
index 5994c89ba9..7d28360149 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/MethodKey.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/MethodKey.java
@@ -19,9 +19,9 @@
  * @since 1.1
  */
 public class MethodKey {
-	private String fSelector;
-	private String fSig;
-	private String fTypename;
+	private final String fSelector;
+	private final String fSig;
+	private final String fTypename;
 	private boolean fConsiderTypename = false;
 
 	/**
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ProjectComponent.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ProjectComponent.java
index ebde5291c1..0d6d4c7d19 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ProjectComponent.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ProjectComponent.java
@@ -75,7 +75,7 @@ public class ProjectComponent extends BundleComponent {
 	/**
 	 * Associated Java project
 	 */
-	private IJavaProject fProject;
+	private final IJavaProject fProject;
 
 	/**
 	 * Associated IPluginModelBase object
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ProjectTypeContainer.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ProjectTypeContainer.java
index a703013e9d..aad86a7f12 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ProjectTypeContainer.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ProjectTypeContainer.java
@@ -42,7 +42,7 @@ public class ProjectTypeContainer extends ApiElement implements IApiTypeContaine
 	/**
 	 * Root directory of the {@link IApiTypeContainer}
 	 */
-	private IContainer fRoot;
+	private final IContainer fRoot;
 	private String[] fPackageNames = null;
 
 	/**
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ResourceApiTypeRoot.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ResourceApiTypeRoot.java
index fcc8e9e0d2..df3f5419c0 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ResourceApiTypeRoot.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ResourceApiTypeRoot.java
@@ -33,7 +33,7 @@ public class ResourceApiTypeRoot extends AbstractApiTypeRoot {
 	/**
 	 * Corresponding file
 	 */
-	private IFile fFile;
+	private final IFile fFile;
 
 	// when class file is changed, the object is changed too
 	// can store the contents in the class field for optimisation.
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/provisional/ApiPlugin.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/provisional/ApiPlugin.java
index 8c3f5380d0..c11194dab2 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/provisional/ApiPlugin.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/provisional/ApiPlugin.java
@@ -350,7 +350,7 @@ public class ApiPlugin extends Plugin implements ISaveParticipant, DebugOptionsL
 	 * A set of listeners that want to participate in the saving life-cycle of
 	 * the workbench via this plug-in
 	 */
-	private ListenerList<ISaveParticipant> savelisteners = new ListenerList<>();
+	private final ListenerList<ISaveParticipant> savelisteners = new ListenerList<>();
 
 	/**
 	 * This is used to log resolution errors only once per session
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ConsumerReportConvertor.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ConsumerReportConvertor.java
index 0c3177cec8..1275792326 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ConsumerReportConvertor.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ConsumerReportConvertor.java
@@ -91,7 +91,7 @@ public void visitReference(IReferenceDescriptor reference) {
 	class ConsumerReportVisitor extends UseScanVisitor {
 		Consumer consumer;
 		Map<String, Producer> producers = new HashMap<>();
-		private IComponentDescriptor consumerDescriptor;
+		private final IComponentDescriptor consumerDescriptor;
 		private Producer currentProducer;
 		private Type2 currenttype = null;
 		private Member currentmember = null;
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefParser.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefParser.java
index 3eb781720f..962986de30 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefParser.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefParser.java
@@ -47,8 +47,8 @@ static class MissingRefProblemHandler extends DefaultHandler {
 		private int charstart;
 		private int charend;
 		private int id;
-		private List<String> messageargs = new ArrayList<>();
-		private Map<String, String> extraargs = new HashMap<>();
+		private final List<String> messageargs = new ArrayList<>();
+		private final Map<String, String> extraargs = new HashMap<>();
 
 		@Override
 		public void startDocument() throws SAXException {
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefReportConverter.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefReportConverter.java
index da746312ed..afee4d2fc0 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefReportConverter.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefReportConverter.java
@@ -226,7 +226,7 @@ public void addToCurrentReport(List<IApiProblem> apiProblems) {
 	private String xmlLocation = null;
 	private String htmlLocation = null;
 	private File reportsRoot = null;
-	private File htmlIndex = null;
+	private final File htmlIndex = null;
 	Report currentreport = null;
 
 	static final Comparator<Object> missingcompare = (o1, o2) -> {
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ReferenceDescriptor.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ReferenceDescriptor.java
index d4c990ad70..d125bf21ff 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ReferenceDescriptor.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ReferenceDescriptor.java
@@ -23,15 +23,15 @@
  */
 public class ReferenceDescriptor implements IReferenceDescriptor {
 
-	private IMemberDescriptor origin;
-	private IMemberDescriptor target;
-	private IComponentDescriptor from;
-	private IComponentDescriptor to;
-
-	private int line;
-	private int kind;
-	private int flags;
-	private int visibility;
+	private final IMemberDescriptor origin;
+	private final IMemberDescriptor target;
+	private final IComponentDescriptor from;
+	private final IComponentDescriptor to;
+
+	private final int line;
+	private final int kind;
+	private final int flags;
+	private final int visibility;
 	private String[] messages = null;
 
 	public ReferenceDescriptor(IComponentDescriptor from, IMemberDescriptor origin, int line, IComponentDescriptor to, IMemberDescriptor target, int kind, int flags, int vis, String[] messages) {
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ReferenceLookupVisitor.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ReferenceLookupVisitor.java
index 8fbe327151..2a005e4299 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ReferenceLookupVisitor.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ReferenceLookupVisitor.java
@@ -49,7 +49,7 @@
  */
 public class ReferenceLookupVisitor extends UseScanVisitor {
 
-	private IApiBaseline baseline;
+	private final IApiBaseline baseline;
 	private IComponentDescriptor targetComponent;
 	private IComponentDescriptor referencingComponent;
 	private IApiComponent currComponent;
@@ -57,9 +57,9 @@ public class ReferenceLookupVisitor extends UseScanVisitor {
 	private IMemberDescriptor targetMember;
 	private IReferenceTypeDescriptor targetType;
 	private IApiType currType;
-	private List<IComponentDescriptor> missingComponents = new ArrayList<>();
-	private List<IComponentDescriptor> skippedComponents = new ArrayList<>();
-	private String location;
+	private final List<IComponentDescriptor> missingComponents = new ArrayList<>();
+	private final List<IComponentDescriptor> skippedComponents = new ArrayList<>();
+	private final String location;
 	private List<IReferenceDescriptor> unresolved = null;
 	private String analysisScope = null;
 	private String targetScope = null;
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/SkippedComponent.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/SkippedComponent.java
index 4d192667e9..6bc8fee048 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/SkippedComponent.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/SkippedComponent.java
@@ -25,11 +25,11 @@ public class SkippedComponent implements IApiElement {
 	/**
 	 * the id of of the skipped component
 	 */
-	private String componentid;
+	private final String componentid;
 	/**
 	 * The version of the component
 	 */
-	private String version;
+	private final String version;
 	/**
 	 * the set of resolution errors barring the component from being scanned
 	 */
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/UseScanReferenceVisitor.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/UseScanReferenceVisitor.java
index 0d3270b277..890d871978 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/UseScanReferenceVisitor.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/UseScanReferenceVisitor.java
@@ -27,12 +27,12 @@
  *
  */
 public class UseScanReferenceVisitor extends UseScanVisitor {
-	private IApiComponent fLookupAPIComponent;
+	private final IApiComponent fLookupAPIComponent;
 	private List<String> fLookupMemberTypes;
 	private String fCurrentReferencedMemberRootType;
 	private IComponentDescriptor fCurrentComponent;
 	private IComponentDescriptor fReferencingComponent;
-	private IReferenceCollection fReferences;
+	private final IReferenceCollection fReferences;
 	private IMemberDescriptor fCurrentReferencedMember;
 
 	public UseScanReferenceVisitor(IApiComponent component, String[] lookupTypes, IReferenceCollection references) {
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/TarEntry.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/TarEntry.java
index c219486780..e00ccc539c 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/TarEntry.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/TarEntry.java
@@ -17,7 +17,7 @@
  * Representation of a file in a tar archive.
  */
 public class TarEntry implements Cloneable {
-	private String name;
+	private final String name;
 	private long mode, time, size;
 	private int type;
 	int filepos;
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/TarFile.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/TarFile.java
index 73e92e1292..835b8bf96e 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/TarFile.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/TarFile.java
@@ -343,7 +343,7 @@ public int read() throws IOException {
 		}
 	}
 
-	private File file;
+	private final File file;
 	TarInputStream entryEnumerationStream;
 	TarEntry curEntry;
 	private TarInputStream entryStream;
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java
index b8ad37a1f8..76c84e02d3 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java
@@ -165,7 +165,7 @@ public final class Util {
 	 */
 	private static final class BuildJob extends Job {
 		private final IProject[] fProjects;
-		private int fBuildType;
+		private final int fBuildType;
 
 		/**
 		 * Constructor
diff --git a/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIDeprecationReportConversionTask.java b/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIDeprecationReportConversionTask.java
index fb813361f3..6032112491 100644
--- a/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIDeprecationReportConversionTask.java
+++ b/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIDeprecationReportConversionTask.java
@@ -45,11 +45,11 @@ static final class ConverterDefaultHandler extends DefaultHandler {
 		private String[] arguments;
 		private List<String> argumentsList;
 		private String componentID;
-		private boolean debug;
+		private final boolean debug;
 		private int flags;
 		private String key;
 		private String kind;
-		private Map<String, List<Entry>> map;
+		private final Map<String, List<Entry>> map;
 		private String typename;
 		private int elementType;
 
diff --git a/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIFreezeReportConversionTask.java b/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIFreezeReportConversionTask.java
index 53c956c817..4cdc3dcc8a 100644
--- a/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIFreezeReportConversionTask.java
+++ b/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIFreezeReportConversionTask.java
@@ -46,17 +46,17 @@ static final class ConverterDefaultHandler extends DefaultHandler {
 		private String[] arguments;
 		private List<String> argumentsList;
 		private String componentID;
-		private boolean debug;
+		private final boolean debug;
 		private int flags;
 		private String key;
 		private String kind;
-		private Map<String, List<Entry>> map;
+		private final Map<String, List<Entry>> map;
 		private String typename;
 		private int elementType;
 		/**
 		 * String component id to ArrayList of String resolver error messages
 		 */
-		private Map<String, List<String>> resolverErrors;
+		private final Map<String, List<String>> resolverErrors;
 		private boolean isResolverSection;
 
 		public ConverterDefaultHandler(boolean debug) {
diff --git a/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIFreezeTask.java b/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIFreezeTask.java
index 7a9e1c1a7c..510c8c988e 100644
--- a/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIFreezeTask.java
+++ b/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIFreezeTask.java
@@ -64,7 +64,7 @@ public class APIFreezeTask extends CommonUtilsTask {
 	 * store the resolver errors of components. Maps String component IDs to an
 	 * array of ResolverErrors.
 	 */
-	private Map<String, ResolverError[]> resolverErrors = new HashMap<>();
+	private final Map<String, ResolverError[]> resolverErrors = new HashMap<>();
 
 	@Override
 	public void execute() throws BuildException {
diff --git a/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/ApiFileGenerationTask.java b/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/ApiFileGenerationTask.java
index 265010670d..41132756cb 100644
--- a/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/ApiFileGenerationTask.java
+++ b/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/ApiFileGenerationTask.java
@@ -21,7 +21,7 @@
  */
 public class ApiFileGenerationTask extends Task/* APIFileGenerator */ {
 
-	private APIFileGenerator apiFileGenerator;
+	private final APIFileGenerator apiFileGenerator;
 
 	public ApiFileGenerationTask() {
 		this.apiFileGenerator = new APIFileGenerator();
diff --git a/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/ApiMigrationTask.java b/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/ApiMigrationTask.java
index b709ddf3d9..bdb3892897 100644
--- a/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/ApiMigrationTask.java
+++ b/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/ApiMigrationTask.java
@@ -42,7 +42,7 @@ public final class ApiMigrationTask extends CommonUtilsTask {
 	/**
 	 * Set of project names that were not searched
 	 */
-	private TreeSet<SkippedComponent> notsearched = null;
+	private final TreeSet<SkippedComponent> notsearched = null;
 	/**
 	 * The regex pattern to use to compose the scope
 	 */
diff --git a/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/FilterListDeltaVisitor.java b/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/FilterListDeltaVisitor.java
index 85e237c633..a201a0db22 100644
--- a/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/FilterListDeltaVisitor.java
+++ b/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/FilterListDeltaVisitor.java
@@ -36,11 +36,11 @@ public class FilterListDeltaVisitor extends DeltaXmlVisitor {
 	public static final int CHECK_OTHER = 0x02;
 	public static final int CHECK_ALL = CHECK_DEPRECATION | CHECK_OTHER;
 
-	private FilteredElements excludedElements;
-	private FilteredElements includedElements;
-	private List<String> nonExcludedElements;
+	private final FilteredElements excludedElements;
+	private final FilteredElements includedElements;
+	private final List<String> nonExcludedElements;
 
-	private int flags;
+	private final int flags;
 
 	public FilterListDeltaVisitor(FilteredElements excludedElements, FilteredElements includedElements, int flags) throws CoreException {
 		super();
diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSBuilder.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSBuilder.java
index a1ba2f0f78..458eed6be5 100644
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSBuilder.java
+++ b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSBuilder.java
@@ -44,7 +44,7 @@ public class DSBuilder extends IncrementalProjectBuilder {
 	private static IProject[] EMPTY_LIST = new IProject[0];
 
 	class ResourceVisitor implements IResourceVisitor {
-		private IProgressMonitor monitor;
+		private final IProgressMonitor monitor;
 
 		public ResourceVisitor(IProgressMonitor monitor) {
 			this.monitor = monitor;
@@ -75,7 +75,7 @@ public boolean visit(IResource resource) {
 	}
 
 	class DeltaVisitor implements IResourceDeltaVisitor {
-		private IProgressMonitor monitor;
+		private final IProgressMonitor monitor;
 
 		public DeltaVisitor(IProgressMonitor monitor) {
 			this.monitor = monitor;
diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentFactory.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentFactory.java
index e0f8d2e56e..57250ac94c 100644
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentFactory.java
+++ b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentFactory.java
@@ -36,7 +36,7 @@
  */
 public class DSDocumentFactory extends DocumentNodeFactory implements
 		IDSDocumentFactory {
-	private DSModel fModel;
+	private final DSModel fModel;
 
 	public DSDocumentFactory(DSModel model) {
 		fModel = model;
diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentHandler.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentHandler.java
index 2cded9df4c..231c83b7d1 100644
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentHandler.java
+++ b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentHandler.java
@@ -27,7 +27,7 @@
  */
 public class DSDocumentHandler extends NodeDocumentHandler {
 
-	private DSModel fModel;
+	private final DSModel fModel;
 
 	public DSDocumentHandler(DSModel model, boolean reconciling) {
 		super(reconciling, (IDocumentNodeFactory) model.getFactory());
diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSTextHover.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSTextHover.java
index 078ed927af..ce048081e4 100644
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSTextHover.java
+++ b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSTextHover.java
@@ -27,7 +27,7 @@
 
 public class DSTextHover extends PDETextHover {
 
-	private PDESourcePage fSourcePage;
+	private final PDESourcePage fSourcePage;
 
 	public DSTextHover(PDESourcePage sourcePage) {
 		fSourcePage = sourcePage;
diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/FormEntryAdapter.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/FormEntryAdapter.java
index 1e404c2d09..1308e07981 100644
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/FormEntryAdapter.java
+++ b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/FormEntryAdapter.java
@@ -25,7 +25,7 @@
 import org.eclipse.ui.forms.events.HyperlinkEvent;
 
 public class FormEntryAdapter implements IFormEntryListener {
-	private IContextPart contextPart;
+	private final IContextPart contextPart;
 	protected IActionBars actionBars;
 
 	public FormEntryAdapter(IContextPart contextPart) {
diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSCompletionProposal.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSCompletionProposal.java
index a80d7b2d11..91752bcb37 100644
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSCompletionProposal.java
+++ b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSCompletionProposal.java
@@ -27,9 +27,9 @@
 
 public class DSCompletionProposal implements ICompletionProposal {
 
-	private IDSObject fObject;
-	private int fStartOffset;
-	private int fLength;
+	private final IDSObject fObject;
+	private final int fStartOffset;
+	private final int fLength;
 
 	public DSCompletionProposal(IDSObject object, int startOffset) {
 		this(object, startOffset, 0);
diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSContentAssistProcessor.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSContentAssistProcessor.java
index 8b06347235..843360695d 100644
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSContentAssistProcessor.java
+++ b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSContentAssistProcessor.java
@@ -46,7 +46,7 @@ public class DSContentAssistProcessor extends TypePackageCompletionProcessor
 		implements IContentAssistProcessor, ICompletionListener {
 	protected boolean fAssistSessionStarted;
 
-	private PDESourcePage fSourcePage;
+	private final PDESourcePage fSourcePage;
 
 	private IDocumentRange fRange;
 
diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSContentAssistText.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSContentAssistText.java
index 6391f8092b..76eda55607 100644
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSContentAssistText.java
+++ b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSContentAssistText.java
@@ -25,9 +25,9 @@
  */
 public class DSContentAssistText {
 
-	private String fText;
+	private final String fText;
 
-	private int fStartOffset;
+	private final int fStartOffset;
 
 	private DSContentAssistText(String text, int startOffset) {
 		fText = text;
diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/TypePackageCompletionProcessor.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/TypePackageCompletionProcessor.java
index 9da46e1fcd..97ca998df9 100644
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/TypePackageCompletionProcessor.java
+++ b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/TypePackageCompletionProcessor.java
@@ -50,7 +50,7 @@
 public abstract class TypePackageCompletionProcessor implements IContentAssistProcessor {
 
 	private String fErrorMessage;
-	private SearchEngine fSearchEngine;
+	private final SearchEngine fSearchEngine;
 	private Comparator<ICompletionProposal> fComparator;
 
 	abstract static class ProposalGenerator {
diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditPropertiesDialog.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditPropertiesDialog.java
index 2186eebab8..146b2c7d7f 100644
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditPropertiesDialog.java
+++ b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditPropertiesDialog.java
@@ -53,8 +53,8 @@
 
 public class DSEditPropertiesDialog extends FormDialog {
 
-	private IDSProperties fProperties;
-	private DSPropertiesSection fPropertiesSection;
+	private final IDSProperties fProperties;
+	private final DSPropertiesSection fPropertiesSection;
 	private FormEntry fEntry;
 
 	public DSEditPropertiesDialog(Shell parentShell,
diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditPropertyDialog.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditPropertyDialog.java
index 0862f4b6c8..a5d25ddba0 100644
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditPropertyDialog.java
+++ b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditPropertyDialog.java
@@ -59,12 +59,12 @@
 
 public class DSEditPropertyDialog extends FormDialog {
 
-	private IDSProperty fProperty;
-	private DSPropertiesSection fPropertiesSection;
+	private final IDSProperty fProperty;
+	private final DSPropertiesSection fPropertiesSection;
 	private FormEntry fNameEntry;
 	private ComboPart fTypeCombo;
 	private FormEntry fValuesEntry;
-	private boolean fAddDialog; // boolean used to erase added element whether
+	private final boolean fAddDialog; // boolean used to erase added element whether
 
 	private static final String EMPTY = ""; //$NON-NLS-1$
 
diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditProvideDialog.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditProvideDialog.java
index 3f850d39b4..72ce0d1350 100644
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditProvideDialog.java
+++ b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditProvideDialog.java
@@ -50,9 +50,9 @@
 
 public class DSEditProvideDialog extends FormDialog {
 
-	private IDSProvide fProvide;
+	private final IDSProvide fProvide;
 	private FormEntry fInterfaceEntry;
-	private DSProvideSection fProvideSection;
+	private final DSProvideSection fProvideSection;
 
 	public DSEditProvideDialog(Shell parentShell, IDSProvide provide,
 			DSProvideSection provideSection) {
diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditReferenceDialog.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditReferenceDialog.java
index 40bc194224..cffa75d899 100644
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditReferenceDialog.java
+++ b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditReferenceDialog.java
@@ -54,7 +54,7 @@
 
 public class DSEditReferenceDialog extends FormDialog {
 
-	private IDSReference fReference;
+	private final IDSReference fReference;
 	private FormEntry fNameEntry;
 	private FormEntry fInterfaceEntry;
 	private FormEntry fBindEntry;
@@ -64,7 +64,7 @@ public class DSEditReferenceDialog extends FormDialog {
 	private Label fLabelCardinality;
 	private ComboPart fPolicy;
 	private Label fLabelPolicy;
-	private DSReferenceSection fReferenceSection;
+	private final DSReferenceSection fReferenceSection;
 
 	public DSEditReferenceDialog(Shell parentShell, IDSReference reference,
 			DSReferenceSection referenceSection) {
diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSReferenceSection.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSReferenceSection.java
index 8318862816..f8afe1b34e 100644
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSReferenceSection.java
+++ b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSReferenceSection.java
@@ -75,7 +75,7 @@ public class DSReferenceSection extends TableSection implements
 
 	class ReferenceLabelProvider extends StyledCellLabelProvider {
 
-		private DSLabelProvider labelProvider = new DSLabelProvider();
+		private final DSLabelProvider labelProvider = new DSLabelProvider();
 
 		@Override
 		public void update(ViewerCell cell) {
diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSCreationOperation.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSCreationOperation.java
index 0654efe28c..791cd8dbc7 100644
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSCreationOperation.java
+++ b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSCreationOperation.java
@@ -62,8 +62,8 @@
 public class DSCreationOperation extends WorkspaceModifyOperation {
 
 	protected IFile fFile;
-	private String fComponentName;
-	private String fImplementationClass;
+	private final String fComponentName;
+	private final String fImplementationClass;
 
 	private static final String DS_MANIFEST_KEY = "Service-Component"; //$NON-NLS-1$
 
diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSFileWizardPage.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSFileWizardPage.java
index e34d851785..4f6dc88e17 100644
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSFileWizardPage.java
+++ b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSFileWizardPage.java
@@ -80,7 +80,7 @@ public class DSFileWizardPage extends WizardNewFileCreationPage {
 	private Link fDSImplementationClassHyperlink;
 	private Button fDSImplementationClassButton;
 
-	private IStructuredSelection fSelection;
+	private final IStructuredSelection fSelection;
 
 	public DSFileWizardPage(IStructuredSelection selection) {
 		super(F_PAGE_NAME, selection);
diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSModelFactory.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSModelFactory.java
index a168b1a67f..72b8b99717 100644
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSModelFactory.java
+++ b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSModelFactory.java
@@ -26,7 +26,7 @@
 
 public class CompCSModelFactory implements ICompCSModelFactory {
 
-	private ICompCSModel fModel;
+	private final ICompCSModel fModel;
 
 	/**
 	 * @param model
diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSWorkspaceModel.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSWorkspaceModel.java
index 17d7c155f2..e6b408515b 100644
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSWorkspaceModel.java
+++ b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSWorkspaceModel.java
@@ -32,11 +32,11 @@
 public class CompCSWorkspaceModel extends CompCSModel implements
 		IWorkspaceModel {
 
-	private IFile fFile;
+	private final IFile fFile;
 
 	private boolean fDirty;
 
-	private boolean fEditable;
+	private final boolean fEditable;
 
 	private static final long serialVersionUID = 1L;
 
diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentFactory.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentFactory.java
index acae5887ec..cf01250aa6 100644
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentFactory.java
+++ b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentFactory.java
@@ -35,7 +35,7 @@
 public class SimpleCSDocumentFactory extends DocumentNodeFactory implements
 		ISimpleCSModelFactory {
 
-	private SimpleCSModel fModel;
+	private final SimpleCSModel fModel;
 
 	/**
 	 * @param model
diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentHandler.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentHandler.java
index 6afc235f4c..86cfa285bd 100644
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentHandler.java
+++ b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentHandler.java
@@ -20,7 +20,7 @@
 
 public class SimpleCSDocumentHandler extends NodeDocumentHandler {
 
-	private SimpleCSModel fModel;
+	private final SimpleCSModel fModel;
 
 	/**
 	 * @param reconciling
diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSModel.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSModel.java
index a8125450cd..0892939a9c 100644
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSModel.java
+++ b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSModel.java
@@ -28,7 +28,7 @@ public class SimpleCSModel extends XMLEditingModel implements ISimpleCSModel {
 
 	private SimpleCSDocumentHandler fHandler;
 
-	private SimpleCSDocumentFactory fFactory;
+	private final SimpleCSDocumentFactory fFactory;
 
 	private ISimpleCS fSimpleCS;
 
diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDocumentFactory.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDocumentFactory.java
index 5e098c1ded..7da05caa61 100644
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDocumentFactory.java
+++ b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDocumentFactory.java
@@ -27,7 +27,7 @@
  * @see CtxHelpDocumentHandler
  */
 public class CtxHelpDocumentFactory extends DocumentNodeFactory {
-	private CtxHelpModel fModel;
+	private final CtxHelpModel fModel;
 
 	public CtxHelpDocumentFactory(CtxHelpModel model) {
 		fModel = model;
diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDocumentHandler.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDocumentHandler.java
index d7227b48f2..09740df02f 100644
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDocumentHandler.java
+++ b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDocumentHandler.java
@@ -29,7 +29,7 @@
  */
 public class CtxHelpDocumentHandler extends NodeDocumentHandler {
 
-	private CtxHelpModel fModel;
+	private final CtxHelpModel fModel;
 
 	public CtxHelpDocumentHandler(CtxHelpModel model, boolean reconciling) {
 		super(reconciling, model.getFactory());
diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocDocumentFactory.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocDocumentFactory.java
index c1133f7580..fc5138eeaf 100644
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocDocumentFactory.java
+++ b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocDocumentFactory.java
@@ -20,7 +20,7 @@
 import org.eclipse.pde.internal.ua.core.toc.ITocConstants;
 
 public class TocDocumentFactory extends DocumentNodeFactory {
-	private TocModel fModel;
+	private final TocModel fModel;
 
 	public TocDocumentFactory(TocModel model) {
 		fModel = model;
diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocDocumentHandler.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocDocumentHandler.java
index b7026820c4..89ce94f965 100644
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocDocumentHandler.java
+++ b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocDocumentHandler.java
@@ -22,7 +22,7 @@
 
 public class TocDocumentHandler extends NodeDocumentHandler {
 
-	private TocModel fModel;
+	private final TocModel fModel;
 
 	/**
 	 * @param reconciling
diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocModel.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocModel.java
index 6007c9bf1a..dfd26e257a 100644
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocModel.java
+++ b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocModel.java
@@ -28,7 +28,7 @@ public class TocModel extends XMLEditingModel {
 
 	private TocDocumentHandler fHandler;
 
-	private TocDocumentFactory fFactory;
+	private final TocDocumentFactory fFactory;
 
 	private Toc fToc;
 
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractDetails.java
index 6ef2e2fd80..27ba66b1ae 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractDetails.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractDetails.java
@@ -26,9 +26,9 @@
 
 public abstract class CSAbstractDetails extends PDEDetails implements ICSDetails {
 
-	private ICSMaster fMasterSection;
+	private final ICSMaster fMasterSection;
 
-	private String fContextID;
+	private final String fContextID;
 
 	public CSAbstractDetails(ICSMaster masterSection, String contextID) {
 		fMasterSection = masterSection;
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSGroupValidator.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSGroupValidator.java
index 035a3a3b18..03002e74ba 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSGroupValidator.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSGroupValidator.java
@@ -31,11 +31,11 @@
  */
 public class CompCSGroupValidator {
 
-	private Form fForm;
+	private final Form fForm;
 
-	private HashSet<ICompCSTaskGroup> fGroups;
+	private final HashSet<ICompCSTaskGroup> fGroups;
 
-	private String fErrorCategory;
+	private final String fErrorCategory;
 
 	public CompCSGroupValidator(ICompCS cheatsheet, Form form, String errorCategory) {
 		fForm = form;
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSMasterTreeSection.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSMasterTreeSection.java
index 1947572c9d..c16f4a6783 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSMasterTreeSection.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSMasterTreeSection.java
@@ -86,11 +86,11 @@ public class CompCSMasterTreeSection extends TreeSection implements ICSMaster {
 
 	private CollapseAction fCollapseAction;
 
-	private CompCSRemoveTaskObjectAction fRemoveTaskObjectAction;
+	private final CompCSRemoveTaskObjectAction fRemoveTaskObjectAction;
 
-	private CompCSAddGroupAction fAddGroupAction;
+	private final CompCSAddGroupAction fAddGroupAction;
 
-	private CompCSAddTaskAction fAddTaskAction;
+	private final CompCSAddTaskAction fAddTaskAction;
 
 	private CompCSGroupValidator fGroupValidator;
 
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSPage.java
index 27e4a205ea..713a64f231 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSPage.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSPage.java
@@ -37,7 +37,7 @@ public class CompCSPage extends PDEFormPage implements IModelChangedListener {
 
 	public static final String PAGE_ID = "compCSPage"; //$NON-NLS-1$
 
-	private CompCSBlock fBlock;
+	private final CompCSBlock fBlock;
 
 	public CompCSPage(FormEditor editor) {
 		super(editor, PAGE_ID, Messages.CompCSPage_definition);
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSEnclosingTextDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSEnclosingTextDetails.java
index 93b424d4b6..da3852a024 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSEnclosingTextDetails.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSEnclosingTextDetails.java
@@ -72,9 +72,9 @@ public class CompCSEnclosingTextDetails extends CSAbstractSubDetails {
 
 	private String fTaskObjectLabelName;
 
-	private CompCSIntroductionTextListener fIntroductionListener;
+	private final CompCSIntroductionTextListener fIntroductionListener;
 
-	private CompCSConclusionTextListener fConclusionListener;
+	private final CompCSConclusionTextListener fConclusionListener;
 
 	public CompCSEnclosingTextDetails(int type, ICSMaster section) {
 		super(section, CompCSInputContext.CONTEXT_ID);
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/NewCommandKeyEvent.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/NewCommandKeyEvent.java
index 5b3e90e9b1..b05adf8fc6 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/NewCommandKeyEvent.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/NewCommandKeyEvent.java
@@ -24,9 +24,9 @@ public class NewCommandKeyEvent extends EventObject {
 
 	private static final long serialVersionUID = 1L;
 
-	private String fKey;
+	private final String fKey;
 
-	private String fValue;
+	private final String fValue;
 
 	/**
 	 * @param source
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSCommandManager.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSCommandManager.java
index 74a89d1807..8a366362ff 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSCommandManager.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSCommandManager.java
@@ -31,7 +31,7 @@ public class SimpleCSCommandManager {
 
 	private static SimpleCSCommandManager fPinstance;
 
-	private Map<String, String> fCommandMap;
+	private final Map<String, String> fCommandMap;
 
 	private boolean fBlockEvents;
 
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSDefinitionPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSDefinitionPage.java
index eaf9c0342b..a17676e288 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSDefinitionPage.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSDefinitionPage.java
@@ -42,7 +42,7 @@ public class SimpleCSDefinitionPage extends PDEFormPage implements
 
 	public static final String PAGE_ID = "simpleCSPage"; //$NON-NLS-1$
 
-	private SimpleCSBlock fBlock;
+	private final SimpleCSBlock fBlock;
 	private boolean fStale;
 
 	public SimpleCSDefinitionPage(FormEditor editor) {
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSMasterTreeSection.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSMasterTreeSection.java
index 556660f7a6..83c8cf26e1 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSMasterTreeSection.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSMasterTreeSection.java
@@ -83,15 +83,15 @@ public class SimpleCSMasterTreeSection extends TreeSection implements ICSMaster
 
 	private ISimpleCSModel fModel;
 
-	private SimpleCSAddStepAction fAddStepAction;
+	private final SimpleCSAddStepAction fAddStepAction;
 
-	private SimpleCSRemoveStepAction fRemoveStepAction;
+	private final SimpleCSRemoveStepAction fRemoveStepAction;
 
-	private SimpleCSRemoveSubStepAction fRemoveSubStepAction;
+	private final SimpleCSRemoveSubStepAction fRemoveSubStepAction;
 
-	private SimpleCSAddSubStepAction fAddSubStepAction;
+	private final SimpleCSAddSubStepAction fAddSubStepAction;
 
-	private SimpleCSRemoveRunObjectAction fRemoveRunObjectAction;
+	private final SimpleCSRemoveRunObjectAction fRemoveRunObjectAction;
 
 	private CollapseAction fCollapseAction;
 
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSIntroDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSIntroDetails.java
index 90aa841a2c..ae3a4622c9 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSIntroDetails.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSIntroDetails.java
@@ -44,7 +44,7 @@ public class SimpleCSIntroDetails extends CSAbstractDetails {
 
 	private Section fMainSection;
 
-	private SimpleCSHelpDetails fHelpSection;
+	private final SimpleCSHelpDetails fHelpSection;
 
 	private boolean fBlockEvents;
 
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSItemDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSItemDetails.java
index ebb09862e6..b95e9099c3 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSItemDetails.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSItemDetails.java
@@ -55,9 +55,9 @@ public class SimpleCSItemDetails extends CSAbstractDetails {
 
 	private Section fMainSection;
 
-	private SimpleCSHelpDetails fHelpSection;
+	private final SimpleCSHelpDetails fHelpSection;
 
-	private SimpleCSCommandDetails fCommandSection;
+	private final SimpleCSCommandDetails fCommandSection;
 
 	private ControlDecoration fSkipInfoDecoration;
 
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSSubItemDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSSubItemDetails.java
index 680cb6204d..18ac787378 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSSubItemDetails.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSSubItemDetails.java
@@ -43,7 +43,7 @@ public class SimpleCSSubItemDetails extends CSAbstractDetails {
 
 	private Section fMainSection;
 
-	private SimpleCSCommandDetails fCommandSection;
+	private final SimpleCSCommandDetails fCommandSection;
 
 	public SimpleCSSubItemDetails(ICSMaster masterTreeSection) {
 		super(masterTreeSection, SimpleCSInputContext.CONTEXT_ID);
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpPage.java
index 534da2201b..603d20fa63 100644
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpPage.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpPage.java
@@ -48,7 +48,7 @@
 public class CtxHelpPage extends PDEFormPage implements IModelChangedListener {
 	public static final String PAGE_ID = "ctxHelpPage"; //$NON-NLS-1$
 
-	private CtxHelpBlock fBlock;
+	private final CtxHelpBlock fBlock;
 
 	public CtxHelpPage(FormEditor editor) {
 		super(editor, PAGE_ID, CtxHelpMessages.CtxHelpPage_title);
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpAbstractDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpAbstractDetails.java
index 7f2b492cee..2e8f0b8be8 100644
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpAbstractDetails.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpAbstractDetails.java
@@ -42,9 +42,9 @@ public abstract class CtxHelpAbstractDetails extends PDEDetails {
 	 */
 	private static final int NUM_COLUMNS = 3;
 
-	private CtxHelpTreeSection fMasterSection;
+	private final CtxHelpTreeSection fMasterSection;
 	private Section fMainSection;
-	private String fContextID;
+	private final String fContextID;
 
 	public CtxHelpAbstractDetails(CtxHelpTreeSection masterSection, String contextID) {
 		fMasterSection = masterSection;
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDragAdapter.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDragAdapter.java
index b90c9b88a0..c4067fcf4d 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDragAdapter.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDragAdapter.java
@@ -33,7 +33,7 @@
  */
 public class TocDragAdapter implements DragSourceListener {
 	//The TOC Tree Section being dragged from
-	private TocTreeSection fSection;
+	private final TocTreeSection fSection;
 	//The dragged items
 	private ArrayList<TocObject> fDraggedItems;
 
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDropAdapter.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDropAdapter.java
index b9dc0fdb82..e491bfe8f9 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDropAdapter.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDropAdapter.java
@@ -34,7 +34,7 @@
  * mostly overrides the specified drop behaviour.
  */
 public class TocDropAdapter extends ViewerDropAdapter {
-	private TocTreeSection fSection;
+	private final TocTreeSection fSection;
 
 	/**
 	 * Constant describing the position of the cursor relative
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFoldingStructureProvider.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFoldingStructureProvider.java
index 185cc28e2e..47a6f6ce03 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFoldingStructureProvider.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFoldingStructureProvider.java
@@ -30,7 +30,7 @@
 
 public class TocFoldingStructureProvider extends AbstractFoldingStructureProvider {
 
-	private Map<Position, IDocumentElementNode> fPositionToElement = new HashMap<>();
+	private final Map<Position, IDocumentElementNode> fPositionToElement = new HashMap<>();
 
 	public TocFoldingStructureProvider(PDESourcePage editor, IEditingModel model) {
 		super(editor, model);
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocPage.java
index 2c1671bf57..a27881695d 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocPage.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocPage.java
@@ -43,7 +43,7 @@
 public class TocPage extends PDEFormPage implements IModelChangedListener {
 	public static final String PAGE_ID = "tocPage"; //$NON-NLS-1$
 
-	private TocBlock fBlock;
+	private final TocBlock fBlock;
 
 	public TocPage(FormEditor editor) {
 		super(editor, PAGE_ID, TocMessages.TocPage_title);
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocTreeSection.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocTreeSection.java
index b38700d386..0632d47bfc 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocTreeSection.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocTreeSection.java
@@ -130,15 +130,15 @@ public void run() {
 	private CollapseAction fCollapseAction;
 
 	// The actions that will add each type of TOC object
-	private TocAddTopicAction fAddTopicAction;
-	private TocAddLinkAction fAddLinkAction;
-	private TocAddAnchorAction fAddAnchorAction;
+	private final TocAddTopicAction fAddTopicAction;
+	private final TocAddLinkAction fAddLinkAction;
+	private final TocAddAnchorAction fAddAnchorAction;
 
 	// The object removal action
-	private TocRemoveObjectAction fRemoveObjectAction;
+	private final TocRemoveObjectAction fRemoveObjectAction;
 
 	// The action for opening a link from the context menu
-	private TocOpenLinkAction fOpenLinkAction;
+	private final TocOpenLinkAction fOpenLinkAction;
 
 	// The adapter that will listen for drag events in the tree
 	private TocDragAdapter fDragAdapter;
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocAbstractDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocAbstractDetails.java
index bdc35ad051..cc6a5c2341 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocAbstractDetails.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocAbstractDetails.java
@@ -38,11 +38,11 @@ public abstract class TocAbstractDetails extends PDEDetails {
 
 	private static final int NUM_COLUMNS = 3;
 
-	private TocTreeSection fMasterSection;
+	private final TocTreeSection fMasterSection;
 
 	private Section fMainSection;
 
-	private String fContextID;
+	private final String fContextID;
 
 	public TocAbstractDetails(TocTreeSection masterSection, String contextID) {
 		fMasterSection = masterSection;
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSCategoryTrackerUtil.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSCategoryTrackerUtil.java
index f0d8d8ef1b..0f916e1547 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSCategoryTrackerUtil.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSCategoryTrackerUtil.java
@@ -28,11 +28,11 @@ public class CSCategoryTrackerUtil {
 
 	public final static int F_TYPE_OLD_CATEGORY = 2;
 
-	private HashMap<String, String> fCategoryNameMap;
+	private final HashMap<String, String> fCategoryNameMap;
 
-	private HashMap<String, String> fCategoryIDMap;
+	private final HashMap<String, String> fCategoryIDMap;
 
-	private HashMap<String, Integer> fCategoryTypeMap;
+	private final HashMap<String, Integer> fCategoryTypeMap;
 
 	public CSCategoryTrackerUtil() {
 
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSWizard.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSWizard.java
index 0ef8def932..ff2ec81998 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSWizard.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSWizard.java
@@ -31,7 +31,7 @@ public class RegisterCSWizard extends Wizard implements INewWizard {
 
 	private RegisterCSWizardPage fMainPage;
 
-	private IModel fModel;
+	private final IModel fModel;
 
 	public RegisterCSWizard(IModel model) {
 		fModel = model;
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/NewCtxHelpOperation.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/NewCtxHelpOperation.java
index 40b608da61..f29da779b4 100644
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/NewCtxHelpOperation.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/NewCtxHelpOperation.java
@@ -42,7 +42,7 @@
  */
 public class NewCtxHelpOperation extends WorkspaceModifyOperation {
 
-	private IFile fFile;
+	private final IFile fFile;
 
 	public NewCtxHelpOperation(IFile file) {
 		fFile = file;
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/RegisterCtxHelpOperation.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/RegisterCtxHelpOperation.java
index 1604c9c2b3..a4f06f6069 100644
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/RegisterCtxHelpOperation.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/RegisterCtxHelpOperation.java
@@ -72,10 +72,10 @@ public class RegisterCtxHelpOperation extends WorkspaceModifyOperation {
 	public static final String CTX_HELP_ATTR_FILE = "file"; //$NON-NLS-1$
 	public final static String CTX_HELP_ATTR_PLUGIN = "plugin"; //$NON-NLS-1$
 
-	private Shell fShell;
-	private String fPluginText;
-	private IProject fProject;
-	private String fResourceString;
+	private final Shell fShell;
+	private final String fPluginText;
+	private final IProject fProject;
+	private final String fResourceString;
 
 	public RegisterCtxHelpOperation(Shell shell, IModel model, String pluginText) {
 		fPluginText = pluginText;
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/RegisterCtxHelpWizard.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/RegisterCtxHelpWizard.java
index 3fc40af983..35ce03c54b 100644
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/RegisterCtxHelpWizard.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/RegisterCtxHelpWizard.java
@@ -37,7 +37,7 @@
 public class RegisterCtxHelpWizard extends Wizard {
 
 	private RegisterCtxHelpWizardPage fMainPage;
-	private IModel fWizModel;
+	private final IModel fWizModel;
 
 	public RegisterCtxHelpWizard(IModel model) {
 		fWizModel = model;
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizard.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizard.java
index 8499c60c9f..cbd0356f62 100644
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizard.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizard.java
@@ -29,7 +29,7 @@ public class RegisterTocWizard extends Wizard implements INewWizard {
 
 	private RegisterTocWizardPage fMainPage;
 
-	private IModel fModel;
+	private final IModel fModel;
 
 	public RegisterTocWizard(IModel model) {
 		fModel = model;
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLOperation.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLOperation.java
index b9e1c81626..2ccda1613b 100644
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLOperation.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLOperation.java
@@ -24,7 +24,7 @@
 
 public class TocHTMLOperation extends WorkspaceModifyOperation {
 
-	private IFile fFile;
+	private final IFile fFile;
 
 	private static byte[] getHTMLContent() throws CoreException {
 		String indent = "   "; //$NON-NLS-1$
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocOperation.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocOperation.java
index a0f4938394..f1874d6530 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocOperation.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocOperation.java
@@ -37,8 +37,8 @@
 
 public class TocOperation extends WorkspaceModifyOperation {
 
-	private IFile fFile;
-	private String fTocName;
+	private final IFile fFile;
+	private final String fTocName;
 
 	public TocOperation(IFile file, String tocName) {
 		fFile = file;
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/RequiredPluginsClasspathContainer.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/RequiredPluginsClasspathContainer.java
index 9bd67b371f..ec5e295e4e 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/RequiredPluginsClasspathContainer.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/RequiredPluginsClasspathContainer.java
@@ -84,7 +84,7 @@ public class RequiredPluginsClasspathContainer extends PDEClasspathContainer imp
 	 */
 	private static List<IClasspathContributor> fClasspathContributors = null;
 
-	private IProject project;
+	private final IProject project;
 
 	/**
 	 * Constructor for RequiredPluginsClasspathContainer.
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/SourceLocationManager.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/SourceLocationManager.java
index 3bc42de35d..8e2c44da6a 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/SourceLocationManager.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/SourceLocationManager.java
@@ -479,8 +479,8 @@ private static final class SourceExtensions {
 
 	private static final class OrderedPluginSourcePathLocator implements Comparable<OrderedPluginSourcePathLocator> {
 
-		private IPluginSourcePathLocator locator;
-		private LocatorComplexity complexity;
+		private final IPluginSourcePathLocator locator;
+		private final LocatorComplexity complexity;
 
 		OrderedPluginSourcePathLocator(IPluginSourcePathLocator locator, LocatorComplexity complexity) {
 			this.locator = locator;
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/annotations/ExportPackageAnnotationProcessor.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/annotations/ExportPackageAnnotationProcessor.java
index 5c8e69a6ce..880f9e3b5f 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/annotations/ExportPackageAnnotationProcessor.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/annotations/ExportPackageAnnotationProcessor.java
@@ -33,7 +33,7 @@ public class ExportPackageAnnotationProcessor implements OSGiAnnotationProcessor
 
 	private boolean exportPackage = false;
 	private Optional<String> version = Optional.empty();
-	private String packageName;
+	private final String packageName;
 
 	public ExportPackageAnnotationProcessor(String packageName) {
 		this.packageName = packageName;
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/BndBuilder.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/BndBuilder.java
index f77fb46805..be727a0923 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/BndBuilder.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/BndBuilder.java
@@ -59,7 +59,7 @@ public class BndBuilder extends IncrementalProjectBuilder {
 		return true;
 	};
 
-	private Map<IProject, Job> buildJobMap = new ConcurrentHashMap<>();
+	private final Map<IProject, Job> buildJobMap = new ConcurrentHashMap<>();
 
 	public static final String BUILDER_ID = "org.eclipse.pde.BndBuilder";//$NON-NLS-1$
 
@@ -97,8 +97,8 @@ protected void clean(IProgressMonitor monitor) throws CoreException {
 
 	private static final class BndBuild implements ICoreRunnable {
 
-		private IProject project;
-		private Job oldJob;
+		private final IProject project;
+		private final Job oldJob;
 
 		public BndBuild(IProject project, Job oldJob) {
 			this.project = project;
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/BndErrorReporter.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/BndErrorReporter.java
index 5fae1a90db..f72228a6bc 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/BndErrorReporter.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/BndErrorReporter.java
@@ -30,7 +30,7 @@
 public class BndErrorReporter extends ErrorReporter {
 
 	private BndDocument bndDocument;
-	private Report report;
+	private final Report report;
 
 	public BndErrorReporter(IProject project, Report report) {
 		super(project.getFile(BndProject.INSTRUCTIONS_FILE));
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/FileResource.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/FileResource.java
index 4def606652..7a58ea6b45 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/FileResource.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/FileResource.java
@@ -40,7 +40,7 @@
  */
 public class FileResource implements Resource {
 
-	private IFile file;
+	private final IFile file;
 
 	private String extra;
 
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/feature/Feature.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/feature/Feature.java
index 67d23784c8..f25ff3d4e6 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/feature/Feature.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/feature/Feature.java
@@ -42,7 +42,7 @@ public class Feature extends VersionableObject implements IFeature {
 	private final Vector<IFeatureData> fData = new Vector<>();
 	private final Vector<IFeatureChild> fChildren = new Vector<>();
 	private final Vector<IFeaturePlugin> fPlugins = new Vector<>();
-	private Vector<IFeatureImport> fImports = new Vector<>();
+	private final Vector<IFeatureImport> fImports = new Vector<>();
 	private String fOs;
 	private String fWs;
 	private String fNl;
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/Product.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/Product.java
index d1d3294a67..0e53f1fe80 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/Product.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/Product.java
@@ -69,10 +69,10 @@ public class Product extends ProductObject implements IProduct {
 	private String fVersion;
 	private IAboutInfo fAboutInfo;
 
-	private TreeMap<String, IProductObject> fPlugins = new TreeMap<>();
-	private TreeMap<String, IProductObject> fPluginConfigurations = new TreeMap<>();
-	private Set<IConfigurationProperty> fConfigurationProperties = new LinkedHashSet<>();
-	private List<IProductFeature> fFeatures = new ArrayList<>();
+	private final TreeMap<String, IProductObject> fPlugins = new TreeMap<>();
+	private final TreeMap<String, IProductObject> fPluginConfigurations = new TreeMap<>();
+	private final Set<IConfigurationProperty> fConfigurationProperties = new LinkedHashSet<>();
+	private final List<IProductFeature> fFeatures = new ArrayList<>();
 	private IConfigurationFileInfo fConfigIniInfo;
 	private IJREInfo fJVMInfo;
 	private ProductType fType = ProductType.BUNDLES;
@@ -84,7 +84,7 @@ public class Product extends ProductObject implements IProduct {
 	private IArgumentsInfo fLauncherArgs;
 	private IIntroInfo fIntroInfo;
 	private ILicenseInfo fLicenseInfo;
-	private Set<IProductObject> fRepositories = new LinkedHashSet<>();
+	private final Set<IProductObject> fRepositories = new LinkedHashSet<>();
 	private IPreferencesInfo fPreferencesInfo;
 	private ICSSInfo fCSSInfo;
 
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/ExternalFileTargetHandle.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/ExternalFileTargetHandle.java
index 9c6a2fa5d1..493ff3c5c7 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/ExternalFileTargetHandle.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/ExternalFileTargetHandle.java
@@ -51,7 +51,7 @@ static ITargetHandle restoreHandle(URI uri) {
 	}
 
 	private final URI fURI;
-	private File fFile;
+	private final File fFile;
 
 	/**
 	 * Constructs a new target handle to the remote file, based on its URI.
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPlatformService.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPlatformService.java
index 00b58d0cd1..17dd21b6b0 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPlatformService.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPlatformService.java
@@ -110,7 +110,7 @@ public class TargetPlatformService implements ITargetPlatformService {
 	 */
 	static class ResourceProxyVisitor implements IResourceProxyVisitor {
 
-		private List<IResource> fList;
+		private final List<IResource> fList;
 
 		protected ResourceProxyVisitor(List<IResource> list) {
 			fList = list;
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetReferenceBundleContainer.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetReferenceBundleContainer.java
index 8d7cb5886f..44da8a83dc 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetReferenceBundleContainer.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetReferenceBundleContainer.java
@@ -34,7 +34,7 @@ public class TargetReferenceBundleContainer extends AbstractBundleContainer {
 
 	public static final String TYPE = "Target"; //$NON-NLS-1$
 
-	private String uri;
+	private final String uri;
 
 	private volatile ITargetDefinition targetDefinition;
 
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/update/configurator/Configuration.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/update/configurator/Configuration.java
index 76c6f9797e..e9a0a134b8 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/update/configurator/Configuration.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/update/configurator/Configuration.java
@@ -23,8 +23,8 @@
 @SuppressWarnings("deprecation")
 class Configuration implements IConfigurationConstants {
 
-	private HashMap<String, SiteEntry> sites = new HashMap<>();
-	private HashMap<String, URL> platformURLs = new HashMap<>();
+	private final HashMap<String, SiteEntry> sites = new HashMap<>();
+	private final HashMap<String, URL> platformURLs = new HashMap<>();
 	private Date date;
 	private long lastModified; // needed to account for file system limitations
 	private URL url;
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/update/configurator/ConfigurationParser.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/update/configurator/ConfigurationParser.java
index 8577e94581..4f0c2ddd96 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/update/configurator/ConfigurationParser.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/update/configurator/ConfigurationParser.java
@@ -41,7 +41,7 @@ class ConfigurationParser extends DefaultHandler implements IConfigurationConsta
 
 	private static final String URL_PROPERTY = "org.eclipse.update.resolution_url"; //$NON-NLS-1$
 	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
-	private SAXParser parser;
+	private final SAXParser parser;
 
 	private URL currentSiteURL;
 	private Configuration config;
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/update/configurator/FeatureEntry.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/update/configurator/FeatureEntry.java
index 4d8af1da64..ee3f6577d1 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/update/configurator/FeatureEntry.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/update/configurator/FeatureEntry.java
@@ -21,13 +21,13 @@
  */
 @SuppressWarnings("deprecation")
 class FeatureEntry implements IConfigurationConstants {
-	private String id;
-	private String version;
-	private String pluginVersion;
-	private String application;
-	private URL[] root;
-	private boolean primary;
-	private String pluginIdentifier;
+	private final String id;
+	private final String version;
+	private final String pluginVersion;
+	private final String application;
+	private final URL[] root;
+	private final boolean primary;
+	private final String pluginIdentifier;
 	private String url;
 	private SiteEntry site;
 
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/update/configurator/VersionedIdentifier.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/update/configurator/VersionedIdentifier.java
index ec6864c473..e04061ce19 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/update/configurator/VersionedIdentifier.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/update/configurator/VersionedIdentifier.java
@@ -16,8 +16,8 @@
 import org.osgi.framework.Version;
 
 class VersionedIdentifier {
-	private String identifier;
-	private Version version;
+	private final String identifier;
+	private final Version version;
 
 	public VersionedIdentifier(String id, String version) {
 		this.identifier = id;
diff --git a/ui/org.eclipse.pde.genericeditor.extension.tests/src/org/eclipse/pde/genericeditor/extension/tests/UpdateUnitVersionsCommandTests.java b/ui/org.eclipse.pde.genericeditor.extension.tests/src/org/eclipse/pde/genericeditor/extension/tests/UpdateUnitVersionsCommandTests.java
index c24978d310..73a16b5d07 100644
--- a/ui/org.eclipse.pde.genericeditor.extension.tests/src/org/eclipse/pde/genericeditor/extension/tests/UpdateUnitVersionsCommandTests.java
+++ b/ui/org.eclipse.pde.genericeditor.extension.tests/src/org/eclipse/pde/genericeditor/extension/tests/UpdateUnitVersionsCommandTests.java
@@ -55,7 +55,7 @@ public void testVersionSort() throws Exception {
 		confirmVersionUpdates(expected);
 	}
 
-	private ICommandService service = PlatformUI.getWorkbench().getService(ICommandService.class);
+	private final ICommandService service = PlatformUI.getWorkbench().getService(ICommandService.class);
 
 	private Map<String, String> getVersionsForIdsFromTargetFile(String targetFile) {
 		Map<String, String> units = new HashMap<>();
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/InstallableUnitProposal.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/InstallableUnitProposal.java
index ff83ef69cc..9f4c1fb57f 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/InstallableUnitProposal.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/InstallableUnitProposal.java
@@ -21,8 +21,8 @@
 
 public class InstallableUnitProposal extends TargetCompletionProposal {
 
-	private String completionString;
-	private int offset;
+	private final String completionString;
+	private final int offset;
 
 	public InstallableUnitProposal(StyledString completionString, int offset, int length) {
 		super(completionString.toString(), completionString.length() + length, offset, length, completionString);
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/TargetCompletionProposal.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/TargetCompletionProposal.java
index ee9ea51942..0cea1e1bd8 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/TargetCompletionProposal.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/TargetCompletionProposal.java
@@ -26,15 +26,15 @@
 public class TargetCompletionProposal implements ICompletionProposal, ICompletionProposalExtension6 {
 
 	/** The string to be displayed in the completion proposal pop up. */
-	private StyledString fDisplayString;
+	private final StyledString 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;
+	private final int fReplacementLength;
 	/** The cursor position after this proposal has been applied. */
-	private int fCursorPosition;
+	private final int fCursorPosition;
 
 	/**
 	 * Creates a new completion proposal. All fields are initialized based on the
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/AttributeNameCompletionProcessor.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/AttributeNameCompletionProcessor.java
index 2ce98be51e..97b0b04ae8 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/AttributeNameCompletionProcessor.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/AttributeNameCompletionProcessor.java
@@ -35,23 +35,23 @@
  */
 public class AttributeNameCompletionProcessor extends DelegateProcessor {
 
-	private String searchTerm;
-	private String acKey;
-	private int offset;
-	private String text;
+	private final String searchTerm;
+	private final String acKey;
+	private final int offset;
+	private final String text;
 
 	private static final String ATTRIBUTE_NAME_FIND = "(?:\\s*(\\w*)\\s*=\\s*\".*?\")";// $NON-NLS-1$
 	private static final Pattern ATT_NAME_PATTERN = Pattern.compile(ATTRIBUTE_NAME_FIND);
 
-	private String[] target = new String[] { ITargetConstants.TARGET_NAME_ATTR, ITargetConstants.TARGET_SEQ_NO_ATTR };
-	private String[] locations = new String[] {};
-	private String[] location = new String[] { ITargetConstants.LOCATION_INCLUDE_PLATFORMS_ATTR,
+	private final String[] target = new String[] { ITargetConstants.TARGET_NAME_ATTR, ITargetConstants.TARGET_SEQ_NO_ATTR };
+	private final String[] locations = new String[] {};
+	private final String[] location = new String[] { ITargetConstants.LOCATION_INCLUDE_PLATFORMS_ATTR,
 			ITargetConstants.LOCATION_INCLUDE_CONFIG_PHASE_ATTR, ITargetConstants.LOCATION_INCLUDE_MODE_ATTR,
 			ITargetConstants.LOCATION_INCLUDE_SOURCE_ATTR, ITargetConstants.LOCATION_TYPE_ATTR };
-	private String[] unit = new String[] { ITargetConstants.UNIT_ID_ATTR, ITargetConstants.UNIT_VERSION_ATTR };
-	private String[] repository = new String[] { ITargetConstants.REPOSITORY_LOCATION_ATTR };
-	private String[] targetJRE = new String[] { ITargetConstants.TARGET_JRE_PATH_ATTR };
-	private Map<String, String[]> completionMap = new HashMap<>();
+	private final String[] unit = new String[] { ITargetConstants.UNIT_ID_ATTR, ITargetConstants.UNIT_VERSION_ATTR };
+	private final String[] repository = new String[] { ITargetConstants.REPOSITORY_LOCATION_ATTR };
+	private final String[] targetJRE = new String[] { ITargetConstants.TARGET_JRE_PATH_ATTR };
+	private final Map<String, String[]> completionMap = new HashMap<>();
 
 	public AttributeNameCompletionProcessor(String searchTerm, String acKey, int offset, String text) {
 		this.searchTerm = searchTerm;
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/AttributeValueCompletionProcessor.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/AttributeValueCompletionProcessor.java
index 5dbcefd872..4a71f90aa7 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/AttributeValueCompletionProcessor.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/AttributeValueCompletionProcessor.java
@@ -39,9 +39,9 @@
  */
 public class AttributeValueCompletionProcessor extends DelegateProcessor {
 
-	private String searchTerm;
-	private String acKey;
-	private int offset;
+	private final String searchTerm;
+	private final String acKey;
+	private final int offset;
 
 	public AttributeValueCompletionProcessor(String searchTerm, String acKey, int offset) {
 		this.searchTerm = searchTerm;
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/TagCompletionProcessor.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/TagCompletionProcessor.java
index 4d46c3cbf6..ac219608b1 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/TagCompletionProcessor.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/TagCompletionProcessor.java
@@ -72,8 +72,8 @@ public class TagCompletionProcessor extends DelegateProcessor {
 		allowedDuplicatesTags.add(DependencyNode.class);
 	}
 
-	private String searchTerm;
-	private int offset;
+	private final String searchTerm;
+	private final int offset;
 
 	public TagCompletionProcessor(String searchTerm, String acKey, int offset) {
 		this.searchTerm = searchTerm;
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/TagValueCompletionProcessor.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/TagValueCompletionProcessor.java
index 9cadef9a66..60a3293dc7 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/TagValueCompletionProcessor.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/TagValueCompletionProcessor.java
@@ -41,9 +41,9 @@ public class TagValueCompletionProcessor extends DelegateProcessor {
 		tagTextValues.put(ITargetConstants.NL_TAG, getLocales());
 	}
 
-	private String searchTerm;
-	private String acKey;
-	private int offset;
+	private final String searchTerm;
+	private final String acKey;
+	private final int offset;
 
 	public TagValueCompletionProcessor(String searchTerm, String acKey, int offset) {
 		this.searchTerm = searchTerm;
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/xml/Parser.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/xml/Parser.java
index bce7646dac..d1610b2c73 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/xml/Parser.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/xml/Parser.java
@@ -111,15 +111,15 @@ public void parse(IDocument document) throws XMLStreamException {
 
 	private Iterator<XMLElement> createXMLTagItterator(String document) {
 		return new Iterator<>() {
-			private String tagRegex = "(?<tag><[\\w|/][^<]+?>)";
-			private String commentRegex = "(<!--.*?-->)";
-			private String beforeTagRegex = ".*?(?=".concat(tagRegex).concat(")");
+			private final String tagRegex = "(?<tag><[\\w|/][^<]+?>)";
+			private final String commentRegex = "(<!--.*?-->)";
+			private final String beforeTagRegex = ".*?(?=".concat(tagRegex).concat(")");
 
 			private String text = document;
 
-			private Pattern tagPattern = Pattern.compile(tagRegex, Pattern.DOTALL);
-			private Pattern commentPattern = Pattern.compile(commentRegex, Pattern.DOTALL);
-			private Pattern beforeTagPattern = Pattern.compile(beforeTagRegex, Pattern.DOTALL);
+			private final Pattern tagPattern = Pattern.compile(tagRegex, Pattern.DOTALL);
+			private final Pattern commentPattern = Pattern.compile(commentRegex, Pattern.DOTALL);
+			private final Pattern beforeTagPattern = Pattern.compile(beforeTagRegex, Pattern.DOTALL);
 
 			@Override
 			public boolean hasNext() {
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/xml/XMLElement.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/xml/XMLElement.java
index d3a9b1fc4e..9364d547b6 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/xml/XMLElement.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/xml/XMLElement.java
@@ -19,16 +19,16 @@
 import java.util.regex.Pattern;
 
 public class XMLElement {
-	private String element;
-	private int offset;
-	private String name;
-	private Map<String, String> attributes = new HashMap<>();
-	private boolean isEndElement;
-	private boolean isStartElement;
+	private final String element;
+	private final int offset;
+	private final String name;
+	private final Map<String, String> attributes = new HashMap<>();
+	private final boolean isEndElement;
+	private final boolean isStartElement;
 
-	private Pattern startElementNamePattern = Pattern.compile("<\\s*(?<name>\\w*).*", Pattern.DOTALL); //$NON-NLS-1$
-	private Pattern endElementNamePattern = Pattern.compile("</\\s*(?<name>\\w*).*", Pattern.DOTALL); //$NON-NLS-1$
-	private Pattern attributePattern = Pattern.compile("((?<key>\\w*)\\s*=\\s*\"(?<value>.*?)\")", Pattern.DOTALL);//$NON-NLS-1$
+	private final Pattern startElementNamePattern = Pattern.compile("<\\s*(?<name>\\w*).*", Pattern.DOTALL); //$NON-NLS-1$
+	private final Pattern endElementNamePattern = Pattern.compile("</\\s*(?<name>\\w*).*", Pattern.DOTALL); //$NON-NLS-1$
+	private final Pattern attributePattern = Pattern.compile("((?<key>\\w*)\\s*=\\s*\"(?<value>.*?)\")", Pattern.DOTALL);//$NON-NLS-1$
 
 	public XMLElement(String element, int offset) {
 		this.element = element;
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/p2/UpdateJob.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/p2/UpdateJob.java
index 075dc4669c..0ac3ed8b30 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/p2/UpdateJob.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/p2/UpdateJob.java
@@ -29,7 +29,7 @@
  */
 public class UpdateJob extends Job {
 
-	private LocationNode node;
+	private final LocationNode node;
 
 	public UpdateJob(LocationNode node) {
 		super(Messages.UpdateJob_P2DataFetch + node.getRepositoryLocation());
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/folding/FoldingReconcilerStrategy.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/folding/FoldingReconcilerStrategy.java
index 955f08da03..0b3a04e14b 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/folding/FoldingReconcilerStrategy.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/folding/FoldingReconcilerStrategy.java
@@ -36,8 +36,8 @@ public class FoldingReconcilerStrategy implements IReconcilingStrategy, IReconci
 	private IDocument document;
 	private String oldDocument;
 	private ProjectionViewer projectionViewer;
-	private List<Annotation> oldAnnotations = new ArrayList<>();
-	private List<Position> oldPositions = new ArrayList<>();
+	private final List<Annotation> oldAnnotations = new ArrayList<>();
+	private final List<Position> oldPositions = new ArrayList<>();
 
 	@Override
 	public void setDocument(IDocument document) {
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/folding/TargetPlatformFoldingReconciler.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/folding/TargetPlatformFoldingReconciler.java
index e9fe9555a1..bbf52f7830 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/folding/TargetPlatformFoldingReconciler.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/folding/TargetPlatformFoldingReconciler.java
@@ -20,7 +20,7 @@
 
 public class TargetPlatformFoldingReconciler extends Reconciler {
 
-	private FoldingReconcilerStrategy fStrategy;
+	private final FoldingReconcilerStrategy fStrategy;
 
 	public TargetPlatformFoldingReconciler() {
 		fStrategy = new FoldingReconcilerStrategy();
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/GeneralTagRule.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/GeneralTagRule.java
index b49cb375ef..f7e5041311 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/GeneralTagRule.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/GeneralTagRule.java
@@ -25,7 +25,7 @@
  * Simple tag matcher
  */
 public class GeneralTagRule implements IRule {
-	private IToken tagToken = new Token(new TextAttribute(PlatformUI.getWorkbench().getThemeManager().getCurrentTheme()
+	private final IToken tagToken = new Token(new TextAttribute(PlatformUI.getWorkbench().getThemeManager().getCurrentTheme()
 			.getColorRegistry().get(IGETEColorConstants.P_TAG)));
 
 	@Override
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformAttributeRule.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformAttributeRule.java
index f77cbfdc0a..03c07ab6f1 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformAttributeRule.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformAttributeRule.java
@@ -43,7 +43,7 @@ public class TargetPlatformAttributeRule extends WordRule {
 			LOCATION_INCLUDE_PLATFORMS_ATTR, LOCATION_INCLUDE_MODE_ATTR, LOCATION_TYPE_ATTR, REPOSITORY_LOCATION_ATTR,
 			TARGET_JRE_PATH_ATTR, TARGET_SEQ_NO_ATTR, LOCATION_INCLUDE_CONFIG_PHASE_ATTR, LOCATION_INCLUDE_SOURCE_ATTR,
 			INCLUDE_DEPENDENCY_DEPTH, INCLUDE_DEPENDENCY_SCOPES, MISSING_MANIFEST };
-	private IToken attributeToken = new Token(
+	private final IToken attributeToken = new Token(
 			new TextAttribute(PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry()
 					.get(IGETEColorConstants.P_ATTRIBUTE)));
 
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformPresentationReconciler.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformPresentationReconciler.java
index 9160fb36bf..1c59d5def9 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformPresentationReconciler.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformPresentationReconciler.java
@@ -62,8 +62,8 @@ public void propertyChange(PropertyChangeEvent event) {
 		}
 	}
 
-	private UpdatableDefaultDamagerRepairer dr;
-	private InvalidatingListener listener;
+	private final UpdatableDefaultDamagerRepairer dr;
+	private final InvalidatingListener listener;
 
 	public TargetPlatformPresentationReconciler() {
 		dr = new UpdatableDefaultDamagerRepairer(new RuleBasedScanner());
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformTagRule.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformTagRule.java
index 2b7dcf253e..3c88461b41 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformTagRule.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformTagRule.java
@@ -52,7 +52,7 @@ public class TargetPlatformTagRule extends WordRule {
 			WS_TAG, ARCH_TAG, NL_TAG, DEPENDENCIES_TAG, DEPENDENCY_TAG, VERSION_TAG, TYPE_TAG, GROUP_ID_TAG,
 			ARTIFACT_ID_TAG };
 
-	private IToken tagToken = new Token(
+	private final IToken tagToken = new Token(
 			new TextAttribute(PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry()
 					.get(IGETEColorConstants.P_TAG)));
 
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/validator/TargedDefinitionSetupParticipant.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/validator/TargedDefinitionSetupParticipant.java
index dc74d017f7..22a0b848f9 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/validator/TargedDefinitionSetupParticipant.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/validator/TargedDefinitionSetupParticipant.java
@@ -20,7 +20,7 @@
 
 public class TargedDefinitionSetupParticipant implements IDocumentSetupParticipant {
 
-	private TargetDefinitionBufferListener bufferListener;
+	private final TargetDefinitionBufferListener bufferListener;
 
 	public TargedDefinitionSetupParticipant() {
 		bufferListener = new TargetDefinitionBufferListener();
diff --git a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/MultiBundleClassLoader.java b/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/MultiBundleClassLoader.java
index ca0feb3cf7..7aabec7631 100644
--- a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/MultiBundleClassLoader.java
+++ b/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/MultiBundleClassLoader.java
@@ -24,7 +24,7 @@
 import org.osgi.framework.Bundle;
 
 class MultiBundleClassLoader extends ClassLoader {
-	private List<Bundle> bundleList;
+	private final List<Bundle> bundleList;
 
 	public MultiBundleClassLoader(List<Bundle> platformEngineBundles) {
 		super(null); // never delegate to system classloader, only load classes via given Bundles
diff --git a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/PlatformUITestHarness.java b/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/PlatformUITestHarness.java
index 7988e46e87..3576e1f6ad 100644
--- a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/PlatformUITestHarness.java
+++ b/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/PlatformUITestHarness.java
@@ -22,7 +22,7 @@
  */
 public class PlatformUITestHarness implements ITestHarness {
 
-	private TestableObject fTestableObject;
+	private final TestableObject fTestableObject;
 	private final boolean fRunTestsInSeparateThread;
 
 	/**
diff --git a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/RemotePluginTestRunner.java b/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/RemotePluginTestRunner.java
index db52ea18a3..9060f8c2b5 100644
--- a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/RemotePluginTestRunner.java
+++ b/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/RemotePluginTestRunner.java
@@ -38,7 +38,7 @@ public class RemotePluginTestRunner extends RemoteTestRunner {
 	private ClassLoader fLoaderClassLoader;
 
 	static class BundleClassLoader extends ClassLoader {
-		private Bundle bundle;
+		private final Bundle bundle;
 
 		public BundleClassLoader(Bundle target) {
 			this.bundle = target;
diff --git a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchListener.java b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchListener.java
index c3fba80066..5fbb79f273 100644
--- a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchListener.java
+++ b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchListener.java
@@ -37,7 +37,7 @@
 import org.eclipse.pde.launching.IPDELauncherConstants;
 
 public class LaunchListener implements ILaunchListener, IDebugEventSetListener {
-	private ArrayList<ILaunch> managedLaunches;
+	private final ArrayList<ILaunch> managedLaunches;
 
 	public LaunchListener() {
 		managedLaunches = new ArrayList<>();
diff --git a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/sourcelookup/PDESourceLookupDirector.java b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/sourcelookup/PDESourceLookupDirector.java
index 1aa9d5eb8a..68252514a8 100644
--- a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/sourcelookup/PDESourceLookupDirector.java
+++ b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/sourcelookup/PDESourceLookupDirector.java
@@ -66,7 +66,7 @@ public class PDESourceLookupDirector extends AbstractSourceLookupDirector {
 	/**
 	 * Cache of source containers by location and id (String & String)
 	 */
-	private Map<String, List<ISourceContainer>> fSourceContainerMap = new LinkedHashMap<>();
+	private final Map<String, List<ISourceContainer>> fSourceContainerMap = new LinkedHashMap<>();
 
 	private ISourceContainer[] fJreSourceContainers;
 
diff --git a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/sourcelookup/PDESourceLookupQuery.java b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/sourcelookup/PDESourceLookupQuery.java
index a7bb00907a..e08295b040 100644
--- a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/sourcelookup/PDESourceLookupQuery.java
+++ b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/sourcelookup/PDESourceLookupQuery.java
@@ -66,9 +66,9 @@ public class PDESourceLookupQuery implements ISafeRunnable {
 	private static final String STARTUP_CLASSLOADER = "org.eclipse.equinox.launcher.Main$StartupClassLoader"; //$NON-NLS-1$
 	private static final String OSGI_FRAMEWORK_PLUGIN = "org.eclipse.osgi"; //$NON-NLS-1$
 
-	private Object fElement;
+	private final Object fElement;
 	private Object fResult;
-	private PDESourceLookupDirector fDirector;
+	private final PDESourceLookupDirector fDirector;
 
 	public PDESourceLookupQuery(PDESourceLookupDirector director, Object object) {
 		fElement = object;
diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/OverlayIcon.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/OverlayIcon.java
index b54a356e47..6087392140 100644
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/OverlayIcon.java
+++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/OverlayIcon.java
@@ -26,7 +26,7 @@ public class OverlayIcon extends CompositeImageDescriptor {
 	private Point fSize = null;
 
 	private ImageDescriptor fBase;
-	private ImageDescriptor[][] fOverlays;
+	private final ImageDescriptor[][] fOverlays;
 
 	public OverlayIcon(ImageDescriptor base, ImageDescriptor[][] overlays) {
 		fBase = base;
diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowser.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowser.java
index 2953d934f7..6217f31874 100644
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowser.java
+++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowser.java
@@ -81,7 +81,7 @@
 public class RegistryBrowser extends ViewPart {
 
 	private class GroupByAction extends Action {
-		private int actionGroupBy;
+		private final int actionGroupBy;
 
 		public GroupByAction(String name, int groupBy) {
 			super(name, AS_RADIO_BUTTON);
@@ -140,7 +140,7 @@ public void run() {
 	private Clipboard fClipboard;
 
 	private DrillDownAdapter fDrillDownAdapter;
-	private ViewerFilter fActiveFilter = new ViewerFilter() {
+	private final ViewerFilter fActiveFilter = new ViewerFilter() {
 		@Override
 		public boolean select(Viewer viewer, Object parentElement, Object element) {
 			if (element instanceof ExtensionPoint)
diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserContentProvider.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserContentProvider.java
index bba3aebdbc..4aa6995feb 100644
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserContentProvider.java
+++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserContentProvider.java
@@ -34,7 +34,7 @@ public class RegistryBrowserContentProvider implements ITreeContentProvider {
 
 	public boolean isInExtensionSet;
 
-	private RegistryBrowser fRegistryBrowser;
+	private final RegistryBrowser fRegistryBrowser;
 
 	public RegistryBrowserContentProvider(RegistryBrowser registryBrowser) {
 		fRegistryBrowser = registryBrowser;
diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserLabelProvider.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserLabelProvider.java
index f17381fee8..5ddbe46ac3 100644
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserLabelProvider.java
+++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserLabelProvider.java
@@ -42,31 +42,31 @@
 
 public class RegistryBrowserLabelProvider extends StyledCellLabelProvider implements ILabelProvider {
 
-	private Image fPluginImage;
-	private Image fActivePluginImage;
-	private Image fUnresolvedPluginImage;
-	private Image fLibraryImage;
-	private Image fRuntimeImage;
-	private Image fGenericTagImage;
-	private Image fGenericAttrImage;
-	private Image fExtensionImage;
-	private Image fExtensionsImage;
-	private Image fExtensionPointImage;
-	private Image fExtensionPointsImage;
-	private Image fRequiresImage;
-	private Image fExpReqPluginImage;
-	private Image fReqPluginImage;
-	private Image fPluginsImage;
-	private Image fLocationImage;
-	private Image fExporterImage;
-	private Image fImporterImage;
-	private Image fServiceImage;
-	private Image fPropertyImage;
-	private Image fServicePropertyImage;
-	private Image fFragmentImage;
-	private Image fPackageImage;
-	private Image fRemoteServiceProxyImage;
-	private RegistryBrowser fRegistryBrowser;
+	private final Image fPluginImage;
+	private final Image fActivePluginImage;
+	private final Image fUnresolvedPluginImage;
+	private final Image fLibraryImage;
+	private final Image fRuntimeImage;
+	private final Image fGenericTagImage;
+	private final Image fGenericAttrImage;
+	private final Image fExtensionImage;
+	private final Image fExtensionsImage;
+	private final Image fExtensionPointImage;
+	private final Image fExtensionPointsImage;
+	private final Image fRequiresImage;
+	private final Image fExpReqPluginImage;
+	private final Image fReqPluginImage;
+	private final Image fPluginsImage;
+	private final Image fLocationImage;
+	private final Image fExporterImage;
+	private final Image fImporterImage;
+	private final Image fServiceImage;
+	private final Image fPropertyImage;
+	private final Image fServicePropertyImage;
+	private final Image fFragmentImage;
+	private final Image fPackageImage;
+	private final Image fRemoteServiceProxyImage;
+	private final RegistryBrowser fRegistryBrowser;
 
 	public RegistryBrowserLabelProvider(RegistryBrowser browser) {
 		fRegistryBrowser = browser;
diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserModelChangeListener.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserModelChangeListener.java
index 1261e63cb1..e563e41900 100644
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserModelChangeListener.java
+++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserModelChangeListener.java
@@ -26,7 +26,7 @@
 
 public class RegistryBrowserModelChangeListener implements ModelChangeListener {
 
-	private RegistryBrowser fRegistryBrowser;
+	private final RegistryBrowser fRegistryBrowser;
 
 	public RegistryBrowserModelChangeListener(RegistryBrowser registryBrowser) {
 		fRegistryBrowser = registryBrowser;
diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryFilteredTree.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryFilteredTree.java
index b702d15fbb..b01f624518 100644
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryFilteredTree.java
+++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryFilteredTree.java
@@ -22,7 +22,7 @@
 
 public class RegistryFilteredTree extends FilteredTree {
 
-	private RegistryBrowser browser;
+	private final RegistryBrowser browser;
 
 	public RegistryFilteredTree(RegistryBrowser browser, Composite parent, int treeStyle, PatternFilter filter) {
 		super(parent, treeStyle, filter, true, true);
diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/Folder.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/Folder.java
index 98ef06e844..a5f15723fe 100644
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/Folder.java
+++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/Folder.java
@@ -27,8 +27,8 @@ public class Folder {
 	public static final int F_IMPORTED_PACKAGES = 10;
 	public static final int F_EXPORTED_PACKAGES = 11;
 
-	private int id;
-	private Object parent;
+	private final int id;
+	private final Object parent;
 
 	public Folder(int id, Object parent) {
 		this.id = id;
diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/ModelChangeDelta.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/ModelChangeDelta.java
index 43dd304bff..0325e5b4df 100644
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/ModelChangeDelta.java
+++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/ModelChangeDelta.java
@@ -28,8 +28,8 @@ public class ModelChangeDelta {
 	public static final int RESOLVED = 7;
 	public static final int UNRESOLVED = 8;
 
-	private ModelObject fObject;
-	private int fFlag;
+	private final ModelObject fObject;
+	private final int fFlag;
 
 	public ModelChangeDelta(ModelObject object, int flag) {
 		fObject = object;
diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/RegistryModel.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/RegistryModel.java
index 6c0aee69f6..22705ef5ee 100644
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/RegistryModel.java
+++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/RegistryModel.java
@@ -33,7 +33,7 @@
  */
 public class RegistryModel {
 
-	private BackendChangeListener backendListener = new BackendChangeListener() {
+	private final BackendChangeListener backendListener = new BackendChangeListener() {
 		@Override
 		public void addBundle(Bundle adapter) {
 			adapter.setModel(RegistryModel.this);
@@ -213,12 +213,12 @@ public void removeExtensionPoints(ExtensionPoint[] extensionPointAdapters) {
 		}
 	};
 
-	private List<ModelChangeListener> listeners = new ArrayList<>();
-	private Map<Long, Bundle> bundles;
-	private Map<Long, ServiceRegistration> services;
-	private Map<String, ExtensionPoint> extensionPoints;
-	private Set<ServiceName> serviceNames;
-	private Map<String, Set<Bundle>> fragments;
+	private final List<ModelChangeListener> listeners = new ArrayList<>();
+	private final Map<Long, Bundle> bundles;
+	private final Map<Long, ServiceRegistration> services;
+	private final Map<String, ExtensionPoint> extensionPoints;
+	private final Set<ServiceName> serviceNames;
+	private final Map<String, Set<Bundle>> fragments;
 
 	protected RegistryBackend backend;
 
diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/ServiceName.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/ServiceName.java
index af8c574eb8..189b55001c 100644
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/ServiceName.java
+++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/ServiceName.java
@@ -20,8 +20,8 @@
 
 public class ServiceName extends ModelObject implements Comparable<ServiceName> {
 
-	private String[] classes;
-	private ServiceReference<?> reference;
+	private final String[] classes;
+	private final ServiceReference<?> reference;
 
 	public ServiceName(String[] classes, ServiceReference<?> ref) {
 		this.classes = classes;
diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/SpyFormToolkit.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/SpyFormToolkit.java
index 1bb3a4eedc..bd59df290c 100644
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/SpyFormToolkit.java
+++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/SpyFormToolkit.java
@@ -64,7 +64,7 @@ public class SpyFormToolkit extends FormToolkit {
 
 	private class SpyHyperlinkAdapter extends HyperlinkAdapter {
 
-		private PopupDialog fDialog;
+		private final PopupDialog fDialog;
 
 		public SpyHyperlinkAdapter(PopupDialog dialog) {
 			this.fDialog = dialog;
@@ -88,7 +88,7 @@ public void linkActivated(HyperlinkEvent e) {
 
 	private static class SaveImageAction extends Action {
 
-		private Image image;
+		private final Image image;
 
 		public SaveImageAction(Image image) {
 			this.image = image;
@@ -127,8 +127,8 @@ private int determineFileType(String filename) {
 		}
 	}
 
-	private Map<String, Bundle> bundleClassByName = new HashMap<>();
-	private PopupDialog dialog;
+	private final Map<String, Bundle> bundleClassByName = new HashMap<>();
+	private final PopupDialog dialog;
 	private static String HELP_KEY = "org.eclipse.ui.help"; //$NON-NLS-1$
 
 	public SpyFormToolkit(PopupDialog dialog) {
diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/dialogs/MenuSpyDialog.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/dialogs/MenuSpyDialog.java
index 84df303dbe..fcbbf168bc 100644
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/dialogs/MenuSpyDialog.java
+++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/dialogs/MenuSpyDialog.java
@@ -36,8 +36,8 @@
 
 public class MenuSpyDialog extends PopupDialog {
 
-	private Event event;
-	private Point fAnchor;
+	private final Event event;
+	private final Point fAnchor;
 	private Composite composite;
 	private SpyFormToolkit toolkit;
 
diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/dialogs/SpyDialog.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/dialogs/SpyDialog.java
index f2f07ff128..cee4b2ad87 100644
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/dialogs/SpyDialog.java
+++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/dialogs/SpyDialog.java
@@ -44,8 +44,8 @@
 
 public class SpyDialog extends PopupDialog {
 
-	private ExecutionEvent event;
-	private Point fAnchor;
+	private final ExecutionEvent event;
+	private final Point fAnchor;
 	private Composite composite;
 	private SpyFormToolkit toolkit;
 
diff --git a/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/CSSPropertyProvider.java b/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/CSSPropertyProvider.java
index 425598edd1..c3f0379d59 100644
--- a/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/CSSPropertyProvider.java
+++ b/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/CSSPropertyProvider.java
@@ -23,9 +23,9 @@
 @SuppressWarnings("restriction")
 public class CSSPropertyProvider {
 
-	private String propertyName;
-	private CSSStylableElement element;
-	private CSSEngine engine;
+	private final String propertyName;
+	private final CSSStylableElement element;
+	private final CSSEngine engine;
 
 	public CSSPropertyProvider(String propertyName, CSSStylableElement element, CSSEngine engine) {
 		this.propertyName = propertyName;
diff --git a/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/CSSScratchPadPart.java b/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/CSSScratchPadPart.java
index b124af6c20..9206a45242 100644
--- a/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/CSSScratchPadPart.java
+++ b/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/CSSScratchPadPart.java
@@ -53,7 +53,7 @@ public class CSSScratchPadPart {
 	/**
 	 * Collection of buttons created by the <code>createButton</code> method.
 	 */
-	private HashMap<Integer, Button> buttons = new HashMap<>();
+	private final HashMap<Integer, Button> buttons = new HashMap<>();
 
 	private Text cssText;
 	private Text exceptions;
diff --git a/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/CssSpyPart.java b/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/CssSpyPart.java
index f2c460c484..d890b1fcaa 100644
--- a/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/CssSpyPart.java
+++ b/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/CssSpyPart.java
@@ -149,8 +149,8 @@ public static CSSEngine getCSSEngine(Object o) {
 	private TableViewer cssPropertiesViewer;
 	private Text cssRules;
 
-	private List<Shell> highlights = new LinkedList<>();
-	private List<Region> highlightRegions = new LinkedList<>();
+	private final List<Shell> highlights = new LinkedList<>();
+	private final List<Region> highlightRegions = new LinkedList<>();
 	private Text cssSearchBox;
 	private Button showUnsetProperties;
 	private Button showCssFragment;
diff --git a/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/TextPopupDialog.java b/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/TextPopupDialog.java
index e9b277b6c8..c2373f9d01 100644
--- a/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/TextPopupDialog.java
+++ b/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/TextPopupDialog.java
@@ -9,8 +9,8 @@
 
 public class TextPopupDialog extends PopupDialog {
 
-	private String content;
-	private boolean contentEditable;
+	private final String content;
+	private final boolean contentEditable;
 
 	public TextPopupDialog(Shell shell, String title, String content, boolean editable, String infoText) {
 		super(shell, SWT.RESIZE | SWT.ON_TOP, true, true, true, false, false, title, infoText);
diff --git a/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/model/ItemToFilter.java b/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/model/ItemToFilter.java
index 0372186b07..bcf4014f58 100644
--- a/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/model/ItemToFilter.java
+++ b/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/model/ItemToFilter.java
@@ -18,7 +18,7 @@ public enum ItemToFilter {
 			Messages.ItemToFilter_NameAndValue), ParameterValue(Messages.ItemToFilter_SomeParameterValue), Publisher(
 					Messages.ItemToFilter_EventPublisher), ChangedElement(Messages.ItemToFilter_ChangedElement);
 
-	private String text;
+	private final String text;
 
 	private ItemToFilter(String text) {
 		this.text = text;
diff --git a/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/model/Operator.java b/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/model/Operator.java
index 7b2213afbd..be54eaf17c 100644
--- a/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/model/Operator.java
+++ b/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/model/Operator.java
@@ -18,9 +18,9 @@ public enum Operator {
 			false), Contains(Messages.Operator_Contains, true), NotContains(Messages.Operator_NotContains, false), StartsWith(Messages.Operator_StartsWith,
 					true), NotStartsWith(Messages.Operator_NotStartsWith, false);
 
-	private String text;
+	private final String text;
 
-	private boolean positive;
+	private final boolean positive;
 
 	private Operator(String text, boolean positive) {
 		this.text = text;
diff --git a/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/model/SpecialValue.java b/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/model/SpecialValue.java
index 30bd671fac..de27cb253a 100644
--- a/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/model/SpecialValue.java
+++ b/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/model/SpecialValue.java
@@ -16,7 +16,7 @@
 public enum SpecialValue {
 	Null(""), EmptyString(""), NameAndValue("%s=%s"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
 
-	private String text;
+	private final String text;
 
 	private SpecialValue(String text) {
 		this.text = text;
diff --git a/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/ui/CapturedEventFilters.java b/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/ui/CapturedEventFilters.java
index 9f60f87804..d6284c6194 100644
--- a/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/ui/CapturedEventFilters.java
+++ b/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/ui/CapturedEventFilters.java
@@ -67,7 +67,7 @@ public class CapturedEventFilters {
 
 	private List filters;
 
-	private java.util.List<CapturedEventFilter> rawFilters;
+	private final java.util.List<CapturedEventFilter> rawFilters;
 
 	private final Clipboard clipboard;
 
diff --git a/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/ui/CapturedEventTree.java b/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/ui/CapturedEventTree.java
index ceb1b524bf..dc68012916 100644
--- a/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/ui/CapturedEventTree.java
+++ b/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/ui/CapturedEventTree.java
@@ -59,9 +59,9 @@
 public class CapturedEventTree extends TreeViewer {
 	private ICapturedEventTreeListener listener;
 
-	private WritableList<CapturedEvent> capturedEvents;
+	private final WritableList<CapturedEvent> capturedEvents;
 
-	private Clipboard clipboard;
+	private final Clipboard clipboard;
 
 	private TreeItemCursor treeItemCursor;
 
diff --git a/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/ui/ToggleLink.java b/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/ui/ToggleLink.java
index d897c61a8f..b089925dd1 100644
--- a/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/ui/ToggleLink.java
+++ b/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/ui/ToggleLink.java
@@ -19,7 +19,7 @@
 import org.eclipse.swt.widgets.Link;
 
 public class ToggleLink {
-	private Link link;
+	private final Link link;
 
 	private ClickListener listener;
 
diff --git a/ui/org.eclipse.pde.spy.model/src/org/eclipse/pde/spy/model/MemoryModelResource.java b/ui/org.eclipse.pde.spy.model/src/org/eclipse/pde/spy/model/MemoryModelResource.java
index 436ce74b4f..aac59a9607 100644
--- a/ui/org.eclipse.pde.spy.model/src/org/eclipse/pde/spy/model/MemoryModelResource.java
+++ b/ui/org.eclipse.pde.spy.model/src/org/eclipse/pde/spy/model/MemoryModelResource.java
@@ -29,8 +29,8 @@
 
 @SuppressWarnings("restriction")
 public class MemoryModelResource implements IModelResource {
-	private WritableList<Object> list = new WritableList<>();
-	private EditingDomain editingDomain;
+	private final WritableList<Object> list = new WritableList<>();
+	private final EditingDomain editingDomain;
 
 	public MemoryModelResource(MApplication application) {
 		list.add(application);
diff --git a/ui/org.eclipse.pde.spy.model/src/org/eclipse/pde/spy/model/ModelSpyPart.java b/ui/org.eclipse.pde.spy.model/src/org/eclipse/pde/spy/model/ModelSpyPart.java
index 58515404cf..35748ff490 100644
--- a/ui/org.eclipse.pde.spy.model/src/org/eclipse/pde/spy/model/ModelSpyPart.java
+++ b/ui/org.eclipse.pde.spy.model/src/org/eclipse/pde/spy/model/ModelSpyPart.java
@@ -25,8 +25,8 @@
 @SuppressWarnings("restriction")
 public class ModelSpyPart {
 
-	private ApplicationModelEditor instance;
-	private IEclipseContext childContext;
+	private final ApplicationModelEditor instance;
+	private final IEclipseContext childContext;
 
 	@Inject
 	public ModelSpyPart(IEclipseContext context, MApplication application) {
diff --git a/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/addon/PreferenceSpyAddon.java b/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/addon/PreferenceSpyAddon.java
index f270f25269..6cdf0d63b1 100644
--- a/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/addon/PreferenceSpyAddon.java
+++ b/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/addon/PreferenceSpyAddon.java
@@ -50,12 +50,12 @@ public class PreferenceSpyAddon {
 	@Inject
 	private IEventBroker eventBroker;
 
-	private IEclipsePreferences bundleDefaultsScopePreferences = BundleDefaultsScope.INSTANCE.getNode("");
-	private IEclipsePreferences configurationScopePreferences = ConfigurationScope.INSTANCE.getNode("");
-	private IEclipsePreferences defaultScopePreferences = DefaultScope.INSTANCE.getNode("");
-	private IEclipsePreferences instanceScopePreferences = InstanceScope.INSTANCE.getNode("");
+	private final IEclipsePreferences bundleDefaultsScopePreferences = BundleDefaultsScope.INSTANCE.getNode("");
+	private final IEclipsePreferences configurationScopePreferences = ConfigurationScope.INSTANCE.getNode("");
+	private final IEclipsePreferences defaultScopePreferences = DefaultScope.INSTANCE.getNode("");
+	private final IEclipsePreferences instanceScopePreferences = InstanceScope.INSTANCE.getNode("");
 
-	private ChangedPreferenceListener preferenceChangedListener = new ChangedPreferenceListener();
+	private final ChangedPreferenceListener preferenceChangedListener = new ChangedPreferenceListener();
 
 	@Inject
 	@Optional
diff --git a/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/handler/ShowAllPreferencesHandler.java b/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/handler/ShowAllPreferencesHandler.java
index a0380c4359..b534318e86 100644
--- a/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/handler/ShowAllPreferencesHandler.java
+++ b/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/handler/ShowAllPreferencesHandler.java
@@ -54,7 +54,7 @@ public void execute(Shell shell, IEventBroker eventBroker) {
 
 	private class PrefereneGatherer implements IPreferenceNodeVisitor {
 
-		private Map<String, PreferenceNodeEntry> preferenceEntries;
+		private final Map<String, PreferenceNodeEntry> preferenceEntries;
 
 		public PrefereneGatherer(Map<String, PreferenceNodeEntry> preferenceEntries) {
 			this.preferenceEntries = preferenceEntries;
diff --git a/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/model/AbstractModelObject.java b/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/model/AbstractModelObject.java
index f598dd40f6..4ec24e6945 100644
--- a/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/model/AbstractModelObject.java
+++ b/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/model/AbstractModelObject.java
@@ -17,7 +17,7 @@
 import java.beans.PropertyChangeSupport;
 
 public abstract class AbstractModelObject {
-	private PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
+	private final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
 
 	public void addPropertyChangeListener(PropertyChangeListener listener) {
 		propertyChangeSupport.addPropertyChangeListener(listener);
diff --git a/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/model/PreferenceEntryManager.java b/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/model/PreferenceEntryManager.java
index 34953fa872..c8cfe9c6f9 100644
--- a/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/model/PreferenceEntryManager.java
+++ b/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/model/PreferenceEntryManager.java
@@ -18,7 +18,7 @@
 
 public class PreferenceEntryManager extends PreferenceNodeEntry {
 
-	private Map<String, PreferenceNodeEntry> recentPreferenceEntries = new HashMap<>();
+	private final Map<String, PreferenceNodeEntry> recentPreferenceEntries = new HashMap<>();
 
 	public PreferenceEntryManager() {
 	}
diff --git a/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/viewer/PreferenceMapLabelProvider.java b/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/viewer/PreferenceMapLabelProvider.java
index 9af62172ad..ebbb891aec 100644
--- a/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/viewer/PreferenceMapLabelProvider.java
+++ b/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/viewer/PreferenceMapLabelProvider.java
@@ -27,7 +27,7 @@
 public class PreferenceMapLabelProvider extends ObservableMapLabelProvider implements IFontProvider {
 
 	private LocalResourceManager resourceManager;
-	private FontDescriptor fontDescriptor;
+	private final FontDescriptor fontDescriptor;
 
 
 	public PreferenceMapLabelProvider(FontDescriptor fontDescriptor, IObservableMap<Object,Object>[] attributeMaps) {
diff --git a/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/viewer/PreferenceSpyEditingSupport.java b/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/viewer/PreferenceSpyEditingSupport.java
index 5dba4e45c1..170403b4ce 100644
--- a/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/viewer/PreferenceSpyEditingSupport.java
+++ b/ui/org.eclipse.pde.spy.preferences/src/org/eclipse/pde/spy/preferences/viewer/PreferenceSpyEditingSupport.java
@@ -24,7 +24,7 @@
 
 public class PreferenceSpyEditingSupport extends EditingSupport {
 
-	private Fields field;
+	private final Fields field;
 
 	public PreferenceSpyEditingSupport(ColumnViewer viewer, Fields field) {
 		super(viewer);
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateSection.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateSection.java
index 91836d7037..d2d77be617 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateSection.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateSection.java
@@ -39,7 +39,7 @@ public abstract class PDETemplateSection extends OptionTemplateSection {
 	public static final String VALUE_PERSPECTIVE_NAME = "RCP Perspective"; //$NON-NLS-1$
 	public static final String VALUE_APPLICATION_ID = "application"; //$NON-NLS-1$
 
-	private Bundle bundle = FrameworkUtil.getBundle(PDETemplateSection.class);
+	private final Bundle bundle = FrameworkUtil.getBundle(PDETemplateSection.class);
 
 	@Override
 	protected ResourceBundle getPluginResourceBundle() {
diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/src/org/eclipse/ui/tests/smartimport/plugins/ImportedProject.java b/ui/org.eclipse.pde.ui.tests.smartimport/src/org/eclipse/ui/tests/smartimport/plugins/ImportedProject.java
index 6df9fd672f..9d49cd5e5f 100644
--- a/ui/org.eclipse.pde.ui.tests.smartimport/src/org/eclipse/ui/tests/smartimport/plugins/ImportedProject.java
+++ b/ui/org.eclipse.pde.ui.tests.smartimport/src/org/eclipse/ui/tests/smartimport/plugins/ImportedProject.java
@@ -22,9 +22,9 @@
  */
 public class ImportedProject {
 
-	private String projectName;
-	private List<String> importedAs;
-	private String relativePath;
+	private final String projectName;
+	private final List<String> importedAs;
+	private final String relativePath;
 
 	public ImportedProject(String projectName, String relativePath) {
 		this.projectName = projectName;
diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/src/org/eclipse/ui/tests/smartimport/plugins/ProjectProposal.java b/ui/org.eclipse.pde.ui.tests.smartimport/src/org/eclipse/ui/tests/smartimport/plugins/ProjectProposal.java
index 3e39919dd3..ea1ea6c4a9 100644
--- a/ui/org.eclipse.pde.ui.tests.smartimport/src/org/eclipse/ui/tests/smartimport/plugins/ProjectProposal.java
+++ b/ui/org.eclipse.pde.ui.tests.smartimport/src/org/eclipse/ui/tests/smartimport/plugins/ProjectProposal.java
@@ -20,7 +20,7 @@
 public class ProjectProposal {
 
 	private String folder;
-	private List<String> importAsList;
+	private final List<String> importAsList;
 
 	public ProjectProposal(String folder) {
 		this.folder = folder;
diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/project/ClasspathContainerInitializer.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/project/ClasspathContainerInitializer.java
index 94fc9723f6..be15bce3e0 100644
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/project/ClasspathContainerInitializer.java
+++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/project/ClasspathContainerInitializer.java
@@ -37,7 +37,7 @@ public void initialize(IPath containerPath, IJavaProject project) throws CoreExc
 
 	static class ClasspathContainer implements IClasspathContainer {
 
-		private IPath fPath;
+		private final IPath fPath;
 
 		/**
 		 * Constructs a new container for the given path.
diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/PDEPerfTesterUtil.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/PDEPerfTesterUtil.java
index 0c5609540f..f38a624be3 100755
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/PDEPerfTesterUtil.java
+++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/PDEPerfTesterUtil.java
@@ -19,7 +19,7 @@
 
 public class PDEPerfTesterUtil {
 
-	private String fTag;
+	private final String fTag;
 
 	private long fDuration;
 
diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/ProjectUtils.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/ProjectUtils.java
index 44265b09ab..dd06a8b1c2 100644
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/ProjectUtils.java
+++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/ProjectUtils.java
@@ -72,7 +72,7 @@ public class ProjectUtils {
 	 * Used to create projects
 	 */
 	static class TestProjectProvider implements IProjectProvider {
-		private String fProjectName;
+		private final String fProjectName;
 
 		TestProjectProvider(String projectName) {
 			fProjectName = projectName;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/annotations/OSGiAnnotationsASTVisitor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/annotations/OSGiAnnotationsASTVisitor.java
index d30ce61ba4..4d3bdc9922 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/annotations/OSGiAnnotationsASTVisitor.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/annotations/OSGiAnnotationsASTVisitor.java
@@ -38,7 +38,7 @@
 
 public class OSGiAnnotationsASTVisitor extends ASTVisitor {
 
-	private CompilationUnit unit;
+	private final CompilationUnit unit;
 
 	public OSGiAnnotationsASTVisitor(CompilationUnit compilationUnit) {
 		this.unit = compilationUnit;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java
index 6e5e41e58e..9d27301cab 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java
@@ -58,8 +58,8 @@
  */
 public class RuntimeInstallJob extends Job {
 
-	private FeatureExportInfo fInfo;
-	private ProvisioningUI ui;
+	private final FeatureExportInfo fInfo;
+	private final ProvisioningUI ui;
 
 	/**
 	 * Creates a new job that will install exported plug-ins.  For a
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandComposerDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandComposerDialog.java
index e5d8b8ad9c..c79e9e3554 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandComposerDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandComposerDialog.java
@@ -32,7 +32,7 @@
 
 public class CommandComposerDialog extends FormDialog {
 
-	private CommandComposerPart fCCP;
+	private final CommandComposerPart fCCP;
 	private ParameterizedCommand fPC;
 	private Button fOKButton;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandDetails.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandDetails.java
index 2a94d141b3..491a2d3398 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandDetails.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandDetails.java
@@ -71,8 +71,8 @@ public class CommandDetails {
 	private final ArrayList<ValuesParameterControl> fValueParamList = new ArrayList<>();
 	private final ArrayList<TextParameterControl> fTextParamList = new ArrayList<>();
 
-	private CommandComposerPart fCCP;
-	private FormToolkit fToolkit;
+	private final CommandComposerPart fCCP;
+	private final FormToolkit fToolkit;
 	private Command fSelectedCommand;
 	private ParameterizedCommand fPreSel;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandList.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandList.java
index 2ca1312b56..6de456c352 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandList.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandList.java
@@ -61,7 +61,7 @@
 public class CommandList {
 
 	protected class CommandTreeLabelProvider extends LabelProvider {
-		private HashMap<Object, Image> fImgMap = new HashMap<>();
+		private final HashMap<Object, Image> fImgMap = new HashMap<>();
 		private Image fDefaultImage;
 
 		@Override
@@ -169,12 +169,12 @@ public CollapseAction() {
 
 	}
 
-	private CommandComposerPart fCCP;
-	private FormToolkit fToolkit;
+	private final CommandComposerPart fCCP;
+	private final FormToolkit fToolkit;
 	private Text fFilterText;
 	private TreeViewer fTreeViewer;
 	private CommandTreeContentProvider fContentProvider;
-	private ICommandImageService fComImgServ;
+	private final ICommandImageService fComImgServ;
 
 	public CommandList(CommandComposerPart cv, Composite parent) {
 		fCCP = cv;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandTreeContentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandTreeContentProvider.java
index 5f843cb1f0..582ce32c51 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandTreeContentProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandTreeContentProvider.java
@@ -28,7 +28,7 @@ public class CommandTreeContentProvider implements ITreeContentProvider {
 	protected static final int F_CAT_CONTENT = 0; // category grouped content
 	protected static final int F_CON_CONTENT = 1; // context grouped content
 
-	private ICommandService fComServ;
+	private final ICommandService fComServ;
 	private TreeMap<Category, ArrayList<Command>> fCatMap; // mapping of commands to category
 	private Viewer fViewer;
 	private int fCurContent = F_CAT_CONTENT;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/TagManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/TagManager.java
index 050ab1939d..b9f5fb3849 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/TagManager.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/TagManager.java
@@ -23,8 +23,8 @@
 
 public class TagManager {
 
-	private Hashtable<Command, String> fCommandToTags = new Hashtable<>();
-	private ListenerList<Listener> fListeners = new ListenerList<>();
+	private final Hashtable<Command, String> fCommandToTags = new Hashtable<>();
+	private final ListenerList<Listener> fListeners = new ListenerList<>();
 
 	public void update(Command command, String tags) {
 		if ((tags == null) || ("".equals(tags))) { //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/ManifestContentMergeViewer.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/ManifestContentMergeViewer.java
index 60d3cd6f35..58aef255db 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/ManifestContentMergeViewer.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/ManifestContentMergeViewer.java
@@ -37,7 +37,7 @@
 public class ManifestContentMergeViewer extends TextMergeViewer {
 
 	private IColorManager fColorManager;
-	private Set<ManifestConfiguration> manifestConfigurations;
+	private final Set<ManifestConfiguration> manifestConfigurations;
 
 	public ManifestContentMergeViewer(Composite parent, CompareConfiguration configuration) {
 		super(parent, SWT.LEFT_TO_RIGHT, configuration);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AddAutomaticModuleResolution.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AddAutomaticModuleResolution.java
index 3ac648c4eb..de9116cef1 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AddAutomaticModuleResolution.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AddAutomaticModuleResolution.java
@@ -27,7 +27,7 @@
 import org.osgi.framework.Constants;
 
 public class AddAutomaticModuleResolution extends AbstractManifestMarkerResolution {
-	private IMarker mark;
+	private final IMarker mark;
 
 	public AddAutomaticModuleResolution(int type, IMarker marker) {
 		super(type, marker);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AddSingletonToSymbolicName.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AddSingletonToSymbolicName.java
index 2b9242d513..d606c2f178 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AddSingletonToSymbolicName.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AddSingletonToSymbolicName.java
@@ -25,7 +25,7 @@
 
 public class AddSingletonToSymbolicName extends AbstractManifestMarkerResolution {
 
-	private boolean fisDirective;
+	private final boolean fisDirective;
 
 	public AddSingletonToSymbolicName(int type, boolean directive, IMarker marker) {
 		super(type, marker);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ChooseManifestClassResolution.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ChooseManifestClassResolution.java
index 937e34a25c..9682913759 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ChooseManifestClassResolution.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ChooseManifestClassResolution.java
@@ -23,7 +23,7 @@
 
 public class ChooseManifestClassResolution extends AbstractManifestMarkerResolution {
 
-	private String fHeader;
+	private final String fHeader;
 
 	public ChooseManifestClassResolution(int type, String headerName, IMarker marker) {
 		super(type, marker);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/CreateManifestClassResolution.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/CreateManifestClassResolution.java
index 6789edb667..f41ce47952 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/CreateManifestClassResolution.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/CreateManifestClassResolution.java
@@ -27,7 +27,7 @@
 
 public class CreateManifestClassResolution extends AbstractManifestMarkerResolution {
 
-	private String fHeader;
+	private final String fHeader;
 
 	public CreateManifestClassResolution(int type, String headerName, IMarker marker) {
 		super(type, marker);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/JavaResolutionFactory.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/JavaResolutionFactory.java
index 97f526ca5c..7ab7a9c0c0 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/JavaResolutionFactory.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/JavaResolutionFactory.java
@@ -81,8 +81,8 @@ public class JavaResolutionFactory {
 	 */
 	private static abstract class AbstractManifestChange extends Change {
 
-		private Object fChangeObject;
-		private IProject fProject;
+		private final Object fChangeObject;
+		private final IProject fProject;
 		private CompilationUnit fCompilationUnit;
 		private String fQualifiedTypeToImport;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/QuickFixProcessor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/QuickFixProcessor.java
index e504bee9db..72c2e349ab 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/QuickFixProcessor.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/QuickFixProcessor.java
@@ -258,7 +258,7 @@ private AbstractClassResolutionCollector createCollector(final Collection<Object
 		return new AbstractClassResolutionCollector() {
 
 			// the list of package names for which an import package resolution has been created
-			private Set<String> addedImportPackageResolutions = new HashSet<>();
+			private final Set<String> addedImportPackageResolutions = new HashSet<>();
 
 			boolean isDone = false;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/SearchRepositoriesForIUProposal.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/SearchRepositoriesForIUProposal.java
index 42c3daa4d8..f98d1760ee 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/SearchRepositoriesForIUProposal.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/SearchRepositoriesForIUProposal.java
@@ -37,7 +37,7 @@
 
 public class SearchRepositoriesForIUProposal implements IJavaCompletionProposal {
 
-	private String fPackageName;
+	private final String fPackageName;
 
 	public SearchRepositoriesForIUProposal(String packageName) {
 		fPackageName = packageName;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/UnresolvedImportFixProcessor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/UnresolvedImportFixProcessor.java
index 923b306bd3..66eb5a893c 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/UnresolvedImportFixProcessor.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/UnresolvedImportFixProcessor.java
@@ -36,7 +36,7 @@ public class UnresolvedImportFixProcessor extends ClasspathFixProcessor {
 
 	private static class ClasspathFixCollector extends AbstractClassResolutionCollector {
 
-		private ArrayList<Object> fList = new ArrayList<>();
+		private final ArrayList<Object> fList = new ArrayList<>();
 
 		@Override
 		public void addResolutionModification(IProject project, ExportPackageDescription desc) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/FeatureSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/FeatureSelectionDialog.java
index dd027100c7..39683af5f6 100755
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/FeatureSelectionDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/FeatureSelectionDialog.java
@@ -43,7 +43,7 @@
 public class FeatureSelectionDialog extends FilteredItemsSelectionDialog {
 
 	private static final String DIALOG_SETTINGS = "org.eclipse.pde.ui.dialogs.FeatureSelectionDialog"; //$NON-NLS-1$
-	private IFeatureModel[] fModels;
+	private final IFeatureModel[] fModels;
 	private FeatureSearchItemsFilter filter;
 
 	private final class FeatureDetailsLabelProvider extends LabelProvider {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/PluginSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/PluginSelectionDialog.java
index 5a38799e44..34f27522e6 100755
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/PluginSelectionDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/PluginSelectionDialog.java
@@ -53,7 +53,7 @@
 public class PluginSelectionDialog extends FilteredItemsSelectionDialog {
 
 	private static final String DIALOG_SETTINGS = "org.eclipse.pde.ui.dialogs.PluginSelectionDialog"; //$NON-NLS-1$
-	private IPluginModelBase[] fModels;
+	private final IPluginModelBase[] fModels;
 	String originalPattern;
 
 	private class PluginSearchItemsFilter extends ItemsFilter {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/RepositoryDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/RepositoryDialog.java
index aec11af68f..955adef1fd 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/RepositoryDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/RepositoryDialog.java
@@ -44,7 +44,7 @@
  */
 public class RepositoryDialog extends StatusDialog {
 	private Text fLocation;
-	private String fRepoURL;
+	private final String fRepoURL;
 	private String fLocationStr;
 
 	/**
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/AbstractFoldingStructureProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/AbstractFoldingStructureProvider.java
index 133e26fe3c..8e4e886928 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/AbstractFoldingStructureProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/AbstractFoldingStructureProvider.java
@@ -34,8 +34,8 @@
 
 public abstract class AbstractFoldingStructureProvider implements IFoldingStructureProvider, IModelChangedListener {
 
-	private PDESourcePage fEditor;
-	private IEditingModel fModel;
+	private final PDESourcePage fEditor;
+	private final IEditingModel fModel;
 
 	public AbstractFoldingStructureProvider(PDESourcePage editor, IEditingModel model) {
 		this.fEditor = editor;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormEntryAdapter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormEntryAdapter.java
index b92392ea21..7a29a1f5c2 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormEntryAdapter.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormEntryAdapter.java
@@ -22,7 +22,7 @@
 import org.eclipse.ui.forms.events.HyperlinkEvent;
 
 public class FormEntryAdapter implements IFormEntryListener {
-	private IContextPart contextPart;
+	private final IContextPart contextPart;
 	protected IActionBars actionBars;
 
 	public FormEntryAdapter(IContextPart contextPart) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormOutlinePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormOutlinePage.java
index bb892d2731..27b4c2b7a0 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormOutlinePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormOutlinePage.java
@@ -70,7 +70,7 @@ public Object getParent(Object obj) {
 	}
 
 	public static class BasicLabelProvider extends LabelProvider {
-		private ILabelProvider fWrappedLabelProvider;
+		private final ILabelProvider fWrappedLabelProvider;
 
 		public BasicLabelProvider(ILabelProvider ilp) {
 			fWrappedLabelProvider = ilp;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/JarEntryEditorInput.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/JarEntryEditorInput.java
index ffb0915969..ed93844304 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/JarEntryEditorInput.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/JarEntryEditorInput.java
@@ -27,7 +27,7 @@
  */
 public class JarEntryEditorInput implements IStorageEditorInput {
 
-	private IStorage fJarEntryFile;
+	private final IStorage fJarEntryFile;
 
 	public JarEntryEditorInput(IStorage jarEntryFile) {
 		fJarEntryFile = jarEntryFile;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/JarEntryFile.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/JarEntryFile.java
index d13e078604..b08b65eb9a 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/JarEntryFile.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/JarEntryFile.java
@@ -26,8 +26,8 @@
 
 public class JarEntryFile extends PlatformObject implements IStorage {
 
-	private ZipFile fZipFile;
-	private String fEntryName;
+	private final ZipFile fZipFile;
+	private final String fEntryName;
 
 	public JarEntryFile(ZipFile zipFile, String entryName) {
 		fZipFile = zipFile;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/LinkSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/LinkSection.java
index a8cd940e3a..006a5adbde 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/LinkSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/LinkSection.java
@@ -48,7 +48,7 @@ public class LinkSection extends PDESection {
 	private Button moreButton;
 	private String morePageId;
 	private int linkNumberLimit = 20;
-	private LinkHandler linkHandler;
+	private final LinkHandler linkHandler;
 
 	class LinkHandler implements IHyperlinkListener {
 		@Override
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ModelUndoManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ModelUndoManager.java
index 8bd90fcd51..d503a468d3 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ModelUndoManager.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ModelUndoManager.java
@@ -31,7 +31,7 @@ public abstract class ModelUndoManager implements IModelUndoManager, IModelChang
 	private int cursor = -1;
 	private IAction undoAction;
 	private IAction redoAction;
-	private PDEFormEditor editor;
+	private final PDEFormEditor editor;
 
 	public ModelUndoManager(PDEFormEditor editor) {
 		this.editor = editor;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEDragAdapter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEDragAdapter.java
index 71a2e601d6..7ff58da6ce 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEDragAdapter.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEDragAdapter.java
@@ -32,7 +32,7 @@
 
 public class PDEDragAdapter implements DragSourceListener, IPDESourceParticipant {
 
-	private IPDEDragParticipant fParticipant;
+	private final IPDEDragParticipant fParticipant;
 
 	// Needs to be static to allow dragging objects from one viewer to another
 	private static Object[] fSourceObjects;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEDropAdapter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEDropAdapter.java
index 095a8bacdf..6736a4b834 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEDropAdapter.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEDropAdapter.java
@@ -21,9 +21,9 @@
 
 public class PDEDropAdapter extends ViewerDropAdapter {
 
-	private IPDEDropParticipant fDropParticipant;
+	private final IPDEDropParticipant fDropParticipant;
 
-	private IPDESourceParticipant fSourceParticipant;
+	private final IPDESourceParticipant fSourceParticipant;
 
 	private int fLastValidOperation;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormEditorContributor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormEditorContributor.java
index c8689866bc..54660eb83e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormEditorContributor.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormEditorContributor.java
@@ -56,12 +56,12 @@ public class PDEFormEditorContributor extends MultiPageEditorActionBarContributo
 
 	private SelectAllAction fSelectAllAction;
 
-	private Hashtable<String, Action> fGlobalActions = new Hashtable<>();
+	private final Hashtable<String, Action> fGlobalActions = new Hashtable<>();
 
 	private ISharedImages fSharedImages;
 
 	class GlobalAction extends Action implements IUpdate {
-		private String id;
+		private final String id;
 
 		public GlobalAction(String id) {
 			this.id = id;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormTextEditorContributor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormTextEditorContributor.java
index 37a608cc56..c1607f0d66 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormTextEditorContributor.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormTextEditorContributor.java
@@ -45,7 +45,7 @@ public class PDEFormTextEditorContributor extends PDEFormEditorContributor {
 	private FormatAction fFormatAction;
 	private RetargetTextEditorAction fContentAssist;
 
-	private TextEditorActionContributor fSourceContributor;
+	private final TextEditorActionContributor fSourceContributor;
 	private SubActionBars fSourceActionBars;
 
 	class PDETextEditorActionContributor extends TextEditorActionContributor {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEHyperlinkDetector.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEHyperlinkDetector.java
index e4006265f2..a8a4bb7959 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEHyperlinkDetector.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEHyperlinkDetector.java
@@ -26,7 +26,7 @@
 
 public abstract class PDEHyperlinkDetector implements IHyperlinkDetector {
 
-	private PDESourcePage fSourcePage;
+	private final PDESourcePage fSourcePage;
 
 	public PDEHyperlinkDetector(PDESourcePage page) {
 		fSourcePage = page;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDELauncherFormEditor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDELauncherFormEditor.java
index 65218c79cb..76eae3101e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDELauncherFormEditor.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDELauncherFormEditor.java
@@ -190,7 +190,7 @@ else if (mode.equals(ILaunchManager.PROFILE_MODE))
 	 * Represents an action that will launch a PDE launch shortcut extension
 	 */
 	public static abstract class LauncherAction extends Action {
-		private IConfigurationElement configElement;
+		private final IConfigurationElement configElement;
 
 		public LauncherAction(IConfigurationElement configurationElement) {
 			super();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMasterDetailsBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMasterDetailsBlock.java
index 2f5de3669a..e0a6ab63a3 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMasterDetailsBlock.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMasterDetailsBlock.java
@@ -21,7 +21,7 @@
 import org.eclipse.ui.forms.widgets.Section;
 
 public abstract class PDEMasterDetailsBlock extends MasterDetailsBlock {
-	private PDEFormPage fPage;
+	private final PDEFormPage fPage;
 	private PDESection fSection;
 
 	public PDEMasterDetailsBlock(PDEFormPage page) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEProjectionSourcePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEProjectionSourcePage.java
index 5c752bd787..eb177f74cc 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEProjectionSourcePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEProjectionSourcePage.java
@@ -40,8 +40,8 @@ public abstract class PDEProjectionSourcePage extends PDESourcePage implements I
 
 	private ProjectionSupport fProjectionSupport;
 	private IFoldingStructureProvider fFoldingStructureProvider;
-	private IColorManager fColorManager;
-	private ChangeAwareSourceViewerConfiguration fConfiguration;
+	private final IColorManager fColorManager;
+	private final ChangeAwareSourceViewerConfiguration fConfiguration;
 
 	public PDEProjectionSourcePage(PDEFormEditor editor, String id, String title) {
 		super(editor, id, title);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEProjectionViewer.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEProjectionViewer.java
index e45ad8972d..816622166d 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEProjectionViewer.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEProjectionViewer.java
@@ -35,7 +35,7 @@ public class PDEProjectionViewer extends ProjectionViewer {
 
 	private IInformationPresenter fOutlinePresenter;
 
-	private boolean fIsQuickOutlineEnabled;
+	private final boolean fIsQuickOutlineEnabled;
 
 	/**
 	 * @param parent
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESection.java
index 866146841b..3840e8ec0f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESection.java
@@ -28,7 +28,7 @@
 
 public abstract class PDESection extends SectionPart implements IContextPart, IAdaptable {
 
-	private PDEFormPage fPage;
+	private final PDEFormPage fPage;
 
 	public PDESection(PDEFormPage page, Composite parent, int style) {
 		this(page, parent, style, true);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESourcePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESourcePage.java
index 28ea8080cf..2e10209f46 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESourcePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESourcePage.java
@@ -144,7 +144,7 @@ public void uninstall(ISelectionProvider selectionProvider) {
 	private PDEFormEditor fEditor;
 	private Control fControl;
 	private int fIndex;
-	private String fId;
+	private final String fId;
 	private InputContext fInputContext;
 	private ISortableContentOutlinePage fOutlinePage;
 	private ISelectionChangedListener fOutlineSelectionChangedListener;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEStorageDocumentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEStorageDocumentProvider.java
index dc13bca4cc..f2c249d6b7 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEStorageDocumentProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEStorageDocumentProvider.java
@@ -33,7 +33,7 @@
 
 public class PDEStorageDocumentProvider extends StorageDocumentProvider {
 
-	private IDocumentSetupParticipant fSetupParticipant;
+	private final IDocumentSetupParticipant fSetupParticipant;
 
 	public PDEStorageDocumentProvider(IDocumentSetupParticipant participant) {
 		fSetupParticipant = participant;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SourceOutlinePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SourceOutlinePage.java
index b7aa087e7b..80b8f073ae 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SourceOutlinePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SourceOutlinePage.java
@@ -33,11 +33,11 @@
  */
 public class SourceOutlinePage extends PDEOutlinePage implements IReconcilingParticipant, ISortableContentOutlinePage {
 
-	private IEditingModel fModel;
-	private IBaseLabelProvider fLabelProvider;
-	private IContentProvider fContentProvider;
-	private ViewerComparator fDefaultComparator;
-	private ViewerComparator fViewerComparator;
+	private final IEditingModel fModel;
+	private final IBaseLabelProvider fLabelProvider;
+	private final IContentProvider fContentProvider;
+	private final ViewerComparator fDefaultComparator;
+	private final ViewerComparator fViewerComparator;
 	private boolean sorted;
 	TreeViewer viewer;
 
@@ -46,7 +46,7 @@ public class SourceOutlinePage extends PDEOutlinePage implements IReconcilingPar
 	 * org.eclipse.ui.views.contentoutline.ContentOutlinePage.selectionChangedListeners
 	 * from our parent
 	 */
-	private ArrayList<ISelectionChangedListener> fListenerList;
+	private final ArrayList<ISelectionChangedListener> fListenerList;
 
 	public SourceOutlinePage(PDEFormEditor editor, IEditingModel model, IBaseLabelProvider lProvider, IContentProvider cProvider, ViewerComparator defaultComparator, ViewerComparator comparator) {
 		super(editor);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/CollapseAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/CollapseAction.java
index 2332e88517..6d52e2a259 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/CollapseAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/CollapseAction.java
@@ -22,9 +22,9 @@ public class CollapseAction extends Action {
 
 	private AbstractTreeViewer fTreeViewer;
 
-	private Object fTreeObject;
+	private final Object fTreeObject;
 
-	private int fExpandToLevel;
+	private final int fExpandToLevel;
 
 	/**
 	 * @param viewer
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/FormatOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/FormatOperation.java
index 76e456a19b..72a57eb5d1 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/FormatOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/FormatOperation.java
@@ -37,7 +37,7 @@
 
 public class FormatOperation implements IRunnableWithProgress {
 
-	private Object[] fObjects;
+	private final Object[] fObjects;
 
 	public FormatOperation(Object[] objects) {
 		fObjects = objects;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/SortAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/SortAction.java
index df2bea95f0..8afbb8b588 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/SortAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/SortAction.java
@@ -24,11 +24,11 @@ public class SortAction extends Action {
 
 	private boolean fSorted;
 
-	private StructuredViewer fViewer;
+	private final StructuredViewer fViewer;
 
 	private ViewerComparator fComparator;
 
-	private ViewerComparator fDefaultComparator;
+	private final ViewerComparator fDefaultComparator;
 
 	public SortAction(StructuredViewer viewer, String tooltipText, ViewerComparator sorter, ViewerComparator defaultSorter, IPropertyChangeListener listener) {
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/bnd/BndModel.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/bnd/BndModel.java
index a4d99774b0..ecb545a57c 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/bnd/BndModel.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/bnd/BndModel.java
@@ -30,7 +30,7 @@
  */
 public class BndModel extends BndEditModel implements IBaseModel, IModelChangeProvider {
 
-	private BndDocument bndDocument;
+	private final BndDocument bndDocument;
 	private volatile boolean valid;
 	private volatile boolean disposed;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildClasspathSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildClasspathSection.java
index 4fea03eeed..5841443756 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildClasspathSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildClasspathSection.java
@@ -78,8 +78,8 @@ public class BuildClasspathSection extends TableSection {
 	 */
 	static class ElementSelectionValidator implements ISelectionStatusValidator {
 
-		private Class<?>[] fAcceptedTypes;
-		private boolean fAllowMultipleSelection;
+		private final Class<?>[] fAcceptedTypes;
+		private final boolean fAllowMultipleSelection;
 
 		/**
 		 * @param acceptedTypes The types accepted by the validator
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildHyperlinkDetector.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildHyperlinkDetector.java
index 3e40a6f6d6..1e9e813f70 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildHyperlinkDetector.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildHyperlinkDetector.java
@@ -30,7 +30,7 @@
 
 public class BuildHyperlinkDetector implements IHyperlinkDetector {
 
-	private PDESourcePage fSourcePage;
+	private final PDESourcePage fSourcePage;
 
 	public BuildHyperlinkDetector(PDESourcePage page) {
 		fSourcePage = page;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildInputContext.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildInputContext.java
index 081390015d..af4bcd6b41 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildInputContext.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildInputContext.java
@@ -42,7 +42,7 @@
 public class BuildInputContext extends InputContext {
 	public static final String CONTEXT_ID = "build-context"; //$NON-NLS-1$
 
-	private HashMap<IDocumentKey, TextEdit> fOperationTable = new HashMap<>();
+	private final HashMap<IDocumentKey, TextEdit> fOperationTable = new HashMap<>();
 
 	public BuildInputContext(PDEFormEditor editor, IEditorInput input, boolean primary) {
 		super(editor, input, primary);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildSourceViewerConfiguration.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildSourceViewerConfiguration.java
index 2073d7d317..bd4538b21a 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildSourceViewerConfiguration.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildSourceViewerConfiguration.java
@@ -94,7 +94,7 @@ protected TextAttribute createTextAttribute(String property) {
 
 	private class SingleTokenJavaScanner extends AbstractJavaScanner {
 
-		private String fProperty;
+		private final String fProperty;
 
 		public SingleTokenJavaScanner(String property) {
 			fProperty = property;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/JARFileFilter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/JARFileFilter.java
index 24a07447ab..a9a46cb163 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/JARFileFilter.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/JARFileFilter.java
@@ -28,7 +28,7 @@
 
 public class JARFileFilter extends ViewerFilter {
 	private final static String jarExt = "jar"; //$NON-NLS-1$
-	private Set<IPath> fPaths;
+	private final Set<IPath> fPaths;
 
 	public JARFileFilter() {
 		fPaths = new HashSet<>();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/CategoryInputContext.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/CategoryInputContext.java
index 9299df486f..f5508ae280 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/CategoryInputContext.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/CategoryInputContext.java
@@ -48,7 +48,7 @@
 
 public class CategoryInputContext extends XMLInputContext {
 	public static final String CONTEXT_ID = "category-context"; //$NON-NLS-1$
-	private boolean storageModel = false;
+	private final boolean storageModel = false;
 
 	/**
 	 * @param editor
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/CategoryLabelProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/CategoryLabelProvider.java
index b058afb21b..c68b13f057 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/CategoryLabelProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/CategoryLabelProvider.java
@@ -31,12 +31,12 @@
 
 class CategoryLabelProvider extends LabelProvider {
 
-	private PDELabelProvider fSharedProvider;
+	private final PDELabelProvider fSharedProvider;
 
 	private Image fSiteFeatureImage;
 	private Image fMissingSiteFeatureImage;
-	private Image fSiteBundleImage;
-	private Image fMissingSiteBundleImage;
+	private final Image fSiteBundleImage;
+	private final Image fMissingSiteBundleImage;
 	private Image fPageImage;
 	private Image fCatDefImage;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/IUsPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/IUsPage.java
index 474d861df8..ae1cb4d3bf 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/IUsPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/IUsPage.java
@@ -40,7 +40,7 @@
 public class IUsPage extends PDEFormPage {
 	public static final String PAGE_ID = "ius"; //$NON-NLS-1$
 	private CategorySection fCategorySection;
-	private SiteFeaturesBlock fBlock;
+	private final SiteFeaturesBlock fBlock;
 
 	public class SiteFeaturesBlock extends PDEMasterDetailsBlock {
 		public SiteFeaturesBlock() {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypeCompletionProposal.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypeCompletionProposal.java
index 7d49d59b75..a2d4f2cf11 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypeCompletionProposal.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypeCompletionProposal.java
@@ -33,8 +33,8 @@
 public class TypeCompletionProposal extends AbstractJavaCompletionProposal implements ICompletionProposalExtension4 {
 
 	private static final class PDETypeProposalInfo extends ProposalInfo {
-		private IJavaProject fJavaProject;
-		private String fTypeName;
+		private final IJavaProject fJavaProject;
+		private final String fTypeName;
 
 		/**
 		 * Creates a new proposal info.
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypeContentProposal.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypeContentProposal.java
index 97738d6635..2590d4be8d 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypeContentProposal.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypeContentProposal.java
@@ -19,13 +19,13 @@
 
 public class TypeContentProposal implements IContentProposal {
 
-	private String fLabel;
+	private final String fLabel;
 
-	private String fContent;
+	private final String fContent;
 
-	private String fDescription;
+	private final String fDescription;
 
-	private Image fImage;
+	private final Image fImage;
 
 	public TypeContentProposal(String label, String content, String description, Image image) {
 		fLabel = label;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypeContentProposalProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypeContentProposalProvider.java
index 6d8b89f429..440145c40b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypeContentProposalProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypeContentProposalProvider.java
@@ -29,15 +29,15 @@ public class TypeContentProposalProvider extends TypePackageCompletionProcessor
 
 	public static final char F_DOT = '.';
 
-	private IProject fProject;
+	private final IProject fProject;
 
-	private int fTypeScope;
+	private final int fTypeScope;
 
 	private ArrayList<Object> fInitialContentProposals;
 
 	private String fInitialContent;
 
-	private Comparator<Object> fComparator;
+	private final Comparator<Object> fComparator;
 
 	public TypeContentProposalProvider(IProject project, int scope) {
 		fProject = project;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypeFieldAssistDisposer.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypeFieldAssistDisposer.java
index d1153c27a6..196aa48bde 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypeFieldAssistDisposer.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypeFieldAssistDisposer.java
@@ -25,9 +25,9 @@
  */
 public class TypeFieldAssistDisposer {
 
-	private ContentAssistCommandAdapter fAdapter;
+	private final ContentAssistCommandAdapter fAdapter;
 
-	private TypeContentProposalListener fListener;
+	private final TypeContentProposalListener fListener;
 
 	/**
 	 *
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypePackageCompletionProcessor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypePackageCompletionProcessor.java
index 06729f2483..c293481d84 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypePackageCompletionProcessor.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypePackageCompletionProcessor.java
@@ -49,7 +49,7 @@
 public abstract class TypePackageCompletionProcessor implements IContentAssistProcessor {
 
 	private String fErrorMessage;
-	private SearchEngine fSearchEngine;
+	private final SearchEngine fSearchEngine;
 	private Comparator<Object> fComparator;
 
 	abstract static class ProposalGenerator {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/VirtualSchemaObject.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/VirtualSchemaObject.java
index df4748599c..48f59acb08 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/VirtualSchemaObject.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/VirtualSchemaObject.java
@@ -27,9 +27,9 @@
 
 public class VirtualSchemaObject implements ISchemaObject {
 
-	private String fName;
+	private final String fName;
 
-	private Object fDescription;
+	private final Object fDescription;
 
 	private int fType;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/XMLCompletionProposal.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/XMLCompletionProposal.java
index 5d0b311637..e85c9b987d 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/XMLCompletionProposal.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/XMLCompletionProposal.java
@@ -66,13 +66,13 @@ public class XMLCompletionProposal implements ICompletionProposal, ICompletionPr
 
 	private static final String F_DEF_ATTR_INDENT = "      "; //$NON-NLS-1$
 
-	private ISchemaObject fSchemaObject;
-	private IDocumentRange fRange;
+	private final ISchemaObject fSchemaObject;
+	private final IDocumentRange fRange;
 	private int fOffset;
 	private int fLen;
 	private int fSelOffset;
 	private int fSelLen;
-	private XMLContentAssistProcessor fProcessor;
+	private final XMLContentAssistProcessor fProcessor;
 	private String fAddInfo;
 	private IInformationControlCreator fCreator;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/XMLContentAssistProcessor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/XMLContentAssistProcessor.java
index cbcbe12735..2dabfbf512 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/XMLContentAssistProcessor.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/XMLContentAssistProcessor.java
@@ -108,7 +108,7 @@ public class XMLContentAssistProcessor extends TypePackageCompletionProcessor im
 	private static final String F_STR_EXT_PT = "extension-point"; //$NON-NLS-1$
 	private static final String F_STR_EXT = "extension"; //$NON-NLS-1$
 
-	private PDESourcePage fSourcePage;
+	private final PDESourcePage fSourcePage;
 	private final Image[] fImages = new Image[F_TOTAL_TYPES];
 	// TODO add a listener to add/remove extension points as they are added/removed from working models
 	private IDocumentRange fRange;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/XMLContentAssistText.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/XMLContentAssistText.java
index 2aeec79c98..696831ba9d 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/XMLContentAssistText.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/XMLContentAssistText.java
@@ -24,9 +24,9 @@
  */
 public class XMLContentAssistText {
 
-	private String fText;
+	private final String fText;
 
-	private int fStartOffset;
+	private final int fStartOffset;
 
 	private XMLContentAssistText(String text, int startOffset) {
 		fText = text;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/display/JavaDocCommentReader.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/display/JavaDocCommentReader.java
index 130acf8dcf..a722bd3aed 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/display/JavaDocCommentReader.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/display/JavaDocCommentReader.java
@@ -30,9 +30,9 @@ public class JavaDocCommentReader extends SingleCharReader {
 
 	private int fCurrPos;
 
-	private int fStartPos;
+	private final int fStartPos;
 
-	private int fEndPos;
+	private final int fEndPos;
 
 	private boolean fWasNewLine;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/InputContext.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/InputContext.java
index 1a328ed442..51eaf25606 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/InputContext.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/InputContext.java
@@ -67,7 +67,7 @@
  */
 public abstract class InputContext {
 
-	private PDEFormEditor fEditor;
+	private final PDEFormEditor fEditor;
 	private IEditorInput fEditorInput;
 	private IBaseModel fModel;
 	private IModelChangedListener fModelListener;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/Choice.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/Choice.java
index 0548547865..2e3f2a846e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/Choice.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/Choice.java
@@ -14,8 +14,8 @@
 package org.eclipse.pde.internal.ui.editor.feature;
 
 public class Choice {
-	private String label;
-	private String value;
+	private final String label;
+	private final String value;
 
 	public Choice(String value, String label) {
 		this.value = value;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureOutlinePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureOutlinePage.java
index 3148cbcb04..5e46f4f2e7 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureOutlinePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureOutlinePage.java
@@ -74,7 +74,7 @@ public Object getParent(Object child) {
 		}
 	}
 
-	private NamedElement fDiscoveryUrls;
+	private final NamedElement fDiscoveryUrls;
 
 	public FeatureOutlinePage(PDEFormEditor editor) {
 		super(editor);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InfoFormPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InfoFormPage.java
index 9bcb1ffd87..461e83f1d5 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InfoFormPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InfoFormPage.java
@@ -32,7 +32,7 @@
  */
 public class InfoFormPage extends PDEFormPage {
 	public static final String PAGE_ID = "info"; //$NON-NLS-1$
-	private IColorManager colorManager = ColorManager.getDefault();
+	private final IColorManager colorManager = ColorManager.getDefault();
 	private InfoSection infoSection;
 
 	/**
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InfoSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InfoSection.java
index a696a6245d..c178bf3df5 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InfoSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InfoSection.java
@@ -62,9 +62,9 @@
 import org.eclipse.ui.forms.widgets.Section;
 
 public class InfoSection extends PDESection {
-	private IDocument fDocument;
+	private final IDocument fDocument;
 
-	private XMLConfiguration fSourceConfiguration;
+	private final XMLConfiguration fSourceConfiguration;
 
 	private SourceViewer fSourceViewer;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/LicenseFeatureSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/LicenseFeatureSection.java
index 2139d1ea95..bf16b0d2c5 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/LicenseFeatureSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/LicenseFeatureSection.java
@@ -73,8 +73,8 @@ public class LicenseFeatureSection extends PDESection {
 	private Text fLicenseFeatureVersionText;
 	private Text fUrlText;
 	private SourceViewer fSourceViewer;
-	private SourceViewerConfiguration fSourceConfiguration;
-	private IDocument fDocument;
+	private final SourceViewerConfiguration fSourceConfiguration;
+	private final IDocument fDocument;
 	private boolean fIgnoreChange;
 	private Button fSharedLicenseButton;
 	private Button fLocalLicenseButton;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PortabilityChoicesDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PortabilityChoicesDialog.java
index 2fde11fe33..b8203b549c 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PortabilityChoicesDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PortabilityChoicesDialog.java
@@ -39,9 +39,9 @@
 
 public class PortabilityChoicesDialog extends TrayDialog {
 	private String value;
-	private Choice[] choices;
+	private final Choice[] choices;
 	private CheckboxTableViewer choiceViewer;
-	private WizardCheckboxTablePart checkboxTablePart;
+	private final WizardCheckboxTablePart checkboxTablePart;
 
 	class ContentProvider implements IStructuredContentProvider {
 		@Override
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizard.java
index 03046cfe91..28141a9373 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizard.java
@@ -19,7 +19,7 @@
 import org.eclipse.pde.internal.ui.PDEUIMessages;
 
 public class SynchronizeVersionsWizard extends Wizard {
-	private FeatureEditor featureEditor;
+	private final FeatureEditor featureEditor;
 	private SynchronizeVersionsWizardPage mainPage;
 
 	public SynchronizeVersionsWizard(FeatureEditor featureEditor) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizardPage.java
index 913d45042e..76b4e303b1 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizardPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizardPage.java
@@ -57,11 +57,11 @@ public class SynchronizeVersionsWizardPage extends WizardPage {
 	public static final int USE_PLUGINS_AT_BUILD = 0;
 	public static final int USE_FEATURE = 1;
 	public static final int USE_PLUGINS = 2;
-	private FeatureEditor fFeatureEditor;
+	private final FeatureEditor fFeatureEditor;
 	private Button fUsePluginsAtBuildButton;
 	private Button fUseComponentButton;
 	private Button fUsePluginsButton;
-	private boolean fIsForceVersionEnabled;
+	private final boolean fIsForceVersionEnabled;
 
 	private static final String PREFIX = PDEPlugin.getPluginId() + ".synchronizeVersions."; //$NON-NLS-1$
 	private static final String PROP_SYNCHRO_MODE = PREFIX + "mode"; //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/URLSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/URLSection.java
index 0049c0e0c9..b82a21cc54 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/URLSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/URLSection.java
@@ -62,7 +62,7 @@ public class URLSection extends TableSection {
 
 	private Action fDeleteAction;
 
-	private Image fUrlImage;
+	private final Image fUrlImage;
 
 	static class URLContentProvider implements IStructuredContentProvider {
 		@Override
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/outline/QuickOutlineMouseMoveListener.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/outline/QuickOutlineMouseMoveListener.java
index 05b58f752a..2f09e7514f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/outline/QuickOutlineMouseMoveListener.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/outline/QuickOutlineMouseMoveListener.java
@@ -30,7 +30,7 @@ public class QuickOutlineMouseMoveListener implements MouseMoveListener {
 
 	private TreeItem fLastItem;
 
-	private TreeViewer fTreeViewer;
+	private final TreeViewer fTreeViewer;
 
 	/**
 	 *
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/outline/QuickOutlinePopupDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/outline/QuickOutlinePopupDialog.java
index ef97c66f03..dddc14cc5c 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/outline/QuickOutlinePopupDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/outline/QuickOutlinePopupDialog.java
@@ -56,9 +56,9 @@ public class QuickOutlinePopupDialog extends PopupDialog implements IInformation
 
 	private TreeViewer fTreeViewer;
 
-	private IOutlineContentCreator fOutlineContentCreator;
+	private final IOutlineContentCreator fOutlineContentCreator;
 
-	private IOutlineSelectionHandler fOutlineSelectionHandler;
+	private final IOutlineSelectionHandler fOutlineSelectionHandler;
 
 	private Text fFilterText;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/AbstractPluginElementDetails.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/AbstractPluginElementDetails.java
index 819b5a1a8e..c0279c4e07 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/AbstractPluginElementDetails.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/AbstractPluginElementDetails.java
@@ -24,7 +24,7 @@
 
 public abstract class AbstractPluginElementDetails extends PDEDetails {
 
-	private PDESection fMasterSection;
+	private final PDESection fMasterSection;
 
 	public AbstractPluginElementDetails(PDESection masterSection) {
 		fMasterSection = masterSection;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BlankQuery.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BlankQuery.java
index 01986d6c9c..af89209e65 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BlankQuery.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BlankQuery.java
@@ -24,7 +24,7 @@
 
 public class BlankQuery implements ISearchQuery {
 
-	private PackageObject fObject;
+	private final PackageObject fObject;
 
 	BlankQuery(PackageObject object) {
 		fObject = object;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleFoldingStructureProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleFoldingStructureProvider.java
index 13302e0617..9b77f26a1b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleFoldingStructureProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleFoldingStructureProvider.java
@@ -30,7 +30,7 @@
 
 public class BundleFoldingStructureProvider extends AbstractFoldingStructureProvider {
 
-	private Map<Position, IManifestHeader> fPositionToElement = new HashMap<>();
+	private final Map<Position, IManifestHeader> fPositionToElement = new HashMap<>();
 
 	public BundleFoldingStructureProvider(PDESourcePage editor, IEditingModel model) {
 		super(editor, model);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleHyperlinkDetector.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleHyperlinkDetector.java
index c27140d9ef..f0f70dad8b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleHyperlinkDetector.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleHyperlinkDetector.java
@@ -35,7 +35,7 @@
 
 public class BundleHyperlinkDetector implements IHyperlinkDetector {
 
-	private PDESourcePage fSourcePage;
+	private final PDESourcePage fSourcePage;
 
 	public BundleHyperlinkDetector(PDESourcePage page) {
 		fSourcePage = page;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleInputContext.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleInputContext.java
index 8703c5be70..e09fdeba3f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleInputContext.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleInputContext.java
@@ -57,7 +57,7 @@
 public class BundleInputContext extends UTF8InputContext {
 	public static final String CONTEXT_ID = "bundle-context"; //$NON-NLS-1$
 
-	private HashMap<IDocumentKey, TextEdit> fOperationTable = new HashMap<>();
+	private final HashMap<IDocumentKey, TextEdit> fOperationTable = new HashMap<>();
 
 	/**
 	 * @param editor
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/CreateManifestOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/CreateManifestOperation.java
index fbac3c5588..91e2f4e4af 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/CreateManifestOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/CreateManifestOperation.java
@@ -37,7 +37,7 @@
 
 public class CreateManifestOperation implements IRunnableWithProgress {
 
-	private IPluginModelBase fModel;
+	private final IPluginModelBase fModel;
 
 	public CreateManifestOperation(IPluginModelBase model) {
 		fModel = model;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExecutionEnvironmentSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExecutionEnvironmentSection.java
index d28e213517..ba5488a8ed 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExecutionEnvironmentSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExecutionEnvironmentSection.java
@@ -86,7 +86,7 @@ public class ExecutionEnvironmentSection extends TableSection {
 
 	class EELabelProvider extends LabelProvider {
 
-		private Image fImage;
+		private final Image fImage;
 
 		public EELabelProvider() {
 			fImage = PDEPluginImages.DESC_JAVA_LIB_OBJ.createImage();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionElementDetails.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionElementDetails.java
index 75b75912e5..2990e1fdc5 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionElementDetails.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionElementDetails.java
@@ -53,8 +53,8 @@
 
 public class ExtensionElementDetails extends AbstractPluginElementDetails {
 	private IPluginElement input;
-	private ISchemaElement schemaElement;
-	private ArrayList<ExtensionAttributeRow> rows;
+	private final ISchemaElement schemaElement;
+	private final ArrayList<ExtensionAttributeRow> rows;
 	private Section section;
 
 	/**
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionPointsPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionPointsPage.java
index 3f6d80dfdc..1f0e396f21 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionPointsPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionPointsPage.java
@@ -41,7 +41,7 @@ public class ExtensionPointsPage extends PDEFormPage {
 	public static final String PAGE_ID = "ex-points"; //$NON-NLS-1$
 
 	private ExtensionPointsSection fExtensionPointsSection;
-	private ExtensionPointsBlock fBlock;
+	private final ExtensionPointsBlock fBlock;
 
 	public class ExtensionPointsBlock extends PDEMasterDetailsBlock {
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsPage.java
index 5b4422e74f..f8839d7fb0 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsPage.java
@@ -45,7 +45,7 @@ public class ExtensionsPage extends PDEFormPage {
 	public static final String PAGE_ID = "extensions"; //$NON-NLS-1$
 
 	private ExtensionsSection fSection;
-	private ExtensionsBlock fBlock;
+	private final ExtensionsBlock fBlock;
 
 	public class ExtensionsBlock extends PDEMasterDetailsBlock implements IDetailsPageProvider {
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JarSelectionValidator.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JarSelectionValidator.java
index 243eee4f01..989d868ca6 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JarSelectionValidator.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JarSelectionValidator.java
@@ -25,8 +25,8 @@
  */
 public class JarSelectionValidator implements ISelectionStatusValidator {
 
-	private Class<?>[] fAcceptedTypes;
-	private boolean fAllowMultipleSelection;
+	private final Class<?>[] fAcceptedTypes;
+	private final boolean fAllowMultipleSelection;
 
 	/**
 	 * @param acceptedTypes The types accepted by the validator
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeValue.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeValue.java
index ba297b3403..df09a74454 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeValue.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeValue.java
@@ -18,8 +18,8 @@
 import org.eclipse.pde.internal.core.ischema.ISchemaAttribute;
 
 public class JavaAttributeValue extends ResourceAttributeValue {
-	private ISchemaAttribute attInfo;
-	private IPluginModelBase model;
+	private final ISchemaAttribute attInfo;
+	private final IPluginModelBase model;
 
 	public JavaAttributeValue(IProject project, IPluginModelBase model, ISchemaAttribute attInfo, String className) {
 		super(project, className);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizard.java
index 2256a5f3ca..752ce7b536 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizard.java
@@ -43,10 +43,10 @@ public class JavaAttributeWizard extends Wizard {
 
 	private static String STORE_SECTION = "JavaAttributeWizard"; //$NON-NLS-1$
 
-	private String fClassName;
-	private IProject fProject;
-	private ISchemaAttribute fAttInfo;
-	private IPluginModelBase fModel;
+	private final String fClassName;
+	private final IProject fProject;
+	private final ISchemaAttribute fAttInfo;
+	private final IPluginModelBase fModel;
 	protected NewTypeWizardPage fMainPage;
 
 	public JavaAttributeWizard(JavaAttributeValue value) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java
index 70dbf7963b..87620aa328 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java
@@ -40,10 +40,10 @@
 
 public class JavaAttributeWizardPage extends NewClassWizardPage {
 	private String className;
-	private IProject project;
-	private ISchemaAttribute attInfo;
-	private IPluginModelBase model;
-	private InitialClassProperties initialValues;
+	private final IProject project;
+	private final ISchemaAttribute attInfo;
+	private final IPluginModelBase model;
+	private final InitialClassProperties initialValues;
 	private IJavaProject javaProject;
 
 	static class InitialClassProperties {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LoopDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LoopDialog.java
index 0783ea7e65..6c2f6aabb3 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LoopDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LoopDialog.java
@@ -36,9 +36,9 @@
 import org.eclipse.ui.PlatformUI;
 
 public class LoopDialog extends TrayDialog {
-	private DependencyLoop[] fLoops;
+	private final DependencyLoop[] fLoops;
 	private TreeViewer fLoopViewer;
-	private Image fLoopImage;
+	private final Image fLoopImage;
 
 	class ContentProvider implements ITreeContentProvider {
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestSourcePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestSourcePage.java
index 19b3fea1f9..a65e5d869f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestSourcePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestSourcePage.java
@@ -53,16 +53,16 @@
 
 public class ManifestSourcePage extends XMLSourcePage {
 
-	private Object fLibraries = new Object();
-	private Object fImports = new Object();
-	private Object fExtensionPoints = new Object();
-	private Object fExtensions = new Object();
-	private ExtensionAttributePointDectector fDetector;
-	private PluginSearchActionGroup fActionGroup;
+	private final Object fLibraries = new Object();
+	private final Object fImports = new Object();
+	private final Object fExtensionPoints = new Object();
+	private final Object fExtensions = new Object();
+	private final ExtensionAttributePointDectector fDetector;
+	private final PluginSearchActionGroup fActionGroup;
 	private PDERefactoringAction fRenameAction;
 
 	class OutlineLabelProvider extends LabelProvider {
-		private PDELabelProvider fProvider;
+		private final PDELabelProvider fProvider;
 
 		public OutlineLabelProvider() {
 			fProvider = PDEPlugin.getDefault().getLabelProvider();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/NewElementAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/NewElementAction.java
index 7f34aaf455..9c6b56e005 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/NewElementAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/NewElementAction.java
@@ -30,9 +30,9 @@
 public class NewElementAction extends Action {
 	public static final String UNKNOWN_ELEMENT_TAG = PDEUIMessages.NewElementAction_generic;
 
-	private ISchemaElement elementInfo;
+	private final ISchemaElement elementInfo;
 
-	private IPluginParent parent;
+	private final IPluginParent parent;
 
 	public NewElementAction(ISchemaElement elementInfo, IPluginParent parent) {
 		this.elementInfo = elementInfo;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/NewRuntimeLibraryDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/NewRuntimeLibraryDialog.java
index 1ab2b8a17a..e62447da5f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/NewRuntimeLibraryDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/NewRuntimeLibraryDialog.java
@@ -36,10 +36,10 @@
 
 public class NewRuntimeLibraryDialog extends SelectionStatusDialog {
 	private Text libraryText;
-	private IPluginLibrary[] libraries;
-	private DuplicateStatusValidator validator;
+	private final IPluginLibrary[] libraries;
+	private final DuplicateStatusValidator validator;
 	private String libraryName;
-	private Set<IPath> librarySet;
+	private final Set<IPath> librarySet;
 
 	class DuplicateStatusValidator {
 		public IStatus validate(String text) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginFoldingStructureProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginFoldingStructureProvider.java
index 7f3a739d89..4a74b3d664 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginFoldingStructureProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginFoldingStructureProvider.java
@@ -30,7 +30,7 @@
 
 public class PluginFoldingStructureProvider extends AbstractFoldingStructureProvider {
 
-	private Map<Position, IDocumentElementNode> fPositionToElement = new HashMap<>();
+	private final Map<Position, IDocumentElementNode> fPositionToElement = new HashMap<>();
 
 	public PluginFoldingStructureProvider(PDESourcePage editor, IEditingModel model) {
 		super(editor, model);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginInputContext.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginInputContext.java
index 52fad4c291..8a43f2f476 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginInputContext.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginInputContext.java
@@ -43,7 +43,7 @@
 
 public class PluginInputContext extends XMLInputContext {
 	public static final String CONTEXT_ID = "plugin-context"; //$NON-NLS-1$
-	private boolean fIsFragment;
+	private final boolean fIsFragment;
 
 	public PluginInputContext(PDEFormEditor editor, IEditorInput input, boolean primary, boolean isFragment) {
 		super(editor, input, primary);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ResourceAttributeValue.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ResourceAttributeValue.java
index f29e0e4a86..17aa0bcf34 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ResourceAttributeValue.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ResourceAttributeValue.java
@@ -16,8 +16,8 @@
 import org.eclipse.core.resources.IProject;
 
 public class ResourceAttributeValue {
-	private IProject project;
-	private String stringValue;
+	private final IProject project;
+	private final String stringValue;
 
 	public ResourceAttributeValue(IProject project, String stringValue) {
 		this.project = project;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java
index cceacecef4..82baae4fad 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java
@@ -73,7 +73,7 @@ public class ArgumentsSection extends PDESection {
 	private CTabFolder fTabFolder;
 	private ComboViewerPart fArchCombo;
 	private int fLastTab;
-	private int[] fLastArch = {0, 0, 0, 0, 0}; // default arch index is "All" (0)
+	private final int[] fLastArch = {0, 0, 0, 0, 0}; // default arch index is "All" (0)
 
 	public ArgumentsSection(PDEFormPage page, Composite parent) {
 		super(page, parent, Section.DESCRIPTION);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/DependenciesPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/DependenciesPage.java
index 9bc543680e..5d2b38fb79 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/DependenciesPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/DependenciesPage.java
@@ -40,7 +40,7 @@ public class DependenciesPage extends PDEFormPage {
 	static final Map<ProductType, String> TYPE_2_ID = Map.of( //
 			ProductType.BUNDLES, PLUGIN_ID, ProductType.FEATURES, FEATURE_ID, ProductType.MIXED, MIXED_ID);
 
-	private ProductType fProductType;
+	private final ProductType fProductType;
 	private PluginSection fPluginSection = null;
 
 	public DependenciesPage(FormEditor editor, ProductType productType) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherSection.java
index 8338d106fe..e11e05b357 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherSection.java
@@ -83,7 +83,7 @@ public class LauncherSection extends PDESection {
 	private static final String[] F_WIN_ICON_IDS = new String[] {ILauncherInfo.WIN32_16_LOW, ILauncherInfo.WIN32_16_HIGH, ILauncherInfo.WIN32_32_LOW, ILauncherInfo.WIN32_32_HIGH, ILauncherInfo.WIN32_48_LOW, ILauncherInfo.WIN32_48_HIGH, ILauncherInfo.WIN32_256_HIGH};
 
 	private FormEntry fNameEntry;
-	private ArrayList<IconEntry> fIcons = new ArrayList<>();
+	private final ArrayList<IconEntry> fIcons = new ArrayList<>();
 	private Button fIcoButton;
 	private Button fBmpButton;
 	private CTabFolder fTabFolder;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductExportAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductExportAction.java
index 100540128d..53e792fbea 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductExportAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductExportAction.java
@@ -29,9 +29,9 @@
 
 public class ProductExportAction extends Action {
 
-	private IProject fProject;
+	private final IProject fProject;
 
-	private IStructuredSelection fSelection;
+	private final IStructuredSelection fSelection;
 
 	public ProductExportAction(PDEFormEditor editor) {
 		IResource resource = null;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PropertiesSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PropertiesSection.java
index ec8dfbc43d..50b897fc69 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PropertiesSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PropertiesSection.java
@@ -126,11 +126,11 @@ private class PropertyDialog extends StatusDialog {
 		private Combo fOS;
 		private Combo fArch;
 		private IConfigurationProperty fEdit;
-		private Set<IConfigurationProperty> fExistingProperties;
+		private final Set<IConfigurationProperty> fExistingProperties;
 
-		private String[] COMBO_OSLABELS = new String[] { PDEUIMessages.PropertiesSection_All, Platform.OS_LINUX,
+		private final String[] COMBO_OSLABELS = new String[] { PDEUIMessages.PropertiesSection_All, Platform.OS_LINUX,
 				Platform.OS_MACOSX, Platform.OS_WIN32 };
-		private String[] COMBO_ARCHLABELS = new String[] { PDEUIMessages.PropertiesSection_All, Platform.ARCH_X86,
+		private final String[] COMBO_ARCHLABELS = new String[] { PDEUIMessages.PropertiesSection_All, Platform.ARCH_X86,
 				Platform.ARCH_X86_64 };
 
 		public PropertyDialog(Shell shell, IConfigurationProperty property,
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/SplashConfigurationSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/SplashConfigurationSection.java
index 4d56072b74..d3d7b321c6 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/SplashConfigurationSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/SplashConfigurationSection.java
@@ -62,15 +62,15 @@ public class SplashConfigurationSection extends PDESection {
 
 	private Button fAddBarButton;
 	// spinners controlling the progress bar geometry
-	private Spinner[] fBarSpinners = new Spinner[4];
+	private final Spinner[] fBarSpinners = new Spinner[4];
 	// all swt controls under the progress bar checkbox
-	private Control[] fBarControls = new Control[8];
+	private final Control[] fBarControls = new Control[8];
 
 	private Button fAddMessageButton;
 	// spinners controlling the progress message geometry
-	private Spinner[] fMessageSpinners = new Spinner[4];
+	private final Spinner[] fMessageSpinners = new Spinner[4];
 	// all swt controls under the progress message checkbox
-	private Control[] fMessageControls = new Control[10];
+	private final Control[] fMessageControls = new Control[10];
 
 	private Section fSection;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/WindowImagesSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/WindowImagesSection.java
index cd2bb8afab..98e0801a08 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/WindowImagesSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/WindowImagesSection.java
@@ -54,7 +54,7 @@ public class WindowImagesSection extends PDESection {
 
 	private static final int[][] F_ICON_DIMENSIONS = new int[][] { {16, 16}, {32, 32}, {48, 48}, {64, 64}, {128, 128}, {256, 256}};
 	private static final String[] F_ICON_LABELS = new String[] {PDEUIMessages.WindowImagesSection_16, PDEUIMessages.WindowImagesSection_32, PDEUIMessages.WindowImagesSection_48, PDEUIMessages.WindowImagesSection_64, PDEUIMessages.WindowImagesSection_128, PDEUIMessages.WindowImagesSection_256};
-	private FormEntry[] fImages = new FormEntry[F_ICON_LABELS.length];
+	private final FormEntry[] fImages = new FormEntry[F_ICON_LABELS.length];
 
 	public WindowImagesSection(PDEFormPage page, Composite parent) {
 		super(page, parent, Section.DESCRIPTION);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/AbstractSchemaDetails.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/AbstractSchemaDetails.java
index 1303a2b3a3..c121ad7fe5 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/AbstractSchemaDetails.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/AbstractSchemaDetails.java
@@ -55,9 +55,9 @@ public abstract class AbstractSchemaDetails extends PDEDetails {
 
 	private Section fSection;
 	private SchemaDtdDetailsSection fDtdSection = null;
-	private ElementSection fElementSection;
-	private boolean fShowDTD;
-	private boolean fShowDescription;
+	private final ElementSection fElementSection;
+	private final boolean fShowDTD;
+	private final boolean fShowDescription;
 	private Spinner fMinOccurSpinner;
 	private Spinner fMaxOccurSpinner;
 	private Button fUnboundSelect;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/DocSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/DocSection.java
index 0e551ec574..3c8f904f6f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/DocSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/DocSection.java
@@ -55,11 +55,11 @@
 import org.eclipse.ui.forms.widgets.Section;
 
 public class DocSection extends PDESection {
-	private IDocument fDocument;
-	private XMLConfiguration fSourceConfiguration;
+	private final IDocument fDocument;
+	private final XMLConfiguration fSourceConfiguration;
 	private SourceViewer fSourceViewer;
 	private CTabFolder fTabFolder;
-	private ISchema fSchema;
+	private final ISchema fSchema;
 	private Object fElement;
 	private boolean fIgnoreChange;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSection.java
index 2ac06d3573..b5eb04563f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSection.java
@@ -74,8 +74,8 @@
 public class ElementSection extends TreeSection {
 	private TreeViewer fTreeViewer;
 	private Schema fSchema;
-	private NewElementAction fNewElementAction = new NewElementAction();
-	private NewAttributeAction fNewAttributeAction = new NewAttributeAction();
+	private final NewElementAction fNewElementAction = new NewElementAction();
+	private final NewAttributeAction fNewAttributeAction = new NewAttributeAction();
 	private Clipboard fClipboard;
 	private SchemaRearranger fRearranger;
 	private CollapseAction fCollapseAction;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSectionDragAdapter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSectionDragAdapter.java
index c0aee7488a..07c7032a38 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSectionDragAdapter.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSectionDragAdapter.java
@@ -27,7 +27,7 @@
 import org.eclipse.swt.widgets.Control;
 
 public class ElementSectionDragAdapter extends DragSourceAdapter {
-	private ISelectionProvider fSelectionProvider;
+	private final ISelectionProvider fSelectionProvider;
 	private Object fDragData;
 
 	/**
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSectionDropAdapter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSectionDropAdapter.java
index fad4c3c297..4378c868af 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSectionDropAdapter.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSectionDropAdapter.java
@@ -23,8 +23,8 @@
 
 public class ElementSectionDropAdapter extends ViewerDropAdapter {
 	private TransferData fCurrentTransfer;
-	private ElementSection fSsection;
-	private ElementSectionDragAdapter fDragAdapter;
+	private final ElementSection fSsection;
+	private final ElementSectionDragAdapter fDragAdapter;
 
 	public ElementSectionDropAdapter(ElementSectionDragAdapter dragAdapter, ElementSection section) {
 		super(section.getTreeViewer());
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/FilteredSchemaAttributeSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/FilteredSchemaAttributeSelectionDialog.java
index 226303d9e6..f92c2ada45 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/FilteredSchemaAttributeSelectionDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/FilteredSchemaAttributeSelectionDialog.java
@@ -55,8 +55,8 @@ public class FilteredSchemaAttributeSelectionDialog extends FilteredItemsSelecti
 	private static final String DIALOG_SETTINGS = "org.eclipse.pde.ui.dialogs.FilteredSchemaAttributeSelectionDialog"; //$NON-NLS-1$
 	private static final String S_OPTIONAL_ATTRIBUTES = "showOptionalAttributes"; //$NON-NLS-1$
 
-	private Action optionalAttributesAction = new ShowOptionalAttributesAction();
-	private OptionalAttributesFilter optionalAttributesFilter = new OptionalAttributesFilter();
+	private final Action optionalAttributesAction = new ShowOptionalAttributesAction();
+	private final OptionalAttributesFilter optionalAttributesFilter = new OptionalAttributesFilter();
 	private final SchemaListLabelProvider listLabelProvider = new SchemaListLabelProvider();
 	private final SchemaDetailsLabelProvider detailsLabelProvider = new SchemaDetailsLabelProvider();
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewClassCreationWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewClassCreationWizard.java
index 032dfabfb7..420c381ff8 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewClassCreationWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewClassCreationWizard.java
@@ -28,7 +28,7 @@
 
 public class NewClassCreationWizard extends JavaAttributeWizard {
 
-	private boolean fIsInterface;
+	private final boolean fIsInterface;
 
 	private IPackageFragment packageName = null;
 	private String className = null;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewCompositorAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewCompositorAction.java
index 3e9741b3b3..93e0cd3772 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewCompositorAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewCompositorAction.java
@@ -26,9 +26,9 @@
 import org.eclipse.pde.internal.ui.PDEUIMessages;
 
 public class NewCompositorAction extends Action {
-	private ISchemaElement source;
-	private Object object;
-	private int kind;
+	private final ISchemaElement source;
+	private final Object object;
+	private final int kind;
 
 	public NewCompositorAction(ISchemaElement source, Object object, int kind) {
 		this.source = source;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewReferenceAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewReferenceAction.java
index 1aade7b87e..b792700bc8 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewReferenceAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewReferenceAction.java
@@ -21,9 +21,9 @@
 import org.eclipse.pde.internal.ui.PDEPluginImages;
 
 public class NewReferenceAction extends Action {
-	private Object object;
+	private final Object object;
 
-	private ISchemaElement referencedElement;
+	private final ISchemaElement referencedElement;
 
 	public NewReferenceAction(ISchemaElement source, Object object, ISchemaElement referencedElement) {
 		this.object = object;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaFormPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaFormPage.java
index afd8e8ab0a..ace9f04ece 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaFormPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaFormPage.java
@@ -47,7 +47,7 @@
 public class SchemaFormPage extends PDEFormPage implements IModelChangedListener {
 	public static final String PAGE_ID = "form"; //$NON-NLS-1$
 	private ElementSection fSection;
-	private SchemaBlock fBlock;
+	private final SchemaBlock fBlock;
 	private DetailsPart fDetailsPart;
 	private ImageHyperlink fImageHyperlinkPreviewRefDoc;
 	private ShowDescriptionAction fPreviewAction;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaOverviewPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaOverviewPage.java
index 27e9cf9e55..a539d3d5bb 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaOverviewPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaOverviewPage.java
@@ -38,7 +38,7 @@ public class SchemaOverviewPage extends PDEFormPage {
 
 	public static final String PAGE_ID = "overview"; //$NON-NLS-1$
 
-	private IColorManager fColorManager = ColorManager.getDefault();
+	private final IColorManager fColorManager = ColorManager.getDefault();
 
 	private ImageHyperlink fImageHyperlinkPreviewRefDoc;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaRearranger.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaRearranger.java
index 5d2cd6c615..d8bcc9ddd5 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaRearranger.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaRearranger.java
@@ -33,7 +33,7 @@
 
 public class SchemaRearranger {
 
-	private Schema fSchema;
+	private final Schema fSchema;
 
 	public SchemaRearranger(Schema schema) {
 		fSchema = schema;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/FeaturesPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/FeaturesPage.java
index 394fbf2dfa..c449e1d185 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/FeaturesPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/FeaturesPage.java
@@ -38,7 +38,7 @@
 public class FeaturesPage extends PDEFormPage {
 	public static final String PAGE_ID = "features"; //$NON-NLS-1$
 	private CategorySection fCategorySection;
-	private SiteFeaturesBlock fBlock;
+	private final SiteFeaturesBlock fBlock;
 
 	public class SiteFeaturesBlock extends PDEMasterDetailsBlock {
 		public SiteFeaturesBlock() {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/NewArchiveDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/NewArchiveDialog.java
index 98611687ba..ceb70230b2 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/NewArchiveDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/NewArchiveDialog.java
@@ -42,7 +42,7 @@ public class NewArchiveDialog extends StatusDialog {
 
 	private ISiteArchive fSiteArchive;
 
-	private ISiteModel fSiteModel;
+	private final ISiteModel fSiteModel;
 
 	private Text fUrlText;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteInputContext.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteInputContext.java
index 6719fa0266..f23e1ed377 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteInputContext.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteInputContext.java
@@ -48,7 +48,7 @@
 
 public class SiteInputContext extends XMLInputContext {
 	public static final String CONTEXT_ID = "site-context"; //$NON-NLS-1$
-	private boolean storageModel = false;
+	private final boolean storageModel = false;
 
 	/**
 	 * @param editor
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteLabelProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteLabelProvider.java
index 43b985ed71..13788abe50 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteLabelProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteLabelProvider.java
@@ -25,7 +25,7 @@
 
 class SiteLabelProvider extends LabelProvider {
 
-	private PDELabelProvider fSharedProvider;
+	private final PDELabelProvider fSharedProvider;
 
 	/**
 	 * Comment for <code>fLabelProvider</code>
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesAction.java
index 40c526815f..643f3650f4 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesAction.java
@@ -22,9 +22,9 @@
 import org.eclipse.pde.internal.ui.PDEUIMessages;
 
 public class SynchronizePropertiesAction extends Action {
-	private ISiteModel fModel;
+	private final ISiteModel fModel;
 
-	private ISiteFeature[] fSiteFeatures;
+	private final ISiteFeature[] fSiteFeatures;
 
 	public SynchronizePropertiesAction(ISiteFeature[] siteFeatures, ISiteModel model) {
 		setText(PDEUIMessages.SynchronizePropertiesAction_label);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizard.java
index 4fe02651d7..c91ea41392 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizard.java
@@ -24,9 +24,9 @@
 public class SynchronizePropertiesWizard extends Wizard {
 	private SynchronizePropertiesWizardPage fMainPage;
 
-	private ISiteModel fModel;
+	private final ISiteModel fModel;
 
-	private ISiteFeature[] fSiteFeatures;
+	private final ISiteFeature[] fSiteFeatures;
 
 	public SynchronizePropertiesWizard(ISiteFeature[] siteFeatures, ISiteModel model) {
 		super();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizardPage.java
index 36d04efd8e..af381fae2b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizardPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizardPage.java
@@ -52,11 +52,11 @@ public class SynchronizePropertiesWizardPage extends WizardPage {
 
 	private Button fAllFeaturesButton;
 
-	private ISiteModel fModel;
+	private final ISiteModel fModel;
 
 	private Button fSelectedFeaturesButton;
 
-	private ISiteFeature[] fSiteFeatures;
+	private final ISiteFeature[] fSiteFeatures;
 
 	/**
 	 *
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/ArgumentsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/ArgumentsSection.java
index 629abbcc99..186fe8683b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/ArgumentsSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/ArgumentsSection.java
@@ -49,8 +49,8 @@ public class ArgumentsSection extends SectionPart {
 	private CTabFolder fTabFolder;
 	private FormEntry fProgramArguments;
 	private FormEntry fVMArguments;
-	private Image fImage;
-	private TargetEditor fEditor;
+	private final Image fImage;
+	private final TargetEditor fEditor;
 
 	public ArgumentsSection(FormPage page, Composite parent) {
 		super(parent, page.getManagedForm().getToolkit(), Section.DESCRIPTION | ExpandableComposite.TITLE_BAR);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/ContentSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/ContentSection.java
index 80b9818649..9bf9c6ca27 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/ContentSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/ContentSection.java
@@ -33,7 +33,7 @@
 public class ContentSection extends SectionPart {
 
 	private TargetContentsGroup fContentGroup;
-	private TargetEditor fEditor;
+	private final TargetEditor fEditor;
 
 	public ContentSection(FormPage page, Composite parent) {
 		super(parent, page.getManagedForm().getToolkit(), Section.DESCRIPTION | ExpandableComposite.TITLE_BAR);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentSection.java
index 1bc69d010b..59fadf7a77 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentSection.java
@@ -60,7 +60,7 @@ public class EnvironmentSection extends SectionPart {
 	private TreeSet<String> fArchChoices;
 	private boolean LOCALES_INITIALIZED = false;
 
-	private TargetEditor fEditor;
+	private final TargetEditor fEditor;
 
 	public EnvironmentSection(FormPage page, Composite parent) {
 		super(parent, page.getManagedForm().getToolkit(), Section.DESCRIPTION | ExpandableComposite.TITLE_BAR);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/ImplicitDependenciesSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/ImplicitDependenciesSection.java
index 27fbe7c0cc..40f1aed30a 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/ImplicitDependenciesSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/ImplicitDependenciesSection.java
@@ -67,7 +67,7 @@
 public class ImplicitDependenciesSection extends SectionPart {
 
 	private TableViewer fViewer;
-	private TargetEditor fEditor;
+	private final TargetEditor fEditor;
 	private Button fAdd;
 	private Button fRemove;
 	private Button fRemoveAll;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/InformationSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/InformationSection.java
index 432bd36ca3..12ca577ce5 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/InformationSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/InformationSection.java
@@ -37,10 +37,10 @@
 public class InformationSection extends SectionPart {
 
 	private Text fNameText;
-	private TargetEditor fEditor;
+	private final TargetEditor fEditor;
 
 	private TextValidator fNameTextValidator;
-	private FormPage fPage;
+	private final FormPage fPage;
 
 	public InformationSection(FormPage page, Composite parent) {
 		super(parent, page.getManagedForm().getToolkit(), ExpandableComposite.TITLE_BAR);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/JRESection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/JRESection.java
index 39b6c1ab3f..fa1421d39f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/JRESection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/JRESection.java
@@ -53,7 +53,7 @@ public class JRESection extends SectionPart {
 	private TreeSet<String> fExecEnvChoices;
 	private boolean fBlockChanges;
 	private Button fConfigureJREButton;
-	private TargetEditor fEditor;
+	private final TargetEditor fEditor;
 
 	private static String JRE_PREF_PAGE_ID = "org.eclipse.jdt.debug.ui.preferences.VMPreferencePage"; //$NON-NLS-1$
 	private static String EE_PREF_PAGE_ID = "org.eclipse.jdt.debug.ui.jreProfiles"; //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/LocationsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/LocationsSection.java
index c760e926fe..b411f864a7 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/LocationsSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/LocationsSection.java
@@ -33,7 +33,7 @@
 public class LocationsSection extends SectionPart {
 
 	private TargetLocationsGroup fContainerGroup;
-	private TargetEditor fEditor;
+	private final TargetEditor fEditor;
 
 	public LocationsSection(FormPage page, Composite parent) {
 		super(parent, page.getManagedForm().getToolkit(), Section.DESCRIPTION | ExpandableComposite.TITLE_BAR);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/SimpleFormEntryAdapter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/SimpleFormEntryAdapter.java
index f1a46f9ba0..f98a204085 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/SimpleFormEntryAdapter.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/SimpleFormEntryAdapter.java
@@ -25,7 +25,7 @@
  */
 public class SimpleFormEntryAdapter implements IFormEntryListener {
 
-	private AbstractFormPart fFormPart;
+	private final AbstractFormPart fFormPart;
 
 	public SimpleFormEntryAdapter(AbstractFormPart formPart) {
 		fFormPart = formPart;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/TargetEditor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/TargetEditor.java
index bc26a12b2c..6cd22f6f74 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/TargetEditor.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/TargetEditor.java
@@ -115,19 +115,19 @@
  */
 public class TargetEditor extends FormEditor {
 
-	private List<IManagedForm> fManagedFormPages = new ArrayList<>(2);
+	private final List<IManagedForm> fManagedFormPages = new ArrayList<>(2);
 	private ExtensionBasedTextEditor fTextualEditor;
 	private int fSourceTabIndex;
 	private IDocument fTargetDocument;
 	private IDocumentListener fTargetDocumentListener;
 
-	private InputHandler fInputHandler = new InputHandler();
+	private final InputHandler fInputHandler = new InputHandler();
 	private TargetChangedListener fTargetChangedListener;
 	private boolean fDirty;
 
 	private ImageHyperlink fLoadHyperlink;
 
-	private EventHandler fEventHandler = this::handleBrokerEvent;
+	private final EventHandler fEventHandler = this::handleBrokerEvent;
 
 	@Override
 	protected FormToolkit createToolkit(Display display) {
@@ -590,7 +590,7 @@ private boolean isActiveTabTextualEditor() {
 	class TargetChangedListener implements ITargetChangedListener {
 		private TargetLocationsGroup fLocationTree;
 		private TargetContentsGroup fContentTree;
-		private Object fJobFamily = new Object();
+		private final Object fJobFamily = new Object();
 
 		public void setLocationTree(TargetLocationsGroup locationTree) {
 			fLocationTree = locationTree;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/AbstractHyperlink.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/AbstractHyperlink.java
index 5e16ee2e0c..3513f9e32a 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/AbstractHyperlink.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/AbstractHyperlink.java
@@ -19,7 +19,7 @@
 public abstract class AbstractHyperlink implements IHyperlink {
 
 	protected String fElement;
-	private IRegion fRegion;
+	private final IRegion fRegion;
 
 	public AbstractHyperlink(IRegion region, String element) {
 		fRegion = region;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ColorManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ColorManager.java
index 033329567c..2e33ab5bc2 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ColorManager.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ColorManager.java
@@ -32,7 +32,7 @@
 public class ColorManager implements IColorManager, IPDEColorConstants {
 
 	private static ColorManager fColorManager;
-	private Map<String, Color> fColorTable = new HashMap<>(5);
+	private final Map<String, Color> fColorTable = new HashMap<>(5);
 	private static int counter = 0;
 
 	public ColorManager() {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/JavaHyperlink.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/JavaHyperlink.java
index dd28a6d1fe..9e85cde0ec 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/JavaHyperlink.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/JavaHyperlink.java
@@ -26,7 +26,7 @@
 
 public class JavaHyperlink extends AbstractHyperlink {
 
-	private IResource fResource;
+	private final IResource fResource;
 
 	public JavaHyperlink(IRegion region, String clazz, IResource res) {
 		super(region, clazz);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ManifestConfiguration.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ManifestConfiguration.java
index aa6792b0af..9a015530c4 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ManifestConfiguration.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ManifestConfiguration.java
@@ -37,12 +37,12 @@
 public class ManifestConfiguration extends ChangeAwareSourceViewerConfiguration {
 
 	private IAnnotationHover fAnnotationHover;
-	private BasePDEScanner fPropertyKeyScanner;
-	private BasePDEScanner fPropertyValueScanner;
+	private final BasePDEScanner fPropertyKeyScanner;
+	private final BasePDEScanner fPropertyValueScanner;
 	private ContentAssistant fContentAssistant;
 	private ManifestContentAssistProcessor fContentAssistantProcessor;
 	private ManifestTextHover fTextHover;
-	private String fDocumentPartitioning;
+	private final String fDocumentPartitioning;
 
 	class ManifestHeaderScanner extends BasePDEScanner {
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ManifestTextHover.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ManifestTextHover.java
index 56ea2c3861..3b927892c2 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ManifestTextHover.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ManifestTextHover.java
@@ -35,8 +35,8 @@
 
 public class ManifestTextHover extends PDETextHover {
 
-	private PDESourcePage fSourcePage;
-	private IJavaProject fJP;
+	private final PDESourcePage fSourcePage;
+	private final IJavaProject fJP;
 
 	public ManifestTextHover(PDESourcePage sourcePage) {
 		fSourcePage = sourcePage;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/PDESelectAnnotationRulerAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/PDESelectAnnotationRulerAction.java
index d493ed16d0..3c5980f544 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/PDESelectAnnotationRulerAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/PDESelectAnnotationRulerAction.java
@@ -33,10 +33,10 @@
 public class PDESelectAnnotationRulerAction extends SelectMarkerRulerAction {
 
 	private boolean fIsEditable;
-	private ITextEditor fTextEditor;
+	private final ITextEditor fTextEditor;
 	private Position fPosition;
-	private ResourceBundle fBundle;
-	private String fPrefix;
+	private final ResourceBundle fBundle;
+	private final String fPrefix;
 
 	public PDESelectAnnotationRulerAction(ResourceBundle bundle, String prefix, ITextEditor editor, IVerticalRulerInfo ruler) {
 		super(bundle, prefix, editor, ruler);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/PDESourceInfoProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/PDESourceInfoProvider.java
index 94df32d349..381f2c030d 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/PDESourceInfoProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/PDESourceInfoProvider.java
@@ -27,7 +27,7 @@
  */
 public class PDESourceInfoProvider implements IInformationProvider, IInformationProviderExtension {
 
-	private PDESourcePage fSourcePage;
+	private final PDESourcePage fSourcePage;
 
 	public PDESourceInfoProvider(PDESourcePage sourcePage) {
 		fSourcePage = sourcePage;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/PluginXMLTextHover.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/PluginXMLTextHover.java
index c56afe24d6..42a393291d 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/PluginXMLTextHover.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/PluginXMLTextHover.java
@@ -39,7 +39,7 @@
 
 public class PluginXMLTextHover extends PDETextHover {
 
-	private PDESourcePage fSourcePage;
+	private final PDESourcePage fSourcePage;
 
 	public PluginXMLTextHover(PDESourcePage sourcePage) {
 		fSourcePage = sourcePage;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ReconcilingStrategy.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ReconcilingStrategy.java
index 978bc37298..5669f0017a 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ReconcilingStrategy.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ReconcilingStrategy.java
@@ -24,7 +24,7 @@
 public class ReconcilingStrategy implements IReconcilingStrategy {
 
 	private IDocument fDocument;
-	private ArrayList<IReconcilingParticipant> fParticipants = new ArrayList<>();
+	private final ArrayList<IReconcilingParticipant> fParticipants = new ArrayList<>();
 
 	public ReconcilingStrategy() {
 	}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ResourceHyperlink.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ResourceHyperlink.java
index 464d8065c1..5f9f58ba78 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ResourceHyperlink.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ResourceHyperlink.java
@@ -27,7 +27,7 @@
 
 public class ResourceHyperlink extends AbstractHyperlink {
 
-	private IResource fResource;
+	private final IResource fResource;
 
 	public ResourceHyperlink(IRegion region, String element, IResource res) {
 		super(region, element);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/SchemaHyperlink.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/SchemaHyperlink.java
index efcf13023c..1ed06f51be 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/SchemaHyperlink.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/SchemaHyperlink.java
@@ -19,7 +19,7 @@
 
 public class SchemaHyperlink extends AbstractHyperlink {
 
-	private IResource fResource;
+	private final IResource fResource;
 
 	public SchemaHyperlink(IRegion region, String schema, IResource res) {
 		super(region, schema);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/SourceInformationProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/SourceInformationProvider.java
index f76ed9c656..0170788cdb 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/SourceInformationProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/SourceInformationProvider.java
@@ -61,7 +61,7 @@ public void partBroughtToTop(IWorkbenchPart part) {
 		update();
 	}
 
-	private IInformationControlCreator fPresenterControlCreator;
+	private final IInformationControlCreator fPresenterControlCreator;
 
 	public SourceInformationProvider(PDESourcePage editor, IInformationControlCreator creator, int impType) {
 		fSourcePage = editor;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/TranslationHyperlink.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/TranslationHyperlink.java
index 3fc4d8289a..a4cfcb2f72 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/TranslationHyperlink.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/TranslationHyperlink.java
@@ -32,7 +32,7 @@
 
 public class TranslationHyperlink extends AbstractHyperlink {
 
-	private IModel fBase;
+	private final IModel fBase;
 
 	private boolean fOpened;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLReconcilingStrategy.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLReconcilingStrategy.java
index 16fdcd9d44..173717bf89 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLReconcilingStrategy.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLReconcilingStrategy.java
@@ -46,7 +46,7 @@ public class XMLReconcilingStrategy extends SpellingReconcileStrategy {
 	private class SpellingProblemCollector implements ISpellingProblemCollector {
 
 		/** Annotation model. */
-		private IAnnotationModel fAnnotationModel;
+		private final IAnnotationModel fAnnotationModel;
 
 		/** Annotations to add. */
 		private Map<SpellingAnnotation, Position> fAddAnnotations;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/validation/AbstractControlValidator.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/validation/AbstractControlValidator.java
index 6168f42868..39a7e6e561 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/validation/AbstractControlValidator.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/validation/AbstractControlValidator.java
@@ -29,15 +29,15 @@ public abstract class AbstractControlValidator implements IControlValidator, IVa
 
 	private boolean fEnabled;
 
-	private IManagedForm fManagedForm;
+	private final IManagedForm fManagedForm;
 
-	private Control fControl;
+	private final Control fControl;
 
 	private String fMessagePrefix;
 
 	private boolean fIsValid;
 
-	private IProject fProject;
+	private final IProject fProject;
 
 	/**
 	 * @param managedForm
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/validation/TextValidator.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/validation/TextValidator.java
index d77692c341..191d2ec9d4 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/validation/TextValidator.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/validation/TextValidator.java
@@ -24,7 +24,7 @@ public abstract class TextValidator extends AbstractControlValidator {
 
 	private ModifyListener fModifyListener;
 
-	private boolean fAutoValidate;
+	private final boolean fAutoValidate;
 
 	private String fCurrentText;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/ElementList.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/ElementList.java
index bb6d4b0a41..81053d1adb 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/ElementList.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/ElementList.java
@@ -18,7 +18,7 @@
 import org.eclipse.swt.graphics.Image;
 
 public class ElementList extends NamedElement {
-	private Vector<IPDEElement> children = new Vector<>();
+	private final Vector<IPDEElement> children = new Vector<>();
 
 	public ElementList(String name) {
 		super(name);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/NamedElement.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/NamedElement.java
index 1dd3b3aec4..03391729a2 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/NamedElement.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/NamedElement.java
@@ -18,9 +18,9 @@
 public class NamedElement extends DefaultElement {
 	protected Image image;
 
-	private String name;
+	private final String name;
 
-	private IPDEElement parent;
+	private final IPDEElement parent;
 
 	public NamedElement(String name) {
 		this(name, null, null);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPluginBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPluginBlock.java
index 2b60d39fef..6eb89f970c 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPluginBlock.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPluginBlock.java
@@ -137,7 +137,7 @@ public abstract class AbstractPluginBlock {
 	 * if none set.
 	 */
 	protected ILaunchConfiguration fLaunchConfig;
-	private Listener fListener = new Listener();
+	private final Listener fListener = new Listener();
 
 	private Label fCounter;
 
@@ -152,7 +152,7 @@ public abstract class AbstractPluginBlock {
 	private PluginStatusDialog fDialog;
 
 	class PluginModelNameBuffer {
-		private Set<String> nameSet;
+		private final Set<String> nameSet;
 
 		PluginModelNameBuffer() {
 			super();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ApplicationSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ApplicationSelectionDialog.java
index 107af83ea8..c02d11e137 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ApplicationSelectionDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ApplicationSelectionDialog.java
@@ -32,9 +32,9 @@
 
 public class ApplicationSelectionDialog extends TrayDialog {
 
-	private String fMode;
+	private final String fMode;
 	private Combo applicationCombo;
-	private String[] fApplicationNames;
+	private final String[] fApplicationNames;
 	private String fSelectedApplication;
 
 	public ApplicationSelectionDialog(Shell parentShell, String[] applicationNames, String mode) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/BlockAdapter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/BlockAdapter.java
index d00c0649f1..71b0dfafe2 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/BlockAdapter.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/BlockAdapter.java
@@ -25,8 +25,8 @@
 
 public class BlockAdapter {
 
-	private AbstractPluginBlock fPluginBlock;
-	private FeatureBlock fFeatureBlock;
+	private final AbstractPluginBlock fPluginBlock;
+	private final FeatureBlock fFeatureBlock;
 	private StackLayout fLayout;
 	private Composite fPluginBlockComposite;
 	private Composite fFeatureBlockComposite;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/FeatureBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/FeatureBlock.java
index 22abb8000f..0703bbd589 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/FeatureBlock.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/FeatureBlock.java
@@ -860,7 +860,7 @@ public String getResolutionLabel(String pluginResolution) {
 
 	private ILaunchConfiguration fLaunchConfig;
 	private ButtonSelectionListener fListener;
-	private AbstractLauncherTab fTab;
+	private final AbstractLauncherTab fTab;
 	private CachedCheckboxTreeViewer fTree;
 
 	private ViewerFilter fSelectedOnlyFilter;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JREBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JREBlock.java
index 04aa1f1680..39d46adee7 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JREBlock.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JREBlock.java
@@ -52,8 +52,8 @@
 
 public class JREBlock {
 
-	private AbstractLauncherTab fTab;
-	private Listener fListener = new Listener();
+	private final AbstractLauncherTab fTab;
+	private final Listener fListener = new Listener();
 	private Button fJavawButton;
 	private Button fJavaButton;
 	private Button fJreButton;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchAction.java
index 34b5267108..fdfc2bc448 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchAction.java
@@ -102,10 +102,10 @@ public static Set<IPluginModelBase> getLaunchedBundlesForProduct(IProduct produc
 		return BundleLauncherHelper.getMergedBundleMap(config, false).keySet();
 	}
 
-	private IProduct fProduct;
-	private String fMode;
-	private IPath fPath;
-	private Map<String, IPluginConfiguration> fPluginConfigurations;
+	private final IProduct fProduct;
+	private final String fMode;
+	private final IPath fPath;
+	private final Map<String, IPluginConfiguration> fPluginConfigurations;
 
 	public LaunchAction(IProduct product, IPath path, String mode) {
 		fProduct = product;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/OSGiFrameworkBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/OSGiFrameworkBlock.java
index 6484728e70..db1d881d36 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/OSGiFrameworkBlock.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/OSGiFrameworkBlock.java
@@ -39,12 +39,12 @@ public class OSGiFrameworkBlock {
 
 	private Combo fDefaultAutoStart;
 	private Spinner fDefaultStartLevel;
-	private IConfigurationElement[] fConfigElements;
+	private final IConfigurationElement[] fConfigElements;
 	private Combo fLauncherCombo;
-	private Listener fListener;
-	private AbstractLauncherTab fTab;
+	private final Listener fListener;
+	private final AbstractLauncherTab fTab;
 	private Combo fLaunchWithCombo;
-	private BlockAdapter fBlock;
+	private final BlockAdapter fBlock;
 
 	class Listener extends SelectionAdapter implements ModifyListener {
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ProgramBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ProgramBlock.java
index dfc0c06a63..014fe708f2 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ProgramBlock.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ProgramBlock.java
@@ -46,8 +46,8 @@ public class ProgramBlock {
 	private Button fProductButton;
 	private Combo fProductCombo;
 	private Button fApplicationButton;
-	private AbstractLauncherTab fTab;
-	private Listener fListener = new Listener();
+	private final AbstractLauncherTab fTab;
+	private final Listener fListener = new Listener();
 	private ControlDecoration fProductComboDecoration;
 
 	class Listener extends SelectionAdapter implements ModifyListener {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SoftwareInstallBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SoftwareInstallBlock.java
index d0f90756ca..2f4b3d61f5 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SoftwareInstallBlock.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SoftwareInstallBlock.java
@@ -38,7 +38,7 @@
 public class SoftwareInstallBlock {
 
 	private Button fGenerateProfileButton;
-	private AbstractLauncherTab fTab;
+	private final AbstractLauncherTab fTab;
 
 	/**
 	 * Constructor
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingBlock.java
index dee7943763..aa40c8049a 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingBlock.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingBlock.java
@@ -61,16 +61,16 @@
 
 public class TracingBlock {
 
-	private TracingTab fTab;
+	private final TracingTab fTab;
 	private Button fTracingCheck;
 	private CheckboxTableViewer fPluginViewer;
 	private IPluginModelBase[] fTraceableModels;
-	private Properties fMasterOptions = new Properties();
+	private final Properties fMasterOptions = new Properties();
 	private Button fSelectAllButton;
 	private Button fDeselectAllButton;
 	private Button fRestoreSelectedDefaultButton;
 	private Button fRestoreDefaultButton;
-	private Hashtable<IPluginModelBase, TracingPropertySource> fPropertySources = new Hashtable<>();
+	private final Hashtable<IPluginModelBase, TracingPropertySource> fPropertySources = new Hashtable<>();
 	private FormToolkit fToolkit;
 	private ScrolledPageBook fPageBook;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingPropertySource.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingPropertySource.java
index 29e7d5311a..16d1589607 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingPropertySource.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingPropertySource.java
@@ -35,23 +35,23 @@
 import org.eclipse.ui.forms.widgets.TableWrapLayout;
 
 public class TracingPropertySource {
-	private IPluginModelBase fModel;
+	private final IPluginModelBase fModel;
 	private Vector<PropertyEditor> fDescriptors;
-	private Hashtable<String, String> fTemplate;
-	private Hashtable<String, Object> fValues;
+	private final Hashtable<String, String> fTemplate;
+	private final Hashtable<String, Object> fValues;
 	private static final String[] fBooleanChoices = {"false", "true"}; //$NON-NLS-1$ //$NON-NLS-2$
-	private Properties fMasterOptions;
+	private final Properties fMasterOptions;
 	private boolean fModified;
 
 	// the flag fChanged is used to determine whether the model's content page
 	// should be recreated
 	private boolean fChanged;
-	private TracingBlock fBlock;
+	private final TracingBlock fBlock;
 
 	private abstract class PropertyEditor {
-		private String key;
-		private String label;
-		private String comment;
+		private final String key;
+		private final String label;
+		private final String comment;
 
 		public PropertyEditor(String key, String label, String comment) {
 			this.key = key;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsLabelProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsLabelProvider.java
index fe6ad9b2a9..2a10e95471 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsLabelProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsLabelProvider.java
@@ -23,7 +23,7 @@
 
 public class ExternalizeStringsLabelProvider extends LabelProvider implements ITableLabelProvider, IFontProvider {
 
-	private FontRegistry fFontRegistry;
+	private final FontRegistry fFontRegistry;
 
 	public ExternalizeStringsLabelProvider() {
 		fFontRegistry = JFaceResources.getFontRegistry();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsOperation.java
index 99226ea311..6833d3faa5 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsOperation.java
@@ -54,10 +54,10 @@
 
 public class ExternalizeStringsOperation extends WorkspaceModifyOperation {
 
-	private Object[] fChangeFiles;
-	private CompositeChange fParentChange;
-	private HashMap<String, CompositeChange> fCompositeChanges;
-	private HashMap<IFile, TextFileChange> fFileChanges;
+	private final Object[] fChangeFiles;
+	private final CompositeChange fParentChange;
+	private final HashMap<String, CompositeChange> fCompositeChanges;
+	private final HashMap<IFile, TextFileChange> fFileChanges;
 
 	public ExternalizeStringsOperation(Object[] changeFiles, CompositeChange parentChange) {
 		fChangeFiles = changeFiles;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizard.java
index 7d6d2eef26..5ccce012a3 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizard.java
@@ -20,7 +20,7 @@
 
 public class ExternalizeStringsWizard extends RefactoringWizard {
 	private ExternalizeStringsWizardPage page1;
-	private ModelChangeTable fModelChangeTable;
+	private final ModelChangeTable fModelChangeTable;
 
 	public ExternalizeStringsWizard(ModelChangeTable changeTable, PDERefactor refactoring) {
 		super(refactoring, WIZARD_BASED_USER_INTERFACE);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/GetNonExternalizedStringsOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/GetNonExternalizedStringsOperation.java
index cd1eeaacc1..c1627085df 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/GetNonExternalizedStringsOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/GetNonExternalizedStringsOperation.java
@@ -59,13 +59,13 @@
 
 public class GetNonExternalizedStringsOperation implements IRunnableWithProgress {
 
-	private ISelection fSelection;
+	private final ISelection fSelection;
 	private ArrayList<Object> fSelectedModels;
 	private ModelChangeTable fModelChangeTable;
 	private boolean fCanceled;
 
 	//Azure: To indicate that only selected plug-ins under <code>fSelection</code> are to be externalized.
-	private boolean fExternalizeSelectedPluginsOnly;
+	private final boolean fExternalizeSelectedPluginsOnly;
 
 	public GetNonExternalizedStringsOperation(ISelection selection, boolean externalizeSelectedPluginsOnly) {
 		fSelection = selection;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeModelTable.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeModelTable.java
index d94b1a1b14..51beca54ec 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeModelTable.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeModelTable.java
@@ -27,8 +27,8 @@
  *
  */
 public class InternationalizeModelTable<T> {
-	private List<T> fModels;
-	private List<T> fPreSelected; // Models preselected by the user
+	private final List<T> fModels;
+	private final List<T> fPreSelected; // Models preselected by the user
 
 	public InternationalizeModelTable() {
 		fModels = new ArrayList<>();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeOperation.java
index 975741038d..0034edc658 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeOperation.java
@@ -39,7 +39,7 @@
  */
 public class InternationalizeOperation implements IRunnableWithProgress {
 
-	private ISelection fSelection;
+	private final ISelection fSelection;
 	private ArrayList<Object> fSelectedModels;
 	private InternationalizeModelTable<IPluginModelBase> fModelPluginTable;
 	private boolean fCanceled;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizard.java
index cd5c9c50fa..202d7f0677 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizard.java
@@ -53,7 +53,7 @@ public class InternationalizeWizard extends Wizard implements IImportWizard {
 	private InternationalizeWizardLocalePage page2;
 
 	//Contains the list of plug-ins to be internationalized
-	private InternationalizeModelTable<IPluginModelBase> fInternationalizePluginModelTable;
+	private final InternationalizeModelTable<IPluginModelBase> fInternationalizePluginModelTable;
 
 	//Contains the list of locales
 	private InternationalizeModelTable<Locale> fInternationalizeLocaleModelTable;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizardLocalePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizardLocalePage.java
index 7a712f4ce1..7d068b8697 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizardLocalePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizardLocalePage.java
@@ -81,9 +81,9 @@ public class InternationalizeWizardLocalePage extends InternationalizationWizard
 	private Button fRemoveButton;
 	private Button fRemoveAllButton;
 
-	private InternationalizeModelTable<Locale> fInternationalizeModelTable;
+	private final InternationalizeModelTable<Locale> fInternationalizeModelTable;
 
-	private ILabelProvider fLabelProvider = PDEPlugin.getDefault().getLabelProvider();
+	private final ILabelProvider fLabelProvider = PDEPlugin.getDefault().getLabelProvider();
 
 	private static class ContentProvider implements IStructuredContentProvider {
 		@Override
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizardOpenOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizardOpenOperation.java
index 9134ad3646..0d2cf5d19a 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizardOpenOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizardOpenOperation.java
@@ -33,7 +33,7 @@
  */
 public class InternationalizeWizardOpenOperation {
 
-	private InternationalizeWizard fWizard;
+	private final InternationalizeWizard fWizard;
 
 	public InternationalizeWizardOpenOperation(InternationalizeWizard wizard) {
 		Assert.isNotNull(wizard);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizardPluginPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizardPluginPage.java
index b98dbfd288..bc7dec03f4 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizardPluginPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizardPluginPage.java
@@ -101,7 +101,7 @@ public class InternationalizeWizardPluginPage extends InternationalizationWizard
 	private Button fRemoveAllButton;
 
 	// Used to store the plug-ins
-	private InternationalizeModelTable<IPluginModelBase> fInternationalizeModelTable;
+	private final InternationalizeModelTable<IPluginModelBase> fInternationalizeModelTable;
 
 	private Button overwriteOption;
 	private Button individualFragments;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChange.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChange.java
index fc8c7b5ca2..867ce05d7b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChange.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChange.java
@@ -33,8 +33,8 @@ public class ModelChange {
 	private ModelChangeFile fXMLCoupling;
 	private ModelChangeFile fMFCoupling;
 
-	private IPluginModelBase fParent;
-	private boolean fPreSelected;
+	private final IPluginModelBase fParent;
+	private final boolean fPreSelected;
 
 	private String fBundleLocalization;
 	private Properties fProperties;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeElement.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeElement.java
index 1e885c23c0..3bcb4bdd9d 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeElement.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeElement.java
@@ -35,8 +35,8 @@ public class ModelChangeElement {
 	private int fOffset = 0;
 	private int fLength = 0;
 	private boolean fExternalized = true;
-	private ModelChange fParent;
-	private Object fUnderlying;
+	private final ModelChange fParent;
+	private final Object fUnderlying;
 
 	public ModelChangeElement(ModelChange parent, Object incoming) {
 		fParent = parent;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeFile.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeFile.java
index 3042620b93..d9769db874 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeFile.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeFile.java
@@ -18,9 +18,9 @@
 import org.eclipse.core.resources.IFile;
 
 public class ModelChangeFile {
-	private IFile fFile;
-	private ModelChange fModel;
-	private ArrayList<ModelChangeElement> fChanges = new ArrayList<>();
+	private final IFile fFile;
+	private final ModelChange fModel;
+	private final ArrayList<ModelChangeElement> fChanges = new ArrayList<>();
 	private int fNumChanges = 0;
 
 	public ModelChangeFile(IFile file, ModelChange model) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeLabelProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeLabelProvider.java
index 624533966d..c673c42a2f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeLabelProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeLabelProvider.java
@@ -23,8 +23,8 @@
 
 public class ModelChangeLabelProvider extends PDELabelProvider {
 
-	private Image manifestImage;
-	private Image xmlImage;
+	private final Image manifestImage;
+	private final Image xmlImage;
 
 	public ModelChangeLabelProvider() {
 		xmlImage = PDEPluginImages.DESC_PLUGIN_MF_OBJ.createImage();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeTable.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeTable.java
index ae9bffbcd4..12f845cf59 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeTable.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeTable.java
@@ -23,8 +23,8 @@
 
 public class ModelChangeTable {
 
-	private Map<IPluginModelBase, ModelChange> fChangeTable = new LinkedHashMap<>();
-	private ArrayList<ModelChange> fPreSelected = new ArrayList<>();
+	private final Map<IPluginModelBase, ModelChange> fChangeTable = new LinkedHashMap<>();
+	private final ArrayList<ModelChange> fPreSelected = new ArrayList<>();
 
 	public void addToChangeTable(IPluginModelBase model, IFile file, Object change, boolean selected) {
 		if (change == null)
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/NLSFragmentGenerator.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/NLSFragmentGenerator.java
index 6dbb4409e2..08e9df7256 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/NLSFragmentGenerator.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/NLSFragmentGenerator.java
@@ -217,7 +217,7 @@ private void internationalizePlugins(List<IPluginModelBase> plugins, List<Locale
 		}
 	}
 
-	private Object OVERWRITE = new Object();
+	private final Object OVERWRITE = new Object();
 
 	private Map<String, Object> promptForOverwrite(List<IPluginModelBase> plugins, List<Locale> locales) {
 		Map<String, Object> overwrites = new HashMap<>();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/ConditionalListSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/ConditionalListSelectionDialog.java
index 2271fcdf4c..5a8def65c7 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/ConditionalListSelectionDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/ConditionalListSelectionDialog.java
@@ -31,7 +31,7 @@
 
 public class ConditionalListSelectionDialog extends ElementListSelectionDialog {
 
-	private String fButtonText;
+	private final String fButtonText;
 	private Object[] fElements;
 	private Object[] fConditionalElements;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/MessageLine.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/MessageLine.java
index 9d151dda5a..f7d3aa7d1a 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/MessageLine.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/MessageLine.java
@@ -31,7 +31,7 @@ public class MessageLine extends CLabel {
 
 	private static final RGB ERROR_BACKGROUND_RGB = new RGB(230, 226, 221);
 
-	private Color fNormalMsgAreaBackground;
+	private final Color fNormalMsgAreaBackground;
 	private Color fErrorMsgAreaBackground;
 
 	/**
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/PDESourceViewer.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/PDESourceViewer.java
index 7750b56a47..a7c32a0db7 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/PDESourceViewer.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/PDESourceViewer.java
@@ -43,9 +43,9 @@ public class PDESourceViewer {
 
 	private SourceViewer fViewer;
 
-	private PDEFormPage fPage;
+	private final PDEFormPage fPage;
 
-	private IDocument fDocument;
+	private final IDocument fDocument;
 
 	public PDESourceViewer(PDEFormPage page) {
 		// Create the underlying document
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/PluginVersionPart.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/PluginVersionPart.java
index 2413e0eac7..485ae5cab3 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/PluginVersionPart.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/PluginVersionPart.java
@@ -107,7 +107,7 @@ public Object[] getElements(Object element) {
 
 	private VersionRange fVersionRange;
 	private boolean fIsRanged;
-	private boolean fRangeAllowed;
+	private final boolean fRangeAllowed;
 
 	public PluginVersionPart(boolean rangeAllowed) {
 		fRangeAllowed = rangeAllowed;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/SharedPartWithButtons.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/SharedPartWithButtons.java
index dd81557cf3..75423f2709 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/SharedPartWithButtons.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/SharedPartWithButtons.java
@@ -27,7 +27,7 @@
 import org.eclipse.ui.forms.widgets.FormToolkit;
 
 public abstract class SharedPartWithButtons extends SharedPart {
-	private String[] fButtonLabels;
+	private final String[] fButtonLabels;
 	private Button[] fButtons;
 	protected Composite fButtonContainer;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/WizardCheckboxTablePart.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/WizardCheckboxTablePart.java
index d50e174aab..1648ab5733 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/WizardCheckboxTablePart.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/WizardCheckboxTablePart.java
@@ -32,7 +32,7 @@ public class WizardCheckboxTablePart extends CheckboxTablePart {
 	private int deselectAllIndex = -1;
 	private int selectIndex = -1;
 	private int deselectIndex = -1;
-	private String tableName;
+	private final String tableName;
 	private int counter;
 	private Label counterLabel;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/WizardCheckboxTreePart.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/WizardCheckboxTreePart.java
index ada0f1359f..1acf8751e2 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/WizardCheckboxTreePart.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/WizardCheckboxTreePart.java
@@ -34,7 +34,7 @@ public class WizardCheckboxTreePart extends CheckboxTreePart {
 	private int deselectAllIndex = -1;
 	private int selectIndex = -1;
 	private int deselectIndex = -1;
-	private String tableName;
+	private final String tableName;
 	private Label counterLabel;
 
 	/**
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/AddToJavaSearchJob.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/AddToJavaSearchJob.java
index 9e2d6d3495..3e3b305647 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/AddToJavaSearchJob.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/AddToJavaSearchJob.java
@@ -43,7 +43,7 @@ public class AddToJavaSearchJob extends WorkspaceJob {
 
 	private IPluginModelBase[] fBundles;
 	private boolean fAdd;
-	private ITargetDefinition fTargetDefinition;
+	private final ITargetDefinition fTargetDefinition;
 
 	/**
 	 * Adds/Removes the target bundles to/from Java search
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/BuildJob.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/BuildJob.java
index a62fb96e74..bc48d496d2 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/BuildJob.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/BuildJob.java
@@ -36,7 +36,7 @@
 
 public final class BuildJob extends Job {
 	private final IProject[] fProjects;
-	private int fBuildType;
+	private final int fBuildType;
 
 	private static final String API_TOOL_PLUGIN_ID = "org.eclipse.pde.api.tools"; //$NON-NLS-1$
 	private static final String API_TOOL_NATURE = "org.eclipse.pde.api.tools.apiAnalysisNature"; //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/EditorPreferencePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/EditorPreferencePage.java
index 28be92cbd4..234d514f9b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/EditorPreferencePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/EditorPreferencePage.java
@@ -40,7 +40,7 @@ public class EditorPreferencePage extends PreferencePage implements IWorkbenchPr
 
 	private XMLSyntaxColorTab fXMLTab;
 	private ManifestSyntaxColorTab fManifestTab;
-	private ColorManager fColorManager;
+	private final ColorManager fColorManager;
 
 	public EditorPreferencePage() {
 		setDescription(PDEUIMessages.EditorPreferencePage_colorSettings);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/PDECompilersConfigurationBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/PDECompilersConfigurationBlock.java
index 5b293d195e..e174a8c6f6 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/PDECompilersConfigurationBlock.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/PDECompilersConfigurationBlock.java
@@ -88,8 +88,8 @@ public class PDECompilersConfigurationBlock extends ConfigurationBlock {
 	 * Provides data information for created controls
 	 */
 	protected static class ControlData {
-		private Key key;
-		private String[] values;
+		private final Key key;
+		private final String[] values;
 
 		/**
 		 * Constructor
@@ -131,8 +131,8 @@ public int getSelection(String value) {
 	 */
 	public static class Key {
 
-		private String qualifier;
-		private String key;
+		private final String qualifier;
+		private final String key;
 
 		/**
 		 * Constructor
@@ -320,16 +320,16 @@ protected final static Key getPDEPrefKey(String key) {
 	 * Map of controls to the tab they appear on. Allows for optimizing which builders
 	 * are used if changes are made
 	 */
-	private HashMap<Integer, HashSet<Control>> fControlMap = new HashMap<>(3);
+	private final HashMap<Integer, HashSet<Control>> fControlMap = new HashMap<>(3);
 	/**
 	 * Map of combo and label
 	 */
-	private HashMap<Combo, Label> fComboLabelMap = new HashMap<>();
+	private final HashMap<Combo, Label> fComboLabelMap = new HashMap<>();
 
 	/**
 	 * Listing of all of the {@link ExpandableComposite}s in the block
 	 */
-	private ArrayList<ExpandableComposite> fExpComps = new ArrayList<>();
+	private final ArrayList<ExpandableComposite> fExpComps = new ArrayList<>();
 
 	/**
 	 * Flag used to know if the page needs saving or not
@@ -344,7 +344,7 @@ protected final static Key getPDEPrefKey(String key) {
 	/**
 	 * Set of builders to use when building if there are changes
 	 */
-	private HashSet<String> fBuilders = new HashSet<>(4);
+	private final HashSet<String> fBuilders = new HashSet<>(4);
 
 	/**
 	 * The parent this block has been added to
@@ -357,7 +357,7 @@ public static Key[] getAllKeys() {
 	/**
 	 * Default selection listener for combo and check controls
 	 */
-	private SelectionListener selectionlistener = widgetSelectedAdapter(e -> {
+	private final SelectionListener selectionlistener = widgetSelectedAdapter(e -> {
 		if (e.widget instanceof Combo) {
 			Combo combo = (Combo) e.widget;
 			ControlData data = (ControlData) combo.getData();
@@ -379,7 +379,7 @@ public static Key[] getAllKeys() {
 	/**
 	 * Default modify listener for text controls
 	 */
-	private ModifyListener modifylistener = e -> {
+	private final ModifyListener modifylistener = e -> {
 		if (e.widget instanceof Text) {
 			Text text = (Text) e.widget;
 			ControlData data = (ControlData) text.getData();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/SyntaxColorTab.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/SyntaxColorTab.java
index 187370f3ba..389f34cf5d 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/SyntaxColorTab.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/SyntaxColorTab.java
@@ -54,8 +54,8 @@ public abstract class SyntaxColorTab {
 	private ColorSelector fColorSelector;
 
 	class ColorElement {
-		private String fDisplayName;
-		private String fColorKey;
+		private final String fDisplayName;
+		private final String fColorKey;
 		private RGB fColorValue;
 		private boolean fBold;
 		private boolean fItalic;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferencePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferencePage.java
index 7a0091cfcc..bf24e419d8 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferencePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferencePage.java
@@ -352,17 +352,17 @@ public IStatus run(IProgressMonitor monitor) {
 	/**
 	 * Initial collection of targets (handles are realized into definitions as working copies)
 	 */
-	private List<ITargetDefinition> fTargets = new ArrayList<>();
+	private final List<ITargetDefinition> fTargets = new ArrayList<>();
 
 	/**
 	 * Removed definitions (to be removed on apply)
 	 */
-	private List<ITargetDefinition> fRemoved = new ArrayList<>();
+	private final List<ITargetDefinition> fRemoved = new ArrayList<>();
 
 	/**
 	 * Moved definitions (to be moved on apply)
 	 */
-	private Map<ITargetDefinition, IPath> fMoved = new HashMap<>(1);
+	private final Map<ITargetDefinition, IPath> fMoved = new HashMap<>(1);
 
 	/**
 	 * The chosen active target (will be loaded on apply)
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/properties/SelfHostingPropertyPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/properties/SelfHostingPropertyPage.java
index d12585fedb..5f5c14aa89 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/properties/SelfHostingPropertyPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/properties/SelfHostingPropertyPage.java
@@ -51,7 +51,7 @@
 
 public class SelfHostingPropertyPage extends PropertyPage {
 
-	private Image fImage;
+	private final Image fImage;
 	private CheckboxTableViewer fViewer;
 
 	class ContentProvider implements IStructuredContentProvider {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/CreateHeaderChangeOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/CreateHeaderChangeOperation.java
index 534ed0aaed..49efaa7a82 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/CreateHeaderChangeOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/CreateHeaderChangeOperation.java
@@ -45,10 +45,10 @@
 
 public class CreateHeaderChangeOperation implements IWorkspaceRunnable {
 
-	private IPluginModelBase fBase;
-	private String fHeaderKey;
-	private String fOldValue;
-	private String fNewValue;
+	private final IPluginModelBase fBase;
+	private final String fHeaderKey;
+	private final String fOldValue;
+	private final String fNewValue;
 	private TextFileChange fChange;
 
 	public CreateHeaderChangeOperation(IPluginModelBase base, String headerKey, String oldValue, String newValue) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/FindReferenceOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/FindReferenceOperation.java
index a39fc15c5d..3614905a3c 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/FindReferenceOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/FindReferenceOperation.java
@@ -35,8 +35,8 @@
 
 public class FindReferenceOperation implements IWorkspaceRunnable {
 
-	private BundleDescription fDesc;
-	private String fNewId;
+	private final BundleDescription fDesc;
+	private final String fNewId;
 	private Change[] fChanges;
 
 	public FindReferenceOperation(BundleDescription desc, String newId) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/MovedTextFileChange.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/MovedTextFileChange.java
index dc7c19dba3..faabc45fc5 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/MovedTextFileChange.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/MovedTextFileChange.java
@@ -32,7 +32,7 @@
 
 public class MovedTextFileChange extends TextFileChange {
 
-	private IFile fCurrentFile;
+	private final IFile fCurrentFile;
 
 	public MovedTextFileChange(String name, IFile newFile, IFile currentFile) {
 		super(name, newFile);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindDeclarationsAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindDeclarationsAction.java
index ed40ef62c8..28fec95e7d 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindDeclarationsAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindDeclarationsAction.java
@@ -26,7 +26,7 @@
 
 public class FindDeclarationsAction extends BaseSearchAction {
 
-	private Object fSelectedObject;
+	private final Object fSelectedObject;
 
 	public FindDeclarationsAction(Object object) {
 		super(PDEUIMessages.SearchAction_Declaration);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindReferencesAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindReferencesAction.java
index 4c8749bc03..ae910672bf 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindReferencesAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindReferencesAction.java
@@ -36,8 +36,8 @@
  **/
 public class FindReferencesAction extends BaseSearchAction {
 
-	private Object fSelectedObject;
-	private String fPluginID;
+	private final Object fSelectedObject;
+	private final String fPluginID;
 
 	/**
 	 * Creates a new find references action to find references to the given object. The object should
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchPage.java
index 32a0e2c4ee..f18e06d22d 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchPage.java
@@ -79,11 +79,11 @@ public int hashCode() {
 
 	private Button caseSensitive;
 	private ISearchPageContainer container;
-	private Button[] externalScopeButtons = new Button[3];
+	private final Button[] externalScopeButtons = new Button[3];
 	private boolean firstTime = true;
-	private Button[] limitToButtons = new Button[3];
+	private final Button[] limitToButtons = new Button[3];
 	private Combo patternCombo;
-	private Button[] searchForButtons = new Button[3];
+	private final Button[] searchForButtons = new Button[3];
 
 	@Override
 	public void createControl(Composite parent) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchQuery.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchQuery.java
index 261266a0f5..2b5077e140 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchQuery.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchQuery.java
@@ -31,7 +31,7 @@ public class PluginSearchQuery implements ISearchQuery {
 
 	private SearchResult fSearchResult;
 
-	private PluginSearchInput fSearchInput;
+	private final PluginSearchInput fSearchInput;
 
 	public PluginSearchQuery(PluginSearchInput input) {
 		fSearchInput = input;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/AddNewDependenciesAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/AddNewDependenciesAction.java
index 7488127e8a..f68ec910c3 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/AddNewDependenciesAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/AddNewDependenciesAction.java
@@ -48,8 +48,8 @@ protected void handleNewDependencies(final Map<ExportPackageDescription, String>
 		}
 	}
 
-	private IProject fProject;
-	private IBundlePluginModelBase fBase;
+	private final IProject fProject;
+	private final IBundlePluginModelBase fBase;
 
 	public AddNewDependenciesAction(IProject project, IBundlePluginModelBase base) {
 		fProject = project;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/CalculateUsesAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/CalculateUsesAction.java
index 2f98d8b043..361b8ed0bb 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/CalculateUsesAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/CalculateUsesAction.java
@@ -33,8 +33,8 @@
 
 public class CalculateUsesAction extends Action {
 
-	private IProject fProject;
-	private IBundlePluginModelBase fModel;
+	private final IProject fProject;
+	private final IBundlePluginModelBase fModel;
 
 	public CalculateUsesAction(IProject project, IBundlePluginModelBase model) {
 		fProject = project;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/CalculateUsesOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/CalculateUsesOperation.java
index e398a95ff3..93a4db5d79 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/CalculateUsesOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/CalculateUsesOperation.java
@@ -51,8 +51,8 @@
 
 public class CalculateUsesOperation extends WorkspaceModifyOperation {
 
-	private IProject fProject;
-	private IBundlePluginModelBase fModel;
+	private final IProject fProject;
+	private final IBundlePluginModelBase fModel;
 
 	public CalculateUsesOperation(IProject project, IBundlePluginModelBase model) {
 		fProject = project;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentAction.java
index 9d34693bc2..81d0a3ac8e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentAction.java
@@ -20,9 +20,9 @@
 
 public class DependencyExtentAction extends Action {
 
-	private IProject fProject;
+	private final IProject fProject;
 
-	private String fImportID;
+	private final String fImportID;
 
 	public DependencyExtentAction(IProject project, String importID) {
 		fProject = project;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentOperation.java
index 64dcff6871..142afc20f9 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentOperation.java
@@ -74,10 +74,10 @@ public Match getMatch() {
 		}
 	}
 
-	private DependencyExtentSearchResult fSearchResult;
-	private String fImportID;
-	private IPluginModelBase fModel;
-	private IProject fProject;
+	private final DependencyExtentSearchResult fSearchResult;
+	private final String fImportID;
+	private final IPluginModelBase fModel;
+	private final IProject fProject;
 
 	public DependencyExtentOperation(IProject project, String importID, ISearchResult searchResult) {
 		fSearchResult = (DependencyExtentSearchResult) searchResult;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentQuery.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentQuery.java
index 2c7065a2f6..a9f0593756 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentQuery.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentQuery.java
@@ -30,8 +30,8 @@
 public class DependencyExtentQuery implements ISearchQuery {
 
 	private ISearchResult fSearchResult;
-	private IProject fProject;
-	private String fImportID;
+	private final IProject fProject;
+	private final String fImportID;
 
 	public DependencyExtentQuery(IProject project, String importID) {
 		fProject = project;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/GatherUnusedDependenciesOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/GatherUnusedDependenciesOperation.java
index eeb2c69366..93cf06b73f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/GatherUnusedDependenciesOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/GatherUnusedDependenciesOperation.java
@@ -76,7 +76,7 @@ public boolean foundMatches() {
 		}
 	}
 
-	private IPluginModelBase fModel;
+	private final IPluginModelBase fModel;
 	private ArrayList<Object> fList;
 
 	public GatherUnusedDependenciesOperation(IPluginModelBase model) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/ShowResultsAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/ShowResultsAction.java
index d6fc48030a..1ab627a57c 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/ShowResultsAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/ShowResultsAction.java
@@ -24,9 +24,9 @@
 
 public class ShowResultsAction extends Action {
 
-	private IPluginModelBase fModel;
+	private final IPluginModelBase fModel;
 	Object[] fUnusedImports;
-	private boolean fReadOnly;
+	private final boolean fReadOnly;
 
 	public ShowResultsAction(IPluginModelBase model, Object[] unused, boolean readOnly) {
 		fModel = model;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesAction.java
index 1b508f9f61..ce2ca86bb4 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesAction.java
@@ -22,9 +22,9 @@
 
 public class UnusedDependenciesAction extends Action {
 
-	private IPluginModelBase fModel;
+	private final IPluginModelBase fModel;
 
-	private boolean fReadOnly;
+	private final boolean fReadOnly;
 
 	public UnusedDependenciesAction(IPluginModelBase model, boolean readOnly) {
 		fModel = model;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesJob.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesJob.java
index ccdeae6278..920132b1ba 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesJob.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesJob.java
@@ -25,8 +25,8 @@
 
 public class UnusedDependenciesJob extends Job {
 
-	private IPluginModelBase fModel;
-	private boolean fReadOnly;
+	private final IPluginModelBase fModel;
+	private final boolean fReadOnly;
 
 	public UnusedDependenciesJob(String name, IPluginModelBase model, boolean readOnly) {
 		super(name);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedImportsDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedImportsDialog.java
index 1968515df7..253b846dbe 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedImportsDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedImportsDialog.java
@@ -35,9 +35,9 @@
 import org.eclipse.ui.PlatformUI;
 
 public class UnusedImportsDialog extends TrayDialog {
-	private IPluginModelBase model;
-	private Object[] unused;
-	private WizardCheckboxTablePart checkboxTablePart;
+	private final IPluginModelBase model;
+	private final Object[] unused;
+	private final WizardCheckboxTablePart checkboxTablePart;
 	private CheckboxTableViewer choiceViewer;
 
 	static class Comparator extends PluginComparator {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/FilteredIUSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/FilteredIUSelectionDialog.java
index 86f9e7b1a5..8d5007cefe 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/FilteredIUSelectionDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/FilteredIUSelectionDialog.java
@@ -65,7 +65,7 @@ public class FilteredIUSelectionDialog extends FilteredItemsSelectionDialog {
 
 	private static class IUWrapperLabelProvider extends LabelProvider implements DelegatingStyledCellLabelProvider.IStyledLabelProvider {
 
-		private PDELabelProvider labelProvider;
+		private final PDELabelProvider labelProvider;
 
 		public IUWrapperLabelProvider() {
 			labelProvider = PDEPlugin.getDefault().getLabelProvider();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/FilteredPluginArtifactsSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/FilteredPluginArtifactsSelectionDialog.java
index e1ebc8f743..8adc8b0890 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/FilteredPluginArtifactsSelectionDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/FilteredPluginArtifactsSelectionDialog.java
@@ -82,22 +82,22 @@ public class FilteredPluginArtifactsSelectionDialog extends FilteredItemsSelecti
 	private static final int TYPE_EXPORTED_PACKAGE = 3;
 	private static final int TYPE_FEATURE = 4;
 
-	private Action extensionsAction = new ExtensionsAction();
-	private Action extensionPointsAction = new ExtensionPointsAction();
-	private Action exportedPackagesAction = new ExportedPackagesAction();
-	private Action featuresAction = new FeaturesAction();
-	private ExtensionsFilter extensionsFilter = new ExtensionsFilter();
-	private ExtensionPointsFilter extensionPointsFilter = new ExtensionPointsFilter();
-	private ExportedPackagesFilter exportedPackagesFilter = new ExportedPackagesFilter();
-	private FeaturesFilter featuresFilter = new FeaturesFilter();
-
-	private SearchLabelProvider searchLabelProvider = new SearchLabelProvider();
-	private ILabelProvider detailsLabelProvider = new DetailedLabelProvider();
+	private final Action extensionsAction = new ExtensionsAction();
+	private final Action extensionPointsAction = new ExtensionPointsAction();
+	private final Action exportedPackagesAction = new ExportedPackagesAction();
+	private final Action featuresAction = new FeaturesAction();
+	private final ExtensionsFilter extensionsFilter = new ExtensionsFilter();
+	private final ExtensionPointsFilter extensionPointsFilter = new ExtensionPointsFilter();
+	private final ExportedPackagesFilter exportedPackagesFilter = new ExportedPackagesFilter();
+	private final FeaturesFilter featuresFilter = new FeaturesFilter();
+
+	private final SearchLabelProvider searchLabelProvider = new SearchLabelProvider();
+	private final ILabelProvider detailsLabelProvider = new DetailedLabelProvider();
 
 	private class SearchLabelProvider extends LabelProvider implements ILabelDecorator, IStyledLabelProvider {
 
 		private BoldStylerProvider boldStylerProvider;
-		private StyledStringHighlighter styledStringHighlighter = new StyledStringHighlighter();
+		private final StyledStringHighlighter styledStringHighlighter = new StyledStringHighlighter();
 
 		@Override
 		public Image getImage(Object element) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java
index d63d70ac78..7ed5cd717f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java
@@ -76,7 +76,7 @@ public class AddBundleContainerSelectionPage extends WizardSelectionPage {
 	static final String SETTINGS_SECTION = "editBundleContainerWizard"; //$NON-NLS-1$
 
 	private Text fDescription;
-	private ITargetDefinition fTarget;
+	private final ITargetDefinition fTarget;
 
 	protected AddBundleContainerSelectionPage(ITargetDefinition target) {
 		super("SelectionPage"); //$NON-NLS-1$
@@ -456,9 +456,9 @@ public IWizardPage getPreviousPage(IWizardPage page) {
 	 * for the table displaying a list of possible bundle container types.
 	 */
 	abstract static class AbstractBundleContainerNode implements IWizardNode {
-		private String fTypeName;
-		private String fTypeDescription;
-		private Image fTypeImage;
+		private final String fTypeName;
+		private final String fTypeDescription;
+		private final Image fTypeImage;
 		private IWizard fWizard;
 		private boolean fPreferredOption;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerWizard.java
index 1741b87ff8..76c8734834 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerWizard.java
@@ -26,7 +26,7 @@
  */
 public class AddBundleContainerWizard extends Wizard {
 
-	private ITargetDefinition fTarget;
+	private final ITargetDefinition fTarget;
 
 	public AddBundleContainerWizard(ITargetDefinition target) {
 		fTarget = target;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/ArgumentsFromContainerSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/ArgumentsFromContainerSelectionDialog.java
index 3d6b5ff00d..91f72bb3c3 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/ArgumentsFromContainerSelectionDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/ArgumentsFromContainerSelectionDialog.java
@@ -55,7 +55,7 @@ public class ArgumentsFromContainerSelectionDialog extends TrayDialog {
 
 	private Map<ITargetLocation, Object[]> fAllArguments;
 	private String[] fArguments;
-	private ITargetDefinition fTarget;
+	private final ITargetDefinition fTarget;
 
 	public ArgumentsFromContainerSelectionDialog(Shell shell, ITargetDefinition target) {
 		super(shell);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/CopyLocationAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/CopyLocationAction.java
index e38af6042b..dad532fcd2 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/CopyLocationAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/CopyLocationAction.java
@@ -29,7 +29,7 @@
 
 public class CopyLocationAction extends Action {
 
-	private StructuredViewer fViewer;
+	private final StructuredViewer fViewer;
 
 	private String fLocation;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/CopyTreeSelectionAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/CopyTreeSelectionAction.java
index 37f437a8da..a18fa288bf 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/CopyTreeSelectionAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/CopyTreeSelectionAction.java
@@ -29,7 +29,7 @@
 
 class CopyTreeSelectionAction extends Action {
 
-	private Tree fTree;
+	private final Tree fTree;
 
 	public CopyTreeSelectionAction(Tree tree) {
 		fTree = tree;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/EditBundleContainerWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/EditBundleContainerWizard.java
index d4c7f7ec95..e3ac3d0181 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/EditBundleContainerWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/EditBundleContainerWizard.java
@@ -32,8 +32,8 @@
  */
 public class EditBundleContainerWizard extends Wizard {
 
-	private ITargetDefinition fTarget;
-	private ITargetLocation fContainer;
+	private final ITargetDefinition fTarget;
+	private final ITargetLocation fContainer;
 	private IEditBundleContainerPage fPage;
 
 	public EditBundleContainerWizard(ITargetDefinition target, ITargetLocation container) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java
index d621745fee..8c4065e67e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java
@@ -97,7 +97,7 @@ public class EditIUContainerPage extends WizardPage implements IEditBundleContai
 	/**
 	 * The parent target definition
 	 */
-	private ITargetDefinition fTarget;
+	private final ITargetDefinition fTarget;
 
 	private RepositorySelectionGroup fRepoSelector;
 	private AvailableIUGroup fAvailableIUGroup;
@@ -111,7 +111,7 @@ public class EditIUContainerPage extends WizardPage implements IEditBundleContai
 	private Button fIncludeSourceButton;
 	private Button fConfigurePhaseButton;
 	private Text fDetailsText;
-	private ProvisioningUI profileUI;
+	private final ProvisioningUI profileUI;
 	private Thread refreshThread;
 
 	/**
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/EditTargetContainerPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/EditTargetContainerPage.java
index 2997576f2a..ecbc2d6ffc 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/EditTargetContainerPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/EditTargetContainerPage.java
@@ -80,7 +80,7 @@ public class EditTargetContainerPage extends WizardPage implements IEditBundleCo
 	 */
 	private static final String SETTINGS_LOCATION_3 = "location3"; //$NON-NLS-1$
 
-	private ITargetDefinition targetDefinition;
+	private final ITargetDefinition targetDefinition;
 
 	public EditTargetContainerPage(ITargetDefinition targetDefinition, TargetReferenceBundleContainer container) {
 		super("EditTargetContainerPage"); //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/IUContentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/IUContentProvider.java
index cc6dbc9748..e212f2d066 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/IUContentProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/IUContentProvider.java
@@ -78,8 +78,8 @@ public boolean hasChildren(Object element) {
 	 * in the tree.
 	 */
 	public static class IUWrapper {
-		private IInstallableUnit fIU;
-		private IUBundleContainer fParent;
+		private final IInstallableUnit fIU;
+		private final IUBundleContainer fParent;
 
 		public IUWrapper(IInstallableUnit unit, IUBundleContainer parent) {
 			fIU = unit;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/PreviewContainerPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/PreviewContainerPage.java
index f39b6cdc1f..ffdbbcf810 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/PreviewContainerPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/PreviewContainerPage.java
@@ -34,8 +34,8 @@
  */
 public class PreviewContainerPage extends WizardPage {
 
-	private ITargetDefinition fTarget;
-	private EditDirectoryContainerPage fPage1;
+	private final ITargetDefinition fTarget;
+	private final EditDirectoryContainerPage fPage1;
 	protected TableViewer fPreviewTable;
 	protected Object fInput;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/SelectRepositoryContentPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/SelectRepositoryContentPage.java
index c1646697a0..88504f09c7 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/SelectRepositoryContentPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/SelectRepositoryContentPage.java
@@ -45,11 +45,11 @@
 
 public class SelectRepositoryContentPage extends WizardPage implements IEditBundleContainerPage {
 
-	private EditRepositoryContainerPage repositoryPage;
+	private final EditRepositoryContainerPage repositoryPage;
 	private String lastLocation;
 	private CheckboxTableViewer viewer;
 	private Collection<Requirement> requirements;
-	private Set<Resource> selected = ConcurrentHashMap.newKeySet();
+	private final Set<Resource> selected = ConcurrentHashMap.newKeySet();
 
 	protected SelectRepositoryContentPage(EditRepositoryContainerPage repositoryPage) {
 		super("SelectRepositoryContentPage"); //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/StyledBundleLabelProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/StyledBundleLabelProvider.java
index 81e6810800..7dc44352ce 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/StyledBundleLabelProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/StyledBundleLabelProvider.java
@@ -61,7 +61,7 @@ public class StyledBundleLabelProvider extends StyledCellLabelProvider implement
 	private boolean fShowVersion = true;
 	private boolean fAppendResolvedVariables = false;
 	@SuppressWarnings("restriction")
-	private org.eclipse.equinox.internal.p2.metadata.TranslationSupport fTranslations = org.eclipse.equinox.internal.p2.metadata.TranslationSupport
+	private final org.eclipse.equinox.internal.p2.metadata.TranslationSupport fTranslations = org.eclipse.equinox.internal.p2.metadata.TranslationSupport
 			.getInstance();
 
 	/**
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetBundleAdapter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetBundleAdapter.java
index 93f825e090..fde75bddcb 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetBundleAdapter.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetBundleAdapter.java
@@ -23,7 +23,7 @@
 
 public class TargetBundleAdapter implements IAdapterFactory {
 
-	private ToggleIncludeHandler<TargetBundle> handler = new ToggleIncludeHandler<>(TargetBundle.class,
+	private final ToggleIncludeHandler<TargetBundle> handler = new ToggleIncludeHandler<>(TargetBundle.class,
 			TargetDefinition.MODE_PLUGIN, ITargetDefinition::getAllBundles,
 			TargetBundleAdapter::asNameVersionDescriptor);
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetContentsGroup.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetContentsGroup.java
index 070bd5a7d6..acbd5bcb09 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetContentsGroup.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetContentsGroup.java
@@ -134,13 +134,13 @@ public class TargetContentsGroup {
 	/**
 	 * Cached list of all bundles, used to quickly obtain bundle counts.
 	 */
-	private List<TargetBundle> fAllBundles = new ArrayList<>();
+	private final List<TargetBundle> fAllBundles = new ArrayList<>();
 
 	private int fGrouping;
 	private static final int GROUP_BY_NONE = 0;
 	private static final int GROUP_BY_FILE_LOC = 1;
 	private static final int GROUP_BY_CONTAINER = 2;
-	private ListenerList<ITargetChangedListener> fChangeListeners = new ListenerList<>();
+	private final ListenerList<ITargetChangedListener> fChangeListeners = new ListenerList<>();
 
 	/**
 	 * Creates this part using the form toolkit and adds it to the given composite.
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetFeatureAdapter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetFeatureAdapter.java
index 828466a6b3..d2d06e00ed 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetFeatureAdapter.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetFeatureAdapter.java
@@ -22,7 +22,7 @@
 
 public class TargetFeatureAdapter implements IAdapterFactory {
 
-	private ToggleIncludeHandler<TargetFeature> handler = new ToggleIncludeHandler<>(TargetFeature.class,
+	private final ToggleIncludeHandler<TargetFeature> handler = new ToggleIncludeHandler<>(TargetFeature.class,
 			TargetDefinition.MODE_FEATURE,
 			ITargetDefinition::getAllFeatures, TargetFeatureAdapter::asNameVersionDescriptor);
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetLocationsGroup.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetLocationsGroup.java
index 4e8aedb976..60c912e652 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetLocationsGroup.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetLocationsGroup.java
@@ -118,8 +118,8 @@ static DeleteButtonState computeState(boolean canRemove, boolean canEnable, bool
 	private Button fShowContentButton;
 
 	private ITargetDefinition fTarget;
-	private ListenerList<ITargetChangedListener> fChangeListeners = new ListenerList<>();
-	private ListenerList<ITargetChangedListener> fReloadListeners = new ListenerList<>();
+	private final ListenerList<ITargetChangedListener> fChangeListeners = new ListenerList<>();
+	private final ListenerList<ITargetChangedListener> fReloadListeners = new ListenerList<>();
 	private static final TargetLocationHandlerAdapter ADAPTER = new TargetLocationHandlerAdapter();
 
 	/**
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetReferenceBundleContainerAdapterFactory.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetReferenceBundleContainerAdapterFactory.java
index 11a6115cd3..418f159f20 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetReferenceBundleContainerAdapterFactory.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetReferenceBundleContainerAdapterFactory.java
@@ -196,7 +196,7 @@ public Class<?>[] getAdapterList() {
 	 *
 	 */
 	public static final class TargetLocationWrapper {
-		private Object wrappedItem;
+		private final Object wrappedItem;
 
 		public TargetLocationWrapper(Object location) {
 			this.wrappedItem = location;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/ToggleIncludeHandler.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/ToggleIncludeHandler.java
index f9404e0226..a3760e1b18 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/ToggleIncludeHandler.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/ToggleIncludeHandler.java
@@ -33,10 +33,10 @@
 
 public class ToggleIncludeHandler<DescriptorType> implements ITargetLocationHandler {
 
-	private int uiMode;
-	private Function<ITargetDefinition, DescriptorType[]> descriptorAccessor;
-	private Function<DescriptorType, NameVersionDescriptor> mapper;
-	private Class<DescriptorType> type;
+	private final int uiMode;
+	private final Function<ITargetDefinition, DescriptorType[]> descriptorAccessor;
+	private final Function<DescriptorType, NameVersionDescriptor> mapper;
+	private final Class<DescriptorType> type;
 
 	public ToggleIncludeHandler(Class<DescriptorType> type, int uiMode,
 			Function<ITargetDefinition, DescriptorType[]> descriptorAccessor,
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/UpdateTargetJob.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/UpdateTargetJob.java
index 880ed8f3fc..c92952a2b3 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/UpdateTargetJob.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/UpdateTargetJob.java
@@ -46,7 +46,7 @@ public class UpdateTargetJob extends Job {
 
 	public static final String JOB_FAMILY_ID = "UpdateTargetJob"; //$NON-NLS-1$
 
-	private List<IJobFunction> toUpdate;
+	private final List<IJobFunction> toUpdate;
 
 	/**
 	 * Schedules a new update job that will update all target locations in the
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/AbstractOverlayIcon.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/AbstractOverlayIcon.java
index 27f86828e9..242a720cf3 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/AbstractOverlayIcon.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/AbstractOverlayIcon.java
@@ -28,7 +28,7 @@ public abstract class AbstractOverlayIcon extends CompositeImageDescriptor {
 
 	private Point fSize = null;
 
-	private ImageDescriptor fOverlays[][];
+	private final ImageDescriptor fOverlays[][];
 
 	public AbstractOverlayIcon(ImageDescriptor[][] overlays) {
 		this(overlays, null);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/AcceleratedTreeScrolling.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/AcceleratedTreeScrolling.java
index 7994806fee..57fe1c54f9 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/AcceleratedTreeScrolling.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/AcceleratedTreeScrolling.java
@@ -24,8 +24,8 @@
  */
 public class AcceleratedTreeScrolling implements MouseWheelListener {
 
-	private Tree fTree;
-	private int fSkipLines;
+	private final Tree fTree;
+	private final int fSkipLines;
 
 	/**
 	 *  Accelerated mouse wheel scrolling during which the MOD1 (Ctrl) key modifier has been pressed
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/ChoicePropertyDescriptor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/ChoicePropertyDescriptor.java
index 5d4421eb1f..fdc8e31583 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/ChoicePropertyDescriptor.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/ChoicePropertyDescriptor.java
@@ -24,7 +24,7 @@ public class ChoicePropertyDescriptor extends PropertyDescriptor {
 	/**
 	 * The list of possible values to display in the combo box
 	 */
-	private String[] values;
+	private final String[] values;
 
 	/**
 	 * Creates an property descriptor with the given id, display name, and list
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileExtensionFilter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileExtensionFilter.java
index c4d500cda0..f560053e1e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileExtensionFilter.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileExtensionFilter.java
@@ -25,7 +25,7 @@
 
 public class FileExtensionFilter extends ViewerFilter {
 
-	private String fTargetExtension;
+	private final String fTargetExtension;
 
 	public FileExtensionFilter(String targetExtension) {
 		fTargetExtension = targetExtension;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileExtensionsFilter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileExtensionsFilter.java
index 331af9ac26..e84370318e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileExtensionsFilter.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileExtensionsFilter.java
@@ -27,7 +27,7 @@
 
 public class FileExtensionsFilter extends ViewerFilter {
 
-	private HashSet<String> fExtensions;
+	private final HashSet<String> fExtensions;
 
 	public FileExtensionsFilter() {
 		fExtensions = new HashSet<>();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileNameFilter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileNameFilter.java
index 36b439081a..a3a6ff504a 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileNameFilter.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileNameFilter.java
@@ -23,7 +23,7 @@
 
 public class FileNameFilter extends ViewerFilter {
 
-	private String fTargetName;
+	private final String fTargetName;
 
 	public FileNameFilter(String targetName) {
 		fTargetName = targetName;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/ImageOverlayIcon.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/ImageOverlayIcon.java
index 9a0802cb62..1a15a97cd1 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/ImageOverlayIcon.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/ImageOverlayIcon.java
@@ -22,7 +22,7 @@
  * An OverlayIcon consists of a main icon and several adornments.
  */
 public class ImageOverlayIcon extends AbstractOverlayIcon {
-	private Image base;
+	private final Image base;
 
 	public ImageOverlayIcon(Image base, ImageDescriptor[][] overlays) {
 		this(base, overlays, null);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/TemplateFileGenerator.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/TemplateFileGenerator.java
index f9d604995b..6a45c77187 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/TemplateFileGenerator.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/TemplateFileGenerator.java
@@ -93,17 +93,17 @@ public class TemplateFileGenerator implements IVariableProvider {
 	 */
 	public static final String KEY_PACKAGE_NAME = "packageName"; //$NON-NLS-1$
 
-	private IProject fProject;
+	private final IProject fProject;
 
-	private IPluginModelBase fModel;
+	private final IPluginModelBase fModel;
 
-	private String fPluginID;
+	private final String fPluginID;
 
-	private String fPackage;
+	private final String fPackage;
 
-	private String fClass;
+	private final String fClass;
 
-	private String fTemplate;
+	private final String fTemplate;
 
 	/**
 	 * @param project
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesLabelProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesLabelProvider.java
index a21c805560..db1246fcdc 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesLabelProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesLabelProvider.java
@@ -34,9 +34,9 @@
 import org.osgi.framework.Version;
 
 public class DependenciesLabelProvider extends LabelProvider {
-	private PDELabelProvider fSharedProvider;
+	private final PDELabelProvider fSharedProvider;
 
-	private boolean fShowReexport;
+	private final boolean fShowReexport;
 
 	/**
 	 * Constructor for PluginsLabelProvider.
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesView.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesView.java
index 0f007c98d0..35364bc7d6 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesView.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesView.java
@@ -215,12 +215,12 @@ public void run() {
 
 	private static final DependencyLoop[] NO_LOOPS = new DependencyLoop[0];
 
-	private Map<IPageBookViewPage, IWorkbenchPart> fPagesToParts;
-	private Map<IWorkbenchPart, IPageBookViewPage> fPartsToPages;
+	private final Map<IPageBookViewPage, IWorkbenchPart> fPagesToParts;
+	private final Map<IWorkbenchPart, IPageBookViewPage> fPartsToPages;
 
 	private Object fInput;
 
-	private PDEPreferencesManager fPreferences = PDEPlugin.getDefault().getPreferenceManager();
+	private final PDEPreferencesManager fPreferences = PDEPlugin.getDefault().getPreferenceManager();
 
 	private ShowCalleesAction fShowCallees;
 	private ShowCallersAction fShowCallers;
@@ -229,7 +229,7 @@ public void run() {
 	private ShowLoopsAction fShowLoops;
 
 	// history of input elements (as Strings). No duplicates
-	private List<String> fInputHistory;
+	private final List<String> fInputHistory;
 
 	private DependencyLoop[] fLoops;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPage.java
index 03b7fbb711..626b44d4a9 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPage.java
@@ -84,9 +84,9 @@ public void update(Object object) {
 
 	protected PDERefactoringAction fRefactorAction;
 
-	private IPropertyChangeListener fPropertyListener;
+	private final IPropertyChangeListener fPropertyListener;
 
-	private DependenciesView fView;
+	private final DependenciesView fView;
 
 	protected StructuredViewer fViewer;
 
@@ -96,7 +96,7 @@ public void update(Object object) {
 
 	protected Action fHideOptionalFilterAction;
 
-	private FragmentFilter fHideFragmentFilter = new FragmentFilter();
+	private final FragmentFilter fHideFragmentFilter = new FragmentFilter();
 
 	private static final String HIDE_FRAGMENTS = "hideFrags"; //$NON-NLS-1$
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPageContentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPageContentProvider.java
index 8c3980e4fb..4c02fac986 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPageContentProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPageContentProvider.java
@@ -26,7 +26,7 @@
 
 public class DependenciesViewPageContentProvider implements IContentProvider, IPluginModelListener {
 
-	private DependenciesView fView;
+	private final DependenciesView fView;
 
 	private StructuredViewer fViewer;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewTreePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewTreePage.java
index 46e030c867..5891eab412 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewTreePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewTreePage.java
@@ -61,7 +61,7 @@ public boolean select(Viewer v, Object parent, Object element) {
 	}
 
 	TreeViewer fTreeViewer;
-	private OptionalFilter fHideOptionalFilter = new OptionalFilter();
+	private final OptionalFilter fHideOptionalFilter = new OptionalFilter();
 
 	public DependenciesViewTreePage(DependenciesView view, ITreeContentProvider contentProvider) {
 		super(view, contentProvider);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryAction.java
index 74a3baffdc..f2763243c4 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryAction.java
@@ -31,7 +31,7 @@ public class HistoryAction extends Action {
 	 * Image descriptor for an image.
 	 */
 	public class ImageImageDescriptor extends ImageDescriptor {
-		private Image fImage;
+		private final Image fImage;
 
 		/**
 		 * Constructor for ImagImageDescriptor.
@@ -57,9 +57,9 @@ public int hashCode() {
 		}
 	}
 
-	private String fElement;
+	private final String fElement;
 
-	private DependenciesView fView;
+	private final DependenciesView fView;
 
 	public HistoryAction(DependenciesView view, String element) {
 		super();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryDropDownAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryDropDownAction.java
index defebd67c3..5c4b85ba17 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryDropDownAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryDropDownAction.java
@@ -29,7 +29,7 @@ public class HistoryDropDownAction extends Action implements IMenuCreator {
 
 	private Menu fMenu;
 
-	private DependenciesView fView;
+	private final DependenciesView fView;
 
 	public HistoryDropDownAction(DependenciesView view) {
 		fView = view;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryListAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryListAction.java
index 1c6d75fd2c..ba29d6fda8 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryListAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryListAction.java
@@ -24,7 +24,7 @@
 
 public class HistoryListAction extends Action {
 
-	private DependenciesView fView;
+	private final DependenciesView fView;
 
 	public HistoryListAction(DependenciesView view) {
 		fView = view;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryListDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryListDialog.java
index 1b2b2d5e0f..222c342b82 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryListDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryListDialog.java
@@ -53,7 +53,7 @@ public Object[] getElements(Object element) {
 		}
 	}
 
-	private List<String> fHistoryList = new ArrayList<>();
+	private final List<String> fHistoryList = new ArrayList<>();
 
 	private IStatus fHistoryStatus;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/OpenPluginReferencesAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/OpenPluginReferencesAction.java
index 33a9c2f2a4..69a10f46ee 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/OpenPluginReferencesAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/OpenPluginReferencesAction.java
@@ -22,7 +22,7 @@
 
 public class OpenPluginReferencesAction extends Action {
 
-	private IPluginModelBase fModel;
+	private final IPluginModelBase fModel;
 
 	public OpenPluginReferencesAction(IPluginModelBase base) {
 		fModel = base;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/imagebrowser/ImageBrowserView.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/imagebrowser/ImageBrowserView.java
index b8963825ba..d63e7648eb 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/imagebrowser/ImageBrowserView.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/imagebrowser/ImageBrowserView.java
@@ -112,7 +112,7 @@ public class ImageBrowserView extends ViewPart implements IImageTarget {
 	private Text txtReference;
 	private Spinner spinMaxImages;
 
-	private List<Image> displayedImages = new ArrayList<>();
+	private final List<Image> displayedImages = new ArrayList<>();
 
 	private AbstractRepository repository;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/imagebrowser/repositories/AbstractRepository.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/imagebrowser/repositories/AbstractRepository.java
index fb7e83e0c8..a8eb438baf 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/imagebrowser/repositories/AbstractRepository.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/imagebrowser/repositories/AbstractRepository.java
@@ -47,7 +47,7 @@ public abstract class AbstractRepository extends Job {
 
 	protected List<ImageElement> mElementsCache = new LinkedList<>();
 
-	private IImageTarget mTarget;
+	private final IImageTarget mTarget;
 
 	public AbstractRepository(IImageTarget target) {
 		super(PDEUIMessages.AbstractRepository_ScanForUI);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/imagebrowser/repositories/TargetPlatformRepository.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/imagebrowser/repositories/TargetPlatformRepository.java
index d445af15b8..da1c0d1d22 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/imagebrowser/repositories/TargetPlatformRepository.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/imagebrowser/repositories/TargetPlatformRepository.java
@@ -38,7 +38,7 @@
 public class TargetPlatformRepository extends AbstractRepository {
 
 	private List<TargetBundle> fBundles = null;
-	private boolean fUseCurrent;
+	private final boolean fUseCurrent;
 
 	/**
 	 * Creates a new target platform repository.  If useCurrent is <code>true</code>
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/JavaSearchActionGroup.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/JavaSearchActionGroup.java
index 315c885be5..358543fad6 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/JavaSearchActionGroup.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/JavaSearchActionGroup.java
@@ -41,7 +41,7 @@ public class JavaSearchActionGroup extends ActionGroup {
 
 	class JavaSearchAction extends Action {
 
-		private boolean add;
+		private final boolean add;
 
 		public JavaSearchAction(boolean add) {
 			this.add = add;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/JavaSearchOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/JavaSearchOperation.java
index d9bbdd09e2..992298c946 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/JavaSearchOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/JavaSearchOperation.java
@@ -27,8 +27,8 @@
 
 public class JavaSearchOperation implements IRunnableWithProgress {
 
-	private IPluginModelBase[] fModels;
-	private boolean fAdd;
+	private final IPluginModelBase[] fModels;
+	private final boolean fAdd;
 
 	public JavaSearchOperation(IPluginModelBase[] models, boolean add) {
 		fModels = models;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsContentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsContentProvider.java
index f4e03be95f..ae03313649 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsContentProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsContentProvider.java
@@ -40,8 +40,8 @@
 
 public class PluginsContentProvider implements ITreeContentProvider {
 
-	private PluginsView fView;
-	private StandardJavaElementContentProvider fJavaProvider;
+	private final PluginsView fView;
+	private final StandardJavaElementContentProvider fJavaProvider;
 	private DeferredTreeContentManager fManager = null;
 
 	/**
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsLabelProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsLabelProvider.java
index 1ae5a52f18..83fb616fd0 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsLabelProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsLabelProvider.java
@@ -42,11 +42,11 @@
 import org.eclipse.ui.progress.IDeferredWorkbenchAdapter;
 
 public class PluginsLabelProvider extends LabelProvider {
-	private PDELabelProvider sharedProvider;
+	private final PDELabelProvider sharedProvider;
 
-	private Image projectImage;
+	private final Image projectImage;
 
-	private Image folderImage;
+	private final Image folderImage;
 
 	/**
 	 * Constructor for PluginsLabelProvider.
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsView.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsView.java
index 174d105521..895676507a 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsView.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsView.java
@@ -126,7 +126,7 @@ public class PluginsView extends ViewPart implements IPluginModelListener {
 	private static final String SHOW_EXDISABLED = "showDisabledExternal"; //$NON-NLS-1$
 	private TreeViewer fTreeViewer;
 	private DrillDownAdapter fDrillDownAdapter;
-	private IPropertyChangeListener fPropertyListener;
+	private final IPropertyChangeListener fPropertyListener;
 	private Action fOpenAction;
 	private Action fHideExtDisabledFilterAction;
 	private Action fHideExtEnabledFilterAction;
@@ -141,10 +141,10 @@ public class PluginsView extends ViewPart implements IPluginModelListener {
 	private Action fSelectAllAction;
 	private PDERefactoringAction fRefactorAction;
 	private CollapseAllAction fCollapseAllAction;
-	private DisabledFilter fHideExtEnabledFilter = new DisabledFilter(true);
-	private DisabledFilter fHideExtDisabledFilter = new DisabledFilter(false);
-	private WorkspaceFilter fHideWorkspaceFilter = new WorkspaceFilter();
-	private JavaFilter fJavaFilter = new JavaFilter();
+	private final DisabledFilter fHideExtEnabledFilter = new DisabledFilter(true);
+	private final DisabledFilter fHideExtDisabledFilter = new DisabledFilter(false);
+	private final WorkspaceFilter fHideWorkspaceFilter = new WorkspaceFilter();
+	private final JavaFilter fJavaFilter = new JavaFilter();
 	private CopyToClipboardAction fCopyAction;
 	private Clipboard fClipboard;
 	private Object fRoot = null;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/StateViewPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/StateViewPage.java
index 35f3282b58..c20c87afff 100755
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/StateViewPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/StateViewPage.java
@@ -85,25 +85,25 @@
 
 public class StateViewPage extends Page implements IStateDeltaListener, IPluginModelListener {
 
-	private IPropertyChangeListener fPropertyListener;
+	private final IPropertyChangeListener fPropertyListener;
 	private FilteredTree fFilteredTree = null;
 	private TreeViewer fTreeViewer = null;
-	private PageBookView fView;
+	private final PageBookView fView;
 	private Composite fComposite;
 	private Action fOpenAction;
-	private String DIALOG_SETTINGS = "targetStateView"; //$NON-NLS-1$
+	private final String DIALOG_SETTINGS = "targetStateView"; //$NON-NLS-1$
 
 	private static final String HIDE_RESOLVED = "hideResolved"; //$NON-NLS-1$
 	private static final String SHOW_NONLEAF = "hideNonLeaf"; //$NON-NLS-1$
 
-	private ViewerFilter fHideResolvedFilter = new ViewerFilter() {
+	private final ViewerFilter fHideResolvedFilter = new ViewerFilter() {
 		@Override
 		public boolean select(Viewer viewer, Object parentElement, Object element) {
 			return ((element instanceof BundleDescription && !((BundleDescription) element).isResolved()) || parentElement instanceof BundleDescription && !((BundleDescription) parentElement).isResolved());
 		}
 	};
 
-	private ViewerFilter fShowLeaves = new ViewerFilter() {
+	private final ViewerFilter fShowLeaves = new ViewerFilter() {
 		@Override
 		public boolean select(Viewer viewer, Object parentElement, Object element) {
 			if (element instanceof BundleDescription) {
@@ -181,7 +181,7 @@ private Object[] getResolvedDependencies(VersionConstraint[] constraints) {
 	}
 
 	class StateLabelProvider extends StyledCellLabelProvider implements ILabelProvider {
-		private PDELabelProvider fSharedProvider;
+		private final PDELabelProvider fSharedProvider;
 
 		public StateLabelProvider() {
 			fSharedProvider = PDEPlugin.getDefault().getLabelProvider();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/TargetStateView.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/TargetStateView.java
index 6109f9f2d8..0499e4c3ab 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/TargetStateView.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/TargetStateView.java
@@ -33,8 +33,8 @@
 public class TargetStateView extends PageBookView {
 
 	public static final String VIEW_ID = "org.eclipse.pde.ui.TargetPlatformState"; //$NON-NLS-1$
-	private Map<IPageBookViewPage, IWorkbenchPart> fPagesToParts;
-	private Map<IWorkbenchPart, IPageBookViewPage> fPartsToPages;
+	private final Map<IPageBookViewPage, IWorkbenchPart> fPagesToParts;
+	private final Map<IWorkbenchPart, IPageBookViewPage> fPartsToPages;
 	private IWorkbenchPart fPartState;
 
 	static class DummyPart implements IWorkbenchPart {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/BaseWizardSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/BaseWizardSelectionPage.java
index ae68d8c7e1..f96c7bf10f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/BaseWizardSelectionPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/BaseWizardSelectionPage.java
@@ -24,8 +24,8 @@
 import org.eclipse.swt.widgets.Control;
 
 public abstract class BaseWizardSelectionPage extends WizardSelectionPage implements ISelectionChangedListener {
-	private String label;
-	private FormBrowser descriptionBrowser;
+	private final String label;
+	private final FormBrowser descriptionBrowser;
 
 	public BaseWizardSelectionPage(String name, String label) {
 		super(name);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/Category.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/Category.java
index fc87ed4f80..e5a71a4353 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/Category.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/Category.java
@@ -18,7 +18,7 @@
 import org.eclipse.core.runtime.IConfigurationElement;
 
 public class Category {
-	private IConfigurationElement config;
+	private final IConfigurationElement config;
 	private String[] parentCategoryPath;
 	public static final String ATT_ID = "id"; //$NON-NLS-1$
 	public static final String ATT_CATEGORY = "parentCategory"; //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/RenameDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/RenameDialog.java
index af69ea663c..4f9e13c7ce 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/RenameDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/RenameDialog.java
@@ -39,7 +39,7 @@ public class RenameDialog extends SelectionStatusDialog {
 	private String newName;
 	private Text text;
 	private IStatus status;
-	private boolean isCaseSensitive;
+	private final boolean isCaseSensitive;
 	private IInputValidator fValidator;
 
 	/**
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/RequiredPluginsContainerPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/RequiredPluginsContainerPage.java
index 39caf03a18..29b33d88ef 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/RequiredPluginsContainerPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/RequiredPluginsContainerPage.java
@@ -49,9 +49,9 @@
 public class RequiredPluginsContainerPage extends WizardPage implements IClasspathContainerPage, IClasspathContainerPageExtension {
 	private IClasspathEntry entry;
 	private TableViewer viewer;
-	private Image projectImage;
-	private Image libraryImage;
-	private Image slibraryImage;
+	private final Image projectImage;
+	private final Image libraryImage;
+	private final Image slibraryImage;
 	private IClasspathEntry[] realEntries;
 	private IJavaProject javaProject;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardCollectionComparator.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardCollectionComparator.java
index bdb0be94ec..cdf6e3570d 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardCollectionComparator.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardCollectionComparator.java
@@ -17,7 +17,7 @@
 import org.eclipse.jface.viewers.ViewerComparator;
 
 public class WizardCollectionComparator extends ViewerComparator {
-	private String baseCategory;
+	private final String baseCategory;
 
 	public WizardCollectionComparator(String baseCategory) {
 		this.baseCategory = baseCategory;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardListSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardListSelectionPage.java
index efdb86cb69..52082e235d 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardListSelectionPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardListSelectionPage.java
@@ -42,7 +42,7 @@
 public abstract class WizardListSelectionPage extends BaseWizardSelectionPage implements IExecutableExtension {
 	protected TableViewer wizardSelectionViewer;
 	protected ElementList wizardElements;
-	private WizardSelectedAction doubleClickAction = new WizardSelectedAction();
+	private final WizardSelectedAction doubleClickAction = new WizardSelectedAction();
 
 	private class WizardSelectedAction extends Action {
 		public WizardSelectedAction() {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardNode.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardNode.java
index ebdea0e6ac..4a0ee8b72e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardNode.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardNode.java
@@ -25,7 +25,7 @@
 
 public abstract class WizardNode implements IWizardNode {
 	private IWizard wizard;
-	private WizardSelectionPage parentWizardPage;
+	private final WizardSelectionPage parentWizardPage;
 	protected WizardElement wizardElement;
 
 	public WizardNode(WizardSelectionPage parentPage, WizardElement element) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardTreeSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardTreeSelectionPage.java
index a1e003f9f5..80247bcf7c 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardTreeSelectionPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardTreeSelectionPage.java
@@ -36,10 +36,10 @@
 
 public abstract class WizardTreeSelectionPage extends BaseWizardSelectionPage {
 	private TreeViewer categoryTreeViewer;
-	private String baseCategory;
+	private final String baseCategory;
 	protected TableViewer wizardSelectionViewer;
 
-	private WizardCollectionElement wizardCategories;
+	private final WizardCollectionElement wizardCategories;
 
 	public WizardTreeSelectionPage(WizardCollectionElement categories, String baseCategory, String message) {
 		super("NewExtension", message); //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/category/NewCategoryCreationOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/category/NewCategoryCreationOperation.java
index efa91b4c77..a21271bd1b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/category/NewCategoryCreationOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/category/NewCategoryCreationOperation.java
@@ -36,7 +36,7 @@
 import org.eclipse.ui.part.ISetSelectionTarget;
 
 public class NewCategoryCreationOperation extends WorkspaceModifyOperation {
-	private Display fDisplay;
+	private final Display fDisplay;
 	private final IPath fPath;
 	private final String fFileName;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/AntGeneratingExportWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/AntGeneratingExportWizard.java
index 59e462674c..8ffda71f4b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/AntGeneratingExportWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/AntGeneratingExportWizard.java
@@ -182,7 +182,7 @@ protected String getExportOperation() {
 	}
 
 	protected class AntErrorDialog extends MessageDialog {
-		private File fLogLocation;
+		private final File fLogLocation;
 
 		public AntErrorDialog(File logLocation) {
 			super(PlatformUI.getWorkbench().getDisplay().getActiveShell(), PDECoreMessages.FeatureBasedExportOperation_ProblemDuringExport, null, null, MessageDialog.ERROR, new String[] {IDialogConstants.OK_LABEL}, 0);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/BaseExportWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/BaseExportWizardPage.java
index 3093c9d973..34a72801d8 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/BaseExportWizardPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/BaseExportWizardPage.java
@@ -56,7 +56,7 @@
 public abstract class BaseExportWizardPage extends AbstractExportWizardPage {
 
 	protected ExportPart fExportPart;
-	private IStructuredSelection fSelection;
+	private final IStructuredSelection fSelection;
 	protected ExportDestinationTab fDestinationTab;
 	protected ExportOptionsTab fOptionsTab;
 	protected JARSigningTab fJARSiginingTab;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/CrossPlatformExportPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/CrossPlatformExportPage.java
index 2db96ae7c1..86768ceffb 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/CrossPlatformExportPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/CrossPlatformExportPage.java
@@ -93,8 +93,8 @@ protected void buttonSelected(Button button, int index) {
 		}
 	}
 
-	private PlatformPart fPlatformPart;
-	private IFeatureModel fModel;
+	private final PlatformPart fPlatformPart;
+	private final IFeatureModel fModel;
 
 	public CrossPlatformExportPage(String pageName, IFeatureModel model) {
 		super(pageName);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/JARSigningTab.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/JARSigningTab.java
index f9f1ff3e81..e9697a2616 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/JARSigningTab.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/JARSigningTab.java
@@ -60,7 +60,7 @@ public class JARSigningTab {
 
 	private Label fPasswordLabel;
 	private Text fPasswordText;
-	private BaseExportWizardPage fPage;
+	private final BaseExportWizardPage fPage;
 	private Button fBrowseButton;
 
 	public JARSigningTab(BaseExportWizardPage page) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/JNLPTab.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/JNLPTab.java
index 1bf84ae44e..1e03c8b6ce 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/JNLPTab.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/JNLPTab.java
@@ -39,7 +39,7 @@ public class JNLPTab {
 	private Text fVersionText;
 	private Button fButton;
 
-	private BaseExportWizardPage fPage;
+	private final BaseExportWizardPage fPage;
 
 	public JNLPTab(BaseExportWizardPage page) {
 		fPage = page;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductConfigurationSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductConfigurationSection.java
index 7fd288c4e4..cad2d49f22 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductConfigurationSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductConfigurationSection.java
@@ -53,7 +53,7 @@ public class ProductConfigurationSection {
 	private Text fProductRootText;
 	private Combo fProductCombo;
 
-	private ProductExportWizardPage fPage;
+	private final ProductExportWizardPage fPage;
 
 	public ProductConfigurationSection(ProductExportWizardPage page) {
 		fPage = page;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizard.java
index 98425aee67..d9c8201377 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizard.java
@@ -45,7 +45,7 @@ public class ProductExportWizard extends BaseExportWizard {
 	private WorkspaceProductModel fProductModel;
 	private CrossPlatformExportPage fPage2;
 	private ProductExportWizardPage fPage;
-	private IProject fProject;
+	private final IProject fProject;
 
 	public ProductExportWizard() {
 		this(null);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java
index a4b71de75c..6958e0f134 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java
@@ -43,7 +43,7 @@ public class ProductExportWizardPage extends AbstractExportWizardPage {
 	private static final String S_EXPORT_METADATA = "p2metadata"; //$NON-NLS-1$
 
 	private Button fSyncButton;
-	private IStructuredSelection fSelection;
+	private final IStructuredSelection fSelection;
 	private ProductDestinationGroup fExportGroup;
 	private ProductConfigurationSection fConfigurationGroup;
 	private Button fExportSourceButton;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/ExtensionEditorWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/ExtensionEditorWizard.java
index 7ffda0cbf2..ccbe6adc71 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/ExtensionEditorWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/ExtensionEditorWizard.java
@@ -25,9 +25,9 @@
 public class ExtensionEditorWizard extends Wizard {
 	public static final String PLUGIN_POINT = "newExtension"; //$NON-NLS-1$
 	private ExtensionEditorSelectionPage pointPage;
-	private IPluginModelBase model;
-	private IProject project;
-	private IStructuredSelection selection;
+	private final IPluginModelBase model;
+	private final IProject project;
+	private final IStructuredSelection selection;
 	private ElementList wizards;
 
 	public ExtensionEditorWizard(IProject project, IPluginModelBase model, IStructuredSelection selection) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionPointMainPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionPointMainPage.java
index 0bd80b869c..1e6c75a23b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionPointMainPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionPointMainPage.java
@@ -25,8 +25,8 @@
 import org.eclipse.pde.internal.ui.PDEUIMessages;
 
 public class NewExtensionPointMainPage extends BaseExtensionPointMainPage {
-	private IPluginModelBase fModel;
-	private IPluginExtensionPoint fPoint;
+	private final IPluginModelBase fModel;
+	private final IPluginExtensionPoint fPoint;
 
 	public NewExtensionPointMainPage(IProject project, IPluginModelBase model) {
 		this(project, model, null);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionPointWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionPointWizard.java
index 3e52e328b6..71cfd6e20f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionPointWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionPointWizard.java
@@ -24,9 +24,9 @@
 
 public class NewExtensionPointWizard extends NewWizard {
 	private NewExtensionPointMainPage mainPage;
-	private IPluginModelBase model;
-	private IProject project;
-	private IPluginExtensionPoint point;
+	private final IPluginModelBase model;
+	private final IProject project;
+	private final IPluginExtensionPoint point;
 	private ManifestEditor editor;
 
 	public NewExtensionPointWizard(IProject project, IPluginModelBase model, ManifestEditor editor) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionRegistryReader.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionRegistryReader.java
index 3dd63735cc..f3fdbeb2a1 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionRegistryReader.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionRegistryReader.java
@@ -41,7 +41,7 @@ public class NewExtensionRegistryReader {
 	private final static String UNCATEGORIZED_WIZARD_CATEGORY = "org.eclipse.pde.ui.Other"; //$NON-NLS-1$
 	private final static String UNCATEGORIZED_WIZARD_CATEGORY_LABEL = "Other"; //$NON-NLS-1$
 
-	private boolean editorWizardMode;
+	private final boolean editorWizardMode;
 
 	public NewExtensionRegistryReader() {
 		this(false);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionWizard.java
index 2bf50bdff7..0831a79b0e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionWizard.java
@@ -26,9 +26,9 @@
 public class NewExtensionWizard extends NewWizard {
 	public static final String PLUGIN_POINT = "newExtension"; //$NON-NLS-1$
 	private PointSelectionPage fPointPage;
-	private IPluginModelBase fModel;
-	private IProject fProject;
-	private ManifestEditor fEditor;
+	private final IPluginModelBase fModel;
+	private final IProject fProject;
+	private final ManifestEditor fEditor;
 	private WizardCollectionElement fWizardCollection;
 
 	public NewExtensionWizard(IProject project, IPluginModelBase model, ManifestEditor editor) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewSchemaFileMainPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewSchemaFileMainPage.java
index 1ca91857d8..d6879b3b65 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewSchemaFileMainPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewSchemaFileMainPage.java
@@ -29,8 +29,8 @@
 import org.eclipse.pde.internal.ui.PDEUIMessages;
 
 public class NewSchemaFileMainPage extends BaseExtensionPointMainPage {
-	private IPluginExtensionPoint fPoint;
-	private boolean isPluginIdFinal;
+	private final IPluginExtensionPoint fPoint;
+	private final boolean isPluginIdFinal;
 
 	public NewSchemaFileMainPage(IContainer container) {
 		this(container, null, false);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewSchemaFileWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewSchemaFileWizard.java
index e84e69732c..95b65ce5de 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewSchemaFileWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewSchemaFileWizard.java
@@ -29,8 +29,8 @@
 public class NewSchemaFileWizard extends Wizard implements INewWizard {
 	private NewSchemaFileMainPage mainPage;
 	private IContainer container;
-	private IPluginExtensionPoint point;
-	private boolean isPluginIdFinal;
+	private final IPluginExtensionPoint point;
+	private final boolean isPluginIdFinal;
 
 	public NewSchemaFileWizard() {
 		this(null, null, false);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/PointSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/PointSelectionPage.java
index 01c675fd48..9f954dd306 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/PointSelectionPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/PointSelectionPage.java
@@ -119,20 +119,20 @@ public class PointSelectionPage extends BaseWizardSelectionPage {
 	private TableViewer fPointListViewer;
 	private TableViewer fTemplateViewer;
 
-	private IPluginModelBase fModel;
+	private final IPluginModelBase fModel;
 	private Button fFilterCheck;
 	private IPluginExtensionPoint fCurrentPoint;
-	private Set<String> fAvailableImports;
-	private IProject fProject;
+	private final Set<String> fAvailableImports;
+	private final IProject fProject;
 	private Label fTemplateLabel;
 	private ExtensionTreeSelectionPage fWizardsPage;
 
 	private IPluginExtension fNewExtension;
-	private WizardCollectionElement fTemplateCollection;
-	private WizardCollectionElement fWizardCollection;
-	private NewExtensionWizard fWizard;
+	private final WizardCollectionElement fTemplateCollection;
+	private final WizardCollectionElement fWizardCollection;
+	private final NewExtensionWizard fWizard;
 	private Text fFilterText;
-	private WildcardFilter fWildCardFilter;
+	private final WildcardFilter fWildCardFilter;
 	private Text fPointDescription;
 	private Link fDescLink;
 	private Browser fPointDescBrowser;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/AbstractCreateFeatureOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/AbstractCreateFeatureOperation.java
index 1563251f64..81b651d17b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/AbstractCreateFeatureOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/AbstractCreateFeatureOperation.java
@@ -57,7 +57,7 @@ public abstract class AbstractCreateFeatureOperation extends WorkspaceModifyOper
 	protected IProject fProject;
 	protected IPath fLocation;
 	protected FeatureData fFeatureData;
-	private Shell fShell;
+	private final Shell fShell;
 
 	public AbstractCreateFeatureOperation(IProject project, IPath location, FeatureData featureData, Shell shell) {
 		fProject = project;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/CreateFeaturePatchOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/CreateFeaturePatchOperation.java
index b76ea721d2..7dba44061e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/CreateFeaturePatchOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/CreateFeaturePatchOperation.java
@@ -25,7 +25,7 @@
 
 public class CreateFeaturePatchOperation extends AbstractCreateFeatureOperation {
 
-	private IFeatureModel fFeatureModel;
+	private final IFeatureModel fFeatureModel;
 
 	public CreateFeaturePatchOperation(IProject project, IPath location, FeatureData featureData, IFeatureModel featureModel, Shell shell) {
 		super(project, location, featureData, shell);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/CreateFeatureProjectFromLaunchOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/CreateFeatureProjectFromLaunchOperation.java
index 47193969a3..edf9941e0d 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/CreateFeatureProjectFromLaunchOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/CreateFeatureProjectFromLaunchOperation.java
@@ -34,7 +34,7 @@
 
 public class CreateFeatureProjectFromLaunchOperation extends CreateFeatureProjectOperation {
 
-	private ILaunchConfiguration fLaunchConfig;
+	private final ILaunchConfiguration fLaunchConfig;
 
 	public CreateFeatureProjectFromLaunchOperation(IProject project, IPath location, FeatureData featureData, ILaunchConfiguration launchConfig, Shell shell) {
 		super(project, location, featureData, null, shell);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/AlternateSourceLocations.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/AlternateSourceLocations.java
index 3a5ed2f630..c45398c16b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/AlternateSourceLocations.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/AlternateSourceLocations.java
@@ -31,12 +31,12 @@ public class AlternateSourceLocations extends SourceLocationManager {
 	/**
 	 * All models to consider as source locations.
 	 */
-	private IPluginModelBase[] models;
+	private final IPluginModelBase[] models;
 
 	/**
 	 * Resolved bundles corresponding to models
 	 */
-	private TargetBundle[] bundles;
+	private final TargetBundle[] bundles;
 
 	/**
 	 * List of source locations that reference root folders containing
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportOperation.java
index f4acca39f8..1f67f92f29 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportOperation.java
@@ -69,12 +69,12 @@ public interface IReplaceQuery {
 		int doQuery(IProject project);
 	}
 
-	private IFeatureModel[] fModels;
-	private boolean fBinary;
-	private IPath fTargetPath;
+	private final IFeatureModel[] fModels;
+	private final boolean fBinary;
+	private final IPath fTargetPath;
 
-	private IWorkspaceRoot fRoot;
-	private IReplaceQuery fReplaceQuery;
+	private final IWorkspaceRoot fRoot;
+	private final IReplaceQuery fReplaceQuery;
 
 	/**
 	 *
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportWizard.java
index a57cd7e3e6..89ea9e3c53 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportWizard.java
@@ -115,7 +115,7 @@ public ReplaceQuery(Shell shell) {
 		}
 
 		private int yesToAll = 0;
-		private int[] RETURNCODES = {IReplaceQuery.YES, IReplaceQuery.YES, IReplaceQuery.NO, IReplaceQuery.NO, IReplaceQuery.CANCEL};
+		private final int[] RETURNCODES = {IReplaceQuery.YES, IReplaceQuery.YES, IReplaceQuery.NO, IReplaceQuery.NO, IReplaceQuery.CANCEL};
 
 		@Override
 		public int doQuery(IProject project) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/OverwriteProjectsSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/OverwriteProjectsSelectionDialog.java
index 57e5e5306e..1c15b48e69 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/OverwriteProjectsSelectionDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/OverwriteProjectsSelectionDialog.java
@@ -137,7 +137,7 @@ public void widgetSelected(SelectionEvent e) {
 		}
 	}
 
-	private List<IPluginModelBase> fPluginProjectList;
+	private final List<IPluginModelBase> fPluginProjectList;
 	private FilteredCheckboxTree fFilteredTree;
 	private CachedCheckboxTreeViewer fCheckboxTreeViewer;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java
index da9bd34a67..cf0c81bde6 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java
@@ -117,15 +117,15 @@ public class PluginImportOperation extends WorkspaceJob {
 	private static final int MAX_RETRY = 5;
 	private static final int RETRY_DELAY = 1000;
 
-	private IPluginModelBase[] fModels;
-	private int fImportType;
-	private Hashtable<IProject, IClasspathEntry[]> fProjectClasspaths = new Hashtable<>();
+	private final IPluginModelBase[] fModels;
+	private final int fImportType;
+	private final Hashtable<IProject, IClasspathEntry[]> fProjectClasspaths = new Hashtable<>();
 
 	/**
 	 * Maps project ids to a List of IWorkingSets, the map is filled when determining what projects to delete
 	 */
-	private Map<String, List<IWorkingSet>> fProjectWorkingSets = new HashMap<>();
-	private boolean fForceAutobuild;
+	private final Map<String, List<IWorkingSet>> fProjectWorkingSets = new HashMap<>();
+	private final boolean fForceAutobuild;
 
 	// used when importing from a repository
 	private Map<IBundleImporter, ScmUrlImportDescription[]> fImportDescriptions;
@@ -184,7 +184,7 @@ private class NotImportedProjectsWarningDialog extends MessageDialog {
 		/**
 		 * The list of the projects that did not get imported.
 		 */
-		private List<String> fNamesOfNotImportedProjects;
+		private final List<String> fNamesOfNotImportedProjects;
 
 		/**
 		 * Creates a warning message dialog. The message area will contain the scrollable
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardDetailedPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardDetailedPage.java
index c1cf7d596c..8e624492a5 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardDetailedPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardDetailedPage.java
@@ -86,7 +86,7 @@ public Object[] getElements(Object element) {
 	private ViewerFilter fRepositoryFilter;
 	// fSelected is used to track the selection in a hash set so we can efficiently
 	// filter selected items out of the available item list
-	private Set<Object> fSelected;
+	private final Set<Object> fSelected;
 	// this job is used to delay the full filter refresh for 200 milliseconds in case the user is still typing
 	private WorkbenchJob fFilterJob;
 	private Button fAddButton;
@@ -149,7 +149,7 @@ public boolean setPattern(String newPattern) {
 	 *
 	 */
 	private static class VersionFilter extends ViewerFilter {
-		private HashMap<String, Version> versions = new HashMap<>();
+		private final HashMap<String, Version> versions = new HashMap<>();
 
 		public void setModel(IPluginModelBase[] plugins) {
 			if (plugins != null && plugins.length > 0) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardExpressPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardExpressPage.java
index b31c9ba1de..75f954a2dd 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardExpressPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardExpressPage.java
@@ -54,7 +54,7 @@
 public class PluginImportWizardExpressPage extends BaseImportWizardSecondPage {
 
 	private TablePart fTablePart;
-	private IStructuredSelection fInitialSelection;
+	private final IStructuredSelection fInitialSelection;
 	private Label fCounterLabel;
 
 	static class PluginContentProvider implements IStructuredContentProvider {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java
index bab290bc18..70b2cf45a9 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java
@@ -133,12 +133,12 @@ public class PluginImportWizardFirstPage extends WizardPage {
 	/**
 	 * Map of bundle importer extension id to associated wizard page
 	 */
-	private Map<String, IScmUrlImportWizardPage> importIdToWizardPage = new HashMap<>();
+	private final Map<String, IScmUrlImportWizardPage> importIdToWizardPage = new HashMap<>();
 
 	/**
 	 * Array of next wizard pages (in order)
 	 */
-	private List<IScmUrlImportWizardPage> nextPages = new ArrayList<>();
+	private final List<IScmUrlImportWizardPage> nextPages = new ArrayList<>();
 
 	public PluginImportWizardFirstPage(String name) {
 		super(name);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/RepositoryImportWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/RepositoryImportWizard.java
index e0084f4555..1bebf5d911 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/RepositoryImportWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/RepositoryImportWizard.java
@@ -47,12 +47,12 @@ public class RepositoryImportWizard extends Wizard {
 	/**
 	 * Map of import delegates to import descriptions as provided by the {@link BundleProjectService}
 	 */
-	private Map<IBundleImporter, ScmUrlImportDescription[]> fImportMap;
+	private final Map<IBundleImporter, ScmUrlImportDescription[]> fImportMap;
 
 	/**
 	 * Map of importer identifier to associated wizard import page
 	 */
-	private Map<String, IScmUrlImportWizardPage> fIdToPages = new HashMap<>();
+	private final Map<String, IScmUrlImportWizardPage> fIdToPages = new HashMap<>();
 
 	private static final String STORE_SECTION = "RepositoryImportWizard"; //$NON-NLS-1$
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java
index be9da4692e..7f9a306de3 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java
@@ -67,7 +67,7 @@ public class FragmentContentPage extends ContentPage {
 	private StackLayout fNotebookLayout;
 	private Composite fOldComp;
 	private Composite fNewComp;
-	private PluginVersionPart fVersionPart;
+	private final PluginVersionPart fVersionPart;
 	private Label fEELabel;
 	private Button fExeEnvButton;
 	private Combo fEEChoice;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewFragmentProjectWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewFragmentProjectWizard.java
index 15cbd78a65..cced0c4700 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewFragmentProjectWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewFragmentProjectWizard.java
@@ -34,7 +34,7 @@ public class NewFragmentProjectWizard extends NewWizard implements IExecutableEx
 
 	private NewProjectCreationPage fMainPage;
 	private ContentPage fContentPage;
-	private FragmentFieldData fFragmentData;
+	private final FragmentFieldData fFragmentData;
 	private IProjectProvider fProjectProvider;
 	private IConfigurationElement fConfig;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationOperation.java
index efef994ff9..9dd946f985 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationOperation.java
@@ -94,7 +94,7 @@ public class NewLibraryPluginCreationOperation extends NewProjectCreationOperati
 
 	private static final String SOURCE_PREFIX = "source."; //$NON-NLS-1$
 
-	private LibraryPluginFieldData fData;
+	private final LibraryPluginFieldData fData;
 
 	public NewLibraryPluginCreationOperation(LibraryPluginFieldData data, IProjectProvider provider, IPluginContentWizard contentWizard) {
 		super(data, provider, contentWizard);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationPage.java
index 17b1aae517..82d8623a85 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationPage.java
@@ -79,7 +79,7 @@ public void setBlocked(boolean blocked) {
 		}
 	}
 
-	private LibraryPluginFieldData fData;
+	private final LibraryPluginFieldData fData;
 	protected NewLibraryPluginCreationPage fMainPage;
 	protected IProjectProvider fProjectProvider;
 	protected PropertiesListener fPropertiesListener = new PropertiesListener();
@@ -93,7 +93,7 @@ public void setBlocked(boolean blocked) {
 	protected Button fJarredCheck;
 	protected Button fFindDependencies;
 	private Button fUpdateRefsCheck;
-	private IStructuredSelection fSelection;
+	private final IStructuredSelection fSelection;
 
 	public NewLibraryPluginCreationPage(String pageName, LibraryPluginFieldData data, IStructuredSelection selection) {
 		super(pageName);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationUpdateRefPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationUpdateRefPage.java
index f76dcb9c92..b839f159aa 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationUpdateRefPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationUpdateRefPage.java
@@ -48,8 +48,8 @@ public class NewLibraryPluginCreationUpdateRefPage extends WizardPage {
 	private IPluginModelBase[] fSelected;
 	private IPluginModelBase[] fUnmigrated;
 	private CheckboxTableViewer pluginListViewer;
-	private TablePart tablePart;
-	private LibraryPluginFieldData fData;
+	private final TablePart tablePart;
+	private final LibraryPluginFieldData fData;
 
 	public class BuildpathContentProvider implements IStructuredContentProvider {
 		@Override
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginProjectWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginProjectWizard.java
index 1a77bc1e1c..5de69192d9 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginProjectWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginProjectWizard.java
@@ -53,13 +53,13 @@ public class NewLibraryPluginProjectWizard extends NewWizard implements IExecuta
 	private NewLibraryPluginCreationPage fMainPage;
 	private NewLibraryPluginCreationUpdateRefPage fUpdatePage;
 
-	private LibraryPluginFieldData fPluginData;
+	private final LibraryPluginFieldData fPluginData;
 
 	private IProjectProvider fProjectProvider;
 
-	private Collection<?> fInitialJarPaths;
+	private final Collection<?> fInitialJarPaths;
 
-	private Collection<?> fInitialSelection;
+	private final Collection<?> fInitialSelection;
 
 	public NewLibraryPluginProjectWizard(Collection<?> initialJarPaths, Collection<?> initialSelection) {
 		setDefaultPageImageDescriptor(PDEPluginImages.DESC_JAR_TO_PLUGIN_WIZ);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewPluginProjectWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewPluginProjectWizard.java
index 87dce2ee3d..2c57a24463 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewPluginProjectWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewPluginProjectWizard.java
@@ -46,7 +46,7 @@ public class NewPluginProjectWizard extends NewWizard implements IExecutableExte
 	public static final String DEF_TEMPLATE_ID = "template-id"; //$NON-NLS-1$
 
 	private IConfigurationElement fConfig;
-	private PluginFieldData fPluginData;
+	private final PluginFieldData fPluginData;
 	private IProjectProvider fProjectProvider;
 	protected NewProjectCreationPage fMainPage;
 	protected PluginContentPage fContentPage;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationFromTemplatePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationFromTemplatePage.java
index 1ccc6ddb96..8ce0786450 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationFromTemplatePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationFromTemplatePage.java
@@ -22,7 +22,7 @@
  */
 public class NewProjectCreationFromTemplatePage extends NewProjectCreationPage {
 
-	private WizardElement fTemplateWizard;
+	private final WizardElement fTemplateWizard;
 
 	public NewProjectCreationFromTemplatePage(String pageName, AbstractFieldData data, IStructuredSelection selection, WizardElement templateWizard) {
 		super(pageName, data, false, selection);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationOperation.java
index 714bb390a5..b4223ff50a 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationOperation.java
@@ -99,15 +99,15 @@
 import aQute.bnd.properties.Document;
 
 public class NewProjectCreationOperation extends WorkspaceModifyOperation {
-	private IPluginContentWizard fContentWizard;
+	private final IPluginContentWizard fContentWizard;
 
-	private IFieldData fData;
+	private final IFieldData fData;
 
 	private PluginClassCodeGenerator fGenerator;
 
 	private WorkspacePluginModelBase fModel;
 
-	private IProjectProvider fProjectProvider;
+	private final IProjectProvider fProjectProvider;
 
 	private boolean fResult;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java
index 0d415b07f5..872f63644f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java
@@ -44,16 +44,16 @@
 
 public class NewProjectCreationPage extends WizardNewProjectCreationPage {
 	protected Button fJavaButton;
-	private boolean fFragment;
+	private final boolean fFragment;
 	protected Label fSourceLabel;
 	protected Text fSourceText;
 	protected Label fOutputlabel;
 	protected Text fOutputText;
-	private AbstractFieldData fData;
+	private final AbstractFieldData fData;
 	protected Button fEclipseButton;
 	protected Combo fOSGiCombo;
 	protected Button fOSGIButton;
-	private IStructuredSelection fSelection;
+	private final IStructuredSelection fSelection;
 
 	private static final String S_OSGI_PROJECT = "osgiProject"; //$NON-NLS-1$
 	private static final String S_FRAMEWORK_TYPE = "frameworkType"; //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginClassCodeGenerator.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginClassCodeGenerator.java
index 59e68d32af..b9904c10ab 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginClassCodeGenerator.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginClassCodeGenerator.java
@@ -33,9 +33,9 @@
 import org.eclipse.pde.ui.templates.PluginReference;
 
 public class PluginClassCodeGenerator {
-	private PluginFieldData fPluginData;
-	private IProject fProject;
-	private String fQualifiedClassName;
+	private final PluginFieldData fPluginData;
+	private final IProject fProject;
+	private final String fQualifiedClassName;
 
 	public PluginClassCodeGenerator(IProject project, String qualifiedClassName, PluginFieldData data, boolean generateTemplate) {
 		fProject = project;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentFromTemplatePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentFromTemplatePage.java
index c98ac88ef3..739b51651e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentFromTemplatePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentFromTemplatePage.java
@@ -22,7 +22,7 @@
  */
 public class PluginContentFromTemplatePage extends PluginContentPage {
 
-	private WizardElement fTemplateWizard;
+	private final WizardElement fTemplateWizard;
 
 	public PluginContentFromTemplatePage(String pageName, IProjectProvider provider, NewProjectCreationPage page, AbstractFieldData data, WizardElement templateWizard) {
 		super(pageName, provider, page, data);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentPage.java
index da30e0580d..cc9557f5fc 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentPage.java
@@ -82,7 +82,7 @@ public class PluginContentPage extends ContentPage {
 	/**
 	 * default tText modify listener
 	 */
-	private ModifyListener classListener = e -> {
+	private final ModifyListener classListener = e -> {
 		if (fInitialized)
 			fChangedGroups |= P_CLASS_GROUP;
 		validatePage();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginFieldData.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginFieldData.java
index 5b3b083e22..1e90316ea4 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginFieldData.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginFieldData.java
@@ -27,7 +27,7 @@ public class PluginFieldData extends AbstractFieldData implements IPluginFieldDa
 	private boolean fRCPAppPlugin = false;
 	private boolean fSetupAPITooling = false;
 	private boolean fE4Plugin = false;
-	private ArrayList<ITemplateSection> templates = new ArrayList<>();
+	private final ArrayList<ITemplateSection> templates = new ArrayList<>();
 
 	@Override
 	public String getClassname() {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/TemplateListSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/TemplateListSelectionPage.java
index 0dc089d1c1..15f28ce2c9 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/TemplateListSelectionPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/TemplateListSelectionPage.java
@@ -38,7 +38,7 @@
 import org.eclipse.ui.PlatformUI;
 
 public class TemplateListSelectionPage extends WizardListSelectionPage {
-	private ContentPage fContentPage;
+	private final ContentPage fContentPage;
 	private Button fUseTemplate;
 	private String fInitialTemplateId;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/BaseManifestOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/BaseManifestOperation.java
index 4150c5829a..938da2e770 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/BaseManifestOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/BaseManifestOperation.java
@@ -43,7 +43,7 @@
 
 public abstract class BaseManifestOperation implements IRunnableWithProgress {
 
-	private Shell fShell;
+	private final Shell fShell;
 	protected String fPluginId;
 
 	public BaseManifestOperation(Shell shell, String pluginId) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/BaseProductCreationOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/BaseProductCreationOperation.java
index 2e6ba8768c..00dba30401 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/BaseProductCreationOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/BaseProductCreationOperation.java
@@ -59,7 +59,7 @@
 
 public class BaseProductCreationOperation extends WorkspaceModifyOperation {
 
-	private IFile fFile;
+	private final IFile fFile;
 
 	public BaseProductCreationOperation(IFile file) {
 		fFile = file;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionOperation.java
index 87690bb269..f2e9bbbee4 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionOperation.java
@@ -55,9 +55,9 @@ public class ProductDefinitionOperation extends BaseManifestOperation {
 
 	private static final String APPLICATION_CSS = "applicationCSS"; //$NON-NLS-1$
 
-	private String fProductId;
-	private String fApplication;
-	private IProduct fProduct;
+	private final String fProductId;
+	private final String fApplication;
+	private final IProduct fProduct;
 
 	protected IProject fProject;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionWizard.java
index 103328e943..b856d0bc93 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionWizard.java
@@ -27,7 +27,7 @@ public class ProductDefinitionWizard extends Wizard {
 	private String fProductId;
 	private String fPluginId;
 	private String fApplication;
-	private IProduct fProduct;
+	private final IProduct fProduct;
 
 	public ProductDefinitionWizard(IProduct product) {
 		fProduct = product;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitonWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitonWizardPage.java
index 9a60f95794..c901fb54a8 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitonWizardPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitonWizardPage.java
@@ -57,9 +57,9 @@ public class ProductDefinitonWizardPage extends WizardPage implements IHyperlink
 	private Text fProductText;
 	private Set<String> fProductSet;
 	private Combo fApplicationCombo;
-	private IProduct fProduct;
+	private final IProduct fProduct;
 
-	private ModifyListener fListener = e -> validatePage();
+	private final ModifyListener fListener = e -> validatePage();
 
 	public ProductDefinitonWizardPage(String pageName, IProduct product) {
 		super(pageName);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFromConfigOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFromConfigOperation.java
index 5698d0bd31..fc46b06071 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFromConfigOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFromConfigOperation.java
@@ -45,7 +45,7 @@
  */
 public class ProductFromConfigOperation extends BaseProductCreationOperation {
 
-	private ILaunchConfiguration fLaunchConfiguration;
+	private final ILaunchConfiguration fLaunchConfiguration;
 
 	public ProductFromConfigOperation(IFile file, ILaunchConfiguration config) {
 		super(file);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFromExtensionOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFromExtensionOperation.java
index de72a400dc..e463c5d758 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFromExtensionOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFromExtensionOperation.java
@@ -29,7 +29,7 @@
 
 public class ProductFromExtensionOperation extends BaseProductCreationOperation {
 
-	private String fId;
+	private final String fId;
 
 	public ProductFromExtensionOperation(IFile file, String productId) {
 		super(file);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java
index 526cb03c96..4086b00af7 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java
@@ -57,8 +57,8 @@ public class ProductIntroOperation extends BaseManifestOperation implements IVar
 
 	protected String fIntroId;
 	private Shell fShell;
-	private IProduct fProduct;
-	private IProject fProject;
+	private final IProduct fProduct;
+	private final IProject fProject;
 	private static final String INTRO_POINT = "org.eclipse.ui.intro"; //$NON-NLS-1$
 	private static final String INTRO_CONFIG_POINT = "org.eclipse.ui.intro.config"; //$NON-NLS-1$
 	private static final String INTRO_CLASS = "org.eclipse.ui.intro.config.CustomizableIntroPart"; //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroWizard.java
index dd32219483..848046b80d 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroWizard.java
@@ -26,12 +26,12 @@ public class ProductIntroWizard extends Wizard {
 
 	private ProductDefinitonWizardPage fProductDefinitionPage;
 	private ProductIntroWizardPage fNewIntroPage;
-	private boolean fNeedNewProduct;
+	private final boolean fNeedNewProduct;
 	private String fIntroId;
 	private String fProductId;
 	private String fPluginId;
 	private String fApplication;
-	private IProduct fProduct;
+	private final IProduct fProduct;
 
 	public ProductIntroWizard(IProduct product, boolean needNewProduct) {
 		setDefaultPageImageDescriptor(PDEPluginImages.DESC_DEFCON_WIZ);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroWizardPage.java
index 6830ba8150..22dd825fbe 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroWizardPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroWizardPage.java
@@ -52,10 +52,10 @@ public class ProductIntroWizardPage extends WizardPage implements IHyperlinkList
 
 	private Text fPluginText;
 	private Text fIntroIdText;
-	private TreeSet<String> fIntroIds;
-	private IProduct fProduct;
+	private final TreeSet<String> fIntroIds;
+	private final IProduct fProduct;
 
-	private ModifyListener fListener = e -> validatePage();
+	private final ModifyListener fListener = e -> validatePage();
 
 	public ProductIntroWizardPage(String pageName, IProduct product) {
 		super(pageName);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectCreationOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectCreationOperation.java
index 503174f0cd..489be1f241 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectCreationOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectCreationOperation.java
@@ -43,10 +43,10 @@
 import org.eclipse.ui.part.ISetSelectionTarget;
 
 public class NewSiteProjectCreationOperation extends WorkspaceModifyOperation {
-	private Display fDisplay;
-	private IProject fProject;
-	private IPath fPath;
-	private String fWebLocation;
+	private final Display fDisplay;
+	private final IProject fProject;
+	private final IPath fPath;
+	private final String fWebLocation;
 
 	public NewSiteProjectCreationOperation(Display display, IProject project, IPath path, String webLocation) {
 		fDisplay = display;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/target/TargetCreationPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/target/TargetCreationPage.java
index e5493fc3d6..3631e4a0cc 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/target/TargetCreationPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/target/TargetCreationPage.java
@@ -51,7 +51,7 @@ public class TargetCreationPage extends WizardSelectionPage {
 	private Combo fTargets;
 	private String[] fTargetIds;
 	private String templateTargetId;
-	private ITargetDefinition[] fTargetDefs = new ITargetDefinition[4];
+	private final ITargetDefinition[] fTargetDefs = new ITargetDefinition[4];
 
 	public TargetCreationPage(String pageName) {
 		super(pageName);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ControlStack.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ControlStack.java
index 827f65d2d8..828d6fbbe6 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ControlStack.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ControlStack.java
@@ -18,8 +18,8 @@
 import org.eclipse.pde.ui.templates.IVariableProvider;
 
 public class ControlStack {
-	private Stack<Entry> stack;
-	private PreprocessorParser parser;
+	private final Stack<Entry> stack;
+	private final PreprocessorParser parser;
 
 	static class Entry {
 		boolean value;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/NewExtensionTemplateWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/NewExtensionTemplateWizard.java
index b63f3d0aae..8085709340 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/NewExtensionTemplateWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/NewExtensionTemplateWizard.java
@@ -49,7 +49,7 @@
  */
 
 public class NewExtensionTemplateWizard extends Wizard implements IExtensionWizard {
-	private ITemplateSection fSection;
+	private final ITemplateSection fSection;
 	private IProject fProject;
 	private IPluginModelBase fModel;
 	private boolean fUpdatedDependencies;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PreprocessorParser.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PreprocessorParser.java
index 85af6d5d8b..bb5742c291 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PreprocessorParser.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PreprocessorParser.java
@@ -43,7 +43,7 @@ public class PreprocessorParser {
 
 	private IVariableProvider provider;
 	private String line;
-	private Stack<RootEntry> exprStack;
+	private final Stack<RootEntry> exprStack;
 	private int loc;
 	private String tvalue;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/TemplateSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/TemplateSelectionPage.java
index 6dfa5b56ce..46a5b680d4 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/TemplateSelectionPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/TemplateSelectionPage.java
@@ -48,7 +48,7 @@
 import org.eclipse.ui.forms.widgets.FormToolkit;
 
 public class TemplateSelectionPage extends WizardPage {
-	private ITemplateSection[] fCandidates;
+	private final ITemplateSection[] fCandidates;
 	private ArrayList<WizardPage> fVisiblePages;
 	private WizardCheckboxTablePart fTablePart;
 	private FormBrowser fDescriptionBrowser;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertProjectToPluginOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertProjectToPluginOperation.java
index 76b018d6b9..6a86d92f86 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertProjectToPluginOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertProjectToPluginOperation.java
@@ -65,8 +65,8 @@
  */
 public class ConvertProjectToPluginOperation extends WorkspaceModifyOperation {
 
-	private IProject[] projectsToConvert;
-	private boolean enableApiAnalysis;
+	private final IProject[] projectsToConvert;
+	private final boolean enableApiAnalysis;
 
 	private String fLibraryName;
 	private String[] fSrcEntries;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectWizard.java
index 677bcd7642..da45f06e38 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectWizard.java
@@ -32,8 +32,8 @@ public class ConvertedProjectWizard extends NewWizard {
 	private static final String STORE_SECTION = "ConvertedProjectWizard"; //$NON-NLS-1$
 
 	private ConvertedProjectsPage mainPage;
-	private Vector<IProject> selected;
-	private IProject[] fUnconverted;
+	private final Vector<IProject> selected;
+	private final IProject[] fUnconverted;
 
 	public ConvertedProjectWizard(IProject[] projects, Vector<IProject> initialSelection) {
 		setDefaultPageImageDescriptor(PDEPluginImages.DESC_CONVJPPRJ_WIZ);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectsPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectsPage.java
index c382ad526c..e82fb92468 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectsPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectsPage.java
@@ -54,12 +54,12 @@ public class ConvertedProjectsPage extends WizardPage {
 	/**
 	 * Items to select when the table is created, based off what the user had selected when opening the wizard
 	 */
-	private IProject[] fInitialSelection;
+	private final IProject[] fInitialSelection;
 
 	/**
 	 * All items to put in the table, consists of all unconverted projects in the workspace
 	 */
-	private IProject[] fAllUnconvertedProjects;
+	private final IProject[] fAllUnconvertedProjects;
 
 	/**
 	 * Label provider for the table
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/OrganizeManifestsWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/OrganizeManifestsWizardPage.java
index c7255fce37..10e12c9166 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/OrganizeManifestsWizardPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/OrganizeManifestsWizardPage.java
@@ -65,7 +65,7 @@ public class OrganizeManifestsWizardPage extends UserInputWizardPage implements
 	private Button[] fTopLevelButtons; // used for setting page complete state
 
 	private OrganizeManifestsProcessor fProcessor;
-	private Set<IProject> fCustomProjects;
+	private final Set<IProject> fCustomProjects;
 
 	private static String title = PDEUIMessages.OrganizeManifestsWizardPage_title;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateBuildpathWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateBuildpathWizard.java
index d081cbbca6..514f25ad69 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateBuildpathWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateBuildpathWizard.java
@@ -24,8 +24,8 @@
 
 public class UpdateBuildpathWizard extends Wizard {
 	private UpdateBuildpathWizardPage page1;
-	private IPluginModelBase[] fSelected;
-	private IPluginModelBase[] fUnupdated;
+	private final IPluginModelBase[] fSelected;
+	private final IPluginModelBase[] fUnupdated;
 	private static final String STORE_SECTION = "UpdateBuildpathWizard"; //$NON-NLS-1$
 
 	public UpdateBuildpathWizard(IPluginModelBase[] models, IPluginModelBase[] selected) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateBuildpathWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateBuildpathWizardPage.java
index 2236a7c86b..7122bd3c39 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateBuildpathWizardPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateBuildpathWizardPage.java
@@ -33,10 +33,10 @@
 import org.eclipse.ui.forms.widgets.FormToolkit;
 
 public class UpdateBuildpathWizardPage extends WizardPage {
-	private IPluginModelBase[] fSelected;
-	private IPluginModelBase[] fUnmigrated;
+	private final IPluginModelBase[] fSelected;
+	private final IPluginModelBase[] fUnmigrated;
 	private CheckboxTableViewer pluginListViewer;
-	private TablePart tablePart;
+	private final TablePart tablePart;
 
 	public class BuildpathContentProvider implements IStructuredContentProvider {
 		@Override
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/BundlesTab.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/BundlesTab.java
index 9dfae90e02..d8130c8afd 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/BundlesTab.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/BundlesTab.java
@@ -44,8 +44,8 @@
  */
 public class BundlesTab extends AbstractLauncherTab {
 
-	private Image fImage;
-	private BlockAdapter fBlock;
+	private final Image fImage;
+	private final BlockAdapter fBlock;
 	OSGiFrameworkBlock fFrameworkBlock;
 
 	private static final int PLUGIN_SELECTION = 1;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/ConfigurationTab.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/ConfigurationTab.java
index eec29fa02d..669b553478 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/ConfigurationTab.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/ConfigurationTab.java
@@ -44,11 +44,11 @@
  */
 public class ConfigurationTab extends AbstractLauncherTab implements IPDELauncherConstants {
 
-	private ConfigurationAreaBlock fConfigurationArea;
-	private ConfigurationTemplateBlock fTemplateArea;
-	private SoftwareInstallBlock fSoftwareInstallArea;
-	private Image fImage;
-	private boolean fJUnitConfig;
+	private final ConfigurationAreaBlock fConfigurationArea;
+	private final ConfigurationTemplateBlock fTemplateArea;
+	private final SoftwareInstallBlock fSoftwareInstallArea;
+	private final Image fImage;
+	private final boolean fJUnitConfig;
 
 	/**
 	 * Constructor.  Equivalent to ConfigurationTab(false).
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/MainTab.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/MainTab.java
index dd12993f58..ef62571adb 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/MainTab.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/MainTab.java
@@ -57,7 +57,7 @@ public class MainTab extends AbstractLauncherTab implements IPDELauncherConstant
 	protected ProgramBlock fProgramBlock;
 	protected JREBlock fJreBlock;
 
-	private Image fImage;
+	private final Image fImage;
 
 	/**
 	 * Contructor to create a new main tab
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/OSGiSettingsTab.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/OSGiSettingsTab.java
index 903b7dbe99..808268ccab 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/OSGiSettingsTab.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/OSGiSettingsTab.java
@@ -42,9 +42,9 @@
  */
 public class OSGiSettingsTab extends AbstractLauncherTab {
 
-	private JREBlock fJREBlock;
-	private ConfigurationAreaBlock fConfigurationBlock;
-	private Image fImage;
+	private final JREBlock fJREBlock;
+	private final ConfigurationAreaBlock fConfigurationBlock;
+	private final Image fImage;
 	private boolean fInitializing = false;
 
 	/**
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/PluginsTab.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/PluginsTab.java
index 9e9e0bb37a..69d9647453 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/PluginsTab.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/PluginsTab.java
@@ -52,13 +52,13 @@
  */
 public class PluginsTab extends AbstractLauncherTab {
 
-	private Image fImage;
+	private final Image fImage;
 
 	private Combo fSelectionCombo;
-	private BlockAdapter fBlock;
+	private final BlockAdapter fBlock;
 	private Combo fDefaultAutoStart;
 	private Spinner fDefaultStartLevel;
-	private Listener fListener;
+	private final Listener fListener;
 
 	private static final int DEFAULT_SELECTION = 0;
 	private static final int PLUGIN_SELECTION = 1;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/TracingTab.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/TracingTab.java
index 75aa4308a8..636dd712d3 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/TracingTab.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/TracingTab.java
@@ -41,8 +41,8 @@
  */
 public class TracingTab extends AbstractLauncherTab {
 
-	private Image fImage;
-	private TracingBlock fTracingBlock;
+	private final Image fImage;
+	private final TracingBlock fTracingBlock;
 
 	/**
 	 * Constructor
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/BaseOptionTemplateSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/BaseOptionTemplateSection.java
index a1931cf094..96aea4b115 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/BaseOptionTemplateSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/BaseOptionTemplateSection.java
@@ -38,7 +38,7 @@
  */
 
 public abstract class BaseOptionTemplateSection extends AbstractTemplateSection {
-	private Hashtable<String, TemplateOption> options = new Hashtable<>();
+	private final Hashtable<String, TemplateOption> options = new Hashtable<>();
 
 	/**
 	 * Adds a boolean option with a provided name, label and initial value.
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/BlankField.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/BlankField.java
index b475a23310..6cbca81988 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/BlankField.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/BlankField.java
@@ -34,7 +34,7 @@ private static String getUniqueName() {
 	}
 
 	private Label fblankLabel;
-	private int fheight;
+	private final int fheight;
 
 	/**
 	 * The default constructor.
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/ChoiceOption.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/ChoiceOption.java
index 8285df83be..121b4800be 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/ChoiceOption.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/ChoiceOption.java
@@ -32,7 +32,7 @@
  */
 @Deprecated
 public class ChoiceOption extends TemplateOption {
-	private String[][] choices;
+	private final String[][] choices;
 	private Control labelControl;
 	private Button[] buttons;
 	private boolean blockListener;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/NewPluginProjectFromTemplateWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/NewPluginProjectFromTemplateWizard.java
index 3073a8bf49..9949adb9a4 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/NewPluginProjectFromTemplateWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/NewPluginProjectFromTemplateWizard.java
@@ -77,7 +77,7 @@ public abstract class NewPluginProjectFromTemplateWizard extends NewWizard imple
 	 */
 	public static final String TAG_WIZARD = "wizard"; //$NON-NLS-1$
 
-	private AbstractFieldData fPluginData;
+	private final AbstractFieldData fPluginData;
 	private NewProjectCreationPage fProjectPage;
 	private PluginContentPage fContentPage;
 	private IPluginContentWizard fTemplateWizard;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/NewPluginTemplateWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/NewPluginTemplateWizard.java
index bdd5c94849..28853f2f0a 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/NewPluginTemplateWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/NewPluginTemplateWizard.java
@@ -26,7 +26,7 @@
  * @since 2.0
  */
 public abstract class NewPluginTemplateWizard extends AbstractNewPluginTemplateWizard {
-	private ITemplateSection[] sections;
+	private final ITemplateSection[] sections;
 
 	/**
 	 * Creates a new template wizard.
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/OptionTemplateSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/OptionTemplateSection.java
index a1a0edd03a..3f8aba481e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/OptionTemplateSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/OptionTemplateSection.java
@@ -44,7 +44,7 @@
  * @since 2.0
  */
 public abstract class OptionTemplateSection extends BaseOptionTemplateSection {
-	private ArrayList<TemplatePage> pages = new ArrayList<>();
+	private final ArrayList<TemplatePage> pages = new ArrayList<>();
 
 	private static class TemplatePage {
 		WizardPage page;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/OptionTemplateWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/OptionTemplateWizardPage.java
index 4cb9ea48ea..c4c9081819 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/OptionTemplateWizardPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/OptionTemplateWizardPage.java
@@ -34,9 +34,9 @@
  */
 
 public class OptionTemplateWizardPage extends WizardPage {
-	private BaseOptionTemplateSection section;
-	private List<TemplateOption> options;
-	private String helpContextId;
+	private final BaseOptionTemplateSection section;
+	private final List<TemplateOption> options;
+	private final String helpContextId;
 
 	/**
 	 * The constructor.
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/TemplateField.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/TemplateField.java
index b9ce977133..6e388a4574 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/TemplateField.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/TemplateField.java
@@ -28,7 +28,7 @@
  * @since 2.0
  */
 public abstract class TemplateField {
-	private BaseOptionTemplateSection section;
+	private final BaseOptionTemplateSection section;
 	private String label;
 
 	/**
diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/ProjectNamesPage.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/ProjectNamesPage.java
index 9910664adc..35d2e06f42 100644
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/ProjectNamesPage.java
+++ b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/ProjectNamesPage.java
@@ -34,7 +34,7 @@
 import org.eclipse.ui.PlatformUI;
 
 public class ProjectNamesPage extends WizardPage {
-	private SampleWizard wizard;
+	private final SampleWizard wizard;
 	private Composite container;
 
 	public ProjectNamesPage(SampleWizard wizard) {
diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/ReviewPage.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/ReviewPage.java
index 306bedf8a6..29d2d22851 100644
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/ReviewPage.java
+++ b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/ReviewPage.java
@@ -28,7 +28,7 @@
 import org.eclipse.ui.forms.widgets.ScrolledFormText;
 
 public class ReviewPage extends WizardPage {
-	private SampleWizard wizard;
+	private final SampleWizard wizard;
 	private ScrolledFormText formText;
 
 	public ReviewPage(SampleWizard wizard) {
diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleEditor.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleEditor.java
index cb24210f84..ca57a5097d 100644
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleEditor.java
+++ b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleEditor.java
@@ -64,7 +64,7 @@ public class SampleEditor extends EditorPart {
 	private ScrolledForm form;
 	private FormText descText;
 	private FormText instText;
-	private ILaunchShortcut defaultShortcut;
+	private final ILaunchShortcut defaultShortcut;
 	private InputFileListener inputFileListener;
 
 	class InputFileListener implements IResourceChangeListener, IResourceDeltaVisitor {
diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleOperation.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleOperation.java
index a0df8a666c..fded4e4238 100644
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleOperation.java
+++ b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleOperation.java
@@ -48,13 +48,13 @@
 public class SampleOperation implements IRunnableWithProgress {
 	private static final String SAMPLE_PROPERTIES = "sample.properties"; //$NON-NLS-1$
 
-	private IConfigurationElement sample;
+	private final IConfigurationElement sample;
 
-	private String[] projectNames;
+	private final String[] projectNames;
 
 	private IFile sampleManifest;
 
-	private IOverwriteQuery query;
+	private final IOverwriteQuery query;
 
 	private boolean yesToAll;
 
diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleStandbyContent.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleStandbyContent.java
index 92c7c53f55..e542971e33 100644
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleStandbyContent.java
+++ b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleStandbyContent.java
@@ -62,7 +62,7 @@ public class SampleStandbyContent implements IStandbyContentPart {
 	private String launchTarget;
 	private FormText descText;
 	private FormText instText;
-	private ILaunchShortcut defaultShortcut;
+	private final ILaunchShortcut defaultShortcut;
 	private IConfigurationElement sample;
 	// cached input.
 	private String input;
diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleWizard.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleWizard.java
index c5a1ab6dc7..3e499554d4 100644
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleWizard.java
+++ b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleWizard.java
@@ -40,10 +40,10 @@
 import org.eclipse.ui.ide.IDE;
 
 public class SampleWizard extends Wizard implements INewWizard, IExecutableExtension {
-	private IConfigurationElement[] samples;
+	private final IConfigurationElement[] samples;
 	private IConfigurationElement selection;
-	private ProjectNamesPage namesPage;
-	private ReviewPage lastPage;
+	private final ProjectNamesPage namesPage;
+	private final ReviewPage lastPage;
 
 	private boolean sampleEditorNeeded = true;
 	private boolean switchPerspective = true;
diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SelectionPage.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SelectionPage.java
index 64ce398410..fe4935bd5f 100644
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SelectionPage.java
+++ b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SelectionPage.java
@@ -34,9 +34,9 @@
 import org.eclipse.ui.PlatformUI;
 
 public class SelectionPage extends WizardPage {
-	private TablePart part;
+	private final TablePart part;
 	private Text desc;
-	private SampleWizard wizard;
+	private final SampleWizard wizard;
 
 	class SelectionPart extends TablePart {
 		public SelectionPart() {
@@ -67,7 +67,7 @@ public Object[] getElements(Object input) {
 	}
 
 	static class SampleLabelProvider extends LabelProvider {
-		private Image image;
+		private final Image image;
 
 		public SampleLabelProvider() {
 			image = PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_NEWEXP_TOOL);
diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/ShowSampleAction.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/ShowSampleAction.java
index bd1e71c814..4eeeae9df7 100644
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/ShowSampleAction.java
+++ b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/ShowSampleAction.java
@@ -64,7 +64,7 @@ public class ShowSampleAction extends Action implements IIntroAction {
 	private static final String UPDATE_SITE = "http://www.eclipse.org/pde/samples/site.xml"; //$NON-NLS-1$
 	private String sampleId;
 
-	private ProvisioningUI provUI;
+	private final ProvisioningUI provUI;
 
 	/**
 	 *
diff --git a/ui/org.eclipse.pde.unittest.junit/src/org/eclipse/pde/unittest/junit/launcher/JUnitPluginLaunchConfigurationDelegate.java b/ui/org.eclipse.pde.unittest.junit/src/org/eclipse/pde/unittest/junit/launcher/JUnitPluginLaunchConfigurationDelegate.java
index 5d18014d9d..3d3a272f13 100644
--- a/ui/org.eclipse.pde.unittest.junit/src/org/eclipse/pde/unittest/junit/launcher/JUnitPluginLaunchConfigurationDelegate.java
+++ b/ui/org.eclipse.pde.unittest.junit/src/org/eclipse/pde/unittest/junit/launcher/JUnitPluginLaunchConfigurationDelegate.java
@@ -905,7 +905,7 @@ public String[][] internalGetClasspathAndModulepath(ILaunchConfiguration configu
 
 	private static class ClasspathLocalizer {
 
-		private boolean fInDevelopmentMode;
+		private final boolean fInDevelopmentMode;
 
 		public ClasspathLocalizer(boolean inDevelopmentMode) {
 			fInDevelopmentMode = inDevelopmentMode;
diff --git a/ui/org.eclipse.tools.layout.spy/src/org/eclipse/tools/layout/spy/internal/dialogs/ControlSelector.java b/ui/org.eclipse.tools.layout.spy/src/org/eclipse/tools/layout/spy/internal/dialogs/ControlSelector.java
index 3427afd9d2..d7d86a9ff7 100644
--- a/ui/org.eclipse.tools.layout.spy/src/org/eclipse/tools/layout/spy/internal/dialogs/ControlSelector.java
+++ b/ui/org.eclipse.tools.layout.spy/src/org/eclipse/tools/layout/spy/internal/dialogs/ControlSelector.java
@@ -43,14 +43,14 @@
 public class ControlSelector {
 	private static final int EDGE_SIZE = 4;
 
-	private Shell overlay;
+	private final Shell overlay;
 	private final Color selectionRectangleColor = new Color(255, 255, 0);
-	private Display display;
-	private WritableValue<@Nullable Control> currentSelection = new WritableValue<>(null, null);
+	private final Display display;
+	private final WritableValue<@Nullable Control> currentSelection = new WritableValue<>(null, null);
 	private Region region;
-	private Consumer<@Nullable Control> callback;
-	private Listener moveFilter = this::mouseMove;
-	private Listener selectFilter = this::select;
+	private final Consumer<@Nullable Control> callback;
+	private final Listener moveFilter = this::mouseMove;
+	private final Listener selectFilter = this::select;
 
 	/**
 	 * Instantiates and opens the control selector.
diff --git a/ui/org.eclipse.tools.layout.spy/src/org/eclipse/tools/layout/spy/internal/dialogs/LayoutSpyDialog.java b/ui/org.eclipse.tools.layout.spy/src/org/eclipse/tools/layout/spy/internal/dialogs/LayoutSpyDialog.java
index 2d3dbb2793..b8a1a70f6d 100644
--- a/ui/org.eclipse.tools.layout.spy/src/org/eclipse/tools/layout/spy/internal/dialogs/LayoutSpyDialog.java
+++ b/ui/org.eclipse.tools.layout.spy/src/org/eclipse/tools/layout/spy/internal/dialogs/LayoutSpyDialog.java
@@ -90,8 +90,8 @@ public class LayoutSpyDialog {
 	private Shell overlay;
 
 	// Model
-	private WritableValue<@Nullable Composite> parentControl = new WritableValue<>(null, null);
-	private WritableValue<Boolean> controlSelectorOpen = new WritableValue<>(Boolean.FALSE, null);
+	private final WritableValue<@Nullable Composite> parentControl = new WritableValue<>(null, null);
+	private final WritableValue<Boolean> controlSelectorOpen = new WritableValue<>(Boolean.FALSE, null);
 	private ComputedList<Control> listContents;
 	private IViewerObservableValue<@Nullable Control> selectedChild;
 	private final Color parentRectangleColor = new Color(255, 0, 0);
diff --git a/ui/org.eclipse.tools.layout.spy/src/org/eclipse/tools/layout/spy/internal/displayfilter/LayoutIssuesDebugFilter.java b/ui/org.eclipse.tools.layout.spy/src/org/eclipse/tools/layout/spy/internal/displayfilter/LayoutIssuesDebugFilter.java
index 888048a5c8..d4e2585016 100644
--- a/ui/org.eclipse.tools.layout.spy/src/org/eclipse/tools/layout/spy/internal/displayfilter/LayoutIssuesDebugFilter.java
+++ b/ui/org.eclipse.tools.layout.spy/src/org/eclipse/tools/layout/spy/internal/displayfilter/LayoutIssuesDebugFilter.java
@@ -24,8 +24,8 @@
 public class LayoutIssuesDebugFilter implements Listener {
 	static LayoutIssuesDebugFilter filter;
 
-	private int extraCompositeMargin;
-	private boolean toolTip;
+	private final int extraCompositeMargin;
+	private final boolean toolTip;
 
 	public static final String IGNORE_BY_LAYOUT_ISSUES_DEBUG_FILTER = "IGNORE_BY_LayoutIssuesDebugFilter";
 
diff --git a/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/TracingComponentColumnEditingSupport.java b/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/TracingComponentColumnEditingSupport.java
index 410f128f93..8058899084 100644
--- a/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/TracingComponentColumnEditingSupport.java
+++ b/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/TracingComponentColumnEditingSupport.java
@@ -141,7 +141,7 @@ protected void setValue(final Object element, final Object value) {
 	 * The column index of the editors. One of {@link TracingConstants#LABEL_COLUMN_INDEX} or
 	 * {@link TracingConstants#VALUE_COLUMN_INDEX}
 	 */
-	private int columnIndex;
+	private final int columnIndex;
 
 	/**
 	 * The {@link CellEditor} for the value column
diff --git a/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/providers/TracingComponentColumnLabelProvider.java b/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/providers/TracingComponentColumnLabelProvider.java
index ef08870289..908fb236dc 100644
--- a/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/providers/TracingComponentColumnLabelProvider.java
+++ b/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/providers/TracingComponentColumnLabelProvider.java
@@ -44,5 +44,5 @@ public String getText(final Object element) {
 	 * The column index. One of {@link TracingConstants#LABEL_COLUMN_INDEX} or
 	 * {@link TracingConstants#VALUE_COLUMN_INDEX}
 	 */
-	private int columnIndex;
+	private final int columnIndex;
 }
\ No newline at end of file