@Override annotations.

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlock.java

@@ -207,8 +207,10 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo
 	
 	private Map<Object, String> fCheckBoxes= new HashMap<Object, String>();
 	private SelectionListener fCheckBoxListener= new SelectionListener() {
+		@Override
 		public void widgetDefaultSelected(SelectionEvent e) {
 		}
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			Button button= (Button) e.widget;
 			fStore.setValue(fCheckBoxes.get(button), button.getSelection());
@@ -218,6 +220,7 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo
 	
 	private Map<Object, String> fTextFields= new HashMap<Object, String>();
 	private ModifyListener fTextFieldListener= new ModifyListener() {
+		@Override
 		public void modifyText(ModifyEvent e) {
 			Text text= (Text) e.widget;
 			fStore.setValue(fTextFields.get(text), text.getText());
@@ -226,6 +229,7 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo
 
 	private ArrayList<Text> fNumberFields= new ArrayList<Text>();
 	private ModifyListener fNumberFieldListener= new ModifyListener() {
+		@Override
 		public void modifyText(ModifyEvent e) {
 			numberFieldChanged((Text) e.widget);
 		}
@@ -356,6 +360,7 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo
 		Assert.isTrue(slaves.length > 0);
 		indent(slaves[0]);
 		SelectionListener listener= new SelectionListener() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				boolean state= master.getSelection();
 				for (Control slave : slaves) {
@@ -363,6 +368,7 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo
 				}
 			}
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {}
 		};
 		master.addSelectionListener(listener);
@@ -373,6 +379,7 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo
 		((GridData) control.getLayoutData()).horizontalIndent+= INDENT;
 	}
 
+	@Override
 	public void initialize() {
 		initializeFields();
 	}
@@ -403,9 +410,11 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo
         updateStatus(new StatusInfo());
 	}
 
+	@Override
 	public void performOk() {
 	}
 
+	@Override
 	public void performDefaults() {
 		initializeFields();
 	}
@@ -419,6 +428,7 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo
 	/*
 	 * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#dispose()
 	 */
+	@Override
 	public void dispose() {
 	}
 	

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlockPreferencePage.java

@@ -53,6 +53,7 @@ public abstract class AbstractConfigurationBlockPreferencePage extends Preferenc
 	/*
 	 * @see IWorkbenchPreferencePage#init()
 	 */	
+	@Override
 	public void init(IWorkbench workbench) {
 	}
 

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractMixedPreferencePage.java

@@ -37,9 +37,11 @@ public abstract class AbstractMixedPreferencePage extends AbstractPreferencePage
 
 	private Map<Button, String> corePrefsCheckBoxes = new HashMap<Button, String>();
 	private SelectionListener corePrefsCheckBoxListener = new SelectionListener() {
+		@Override
 		public void widgetDefaultSelected(SelectionEvent e) {
 		}
 
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			Button button = (Button) e.widget;
 			corePrefsOverlayStore.setValue(corePrefsCheckBoxes.get(button), button.getSelection());

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java

@@ -64,6 +64,7 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I
 
 	protected Map<Object, String> fTextFields = new HashMap<Object, String>();
 	private ModifyListener fTextFieldListener = new ModifyListener() {
+		@Override
 		public void modifyText(ModifyEvent e) {
 			Text text = (Text) e.widget;
 			fOverlayStore.setValue(fTextFields.get(text), text.getText());
@@ -72,6 +73,7 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I
 	
 	protected Map<Object, String> fComboBoxes = new HashMap<Object, String>();
 	private ModifyListener fComboBoxListener = new ModifyListener() {
+		@Override
 		public void modifyText(ModifyEvent e) {
 			Combo combo = (Combo) e.widget;
 			String state = ProposalFilterPreferencesUtil.comboStateAsString(combo);
@@ -82,8 +84,10 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I
 
 	protected Map<Object, String> fCheckBoxes = new HashMap<Object, String>();
 	private SelectionListener fCheckBoxListener = new SelectionListener() {
+		@Override
 		public void widgetDefaultSelected(SelectionEvent e) {
 		}
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			Button button = (Button) e.widget;
 			fOverlayStore.setValue(fCheckBoxes.get(button), button.getSelection());
@@ -92,6 +96,7 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I
 
 	protected ArrayList<Text> fNumberFields = new ArrayList<Text>();
 	private ModifyListener fNumberFieldListener = new ModifyListener() {
+		@Override
 		public void modifyText(ModifyEvent e) {
 			numberFieldChanged((Text) e.widget);
 		}
@@ -99,8 +104,10 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I
 
 	protected Map<Object, String> fColorButtons = new HashMap<Object, String>();
 	private SelectionListener fColorButtonListener = new SelectionListener() {
+		@Override
 		public void widgetDefaultSelected(SelectionEvent e) {
 		}
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			ColorSelector editor = (ColorSelector) e.widget.getData();
 			PreferenceConverter.setValue(fOverlayStore, fColorButtons.get(editor), editor.getColorValue());
@@ -209,10 +216,12 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I
 		boolean masterState= fOverlayStore.getBoolean(masterKey);
 		slave.setEnabled(masterState);
 		SelectionListener listener= new SelectionListener() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				slave.setEnabled(master.getSelection());
 			}
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {}
 		};
 		master.addSelectionListener(listener);
@@ -342,6 +351,7 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I
 	 * 
 	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
 	 */
+	@Override
 	public void init(IWorkbench workbench) {
 	}
 

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AppearancePreferencePage.java

@@ -62,6 +62,7 @@ public class AppearancePreferencePage extends PreferencePage implements IWorkben
 		setDescription(PreferencesMessages.AppearancePreferencePage_description); 
 	
 		IDialogFieldListener listener= new IDialogFieldListener() {
+			@Override
 			public void dialogFieldChanged(DialogField field) {
 				doDialogFieldChanged(field);
 			}
@@ -193,6 +194,7 @@ public class AppearancePreferencePage extends PreferencePage implements IWorkben
 	/*
 	 * @see IWorkbenchPreferencePage#init(IWorkbench)
 	 */
+	@Override
 	public void init(IWorkbench workbench) {
 	}
 	

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java

@@ -145,6 +145,7 @@ public class BuildConsolePreferencePage extends FieldEditorPreferencePage implem
 		return CUIPlugin.getDefault().getPreferenceStore().getInt(PREF_BUILDCONSOLE_LINES);
 	}
 
+	@Override
 	public void init(IWorkbench workbench) {
 	}
 

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildLogPreferencePage.java

@@ -82,6 +82,7 @@ public class BuildLogPreferencePage extends PropertyPage implements ICOptionCont
 			String logLocation = prefs.get(BuildConsoleManager.KEY_LOG_LOCATION, consoleManager.getDefaultConsoleLogLocation(project));
 			logLocationText.setText(logLocation);
 			logLocationText.addModifyListener(new ModifyListener() {
+				@Override
 				public void modifyText(ModifyEvent e) {
 				}
 			});
@@ -146,6 +147,7 @@ public class BuildLogPreferencePage extends PropertyPage implements ICOptionCont
 		return true;
 	}
 
+	@Override
 	public IProject getProject(){
 		IProject project= null;
 		IAdaptable elem = getElement();
@@ -161,11 +163,13 @@ public class BuildLogPreferencePage extends PropertyPage implements ICOptionCont
 		return (BuildConsoleManager)CUIPlugin.getDefault().getConsoleManager();
 	}
 
+	@Override
 	@Deprecated
 	public org.eclipse.core.runtime.Preferences getPreferences() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public void updateContainer() {
 	}
 

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java

@@ -87,10 +87,12 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB
 	
 	private class CEditorTextHoverDescriptorLabelProvider implements ITableLabelProvider {
 
+		@Override
 		public Image getColumnImage(Object element, int columnIndex) {
 			return null;
 		}
 		
+		@Override
 		public String getColumnText(Object element, int columnIndex) {
 			switch (columnIndex) {
 			case ENABLED_PROP:
@@ -108,16 +110,20 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB
 			return null;
 		}
 
+		@Override
 		public void addListener(ILabelProviderListener listener) {
 		}
 		
+		@Override
 		public void dispose() {
 		}
 
+		@Override
 		public boolean isLabelProperty(Object element, String property) {
 			return false;
 		}
 
+		@Override
 		public void removeListener(ILabelProviderListener listener) {
 		}
 	}
@@ -125,13 +131,16 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB
 	
 	private class CEditorTextHoverDescriptorContentProvider implements IStructuredContentProvider {
 		
+		@Override
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 			// Do nothing since the viewer listens to resource deltas
 		}
 		
+		@Override
 		public void dispose() {
 		}
 				
+		@Override
 		public Object[] getElements(Object element) {
 			return (Object[])element;
 		}
@@ -179,6 +188,7 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB
 	 * @param parent the parent composite
 	 * @return the control for the preference page
 	 */
+	@Override
 	public Control createControl(Composite parent) {
 
 		ScrolledPageContent scrolled= new ScrolledPageContent(parent, SWT.H_SCROLL | SWT.V_SCROLL);
@@ -221,9 +231,11 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB
 		layouter.setLayoutData(gd);
 
 		fHoverTable.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				handleHoverListSelection();
 			}
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 		});
@@ -248,6 +260,7 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB
 			/*
 			 * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent)
 			 */
+			@Override
 			public void checkStateChanged(CheckStateChangedEvent event) {
 				String id= ((CEditorTextHoverDescriptor)event.getElement()).getId();
 				if (id == null)
@@ -277,10 +290,12 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB
 
 		fModifierEditor.addKeyListener(new KeyListener() {
 			private boolean isModifierCandidate;
+			@Override
 			public void keyPressed(KeyEvent e) {
 				isModifierCandidate= e.keyCode > 0 && e.character == 0 && e.stateMask == 0;
 			}
 		
+			@Override
 			public void keyReleased(KeyEvent e) {
 				if (isModifierCandidate && e.stateMask > 0 && e.stateMask == e.stateMask && e.character == 0) {// && e.time -time < 1000) {
 					String text= fModifierEditor.getText();
@@ -315,6 +330,7 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB
 		});
 
 		fModifierEditor.addModifyListener(new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				handleModifierModified();
 			}
@@ -354,6 +370,7 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB
 	/*
 	 * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#initialize()
 	 */
+	@Override
 	public void initialize() {
 		CEditorTextHoverDescriptor[] hoverDescs= getContributedHovers();
 		fHoverConfigs= new HoverConfig[hoverDescs.length];
@@ -377,6 +394,7 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB
 	/*
 	 * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#performOk()
 	 */
+	@Override
 	public void performOk() {
 		StringBuffer buf= new StringBuffer();
 		StringBuffer maskBuf= new StringBuffer();
@@ -405,6 +423,7 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB
 	/*
 	 * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#performDefaults()
 	 */
+	@Override
 	public void performDefaults() {
 		restoreFromPreferences();
 		initializeFields();
@@ -541,6 +560,7 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB
 	/*
 	 * @see DialogPage#dispose()
 	 */
+	@Override
 	public void dispose() {
 		// nothing to dispose
 	}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java

@@ -258,6 +258,7 @@ public class CEditorPreferencePage extends AbstractPreferencePage {
 		Link link = new Link(parent, SWT.NONE);
 		link.setText(text);
 		link.addListener (SWT.Selection, new Listener () {
+			@Override
 			public void handleEvent(Event event) {
 				String u = event.text;
 				PreferencesUtil.createPreferenceDialogOn(getShell(), u, null, null);
@@ -310,6 +311,7 @@ public class CEditorPreferencePage extends AbstractPreferencePage {
 			fAppearanceColorList.add(element[0]);
 		}
 		fAppearanceColorList.getDisplay().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				fAppearanceColorList.select(0);
 				handleAppearanceColorListSelection();

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeDialog.java

@@ -78,6 +78,7 @@ public class CFileTypeDialog extends Dialog {
 		}
 
 		fTextPattern.addModifyListener(new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				getOkayButton().setEnabled(getPatternFromControl().length() > 0);
 			}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java

@@ -93,14 +93,17 @@ public class CFileTypesPreferenceBlock {
 	private class AssocContentProvider implements IStructuredContentProvider {
 		CFileTypeAssociation[] assocs;
 		
+		@Override
 		public Object[] getElements(Object inputElement) {
 			return assocs;
 		}
 
+		@Override
 		public void dispose() {
 			assocs = null;
 		}
 
+		@Override
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 			if (newInput instanceof CFileTypeAssociation[]) {	
 				assocs = (CFileTypeAssociation[]) newInput;
@@ -111,6 +114,7 @@ public class CFileTypesPreferenceBlock {
 	private class AssocLabelProvider implements ILabelProvider, ITableLabelProvider {
 		private ListenerList listeners = new ListenerList();
 		
+		@Override
 		public Image getColumnImage(Object element, int columnIndex) {
 			if (element instanceof CFileTypeAssociation) {
 				if (COL_PATTERN == columnIndex) {
@@ -120,6 +124,7 @@ public class CFileTypesPreferenceBlock {
 			return null;
 		}
 
+		@Override
 		public String getColumnText(Object element, int columnIndex) {
 			if (element instanceof CFileTypeAssociation) {
 				CFileTypeAssociation assoc = (CFileTypeAssociation) element;
@@ -142,27 +147,33 @@ public class CFileTypesPreferenceBlock {
 			return element.toString();
 		}
 
+		@Override
 		public void addListener(ILabelProviderListener listener) {
 			listeners.add(listener);
 		}
 
+		@Override
 		public void dispose() {
 			listeners.clear();
 			listeners = null;
 		}
 
+		@Override
 		public boolean isLabelProperty(Object element, String property) {
 			return false;
 		}
 
+		@Override
 		public void removeListener(ILabelProviderListener listener) {
 			listeners.remove(listener);
 		}
 
+		@Override
 		public Image getImage(Object element) {
 			return getColumnImage(element, 0);
 		}
 
+		@Override
 		public String getText(Object element) {
 			return getColumnText(element, 0);
 		}
@@ -251,6 +262,7 @@ public class CFileTypesPreferenceBlock {
 		fBtnNew.setLayoutData(gridData);
 		
 		fBtnNew.addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event e) {
 				handleAdd();
 			}
@@ -266,6 +278,7 @@ public class CFileTypesPreferenceBlock {
 		fBtnRemove.setLayoutData(gridData);
 		
 		fBtnRemove.addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event e) {
 				handleRemove();
 			}
@@ -281,6 +294,7 @@ public class CFileTypesPreferenceBlock {
 		fAssocViewer.setInput(getCFileTypeAssociations());
 
 		fAssocViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			@Override
 			public void selectionChanged(SelectionChangedEvent event) {
 				handleSelectionChanged();
 			}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java

@@ -53,6 +53,7 @@ public class CFileTypesPreferencePage extends PreferencePage implements IWorkben
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
 	 */
+	@Override
 	public void init(IWorkbench workbench) {
 	}
 

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java

@@ -128,6 +128,7 @@ public class CFileTypesPropertyPage extends PropertyPage {
 		fUseWorkspace = new Button(radioPane, SWT.RADIO);
 		fUseWorkspace.setText(PreferencesMessages.CFileTypesPropertyPage_useWorkspaceSettings); 
 		fUseWorkspace.addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event e) {
 				if (fUseWorkspace.getSelection()) {
 					fPrefsBlock.setInput(null);
@@ -142,6 +143,7 @@ public class CFileTypesPropertyPage extends PropertyPage {
 		fUseProject = new Button(radioPane, SWT.RADIO);
 		fUseProject.setText(PreferencesMessages.CFileTypesPropertyPage_useProjectSettings); 
 		fUseProject.addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event e) {
 				if (fUseProject.getSelection()) {
 					fPrefsBlock.setInput(project);

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CParserPreferencePage.java

@@ -101,6 +101,7 @@ public class CParserPreferencePage extends PreferencePage implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
 	 */
+	@Override
 	public void init(IWorkbench workbench) {
 		// TODO Auto-generated method stub
 	}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java

@@ -106,9 +106,11 @@ public class CPluginPreferencePage extends PreferencePage implements IWorkbenchP
 		clearButton.setText(PreferencesMessages.CPluginPreferencePage_clear_button);
 		clearButton.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, false, false));
 		clearButton.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				OptionalMessageDialog.clearAllRememberedStates();
 			}
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 				OptionalMessageDialog.clearAllRememberedStates();
 			}
@@ -188,6 +190,7 @@ public class CPluginPreferencePage extends PreferencePage implements IWorkbenchP
 	/**
 	 * @see IWorkbenchPreferencePage#init
 	 */
+	@Override
 	public void init(IWorkbench workbench) {
 	}
 	

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CSourcePreviewerUpdater.java

@@ -53,6 +53,7 @@ public class CSourcePreviewerUpdater {
 			/*
 			 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
 			 */
+			@Override
 			public void propertyChange(PropertyChangeEvent event) {
 				if (event.getProperty().equals(PreferenceConstants.EDITOR_TEXT_FONT)) {
 					Font font= JFaceResources.getFont(PreferenceConstants.EDITOR_TEXT_FONT);
@@ -64,6 +65,7 @@ public class CSourcePreviewerUpdater {
 			/*
 			 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
 			 */
+			@Override
 			public void propertyChange(PropertyChangeEvent event) {
 				if (configuration.affectsTextPresentation(event)) {
 					configuration.handlePropertyChangeEvent(event);
@@ -75,6 +77,7 @@ public class CSourcePreviewerUpdater {
 			/*
 			 * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent)
 			 */
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				preferenceStore.removePropertyChangeListener(propertyChangeListener);
 				JFaceResources.getFontRegistry().removeListener(fontChangeListener);

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java

@@ -97,6 +97,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
 		/*
 		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
 		 */
+		@Override
 		public Image getColumnImage(Object element, int columnIndex) {
 			if (columnIndex == 0)
 				return ((ModelElement) element).getImage();
@@ -106,6 +107,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
 		/*
 		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
 		 */
+		@Override
 		public String getColumnText(Object element, int columnIndex) {
 			switch (columnIndex) {
 	            case 0:
@@ -132,6 +134,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
 		/*
 		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
 		 */
+		@Override
 		public Image getColumnImage(Object element, int columnIndex) {
 			if (columnIndex == 0)
 				return ((ModelElement) element).getImage();
@@ -141,6 +144,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
 		/*
 		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
 		 */
+		@Override
 		public String getColumnText(Object element, int columnIndex) {
 			switch (columnIndex) {
 				case 0:
@@ -153,6 +157,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
 	}
 
 	private final Comparator<ModelElement> fCategoryComparator= new Comparator<ModelElement>() {
+		@Override
 		public int compare(ModelElement o1, ModelElement o2) {
 			return o1.getRank() - o2.getRank();
 		}
@@ -441,6 +446,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
 		keyColumn.setResizable(true);
 		
 		fDefaultViewer.addCheckStateListener(new ICheckStateListener() {
+			@Override
 			public void checkStateChanged(CheckStateChangedEvent event) {
 				boolean checked= event.getChecked();
 				ModelElement element= (ModelElement) event.getElement();
@@ -536,6 +542,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
 		nameColumn.setWidth(minNameWidth);
 		
 		fSeparateViewer.addCheckStateListener(new ICheckStateListener() {
+			@Override
 			public void checkStateChanged(CheckStateChangedEvent event) {
 				boolean checked= event.getChecked();
 				ModelElement element= (ModelElement) event.getElement();

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateBlock.java

@@ -86,10 +86,12 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock {
 			implements ITreeListAdapter<Object>, IDialogFieldListener {
 		private final Object[] NO_CHILDREN= new Object[0];
 
+		@Override
 		public void customButtonPressed(TreeListDialogField<Object> field, int index) {
 			doButtonPressed(index, field.getSelectedElements());
 		}
 		
+		@Override
 		public void selectionChanged(TreeListDialogField<Object> field) {
 			List<Object> selected= field.getSelectedElements();
 			field.enableButton(IDX_ADD, canAdd(selected));
@@ -100,6 +102,7 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock {
 			updateSourceViewerInput(selected);
 		}
 
+		@Override
 		public void doubleClicked(TreeListDialogField<Object> field) {
 			List<Object> selected= field.getSelectedElements();
 			if (canEdit(selected)) {
@@ -107,6 +110,7 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock {
 			}
 		}
 
+		@Override
 		public Object[] getChildren(TreeListDialogField<Object> field, Object element) {
 			if (element == COMMENT_NODE || element == CODE_NODE) {
 				return getCodeTemplatesOfCategory(element == COMMENT_NODE);
@@ -118,6 +122,7 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock {
 			return NO_CHILDREN;
 		}
 
+		@Override
 		public Object getParent(TreeListDialogField<Object> field, Object element) {
 			if (element instanceof TemplatePersistenceData) {
 				TemplatePersistenceData data= (TemplatePersistenceData) element;
@@ -134,16 +139,19 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock {
 			return null;
 		}
 
+		@Override
 		public boolean hasChildren(TreeListDialogField<Object> field, Object element) {
 			return (element == COMMENT_NODE || element == CODE_NODE || element == FILE_NODE || element instanceof TemplateContextType);
 		}
 
+		@Override
 		public void dialogFieldChanged(DialogField field) {
 			if (field == fGenerateComments) {
 				setValue(PREF_GENERATE_COMMENTS, fGenerateComments.isSelected());
 			}
 		}
 
+		@Override
 		public void keyPressed(TreeListDialogField<Object> field, KeyEvent event) {
 		}
 		

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateSourceViewerConfiguration.java

@@ -59,6 +59,7 @@ public class CodeTemplateSourceViewerConfiguration extends SimpleCSourceViewerCo
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
 		 */
+		@Override
 		public String getHoverInfo(ITextViewer textViewer, IRegion subject) {
 			try {
 				IDocument doc= textViewer.getDocument();
@@ -84,6 +85,7 @@ public class CodeTemplateSourceViewerConfiguration extends SimpleCSourceViewerCo
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int)
 		 */
+		@Override
 		public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
 			if (textViewer != null) {
 				return CWordFinder.findWord(textViewer.getDocument(), offset);
@@ -123,6 +125,7 @@ public class CodeTemplateSourceViewerConfiguration extends SimpleCSourceViewerCo
 		assistant.setProposalPopupOrientation(IContentAssistant.PROPOSAL_OVERLAY);
 		assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_ABOVE);
 		assistant.setInformationControlCreator(new IInformationControlCreator() {
+			@Override
 			public IInformationControl createInformationControl(Shell parent) {
 				return new DefaultInformationControl(parent, false);
 			}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java

@@ -80,6 +80,7 @@ import org.eclipse.ui.handlers.IHandlerService;
 import org.eclipse.ui.texteditor.ITextEditorActionConstants;
 import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
 import org.eclipse.ui.texteditor.IUpdate;
+
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.PreferenceConstants;
 import org.eclipse.cdt.ui.text.ICPartitions;
@@ -98,9 +99,8 @@ import org.eclipse.cdt.internal.ui.text.template.TemplateVariableProcessor;
 public class EditTemplateDialog extends StatusDialog {
 
 	private static class TextViewerAction extends Action implements IUpdate {
-	
 		private int fOperationCode= -1;
-		private ITextOperationTarget fOperationTarget;
+		private final ITextOperationTarget fOperationTarget;
 	
 		/**
 		 * Creates a new action.
@@ -120,6 +120,7 @@ public class EditTemplateDialog extends StatusDialog {
 		 * 
 		 * @see Action#firePropertyChange(String, Object, Object)
 		 */
+		@Override
 		public void update() {
 			// XXX: workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=206111
 			if (fOperationCode == ITextOperationTarget.REDO)
@@ -158,8 +159,8 @@ public class EditTemplateDialog extends StatusDialog {
 
 	private StatusInfo fValidationStatus;
 	private boolean fSuppressError= true; // https://bugs.eclipse.org/bugs/show_bug.cgi?id=4354
-	private Map<String, TextViewerAction> fGlobalActions= new HashMap<String, TextViewerAction>(10);
+	private final Map<String, TextViewerAction> fGlobalActions= new HashMap<String, TextViewerAction>(10);
-	private List<String> fSelectionActions = new ArrayList<String>(3);
+	private final List<String> fSelectionActions = new ArrayList<String>(3);
 	private String[][] fContextTypes;
 	
 	private ContextTypeRegistry fContextTypeRegistry;
@@ -200,6 +201,7 @@ public class EditTemplateDialog extends StatusDialog {
 				contexts.add(0, new String[] { type.getId(), type.getName(), "" }); //$NON-NLS-1$
 		}
 		Collections.sort(contexts, new Comparator<String[]>() {
+			@Override
 			public int compare(String[] s1, String[] s2) {
 				return s1[1].compareTo(s2[1]);
 			}});
@@ -213,17 +215,11 @@ public class EditTemplateDialog extends StatusDialog {
 		fTemplateProcessor.setContextType(type);
 	}
 
-	/*
-	 * @see org.eclipse.jface.dialogs.Dialog#isResizable()
-	 */
 	@Override
 	protected boolean isResizable() {
 		return true;
 	}
 	
-	/*
-	 * @see org.eclipse.cdt.internal.ui.dialogs.StatusDialog#create()
-	 */
 	@Override
 	public void create() {
 		super.create();
@@ -231,9 +227,6 @@ public class EditTemplateDialog extends StatusDialog {
 		getButton(IDialogConstants.OK_ID).setEnabled(getStatus().isOK());
 	}
 	
-	/*
-	 * @see Dialog#createDialogArea(Composite)
-	 */
 	@Override
 	protected Control createDialogArea(Composite ancestor) {
 		Composite parent= new Composite(ancestor, SWT.NONE);
@@ -243,6 +236,7 @@ public class EditTemplateDialog extends StatusDialog {
 		parent.setLayoutData(new GridData(GridData.FILL_BOTH));
 		
 		ModifyListener listener= new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				doTextWidgetChanged(e.widget);
 			}
@@ -261,10 +255,11 @@ public class EditTemplateDialog extends StatusDialog {
 			
 			fNameText= createText(composite);
 			fNameText.addFocusListener(new FocusListener() {
-				
+				@Override
 				public void focusGained(FocusEvent e) {
 				}
 				
+				@Override
 				public void focusLost(FocusEvent e) {
 					if (fSuppressError) {
 						fSuppressError= false;
@@ -314,11 +309,13 @@ public class EditTemplateDialog extends StatusDialog {
 		fInsertVariableButton.setLayoutData(getButtonGridData());
 		fInsertVariableButton.setText(PreferencesMessages.EditTemplateDialog_insert_variable);
 		fInsertVariableButton.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				fPatternEditor.getTextWidget().setFocus();
 				fPatternEditor.doOperation(ISourceViewer.CONTENTASSIST_PROPOSALS);
 			}
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {}
 		});
 
@@ -444,6 +441,7 @@ public class EditTemplateDialog extends StatusDialog {
 		control.setLayoutData(data);
 		
 		viewer.addTextListener(new ITextListener() {
+			@Override
 			public void textChanged(TextEvent event) {
 				if (event .getDocumentEvent() != null)
 					doSourceChanged(event.getDocumentEvent().getDocument());
@@ -451,6 +449,7 @@ public class EditTemplateDialog extends StatusDialog {
 		});
 
 		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			@Override
 			public void selectionChanged(SelectionChangedEvent event) {
 				updateSelectionDependentActions();
 			}
@@ -482,6 +481,7 @@ public class EditTemplateDialog extends StatusDialog {
 		final ArrayList<IHandlerActivation> handlerActivations= new ArrayList<IHandlerActivation>(3);
 		final IHandlerService handlerService= (IHandlerService) PlatformUI.getWorkbench().getAdapter(IHandlerService.class);
 		getShell().addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				handlerService.deactivateHandlers(handlerActivations);
 			}
@@ -528,6 +528,7 @@ public class EditTemplateDialog extends StatusDialog {
 		MenuManager manager= new MenuManager(null, null);
 		manager.setRemoveAllWhenShown(true);
 		manager.addMenuListener(new IMenuListener() {
+			@Override
 			public void menuAboutToShow(IMenuManager mgr) {
 				fillContextMenu(mgr);
 			}
@@ -553,7 +554,6 @@ public class EditTemplateDialog extends StatusDialog {
 		menu.appendToGroup(IContextMenuConstants.GROUP_GENERATE, fGlobalActions.get("ContentAssistProposal")); //$NON-NLS-1$
 	}
 
-
 	protected void updateSelectionDependentActions() {
 		Iterator<String> iterator= fSelectionActions.iterator();
 		while (iterator.hasNext())
@@ -567,7 +567,6 @@ public class EditTemplateDialog extends StatusDialog {
 	}
 
 	private int getIndex(String contextid) {
-		
 		if (contextid == null)
 			return -1;
 		
@@ -639,9 +638,6 @@ public class EditTemplateDialog extends StatusDialog {
 		}
 	}
 	
-	/*
-	 * @see org.eclipse.jface.dialogs.Dialog#getInitialSize()
-	 */
 	@Override
 	protected Point getInitialSize() {
 		Point defaultSize= getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
@@ -652,9 +648,6 @@ public class EditTemplateDialog extends StatusDialog {
 		return restoredSize;
 	}
 
-	/*
-	 * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings()
-	 */
 	@Override
 	protected IDialogSettings getDialogBoundsSettings() {
 		String sectionName= getClass().getName() + "_dialogBounds"; //$NON-NLS-1$
@@ -664,5 +657,4 @@ public class EditTemplateDialog extends StatusDialog {
 			section= settings.addNewSection(sectionName);
 		return section;
 	}
-
 }

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingConfigurationBlock.java

@@ -8,12 +8,10 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-
 package org.eclipse.cdt.internal.ui.preferences;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 import org.eclipse.core.runtime.Assert;
@@ -59,15 +57,13 @@ import org.eclipse.cdt.internal.ui.text.folding.CFoldingStructureProviderRegistr
 class FoldingConfigurationBlock implements IPreferenceConfigurationBlock {
 	
 	private static class ErrorPreferences implements ICFoldingPreferenceBlock {
-		private String fMessage;
+		private final String fMessage;
 		
 		protected ErrorPreferences(String message) {
 			fMessage= message;
 		}
 		
-		/*
+		@Override
-		 * @see org.eclipse.cdt.internal.ui.text.folding.ICFoldingPreferences#createControl(org.eclipse.swt.widgets.Group)
-		 */
 		public Control createControl(Composite composite) {
 			Composite inner= new Composite(composite, SWT.NONE);
 			inner.setLayout(new FillLayout(SWT.VERTICAL));
@@ -78,18 +74,21 @@ class FoldingConfigurationBlock implements IPreferenceConfigurationBlock {
 			return inner;
 		}
 
+		@Override
 		public void initialize() {
 		}
 
+		@Override
 		public void performOk() {
 		}
 
+		@Override
 		public void performDefaults() {
 		}
 
+		@Override
 		public void dispose() {
 		}
-		
 	}
 
 	/** The overlay preference store. */
@@ -101,8 +100,8 @@ class FoldingConfigurationBlock implements IPreferenceConfigurationBlock {
 	private ComboViewer fProviderViewer;
 	protected Map<String, CFoldingStructureProviderDescriptor> fProviderDescriptors;
 	private Composite fGroup;
-	private Map<String, ICFoldingPreferenceBlock> fProviderPreferences;
+	private final Map<String, ICFoldingPreferenceBlock> fProviderPreferences;
-	private Map<String, Control> fProviderControls;
+	private final Map<String, Control> fProviderControls;
 	private StackLayout fStackLayout;
 	
 
@@ -138,9 +137,7 @@ class FoldingConfigurationBlock implements IPreferenceConfigurationBlock {
 		return keys;
 	}
 
-	/*
+	@Override
-	 * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#createControl(org.eclipse.swt.widgets.Composite)
-	 */
 	public Control createControl(Composite parent) {
 
 		Composite composite= new Composite(parent, SWT.NULL);
@@ -160,12 +157,14 @@ class FoldingConfigurationBlock implements IPreferenceConfigurationBlock {
 		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
 		fFoldingCheckbox.setLayoutData(gd);
 		fFoldingCheckbox.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				boolean enabled= fFoldingCheckbox.getSelection(); 
 				fStore.setValue(PreferenceConstants.EDITOR_FOLDING_ENABLED, enabled);
 				updateCheckboxDependencies();
 			}
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 		});
@@ -197,45 +196,32 @@ class FoldingConfigurationBlock implements IPreferenceConfigurationBlock {
 		/* list viewer */
 		fProviderViewer= new ComboViewer(fProviderCombo);
 		fProviderViewer.setContentProvider(new IStructuredContentProvider() {
-
+			@Override
-			/*
-			 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-			 */
 			public void dispose() {
 			}
 
-			/*
+			@Override
-			 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-			 */
 			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 			}
 
-			/*
+			@Override
-			 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-			 */
 			public Object[] getElements(Object inputElement) {
 				return fProviderDescriptors.values().toArray();
 			}
 		});
 		fProviderViewer.setLabelProvider(new LabelProvider() {
-			/*
-			 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
-			 */
 			@Override
 			public Image getImage(Object element) {
 				return null;
 			}
 			
-			/*
-			 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
-			 */
 			@Override
 			public String getText(Object element) {
 				return ((CFoldingStructureProviderDescriptor) element).getName();
 			}
 		});
 		fProviderViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
+			@Override
 			public void selectionChanged(SelectionChangedEvent event) {
 				IStructuredSelection sel= (IStructuredSelection) event.getSelection();
 				if (!sel.isEmpty()) {
@@ -309,40 +295,29 @@ class FoldingConfigurationBlock implements IPreferenceConfigurationBlock {
 		prefs.initialize();
 	}
 
-	/*
+	@Override
-	 * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#initialize()
-	 */
 	public void initialize() {
 		restoreFromPreferences();
 	}
 
-	/*
+	@Override
-	 * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#performOk()
-	 */
 	public void performOk() {
-		for (Iterator<ICFoldingPreferenceBlock> it= fProviderPreferences.values().iterator(); it.hasNext();) {
+		for (ICFoldingPreferenceBlock prefs : fProviderPreferences.values()) {
-			ICFoldingPreferenceBlock prefs= it.next();
 			prefs.performOk();
 		}
 	}
 	
-	/*
+	@Override
-	 * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#performDefaults()
-	 */
 	public void performDefaults() {
 		restoreFromPreferences();
-		for (Iterator<ICFoldingPreferenceBlock> it= fProviderPreferences.values().iterator(); it.hasNext();) {
+		for (ICFoldingPreferenceBlock prefs : fProviderPreferences.values()) {
-			ICFoldingPreferenceBlock prefs= it.next();
 			prefs.performDefaults();
 		}
 	}
 	
-	/*
+	@Override
-	 * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#dispose()
-	 */
 	public void dispose() {
-		for (Iterator<ICFoldingPreferenceBlock> it= fProviderPreferences.values().iterator(); it.hasNext();) {
+		for (ICFoldingPreferenceBlock prefs : fProviderPreferences.values()) {
-			ICFoldingPreferenceBlock prefs= it.next();
 			prefs.dispose();
 		}
 	}
@@ -360,4 +335,3 @@ class FoldingConfigurationBlock implements IPreferenceConfigurationBlock {
 		}
 	}
 }
-

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/GlobalBuildLogPreferencePage.java

@@ -65,6 +65,7 @@ public class GlobalBuildLogPreferencePage extends FieldEditorPreferencePage impl
 		addField(logLocation);
 	}
 
+	@Override
 	public void init(IWorkbench workbench) {
 		initDefaults(GlobalBuildConsoleManager.getBuildLogPreferenceStore());
 	}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerPreferencePage.java

@@ -38,9 +38,9 @@ public class IndexerPreferencePage extends PreferencePage implements
 	// bug 217860, allow to hide build configuration
 	private static final String SHOW_BUILD_SPECIFIC_CONFIG = "show.build.specific.indexer.config"; //$NON-NLS-1$
 
-	private IndexerBlock fOptionBlock;
+	private final IndexerBlock fOptionBlock;
-	private CacheSizeBlock fCacheBlock;
+	private final CacheSizeBlock fCacheBlock;
-	private IndexerStrategyBlock fStrategyBlock;
+	private final IndexerStrategyBlock fStrategyBlock;
 	
 	public IndexerPreferencePage(){
 		fOptionBlock = new IndexerBlock();
@@ -70,9 +70,11 @@ public class IndexerPreferencePage extends PreferencePage implements
 		return composite;
 	}
 
+	@Override
 	public void init(IWorkbench workbench) {
 	}
 
+	@Override
 	public void updateContainer() {
 		if (!fOptionBlock.isValid()) {
 			setErrorMessage(fOptionBlock.getErrorMessage());
@@ -92,10 +94,12 @@ public class IndexerPreferencePage extends PreferencePage implements
 		}
 	}
 
+	@Override
 	public IProject getProject() {
 		return null;
 	}
 
+	@Override
 	@SuppressWarnings("deprecation")
 	public org.eclipse.core.runtime.Preferences getPreferences() {
 		throw new UnsupportedOperationException();

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java

@@ -9,7 +9,6 @@
  *     IBM Corporation - initial API and implementation
  *     Anton Leherbauer (Wind River Systems)
  *******************************************************************************/
-
 package org.eclipse.cdt.internal.ui.preferences;
 
 import java.util.ArrayList;
@@ -44,14 +43,15 @@ import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore.OverlayKey
  * @since 5.0
  */
 class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock {
+	private final OverlayPreferenceStore fStore;
 	
-	private OverlayPreferenceStore fStore;
+	private final Map<Object, String> fCheckBoxes= new HashMap<Object, String>();
-	
+	private final SelectionListener fCheckBoxListener= new SelectionListener() {
-	
+		@Override
-	private Map<Object, String> fCheckBoxes= new HashMap<Object, String>();
-	private SelectionListener fCheckBoxListener= new SelectionListener() {
 		public void widgetDefaultSelected(SelectionEvent e) {
 		}
+
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			Button button= (Button) e.widget;
 			fStore.setValue(fCheckBoxes.get(button), button.getSelection());
@@ -63,7 +63,7 @@ class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock
 	 * 
 	 * @see #createDependency(Button, String, Control)
 	 */
-	private ArrayList<Object> fMasterSlaveListeners= new ArrayList<Object>();
+	private final ArrayList<Object> fMasterSlaveListeners= new ArrayList<Object>();
 	
 	private StatusInfo fStatus;
 
@@ -93,8 +93,8 @@ class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock
 	 * @param parent the parent composite
 	 * @return the control for the preference page
 	 */
+	@Override
 	public Control createControl(final Composite parent) {
-	
 		Composite composite= new Composite(parent, SWT.NONE);
 		GridLayout layout= new GridLayout();
 		layout.numColumns= 1;
@@ -166,10 +166,12 @@ class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock
 		boolean masterState= fStore.getBoolean(masterKey);
 		slave.setEnabled(masterState);
 		SelectionListener listener= new SelectionListener() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				slave.setEnabled(master.getSelection());
 			}
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {}
 		};
 		master.addSelectionListener(listener);
@@ -182,6 +184,7 @@ class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock
 		control.setLayoutData(gridData);		
 	}
 
+	@Override
 	public void initialize() {
 		initializeFields();
 	}
@@ -204,9 +207,11 @@ class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock
         
 	}
 
+	@Override
 	public void performOk() {
 	}
 
+	@Override
 	public void performDefaults() {
 		restoreFromPreferences();
 		initializeFields();
@@ -225,6 +230,7 @@ class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock
 	/*
 	 * @see org.eclipse.jdt.internal.ui.preferences.IPreferenceConfigurationBlock#dispose()
 	 */
+	@Override
 	public void dispose() {
 	}
 }

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java

@@ -64,8 +64,8 @@ import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener;
 public abstract class OptionsConfigurationBlock {
 
 	public static final class Key {
-		private String fQualifier;
+		private final String fQualifier;
-		private String fKey;
+		private final String fKey;
 
 		public Key(String qualifier, String key) {
 			fQualifier= qualifier;
@@ -120,8 +120,8 @@ public abstract class OptionsConfigurationBlock {
 	}
 
 	protected static class ControlData {
-		private Key fKey;
+		private final Key fKey;
-		private String[] fValues;
+		private final String[] fValues;
 
 		public ControlData(Key key, String[] values) {
 			fKey= key;
@@ -175,7 +175,7 @@ public abstract class OptionsConfigurationBlock {
 	private Shell fShell;
 
 	private final IWorkingCopyManager fManager;
-	private IWorkbenchPreferenceContainer fContainer;
+	private final IWorkbenchPreferenceContainer fContainer;
 
 	private Map<Key, String> fDisabledProjectSettings; // null when project specific settings are turned off
 
@@ -556,8 +556,10 @@ public abstract class OptionsConfigurationBlock {
 	protected SelectionListener getSelectionListener() {
 		if (fSelectionListener == null) {
 			fSelectionListener= new SelectionListener() {
+				@Override
 				public void widgetDefaultSelected(SelectionEvent e) {}
 
+				@Override
 				public void widgetSelected(SelectionEvent e) {
 					controlChanged(e.widget);
 				}
@@ -569,6 +571,7 @@ public abstract class OptionsConfigurationBlock {
 	protected ModifyListener getTextModifyListener() {
 		if (fTextModifyListener == null) {
 			fTextModifyListener= new ModifyListener() {
+				@Override
 				public void modifyText(ModifyEvent e) {
 					textChanged((Text) e.widget);
 				}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OverlayPreferenceStore.java

@@ -22,7 +22,6 @@ import org.eclipse.jface.util.PropertyChangeEvent;
  */
 public class OverlayPreferenceStore  implements IPreferenceStore {
 	
-	
 	public static final class TypeDescriptor {
 		protected TypeDescriptor() {
 		}
@@ -36,7 +35,6 @@ public class OverlayPreferenceStore  implements IPreferenceStore {
 	public static final TypeDescriptor STRING= new TypeDescriptor();
 	
 	public static class OverlayKey {
-		
 		TypeDescriptor fDescriptor;
 		String fKey;
 		
@@ -47,10 +45,7 @@ public class OverlayPreferenceStore  implements IPreferenceStore {
 	}
 	
 	private class PropertyListener implements IPropertyChangeListener {
-				
+		@Override
-		/*
-		 * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)
-		 */
 		public void propertyChange(PropertyChangeEvent event) {
 			OverlayKey key= findOverlayKey(event.getProperty());
 			if (key != null)
@@ -58,14 +53,12 @@ public class OverlayPreferenceStore  implements IPreferenceStore {
 		}
 	}
 	
-	
 	protected IPreferenceStore fParent;
 	protected IPreferenceStore fStore;
 	private OverlayKey[] fOverlayKeys;
 	private boolean fLoaded;
 	private PropertyListener fPropertyListener;
 	
-	
 	public OverlayPreferenceStore(IPreferenceStore parent, OverlayKey[] overlayKeys) {
 		fParent= parent;
 		fOverlayKeys= overlayKeys;
@@ -85,7 +78,6 @@ public class OverlayPreferenceStore  implements IPreferenceStore {
 	}
 	
 	protected void propagateProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target) {
-		
 		if (orgin.isDefault(key.fKey)) {
 			if (!target.isDefault(key.fKey))
 				target.setToDefault(key.fKey);
@@ -94,47 +86,35 @@ public class OverlayPreferenceStore  implements IPreferenceStore {
 		
 		TypeDescriptor d= key.fDescriptor;
 		if (BOOLEAN == d) {
-			
 			boolean originValue= orgin.getBoolean(key.fKey);
 			boolean targetValue= target.getBoolean(key.fKey);
 			if (targetValue != originValue)
 				target.setValue(key.fKey, originValue);
-				
 		} else if (DOUBLE == d) {
-			
 			double originValue= orgin.getDouble(key.fKey);
 			double targetValue= target.getDouble(key.fKey);
 			if (targetValue != originValue)
 				target.setValue(key.fKey, originValue);
-		
 		} else if (FLOAT == d) {
-			
 			float originValue= orgin.getFloat(key.fKey);
 			float targetValue= target.getFloat(key.fKey);
 			if (targetValue != originValue)
 				target.setValue(key.fKey, originValue);
-				
 		} else if (INT == d) {
-
 			int originValue= orgin.getInt(key.fKey);
 			int targetValue= target.getInt(key.fKey);
 			if (targetValue != originValue)
 				target.setValue(key.fKey, originValue);
-
 		} else if (LONG == d) {
-
 			long originValue= orgin.getLong(key.fKey);
 			long targetValue= target.getLong(key.fKey);
 			if (targetValue != originValue)
 				target.setValue(key.fKey, originValue);
-
 		} else if (STRING == d) {
-
 			String originValue= orgin.getString(key.fKey);
 			String targetValue= target.getString(key.fKey);
 			if (targetValue != null && originValue != null && !targetValue.equals(originValue))
 				target.setValue(key.fKey, originValue);
-
 		}
 	}
 	
@@ -146,47 +126,35 @@ public class OverlayPreferenceStore  implements IPreferenceStore {
 	private void loadProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target, boolean forceInitialization) {
 		TypeDescriptor d= key.fDescriptor;
 		if (BOOLEAN == d) {
-			
 			if (forceInitialization)
 				target.setValue(key.fKey, true);
 			target.setValue(key.fKey, orgin.getBoolean(key.fKey));
 			target.setDefault(key.fKey, orgin.getDefaultBoolean(key.fKey));
-			
 		} else if (DOUBLE == d) {
-			
 			if (forceInitialization)
 				target.setValue(key.fKey, 1.0D);
 			target.setValue(key.fKey, orgin.getDouble(key.fKey));
 			target.setDefault(key.fKey, orgin.getDefaultDouble(key.fKey));
-			
 		} else if (FLOAT == d) {
-			
 			if (forceInitialization)
 				target.setValue(key.fKey, 1.0F);
 			target.setValue(key.fKey, orgin.getFloat(key.fKey));
 			target.setDefault(key.fKey, orgin.getDefaultFloat(key.fKey));
-			
 		} else if (INT == d) {
-			
 			if (forceInitialization)
 				target.setValue(key.fKey, 1);
 			target.setValue(key.fKey, orgin.getInt(key.fKey));
 			target.setDefault(key.fKey, orgin.getDefaultInt(key.fKey));
-			
 		} else if (LONG == d) {
-			
 			if (forceInitialization)
 				target.setValue(key.fKey, 1L);
 			target.setValue(key.fKey, orgin.getLong(key.fKey));
 			target.setDefault(key.fKey, orgin.getDefaultLong(key.fKey));
-			
 		} else if (STRING == d) {
-			
 			if (forceInitialization)
 				target.setValue(key.fKey, "1"); //$NON-NLS-1$
 			target.setValue(key.fKey, orgin.getString(key.fKey));
 			target.setDefault(key.fKey, orgin.getDefaultString(key.fKey));
-			
 		}
 	}
 	
@@ -216,238 +184,174 @@ public class OverlayPreferenceStore  implements IPreferenceStore {
 		}
 	}
 	
-	/*
+	@Override
-	 * @see IPreferenceStore#addPropertyChangeListener(IPropertyChangeListener)
-	 */
 	public void addPropertyChangeListener(IPropertyChangeListener listener) {
 		fStore.addPropertyChangeListener(listener);
 	}
 	
-	/*
+	@Override
-	 * @see IPreferenceStore#removePropertyChangeListener(IPropertyChangeListener)
-	 */
 	public void removePropertyChangeListener(IPropertyChangeListener listener) {
 		fStore.removePropertyChangeListener(listener);
 	}
 	
-	/*
+	@Override
-	 * @see IPreferenceStore#firePropertyChangeEvent(String, Object, Object)
-	 */
 	public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
 		fStore.firePropertyChangeEvent(name, oldValue, newValue);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#contains(String)
-	 */
 	public boolean contains(String name) {
 		return fStore.contains(name);
 	}
 	
-	/*
+	@Override
-	 * @see IPreferenceStore#getBoolean(String)
-	 */
 	public boolean getBoolean(String name) {
 		return fStore.getBoolean(name);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#getDefaultBoolean(String)
-	 */
 	public boolean getDefaultBoolean(String name) {
 		return fStore.getDefaultBoolean(name);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#getDefaultDouble(String)
-	 */
 	public double getDefaultDouble(String name) {
 		return fStore.getDefaultDouble(name);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#getDefaultFloat(String)
-	 */
 	public float getDefaultFloat(String name) {
 		return fStore.getDefaultFloat(name);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#getDefaultInt(String)
-	 */
 	public int getDefaultInt(String name) {
 		return fStore.getDefaultInt(name);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#getDefaultLong(String)
-	 */
 	public long getDefaultLong(String name) {
 		return fStore.getDefaultLong(name);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#getDefaultString(String)
-	 */
 	public String getDefaultString(String name) {
 		return fStore.getDefaultString(name);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#getDouble(String)
-	 */
 	public double getDouble(String name) {
 		return fStore.getDouble(name);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#getFloat(String)
-	 */
 	public float getFloat(String name) {
 		return fStore.getFloat(name);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#getInt(String)
-	 */
 	public int getInt(String name) {
 		return fStore.getInt(name);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#getLong(String)
-	 */
 	public long getLong(String name) {
 		return fStore.getLong(name);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#getString(String)
-	 */
 	public String getString(String name) {
 		return fStore.getString(name);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#isDefault(String)
-	 */
 	public boolean isDefault(String name) {
 		return fStore.isDefault(name);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#needsSaving()
-	 */
 	public boolean needsSaving() {
 		return fStore.needsSaving();
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#putValue(String, String)
-	 */
 	public void putValue(String name, String value) {
 		if (covers(name))
 			fStore.putValue(name, value);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#setDefault(String, double)
-	 */
 	public void setDefault(String name, double value) {
 		if (covers(name))
 			fStore.setDefault(name, value);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#setDefault(String, float)
-	 */
 	public void setDefault(String name, float value) {
 		if (covers(name))
 			fStore.setDefault(name, value);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#setDefault(String, int)
-	 */
 	public void setDefault(String name, int value) {
 		if (covers(name))
 			fStore.setDefault(name, value);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#setDefault(String, long)
-	 */
 	public void setDefault(String name, long value) {
 		if (covers(name))
 			fStore.setDefault(name, value);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#setDefault(String, String)
-	 */
 	public void setDefault(String name, String value) {
 		if (covers(name))
 			fStore.setDefault(name, value);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#setDefault(String, boolean)
-	 */
 	public void setDefault(String name, boolean value) {
 		if (covers(name))
 			fStore.setDefault(name, value);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#setToDefault(String)
-	 */
 	public void setToDefault(String name) {
 		fStore.setToDefault(name);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#setValue(String, double)
-	 */
 	public void setValue(String name, double value) {
 		if (covers(name))
 			fStore.setValue(name, value);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#setValue(String, float)
-	 */
 	public void setValue(String name, float value) {
 		if (covers(name))
 			fStore.setValue(name, value);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#setValue(String, int)
-	 */
 	public void setValue(String name, int value) {
 		if (covers(name))
 			fStore.setValue(name, value);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#setValue(String, long)
-	 */
 	public void setValue(String name, long value) {
 		if (covers(name))
 			fStore.setValue(name, value);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#setValue(String, String)
-	 */
 	public void setValue(String name, String value) {
 		if (covers(name))
 			fStore.setValue(name, value);
 	}
 
-	/*
+	@Override
-	 * @see IPreferenceStore#setValue(String, boolean)
-	 */
 	public void setValue(String name, boolean value) {
 		if (covers(name))
 			fStore.setValue(name, value);
@@ -480,6 +384,5 @@ public class OverlayPreferenceStore  implements IPreferenceStore {
 		if (fLoaded)
 			load();
 	}
-
 }
 

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/AlreadyExistsDialog.java

@@ -88,27 +88,32 @@ public class AlreadyExistsDialog extends StatusDialog {
 		fNameText.setFocus();
 		
 		fNameText.addModifyListener( new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				doValidation();
 			}
 		});
 		
 		fRenameRadio.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				fNameText.setEnabled(true);
 				fNameText.setFocus();
 				fNameText.setSelection(0, fNameText.getText().length());
 				doValidation();
 			}
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 		});
 		
 		fOverwriteRadio.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				fNameText.setEnabled(false);
 				doValidation();
 			}
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 		});

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/BracesTabPage.java

@@ -127,6 +127,7 @@ public class BracesTabPage extends FormatterTabPage {
 		final CheckboxPreference arrayInitCheckBox= createIndentedCheckboxPref(group, numColumns, FormatterMessages.BracesTabPage_option_keep_empty_initializer_list_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_EMPTY_INITIALIZER_LIST_ON_ONE_LINE, FALSE_TRUE); 
 
 		arrayInitOption.addObserver(new Observer() {
+			@Override
 			public void update(Observable o, Object arg) {
 				updateOptionEnablement((ComboPreference) o, arrayInitCheckBox);
 			}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CPreview.java

@@ -55,6 +55,7 @@ public abstract class CPreview {
 	private final class CSourcePreviewerUpdater {
 
 	    final IPropertyChangeListener fontListener= new IPropertyChangeListener() {
+	        @Override
 			public void propertyChange(PropertyChangeEvent event) {
 	            if (event.getProperty().equals(PreferenceConstants.EDITOR_TEXT_FONT)) {
 					final Font font= JFaceResources.getFont(PreferenceConstants.EDITOR_TEXT_FONT);
@@ -67,6 +68,7 @@ public abstract class CPreview {
 		};
 		
 	    final IPropertyChangeListener propertyListener= new IPropertyChangeListener() {
+			@Override
 			public void propertyChange(PropertyChangeEvent event) {
 				if (fViewerConfiguration.affectsTextPresentation(event)) {
 					fViewerConfiguration.handlePropertyChangeEvent(event);
@@ -80,6 +82,7 @@ public abstract class CPreview {
 		    fPreferenceStore.addPropertyChangeListener(propertyListener);
 			
 			fSourceViewer.getTextWidget().addDisposeListener(new DisposeListener() {
+				@Override
 				public void widgetDisposed(DisposeEvent e) {
 					JFaceResources.getFontRegistry().removeListener(fontListener);
 					fPreferenceStore.removePropertyChangeListener(propertyListener);

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ControlStatementsTabPage.java

@@ -82,6 +82,7 @@ public class ControlStatementsTabPage extends FormatterTabPage {
 		fSimpleIfPref= createOption(ifElseGroup, numColumns - 1, FormatterMessages.ControlStatementsTabPage_if_else_group_keep_simple_if_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_SIMPLE_IF_ON_ONE_LINE, FALSE_TRUE); 
 		
 		fThenStatementPref.addObserver( new Observer() {
+			@Override
 			public void update(Observable o, Object arg) {
 				fSimpleIfPref.setEnabled(!fThenStatementPref.getChecked());
 			}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CreateProfileDialog.java

@@ -111,6 +111,7 @@ public class CreateProfileDialog extends StatusDialog {
 		fNameText= new Text(composite, SWT.SINGLE | SWT.BORDER);
 		fNameText.setLayoutData(gd);
 		fNameText.addModifyListener( new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				doValidation();
 			}
@@ -135,9 +136,11 @@ public class CreateProfileDialog extends StatusDialog {
 		fEditCheckbox= new Button(composite, SWT.CHECK);
 		fEditCheckbox.setText(FormatterMessages.CreateProfileDialog_open_edit_dialog_checkbox_text); 
 		fEditCheckbox.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				fOpenEditDialog= ((Button)e.widget).getSelection();
 			}
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 		});

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/IndentationTabPage.java

@@ -104,11 +104,13 @@ public class IndentationTabPage extends FormatterTabPage {
 		String tabchar= fWorkingValues.get(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR);
 		updateTabPreferences(tabchar, tabSize, indentSize, onlyForLeading);
 		tabPolicy.addObserver(new Observer() {
+			@Override
 			public void update(Observable o, Object arg) {
 				updateTabPreferences((String) arg, tabSize, indentSize, onlyForLeading);
 			}
 		});
 		tabSize.addObserver(new Observer() {
+			@Override
 			public void update(Observable o, Object arg) {
 				indentSize.updateWidget();
 			}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/LineWrappingTabPage.java

@@ -120,6 +120,7 @@ public class LineWrappingTabPage extends FormatterTabPage {
 //			fCategoriesList.add(category);
 //		}
 
+		@Override
 		public void selectionChanged(SelectionChangedEvent event) {
 		    if (event != null)
 		        fSelection= (IStructuredSelection)event.getSelection();
@@ -177,6 +178,7 @@ public class LineWrappingTabPage extends FormatterTabPage {
 			fCategoriesViewer.setSelection(new StructuredSelection(new Category[] { category }));
 		}
 
+        @Override
 		public void doubleClick(DoubleClickEvent event) {
             final ISelection selection= event.getSelection();
             if (selection instanceof IStructuredSelection) {
@@ -708,17 +710,23 @@ public class LineWrappingTabPage extends FormatterTabPage {
 
 		fCategoriesViewer= new TreeViewer(composite /*categoryGroup*/, SWT.MULTI | SWT.BORDER | SWT.READ_ONLY | SWT.V_SCROLL );
 		fCategoriesViewer.setContentProvider(new ITreeContentProvider() {
+			@Override
 			public Object[] getElements(Object inputElement) {
 				return ((Collection<?>) inputElement).toArray();
 			}
+			@Override
 			public Object[] getChildren(Object parentElement) {
 				return ((Category) parentElement).children.toArray();
 			}
+			@Override
 			public Object getParent(Object element) { return null; }
+			@Override
 			public boolean hasChildren(Object element) {
 				return !((Category) element).children.isEmpty();
 			}
+			@Override
 			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
+			@Override
 			public void dispose() {}
 		});
 		fCategoriesViewer.setLabelProvider(new LabelProvider());
@@ -771,6 +779,7 @@ public class LineWrappingTabPage extends FormatterTabPage {
 		fDefaultFocusManager.add(previewLineWidth);
 		previewLineWidth.addObserver(fUpdater);
 		previewLineWidth.addObserver(new Observer() {
+			@Override
 			public void update(Observable o, Object arg) {
 				fDialogSettings.put(PREF_PREVIEW_LINE_WIDTH, fPreviewPreferences.get(LINE_SPLIT));
 			}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialog.java

@@ -153,6 +153,7 @@ public abstract class ModifyDialog extends StatusDialog implements IModifyDialog
 		fProfileNameField.getLabelControl(nameComposite).setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 		fProfileNameField.getTextControl(nameComposite).setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 		fProfileNameField.setDialogFieldListener(new IDialogFieldListener() {
+			@Override
 			public void dialogFieldChanged(DialogField field) {
 				doValidate();
             }
@@ -169,7 +170,9 @@ public abstract class ModifyDialog extends StatusDialog implements IModifyDialog
 		applyDialogFont(composite);
 		
 		fTabFolder.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {}
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				final TabItem tabItem= (TabItem)e.item;
 				final IModifyDialogTabPage page= (IModifyDialogTabPage)tabItem.getData();
@@ -326,6 +329,7 @@ public abstract class ModifyDialog extends StatusDialog implements IModifyDialog
 		fTabPages.add(tabPage);
 	}
 
+	@Override
 	public void valuesModified() {
 		doValidate();
 	}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java

@@ -61,6 +61,7 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage {
 	 * updates the page's preview on each change. 
 	 */
 	protected final Observer fUpdater= new Observer() {
+		@Override
 		public void update(Observable o, Object arg) {
 			doUpdatePreview();
 			notifyValuesModified();
@@ -352,15 +353,18 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage {
 			updateWidget();
 			
 			fNumberText.addFocusListener(new FocusListener() {
+				@Override
 				public void focusGained(FocusEvent e) {
 				    NumberPreference.this.focusGained();
 				}
+                @Override
 				public void focusLost(FocusEvent e) {
 				    NumberPreference.this.focusLost();
 				}
 			});
 			
 			fNumberText.addModifyListener(new ModifyListener() {
+				@Override
 				public void modifyText(ModifyEvent e) {
 					fieldModified();
 				}
@@ -630,6 +634,7 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void setWorkingValues(Map<String, String> workingValues) {
 		fWorkingValues= workingValues;
 	}
@@ -637,6 +642,7 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void setModifyListener(IModifyDialogTabPage.IModificationListener modifyListener) {
 		fModifyListener= modifyListener;
 	}
@@ -648,6 +654,7 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage {
 	 * @param parent The parent composite
 	 * @return Created content control
 	 */
+	@Override
 	public final Composite createContents(Composite parent) {
 		final int numColumns= 4;
 		
@@ -698,9 +705,11 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage {
 		
 		scroll.addControlListener(new ControlListener() {
 
+			@Override
 			public void controlMoved(ControlEvent e) {
 			}
 
+			@Override
 			public void controlResized(ControlEvent e) {
 				settingsContainer.setSize(settingsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT));	
 			}
@@ -772,6 +781,7 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	final public void makeVisible() {
 		fDefaultFocusManager.resetFocus();
 		doUpdatePreview();
@@ -788,6 +798,7 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage {
     /**
 	 * {@inheritDoc}
 	 */
+    @Override
 	public void setInitialFocus() {
 		if (fDefaultFocusManager.isUsed()) {
 			fDefaultFocusManager.restoreFocus();

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileConfigurationBlock.java

@@ -60,6 +60,7 @@ public abstract class ProfileConfigurationBlock {
 			fProfileManager.addObserver(this);
 		}
 
+		@Override
 		public void update(Observable o, Object arg) {
 			try {
 				fPreferenceListenerEnabled= false;
@@ -98,13 +99,16 @@ public abstract class ProfileConfigurationBlock {
 			updateSelection();
 		}
 
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			final int index= fProfileCombo.getSelectionIndex();
 			fProfileManager.setSelected(fSortedProfiles.get(index));
 		}
 
+		@Override
 		public void widgetDefaultSelected(SelectionEvent e) {}
 
+		@Override
 		public void update(Observable o, Object arg) {
 			if (arg == null) return;
 			final int value= ((Integer)arg).intValue();
@@ -141,12 +145,14 @@ public abstract class ProfileConfigurationBlock {
 			update(fProfileManager, null);
 		}
 
+		@Override
 		public void update(Observable o, Object arg) {
 			Profile selected= ((ProfileManager)o).getSelected();
 			final boolean notBuiltIn= !selected.isBuiltInProfile(); 
 			fDeleteButton.setEnabled(notBuiltIn);
 		}
 
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			final Button button= (Button)e.widget;
 			if (button == fEditButton)
@@ -159,6 +165,7 @@ public abstract class ProfileConfigurationBlock {
 				loadButtonPressed();
 		}
 
+		@Override
 		public void widgetDefaultSelected(SelectionEvent e) {
 		}
 
@@ -290,6 +297,7 @@ public abstract class ProfileConfigurationBlock {
 		
 		fPreferenceListenerEnabled= true;
 		fPreferenceListener= new IPreferenceChangeListener() {
+			@Override
 			public void preferenceChange(PreferenceChangeEvent event) {
 				if (fPreferenceListenerEnabled) {
 					preferenceChanged(event);

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileManager.java

@@ -158,6 +158,7 @@ public abstract class ProfileManager extends Observable {
 			return fID; 
 		}
 		
+		@Override
 		public final int compareTo(Profile o) {
 			if (o instanceof BuiltInProfile) {
 				return fOrder - ((BuiltInProfile)o).fOrder;
@@ -254,6 +255,7 @@ public abstract class ProfileManager extends Observable {
 			fVersion= version;
 		}
 		
+		@Override
 		public int compareTo(Profile o) {
 			if (o instanceof SharedProfile) {
 				return -1;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileVersioner.java

@@ -26,10 +26,12 @@ public class ProfileVersioner implements IProfileVersioner {
 	public static final int CURRENT_VERSION= VERSION_1;
 	
 	
+	@Override
 	public int getFirstVersion() {
 	    return VERSION_1;
     }
 
+	@Override
 	public int getCurrentVersion() {
 	    return CURRENT_VERSION;
     }
@@ -37,10 +39,12 @@ public class ProfileVersioner implements IProfileVersioner {
 	/**
      * {@inheritDoc}
      */
+    @Override
 	public String getProfileKind() {
 	    return CODE_FORMATTER_PROFILE_KIND;
     }
 
+	@Override
 	public void update(CustomProfile profile) {
 		final Map<String, String> oldSettings= profile.getSettings();
 		Map<String, String> newSettings= updateAndComplete(oldSettings, profile.getVersion());

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java

@@ -85,19 +85,25 @@ public class WhiteSpaceTabPage extends FormatterTabPage {
             
 	        fTreeViewer= new ContainerCheckedTreeViewer(fComposite, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL);
 			fTreeViewer.setContentProvider(new ITreeContentProvider() {
+				@Override
 				public Object[] getElements(Object inputElement) {
 					return ((Collection<?>)inputElement).toArray();
 				}
+				@Override
 				public Object[] getChildren(Object parentElement) {
 					return ((Node)parentElement).getChildren().toArray();
 				}
+				@Override
 				public Object getParent(Object element) {
 				    return ((Node)element).getParent(); 
 				}
+				@Override
 				public boolean hasChildren(Object element) {
 					return ((Node)element).hasChildren();
 				}
+				@Override
 				public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
+				@Override
 				public void dispose() {}
 			});
 			fTreeViewer.setLabelProvider(new LabelProvider());
@@ -127,6 +133,7 @@ public class WhiteSpaceTabPage extends FormatterTabPage {
 		    doUpdatePreview();
 		}
 
+		@Override
 		public void selectionChanged(SelectionChangedEvent event) {
 		    final IStructuredSelection selection= (IStructuredSelection)event.getSelection();
 		    if (selection.isEmpty())
@@ -141,6 +148,7 @@ public class WhiteSpaceTabPage extends FormatterTabPage {
 		    fLastSelected= node;
 		}
 
+		@Override
 		public void checkStateChanged(CheckStateChangedEvent event) {
 			final Node node= (Node)event.getElement();
 			node.setChecked(event.getChecked());
@@ -166,6 +174,7 @@ public class WhiteSpaceTabPage extends FormatterTabPage {
 			}
 		}
 
+        @Override
 		public void doubleClick(DoubleClickEvent event) {
             final ISelection selection= event.getSelection();
             if (selection instanceof IStructuredSelection) {
@@ -216,9 +225,11 @@ public class WhiteSpaceTabPage extends FormatterTabPage {
 			fInnerViewer= new TreeViewer(sashForm, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL);
 
 			fInnerViewer.setContentProvider(new ITreeContentProvider() {
+				@Override
 				public Object[] getElements(Object inputElement) {
 					return ((Collection<?>)inputElement).toArray();
 				}
+				@Override
 				public Object[] getChildren(Object parentElement) {
 				    final List<Node> children= ((Node)parentElement).getChildren();
 				    final ArrayList<Object> innerChildren= new ArrayList<Object>();
@@ -227,18 +238,22 @@ public class WhiteSpaceTabPage extends FormatterTabPage {
                     }
 				    return innerChildren.toArray();
 				}
+				@Override
 				public Object getParent(Object element) {
 				    if (element instanceof InnerNode)
 				        return ((InnerNode)element).getParent();
 				    return null;
 				}
+				@Override
 				public boolean hasChildren(Object element) {
 				    final List<?> children= ((Node)element).getChildren();
 				    for (Object child : children)
 						if (child instanceof InnerNode) return true;
 				    return false;
 				}
+				@Override
 				public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
+				@Override
 				public void dispose() {}
 			});
 			
@@ -311,6 +326,7 @@ public class WhiteSpaceTabPage extends FormatterTabPage {
 	        return fComposite;
 	    }
 
+        @Override
 		public void selectionChanged(SelectionChangedEvent event) {
             final IStructuredSelection selection= (IStructuredSelection)event.getSelection();
 
@@ -352,6 +368,7 @@ public class WhiteSpaceTabPage extends FormatterTabPage {
 			doUpdatePreview();
         }
         
+        @Override
 		public void checkStateChanged(CheckStateChangedEvent event) {
 			final OptionNode option= (OptionNode)event.getElement();
 			if (option != null)