Bug 508144 - Add @Override to org.eclipse.pde.ua.ui (XII.)
added @override (removed non-javadoc if needed)
cleaned empty or effectively empty comments
Change-Id: Ib92bfb0b4b71f40bd7173523d65ac7743b5d701f
Signed-off-by: Martin Karpisek <martin.karpisek@gmail.com>
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/NewTocFileWizard.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/NewTocFileWizard.java
index 86ba1d4..6e14b27 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/NewTocFileWizard.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/NewTocFileWizard.java
@@ -22,6 +22,7 @@
private TocWizardPage fPage;
private IPath fInitialPath = null;
+ @Override
public void addPages() {
fPage = new TocWizardPage("tocfile", getSelection()); //$NON-NLS-1$
if (fInitialPath != null)
@@ -29,16 +30,19 @@
addPage(fPage);
}
+ @Override
public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
super.init(workbench, currentSelection);
setWindowTitle(TocWizardMessages.NewTocFileWizard_title);
setNeedsProgressMonitor(true);
}
+ @Override
protected void initializeDefaultPageImageDescriptor() {
// setDefaultPageImageDescriptor(PDEUserAssistanceUIPluginImages.DESC_TARGET_WIZ);
}
+ @Override
public boolean performFinish() {
try {
fNewFile = fPage.createNewFile();
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocOperation.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocOperation.java
index fb63c53..33349a9 100644
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocOperation.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocOperation.java
@@ -69,9 +69,7 @@
super(rule);
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.actions.WorkspaceModifyOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
try {
@@ -89,10 +87,6 @@
}
}
- /**
- * FindCSExtensionResult
- *
- */
private static class FindTocExtensionResult {
public IPluginExtension fTocExtension;
@@ -124,6 +118,7 @@
}
// Perform the modification of the plugin manifest file
ModelModification mod = new ModelModification(fPage.getPluginProject()) {
+ @Override
protected void modifyModel(IBaseModel model, IProgressMonitor monitor) throws CoreException {
doModifyPluginModel(model, monitor);
doModifyManifestModel(model);
@@ -294,6 +289,7 @@
}
// Perform the modification of the manifest file
ModelModification mod = new ModelModification(fPage.getPluginProject()) {
+ @Override
protected void modifyModel(IBaseModel model, IProgressMonitor monitor) throws CoreException {
doModifyManifestModel(model);
doModifyBuildModel(model);
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizard.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizard.java
index 8e58f3b..dcd2939 100644
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizard.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizard.java
@@ -22,33 +22,23 @@
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
-/**
- * NewRegisterCSWizard
- */
public class RegisterTocWizard extends Wizard implements INewWizard {
private RegisterTocWizardPage fMainPage;
private IModel fModel;
- /**
- *
- */
public RegisterTocWizard(IModel model) {
fModel = model;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
+ @Override
public void addPages() {
fMainPage = new RegisterTocWizardPage(fModel);
addPage(fMainPage);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performFinish()
- */
+ @Override
public boolean performFinish() {
try {
getContainer().run(false, true, getOperation());
@@ -61,16 +51,11 @@
return true;
}
- /**
- * @return
- */
private IRunnableWithProgress getOperation() {
return new RegisterTocOperation(fMainPage, getShell());
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
- */
+ @Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
setWindowTitle(TocWizardMessages.RegisterTocWizard_link);
// TODO: MP: LOW: TOC: New register table of contents wizard image
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizardPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizardPage.java
index 491bb4a..9d92199 100644
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizardPage.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizardPage.java
@@ -148,21 +148,22 @@
}
}
+ @Override
public boolean getDataPrimary() {
return fDataIsPrimary;
}
+ @Override
public String getDataTocFile() {
return fTocModel.getUnderlyingResource().getProjectRelativePath().toPortableString();
}
+ @Override
public IProject getPluginProject() {
return fPluginProject;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
+ @Override
public void createControl(Composite parent) {
createUI(parent);
createUIListeners();
@@ -211,6 +212,7 @@
private void createUIListenersPrimaryChkBox() {
fPrimaryChkBox.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
fDataIsPrimary = fPrimaryChkBox.getSelection();
}
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLOperation.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLOperation.java
index b97fff0..9b0fd94 100644
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLOperation.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLOperation.java
@@ -110,6 +110,7 @@
fFile = file;
}
+ @Override
protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
ByteArrayInputStream stream = new ByteArrayInputStream(getHTMLContent());
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLWizard.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLWizard.java
index 11698ab..5b331fc 100644
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLWizard.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLWizard.java
@@ -21,9 +21,7 @@
public class TocHTMLWizard extends BasicNewFileResourceWizard {
protected IFile fNewFile;
- /* (non-Javadoc)
- * @see org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard#addPages()
- */
+ @Override
public void addPages() {
IWizardPage mainPage = new TocHTMLWizardPage("newHTMLPage1", getSelection());//$NON-NLS-1$
mainPage.setTitle(TocWizardMessages.TocHTMLWizard_title);
@@ -31,9 +29,7 @@
addPage(mainPage);
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard#performFinish()
- */
+ @Override
public boolean performFinish() {
IWizardPage mainPage = getPage("newHTMLPage1"); //$NON-NLS-1$
if (!(mainPage instanceof TocHTMLWizardPage)) {
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLWizardPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLWizardPage.java
index f1a9ba0..dbccc42 100644
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLWizardPage.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLWizardPage.java
@@ -21,24 +21,15 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-/**
- * PDEWizardNewFileCreationPage
- */
public class TocHTMLWizardPage extends WizardNewFileCreationPage {
private String fLastFilename;
- /**
- * @param pageName
- * @param selection
- */
public TocHTMLWizardPage(String pageName, IStructuredSelection selection) {
super(pageName, selection);
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#validatePage()
- */
+ @Override
protected boolean validatePage() {
fLastFilename = getFileName().trim();
@@ -68,24 +59,22 @@
return super.validatePage();
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#validateLinkedResource()
- */
+ @Override
protected IStatus validateLinkedResource() {
return new Status(IStatus.OK, PDEUserAssistanceUIPlugin.PLUGIN_ID, IStatus.OK, "", null); //$NON-NLS-1$
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#createLinkTarget()
- */
+ @Override
protected void createLinkTarget() {
// NO-OP
}
+ @Override
protected void createAdvancedControls(Composite parent) {
// NO-OP
}
+ @Override
public String getFileName() {
if (getControl() != null && getControl().isDisposed()) {
return fLastFilename;
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocOperation.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocOperation.java
index 285e997..b2c6cac 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocOperation.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocOperation.java
@@ -42,6 +42,7 @@
fTocName = tocName;
}
+ @Override
protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
TocModel model = new TocModel(CoreUtility.getTextDocument(fFile.getContents()), false);
model.setUnderlyingResource(fFile);
@@ -74,6 +75,7 @@
protected void openFile() {
Display.getCurrent().asyncExec(new Runnable() {
+ @Override
public void run() {
IWorkbenchWindow ww = PDEUserAssistanceUIPlugin.getActiveWorkbenchWindow();
if (ww == null) {
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocWizardPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocWizardPage.java
index 6900464..d231a8b 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocWizardPage.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocWizardPage.java
@@ -28,15 +28,18 @@
setFileExtension(EXTENSION);
}
+ @Override
public void createControl(Composite parent) {
super.createControl(parent);
PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.TOC_PAGE);
}
+ @Override
protected void createAdvancedControls(Composite parent) {
}
+ @Override
protected boolean validatePage() {
String tocName = getTocName();
if (tocName == null) {
