From c188c2200a7c53464491901b2ee320c72b455a07 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Sun, 17 Dec 2006 22:24:45 +0000 Subject: [PATCH] PR 131165 getBinaries() could return an empty list. --- .../eclipse/cdt/internal/core/model/BinaryContainer.java | 9 ++++++++- .../cdt/internal/core/model/BinaryContainerInfo.java | 7 ------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainer.java index b5a990423a1..5ad08b7f9a8 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainer.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainer.java @@ -27,8 +27,15 @@ public class BinaryContainer extends Openable implements IBinaryContainer { super (cProject, null, CCorePlugin.getResourceString("CoreModel.BinaryContainer.Binaries"), ICElement.C_VCONTAINER); //$NON-NLS-1$ } + synchronized void sync() { + BinaryRunner runner = CModelManager.getDefault().getBinaryRunner(getCProject()); + if (runner != null) { + runner.waitIfRunning(); + } + } + public IBinary[] getBinaries() throws CModelException { - ((BinaryContainerInfo)getElementInfo()).sync(); + sync(); ICElement[] e = getChildren(); ArrayList list = new ArrayList(e.length); for (int i = 0; i < e.length; i++) { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainerInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainerInfo.java index 8ab2c9b3949..cf3a74d2fcd 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainerInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainerInfo.java @@ -25,13 +25,6 @@ public class BinaryContainerInfo extends OpenableInfo { super(element); } - synchronized void sync() { - BinaryRunner runner = CModelManager.getDefault().getBinaryRunner(getElement().getCProject()); - if (runner != null) { - runner.waitIfRunning(); - } - } - /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CElementInfo#addChild(org.eclipse.cdt.core.model.ICElement) */