Changed all QNX pr numbers to bugzilla pr numbers.

General code cleanup (removed unused imports/variables, etc)

5 files changed, 0 insertions, 20 deletions

diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/CProjectHelper.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/CProjectHelper.java
index 0c295a28bd3..29546a7b5d8 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/CProjectHelper.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/CProjectHelper.java
@@ -1,11 +1,7 @@
 package org.eclipse.cdt.testplugin;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
 import java.util.zip.ZipFile;
 
 import org.eclipse.cdt.core.CCorePlugin;
@@ -21,9 +17,7 @@ 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.IBinary;
-import org.eclipse.cdt.internal.core.model.CModelManager;
 import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
@@ -148,7 +142,6 @@ public class CProjectHelper {
 	 * Attempts to find an archive with the given name in the workspace
 	 */
 	public static Archive findArchive(ICProject testProject,String name) {
-		Archive myArchive;
 		int x;
 	   	IArchive[] myArchives;
 		ArchiveContainer archCont;
@@ -163,7 +156,6 @@ public class CProjectHelper {
 		myArchives=testProject.getArchiveContainer().getArchives();
 		if (myArchives.length<1) 
 			return(null);
-		myArchive=null;
 		for (x=0;x<myArchives.length;x++) {
 			if (myArchives[x].getElementName().equals(name))
 				if (myArchives[x] instanceof Archive) {
@@ -179,7 +171,6 @@ public class CProjectHelper {
 	 * Attempts to find a binary with the given name in the workspace
 	 */
 	public static Binary findBinary(ICProject testProject,String name) {
-		Binary myBinary;
 		BinaryContainer binCont;
 		int x;
 	   	IBinary[] myBinaries;
@@ -190,7 +181,6 @@ public class CProjectHelper {
 		myBinaries=binCont.getBinaries();
 		if (myBinaries.length<1) 
 			return(null);
-		myBinary=null;
 		for (x=0;x<myBinaries.length;x++) {
 			if (myBinaries[x].getElementName().equals(name))
 				if (myBinaries[x] instanceof Binary) {
@@ -206,13 +196,11 @@ public class CProjectHelper {
 	 * Attempts to find an object with the given name in the workspace
 	 */
 	public static Binary findObject(ICProject testProject,String name) {
-		ICElement myICElement;
 		int x;
 	   	ICElement[] myElements;
 		myElements=testProject.getChildren();
 		if (myElements.length<1) 
 			return(null);
-		myICElement=null;
 		for (x=0;x<myElements.length;x++) {
 			if (myElements[x].getElementName().equals(name))
 				if (myElements[x] instanceof ICElement) {
@@ -227,13 +215,11 @@ public class CProjectHelper {
 	 * Attempts to find a TranslationUnit with the given name in the workspace
 	 */
 	public static TranslationUnit findTranslationUnit(ICProject testProject,String name) {
-		ICElement myICElement;
 		int x;
 	   	ICElement[] myElements;
 		myElements=testProject.getChildren();
 		if (myElements.length<1) 
 			return(null);
-		myICElement=null;
 		for (x=0;x<myElements.length;x++) {
 			if (myElements[x].getElementName().equals(name))
 				if (myElements[x] instanceof ICElement) {
@@ -251,13 +237,11 @@ public class CProjectHelper {
 	 * Attempts to find an element with the given name in the workspace
 	 */
 	public static ICElement findElement(ICProject testProject,String name) {
-		ICElement myICElement;
 		int x;
 	   	ICElement[] myElements;
 		myElements=testProject.getChildren();
 		if (myElements.length<1) 
 			return(null);
-		myICElement=null;
 		for (x=0;x<myElements.length;x++) {
 			if (myElements[x].getElementName().equals(name))
 				if (myElements[x] instanceof ICElement) {
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/CTestSetup.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/CTestSetup.java
index 3e143d5a048..2843c2703b7 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/CTestSetup.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/CTestSetup.java
@@ -7,7 +7,6 @@ package org.eclipse.cdt.testplugin;
 import junit.extensions.TestSetup;
 import junit.framework.Test;
 
-import org.eclipse.core.resources.IWorkspaceRoot;
 
 
 public class CTestSetup extends TestSetup {
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/NewMain.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/NewMain.java
index 41a42bc7f30..66161e7a7bf 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/NewMain.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/NewMain.java
@@ -6,7 +6,6 @@ package org.eclipse.cdt.testplugin;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URL;
 import java.util.Properties;
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/test/HelloWorld.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/test/HelloWorld.java
index 4e41ef027f1..c46fa44e098 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/test/HelloWorld.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/test/HelloWorld.java
@@ -11,7 +11,6 @@ import junit.framework.TestSuite;
 import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.testplugin.CProjectHelper;
 import org.eclipse.cdt.testplugin.TestPluginLauncher;
-import org.eclipse.core.runtime.Path;
 
 
 public class HelloWorld extends TestCase {
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/util/ExpectedStrings.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/util/ExpectedStrings.java
index 6b800cedcfe..d7cc8c48187 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/util/ExpectedStrings.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/util/ExpectedStrings.java
@@ -86,7 +86,6 @@ public class ExpectedStrings {
 		return(missing);
 	}
 	public String getExtraString() {
-		int x;
 		String extra= new String("Extra elements: ");
 		while (!extraStrings.empty()) {
 			extra+=extraStrings.pop();