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

Bug 313431 - The Binaries folder in the C/C++ view disappears sometime

Browse source 
Change-Id: Iccde8b904de9ba4083ecd0471f9e14e12b54e62e
Signed-off-by: Anton Leherbauer <anton.leherbauer@windriver.com>
This commit is contained in:
Anton Leherbauer 2015-04-09 16:21:45 +02:00
parent 20328a9961
commit c0ce0a2b8c
2 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ArchiveContainer.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2008 QNX Software Systems and others. * Copyright (c) 2000, 2015 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -39,6 +39,20 @@ public class ArchiveContainer extends Openable implements IArchiveContainer {
return a; return a;
} }
@Override
public CElementInfo getElementInfo(IProgressMonitor monitor) throws CModelException {
CModelManager manager = CModelManager.getDefault();
synchronized (manager) {
CElementInfo info = (CElementInfo) manager.getInfo(this);
if (info != null) {
return info;
}
info = createElementInfo();
openWhenClosed(info, monitor);
return info;
}
}
@Override @Override
public CElementInfo createElementInfo() { public CElementInfo createElementInfo() {
return new ArchiveContainerInfo(this); return new ArchiveContainerInfo(this);

18
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainer.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2008 QNX Software Systems and others. * Copyright (c) 2000, 2015 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -31,7 +31,7 @@ public class BinaryContainer extends Openable implements IBinaryContainer {
super (cProject, null, CCorePlugin.getResourceString("CoreModel.BinaryContainer.Binaries"), ICElement.C_VCONTAINER); //$NON-NLS-1$ super (cProject, null, CCorePlugin.getResourceString("CoreModel.BinaryContainer.Binaries"), ICElement.C_VCONTAINER); //$NON-NLS-1$
} }
synchronized void sync() { void sync() {
BinaryRunner runner = CModelManager.getDefault().getBinaryRunner(getCProject()); BinaryRunner runner = CModelManager.getDefault().getBinaryRunner(getCProject());
if (runner != null) { if (runner != null) {
runner.waitIfRunning(); runner.waitIfRunning();
@ -56,6 +56,20 @@ public class BinaryContainer extends Openable implements IBinaryContainer {
return b; return b;
} }
@Override
public CElementInfo getElementInfo(IProgressMonitor monitor) throws CModelException {
CModelManager manager = CModelManager.getDefault();
synchronized (manager) {
CElementInfo info = (CElementInfo) manager.getInfo(this);
if (info != null) {
return info;
}
info = createElementInfo();
openWhenClosed(info, monitor);
return info;
}
}
@Override @Override
public CElementInfo createElementInfo() { public CElementInfo createElementInfo() {
return new BinaryContainerInfo(this); return new BinaryContainerInfo(this);