Bug 485638 - Missing missing annotations to org.eclipse.releng.tools
Change-Id: If8b6379768a5d774d765a2bd599375cfd300b2de
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/internal/tools/pomversion/PomVersionErrorReporter.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/internal/tools/pomversion/PomVersionErrorReporter.java
index 4fc08fa..4e9b0cf 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/internal/tools/pomversion/PomVersionErrorReporter.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/internal/tools/pomversion/PomVersionErrorReporter.java
@@ -158,10 +158,12 @@
this.isFeatureProject = isFeatureProject;
}
+ @Override
public void setDocumentLocator(Locator locator) {
this.locator = locator;
}
+ @Override
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
if (ELEMENT_VERSION.equals(qName)) {
if (!elements.isEmpty() && ELEMENT_PROJECT.equals(elements.peek())) {
@@ -171,10 +173,12 @@
elements.push(qName);
}
+ @Override
public void endElement(String uri, String localName, String qName) throws SAXException {
elements.pop();
}
+ @Override
public void characters(char[] ch, int start, int length) throws SAXException {
if (checkVersion) {
checkVersion = false;
@@ -261,6 +265,7 @@
public FeatureVersionHandler() {
}
+ @Override
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
// The version is on the root element, check for the attribute then throw exception to exit early
featureVersion = attributes.getValue("version"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/AdvancedCopyrightComment.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/AdvancedCopyrightComment.java
index 6b25546..33e36d0 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/AdvancedCopyrightComment.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/AdvancedCopyrightComment.java
@@ -57,7 +57,8 @@
/**
* Return the body of this copyright comment or null if it cannot be built.
*/
- public String getCopyrightComment() {
+ @Override
+ public String getCopyrightComment() {
if ((preYearLinesString != null || postYearLineString != null)) {
StringBuilder copyrightComment = new StringBuilder();
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/AdvancedFixCopyrightAction.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/AdvancedFixCopyrightAction.java
index 24eb519..e6602cf 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/AdvancedFixCopyrightAction.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/AdvancedFixCopyrightAction.java
@@ -179,6 +179,7 @@
final MessageConsoleStream stream = console.newMessageStream();
WorkspaceJob wJob = new WorkspaceJob(Messages.getString("AdvancedFixCopyrightAction.1")) { //$NON-NLS-1$
+ @Override
public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
try {
long start = System.currentTimeMillis();
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/BatFile.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/BatFile.java
index 7105a03..ef14c0b 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/BatFile.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/BatFile.java
@@ -25,24 +25,29 @@
//Optional Whitespace, #, optional whitespace, then at least 2 non-word chars repeated till EOL
private static Pattern p = Pattern.compile("\\s*@?[rR][eE][mM]\\s+\\W{2,}\\s*"); //$NON-NLS-1$
+ @Override
public boolean isCommentStart(String aLine) {
return p.matcher(aLine).matches();
}
+ @Override
public boolean isCommentEnd(String aLine, String commentStartString) {
String s = commentStartString.trim();
s = s.substring(s.length()-2);
return aLine.trim().endsWith(s);
}
+ @Override
public String getCommentStart() {
return "@rem **"; //unused, Pattern matcher above will be used instead //$NON-NLS-1$
}
+ @Override
public String getCommentEnd() {
return "**"; //unused, Pattern matcher above will be used instead //$NON-NLS-1$
}
+ @Override
public int getFileType() {
return CopyrightComment.BAT_COMMENT;
}
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/BuildNotesPage.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/BuildNotesPage.java
index e8647da..1e0b261 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/BuildNotesPage.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/BuildNotesPage.java
@@ -110,6 +110,7 @@
updateNotesButton.setText(Messages.getString("BuildNotesPage.2")); //$NON-NLS-1$
updateNotesButton.setLayoutData(data);
updateNotesButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
updateNotesButtonChecked = updateNotesButton.getSelection();
if (updateNotesButtonChecked) {
@@ -161,6 +162,7 @@
browse = new Button(composite, SWT.PUSH);
browse.setText(Messages.getString("BuildNotesPage.8")); //$NON-NLS-1$
browse.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
IResource iResource = buildNotesFileDialog();
if (iResource instanceof IFile) {
@@ -377,6 +379,7 @@
}
}
+ @Override
public void setVisible(boolean visible) {
super.setVisible(visible);
if (visible) {
@@ -400,6 +403,7 @@
// filter for .html files only and exclude bin folders
dialog.addFilter(new ViewerFilter() {
+ @Override
public boolean select(Viewer viewer, Object parentElement,
Object element) {
if (element instanceof IFile) {
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CFile.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CFile.java
index 4e2958a..eada4a8 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CFile.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CFile.java
@@ -19,14 +19,17 @@
super(file);
}
+ @Override
public String getCommentStart() {
return "/*"; //$NON-NLS-1$
}
+ @Override
public String getCommentEnd() {
return "*/"; //$NON-NLS-1$
}
+ @Override
public int getFileType() {
return CopyrightComment.C_COMMENT;
}
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CVSCopyrightAdapter.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CVSCopyrightAdapter.java
index c7b035a..9b6e5bd 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CVSCopyrightAdapter.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CVSCopyrightAdapter.java
@@ -30,6 +30,7 @@
super(resources);
}
+ @Override
public int getLastModifiedYear(IFile file, IProgressMonitor monitor) throws CoreException {
try {
monitor.beginTask("Fetching logs from CVS", 100);
@@ -62,6 +63,7 @@
return -1;
}
+ @Override
public void initialize(IProgressMonitor monitor) throws CoreException {
// TODO We should perform a bulk "log" command to get the last modified year
}
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CommitCommentPage.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CommitCommentPage.java
index dce67d3..44810da 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CommitCommentPage.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CommitCommentPage.java
@@ -49,6 +49,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
*/
+ @Override
public void setVisible(boolean visible) {
super.setVisible(visible);
if (visible) {
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CompareLocalToMap.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CompareLocalToMap.java
index 312bb18..ae49d40 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CompareLocalToMap.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CompareLocalToMap.java
@@ -49,6 +49,7 @@
*
* @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled()
*/
+ @Override
public boolean isEnabled() {
if (!super.isEnabled())
return false;
@@ -98,6 +99,7 @@
/**
* @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction)
*/
+ @Override
protected void execute(IAction action) throws InvocationTargetException, InterruptedException {
//Start the MapProjectSelectionWizard
IPreferenceStore preferenceStore = RelEngPlugin.getDefault().getPreferenceStore();
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/IBMCopyrightComment.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/IBMCopyrightComment.java
index e56ee89..6f10ad7 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/IBMCopyrightComment.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/IBMCopyrightComment.java
@@ -117,6 +117,7 @@
/**
* Return the body of this copyright comment or null if it cannot be built.
*/
+ @Override
public String getCopyrightComment() {
String linePrefix = getCommentPrefix();
if (linePrefix == null)
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/JavaFile.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/JavaFile.java
index e210dad..46c68d3 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/JavaFile.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/JavaFile.java
@@ -28,6 +28,7 @@
/* (non-Javadoc)
* @see Test.popup.actions.SourceFile#getCommentStart()
*/
+ @Override
public String getCommentStart() {
return "/*"; //$NON-NLS-1$
}
@@ -35,10 +36,12 @@
/* (non-Javadoc)
* @see Test.popup.actions.SourceFile#getCommentEnd()
*/
+ @Override
public String getCommentEnd() {
return "*/"; //$NON-NLS-1$
}
+ @Override
public int getFileType() {
return CopyrightComment.JAVA_COMMENT;
}
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/JavaScriptFile.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/JavaScriptFile.java
index 5135669..749c2f6 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/JavaScriptFile.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/JavaScriptFile.java
@@ -22,6 +22,7 @@
/* (non-Javadoc)
* @see Test.popup.actions.SourceFile#getCommentStart()
*/
+ @Override
public String getCommentStart() {
return "/*"; //$NON-NLS-1$
}
@@ -29,9 +30,11 @@
/* (non-Javadoc)
* @see Test.popup.actions.SourceFile#getCommentEnd()
*/
+ @Override
public String getCommentEnd() {
return "*/"; //$NON-NLS-1$
}
+ @Override
public int getFileType() {
return CopyrightComment.JAVASCRIPT_COMMENT;
}
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/LoadMap.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/LoadMap.java
index 5286807..eb47d16 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/LoadMap.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/LoadMap.java
@@ -43,8 +43,10 @@
/**
* @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction)
*/
+ @Override
protected void execute(IAction action) throws InvocationTargetException, InterruptedException {
run(new WorkspaceModifyOperation(null) {
+ @Override
public void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
try {
IResource[] resources = getSelectedResources();
@@ -113,6 +115,7 @@
/**
* @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled()
*/
+ @Override
public boolean isEnabled() {
IResource[] resources = getSelectedResources();
if (resources.length == 0) return false;
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapEntry.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapEntry.java
index 367e509..b8aaddb 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapEntry.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapEntry.java
@@ -327,6 +327,7 @@
this.valid = valid;
}
+ @Override
public String toString() {
return "Entry: " + getMapString();
}
@@ -334,6 +335,7 @@
/* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj) {
if (obj instanceof MapEntry) {
return ((MapEntry)obj).getMapString().equals(getMapString());
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapFile.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapFile.java
index 9a20a5d..34aada2 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapFile.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapFile.java
@@ -36,6 +36,7 @@
/**
* @deprecated As of 3.7, replaced by {@link #isMapFile(IFile)}
*/
+ @Deprecated
public static final String MAP_FILE_EXTENSION = "map"; //$NON-NLS-1$
private static final String MAP_FILE_NAME_ENDING = '.' + MAP_FILE_EXTENSION;
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapFileCompareEditorInput.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapFileCompareEditorInput.java
index bca0383..8824909 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapFileCompareEditorInput.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapFileCompareEditorInput.java
@@ -48,6 +48,7 @@
super(new CompareConfiguration());
documents = new MapContentDocument[0];
root = new DiffNode(Differencer.NO_CHANGE) {
+ @Override
public boolean hasChildren() {
return true;
}
@@ -58,6 +59,7 @@
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#prepareInput(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
protected Object prepareInput(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
CompareConfiguration config = getCompareConfiguration();
config.setRightEditable(false);
@@ -77,6 +79,7 @@
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#createDiffViewer(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public Viewer createDiffViewer(Composite parent) {
viewer = super.createDiffViewer(parent);
viewer.setInput(this);
@@ -107,12 +110,14 @@
DiffNode[] diffNodes = new DiffNode[documents.length];
for (int i = 0; i < diffNodes.length; i++){
ResourceNode resourceNode = new ResourceNode(documents[i].getMapFile().getFile()) {
+ @Override
public boolean isEditable() {
return false;
}
};
diffNodes[i] = new DiffNode(root, Differencer.CHANGE, null, resourceNode, documents[i]) {
+ @Override
public Image getImage() {
return getLeft().getImage();
}
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapFileComparePage.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapFileComparePage.java
index eb36655..5c567c7 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapFileComparePage.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapFileComparePage.java
@@ -35,6 +35,7 @@
*
* @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
*/
+ @Override
public void setVisible(boolean visible) {
super.setVisible(visible);
//Need to handle input and rebuild tree only when becoming visible
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapProjectSelectionPage.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapProjectSelectionPage.java
index cce79ed..1b33214 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapProjectSelectionPage.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapProjectSelectionPage.java
@@ -77,6 +77,7 @@
useDefaultProjectButton = new Button(topContainer, SWT.CHECK);
useDefaultProjectButton.setText(Messages.getString("MapProjectSelectionPage.0")); //$NON-NLS-1$
useDefaultProjectButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
useDefaultMapProject = (useDefaultProjectButton.getSelection());
updateOthers();
@@ -165,6 +166,7 @@
* @see org.eclipse.jface.dialogs.DialogPage#dispose()
* @since 3.7
*/
+ @Override
public void dispose() {
if (selectedMapProject != null) {
selectedMapProject.dispose();
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapProjectSelectionWizard.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapProjectSelectionWizard.java
index 8542a8a..5f62321 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapProjectSelectionWizard.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapProjectSelectionWizard.java
@@ -56,6 +56,7 @@
* @see org.eclipse.jface.wizard.Wizard#createPageControls(org.eclipse.swt.widgets.Composite)
* @since 3.1
*/
+ @Override
public void createPageControls(Composite pageContainer) {
super.createPageControls(pageContainer);
@@ -96,6 +97,7 @@
* (non-Javadoc)
* @see org.eclipse.jface.wizard.Wizard#addPages()
*/
+ @Override
public void addPages() {
mapProjectSelectionPage = new MapProjectSelectionPage("MapProjectSelectionPage", //$NON-NLS-1$
Messages.getString("MapProjectSelectionWizard.1"), //$NON-NLS-1$
@@ -108,6 +110,7 @@
* (non-Javadoc)
* @see org.eclipse.jface.wizard.Wizard#performFinish()
*/
+ @Override
public boolean performFinish() {
mapProjectSelectionPage.saveSettings();
preferenceStore.setValue(MapProjectPreferencePage.USE_DEFAULT_MAP_PROJECT, mapProjectSelectionPage.useDefaultMapProject());
@@ -120,6 +123,7 @@
* (non-Javadoc)
* @see org.eclipse.jface.wizard.Wizard#performCancel()
*/
+ @Override
public boolean performCancel() {
operationCancelled = true;
return true;
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/OrderedMap.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/OrderedMap.java
index 30bfff9..16d19f7 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/OrderedMap.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/OrderedMap.java
@@ -138,6 +138,7 @@
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/
+ @Override
public String toString() {
StringBuffer result = new StringBuffer();
result.append("{"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ProjectComparePage.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ProjectComparePage.java
index c666b51..faf277c 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ProjectComparePage.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ProjectComparePage.java
@@ -108,6 +108,7 @@
buildNotesButton.setText(Messages.getString("ProjectComparePage.2")); //$NON-NLS-1$
buildNotesButton.setFont(font);
buildNotesButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
buildNotesButtonChecked = buildNotesButton.getSelection();
}
@@ -139,6 +140,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
*/
+ @Override
public void setVisible(boolean visible) {
super.setVisible(visible);
if (visible) {
@@ -215,6 +217,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#dispose()
*/
+ @Override
public void dispose() {
super.dispose();
input.getParticipant().dispose();
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ProjectSelectionPage.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ProjectSelectionPage.java
index f5b1f9c..df50f07 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ProjectSelectionPage.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ProjectSelectionPage.java
@@ -60,18 +60,21 @@
private class MapFileLabelProvider extends LabelProvider {
WorkbenchLabelProvider provider = new WorkbenchLabelProvider();
+ @Override
public String getText(Object element) {
if (element instanceof MapFile) {
return ((MapFile)element).getName();
}
return provider.getText(element);
}
+ @Override
public Image getImage(Object element) {
if (element instanceof MapFile) {
return provider.getImage(((MapFile)element).getFile());
}
return provider.getImage(element);
}
+ @Override
public void dispose() {
provider.dispose();
super.dispose();
@@ -111,6 +114,7 @@
viewer.setLabelProvider(new MapFileLabelProvider());
viewer.setContentProvider(getContentProvider());
viewer.setComparator(new ResourceComparator(ResourceComparator.NAME) {
+ @Override
public int compare(Viewer viewer, Object o1, Object o2) {
if (o1 instanceof MapFile && o2 instanceof MapFile) {
return super.compare(viewer, ((MapFile) o1).getFile(), ((MapFile) o2).getFile());
@@ -129,6 +133,7 @@
compareButton.setText(Messages.getString("ProjectSelectionPage.3")); //$NON-NLS-1$
compareButton.setFont(font);
compareButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
compareButtonChecked = compareButton.getSelection();
}
@@ -142,6 +147,7 @@
*/
private IContentProvider getContentProvider() {
return new WorkbenchContentProvider() {
+ @Override
public Object[] getChildren(Object parentElement) {
if (parentElement instanceof MapProject) {
return mapProject.getValidMapFiles();
@@ -155,6 +161,7 @@
* @see org.eclipse.ui.model.BaseWorkbenchContentProvider#getParent(java.lang.Object)
* @since 3.7
*/
+ @Override
public Object getParent(Object element) {
if (mapProject == null)
return null;
@@ -171,6 +178,7 @@
}
return super.getParent(element);
}
+ @Override
public boolean hasChildren(Object element) {
if (element instanceof MapFile) {
return ((MapFile)element).getAccessibleProjects().length > 0;
@@ -242,6 +250,7 @@
* @see org.eclipse.jface.wizard.WizardPage#setPreviousPage(org.eclipse.jface.wizard.IWizardPage)
* @since 3.7
*/
+ @Override
public void setPreviousPage(IWizardPage page) {
super.setPreviousPage(page);
updatePageComplete();
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/PropertiesFile.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/PropertiesFile.java
index 0e2d0d4..214803b 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/PropertiesFile.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/PropertiesFile.java
@@ -28,6 +28,7 @@
/* (non-Javadoc)
* @see Test.popup.actions.SourceFile#getCommentStart()
*/
+ @Override
public String getCommentStart() {
return "##"; //$NON-NLS-1$
}
@@ -35,10 +36,12 @@
/* (non-Javadoc)
* @see Test.popup.actions.SourceFile#getCommentEnd()
*/
+ @Override
public String getCommentEnd() {
return "##"; //$NON-NLS-1$
}
+ @Override
public int getFileType() {
return CopyrightComment.PROPERTIES_COMMENT;
}
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RelEngPlugin.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RelEngPlugin.java
index 8150ddd..761d4d6 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RelEngPlugin.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RelEngPlugin.java
@@ -70,6 +70,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
IEclipsePreferences node = InstanceScope.INSTANCE.getNode(ID);
@@ -95,6 +96,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
IEclipsePreferences node = InstanceScope.INSTANCE.getNode(ID);
if(node != null) {
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ReleaseWizard.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ReleaseWizard.java
index 7444b83..5d1f683 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ReleaseWizard.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ReleaseWizard.java
@@ -97,6 +97,7 @@
* @see org.eclipse.jface.wizard.Wizard#createPageControls(org.eclipse.swt.widgets.Composite)
* @since 3.1
*/
+ @Override
public void createPageControls(Composite pageContainer) {
super.createPageControls(pageContainer);
@@ -138,6 +139,7 @@
/**
* @see org.eclipse.jface.wizard.IWizard#addPages()
*/
+ @Override
public void addPages() {
defaultBeingUsed = false;
if (preferenceStore.getBoolean(MapProjectPreferencePage.USE_DEFAULT_MAP_PROJECT) &&
@@ -211,6 +213,7 @@
* @see org.eclipse.jface.wizard.Wizard#dispose()
* @since 3.7
*/
+ @Override
public void dispose() {
if (mapProject != null) {
mapProject.dispose();
@@ -280,6 +283,7 @@
/**
* @see org.eclipse.jface.wizard.Wizard#performFinish()
*/
+ @Override
public boolean performFinish() {
if(!isProjectSelected())return false;
@@ -368,6 +372,7 @@
*
* @see org.eclipse.jface.wizard.IWizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
*/
+ @Override
public IWizardPage getNextPage(IWizardPage page) {
if (page == mapSelectionPage) {
if (selectedProjects == null && preSelectedProjects != null) {
@@ -502,6 +507,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.IWizard#canFinish()
*/
+ @Override
public boolean canFinish() {
// There must be projects selected
if (!isProjectSelected()) {
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ReplaceLocalFromMap.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ReplaceLocalFromMap.java
index 19058ac..8d9322b 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ReplaceLocalFromMap.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ReplaceLocalFromMap.java
@@ -43,6 +43,7 @@
/**
* @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForAddedResources()
*/
+ @Override
protected boolean isEnabledForAddedResources() {
return false;
}
@@ -50,6 +51,7 @@
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources()
*/
+ @Override
protected boolean isEnabledForNonExistantResources() {
return true;
}
@@ -57,6 +59,7 @@
/**
* @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource)
*/
+ @Override
protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException {
if (super.isEnabledForCVSResource(cvsResource)) {
// Don't enable if there are sticky file revisions in the lineup
@@ -81,6 +84,7 @@
*
* @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled()
*/
+ @Override
public boolean isEnabled() {
if (!(super.isEnabled()))
return false;
@@ -116,6 +120,7 @@
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction)
*/
+ @Override
protected void execute(IAction action) throws InvocationTargetException, InterruptedException {
//Start the MapProjectSelectionWizard
IPreferenceStore preferenceStore = RelEngPlugin.getDefault().getPreferenceStore();
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RepositorySelectionDialog.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RepositorySelectionDialog.java
index 0b3e982..4d53abc 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RepositorySelectionDialog.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RepositorySelectionDialog.java
@@ -46,12 +46,14 @@
public RepositorySelectionDialog(Shell shell) {
super(shell);
}
+ @Override
protected void createButtonsForButtonBar(Composite parent) {
// create OK and Cancel buttons by default
okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
okButton.setEnabled(false);
createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
}
+ @Override
protected Control createDialogArea(Composite parent) {
parent.getShell().setText(Messages.getString("RepositorySelectionDialog.0")); //$NON-NLS-1$
Composite composite = new Composite(parent, SWT.NONE);
@@ -67,6 +69,7 @@
viewer = new TableViewer(table);
viewer.setLabelProvider(new WorkbenchLabelProvider());
viewer.setContentProvider(new WorkbenchContentProvider() {
+ @Override
public Object[] getElements(Object inputElement) {
return locations;
}
@@ -100,6 +103,7 @@
label.setLayoutData(data);
return label;
}
+ @Override
protected void cancelPressed() {
location = null;
super.cancelPressed();
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ShellMakeFile.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ShellMakeFile.java
index e8bb4e8..3dca23e 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ShellMakeFile.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ShellMakeFile.java
@@ -29,24 +29,29 @@
//Optional Whitespace, #, optional whitespace, then at least 2 non-word chars repeated till EOL
private static Pattern p = Pattern.compile("\\s*#\\s*\\W{2,}\\s*"); //$NON-NLS-1$
+ @Override
public boolean isCommentStart(String aLine) {
return p.matcher(aLine).matches();
}
+ @Override
public boolean isCommentEnd(String aLine, String commentStartString) {
String s = commentStartString.trim();
s = s.substring(s.length()-2);
return aLine.trim().endsWith(s);
}
+ @Override
public String getCommentStart() {
return "#*"; //unused, Pattern matcher above will be used instead //$NON-NLS-1$
}
+ @Override
public String getCommentEnd() {
return "**"; //unused, Pattern matcher above will be used instead //$NON-NLS-1$
}
+ @Override
public int getFileType() {
return CopyrightComment.SHELL_MAKE_COMMENT;
}
@@ -54,7 +59,8 @@
/* (non-Javadoc)
* @see org.eclipse.releng.tools.SourceFile#doInsert(java.lang.String, org.eclipse.jface.text.IDocument)
*/
- protected void doInsert(final String comment, IDocument document) throws BadLocationException, IOException {
+ @Override
+ protected void doInsert(final String comment, IDocument document) throws BadLocationException, IOException {
// find insert offset (we must skip instructions)
int insertOffset = findInsertOffset(document);
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/TagAndReleaseAction.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/TagAndReleaseAction.java
index 2e9a5c2..4b6bb73 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/TagAndReleaseAction.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/TagAndReleaseAction.java
@@ -25,6 +25,7 @@
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.ui.actions.TagAction#execute(org.eclipse.jface.action.IAction)
*/
+ @Override
public void execute(IAction action) throws InvocationTargetException, InterruptedException {
//Start the release wizard
ReleaseWizard wizard = new ReleaseWizard();
@@ -38,6 +39,7 @@
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled()
*/
+ @Override
public boolean isEnabled() {
return true;
}
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/TagAndReleaseOperation.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/TagAndReleaseOperation.java
index fd7287b..b0a9c7a 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/TagAndReleaseOperation.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/TagAndReleaseOperation.java
@@ -44,6 +44,7 @@
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.ui.operations.TagOperation#tag(org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource[], org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public IStatus tag(
CVSTeamProvider provider,
IResource[] resources,
@@ -63,6 +64,7 @@
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void execute(IProgressMonitor monitor) throws CVSException, InterruptedException {
monitor.beginTask("Tagging with " + getTag().getName(), 100);
super.execute(new SubProgressMonitor(monitor, 95));
@@ -85,6 +87,7 @@
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getSchedulingRule(org.eclipse.team.internal.ccvs.core.CVSTeamProvider)
*/
+ @Override
protected ISchedulingRule getSchedulingRule(CVSTeamProvider provider) {
// We need a rule on both the provider and the releng map project
ISchedulingRule rule = super.getSchedulingRule(provider);
@@ -114,6 +117,7 @@
return mapFileUpdated;
}
+ @Override
protected IStatus[] getErrors() {
return super.getErrors();
}
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/TagMap.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/TagMap.java
index b78fe90..25cb848 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/TagMap.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/TagMap.java
@@ -40,6 +40,7 @@
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getSelectedCVSResources()
*/
+ @Override
protected ICVSRemoteResource[] getSelectedRemoteResources() {
IResource[] resources = getSelectedResources();
List identifiers = new ArrayList();
@@ -129,6 +130,7 @@
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled()
*/
+ @Override
public boolean isEnabled() {
IResource[] resources = getSelectedResources();
if (resources.length == 0) return false;
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/TagPage.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/TagPage.java
index 7ef983b..2df7e66 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/TagPage.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/TagPage.java
@@ -109,6 +109,7 @@
moveButton.setVisible(true);
moveButton.setText(Messages.getString("TagPage.7")); //$NON-NLS-1$
moveButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
moveButtonSelected = moveButton.getSelection();
}
@@ -118,6 +119,7 @@
validateButton = new Button(composite,SWT.CHECK);
validateButton.setText(Messages.getString("TagPage.8")); //$NON-NLS-1$
validateButton.addSelectionListener( new SelectionAdapter(){
+ @Override
public void widgetSelected(SelectionEvent e) {
validateButtonSelected = validateButton.getSelection();
}
@@ -134,6 +136,7 @@
compareButton = new Button(group,SWT.RADIO);
compareButton.setText(Messages.getString("TagPage.10")); //$NON-NLS-1$
compareButton.addSelectionListener( new SelectionAdapter(){
+ @Override
public void widgetSelected(SelectionEvent e) {
compareButtonSelected = compareButton.getSelection();
updateFinishStatus();
@@ -145,6 +148,7 @@
commitButton.setText(Messages.getString("TagPage.11")); //$NON-NLS-1$
commitButton.setSelection(true);
commitButton.addSelectionListener(new SelectionAdapter(){
+ @Override
public void widgetSelected(SelectionEvent e) {
commitButtonSelected = commitButton.getSelection();
}
@@ -298,6 +302,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
*/
+ @Override
public void setVisible(boolean visible) {
super.setVisible(visible);
ReleaseWizard wizard = (ReleaseWizard)getWizard();
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ValidatePage.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ValidatePage.java
index 52ad3c4..8b47bc3 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ValidatePage.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ValidatePage.java
@@ -39,6 +39,7 @@
/*
* @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
*/
+ @Override
public boolean canFlipToNextPage() {
return false;
}
@@ -46,6 +47,7 @@
/*
* @see org.eclipse.jface.wizard.WizardPage#getPreviousPage()
*/
+ @Override
public IWizardPage getPreviousPage() {
return null;
}
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/XmlFile.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/XmlFile.java
index d580c6f..d29520a 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/XmlFile.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/XmlFile.java
@@ -70,7 +70,8 @@
*
* {@inheritDoc}
*/
- public boolean isCommentStart(String aLine) {
+ @Override
+ public boolean isCommentStart(String aLine) {
return aLine.trim().contains(getCommentStart());
//Note, above is a bit different from parent, contains/startswithd:
@@ -87,19 +88,23 @@
*
* {@inheritDoc}
*/
- public boolean isCommentEnd(String aLine, String commentStartString) {
+ @Override
+ public boolean isCommentEnd(String aLine, String commentStartString) {
return aLine.trim().contains(getCommentEnd());
//Similarly, uses 'contains' instead of 'starts with'
}
+ @Override
public String getCommentStart() {
return "<!--"; //$NON-NLS-1$
}
+ @Override
public String getCommentEnd() {
return "-->"; //$NON-NLS-1$
}
+ @Override
public int getFileType() {
return CopyrightComment.XML_COMMENT;
}
@@ -111,7 +116,8 @@
* If only updating the year, this method is not called. </p>
* @see org.eclipse.releng.tools.SourceFile#doInsert(java.lang.String, org.eclipse.jface.text.IDocument)
*/
- protected void doInsert(final String comment, IDocument document) throws BadLocationException, IOException {
+ @Override
+ protected void doInsert(final String comment, IDocument document) throws BadLocationException, IOException {
//----------------- XML COMMENT CLEAN UP
// XML comments need extra-tidy up because we need to consider the existance of an XML header
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/git/GitCopyrightAdapter.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/git/GitCopyrightAdapter.java
index b7f35a5..aca991e 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/git/GitCopyrightAdapter.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/git/GitCopyrightAdapter.java
@@ -43,6 +43,7 @@
super(resources);
}
+ @Override
public int getLastModifiedYear(IFile file, IProgressMonitor monitor)
throws CoreException {
try {
@@ -106,6 +107,7 @@
return -1;
}
+ @Override
public void initialize(IProgressMonitor monitor) throws CoreException {
// TODO We should perform a bulk "log" command to get the last modified
// year
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/ConfigurationBlock.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/ConfigurationBlock.java
index 4c73bdc..a924766 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/ConfigurationBlock.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/ConfigurationBlock.java
@@ -49,9 +49,11 @@
});
MouseTrackAdapter labelComboListener= new MouseTrackAdapter() {
+ @Override
public void mouseEnter(MouseEvent e) {
highlight(parent, labelControl, comboBox, comboBox.isFocusControl() ? HIGHLIGHT_FOCUS : HIGHLIGHT_MOUSE);
}
+ @Override
public void mouseExit(MouseEvent e) {
if (! comboBox.isFocusControl())
highlight(parent, labelControl, comboBox, HIGHLIGHT_NONE);
@@ -61,6 +63,7 @@
labelControl.addMouseTrackListener(labelComboListener);
class MouseMoveTrackListener extends MouseTrackAdapter implements MouseMoveListener, MouseListener {
+ @Override
public void mouseExit(MouseEvent e) {
if (! comboBox.isFocusControl())
highlight(parent, labelControl, comboBox, HIGHLIGHT_NONE);
@@ -94,6 +97,7 @@
parent.addMouseListener(parentListener);
MouseAdapter labelClickListener= new MouseAdapter() {
+ @Override
public void mouseDown(MouseEvent e) {
comboBox.setFocus();
}
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/CopyrightPreferencePage.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/CopyrightPreferencePage.java
index 9556277..6b3a515 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/CopyrightPreferencePage.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/CopyrightPreferencePage.java
@@ -57,16 +57,12 @@
private Button fIgnoreProperties;
private Button fIgnoreXml;
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
- */
public void init(IWorkbench workbench) {
// TODO Auto-generated method stub
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
- */
+
+ @Override
protected Control createContents(Composite parent) {
//The main composite
@@ -142,6 +138,7 @@
/* (non-Javadoc)
* @see org.eclipse.swt.events.KeyAdapter#keyReleased(org.eclipse.swt.events.KeyEvent)
*/
+ @Override
public void keyReleased(KeyEvent e) {
validateValues();
}
@@ -307,16 +304,12 @@
// }
// }
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#doGetPreferenceStore()
- */
+ @Override
protected IPreferenceStore doGetPreferenceStore() {
return RelEngPlugin.getDefault().getPreferenceStore();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
- */
+ @Override
protected void performDefaults() {
IPreferenceStore store = getPreferenceStore();
@@ -335,9 +328,7 @@
super.performDefaults();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferencePage#performOk()
- */
+ @Override
public boolean performOk() {
IPreferenceStore store = getPreferenceStore();
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/MapProjectPreferencePage.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/MapProjectPreferencePage.java
index d0d9cd0..cdc401c 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/MapProjectPreferencePage.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/MapProjectPreferencePage.java
@@ -13,12 +13,16 @@
import java.util.HashSet;
import java.util.Set;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.releng.tools.MapFile;
import org.eclipse.releng.tools.MapProject;
import org.eclipse.releng.tools.Messages;
import org.eclipse.releng.tools.RelEngPlugin;
-import org.eclipse.team.internal.ui.SWTUtils;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -29,16 +33,7 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.List;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-
+import org.eclipse.team.internal.ui.SWTUtils;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
@@ -57,9 +52,7 @@
private IProject[] workspaceMapProjects;
private IPreferenceStore preferenceStore;
- /*
- * @see PreferencePage#createContents(Composite)
- */
+ @Override
protected Control createContents(Composite parent) {
preferenceStore = RelEngPlugin.getDefault().getPreferenceStore();
@@ -79,6 +72,7 @@
alwaysPromptButton.setLayoutData(data);
SelectionAdapter selectionListener = new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
update();
}
@@ -144,6 +138,7 @@
}
projectList.setItems(projectNames);
projectList.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
projectSelected();
}
@@ -181,9 +176,7 @@
// do nothing
}
- /*
- * @see IPreferencePage#performOk()
- */
+ @Override
public boolean performOk() {
preferenceStore.setValue(USE_DEFAULT_MAP_PROJECT, !(alwaysPromptButton.getSelection()));
if (projectList.getSelectionIndex() != -1) {
@@ -193,18 +186,14 @@
return super.performOk();
}
- /*
- * @see PreferencePage#performDefaults()
- */
+ @Override
protected void performDefaults() {
alwaysPromptButton.setSelection(true);
update();
super.performDefaults();
}
- /*
- * @see PreferencePage#doGetPreferenceStore()
- */
+ @Override
protected IPreferenceStore doGetPreferenceStore() {
return preferenceStore;
}
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/PomErrorLevelBlock.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/PomErrorLevelBlock.java
index f3980f5..0dd2769 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/PomErrorLevelBlock.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/PomErrorLevelBlock.java
@@ -20,12 +20,9 @@
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.core.runtime.preferences.InstanceScope;
-
import org.eclipse.jface.dialogs.Dialog;
-
import org.eclipse.releng.internal.tools.pomversion.IPomVersionConstants;
import org.eclipse.releng.tools.RelEngPlugin;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -36,11 +33,9 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
-
import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
import org.eclipse.ui.preferences.IWorkingCopyManager;
import org.eclipse.ui.preferences.WorkingCopyManager;
-
import org.osgi.service.prefs.BackingStoreException;
/**
@@ -169,9 +164,7 @@
}
}
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
+ @Override
public String toString() {
return qualifier + '/' + key;
}
@@ -208,6 +201,7 @@
* Default selection listener for controls on the page
*/
private SelectionListener selectionlistener = new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
if(e.widget instanceof Combo) {
Combo combo = (Combo) e.widget;
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/PomVersionPreferencePage.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/PomVersionPreferencePage.java
index 7231d8e..343c118 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/PomVersionPreferencePage.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/PomVersionPreferencePage.java
@@ -36,9 +36,7 @@
*/
private PomErrorLevelBlock block = null;
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
- */
+ @Override
protected Control createContents(Composite parent) {
Composite comp = new Composite(parent, SWT.NONE);
GridLayout gl = new GridLayout();
@@ -66,9 +64,7 @@
public void init(IWorkbench workbench) {
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#performCancel()
- */
+ @Override
public boolean performCancel() {
if (this.block != null) {
this.block.performCancel();
@@ -76,24 +72,18 @@
return super.performCancel();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#performOk()
- */
+ @Override
public boolean performOk() {
this.block.performOK();
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#performApply()
- */
+ @Override
protected void performApply() {
this.block.performApply();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
- */
+ @Override
protected void performDefaults() {
this.block.performDefaults();
}
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/RelEngPreferenceInitializer.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/RelEngPreferenceInitializer.java
index 73af506..1aeb460 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/RelEngPreferenceInitializer.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/RelEngPreferenceInitializer.java
@@ -24,9 +24,7 @@
public class RelEngPreferenceInitializer extends AbstractPreferenceInitializer {
private final String LEGAL_LINE = Messages.getString("RelEngPreferenceInitializer.0"); //$NON-NLS-1$
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
- */
+ @Override
public void initializeDefaultPreferences() {
IPreferenceStore store = RelEngPlugin.getDefault().getPreferenceStore();
int year = Calendar.getInstance().get(Calendar.YEAR);
