mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

compilation warnings

Browse source
This commit is contained in:
Andrew Gvozdev 2010-04-28 19:40:14 +00:00
parent ae1955efc0
commit d304fe4f57
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigInfoFactory2.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2004, 2009 IBM Corporation and others. * Copyright (c) 2004, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -881,7 +881,7 @@ public class ScannerConfigInfoFactory2 {
ScannerConfigProfile configuredProfile = ScannerConfigProfileManager.getInstance(). ScannerConfigProfile configuredProfile = ScannerConfigProfileManager.getInstance().
getSCProfileConfiguration(selectedProfile); getSCProfileConfiguration(selectedProfile);
// get the one and only provider id // get the one and only provider id
String providerId = (String) configuredProfile.getSIProviderIds().get(0); String providerId = configuredProfile.getSIProviderIds().get(0);
po.providerOptionsMap = new LinkedHashMap<String, ProfileOptions.ProviderOptions>(1); po.providerOptionsMap = new LinkedHashMap<String, ProfileOptions.ProviderOptions>(1);
po.providerOptionsMap.put(providerId, ppo); po.providerOptionsMap.put(providerId, ppo);

12
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfile.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2004, 2009 IBM Corporation and others. * Copyright (c) 2004, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -122,6 +122,7 @@ public class ScannerConfigProfile {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.make.internal.core.scannerconfig2.ScannerConfigProfileManager.IAction#getNewExternalScannerInfoProvider() * @see org.eclipse.cdt.make.internal.core.scannerconfig2.ScannerConfigProfileManager.IAction#getNewExternalScannerInfoProvider()
*/ */
@Override
public Object createExternalScannerInfoProvider() { public Object createExternalScannerInfoProvider() {
Object provider = super.createExternalScannerInfoProvider(); Object provider = super.createExternalScannerInfoProvider();
if (provider == null) { if (provider == null) {
@ -146,6 +147,7 @@ public class ScannerConfigProfile {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.make.internal.core.scannerconfig2.ScannerConfigProfileManager.IAction#getNewExternalScannerInfoProvider() * @see org.eclipse.cdt.make.internal.core.scannerconfig2.ScannerConfigProfileManager.IAction#getNewExternalScannerInfoProvider()
*/ */
@Override
public Object createExternalScannerInfoProvider() { public Object createExternalScannerInfoProvider() {
Object provider = super.createExternalScannerInfoProvider(); Object provider = super.createExternalScannerInfoProvider();
if (provider == null) { if (provider == null) {
@ -233,7 +235,7 @@ public class ScannerConfigProfile {
private ScannerInfoCollector scannerInfoCollector; private ScannerInfoCollector scannerInfoCollector;
private BuildOutputProvider buildOutputProvider; private BuildOutputProvider buildOutputProvider;
private Map scannerInfoProviders = new LinkedHashMap(); private Map<String, ScannerInfoProvider> scannerInfoProviders = new LinkedHashMap<String, ScannerInfoProvider>();
private Boolean supportsContext; private Boolean supportsContext;
@ -289,8 +291,8 @@ public class ScannerConfigProfile {
/** /**
* @return Returns the list of providerIds * @return Returns the list of providerIds
*/ */
public List getSIProviderIds() { public List<String> getSIProviderIds() {
return new ArrayList(scannerInfoProviders.keySet()); return new ArrayList<String>(scannerInfoProviders.keySet());
} }
/** /**
* @return Returns the buildOutputProvider. * @return Returns the buildOutputProvider.
@ -322,7 +324,7 @@ public class ScannerConfigProfile {
* @return Returns the scannerInfoProviders. * @return Returns the scannerInfoProviders.
*/ */
public ScannerInfoProvider getScannerInfoProviderElement(String providerId) { public ScannerInfoProvider getScannerInfoProviderElement(String providerId) {
return (ScannerInfoProvider) scannerInfoProviders.get(providerId); return scannerInfoProviders.get(providerId);
} }
public boolean supportsContext(){ public boolean supportsContext(){