From eff3096b2891da51703ec50db5ae9c8ccc3658cf Mon Sep 17 00:00:00 2001 From: Alena Laskavaia Date: Fri, 12 Dec 2008 14:19:36 +0000 Subject: [PATCH] 242403 - applied patch to solve ClassCastException --- .../internal/core/MultiResourceInfo.java | 26 +++++++---- .../internal/core/PluginResources.properties | 1 + .../ui/properties/BuildOptionSettingsUI.java | 45 ++++++++++++++----- 3 files changed, 52 insertions(+), 20 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/MultiResourceInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/MultiResourceInfo.java index 1d02c115fe5..7a91af78cdd 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/MultiResourceInfo.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/MultiResourceInfo.java @@ -15,10 +15,12 @@ import org.eclipse.cdt.core.settings.model.extension.CLanguageData; import org.eclipse.cdt.core.settings.model.extension.CResourceData; import org.eclipse.cdt.managedbuilder.core.BuildException; import org.eclipse.cdt.managedbuilder.core.IConfiguration; +import org.eclipse.cdt.managedbuilder.core.IFolderInfo; import org.eclipse.cdt.managedbuilder.core.IHoldsOptions; import org.eclipse.cdt.managedbuilder.core.IOption; import org.eclipse.cdt.managedbuilder.core.IResourceInfo; import org.eclipse.cdt.managedbuilder.core.ITool; +import org.eclipse.cdt.managedbuilder.core.IToolChain; import org.eclipse.cdt.managedbuilder.core.OptionStringValue; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.PluginVersionIdentifier; @@ -228,25 +230,33 @@ public abstract class MultiResourceInfo extends MultiItemsHolder implements String sid = getSuperClassId(option); for (int i=0; i(); private IOptionCategory category; private IHoldsOptions optionHolder; + /** Option Holders involved */ private IHoldsOptions[] ohs; - private int curr; + /** The index of the current IHoldsOptions in ohs */ + private int curr = -1; private Map fieldEditorsToParentMap = new HashMap(); @@ -69,25 +72,43 @@ public class BuildOptionSettingsUI extends AbstractToolSettingUI { MultiResourceInfo mri = (MultiResourceInfo)info; IResourceInfo[] ris = (IResourceInfo[])mri.getItems(); String id = category.getId(); - String ext = ((ITool)optionHolder).getDefaultInputExtension(); - ArrayList lst = new ArrayList(); - for (int i=0; i lst = new ArrayList(); + if (optionHolder instanceof ITool) { + String ext = ((ITool)optionHolder).getDefaultInputExtension(); + for (int i=0; i