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

cosmetics: dead code commented out

Browse source
This commit is contained in:
Andrew Gvozdev 2010-01-18 21:23:11 +00:00
parent caffb3ecfc
commit 53596ee098
1 changed files with 130 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

256
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java
View file

@ -74,7 +74,9 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
IToolChain parTc = folderInfo.getToolChain(); IToolChain parTc = folderInfo.getToolChain();
IToolChain extTc = parTc; IToolChain extTc = parTc;
for(; extTc != null && !extTc.isExtensionElement(); extTc = extTc.getSuperClass()); for(; extTc != null && !extTc.isExtensionElement(); extTc = extTc.getSuperClass()) {
// empty body, loop is to find extension element only
}
if(extTc == null) if(extTc == null)
extTc = parTc; extTc = parTc;
@ -88,7 +90,9 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
String subId = new String(); String subId = new String();
for (ITool tool : tools) { for (ITool tool : tools) {
ITool extTool = tool; ITool extTool = tool;
for(; extTool != null && !extTool.isExtensionElement(); extTool = extTool.getSuperClass()); for(; extTool != null && !extTool.isExtensionElement(); extTool = extTool.getSuperClass()) {
// empty body, loop is to find extension element only
}
if(extTool == null) if(extTool == null)
extTool = tool; extTool = tool;
@ -171,7 +175,9 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
IToolChain cloneToolChain = cloneInfo.getToolChain(); IToolChain cloneToolChain = cloneInfo.getToolChain();
IToolChain extToolChain = cloneToolChain; IToolChain extToolChain = cloneToolChain;
for(; !extToolChain.isExtensionElement(); extToolChain = extToolChain.getSuperClass()); for(; !extToolChain.isExtensionElement(); extToolChain = extToolChain.getSuperClass()) {
// empty body, loop is to find extension element only
}
subName = cloneToolChain.getName(); subName = cloneToolChain.getName();
@ -207,7 +213,9 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
ITargetPlatform tpBase = cloneInfo.getToolChain().getTargetPlatform(); ITargetPlatform tpBase = cloneInfo.getToolChain().getTargetPlatform();
ITargetPlatform extTp = tpBase; ITargetPlatform extTp = tpBase;
for(;extTp != null && !extTp.isExtensionElement();extTp = extTp.getSuperClass()); for(;extTp != null && !extTp.isExtensionElement();extTp = extTp.getSuperClass()) {
// empty body, loop is to find extension element only
}
TargetPlatform tp; TargetPlatform tp;
if(extTp != null){ if(extTp != null){
@ -470,7 +478,7 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
Map<String, String> map = new HashMap<String, String>(ids.length); Map<String, String> map = new HashMap<String, String>(ids.length);
for(String id : ids){ for(String id : ids){
IBuildProperty prop = props.getProperty(id); IBuildProperty prop = props.getProperty(id);
map.put(id, props != null ? prop.getValue().getId() : null); map.put(id, prop.getValue().getId());
} }
return map; return map;
} }
@ -662,15 +670,12 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
if(curReal == newReal) if(curReal == newReal)
return true; return true;
if(tCh != null){ if(getToolChainConverterInfo(fromTc, tCh) != null)
if(getToolChainConverterInfo(fromTc, tCh) != null) compatible = true;
compatible = true;
if(!compatible)
if(!compatible) compatible = isPropertiesModificationCompatible(tCh);
compatible = isPropertiesModificationCompatible(tCh);
} else {
compatible = fromTc != null && fromTc.isPreferenceToolChain();
}
return compatible; return compatible;
} }
@ -901,62 +906,61 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
} }
public void modifyToolChain(ITool[] removed, ITool[] added){ public void modifyToolChain(ITool[] removed, ITool[] added){
if(true){ ToolListModificationInfo info = ToolChainModificationHelper.getModificationInfo(this, getTools(), added, removed);
ToolListModificationInfo info = ToolChainModificationHelper.getModificationInfo(this, getTools(), added, removed); info.apply();
info.apply(); return;
return;
}
ITool[][] checked = checkDups(removed, added);
removed = checked[0];
added = checked[1];
if(added.length == 0 && removed.length == 0)
return;
List<ITool> remainingRemoved = new ArrayList<ITool>();
List<ITool> remainingAdded = new ArrayList<ITool>();
Map<ITool, ConverterInfo> converterMap =
calculateConverterTools(removed, added, remainingRemoved, remainingAdded);
invokeConverters(converterMap);
List<Tool> newTools = new ArrayList<Tool>(added.length);
for(ConverterInfo info : converterMap.values()){
if(info.getConvertedFromObject() instanceof Tool){
Tool newTool = (Tool)info.getConvertedFromObject();
newTool.updateParent(getToolChain());
newTools.add(newTool);
} else {
remainingAdded.add((ITool)info.getToObject());
}
}
for(ITool t : remainingAdded){ // ITool[][] checked = checkDups(removed, added);
newTools.add( // removed = checked[0];
new Tool( // added = checked[1];
toolChain, // if(added.length == 0 && removed.length == 0)
t, // return;
ManagedBuildManager.calculateChildId(t.getId(), null), //
t.getName(), // List<ITool> remainingRemoved = new ArrayList<ITool>();
false) // List<ITool> remainingAdded = new ArrayList<ITool>();
); // Map<ITool, ConverterInfo> converterMap =
} // calculateConverterTools(removed, added, remainingRemoved, remainingAdded);
// invokeConverters(converterMap);
performToolChainModification(removed, newTools.toArray(new Tool[newTools.size()])); // List<Tool> newTools = new ArrayList<Tool>(added.length);
// for(ConverterInfo info : converterMap.values()){
// if(info.getConvertedFromObject() instanceof Tool){
// Tool newTool = (Tool)info.getConvertedFromObject();
// newTool.updateParent(getToolChain());
// newTools.add(newTool);
// } else {
// remainingAdded.add((ITool)info.getToObject());
// }
// }
//
// for(ITool t : remainingAdded){
// newTools.add(
// new Tool(
// toolChain,
// t,
// ManagedBuildManager.calculateChildId(t.getId(), null),
// t.getName(),
// false)
// );
// }
//
// performToolChainModification(removed, newTools.toArray(new Tool[newTools.size()]));
} }
private void performToolChainModification(ITool removed[], ITool[] added){ // private void performToolChainModification(ITool removed[], ITool[] added){
BuildSettingsUtil.disconnectDepentents(getParent(), removed); // BuildSettingsUtil.disconnectDepentents(getParent(), removed);
//
for (ITool tool : removed) { // for (ITool tool : removed) {
toolChain.removeTool((Tool)tool); // toolChain.removeTool((Tool)tool);
} // }
//
for (ITool tool : added) { // for (ITool tool : added) {
toolChain.addTool((Tool)tool); // toolChain.addTool((Tool)tool);
} // }
//
adjustTargetTools(removed, added); // adjustTargetTools(removed, added);
//
toolChain.propertiesChanged(); // toolChain.propertiesChanged();
} // }
private void adjustTargetTools(ITool removed[], ITool added[]){ private void adjustTargetTools(ITool removed[], ITool added[]){
if(!isRoot()) if(!isRoot())
@ -1066,59 +1070,59 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
return null; return null;
} }
private List<ConverterInfo> invokeConverters(Map<?, ConverterInfo> converterMap){ // private List<ConverterInfo> invokeConverters(Map<?, ConverterInfo> converterMap){
List<ConverterInfo> failed = new ArrayList<ConverterInfo>(); // List<ConverterInfo> failed = new ArrayList<ConverterInfo>();
for(ConverterInfo info : converterMap.values()){ // for(ConverterInfo info : converterMap.values()){
IBuildObject converted = info.getConvertedFromObject(); // IBuildObject converted = info.getConvertedFromObject();
if(converted == null || // if(converted == null ||
!converted.getClass().equals(info.getFromObject().getClass())){ // !converted.getClass().equals(info.getFromObject().getClass())){
failed.add(info); // failed.add(info);
} // }
} // }
return failed; // return failed;
} // }
private Map<ITool, ConverterInfo> calculateConverterTools(ITool[] removed, ITool[] added, List<ITool> remainingRemoved, List<ITool> remainingAdded){ // private Map<ITool, ConverterInfo> calculateConverterTools(ITool[] removed, ITool[] added, List<ITool> remainingRemoved, List<ITool> remainingAdded){
if(remainingAdded == null) // if(remainingAdded == null)
remainingAdded = new ArrayList<ITool>(added.length); // remainingAdded = new ArrayList<ITool>(added.length);
if(remainingRemoved == null) // if(remainingRemoved == null)
remainingRemoved = new ArrayList<ITool>(removed.length); // remainingRemoved = new ArrayList<ITool>(removed.length);
//
remainingAdded.clear(); // remainingAdded.clear();
remainingRemoved.clear(); // remainingRemoved.clear();
//
remainingAdded.addAll(Arrays.asList(added)); // remainingAdded.addAll(Arrays.asList(added));
remainingRemoved.addAll(Arrays.asList(removed)); // remainingRemoved.addAll(Arrays.asList(removed));
//
Map<ITool, ConverterInfo> resultMap = new HashMap<ITool, ConverterInfo>(); // Map<ITool, ConverterInfo> resultMap = new HashMap<ITool, ConverterInfo>();
//
for(Iterator<ITool> rIter = remainingRemoved.iterator(); rIter.hasNext();){ // for(Iterator<ITool> rIter = remainingRemoved.iterator(); rIter.hasNext();){
ITool r = rIter.next(); // ITool r = rIter.next();
//
if(r.getParentResourceInfo() != this) // if(r.getParentResourceInfo() != this)
continue; // continue;
//
if(ManagedBuildManager.getConversionElements(r).size() == 0) // if(ManagedBuildManager.getConversionElements(r).size() == 0)
continue; // continue;
//
for(Iterator<ITool> aIter = remainingAdded.iterator(); aIter.hasNext();){ // for(Iterator<ITool> aIter = remainingAdded.iterator(); aIter.hasNext();){
ITool a = aIter.next(); // ITool a = aIter.next();
//
if(a.getParentResourceInfo() == this) // if(a.getParentResourceInfo() == this)
continue; // continue;
//
IConfigurationElement el = getToolConverterElement(r, a); // IConfigurationElement el = getToolConverterElement(r, a);
if(el != null){ // if(el != null){
resultMap.put(r, new ConverterInfo(this, r, a, el)); // resultMap.put(r, new ConverterInfo(this, r, a, el));
rIter.remove(); // rIter.remove();
aIter.remove(); // aIter.remove();
break; // break;
} // }
} // }
} // }
//
return resultMap; // return resultMap;
} // }
private ITool[] calculateToolsArray(ITool[] removed, ITool[] added){ private ITool[] calculateToolsArray(ITool[] removed, ITool[] added){
LinkedHashMap<Object, ITool> map = createRealToExtToolMap(getTools(), false); LinkedHashMap<Object, ITool> map = createRealToExtToolMap(getTools(), false);
@ -1385,11 +1389,11 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
return false; return false;
} }
private IConfigurationElement getToolConverterElement(ITool fromTool, ITool toTool){ // private IConfigurationElement getToolConverterElement(ITool fromTool, ITool toTool){
ToolChain curTc = (ToolChain)getToolChain(); // ToolChain curTc = (ToolChain)getToolChain();
if(curTc != null){ // if(curTc != null){
return curTc.getConverterModificationElement(fromTool, toTool); // return curTc.getConverterModificationElement(fromTool, toTool);
} // }
return null; // return null;
} // }
} }