Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Inglis2003-12-11 16:22:57 -0500
committerDavid Inglis2003-12-11 16:22:57 -0500
commitb67b0d913984470a1914d031e04d87a687a709e8 (patch)
treeb3c5d09d4d38b99a31c68e0563172f9d4e6f78f8
parent9b2e58256f50e3d37a9fb5656a22df8cf7b5656b (diff)
downloadorg.eclipse.cdt-b67b0d913984470a1914d031e04d87a687a709e8.tar.gz
org.eclipse.cdt-b67b0d913984470a1914d031e04d87a687a709e8.tar.xz
org.eclipse.cdt-b67b0d913984470a1914d031e04d87a687a709e8.zip
fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=48596
-rw-r--r--core/org.eclipse.cdt.core/ChangeLog5
-rw-r--r--core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java29
-rw-r--r--core/org.eclipse.cdt.ui/ChangeLog5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java4
4 files changed, 43 insertions, 0 deletions
diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index 6ebaec5e44b..4c5380f05c9 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-11 David Inglis
+ Fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=48596
+
+ * model/org/eclipse/cdt/internal/core/model/CModelManager.java
+
2003-12-04 David Inglis
Fixed bug #48063
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
index 1b20fe0c268..03debd7346d 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
@@ -337,6 +337,35 @@ public class CModelManager implements IResourceChangeListener {
}
}
}
+ } else {
+ ICProject cproject = celement.getCProject();
+ CProjectInfo info = (CProjectInfo)peekAtInfo(cproject);
+ if (info.vBin != null) {
+ if (peekAtInfo(info.vBin) != null) {
+ IBinary[] bins = info.vBin.getBinaries();
+ for (int i = 0; i < bins.length; i++) {
+ if (celement.getPath().isPrefixOf(bins[i].getPath())) {
+ CElementDelta delta = new CElementDelta(getCModel());
+ delta.changed(info.vBin, ICElementDelta.CHANGED);
+ registerCModelDelta(delta);
+ info.vBin.removeChild(bins[i]);
+ }
+ }
+ }
+ }
+ if (info.vLib != null) {
+ if (peekAtInfo(info.vLib) != null) {
+ IArchive[] ars = info.vLib.getArchives();
+ for (int i = 0; i < ars.length; i++) {
+ if (celement.getPath().isPrefixOf(ars[i].getPath())) {
+ CElementDelta delta = new CElementDelta(getCModel());
+ delta.changed(info.vLib, ICElementDelta.CHANGED);
+ registerCModelDelta(delta);
+ info.vLib.removeChild(ars[i]);
+ }
+ }
+ }
+ }
}
}
diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 11e7e12e565..f7203c56749 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-11 David Inglis
+ Fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=48596
+
+ * src/org/eclipse/cdt/ui/CElementContentProvider.java
+
2003-12-09 Hoda Amer
Added a method to return the created class element to the class wizard.
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java
index 9c87b4afc2f..f1f342cdc37 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java
@@ -18,6 +18,8 @@ import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.model.IElementChangedListener;
import org.eclipse.cdt.core.model.IParent;
import org.eclipse.cdt.core.model.ITranslationUnit;
+import org.eclipse.cdt.internal.core.model.ArchiveContainer;
+import org.eclipse.cdt.internal.core.model.BinaryContainer;
import org.eclipse.cdt.internal.ui.BaseCElementContentProvider;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceDelta;
@@ -125,6 +127,8 @@ public class CElementContentProvider extends BaseCElementContentProvider impleme
element instanceof IBinary || element instanceof IArchive) {
postRefresh(element);
return;
+ } else if (element instanceof ArchiveContainer || element instanceof BinaryContainer) {
+ postContainerRefresh((IParent) element, element.getCProject());
}
}

Back to the top