Bug 509261 - Move o.e.releng.tools to Java 1.8
Stricter warnings by default and lambdas.
Change-Id: I9b471e5e7bea89856d6ef078d3994008e2febddf
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.releng.tools/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.releng.tools/.settings/org.eclipse.jdt.core.prefs
index 0d5c4f6..8838a94 100644
--- a/bundles/org.eclipse.releng.tools/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.releng.tools/.settings/org.eclipse.jdt.core.prefs
@@ -27,7 +27,7 @@
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -38,14 +38,14 @@
org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
@@ -67,8 +67,8 @@
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
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 3edf815..3fdffb1 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
@@ -27,18 +27,14 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
@@ -127,31 +123,29 @@
data = new GridData(GridData.FILL_HORIZONTAL);
filePath = new Text(composite, SWT.BORDER);
filePath.setLayoutData(data);
- filePath.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- Path path = new Path(filePath.getText());
- validPath = false;
- if (!path.isEmpty()) {
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
- if (path.isValidPath(filePath.getText())
- && file.getParent().exists()) {
- if (path.getFileExtension().equals(EXT_HTML)) {
- setErrorMessage(null);
- validPath = true;
- iFile = file;
- } else {
- setErrorMessage(Messages
- .getString("BuildNotesPage.5")); //$NON-NLS-1$
- }
+ filePath.addModifyListener(e -> {
+ Path path = new Path(filePath.getText());
+ validPath = false;
+ if (!path.isEmpty()) {
+ IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+ if (path.isValidPath(filePath.getText())
+ && file.getParent().exists()) {
+ if (path.getFileExtension().equals(EXT_HTML)) {
+ setErrorMessage(null);
+ validPath = true;
+ iFile = file;
} else {
- setErrorMessage(Messages.getString("BuildNotesPage.6")); //$NON-NLS-1$
+ setErrorMessage(Messages
+ .getString("BuildNotesPage.5")); //$NON-NLS-1$
}
} else {
- // path is empty
- setErrorMessage(Messages.getString("BuildNotesPage.7")); //$NON-NLS-1$
+ setErrorMessage(Messages.getString("BuildNotesPage.6")); //$NON-NLS-1$
}
- updateButtons();
+ } else {
+ // path is empty
+ setErrorMessage(Messages.getString("BuildNotesPage.7")); //$NON-NLS-1$
}
+ updateButtons();
});
browse = new Button(composite, SWT.PUSH);
@@ -236,52 +230,37 @@
} else {
if (file.getParent().exists()) {
try {
- getContainer().run(true, true,
- new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor)
- throws InvocationTargetException,
- InterruptedException {
- monitor
- .beginTask(
- Messages
- .getString("BuildNotesPage.11"), //$NON-NLS-1$
- 100);
- StringBuffer buffer = new StringBuffer();
- buffer
- .append("<!doctype html public \"-//w3c//dtd html 4.0 transitional//en\">\n");
- buffer.append("<html>\n\n");
- buffer.append("<head>\n");
- buffer
- .append(" <meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\">\n");
- buffer
- .append(" <meta name=\"Build\" content=\"Build\">\n");
- buffer
- .append(" <title>Eclipse Platform Release Notes (3.3) - JFace and Workbench</title>\n");
- buffer.append("</head>\n\n");
- buffer.append("<body>\n\n");
- buffer
- .append("<h1>Eclipse Platform Build Notes (3.3)<br>\n");
- buffer
- .append("JFace and Workbench</h1>");
+ getContainer().run(true, true, monitor -> {
+ monitor.beginTask(Messages.getString("BuildNotesPage.11"), //$NON-NLS-1$
+ 100);
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("<!doctype html public \"-//w3c//dtd html 4.0 transitional//en\">\n");
+ buffer.append("<html>\n\n");
+ buffer.append("<head>\n");
+ buffer.append(
+ " <meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\">\n");
+ buffer.append(" <meta name=\"Build\" content=\"Build\">\n");
+ buffer.append(
+ " <title>Eclipse Platform Release Notes (3.3) - JFace and Workbench</title>\n");
+ buffer.append("</head>\n\n");
+ buffer.append("<body>\n\n");
+ buffer.append("<h1>Eclipse Platform Build Notes (3.3)<br>\n");
+ buffer.append("JFace and Workbench</h1>");
- ByteArrayInputStream c = new ByteArrayInputStream(
- buffer.toString().getBytes());
- try {
- file.create(c, true, monitor);
- } catch (CoreException e) {
- CVSUIPlugin.openError(getShell(),
- null, null, e);
- }
+ ByteArrayInputStream c = new ByteArrayInputStream(buffer.toString().getBytes());
+ try {
+ file.create(c, true, monitor);
+ } catch (CoreException e1) {
+ CVSUIPlugin.openError(getShell(), null, null, e1);
+ }
- try {
- c.close();
- } catch (IOException e) {
- CVSUIPlugin.openError(getShell(),
- null, null, e);
- }
- monitor.done();
- }
- });
+ try {
+ c.close();
+ } catch (IOException e2) {
+ CVSUIPlugin.openError(getShell(), null, null, e2);
+ }
+ monitor.done();
+ });
} catch (InvocationTargetException e) {
CVSUIPlugin.openError(getShell(), null, null, e);
} catch (InterruptedException e) {
@@ -340,26 +319,18 @@
buffer.insert(index, "\n" + insertBuffer.toString());
try {
- getContainer().run(true, true, new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor)
- throws InvocationTargetException,
- InterruptedException {
- monitor.beginTask(Messages
- .getString("BuildNotesPage.38"), 100); //$NON-NLS-1$
- ByteArrayInputStream c = new ByteArrayInputStream(
- buffer.toString().getBytes());
- try {
- file.setContents(c, true, true, monitor);
- c.close();
- } catch (CoreException e) {
- CVSUIPlugin
- .openError(getShell(), null, null, e);
- } catch (IOException e) {
- CVSUIPlugin
- .openError(getShell(), null, null, e);
- }
- monitor.done();
+ getContainer().run(true, true, monitor -> {
+ monitor.beginTask(Messages.getString("BuildNotesPage.38"), 100); //$NON-NLS-1$
+ ByteArrayInputStream c = new ByteArrayInputStream(buffer.toString().getBytes());
+ try {
+ file.setContents(c, true, true, monitor);
+ c.close();
+ } catch (CoreException e1) {
+ CVSUIPlugin.openError(getShell(), null, null, e1);
+ } catch (IOException e2) {
+ CVSUIPlugin.openError(getShell(), null, null, e2);
}
+ monitor.done();
});
} catch (InvocationTargetException e) {
CVSUIPlugin.openError(getShell(), null, null, e);
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 ae49d40..4fd592b 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,6 +12,14 @@
import java.lang.reflect.InvocationTargetException;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceProxyVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.releng.tools.preferences.MapProjectPreferencePage;
import org.eclipse.team.internal.ccvs.core.CVSCompareSubscriber;
import org.eclipse.team.internal.ccvs.core.CVSException;
@@ -21,18 +29,6 @@
import org.eclipse.team.ui.TeamUI;
import org.eclipse.team.ui.synchronize.ISynchronizeParticipant;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.OperationCanceledException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.IPreferenceStore;
-
/**
* This class compares the locally selected projects againsts the versions
@@ -62,23 +58,21 @@
try {
final MapFile[] mapFiles= MapFile.findAllMapFiles(ResourcesPlugin.getWorkspace().getRoot());
- IResourceProxyVisitor visitor= new IResourceProxyVisitor() {
- public boolean visit(IResourceProxy resourceProxy) throws CoreException {
- if (resourceProxy.getType() == IResource.ROOT)
- return true;
+ IResourceProxyVisitor visitor= resourceProxy -> {
+ if (resourceProxy.getType() == IResource.ROOT)
+ return true;
- if (resourceProxy.getType() != IResource.PROJECT || !resourceProxy.isAccessible())
- return false;
-
- IProject project= (IProject)resourceProxy.requestResource();
- if (!RelEngPlugin.isShared(project))
- return false;
-
- if (contains(mapFiles, project))
- throw new OperationCanceledException(FOUND);
-
+ if (resourceProxy.getType() != IResource.PROJECT || !resourceProxy.isAccessible())
return false;
- }
+
+ IProject project= (IProject)resourceProxy.requestResource();
+ if (!RelEngPlugin.isShared(project))
+ return false;
+
+ if (contains(mapFiles, project))
+ throw new OperationCanceledException(FOUND);
+
+ return false;
};
ResourcesPlugin.getWorkspace().getRoot().accept(visitor, IResource.NONE);
return false;
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/GetBugsOperation.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/GetBugsOperation.java
index a2c25c2..908f67b 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/GetBugsOperation.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/GetBugsOperation.java
@@ -31,7 +31,6 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.core.synchronize.SyncInfoSet;
import org.eclipse.team.internal.ccvs.core.CVSException;
@@ -75,29 +74,21 @@
protected void run(final BuildNotesPage page) {
try {
- wizard.getContainer().run(true, true, new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor) {
- final int totalWork = 101;
- monitor
- .beginTask(
- Messages.getString("GetBugsOperation.0"), totalWork); //$NON-NLS-1$
+ wizard.getContainer().run(true, true, monitor -> {
+ final int totalWork = 101;
+ monitor.beginTask(Messages.getString("GetBugsOperation.0"), totalWork); //$NON-NLS-1$
- // task 1 -- get bug number from comments
- syncInfos = syncInfoSet.getSyncInfos();
- Set<Integer> bugTree = getBugNumbersFromComments(syncInfos,
- new SubProgressMonitor(monitor, 85, SubProgressMonitor.SUPPRESS_SUBTASK_LABEL));
+ // task 1 -- get bug number from comments
+ syncInfos = syncInfoSet.getSyncInfos();
+ Set<Integer> bugTree = getBugNumbersFromComments(syncInfos,
+ new SubProgressMonitor(monitor, 85, SubProgressMonitor.SUPPRESS_SUBTASK_LABEL));
- // task 2 -- create map of bugs and summaries
- Integer[] bugs = bugTree.toArray(new Integer[0]);
- final Map<Integer, String> map = getBugzillaSummaries(bugs,
- new SubProgressMonitor(monitor, 15, SubProgressMonitor.SUPPRESS_SUBTASK_LABEL));
- page.getShell().getDisplay().asyncExec(new Runnable() {
- public void run() {
- page.setMap(map);
- }
- });
- monitor.done();
- }
+ // task 2 -- create map of bugs and summaries
+ Integer[] bugs = bugTree.toArray(new Integer[0]);
+ final Map<Integer, String> map = getBugzillaSummaries(bugs,
+ new SubProgressMonitor(monitor, 15, SubProgressMonitor.SUPPRESS_SUBTASK_LABEL));
+ page.getShell().getDisplay().asyncExec(() -> page.setMap(map));
+ monitor.done();
});
} catch (InterruptedException e) {
CVSUIPlugin.openError(wizard.getShell(), null, null, e);
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 ec22a00..9ab8d33 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
@@ -22,7 +22,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
import org.eclipse.core.resources.IResourceProxyVisitor;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -136,20 +135,18 @@
*/
public static MapFile[] findAllMapFiles(IResource resource) throws CoreException {
final ArrayList<MapFile> mapFiles = new ArrayList<MapFile>();
- IResourceProxyVisitor visitor= new IResourceProxyVisitor() {
- public boolean visit(IResourceProxy resourceProxy) throws CoreException {
- if (!resourceProxy.isAccessible())
- return false;
+ IResourceProxyVisitor visitor= resourceProxy -> {
+ if (!resourceProxy.isAccessible())
+ return false;
- int type= resourceProxy.getType();
- if (type == IResource.PROJECT)
- return RelEngPlugin.isShared((IProject)resourceProxy.requestResource());
+ int type= resourceProxy.getType();
+ if (type == IResource.PROJECT)
+ return RelEngPlugin.isShared((IProject)resourceProxy.requestResource());
- if (type == IResource.FILE && resourceProxy.getName().endsWith(MAP_FILE_NAME_ENDING))
- mapFiles.add(new MapFile((IFile)resourceProxy.requestResource()));
+ if (type == IResource.FILE && resourceProxy.getName().endsWith(MAP_FILE_NAME_ENDING))
+ mapFiles.add(new MapFile((IFile)resourceProxy.requestResource()));
- return true;
- }
+ return true;
};
resource.accept(visitor,IResource.NONE);
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 11edd54..6ffd529 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
@@ -21,11 +21,9 @@
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.wizard.WizardPage;
@@ -98,11 +96,7 @@
}
});
result.setLabelProvider(new WorkbenchLabelProvider());
- result.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- updateOthers();
- }
- });
+ result.addSelectionChangedListener(event -> updateOthers());
result.setComparator((new ResourceComparator(ResourceComparator.NAME)));
return result;
}
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 5f62321..2ffd6e5 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -93,10 +93,6 @@
return (dialog.open() == Window.OK);
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
@Override
public void addPages() {
mapProjectSelectionPage = new MapProjectSelectionPage("MapProjectSelectionPage", //$NON-NLS-1$
@@ -106,10 +102,6 @@
addPage(mapProjectSelectionPage);
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performFinish()
- */
@Override
public boolean performFinish() {
mapProjectSelectionPage.saveSettings();
@@ -119,10 +111,6 @@
return true;
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performCancel()
- */
@Override
public boolean performCancel() {
operationCancelled = true;
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 4c7ec0d..bdb18cd 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
@@ -18,7 +18,6 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
@@ -71,9 +70,7 @@
super(pageName, title, image);
this.settings = settings;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
+
public void createControl(Composite parent) {
Font font = parent.getFont();
GridData data = new GridData(GridData.FILL_BOTH);
@@ -130,10 +127,6 @@
}
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
- */
@Override
public void setVisible(boolean visible) {
super.setVisible(visible);
@@ -148,17 +141,14 @@
final CVSTag[] tags = mapProject.getTagsFor(projects);
//Collect all the out-of-sync projects from selected projects and update the selected project again
- getContainer().run(true, true, new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor)
- throws InvocationTargetException, InterruptedException {
- IResource[] r = null;
- if(projects != null && projects.length != 0){
- try {
- r = getOutOfSyncProjects(projects, tags, monitor);
- wizard.setSelectedProjects(r);
- } catch (TeamException e) {
- throw new InvocationTargetException(e);
- }
+ getContainer().run(true, true, monitor -> {
+ IResource[] r = null;
+ if (projects != null && projects.length != 0) {
+ try {
+ r = getOutOfSyncProjects(projects, tags, monitor);
+ wizard.setSelectedProjects(r);
+ } catch (TeamException e) {
+ throw new InvocationTargetException(e);
}
}
});
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 a4d7315..a8a1e63 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
@@ -18,9 +18,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.Viewer;
@@ -86,11 +84,6 @@
this.settings = settings;
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
public void createControl(Composite parent) {
Font font = parent.getFont();
@@ -120,11 +113,7 @@
}});
viewer.setInput(mapProject);
viewer.expandAll();
- viewer.addCheckStateListener(new ICheckStateListener(){
- public void checkStateChanged(CheckStateChangedEvent event) {
- updatePageComplete();
- }
- });
+ viewer.addCheckStateListener(event -> updatePageComplete());
compareButton = new Button(topContainer,SWT.CHECK);
compareButton.setText(Messages.getString("ProjectSelectionPage.3")); //$NON-NLS-1$
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 761d4d6..68a1284 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -67,9 +67,6 @@
}
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
@Override
public void start(BundleContext context) throws Exception {
super.start(context);
@@ -93,9 +90,6 @@
}
}
- /* (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);
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 d569c08..1612f96 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
@@ -14,8 +14,32 @@
import java.util.HashSet;
import java.util.Set;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.SubMonitor;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.osgi.util.NLS;
import org.eclipse.releng.tools.preferences.MapProjectPreferencePage;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.events.ControlListener;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.internal.ccvs.core.CVSTag;
import org.eclipse.team.internal.ccvs.core.client.Command;
@@ -28,35 +52,6 @@
import org.eclipse.team.internal.ui.dialogs.IPromptCondition;
import org.eclipse.team.internal.ui.dialogs.PromptingDialog;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubMonitor;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardDialog;
-
public class ReleaseWizard extends Wizard {
@@ -241,21 +236,14 @@
if (buildNotesPage.isUpdateNotesButtonChecked() && projectComparePage.isBuildNotesButtonChecked()) {
buildNotesPage.updateNotesFile();
try {
- getContainer().run(true, true, new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor)
- throws InvocationTargetException,
- InterruptedException {
- IFile iFile = buildNotesPage.getIFile();
- IProject iProject = iFile.getProject();
- monitor.beginTask(Messages.getString("ReleaseWizard.20"), 100); //$NON-NLS-1$
- new CommitOperation(
- null,
- RepositoryProviderOperation
- .asResourceMappers(new IResource[] { iProject }),
- new Command.LocalOption[0], commentPage
- .getComment()).run(monitor);
- monitor.done();
- }
+ getContainer().run(true, true, monitor -> {
+ IFile iFile = buildNotesPage.getIFile();
+ IProject iProject = iFile.getProject();
+ monitor.beginTask(Messages.getString("ReleaseWizard.20"), 100); //$NON-NLS-1$
+ new CommitOperation(null,
+ RepositoryProviderOperation.asResourceMappers(new IResource[] { iProject }),
+ new Command.LocalOption[0], commentPage.getComment()).run(monitor);
+ monitor.done();
});
} catch (InterruptedException e) {
// Cancelled.
@@ -293,53 +281,51 @@
if (projectSelectionPage.isCompareButtonChecked() && !buildNotesOperation()) {
return true; // Build notes file update cancelled. Close dialog.
}
-
+
try {
- getContainer().run(true, true, new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor)
- throws InvocationTargetException, InterruptedException {
- CVSTag tag = new CVSTag(tagPage.getTagString(), CVSTag.VERSION);
- TagAndReleaseOperation operation = new TagAndReleaseOperation(null, mapProject,
- selectedProjects, tag,commentPage.getComment() );
- if (tagPage.isMoveButtonSelected()) {
- operation.moveTag();
- }
- monitor.beginTask(Messages.getString("ReleaseWizard.21"), 100); //$NON-NLS-1$
- operation.run(SubMonitor.convert(monitor, 90));
- if (operation.isMapFileUpdated()) {
- try {
- if(tagPage.isValidateButtonSelected()){
- try {
- getShell().getDisplay().asyncExec(new Runnable() {
- public void run() {
- if (parentDialog instanceof WizardDialog)
- ((WizardDialog)parentDialog).showPage(validatePage);
- }
- });
- validateRelease(SubMonitor.convert(monitor, 10));
- } catch (TeamException e) {
- throw new InvocationTargetException(e);
- }
+ getContainer().run(true, true, monitor -> {
+ CVSTag tag = new CVSTag(tagPage.getTagString(), CVSTag.VERSION);
+ TagAndReleaseOperation operation = new TagAndReleaseOperation(null, mapProject, selectedProjects, tag,
+ commentPage.getComment());
+ if (tagPage.isMoveButtonSelected()) {
+ operation.moveTag();
+ }
+ monitor.beginTask(Messages.getString("ReleaseWizard.21"), 100); //$NON-NLS-1$
+ operation.run(SubMonitor.convert(monitor, 90));
+ if (operation.isMapFileUpdated()) {
+ try {
+ if (tagPage.isValidateButtonSelected()) {
+ try {
+ getShell().getDisplay().asyncExec(() -> {
+ if (parentDialog instanceof WizardDialog)
+ ((WizardDialog) parentDialog).showPage(validatePage);
+ });
+ validateRelease(SubMonitor.convert(monitor, 10));
+ } catch (TeamException e) {
+ throw new InvocationTargetException(e);
}
- } finally {
- monitor.done();
}
- } else {
- // The map file update didn't occur and no exception was thrown.
- // Let the user know of the failure
- IStatus[] errors = operation.getErrors();
- IStatus status;
- if (errors.length == 0) {
- status = new Status(IStatus.ERROR, RelEngPlugin.ID, 0, Messages.getString("ReleaseWizard.22"), null); //$NON-NLS-1$
- } else if (errors.length == 1) {
- status = errors[0];
- } else {
- status = new MultiStatus(RelEngPlugin.ID, 0, errors, Messages.getString("ReleaseWizard.23"), null); //$NON-NLS-1$
- }
- ErrorDialog.openError(getShell(), Messages.getString("ReleaseWizard.24"), //$NON-NLS-1$
- Messages.getString("ReleaseWizard.25"), //$NON-NLS-1$
- status, IStatus.ERROR | IStatus.WARNING);
+ } finally {
+ monitor.done();
}
+ } else {
+ // The map file update didn't occur and no exception was
+ // thrown.
+ // Let the user know of the failure
+ IStatus[] errors = operation.getErrors();
+ IStatus status;
+ if (errors.length == 0) {
+ status = new Status(IStatus.ERROR, RelEngPlugin.ID, 0, Messages.getString("ReleaseWizard.22"), //$NON-NLS-1$
+ null);
+ } else if (errors.length == 1) {
+ status = errors[0];
+ } else {
+ status = new MultiStatus(RelEngPlugin.ID, 0, errors, Messages.getString("ReleaseWizard.23"), //$NON-NLS-1$
+ null);
+ }
+ ErrorDialog.openError(getShell(), Messages.getString("ReleaseWizard.24"), //$NON-NLS-1$
+ Messages.getString("ReleaseWizard.25"), //$NON-NLS-1$
+ status, IStatus.ERROR | IStatus.WARNING);
}
});
if (!defaultBeingUsed) {
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 28eeccf..a67b514 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
@@ -123,16 +123,14 @@
}
final IResource[][] resources = new IResource[][] {null};
- run(new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException {
- try {
- monitor.beginTask(null, 100);
- resources[0] = checkOverwriteOfDirtyResources(getSelectedResources(), new InfiniteSubProgressMonitor(monitor, 100));
- } catch (TeamException e) {
- throw new InvocationTargetException(e);
- } finally {
- monitor.done();
- }
+ run((IRunnableWithProgress) monitor -> {
+ try {
+ monitor.beginTask(null, 100);
+ resources[0] = checkOverwriteOfDirtyResources(getSelectedResources(), new InfiniteSubProgressMonitor(monitor, 100));
+ } catch (TeamException e) {
+ throw new InvocationTargetException(e);
+ } finally {
+ monitor.done();
}
}, false /* cancelable */, PROGRESS_BUSYCURSOR);
@@ -147,13 +145,11 @@
if (operationCancelled || tags == null)
return;
- run(new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- try {
- performReplace(resources[0], monitor);
- } catch (TeamException e) {
- throw new InvocationTargetException(e);
- }
+ run((IRunnableWithProgress) monitor -> {
+ try {
+ performReplace(resources[0], monitor);
+ } catch (TeamException e) {
+ throw new InvocationTargetException(e);
}
}, true, PROGRESS_DIALOG);
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 4d53abc..4a21b6c 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,11 +12,7 @@
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -74,23 +70,17 @@
return locations;
}
});
- viewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection selection = (IStructuredSelection)event.getSelection();
- if (selection.isEmpty()) {
- location = null;
- okButton.setEnabled(false);
- } else {
- location = (ICVSRepositoryLocation)selection.getFirstElement();
- okButton.setEnabled(true);
- }
+ viewer.addSelectionChangedListener(event -> {
+ IStructuredSelection selection = (IStructuredSelection)event.getSelection();
+ if (selection.isEmpty()) {
+ location = null;
+ okButton.setEnabled(false);
+ } else {
+ location = (ICVSRepositoryLocation)selection.getFirstElement();
+ okButton.setEnabled(true);
}
});
- viewer.addDoubleClickListener(new IDoubleClickListener() {
- public void doubleClick(DoubleClickEvent event) {
- okPressed();
- }
- });
+ viewer.addDoubleClickListener(event -> okPressed());
viewer.setInput(locations);
return composite;
}
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 03f4bc8..e5e447c 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
@@ -28,7 +28,6 @@
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
@@ -87,11 +86,9 @@
label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
label.setFont(font);
- Listener listener = new Listener() {
- public void handleEvent(Event event) {
- tagString = null;
- modifyTag();
- }
+ Listener listener = event -> {
+ tagString = null;
+ modifyTag();
};
tagCombo = new Combo(composite,SWT.NONE);
