mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 17:26:01 +02:00
Code Issues Wiki Activity

Removed most usage of internal classes in favor of public interfaces. Removed some invalid tests. Come code formating cleanups.

Browse source
This commit is contained in:
Peter Graves 2002-09-30 19:43:26 +00:00
parent 1fc9b37e74
commit 3b3e71a2a1
5 changed files with 289 additions and 593 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java
View file

@ -16,7 +16,7 @@ import org.eclipse.cdt.testplugin.util.*;
import org.eclipse.cdt.core.model.*; import org.eclipse.cdt.core.model.*;
import org.eclipse.core.resources.*; import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.*;
import org.eclipse.cdt.internal.core.model.*;
/** /**
@ -131,109 +131,9 @@ public class ArchiveTests extends TestCase {
} }
/***
* This is a simple test to make sure we can not create an Archive with
* a non-archive Ifile/IPath
* Note: This test is of questionable merit, as people should always be
* getting their binaries from the project, not creating them themselves
*/
public void testArchive() throws CoreException {
Archive myArchive;
boolean caught;
myArchive=null;
caught=false;
try {
myArchive=new Archive(testProject, cfile);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("PR:23601 Created an archive with a C file", caught);
myArchive=null;
caught=false;
try {
myArchive=new Archive(testProject, cpath);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an archive with a C file", caught);
myArchive=null;
caught=false;
try {
myArchive=new Archive(testProject, objfile);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an archive with a .o file", caught);
myArchive=null;
caught=false;
try {
myArchive=new Archive(testProject, objpath);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an archive with a .o file", caught);
myArchive=null;
caught=false;
try {
myArchive=new Archive(testProject, exefile);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an archive with a exe file", caught);
myArchive=null;
caught=false;
try {
myArchive=new Archive(testProject, exepath);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an archive with a exe file", caught);
myArchive=null;
caught=false;
try {
myArchive=new Archive(testProject, libfile);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an archive with a .so file", caught);
myArchive=null;
caught=false;
try {
myArchive=new Archive(testProject, libpath);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an archive with a .so file", caught);
myArchive=null;
caught=false;
try {
myArchive=new Archive(testProject, archfile);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an archive with a .a file", !caught);
myArchive=null;
caught=false;
try {
myArchive=new Archive(testProject, archpath);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an archive with a .a file", !caught);
}
public void testGetBinaries() throws CoreException,FileNotFoundException { public void testGetBinaries() throws CoreException,FileNotFoundException {
Archive myArchive; IArchive myArchive;
IBinary[] bins; IBinary[] bins;
ICElement[] elements; ICElement[] elements;
ExpectedStrings expBin, expObj[]; ExpectedStrings expBin, expObj[];
@ -287,7 +187,7 @@ public class ArchiveTests extends TestCase {
* *
*/ */
public void testIsArchive() throws CoreException,FileNotFoundException { public void testIsArchive() throws CoreException,FileNotFoundException {
Archive myArchive; IArchive myArchive;
myArchive=CProjectHelper.findArchive(testProject, "libtestlib_g.a"); myArchive=CProjectHelper.findArchive(testProject, "libtestlib_g.a");
assertTrue("A archive", myArchive.isArchive()); assertTrue("A archive", myArchive.isArchive());

136
core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/BinaryTests.java
View file

@ -16,7 +16,7 @@ import org.eclipse.cdt.testplugin.util.*;
import org.eclipse.cdt.core.model.*; import org.eclipse.cdt.core.model.*;
import org.eclipse.core.resources.*; import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.*;
import org.eclipse.cdt.internal.core.model.*;
/** /**
@ -176,112 +176,12 @@ public class BinaryTests extends TestCase {
} }
/***
* This is a simple test to make sure we can not create a Binary with
* a non-binary Ifile/IPath
* Note: This test is of questionable merit, as people should always be
* getting their archives from the project, not creating them themselves
*/
public void testBinary() throws CoreException {
Binary myBinary;
boolean caught;
myBinary=null;
caught=false;
try {
myBinary=new Binary(testProject, cfile);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("PR:23601 Created an Binary with a C file", caught);
myBinary=null;
caught=false;
try {
myBinary=new Binary(testProject, cpath);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an Binary with a C file", caught);
myBinary=null;
caught=false;
try {
myBinary=new Binary(testProject, objfile);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an Binary with a .o file", !caught);
myBinary=null;
caught=false;
try {
myBinary=new Binary(testProject, objpath);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an Binary with a .o file", !caught);
myBinary=null;
caught=false;
try {
myBinary=new Binary(testProject, exefile);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an Binary with a exe file", !caught);
myBinary=null;
caught=false;
try {
myBinary=new Binary(testProject, exepath);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an Binary with a exe file", !caught);
myBinary=null;
caught=false;
try {
myBinary=new Binary(testProject, libfile);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an Binary with a .so file", caught);
myBinary=null;
caught=false;
try {
myBinary=new Binary(testProject, libpath);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an Binary with a .so file", caught);
myBinary=null;
caught=false;
try {
myBinary=new Binary(testProject, archfile);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an Binary with a .a file", !caught);
myBinary=null;
caught=false;
try {
myBinary=new Binary(testProject, archpath);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an Binary with a .a file", !caught);
}
/**** /****
* Simple tests to make sure we can get all of a binarys children * Simple tests to make sure we can get all of a binarys children
*/ */
public void testGetChildren() throws CoreException,FileNotFoundException { public void testGetChildren() throws CoreException,FileNotFoundException {
Binary myBinary; IBinary myBinary;
ICElement[] elements; ICElement[] elements;
ExpectedStrings expSyms; ExpectedStrings expSyms;
String[] myStrings = {"atexit", "exit", "_init_libc", "printf", "_fini", String[] myStrings = {"atexit", "exit", "_init_libc", "printf", "_fini",
@ -290,7 +190,7 @@ public class BinaryTests extends TestCase {
expSyms=new ExpectedStrings(myStrings); expSyms=new ExpectedStrings(myStrings);
/*** /***
* Grab the Binary we want to test, and find all the elements in all * Grab the IBinary we want to test, and find all the elements in all
* the binarie and make sure we get everything we expect. * the binarie and make sure we get everything we expect.
*/ */
myBinary=CProjectHelper.findBinary(testProject, "test_g"); myBinary=CProjectHelper.findBinary(testProject, "test_g");
@ -307,7 +207,7 @@ public class BinaryTests extends TestCase {
* A quick check to make sure the getBSS function works as expected. * A quick check to make sure the getBSS function works as expected.
*/ */
public void testGetBss(){ public void testGetBss(){
Binary bigBinary,littleBinary; IBinary bigBinary,littleBinary;
bigBinary=CProjectHelper.findBinary(testProject, "exebig_g"); bigBinary=CProjectHelper.findBinary(testProject, "exebig_g");
littleBinary=CProjectHelper.findBinary(testProject, "test_g"); littleBinary=CProjectHelper.findBinary(testProject, "test_g");
@ -318,7 +218,7 @@ public class BinaryTests extends TestCase {
* A quick check to make sure the getBSS function works as expected. * A quick check to make sure the getBSS function works as expected.
*/ */
public void testGetData(){ public void testGetData(){
Binary bigBinary,littleBinary; IBinary bigBinary,littleBinary;
bigBinary=CProjectHelper.findBinary(testProject, "exebig_g"); bigBinary=CProjectHelper.findBinary(testProject, "exebig_g");
littleBinary=CProjectHelper.findBinary(testProject, "test_g"); littleBinary=CProjectHelper.findBinary(testProject, "test_g");
if (false) { if (false) {
@ -340,11 +240,11 @@ public class BinaryTests extends TestCase {
* This is not a in depth test at all. * This is not a in depth test at all.
*/ */
public void testGetCpu() { public void testGetCpu() {
Binary myBinary; IBinary myBinary;
myBinary=CProjectHelper.findBinary(testProject, "exebig_g"); myBinary=CProjectHelper.findBinary(testProject, "exebig_g");
assertTrue("Expected: x86 Got: " + myBinary.getCPU(),myBinary.getCPU().equals("x86")); assertTrue("Expected: x86 Got: " + myBinary.getCPU(),myBinary.getCPU().equals("x86"));
myBinary=new Binary(testProject, ppcexefile); myBinary=CProjectHelper.findBinary(testProject, ppcexefile.toString());
assertTrue("Expected: ppcbe Got: " + myBinary.getCPU(),myBinary.getCPU().equals("ppcbe")); assertTrue("Expected: ppcbe Got: " + myBinary.getCPU(),myBinary.getCPU().equals("ppcbe"));
} }
@ -353,7 +253,7 @@ public class BinaryTests extends TestCase {
* A set of simple tests to make sute getNeededSharedLibs seems to be sane * A set of simple tests to make sute getNeededSharedLibs seems to be sane
*/ */
public void testGetNeededSharedLibs() { public void testGetNeededSharedLibs() {
Binary myBinary; IBinary myBinary;
String[] exelibs={"libsocket.so.2", "libc.so.2"}; String[] exelibs={"libsocket.so.2", "libc.so.2"};
String[] bigexelibs={"libc.so.2"}; String[] bigexelibs={"libc.so.2"};
String[] gotlibs; String[] gotlibs;
@ -393,7 +293,7 @@ public class BinaryTests extends TestCase {
* Simple tests for the getSoname method; * Simple tests for the getSoname method;
*/ */
public void testGetSoname() { public void testGetSoname() {
Binary myBinary; IBinary myBinary;
String name; String name;
myBinary=CProjectHelper.findBinary(testProject, "test_g"); myBinary=CProjectHelper.findBinary(testProject, "test_g");
assertTrue(myBinary.getSoname().equals("")); assertTrue(myBinary.getSoname().equals(""));
@ -410,9 +310,9 @@ public class BinaryTests extends TestCase {
* Simple tests for getText * Simple tests for getText
*/ */
public void testGetText() { public void testGetText() {
Binary bigBinary,littleBinary; IBinary bigBinary,littleBinary;
bigBinary=new Binary(testProject, bigexe); bigBinary=CProjectHelper.findBinary(testProject, bigexe.toString());
littleBinary=new Binary(testProject, exefile); littleBinary=CProjectHelper.findBinary(testProject, exefile.toString());
if (false) { if (false) {
/**** /****
* Since there is no comment on this function, I have no idea what * Since there is no comment on this function, I have no idea what
@ -431,7 +331,7 @@ public class BinaryTests extends TestCase {
* Simple tests for the hadDebug call * Simple tests for the hadDebug call
*/ */
public void testHasDebug() { public void testHasDebug() {
Binary myBinary; IBinary myBinary;
myBinary = CProjectHelper.findBinary(testProject, "test_g"); myBinary = CProjectHelper.findBinary(testProject, "test_g");
assertTrue(myBinary.hasDebug()); assertTrue(myBinary.hasDebug());
myBinary = CProjectHelper.findBinary(testProject, "libtestlib_g.so"); myBinary = CProjectHelper.findBinary(testProject, "libtestlib_g.so");
@ -444,7 +344,7 @@ public class BinaryTests extends TestCase {
* Sanity - isBinary and isReadonly should always return true; * Sanity - isBinary and isReadonly should always return true;
*/ */
public void testisBinRead() { public void testisBinRead() {
Binary myBinary; IBinary myBinary;
myBinary =CProjectHelper.findBinary(testProject, "test_g"); myBinary =CProjectHelper.findBinary(testProject, "test_g");
assertTrue(myBinary.isBinary()); assertTrue(myBinary.isBinary());
assertTrue(myBinary.isReadOnly()); assertTrue(myBinary.isReadOnly());
@ -455,7 +355,7 @@ public class BinaryTests extends TestCase {
* Quick tests to make sure isObject works as expected. * Quick tests to make sure isObject works as expected.
*/ */
public void testIsObject() { public void testIsObject() {
Binary myBinary; IBinary myBinary;
myBinary=CProjectHelper.findObject(testProject, "exetest.o"); myBinary=CProjectHelper.findObject(testProject, "exetest.o");
assertTrue(myBinary.isObject()); assertTrue(myBinary.isObject());
@ -475,7 +375,7 @@ public class BinaryTests extends TestCase {
* Quick tests to make sure isSharedLib works as expected. * Quick tests to make sure isSharedLib works as expected.
*/ */
public void testIsSharedLib() { public void testIsSharedLib() {
Binary myBinary; IBinary myBinary;
myBinary=CProjectHelper.findObject(testProject, "exetest.o"); myBinary=CProjectHelper.findObject(testProject, "exetest.o");
assertTrue(!myBinary.isSharedLib()); assertTrue(!myBinary.isSharedLib());
@ -496,7 +396,7 @@ public class BinaryTests extends TestCase {
* Quick tests to make sure isExecutable works as expected. * Quick tests to make sure isExecutable works as expected.
*/ */
public void testIsExecutable() throws InterruptedException { public void testIsExecutable() throws InterruptedException {
Binary myBinary; IBinary myBinary;
myBinary=CProjectHelper.findObject(testProject, "exetest.o"); myBinary=CProjectHelper.findObject(testProject, "exetest.o");
assertTrue(!myBinary.isExecutable()); assertTrue(!myBinary.isExecutable());
@ -517,7 +417,7 @@ public class BinaryTests extends TestCase {
* *
*/ */
public void testIsBinary() throws CoreException,FileNotFoundException,Exception { public void testIsBinary() throws CoreException,FileNotFoundException,Exception {
Binary myBinary; IBinary myBinary;
myBinary=CProjectHelper.findBinary(testProject, "exebig_g"); myBinary=CProjectHelper.findBinary(testProject, "exebig_g");
assertTrue("A Binary", myBinary.isBinary()); assertTrue("A Binary", myBinary.isBinary());

5
core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/FlagTests.java
View file

@ -10,8 +10,9 @@ package org.eclipse.cdt.core.model.tests;
import junit.framework.TestCase; import junit.framework.TestCase;
import junit.framework.TestSuite; import junit.framework.TestSuite;
import org.eclipse.cdt.core.model.*; import org.eclipse.cdt.core.model.Flags;
import org.eclipse.cdt.internal.core.model.*; import org.eclipse.cdt.internal.core.model.IConstants;
/** /**
* @author Peter Graves * @author Peter Graves
* *

116
core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitTests.java
View file

@ -8,7 +8,6 @@ package org.eclipse.cdt.core.model.tests;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Stack; import java.util.Stack;
import junit.framework.TestCase; import junit.framework.TestCase;
@ -18,7 +17,7 @@ import org.eclipse.cdt.testplugin.util.*;
import org.eclipse.cdt.core.model.*; import org.eclipse.cdt.core.model.*;
import org.eclipse.core.resources.*; import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.*;
import org.eclipse.cdt.internal.core.model.*;
/** /**
@ -155,101 +154,6 @@ public class TranslationUnitTests extends TestCase {
} }
/***
* This is a simple test to make sure we can not create an TranslationUnit with
* a non-TranslationUnit Ifile/IPath
*/
public void testTranslationUnit() throws CoreException {
TranslationUnit myTranslationUnit;
boolean caught;
myTranslationUnit=null;
caught=false;
try {
myTranslationUnit=new TranslationUnit(testProject, cfile);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an TranslationUnit with a C file", !caught);
myTranslationUnit=null;
caught=false;
try {
myTranslationUnit=new TranslationUnit(testProject, cpath);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an TranslationUnit with a C file", !caught);
myTranslationUnit=null;
caught=false;
try {
myTranslationUnit=new TranslationUnit(testProject, objfile);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("PR:23601 Created an TranslationUnit with a .o file", caught);
myTranslationUnit=null;
caught=false;
try {
myTranslationUnit=new TranslationUnit(testProject, objpath);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an TranslationUnit with a .o file", caught);
myTranslationUnit=null;
caught=false;
try {
myTranslationUnit=new TranslationUnit(testProject, exefile);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an TranslationUnit with a exe file", caught);
myTranslationUnit=null;
caught=false;
try {
myTranslationUnit=new TranslationUnit(testProject, exepath);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an TranslationUnit with a exe file", caught);
myTranslationUnit=null;
caught=false;
try {
myTranslationUnit=new TranslationUnit(testProject, libfile);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an TranslationUnit with a .so file", caught);
myTranslationUnit=null;
caught=false;
try {
myTranslationUnit=new TranslationUnit(testProject, libpath);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an TranslationUnit with a .so file", caught);
myTranslationUnit=null;
caught=false;
try {
myTranslationUnit=new TranslationUnit(testProject, archfile);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an TranslationUnit with a .a file", caught);
myTranslationUnit=null;
caught=false;
try {
myTranslationUnit=new TranslationUnit(testProject, archpath);
} catch (IllegalArgumentException e) {
caught=true;
}
assertTrue("Created an TranslationUnit with a .a file", caught);
}
/*** /***
@ -257,7 +161,7 @@ public class TranslationUnitTests extends TestCase {
* *
*/ */
public void testIsTranslationUnit() throws CoreException,FileNotFoundException { public void testIsTranslationUnit() throws CoreException,FileNotFoundException {
TranslationUnit myTranslationUnit; ITranslationUnit myTranslationUnit;
myTranslationUnit=CProjectHelper.findTranslationUnit(testProject,"exetest.c"); myTranslationUnit=CProjectHelper.findTranslationUnit(testProject,"exetest.c");
assertTrue("A TranslationUnit", myTranslationUnit.isTranslationUnit()); assertTrue("A TranslationUnit", myTranslationUnit.isTranslationUnit());
@ -269,7 +173,7 @@ public class TranslationUnitTests extends TestCase {
* basicly work * basicly work
*/ */
public void testGetChildern() { public void testGetChildern() {
TranslationUnit myTranslationUnit; ITranslationUnit myTranslationUnit;
ICElement[] elements; ICElement[] elements;
int x; int x;
@ -292,8 +196,8 @@ public class TranslationUnitTests extends TestCase {
/*** /***
* Simple sanity tests for the getElement() call * Simple sanity tests for the getElement() call
*/ */
public void testGetElement() { public void testGetElement() throws CModelException {
TranslationUnit myTranslationUnit; ITranslationUnit myTranslationUnit;
ICElement myElement; ICElement myElement;
Stack missing=new Stack(); Stack missing=new Stack();
int x; int x;
@ -321,7 +225,7 @@ public class TranslationUnitTests extends TestCase {
* Simple sanity tests for the getElementAtLine() call * Simple sanity tests for the getElementAtLine() call
*/ */
public void testGetElementAtLine() throws CoreException { public void testGetElementAtLine() throws CoreException {
TranslationUnit myTranslationUnit; ITranslationUnit myTranslationUnit;
ICElement myElement; ICElement myElement;
Stack missing=new Stack(); Stack missing=new Stack();
int x; int x;
@ -355,13 +259,13 @@ public class TranslationUnitTests extends TestCase {
* Simple sanity tests for the getInclude call * Simple sanity tests for the getInclude call
*/ */
public void testGetInclude() { public void testGetInclude() {
Include myInclude; IInclude myInclude;
int x; int x;
String includes[]={"stdio.h", "unistd.h"}; String includes[]={"stdio.h", "unistd.h"};
TranslationUnit myTranslationUnit=CProjectHelper.findTranslationUnit(testProject,"exetest.c"); ITranslationUnit myTranslationUnit=CProjectHelper.findTranslationUnit(testProject,"exetest.c");
for (x=0;x<includes.length;x++) { for (x=0;x<includes.length;x++) {
myInclude=(Include)myTranslationUnit.getInclude(includes[x]); myInclude=myTranslationUnit.getInclude(includes[x]);
if (myInclude==null) if (myInclude==null)
fail("Unable to get include: " + includes[x]); fail("Unable to get include: " + includes[x]);
else else
@ -378,7 +282,7 @@ public class TranslationUnitTests extends TestCase {
String includes[]={"stdio.h", "unistd.h"}; String includes[]={"stdio.h", "unistd.h"};
ExpectedStrings myExp= new ExpectedStrings(includes); ExpectedStrings myExp= new ExpectedStrings(includes);
int x; int x;
TranslationUnit myTranslationUnit=CProjectHelper.findTranslationUnit(testProject,"exetest.c"); ITranslationUnit myTranslationUnit=CProjectHelper.findTranslationUnit(testProject,"exetest.c");
fail("PR:23478 Unable to test because we can't get the name of an include file"); fail("PR:23478 Unable to test because we can't get the name of an include file");
myIncludes=myTranslationUnit.getIncludes(); myIncludes=myTranslationUnit.getIncludes();

51
core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/CProjectHelper.java
View file

@ -7,14 +7,13 @@ import java.util.zip.ZipFile;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.CProjectNature; import org.eclipse.cdt.core.CProjectNature;
import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.IArchiveContainer;
import org.eclipse.cdt.core.model.IBinaryContainer;
import org.eclipse.cdt.core.model.ICFolder; import org.eclipse.cdt.core.model.ICFolder;
import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.internal.core.model.Archive; import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.internal.core.model.Binary;
import org.eclipse.cdt.internal.core.model.BinaryContainer;
import org.eclipse.cdt.internal.core.model.TranslationUnit;
import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.internal.core.model.ArchiveContainer;
import org.eclipse.cdt.core.model.IArchive; import org.eclipse.cdt.core.model.IArchive;
import org.eclipse.cdt.core.model.IBinary; import org.eclipse.cdt.core.model.IBinary;
import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IContainer;
@ -141,28 +140,24 @@ public class CProjectHelper {
/** /**
* Attempts to find an archive with the given name in the workspace * Attempts to find an archive with the given name in the workspace
*/ */
public static Archive findArchive(ICProject testProject,String name) { public static IArchive findArchive(ICProject testProject,String name) {
int x; int x;
IArchive[] myArchives; IArchive[] myArchives;
ArchiveContainer archCont; IArchiveContainer archCont;
/*** /***
* Since ArchiveContainer.getArchives does not wait until * Since ArchiveContainer.getArchives does not wait until
* all the archives in the project have been parsed before * all the archives in the project have been parsed before
* returning the list, we have to do a sync ArchiveContainer.getChildren * returning the list, we have to do a sync ArchiveContainer.getChildren
* first to make sure we find all the archives. * first to make sure we find all the archives.
*/ */
archCont=(ArchiveContainer)testProject.getArchiveContainer(); archCont=testProject.getArchiveContainer();
archCont.getChildren(true);
myArchives=testProject.getArchiveContainer().getArchives(); myArchives=archCont.getArchives();
if (myArchives.length<1) if (myArchives.length<1)
return(null); return(null);
for (x=0;x<myArchives.length;x++) { for (x=0;x<myArchives.length;x++) {
if (myArchives[x].getElementName().equals(name)) if (myArchives[x].getElementName().equals(name))
if (myArchives[x] instanceof Archive) { return(myArchives[x]);
return((Archive) myArchives[x]);
}
} }
return(null); return(null);
@ -170,22 +165,18 @@ public class CProjectHelper {
/** /**
* Attempts to find a binary with the given name in the workspace * Attempts to find a binary with the given name in the workspace
*/ */
public static Binary findBinary(ICProject testProject,String name) { public static IBinary findBinary(ICProject testProject,String name) {
BinaryContainer binCont; IBinaryContainer binCont;
int x; int x;
IBinary[] myBinaries; IBinary[] myBinaries;
binCont=(BinaryContainer)testProject.getBinaryContainer(); binCont=testProject.getBinaryContainer();
/* Make sure we wait for the childern to be parsed, see comment about
* ArchiveContainer.getArchives() above */
binCont.getChildren(true);
myBinaries=binCont.getBinaries(); myBinaries=binCont.getBinaries();
if (myBinaries.length<1) if (myBinaries.length<1)
return(null); return(null);
for (x=0;x<myBinaries.length;x++) { for (x=0;x<myBinaries.length;x++) {
if (myBinaries[x].getElementName().equals(name)) if (myBinaries[x].getElementName().equals(name))
if (myBinaries[x] instanceof Binary) { return(myBinaries[x]);
return((Binary) myBinaries[x]);
}
} }
@ -195,7 +186,7 @@ public class CProjectHelper {
/** /**
* Attempts to find an object with the given name in the workspace * Attempts to find an object with the given name in the workspace
*/ */
public static Binary findObject(ICProject testProject,String name) { public static IBinary findObject(ICProject testProject,String name) {
int x; int x;
ICElement[] myElements; ICElement[] myElements;
myElements=testProject.getChildren(); myElements=testProject.getChildren();
@ -204,8 +195,8 @@ public class CProjectHelper {
for (x=0;x<myElements.length;x++) { for (x=0;x<myElements.length;x++) {
if (myElements[x].getElementName().equals(name)) if (myElements[x].getElementName().equals(name))
if (myElements[x] instanceof ICElement) { if (myElements[x] instanceof ICElement) {
if (myElements[x] instanceof Binary) { if (myElements[x] instanceof IBinary) {
return((Binary) myElements[x]); return((IBinary) myElements[x]);
} }
} }
} }
@ -214,7 +205,7 @@ public class CProjectHelper {
/** /**
* Attempts to find a TranslationUnit with the given name in the workspace * Attempts to find a TranslationUnit with the given name in the workspace
*/ */
public static TranslationUnit findTranslationUnit(ICProject testProject,String name) { public static ITranslationUnit findTranslationUnit(ICProject testProject,String name) {
int x; int x;
ICElement[] myElements; ICElement[] myElements;
myElements=testProject.getChildren(); myElements=testProject.getChildren();
@ -223,8 +214,8 @@ public class CProjectHelper {
for (x=0;x<myElements.length;x++) { for (x=0;x<myElements.length;x++) {
if (myElements[x].getElementName().equals(name)) if (myElements[x].getElementName().equals(name))
if (myElements[x] instanceof ICElement) { if (myElements[x] instanceof ICElement) {
if (myElements[x] instanceof TranslationUnit) { if (myElements[x] instanceof ITranslationUnit) {
return((TranslationUnit) myElements[x]); return((ITranslationUnit) myElements[x]);
} }
} }
} }