[cdt-patch] Applied Patch: Fix to core tests for external compiler

[Douglas Schaefer <dschaefe@xxxxxxxxxx>]

This patch addresses a problem I ran into when building the core.tests 
plugin using ant and with the jre 1.3 compiler.

Index: .classpath
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/.classpath,v
retrieving revision 1.5
diff -u -r1.5 .classpath
--- .classpath  27 Aug 2003 18:38:11 -0000      1.5
+++ .classpath  28 Aug 2003 17:34:38 -0000
@@ -12,11 +12,11 @@
     <classpathentry kind="src" path="/org.eclipse.core.resources"/>
     <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
     <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
     <classpathentry kind="src" path="/org.eclipse.swt"/>
     <classpathentry kind="src" path="/org.eclipse.ui"/>
     <classpathentry kind="src" path="/org.junit"/>
     <classpathentry kind="src" path="/org.eclipse.core.boot"/>
     <classpathentry kind="con" 
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+    <classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
Index: suite/org/eclipse/cdt/testplugin/CProjectHelper.java
===================================================================
RCS file: 
/home/tools/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/testplugin/CProjectHelper.java,v
retrieving revision 1.3
diff -u -r1.3 CProjectHelper.java
--- suite/org/eclipse/cdt/testplugin/CProjectHelper.java        11 Jul 
2003 18:59:28 -0000     1.3
+++ suite/org/eclipse/cdt/testplugin/CProjectHelper.java        28 Aug 
2003 17:34:43 -0000
@@ -5,16 +5,15 @@
 
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.CProjectNature;
+import org.eclipse.cdt.core.model.IArchive;
 import org.eclipse.cdt.core.model.IArchiveContainer;
+import org.eclipse.cdt.core.model.IBinary;
 import org.eclipse.cdt.core.model.IBinaryContainer;
 import org.eclipse.cdt.core.model.ICContainer;
+import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.core.model.ITranslationUnit;
-
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.core.model.IArchive;
-import org.eclipse.cdt.core.model.IBinary;
-import org.eclipse.core.resources.IContainer;
+import org.eclipse.cdt.internal.core.model.CModelManager;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
@@ -73,18 +72,18 @@
      */ 
     public static ICContainer addSourceContainer(ICProject cproject, 
String containerName) throws CoreException {
         IProject project= cproject.getProject();
-        IContainer container= null;
+        ICContainer container= null;
         if (containerName == null || containerName.length() == 0) {
-            container= project;
+            container= CModelManager.getDefault().create(project);
         } else {
             IFolder folder= project.getFolder(containerName);
             if (!folder.exists()) {
                 folder.create(false, true, null);
             }
-            container= folder;
+            container= CModelManager.getDefault().create(folder);
         }
 
-        return (ICContainer)container;
+               return container;
     }
 
     /**

Doug Schaefer, Senior Software Developer
IBM Rational Software, Ottawa, Ontario, Canada