From 53596ee098dee4e4f8e96dd5b31b8fe6ff87f8b1 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Mon, 18 Jan 2010 21:23:11 +0000 Subject: [PATCH] cosmetics: dead code commented out --- .../internal/core/FolderInfo.java | 256 +++++++++--------- 1 file changed, 130 insertions(+), 126 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java index a2a28c86d80..3a6ec2428e1 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java @@ -74,7 +74,9 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo { IToolChain parTc = folderInfo.getToolChain(); 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) extTc = parTc; @@ -88,7 +90,9 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo { String subId = new String(); for (ITool tool : tools) { 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) extTool = tool; @@ -171,7 +175,9 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo { IToolChain cloneToolChain = cloneInfo.getToolChain(); 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(); @@ -207,7 +213,9 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo { ITargetPlatform tpBase = cloneInfo.getToolChain().getTargetPlatform(); 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; if(extTp != null){ @@ -470,7 +478,7 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo { Map map = new HashMap(ids.length); for(String id : ids){ IBuildProperty prop = props.getProperty(id); - map.put(id, props != null ? prop.getValue().getId() : null); + map.put(id, prop.getValue().getId()); } return map; } @@ -662,15 +670,12 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo { if(curReal == newReal) return true; - if(tCh != null){ - if(getToolChainConverterInfo(fromTc, tCh) != null) - compatible = true; - - if(!compatible) - compatible = isPropertiesModificationCompatible(tCh); - } else { - compatible = fromTc != null && fromTc.isPreferenceToolChain(); - } + if(getToolChainConverterInfo(fromTc, tCh) != null) + compatible = true; + + if(!compatible) + compatible = isPropertiesModificationCompatible(tCh); + return compatible; } @@ -901,62 +906,61 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo { } public void modifyToolChain(ITool[] removed, ITool[] added){ - if(true){ - ToolListModificationInfo info = ToolChainModificationHelper.getModificationInfo(this, getTools(), added, removed); - info.apply(); - return; - } - ITool[][] checked = checkDups(removed, added); - removed = checked[0]; - added = checked[1]; - if(added.length == 0 && removed.length == 0) - return; - - List remainingRemoved = new ArrayList(); - List remainingAdded = new ArrayList(); - Map converterMap = - calculateConverterTools(removed, added, remainingRemoved, remainingAdded); - invokeConverters(converterMap); - List newTools = new ArrayList(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()); - } - } + ToolListModificationInfo info = ToolChainModificationHelper.getModificationInfo(this, getTools(), added, removed); + info.apply(); + return; - 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()])); +// ITool[][] checked = checkDups(removed, added); +// removed = checked[0]; +// added = checked[1]; +// if(added.length == 0 && removed.length == 0) +// return; +// +// List remainingRemoved = new ArrayList(); +// List remainingAdded = new ArrayList(); +// Map converterMap = +// calculateConverterTools(removed, added, remainingRemoved, remainingAdded); +// invokeConverters(converterMap); +// List newTools = new ArrayList(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){ - BuildSettingsUtil.disconnectDepentents(getParent(), removed); - - for (ITool tool : removed) { - toolChain.removeTool((Tool)tool); - } - - for (ITool tool : added) { - toolChain.addTool((Tool)tool); - } - - adjustTargetTools(removed, added); - - toolChain.propertiesChanged(); - } +// private void performToolChainModification(ITool removed[], ITool[] added){ +// BuildSettingsUtil.disconnectDepentents(getParent(), removed); +// +// for (ITool tool : removed) { +// toolChain.removeTool((Tool)tool); +// } +// +// for (ITool tool : added) { +// toolChain.addTool((Tool)tool); +// } +// +// adjustTargetTools(removed, added); +// +// toolChain.propertiesChanged(); +// } private void adjustTargetTools(ITool removed[], ITool added[]){ if(!isRoot()) @@ -1066,59 +1070,59 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo { return null; } - private List invokeConverters(Map converterMap){ - List failed = new ArrayList(); - for(ConverterInfo info : converterMap.values()){ - IBuildObject converted = info.getConvertedFromObject(); - if(converted == null || - !converted.getClass().equals(info.getFromObject().getClass())){ - failed.add(info); - } - } - return failed; - } +// private List invokeConverters(Map converterMap){ +// List failed = new ArrayList(); +// for(ConverterInfo info : converterMap.values()){ +// IBuildObject converted = info.getConvertedFromObject(); +// if(converted == null || +// !converted.getClass().equals(info.getFromObject().getClass())){ +// failed.add(info); +// } +// } +// return failed; +// } - private Map calculateConverterTools(ITool[] removed, ITool[] added, List remainingRemoved, List remainingAdded){ - if(remainingAdded == null) - remainingAdded = new ArrayList(added.length); - if(remainingRemoved == null) - remainingRemoved = new ArrayList(removed.length); - - remainingAdded.clear(); - remainingRemoved.clear(); - - remainingAdded.addAll(Arrays.asList(added)); - remainingRemoved.addAll(Arrays.asList(removed)); - - Map resultMap = new HashMap(); - - for(Iterator rIter = remainingRemoved.iterator(); rIter.hasNext();){ - ITool r = rIter.next(); - - if(r.getParentResourceInfo() != this) - continue; - - if(ManagedBuildManager.getConversionElements(r).size() == 0) - continue; - - for(Iterator aIter = remainingAdded.iterator(); aIter.hasNext();){ - ITool a = aIter.next(); - - if(a.getParentResourceInfo() == this) - continue; - - IConfigurationElement el = getToolConverterElement(r, a); - if(el != null){ - resultMap.put(r, new ConverterInfo(this, r, a, el)); - rIter.remove(); - aIter.remove(); - break; - } - } - } - - return resultMap; - } +// private Map calculateConverterTools(ITool[] removed, ITool[] added, List remainingRemoved, List remainingAdded){ +// if(remainingAdded == null) +// remainingAdded = new ArrayList(added.length); +// if(remainingRemoved == null) +// remainingRemoved = new ArrayList(removed.length); +// +// remainingAdded.clear(); +// remainingRemoved.clear(); +// +// remainingAdded.addAll(Arrays.asList(added)); +// remainingRemoved.addAll(Arrays.asList(removed)); +// +// Map resultMap = new HashMap(); +// +// for(Iterator rIter = remainingRemoved.iterator(); rIter.hasNext();){ +// ITool r = rIter.next(); +// +// if(r.getParentResourceInfo() != this) +// continue; +// +// if(ManagedBuildManager.getConversionElements(r).size() == 0) +// continue; +// +// for(Iterator aIter = remainingAdded.iterator(); aIter.hasNext();){ +// ITool a = aIter.next(); +// +// if(a.getParentResourceInfo() == this) +// continue; +// +// IConfigurationElement el = getToolConverterElement(r, a); +// if(el != null){ +// resultMap.put(r, new ConverterInfo(this, r, a, el)); +// rIter.remove(); +// aIter.remove(); +// break; +// } +// } +// } +// +// return resultMap; +// } private ITool[] calculateToolsArray(ITool[] removed, ITool[] added){ LinkedHashMap map = createRealToExtToolMap(getTools(), false); @@ -1385,11 +1389,11 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo { return false; } - private IConfigurationElement getToolConverterElement(ITool fromTool, ITool toTool){ - ToolChain curTc = (ToolChain)getToolChain(); - if(curTc != null){ - return curTc.getConverterModificationElement(fromTool, toTool); - } - return null; - } +// private IConfigurationElement getToolConverterElement(ITool fromTool, ITool toTool){ +// ToolChain curTc = (ToolChain)getToolChain(); +// if(curTc != null){ +// return curTc.getConverterModificationElement(fromTool, toTool); +// } +// return null; +// } }