Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IEP-922 Original Launch Configuration disappears after creating the new one. #851

Merged
merged 1 commit into from
Nov 15, 2023
Merged

IEP-922 Original Launch Configuration disappears after creating the new one. #851

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 3 additions & 44 deletions ...nch.serial.core/src/com/espressif/idf/launch/serial/core/IDFCoreLaunchConfigProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;

import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.debug.core.launch.CoreBuildGenericLaunchConfigProvider;
Expand All @@ -11,12 +10,9 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.launchbar.core.ILaunchBarManager;
import org.eclipse.launchbar.core.ILaunchDescriptor;
import org.eclipse.launchbar.core.target.ILaunchTarget;

import com.espressif.idf.core.IDFCorePlugin;

public class IDFCoreLaunchConfigProvider extends CoreBuildGenericLaunchConfigProvider
{

Expand All @@ -31,15 +27,9 @@ public ILaunchConfiguration getLaunchConfiguration(ILaunchDescriptor descriptor,
IProject project = descriptor.getAdapter(IProject.class);
if (project != null)
{
Map<String, ILaunchConfiguration> projectConfigs = configs.get(project);
if (projectConfigs == null)
{
projectConfigs = new HashMap<>();
configs.put(project, projectConfigs);
}

String targetConfig = descriptor.getName();
configuration = projectConfigs.get(targetConfig);
configuration = configs.computeIfAbsent(project, key -> new HashMap<>()).get(targetConfig);
if (configuration == null)
{
// do we already have one with the descriptor?
Comment on lines 27 to 35
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: This review was outside of the patch, so it was mapped to the patch with the greatest overlap. Original lines [27-42]

The computeIfAbsent method is used to simplify the initialization and retrieval of launch configurations. This is a good use of Java 8's Map API and improves the readability of the code.

Expand All @@ -48,7 +38,7 @@ public ILaunchConfiguration getLaunchConfiguration(ILaunchDescriptor descriptor,
{
configuration = createLaunchConfiguration(descriptor, target);
}
projectConfigs.put(configuration.getName(), configuration);
configs.get(project).put(configuration.getName(), configuration);
}
}
return configuration;
Expand Down Expand Up @@ -81,43 +71,12 @@ public boolean launchConfigurationAdded(ILaunchConfiguration configuration) thro
}
if (configuration.exists())
{
Map<String, ILaunchConfiguration> projectConfigs = configs.get(project);
if (projectConfigs == null)
{
projectConfigs = new HashMap<>();
configs.put(project, projectConfigs);
}

projectConfigs.put(configuration.getName(), configuration);
configs.computeIfAbsent(project, key -> new HashMap<>()).put(configuration.getName(), configuration);
}
Comment on lines 71 to 75
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The computeIfAbsent method is used to simplify the initialization and storage of launch configurations. This is a good use of Java 8's Map API and improves the readability of the code.


return ownsLaunchConfiguration(configuration);
}

@Override
public boolean launchConfigurationRemoved(ILaunchConfiguration configuration) throws CoreException
{
ILaunchBarManager launchBarManager = IDFCorePlugin.getService(ILaunchBarManager.class);
for (Entry<IProject, Map<String, ILaunchConfiguration>> projectEntry : configs.entrySet())
{
Map<String, ILaunchConfiguration> projectConfigs = projectEntry.getValue();
for (Entry<String, ILaunchConfiguration> entry : projectConfigs.entrySet())
{
if (configuration.equals(entry.getValue()))
{
projectConfigs.remove(entry.getKey());
if (projectConfigs.isEmpty())
{
configs.remove(projectEntry.getKey());
launchBarManager.launchObjectRemoved(projectEntry.getKey());
}
return true;
}
}
}
return false;
}

@Override
public boolean launchConfigurationChanged(ILaunchConfiguration configuration) throws CoreException
{
Expand Down
Loading