diff options
author | Alexander Kurtakov | 2018-03-29 10:26:48 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2018-03-29 10:26:48 +0000 |
commit | 5251d1be37d5970412dcbe291f47948ada582556 (patch) | |
tree | b5ff3a44bb0f342b6b78aa5276aad09dbecb0463 /org.eclipse.ui.externaltools | |
parent | 6ac5654db62a138703356d3d9f6074228ac01ae6 (diff) | |
download | eclipse.platform.debug-5251d1be37d5970412dcbe291f47948ada582556.tar.gz eclipse.platform.debug-5251d1be37d5970412dcbe291f47948ada582556.tar.xz eclipse.platform.debug-5251d1be37d5970412dcbe291f47948ada582556.zip |
Bug 533055 - Remove redundant type argumentsI20180403-2000I20180402-2000I20180401-2000I20180331-1500I20180330-2235I20180330-2000I20180329-2000
Change-Id: I6f62094af1b4ad2c679e78cc635641918f958fb4
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'org.eclipse.ui.externaltools')
6 files changed, 33 insertions, 73 deletions
diff --git a/org.eclipse.ui.externaltools/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ui.externaltools/.settings/org.eclipse.jdt.core.prefs index 98f0b7eb7..129d9d8a1 100644 --- a/org.eclipse.ui.externaltools/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.ui.externaltools/.settings/org.eclipse.jdt.core.prefs @@ -11,8 +11,11 @@ org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate @@ -24,6 +27,7 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 +org.eclipse.jdt.core.compiler.problem.APILeak=warning org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -74,19 +78,21 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=error org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning 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.redundantSpecificationOfTypeArguments=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore @@ -96,12 +102,16 @@ org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore @@ -110,6 +120,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=error org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuildTab.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuildTab.java index 6b5596b70..1adcaf8c6 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuildTab.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuildTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2018 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 @@ -73,28 +73,19 @@ public class ExternalToolsBuildTab extends AbstractLaunchConfigurationTab { private Button fReferencedProjects; // projects to build (empty if none) - private List<IProject> fProjects = new ArrayList<IProject>(); + private List<IProject> fProjects = new ArrayList<>(); class ProjectsContentProvider implements IStructuredContentProvider { - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) - */ @Override public Object[] getElements(Object inputElement) { return ((IWorkspace)inputElement).getRoot().getProjects(); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IContentProvider#dispose() - */ @Override public void dispose() { } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) - */ @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } @@ -108,9 +99,6 @@ public class ExternalToolsBuildTab extends AbstractLaunchConfigurationTab { setHelpContextId(IExternalToolsHelpContextIds.EXTERNAL_TOOLS_LAUNCH_CONFIGURATION_DIALOG_BUILD_TAB); } - /** - * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) - */ @Override public void createControl(Composite parent) { Composite mainComposite = new Composite(parent, SWT.NONE); @@ -193,23 +181,17 @@ public class ExternalToolsBuildTab extends AbstractLaunchConfigurationTab { return; } Object[] res = dialog.getResult(); - fProjects = new ArrayList<IProject>(res.length); + fProjects = new ArrayList<>(res.length); for (int i = 0; i < res.length; i++) { fProjects.add((IProject) res[i]); } updateLaunchConfigurationDialog(); } - /** - * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) - */ @Override public void setDefaults(ILaunchConfigurationWorkingCopy configuration) { } - /** - * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration) - */ @Override public void initializeFrom(ILaunchConfiguration configuration) { updateScope(configuration); @@ -254,16 +236,13 @@ public class ExternalToolsBuildTab extends AbstractLaunchConfigurationTab { } else if (scope.startsWith("${projects:")) { //$NON-NLS-1$ fSpecificProjectsButton.setSelection(true); IProject[] projects = getBuildProjects(configuration, IExternalToolConstants.ATTR_BUILD_SCOPE); - fProjects = new ArrayList<IProject>(projects.length); + fProjects = new ArrayList<>(projects.length); for (int i = 0; i < projects.length; i++) { fProjects.add(projects[i]); } } } } - /** - * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) - */ @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { String scope = generateScopeMemento(); @@ -296,9 +275,6 @@ public class ExternalToolsBuildTab extends AbstractLaunchConfigurationTab { return "${none}"; //$NON-NLS-1$ } - /** - * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() - */ @Override public String getName() { return ExternalToolsLaunchConfigurationMessages.ExternalToolsBuildTab_8; @@ -326,9 +302,6 @@ public class ExternalToolsBuildTab extends AbstractLaunchConfigurationTab { fReferencedProjects.setEnabled(fBuildButton.getSelection() && (fProjectButton.getSelection() || fSpecificProjectsButton.getSelection())); } - /** - * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage() - */ @Override public Image getImage() { return ExternalToolsImages.getImage(org.eclipse.ui.externaltools.internal.model.IExternalToolConstants.IMG_TAB_BUILD); @@ -391,17 +364,11 @@ public class ExternalToolsBuildTab extends AbstractLaunchConfigurationTab { return buf.toString(); } - /* (non-Javadoc) - * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) - */ @Override public void activated(ILaunchConfigurationWorkingCopy workingCopy) { // do nothing on activation } - /* (non-Javadoc) - * @see org.eclipse.debug.ui.ILaunchConfigurationTab#deactivated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) - */ @Override public void deactivated(ILaunchConfigurationWorkingCopy workingCopy) { // do nothing on deactivation diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java index a0bd3a0f9..551c092ba 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2015 IBM Corporation and others. + * Copyright (c) 2000, 2018 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 @@ -129,7 +129,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta * Collection of configurations created while the page is open. * Stored here so they can be deleted if the page is cancelled. */ - private List<ILaunchConfiguration> newConfigList = new ArrayList<ILaunchConfiguration>(); + private List<ILaunchConfiguration> newConfigList = new ArrayList<>(); private SelectionListener buttonListener= new SelectionAdapter() { @Override @@ -296,9 +296,6 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta return button; } - /* (non-Javadoc) - * Method declared on PreferencePage. - */ @Override protected Control createContents(Composite parent) { @@ -429,9 +426,6 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta viewer.getTable().setFocus(); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent) - */ @Override public void checkStateChanged(CheckStateChangedEvent event) { Object element= event.getElement(); @@ -491,7 +485,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta private void enableCommand(ICommand command, boolean enable) { Map<String, String> args = command.getArguments(); if (args == null) { - args = new HashMap<String, String>(1); + args = new HashMap<>(1); } args.put(COMMAND_ENABLED, Boolean.toString(enable)); command.setArguments(args); @@ -505,7 +499,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta private void handleImportButtonPressed() { ILaunchManager manager= DebugPlugin.getDefault().getLaunchManager(); List<ILaunchConfigurationType> toolTypes = getConfigurationTypes(IExternalToolConstants.ID_EXTERNAL_TOOLS_LAUNCH_CATEGORY); - List<ILaunchConfiguration> configurations = new ArrayList<ILaunchConfiguration>(); + List<ILaunchConfiguration> configurations = new ArrayList<>(); for (ILaunchConfigurationType type : toolTypes) { try { ILaunchConfiguration[] configs = manager.getLaunchConfigurations(type); @@ -569,12 +563,12 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta Object item= iterator.next(); if (item instanceof ILaunchConfiguration) { if (configsToBeDeleted == null) { - configsToBeDeleted = new ArrayList<ILaunchConfiguration>(numSelected); + configsToBeDeleted = new ArrayList<>(numSelected); } configsToBeDeleted.add((ILaunchConfiguration) item); } else if (item instanceof ICommand) { if (commandsToBeDeleted == null) { - commandsToBeDeleted = new ArrayList<ICommand>(numSelected); + commandsToBeDeleted = new ArrayList<>(numSelected); } commandsToBeDeleted.add((ICommand) item); } @@ -682,7 +676,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta */ private List<ILaunchConfigurationType> getConfigurationTypes(String category) { ILaunchConfigurationType types[] = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationTypes(); - List<ILaunchConfigurationType> externalToolTypes = new ArrayList<ILaunchConfigurationType>(); + List<ILaunchConfigurationType> externalToolTypes = new ArrayList<>(); for (int i = 0; i < types.length; i++) { ILaunchConfigurationType configurationType = types[i]; if (category.equals(configurationType.getCategory())) { @@ -982,7 +976,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta //get all the build commands int numCommands = itemData.length; monitor.beginTask(ExternalToolsUIMessages.BuilderPropertyPage_3, numCommands + 1); - List<ICommand> possibleCommands = new ArrayList<ICommand>(numCommands); + List<ICommand> possibleCommands = new ArrayList<>(numCommands); for (int i = 0; i < numCommands; i++) { Object data = itemData[i]; if (data instanceof ICommand) { @@ -1086,7 +1080,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta newCommand.setBuilderName(builderName); newCommand.setArguments(args); if (configsToBeDeleted == null) { - configsToBeDeleted = new ArrayList<ILaunchConfiguration>(); + configsToBeDeleted = new ArrayList<>(); } configsToBeDeleted.add(config); return newCommand; @@ -1215,9 +1209,6 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta return false; } - /* (non-Javadoc) - * @see org.eclipse.jface.preference.IPreferencePage#performCancel() - */ @Override public boolean performCancel() { for (ILaunchConfiguration config : newConfigList) { diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/FileSelectionDialog.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/FileSelectionDialog.java index db51b499e..f91f36873 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/FileSelectionDialog.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/FileSelectionDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2018 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 @@ -102,9 +102,6 @@ public class FileSelectionDialog extends MessageDialog { } } - /* - * (non-Javadoc) Method declared in Window. - */ @Override protected void configureShell(Shell shell) { super.configureShell(shell); @@ -117,9 +114,6 @@ public class FileSelectionDialog extends MessageDialog { initializeDialog(); } - /* - * (non-Javadoc) Method declared on Dialog. - */ @Override protected Control createDialogArea(Composite parent) { // page group @@ -172,7 +166,7 @@ public class FileSelectionDialog extends MessageDialog { IResource[] members = null; try { members = ((IContainer) o).members(); - List<IResource> accessibleMembers = new ArrayList<IResource>(members.length); + List<IResource> accessibleMembers = new ArrayList<>(members.length); for (int i = 0; i < members.length; i++) { IResource resource = members[i]; if (resource.isAccessible()) { @@ -186,7 +180,7 @@ public class FileSelectionDialog extends MessageDialog { } //filter out the desired resource types - ArrayList<IResource> results = new ArrayList<IResource>(); + ArrayList<IResource> results = new ArrayList<>(); for (int i = 0; i < members.length; i++) { //And the test bits with the resource types to see if // they are what we want diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/TreeAndListGroup.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/TreeAndListGroup.java index 4b50ef916..58cb3255a 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/TreeAndListGroup.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/TreeAndListGroup.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2018 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 @@ -42,8 +42,8 @@ import org.eclipse.ui.views.navigator.ResourceComparator; public class TreeAndListGroup implements ISelectionChangedListener { private Object root; private Object currentTreeSelection; - private List<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>(); - private List<IDoubleClickListener> doubleClickListeners = new ArrayList<IDoubleClickListener>(); + private List<ISelectionChangedListener> selectionChangedListeners = new ArrayList<>(); + private List<IDoubleClickListener> doubleClickListeners = new ArrayList<>(); private ITreeContentProvider treeContentProvider; private IStructuredContentProvider listContentProvider; @@ -243,9 +243,6 @@ public class TreeAndListGroup implements ISelectionChangedListener { treeViewer.setInput(root); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) - */ @Override public void selectionChanged(SelectionChangedEvent event) { IStructuredSelection selection = (IStructuredSelection) event.getSelection(); diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/BuildFilesResolver.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/BuildFilesResolver.java index 53e189243..bdcdc5e99 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/BuildFilesResolver.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/BuildFilesResolver.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2013 Matthew Conway and others. + * Copyright (c) 2007, 2018 Matthew Conway 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 @@ -43,7 +43,7 @@ public class BuildFilesResolver implements IDynamicVariableResolver if (buildDelta != null) { final StringBuffer fileList = new StringBuffer(); - final Set<String> changedResources = new LinkedHashSet<String>(); + final Set<String> changedResources = new LinkedHashSet<>(); // Use the argument to determine which deltas to visit - if none, // then defaults to all |