1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-10 12:03:16 +02:00

compilation warnings

This commit is contained in:
Andrew Gvozdev 2010-04-28 19:51:17 +00:00
parent d304fe4f57
commit 44f53ef53d
2 changed files with 19 additions and 19 deletions

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
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -12,7 +12,6 @@
package org.eclipse.cdt.make.internal.core.scannerconfig.gnu;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -126,7 +125,7 @@ public class GCCSpecsConsoleParser implements IScannerInfoConsoleParser {
}
}
TraceUtil.outputTrace("Scanner info from \'specs\' file", //$NON-NLS-1$
"Include paths", includes, Collections.emptyList(), "Defined symbols", symbols); //$NON-NLS-1$ //$NON-NLS-2$);
"Include paths", includes, new ArrayList<String>(0), "Defined symbols", symbols); //$NON-NLS-1$ //$NON-NLS-2$);
}
}

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
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -15,6 +15,7 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.eclipse.cdt.make.core.MakeCorePlugin;
@ -35,6 +36,7 @@ public class TraceUtil {
/* (non-Javadoc)
* @see java.lang.Object#finalize()
*/
@Override
protected void finalize() throws Throwable {
logger.shutdown();
super.finalize();
@ -76,7 +78,7 @@ public class TraceUtil {
* @param col1
* @param col2
*/
public static void outputTrace(String title, String subtitle1, List item1, List item1new, String subtitle2, List item2) {
public static void outputTrace(String title, String subtitle1, List<String> item1, List<String> item1new, String subtitle2, List<String> item2) {
if (isTracing()) {
//System.out.println();
System.out.println(title);
@ -84,13 +86,13 @@ public class TraceUtil {
final String doublePrefix = " "; //$NON-NLS-1$
System.out.println(prefix + subtitle1 + " (" + item1.size() + "):"); //$NON-NLS-1$ //$NON-NLS-2$
int count = 0;
for (Iterator i = item1.iterator(), j = item1new.iterator(); i.hasNext(); ) {
System.out.println(doublePrefix + String.valueOf(++count) + "\t\'" +(String)i.next() + (j.hasNext()?"\' -> \'" + (String)j.next():"") + '\''); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
for (Iterator<String> i = item1.iterator(), j = item1new.iterator(); i.hasNext(); ) {
System.out.println(doublePrefix + String.valueOf(++count) + "\t\'" +i.next() + (j.hasNext()?"\' -> \'" + j.next():"") + '\''); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
System.out.println(prefix + subtitle2 + " (" + item2.size() + "):"); //$NON-NLS-1$ //$NON-NLS-2$
count = 0;
for (Iterator i = item2.iterator(); i.hasNext(); ) {
System.out.println(doublePrefix + String.valueOf(++count) + "\t\'" + (String)i.next() + '\''); //$NON-NLS-1$
for (Iterator<String> i = item2.iterator(); i.hasNext(); ) {
System.out.println(doublePrefix + String.valueOf(++count) + "\t\'" + i.next() + '\''); //$NON-NLS-1$
}
}
}
@ -123,26 +125,25 @@ public class TraceUtil {
* @param subtitlePostfix
* @param map - el grande map
*/
public static void metricsTrace(String title, String subtitlePrefix, String subtitlePostfix, Map directoryCommandListMap) {
public static void metricsTrace(String title, String subtitlePrefix, String subtitlePostfix,
Map<String, List<Map<String, List<String>>>> directoryCommandListMap) {
try {
logger.writeln();
logger.writeln(" *** NEW METRICS TRACE ***"); //$NON-NLS-1$
logger.writeln();
for (Iterator k = directoryCommandListMap.keySet().iterator(); k.hasNext(); ) {
String dir = (String) k.next();
Set<String> dirs = directoryCommandListMap.keySet();
for (String dir : dirs) {
logger.writeln(title + dir + ":"); //$NON-NLS-1$
List directoryCommandList = (List) directoryCommandListMap.get(dir);
List<Map<String, List<String>>> directoryCommandList = directoryCommandListMap.get(dir);
if (directoryCommandList == null) {
logger.writeln(" --- empty ---" + EOL); //$NON-NLS-1$
return;
}
for (Iterator i = directoryCommandList.iterator(); i.hasNext(); ) {
Map command21FileListMap = (Map) i.next();
String[] commands = (String[]) command21FileListMap.keySet().toArray(new String[1]);
for (Map<String, List<String>> command21FileListMap : directoryCommandList) {
String[] commands = command21FileListMap.keySet().toArray(new String[1]);
logger.writeln(" " + subtitlePrefix + commands[0] + subtitlePostfix); //$NON-NLS-1$
List fileList = (List) command21FileListMap.get(commands[0]);
for (Iterator j = fileList.iterator(); j.hasNext(); ) {
String fileName = (String) j.next();
List<String> fileList = command21FileListMap.get(commands[0]);
for (String fileName : fileList) {
logger.writeln(" " + fileName); //$NON-NLS-1$
}
}