From e11035409fb1d4c581911a738570e994caabe14e Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Fri, 18 Dec 2015 13:03:25 +0200 Subject: [PATCH] autotools: Creating default config doesn't need project. AutotoolsConfigurationManager.createDefaultConfiguration doesn't need the project as parameter, that's why it's default one :). Change-Id: I55f39edf5867f874e38524042572329bc7e34f66 Signed-off-by: Alexander Kurtakov --- .../core/configure/AutotoolsConfigurationManager.java | 8 ++++---- .../ui/properties/AutotoolsConfigurePropertyTab.java | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfigurationManager.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfigurationManager.java index d52afd04684..6eba7c3e52c 100644 --- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfigurationManager.java +++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfigurationManager.java @@ -96,7 +96,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener { return instance; } - public synchronized IAConfiguration createDefaultConfiguration(IProject project, String id) { + public synchronized IAConfiguration createDefaultConfiguration(String id) { return new AutotoolsConfiguration(id); } @@ -112,7 +112,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener { public synchronized IAConfiguration getConfiguration(IProject p, String cfgId, boolean persist) { IAConfiguration cfg = findCfg(p, cfgId); if (cfg == null) { - cfg = createDefaultConfiguration(p, cfgId); + cfg = createDefaultConfiguration(cfgId); if (persist) { addConfiguration(p, cfg); } @@ -394,7 +394,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener { String id = cfgd.getId(); IAConfiguration cfg = cfgs.get(id); if (cfg == null) { - cfg = createDefaultConfiguration(project, id); + cfg = createDefaultConfiguration(id); } p.println(""); //$NON-NLS-1$ //$NON-NLS-2$ for (int j = 0; j < optionList.length; ++j) { @@ -625,7 +625,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener { // Get set of configuration options and convert to set of IAutotoolOptions Map cfgOptions = cfg.getOptions(); - IAConfiguration dummyCfg = createDefaultConfiguration(project, createDummyId()); + IAConfiguration dummyCfg = createDefaultConfiguration(createDummyId()); for (Iterator> i = cfgOptions.entrySet().iterator(); i.hasNext();) { Map.Entry entry = i.next(); String name = entry.getKey(); diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsConfigurePropertyTab.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsConfigurePropertyTab.java index 0e247634412..338b3784a15 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsConfigurePropertyTab.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsConfigurePropertyTab.java @@ -117,8 +117,7 @@ public class AutotoolsConfigurePropertyTab extends AbstractAutotoolsCPropertyTab fTree.addSelectionChangedListener(event -> handleOptionSelection()); fTree.getControl().setLayoutData(new GridData(GridData.FILL_BOTH)); // Create a temporary default AutotoolsConfiguration to use for label info - IAConfiguration tmp = AutotoolsConfigurationManager.getInstance().createDefaultConfiguration(page.getProject(), - ""); + IAConfiguration tmp = AutotoolsConfigurationManager.getInstance().createDefaultConfiguration(""); fTree.setLabelProvider(new ToolListLabelProvider(tmp)); }