diff options
Diffstat (limited to 'launch/org.eclipse.cdt.launch')
7 files changed, 13 insertions, 13 deletions
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate2.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate2.java index 0ee855ec3f9..26be3410d2c 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate2.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate2.java @@ -148,9 +148,9 @@ public abstract class AbstractCLaunchDelegate2 extends LaunchConfigurationDelega String[] orderedNames = ResourcesPlugin.getWorkspace().getDescription().getBuildOrder(); if (orderedNames != null) { //Projects may not be in the build order but should still be built if selected - ArrayList<IProject> unorderedProjects = new ArrayList<IProject>(projectSet.size()); + ArrayList<IProject> unorderedProjects = new ArrayList<>(projectSet.size()); unorderedProjects.addAll(projectSet); - orderedProjList = new ArrayList<IProject>(projectSet.size()); + orderedProjList = new ArrayList<>(projectSet.size()); for (String projectName : orderedNames) { for (IProject proj : unorderedProjects) { @@ -366,7 +366,7 @@ public abstract class AbstractCLaunchDelegate2 extends LaunchConfigurationDelega for (ICommand command : commands) { Map<String, String> args = command.getArguments(); if (args == null) { - args = new HashMap<String, String>(cfgIdArgs); + args = new HashMap<>(cfgIdArgs); } else { args.putAll(cfgIdArgs); } diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java index 981d769fbcb..b7e28b2eb29 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java @@ -147,7 +147,7 @@ public class LocalRunLaunchDelegate extends AbstractCLaunchDelegate2 { } } - HashMap<String, String> envMap = new HashMap<String, String>(); + HashMap<String, String> envMap = new HashMap<>(); // If the launch configuration is the only environment the inferior should see, just use that boolean append = config.getAttribute(ILaunchManager.ATTR_APPEND_ENVIRONMENT_VARIABLES, true); @@ -224,7 +224,7 @@ public class LocalRunLaunchDelegate extends AbstractCLaunchDelegate2 { } // Turn it into an envp format - List<String> strings = new ArrayList<String>(envMap.size()); + List<String> strings = new ArrayList<>(envMap.size()); for (Entry<String, String> entry : envMap.entrySet()) { StringBuilder buffer = new StringBuilder(entry.getKey()); buffer.append('=').append(entry.getValue()); diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/MultiLaunchConfigurationDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/MultiLaunchConfigurationDelegate.java index 05e5e7c62dc..879a05e77fd 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/MultiLaunchConfigurationDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/MultiLaunchConfigurationDelegate.java @@ -131,7 +131,7 @@ public class MultiLaunchConfigurationDelegate extends LaunchConfigurationDelegat * A map of all our sub-launches and the current processes that belong * to each one. */ - private Map<ILaunch, IProcess[]> subLaunches = new HashMap<ILaunch, IProcess[]>(); + private Map<ILaunch, IProcess[]> subLaunches = new HashMap<>(); public MultiLaunch(ILaunchConfiguration launchConfiguration, String mode) { super(launchConfiguration, mode, null); diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationSelectionDialog.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationSelectionDialog.java index c7c4fe502c7..c4fdd796303 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationSelectionDialog.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationSelectionDialog.java @@ -133,7 +133,7 @@ public class MultiLaunchConfigurationSelectionDialog extends TitleAreaDialog imp : LaunchMessages.MultiLaunchConfigurationSelectionDialog_14); fStackComposite = new ComboControlledStackComposite(comp, SWT.NONE); - HashMap<String, ILaunchGroup> modes = new HashMap<String, ILaunchGroup>(); + HashMap<String, ILaunchGroup> modes = new HashMap<>(); for (ILaunchGroup launchGroup : launchGroups) { if (!modes.containsKey(launchGroup.getMode())) { modes.put(launchGroup.getMode(), launchGroup); @@ -270,7 +270,7 @@ public class MultiLaunchConfigurationSelectionDialog extends TitleAreaDialog imp } public ILaunchConfiguration[] getSelectedLaunchConfigurations() { - List<ILaunchConfiguration> configs = new ArrayList<ILaunchConfiguration>(); + List<ILaunchConfiguration> configs = new ArrayList<>(); if (fSelection != null && !fSelection.isEmpty()) { for (Iterator<?> iter = ((IStructuredSelection) fSelection).iterator(); iter.hasNext();) { Object selection = iter.next(); diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationTabGroup.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationTabGroup.java index 62404d4391f..d029fa7d340 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationTabGroup.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationTabGroup.java @@ -264,7 +264,7 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio static class GroupLaunchTab extends AbstractLaunchConfigurationTab { protected CheckboxTreeViewer treeViewer; - protected List<LaunchElement> input = new ArrayList<LaunchElement>(); + protected List<LaunchElement> input = new ArrayList<>(); private String mode; public GroupLaunchTab(String mode) { @@ -394,7 +394,7 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio */ private int[] getMultiSelectionIndices() { StructuredSelection sel = (StructuredSelection) treeViewer.getSelection(); - List<Integer> indices = new ArrayList<Integer>(); + List<Integer> indices = new ArrayList<>(); for (Iterator<?> iter = sel.iterator(); iter.hasNext();) { MultiLaunchConfigurationDelegate.LaunchElement el = (MultiLaunchConfigurationDelegate.LaunchElement) iter diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractMainTab.java index ba5d8de8e05..d0a1a612db2 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractMainTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractMainTab.java @@ -90,7 +90,7 @@ public abstract class CAbstractMainTab extends CLaunchConfigurationTab { protected Button fWorkspaceSettingsButton; /** @since 6.1 */ protected Link fWorkpsaceSettingsLink; - protected final Map<IPath, Boolean> fBinaryExeCache = new HashMap<IPath, Boolean>(); + protected final Map<IPath, Boolean> fBinaryExeCache = new HashMap<>(); protected Label fProjLabel; protected Text fProjText; protected Button fProjButton; @@ -203,7 +203,7 @@ public abstract class CAbstractMainTab extends CLaunchConfigurationTab { */ protected ICProject[] getCProjects() throws CModelException { ICProject cproject[] = CoreModel.getDefault().getCModel().getCProjects(); - ArrayList<ICProject> list = new ArrayList<ICProject>(cproject.length); + ArrayList<ICProject> list = new ArrayList<>(cproject.length); for (int i = 0; i < cproject.length; i++) { ICDescriptor cdesciptor = null; try { diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/ComboControlledStackComposite.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/ComboControlledStackComposite.java index 3b235c9c02c..a4034119e94 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/ComboControlledStackComposite.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/ComboControlledStackComposite.java @@ -41,7 +41,7 @@ public class ComboControlledStackComposite extends Composite { public ComboControlledStackComposite(Composite parent, int style) { super(parent, style); - tabMap = new LinkedHashMap<String, Composite>(); + tabMap = new LinkedHashMap<>(); setLayout(new GridLayout(2, false)); createContents(this); } |