Clean Code for bundles/org.eclipse.jface.text

bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSummary.java

@@ -82,11 +82,11 @@ public void run() {
 	}
 
 
-	private ProjectionViewer fProjectionViewer;
-	private IAnnotationAccess fAnnotationAccess;
+	private final ProjectionViewer fProjectionViewer;
+	private final IAnnotationAccess fAnnotationAccess;
 	private List<String> fConfiguredAnnotationTypes;
 
-	private Object fLock= new Object();
+	private final Object fLock= new Object();
 	private IProgressMonitor fProgressMonitor;
 	private volatile Summarizer fSummarizer;
 

bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSupport.java

@@ -143,9 +143,9 @@ public void projectionDisabled() {
 		}
 	}
 
-	private ProjectionViewer fViewer;
-	private IAnnotationAccess fAnnotationAccess;
-	private ISharedTextColors fSharedTextColors;
+	private final ProjectionViewer fViewer;
+	private final IAnnotationAccess fAnnotationAccess;
+	private final ISharedTextColors fSharedTextColors;
 	private List<String> fSummarizableTypes;
 	private IInformationControlCreator fInformationControlCreator;
 	private IInformationControlCreator fInformationPresenterControlCreator;

bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java

@@ -133,7 +133,7 @@ private void processModelChanged(IAnnotationModel model, AnnotationModelEvent ev
 	 */
 	private class ReplaceVisibleDocumentExecutor implements IDocumentListener {
 
-		private IDocument fSlaveDocument;
+		private final IDocument fSlaveDocument;
 		private IDocument fExecutionTrigger;
 
 		/**
@@ -280,7 +280,7 @@ private void computeExpectedExecutionCosts() {
 	/** The projection annotation model used by this viewer. */
 	private ProjectionAnnotationModel fProjectionAnnotationModel;
 	/** The annotation model listener */
-	private IAnnotationModelListener fAnnotationModelListener= new AnnotationModelListener();
+	private final IAnnotationModelListener fAnnotationModelListener= new AnnotationModelListener();
 	/** The projection summary. */
 	private ProjectionSummary fProjectionSummary;
 	/** Indication that an annotation world change has not yet been processed. */
@@ -290,9 +290,9 @@ private void computeExpectedExecutionCosts() {
 	/** The list of projection listeners. */
 	private List<IProjectionListener> fProjectionListeners;
 	/** Internal lock for protecting the list of pending requests */
-	private Object fLock= new Object();
+	private final Object fLock= new Object();
 	/** The list of pending requests */
-	private List<AnnotationModelEvent> fPendingRequests= new ArrayList<>();
+	private final List<AnnotationModelEvent> fPendingRequests= new ArrayList<>();
 	/** The replace-visible-document execution trigger */
 	private IDocument fReplaceVisibleDocumentExecutionTrigger;
 	/** <code>true</code> if projection was on the last time we switched to segmented mode. */

bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/SourceViewerInformationControl.java

@@ -66,7 +66,7 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio
 	/** The text font (do not dispose!) */
 	private Font fTextFont;
 	/** The control's source viewer */
-	private SourceViewer fViewer;
+	private final SourceViewer fViewer;
 	/** The optional status field. */
 	private Label fStatusField;
 	/** The separator for the optional status field. */

bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/AbstractControlContentAssistSubjectAdapter.java

@@ -58,11 +58,11 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon
 	/**
 	 * VerifyKeyListeners for the control.
 	 */
-	private List<VerifyKeyListener> fVerifyKeyListeners;
+	private final List<VerifyKeyListener> fVerifyKeyListeners;
 	/**
 	 * KeyListeners for the control.
 	 */
-	private Set<KeyListener> fKeyListeners;
+	private final Set<KeyListener> fKeyListeners;
 	/**
 	 * The Listener installed on the control which passes events to
 	 * {@link #fVerifyKeyListeners fVerifyKeyListeners} and {@link #fKeyListeners}.

bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java

@@ -60,7 +60,7 @@ private class InternalDocument extends Document {
 		/**
 		 * Updates this document with changes in {@link #fCombo}.
 		 */
-		private ModifyListener fModifyListener;
+		private final ModifyListener fModifyListener;
 
 		private InternalDocument() {
 			super(fCombo.getText());
@@ -80,8 +80,8 @@ public void replace(int pos, int length, String text) throws BadLocationExceptio
 	/**
 	 * The combo widget.
 	 */
-	private Combo fCombo;
-	private HashMap<SelectionListener, Listener> fModifyListeners;
+	private final Combo fCombo;
+	private final HashMap<SelectionListener, Listener> fModifyListeners;
 
 	/**
 	 * Creates a content assist subject control adapter for the given combo.

bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContextInformationValidator.java

@@ -32,7 +32,7 @@
 public final class SubjectControlContextInformationValidator implements ISubjectControlContextInformationValidator {
 
 	/** The content assist processor. */
-	private IContentAssistProcessor fProcessor;
+	private final IContentAssistProcessor fProcessor;
 	/** The context information to be validated. */
 	private IContextInformation fContextInformation;
 	/** The content assist subject control. */

bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java

@@ -50,7 +50,7 @@ private class InternalDocument extends Document {
 		/**
 		 * Updates this document with changes in this adapter's text widget.
 		 */
-		private ModifyListener fModifyListener;
+		private final ModifyListener fModifyListener;
 
 		private InternalDocument() {
 			super(fText.getText());
@@ -68,9 +68,9 @@ public void replace(int pos, int length, String text) throws BadLocationExceptio
 	}
 
 	/** The text. */
-	private Text fText;
+	private final Text fText;
 	/** The modify listeners. */
-	private HashMap<SelectionListener, Listener> fModifyListeners= new HashMap<>();
+	private final HashMap<SelectionListener, Listener> fModifyListeners= new HashMap<>();
 
 	/**
 	 * Creates a content assist subject control adapter for the given text widget.

bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/TableOwnerDrawSupport.java

@@ -36,7 +36,7 @@ public class TableOwnerDrawSupport implements Listener {
 	private static final String STYLED_RANGES_KEY= "styled_ranges"; //$NON-NLS-1$
 
 	// shared text layout
-	private TextLayout fSharedLayout;
+	private final TextLayout fSharedLayout;
 
 	private int fDeltaOfLastMeasure;
 

bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControl.java

@@ -161,7 +161,7 @@ public static boolean isAvailable(Composite parent) {
 	 * The listeners to be notified when the input changed.
 	 * @since 3.4
 	 */
-	private ListenerList<IInputChangedListener> fInputChangeListeners= new ListenerList<>(ListenerList.IDENTITY);
+	private final ListenerList<IInputChangedListener> fInputChangeListeners= new ListenerList<>(ListenerList.IDENTITY);
 
 	/**
 	 * The symbolic name of the font used for size computations, or <code>null</code> to use dialog font.

bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java

@@ -80,7 +80,7 @@ public class HTML2TextReader extends SubstitutionReader {
 	}
 
 	private int fCounter= 0;
-	private TextPresentation fTextPresentation;
+	private final TextPresentation fTextPresentation;
 	private int fBold= 0;
 	private int fItalic= 0;
 	private int fStrikeout= 0;

bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLTextPresenter.java

@@ -43,7 +43,7 @@ public class HTMLTextPresenter implements DefaultInformationControl.IInformation
 
 	private static final String LINE_DELIM= System.lineSeparator();
 
-	private boolean fEnforceUpperLineLimit;
+	private final boolean fEnforceUpperLineLimit;
 
 	public HTMLTextPresenter(boolean enforceUpperLineLimit) {
 		fEnforceUpperLineLimit= enforceUpperLineLimit;

bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SubstitutionTextReader.java

@@ -30,7 +30,7 @@ public abstract class SubstitutionTextReader extends SingleCharReader {
 
 	protected static final String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
 
-	private Reader fReader;
+	private final Reader fReader;
 	protected boolean fWasWhiteSpace;
 	private int fCharAfterWhiteSpace;
 
@@ -40,7 +40,7 @@ public abstract class SubstitutionTextReader extends SingleCharReader {
 	private boolean fSkipWhiteSpace= true;
 
 	private boolean fReadFromBuffer;
-	private StringBuilder fBuffer;
+	private final StringBuilder fBuffer;
 	private int fIndex;
 
 

bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/AdditionalInfoController2.java

@@ -69,9 +69,9 @@ public void widgetDefaultSelected(SelectionEvent e) {
 	/** Object to synchronize initial display of additional info */
 	private Object fStartSignal;
 	/** The table selection listener */
-	private SelectionListener fSelectionListener= new TableSelectionListener();
+	private final SelectionListener fSelectionListener= new TableSelectionListener();
 	/** The delay after which additional information is displayed */
-	private int fDelay;
+	private final int fDelay;
 
 
 	/**

bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java

@@ -76,13 +76,13 @@
 class CompletionProposalPopup2 implements IContentAssistListener2 {
 
 	/** The associated text viewer */
-	private ITextViewer fViewer;
+	private final ITextViewer fViewer;
 	/** The associated content assistant */
-	private ContentAssistant2 fContentAssistant;
+	private final ContentAssistant2 fContentAssistant;
 	/** The used additional info controller */
-	private AdditionalInfoController2 fAdditionalInfoController;
+	private final AdditionalInfoController2 fAdditionalInfoController;
 	/** The closing strategy for this completion proposal popup */
-	private PopupCloser2 fPopupCloser= new PopupCloser2();
+	private final PopupCloser2 fPopupCloser= new PopupCloser2();
 	/** The popup shell */
 	private Shell fProposalShell;
 	/** The proposal table */
@@ -92,7 +92,7 @@ class CompletionProposalPopup2 implements IContentAssistListener2 {
 	/** The key listener to control navigation */
 	private KeyListener fKeyListener;
 	/** List of document events used for filtering proposals */
-	private List<DocumentEvent> fDocumentEvents= new ArrayList<>();
+	private final List<DocumentEvent> fDocumentEvents= new ArrayList<>();
 	/** Listener filling the document event queue */
 	private IDocumentListener fDocumentListener;
 	/** Reentrance count for <code>filterProposals</code> */

bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistant2.java

@@ -217,7 +217,7 @@ class AutoAssistListener implements VerifyKeyListener, Runnable {
 
 		private Thread fThread;
 		private boolean fIsReset= false;
-		private Object fMutex= new Object();
+		private final Object fMutex= new Object();
 		private int fShowStyle;
 
 		private final static int SHOW_PROPOSALS= 1;
@@ -710,7 +710,7 @@ public void processEvent(VerifyEvent event) {
 	private ContextInformationPopup2 fContextInfoPopup;
 
 	private boolean fKeyListenerHooked= false;
-	private IContentAssistListener2[] fListeners= new IContentAssistListener2[4];
+	private final IContentAssistListener2[] fListeners= new IContentAssistListener2[4];
 	private int fCompletionPosition;
 	private String[] fProposalStrings;
 	private ICompletionProposal[] fProposals;

bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java

@@ -76,10 +76,10 @@ static class ContextFrame {
 		public IContextInformationPresenter fPresenter;
 	}
 
-	private ITextViewer fViewer;
-	private ContentAssistant2 fContentAssistant;
+	private final ITextViewer fViewer;
+	private final ContentAssistant2 fContentAssistant;
 
-	private PopupCloser2 fPopupCloser= new PopupCloser2();
+	private final PopupCloser2 fPopupCloser= new PopupCloser2();
 	private Shell fContextSelectorShell;
 	private Table fContextSelectorTable;
 	private IContextInformation[] fContextSelectorInput;
@@ -89,7 +89,7 @@ static class ContextFrame {
 	private StyledText fContextInfoText;
 	private TextPresentation fTextPresentation;
 
-	private Stack<ContextFrame> fContextFrameStack= new Stack<>();
+	private final Stack<ContextFrame> fContextFrameStack= new Stack<>();
 
 
 	/**
@@ -639,7 +639,7 @@ private void validateContextInformation() {
 		 */
 		fContextInfoPopup.getDisplay().asyncExec(new Runnable() {
 
-			private ContextFrame fFrame= fContextFrameStack.peek();
+			private final ContextFrame fFrame= fContextFrameStack.peek();
 
 			@Override
 			public void run() {

bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java

@@ -367,7 +367,7 @@ public void modelChanged(IAnnotationModel model) {
 	 * The information control creator.
 	 */
 	private static final class HoverInformationControlCreator extends AbstractReusableInformationControlCreator {
-		private boolean fIsFocusable;
+		private final boolean fIsFocusable;
 
 		public HoverInformationControlCreator(boolean isFocusable) {
 			fIsFocusable= isFocusable;
@@ -562,7 +562,7 @@ public IInformationControlCreator getInformationPresenterControlCreator() {
 	/** The cached list of ranges adapted to quick diff. */
 	private List<RevisionRange> fRevisionRanges= null;
 	/** The annotations created for the overview ruler temporary display. */
-	private List<Annotation> fAnnotations= new ArrayList<>();
+	private final List<Annotation> fAnnotations= new ArrayList<>();
 
 	/* State */