Skip to main content
summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorAndrew Gvozdev2010-04-29 15:15:13 -0400
committerAndrew Gvozdev2010-04-29 15:15:13 -0400
commitcffc49b2401a9bbcb8636d0927e8fb7e1d7caa35 (patch)
tree47b1e1ec08c770e8032320832b61afa036bbf66b /build
parent844ab2144c95c3c333954b05766e7c0ce3346c03 (diff)
downloadorg.eclipse.cdt-cffc49b2401a9bbcb8636d0927e8fb7e1d7caa35.tar.gz
org.eclipse.cdt-cffc49b2401a9bbcb8636d0927e8fb7e1d7caa35.tar.xz
org.eclipse.cdt-cffc49b2401a9bbcb8636d0927e8fb7e1d7caa35.zip
compilation warnings
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java1
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeCDataFactory.java4
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeDiscoveredInfoProcessor.java3
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeLanguageData.java4
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MakefileReader.java3
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/PerFileDiscoveredPathContainer.java16
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/PathInfoToLangSettingsConverter.java17
7 files changed, 28 insertions, 20 deletions
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java
index 9090be3e7b..c1a4231f21 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java
@@ -370,6 +370,7 @@ public class MakeCorePlugin extends Plugin {
/* (non-Javadoc)
* @see org.eclipse.core.runtime.Plugin#startup()
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeCDataFactory.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeCDataFactory.java
index 7dc530e7dd..f9edc08015 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeCDataFactory.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeCDataFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Intel Corporation and others.
+ * Copyright (c) 2007, 2010 Intel 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
@@ -26,6 +26,7 @@ public class MakeCDataFactory extends CDataFactory {
return fInstance;
}
+ @Override
public CLanguageData createLanguageData(CConfigurationData cfg,
CResourceData rcBase, CLanguageData base, String id, boolean clone) {
if(id == null)
@@ -33,6 +34,7 @@ public class MakeCDataFactory extends CDataFactory {
return new MakeLanguageData(id, base);
}
+ @Override
public CLanguageData createLanguageData(CConfigurationData cfg,
CResourceData rcBase, String id, String name, String languageId,
int supportedKinds, String[] rcTypes, boolean isContentTypes) {
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeDiscoveredInfoProcessor.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeDiscoveredInfoProcessor.java
index 67b2a1780f..eabca40200 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeDiscoveredInfoProcessor.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeDiscoveredInfoProcessor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Intel Corporation and others.
+ * Copyright (c) 2007, 2010 Intel 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
@@ -25,6 +25,7 @@ public class MakeDiscoveredInfoProcessor extends CDataDiscoveredInfoProcessor {
return fInstance;
}
+ @Override
protected void setInfoForData(CConfigurationData cfgData,
CResourceData rcData, CLanguageData data, PathInfo pi,
CResourceData baseRcData, CLanguageData baseLangData) {
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeLanguageData.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeLanguageData.java
index 845c3c2f8b..780be5fcee 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeLanguageData.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeLanguageData.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Intel Corporation and others.
+ * Copyright (c) 2007, 2010 Intel 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
@@ -34,6 +34,7 @@ public class MakeLanguageData extends UserAndDiscoveredEntryLanguageData {
fSupportedKinds = kinds;
}
+ @Override
protected void copySettingsFrom(CLanguageData data) {
super.copySettingsFrom(data);
if(data instanceof MakeLanguageData){
@@ -41,6 +42,7 @@ public class MakeLanguageData extends UserAndDiscoveredEntryLanguageData {
}
}
+ @Override
protected ICLanguageSettingEntry[] getAllDiscoveredEntries(int kind) {
if(fDiscoveredCache != null){
int roFlag = canDisableDiscoveredEntries(kind) ? 0 : ICLanguageSettingEntry.READONLY;
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MakefileReader.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MakefileReader.java
index cad2844724..6561c73825 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MakefileReader.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MakefileReader.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * Copyright (c) 2000, 2010 QNX Software Systems 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
@@ -28,6 +28,7 @@ public class MakefileReader extends LineNumberReader {
}
+ @Override
public String readLine() throws IOException {
boolean done = false;
StringBuffer buffer = new StringBuffer();
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/PerFileDiscoveredPathContainer.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/PerFileDiscoveredPathContainer.java
index d6675c4a71..1e0f8a404d 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/PerFileDiscoveredPathContainer.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/PerFileDiscoveredPathContainer.java
@@ -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
@@ -11,9 +11,9 @@
package org.eclipse.cdt.make.internal.core.scannerconfig;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Set;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.IPathEntry;
@@ -37,7 +37,7 @@ public class PerFileDiscoveredPathContainer extends DiscoveredPathContainer
* @see org.eclipse.cdt.core.model.IPathEntryContainerExtension#getPathEntries(org.eclipse.core.runtime.IPath, int)
*/
public IPathEntry[] getPathEntries(IPath path, int mask) {
- ArrayList entries = new ArrayList();
+ ArrayList<IPathEntry> entries = new ArrayList<IPathEntry>();
try {
IDiscoveredPathInfo info = MakeCorePlugin.getDefault().getDiscoveryManager().getDiscoveredInfo(fProject);
if (info instanceof IPerFileDiscoveredPathInfo) {
@@ -56,10 +56,10 @@ public class PerFileDiscoveredPathContainer extends DiscoveredPathContainer
}
}
if ((mask & IPathEntry.CDT_MACRO) != 0) {
- Map syms = filePathInfo.getSymbols(path);
- for (Iterator iter = syms.entrySet().iterator(); iter.hasNext(); ) {
- Entry entry = (Entry)iter.next();
- entries.add(CoreModel.newMacroEntry(path, (String)entry.getKey(), (String)entry.getValue()));
+ Map<String, String> syms = filePathInfo.getSymbols(path);
+ Set<Entry<String, String>> entrySet = syms.entrySet();
+ for (Entry<String, String> entry : entrySet) {
+ entries.add(CoreModel.newMacroEntry(path, entry.getKey(), entry.getValue()));
}
}
// compare the resource with include and macros files
@@ -88,7 +88,7 @@ public class PerFileDiscoveredPathContainer extends DiscoveredPathContainer
catch (CoreException e) {
//
}
- return (IPathEntry[]) entries.toArray(new IPathEntry[entries.size()]);
+ return entries.toArray(new IPathEntry[entries.size()]);
}
/* (non-Javadoc)
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/PathInfoToLangSettingsConverter.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/PathInfoToLangSettingsConverter.java
index 3043fe76ba..aa76da2cc9 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/PathInfoToLangSettingsConverter.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/PathInfoToLangSettingsConverter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Intel Corporation and others.
+ * Copyright (c) 2007, 2010 Intel 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
@@ -10,16 +10,17 @@
*******************************************************************************/
package org.eclipse.cdt.make.internal.core.scannerconfig.util;
-import java.util.Iterator;
import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
import org.eclipse.cdt.core.settings.model.CMacroEntry;
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
import org.eclipse.cdt.core.settings.model.ICMacroEntry;
import org.eclipse.cdt.core.settings.model.util.CDataUtil;
-import org.eclipse.cdt.make.core.scannerconfig.PathInfo;
import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo;
import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IPerFileDiscoveredPathInfo;
+import org.eclipse.cdt.make.core.scannerconfig.PathInfo;
import org.eclipse.core.runtime.IPath;
public class PathInfoToLangSettingsConverter {
@@ -73,13 +74,13 @@ public class PathInfoToLangSettingsConverter {
return entries;
}
- private static ICMacroEntry[] calculateEntries(int flags, Map map){
+ private static ICMacroEntry[] calculateEntries(int flags, Map<String, String> map){
ICMacroEntry entries[] = new ICMacroEntry[map.size()];
int num = 0;
- for(Iterator iter = map.entrySet().iterator(); iter.hasNext();){
- Map.Entry entry = (Map.Entry)iter.next();
- String name = (String)entry.getKey();
- String value = (String)entry.getValue();
+ Set<Entry<String, String>> entrySet = map.entrySet();
+ for (Entry<String, String> entry : entrySet) {
+ String name = entry.getKey();
+ String value = entry.getValue();
entries[num++] = new CMacroEntry(name, value, flags);
}
return entries;

Back to the top