@Override annotations and other cleanup

5 files changed, 36 insertions, 27 deletions

diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/Activator.java b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/Activator.java
index 459f613723e..5d72f45aef8 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/Activator.java
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/Activator.java
@@ -20,16 +20,18 @@ public class Activator extends AbstractUIPlugin {
 
 
 	private static Activator plugin;
-	
+
 
 	public Activator() {
 	}
 
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
 	}
 
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/Messages.java b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/Messages.java
index f78eeb59d8f..845d6d5971d 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/Messages.java
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/Messages.java
@@ -14,15 +14,15 @@ package org.eclipse.cdt.managedbuilder.xlupc.ui;
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-	
+
 	private static final String BUNDLE_NAME = "org.eclipse.cdt.managedbuilder.xlupc.ui.messages"; //$NON-NLS-1$
-	
+
 	static {
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
 	}
 
 	private Messages() {}
-	
+
 	public static String UpcProjectWizard_0;
 	public static String UpcProjectWizard_1;
 	public static String XLUpcSettingsWizardPage_0;
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/UpcProjectWizard.java b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/UpcProjectWizard.java
index 30dbe13c4ea..316741d5bcf 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/UpcProjectWizard.java
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/UpcProjectWizard.java
@@ -31,17 +31,17 @@ import org.eclipse.core.runtime.NullProgressMonitor;
 public class UpcProjectWizard extends CDTCommonProjectWizard {
 
 	private static final String ARTIFACT_TYPE_UPC_EXE = "org.eclipse.cdt.build.core.buildArtefactType.xlupc.exe";
-	private static final String ARTIFACT_TYPE_UPC_EXE_DEFAULT = ARTIFACT_TYPE_UPC_EXE + ".default"; 
-	
-	private static final String ARTIFACT_TYPE_UPC_SO = "org.eclipse.cdt.build.core.buildArtefactType.xlupc.sharedLib"; 
+	private static final String ARTIFACT_TYPE_UPC_EXE_DEFAULT = ARTIFACT_TYPE_UPC_EXE + ".default";
+
+	private static final String ARTIFACT_TYPE_UPC_SO = "org.eclipse.cdt.build.core.buildArtefactType.xlupc.sharedLib";
 	private static final String ARTIFACT_TYPE_UPC_SO_DEFAULT = ARTIFACT_TYPE_UPC_SO + ".default";
-	
-	private static final String ARTIFACT_TYPE_UPC_LIB = "org.eclipse.cdt.build.core.buildArtefactType.xlupc.staticLib"; 
-	private static final String ARTIFACT_TYPE_UPC_LIB_DEFAULT = ARTIFACT_TYPE_UPC_LIB + ".default"; 
-	
+
+	private static final String ARTIFACT_TYPE_UPC_LIB = "org.eclipse.cdt.build.core.buildArtefactType.xlupc.staticLib";
+	private static final String ARTIFACT_TYPE_UPC_LIB_DEFAULT = ARTIFACT_TYPE_UPC_LIB + ".default";
+
 	private final static String PAGE_NAME = "org.eclipse.cdt.managedbuilder.xlupc.ui.mainpage";
-	
-	
+
+
 	private static final Set<String> ALL_TYPES = new HashSet<String>() {{
 		add(ARTIFACT_TYPE_UPC_EXE);
 		add(ARTIFACT_TYPE_UPC_EXE_DEFAULT);
@@ -50,17 +50,19 @@ public class UpcProjectWizard extends CDTCommonProjectWizard {
 		add(ARTIFACT_TYPE_UPC_LIB);
 		add(ARTIFACT_TYPE_UPC_LIB_DEFAULT);
 	}};
-	
-	
+
+
 
 	public UpcProjectWizard() {
-		super(Messages.UpcProjectWizard_0, Messages.UpcProjectWizard_1); 
+		super(Messages.UpcProjectWizard_0, Messages.UpcProjectWizard_1);
 	}
 
-	
+
+	@Override
 	public void addPages()  {
 		fMainPage = new CDTMainWizardPage(PAGE_NAME) {
-			
+
+			@Override
 			@SuppressWarnings("unchecked")
 			public List filterItems(List items)  {
 				// filter out all non-UPC project types
@@ -75,13 +77,14 @@ public class UpcProjectWizard extends CDTCommonProjectWizard {
 				return items;
 			}
 		};
-		
-		fMainPage.setTitle(Messages.UpcProjectWizard_0); 
-		fMainPage.setDescription(Messages.UpcProjectWizard_1);   
+
+		fMainPage.setTitle(Messages.UpcProjectWizard_0);
+		fMainPage.setDescription(Messages.UpcProjectWizard_1);
 		addPage(fMainPage);
 	}
 
 
+	@Override
 	protected IProject continueCreation(IProject prj) {
 		try {
 			CProjectNature.addCNature(prj, new NullProgressMonitor());
@@ -90,6 +93,7 @@ public class UpcProjectWizard extends CDTCommonProjectWizard {
 	}
 
 
+	@Override
 	public String[] getNatures() {
 		return new String[] { CProjectNature.C_NATURE_ID/*, CCProjectNature.CC_NATURE_ID, RemoteNature.REMOTE_NATURE_ID*/};
 	}
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/XLUpcSettingsWizardPage.java b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/XLUpcSettingsWizardPage.java
index f379581c1d8..637c757190c 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/XLUpcSettingsWizardPage.java
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/XLUpcSettingsWizardPage.java
@@ -29,10 +29,12 @@ public class XLUpcSettingsWizardPage extends XLCSettingsWizardPage {
 		pageID = PAGE_ID;
 	}
 
+	@Override
 	public String getName() {
 		return Messages.XLUpcSettingsWizardPage_0;
 	}
 
+	@Override
 	public String getTitle() {
 		return Messages.XLUpcSettingsWizardPage_1;
 	}
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/XLUpcSettingsWizardRunnable.java b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/XLUpcSettingsWizardRunnable.java
index 477592549cb..6b8ff391608 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/XLUpcSettingsWizardRunnable.java
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/XLUpcSettingsWizardRunnable.java
@@ -33,14 +33,15 @@ import org.eclipse.jface.wizard.IWizardPage;
 
 public class XLUpcSettingsWizardRunnable extends XLCSettingsWizardRunnable {
 
-	
+
 	// now add UPC language mapping to the project
 	private static final String[] CONTENT_TYPE_IDS = { CCorePlugin.CONTENT_TYPE_CHEADER, CCorePlugin.CONTENT_TYPE_CSOURCE };
-	
+
 	public XLUpcSettingsWizardRunnable() {
 		pageId = XLUpcSettingsWizardPage.PAGE_ID;
 	}
 
+	@Override
 	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
 		super.run(monitor);
 		// get a handle to the wizard
@@ -51,10 +52,10 @@ public class XLUpcSettingsWizardRunnable extends XLCSettingsWizardRunnable {
 			CDTCommonProjectWizard wizard = (CDTCommonProjectWizard) pages[0].getWizard();
 			IProject project = wizard.getLastProject();
 			LanguageManager langManager = LanguageManager.getInstance();
-				
+
 			try {
 				ProjectLanguageConfiguration langConfig = langManager.getLanguageConfiguration(project);
-				
+
 				ICProjectDescription projectDescription = CoreModel.getDefault().getProjectDescription(project, false);
 				ICConfigurationDescription configDescription = projectDescription.getActiveConfiguration();
 
@@ -65,9 +66,9 @@ public class XLUpcSettingsWizardRunnable extends XLCSettingsWizardRunnable {
 						langConfig.addContentTypeMapping(configDescription, id, UPCLanguage.ID);
 					}
 				}
-				
+
 				langManager.storeLanguageMappingConfiguration(project, new IContentType[0]);
-				
+
 			} catch (CoreException e) {
 				CCorePlugin.log(e);
 			}