mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-01 21:35:40 +02:00
Code Issues Wiki Activity

bug 319512: Missing type arguments on managedbuilder.core

Browse source 
Reverted problematic code
This commit is contained in:
Andrew Gvozdev 2011-01-03 21:48:28 +00:00
parent 2bb0e9a6a5
commit bb65ee266a
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PropertyManager.java
View file

@ -15,6 +15,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Properties; import java.util.Properties;
@ -213,17 +214,22 @@ public class PropertyManager {
storeData(cfg, map); storeData(cfg, map);
} }
protected Properties mapToProps(Map<String, Properties> map){ protected Properties mapToProps(Map map){
Properties props = null; Properties props = null;
if(map != null){ if(map != null){
synchronized(map){ synchronized(map){
if(map.size() > 0){ if(map.size() > 0){
props = new Properties(); props = new Properties();
for (Entry<String, Properties> entry : map.entrySet()) { for(Iterator iter = map.entrySet().iterator(); iter.hasNext();){
String key = entry.getKey(); Map.Entry entry = (Map.Entry)iter.next();
String key = (String)entry.getKey();
String value = null; String value = null;
Properties oVal = entry.getValue(); Object oVal = entry.getValue();
value = propsToString(oVal); if(oVal instanceof Properties){
value = propsToString((Properties)oVal);
} else if (oVal instanceof String){
value = (String)oVal;
}
if(key != null && value != null) if(key != null && value != null)
props.setProperty(key, value); props.setProperty(key, value);