[52408] First pass at contributors via containers/plugins.
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/AbstractBeanInfoTestCase.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/AbstractBeanInfoTestCase.java
index 6b45638..b5c6426 100644
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/AbstractBeanInfoTestCase.java
+++ b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/AbstractBeanInfoTestCase.java
@@ -11,7 +11,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: AbstractBeanInfoTestCase.java,v $
- *  $Revision: 1.3 $  $Date: 2004/01/13 16:17:20 $ 
+ *  $Revision: 1.4 $  $Date: 2004/03/22 23:49:30 $ 
  */
 import java.util.Iterator;
 
@@ -23,8 +23,8 @@
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.jem.internal.beaninfo.FeatureDecorator;
 import org.eclipse.jem.internal.beaninfo.PropertyDecorator;
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature;
-import org.eclipse.jem.internal.beaninfo.adapters.Utilities;
+import org.eclipse.jem.internal.beaninfo.core.BeaninfoNature;
+import org.eclipse.jem.internal.beaninfo.core.Utilities;
 import org.eclipse.jem.tests.JavaProjectUtil;
 
 import org.eclipse.jem.java.JavaClass;
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/BeanInfoSuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/BeanInfoSuite.java
index 96e871d..d5e8f40 100644
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/BeanInfoSuite.java
+++ b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/BeanInfoSuite.java
@@ -11,7 +11,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: BeanInfoSuite.java,v $
- *  $Revision: 1.2 $  $Date: 2003/10/27 17:32:36 $ 
+ *  $Revision: 1.3 $  $Date: 2004/03/22 23:49:30 $ 
  */
 import java.net.URL;
 
@@ -22,7 +22,7 @@
 import org.eclipse.core.resources.*;
 import org.eclipse.core.runtime.*;
 
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature;
+import org.eclipse.jem.internal.beaninfo.core.BeaninfoNature;
 import org.eclipse.jem.tests.JavaProjectUtil;
 import org.eclipse.jem.tests.JavaTestsPlugin;
 
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestAWTSwingUI.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestAWTSwingUI.java
index c1f679e..6c205c1 100644
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestAWTSwingUI.java
+++ b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestAWTSwingUI.java
@@ -11,7 +11,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: TestAWTSwingUI.java,v $
- *  $Revision: 1.3 $  $Date: 2004/01/13 16:17:20 $ 
+ *  $Revision: 1.4 $  $Date: 2004/03/22 23:49:30 $ 
  */
 import java.util.Arrays;
 import java.util.List;
@@ -21,7 +21,7 @@
 
 import org.eclipse.jem.internal.beaninfo.MethodProxy;
 import org.eclipse.jem.internal.beaninfo.PropertyDecorator;
-import org.eclipse.jem.internal.beaninfo.adapters.Utilities;
+import org.eclipse.jem.internal.beaninfo.core.Utilities;
 
 import org.eclipse.jem.java.JavaClass;
 
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestReflection.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestReflection.java
index 4c71dc9..1551d70 100644
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestReflection.java
+++ b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestReflection.java
@@ -11,14 +11,14 @@
  *******************************************************************************/
 /*
  *  $RCSfile: TestReflection.java,v $
- *  $Revision: 1.3 $  $Date: 2004/01/13 16:17:20 $ 
+ *  $Revision: 1.4 $  $Date: 2004/03/22 23:49:30 $ 
  */
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EStructuralFeature;
 
 import org.eclipse.jem.internal.beaninfo.PropertyDecorator;
-import org.eclipse.jem.internal.beaninfo.adapters.Utilities;
+import org.eclipse.jem.internal.beaninfo.core.Utilities;
 import org.eclipse.jem.java.JavaClass;
 import org.eclipse.jem.java.TypeKind;
 
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestStandard.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestStandard.java
index 22dbbb2..ed25e2d 100644
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestStandard.java
+++ b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestStandard.java
@@ -11,7 +11,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: TestStandard.java,v $
- *  $Revision: 1.3 $  $Date: 2004/01/13 16:17:20 $ 
+ *  $Revision: 1.4 $  $Date: 2004/03/22 23:49:30 $ 
  */
 
 import java.util.Iterator;
@@ -27,7 +27,7 @@
 import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.adapters.Utilities;
+import org.eclipse.jem.internal.beaninfo.core.Utilities;
 
 import org.eclipse.jem.java.*;
 
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/InstantiationSuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/InstantiationSuite.java
index 405e2fd..b8af6c9 100644
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/InstantiationSuite.java
+++ b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/InstantiationSuite.java
@@ -11,7 +11,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: InstantiationSuite.java,v $
- *  $Revision: 1.2 $  $Date: 2003/10/27 17:32:36 $ 
+ *  $Revision: 1.3 $  $Date: 2004/03/22 23:49:30 $ 
  */
 import java.net.URL;
 
@@ -22,7 +22,7 @@
 import org.eclipse.core.resources.*;
 import org.eclipse.core.runtime.*;
 
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature;
+import org.eclipse.jem.internal.beaninfo.core.BeaninfoNature;
 import org.eclipse.jem.internal.instantiation.base.JavaInstantiation;
 import org.eclipse.jem.tests.JavaProjectUtil;
 import org.eclipse.jem.tests.JavaTestsPlugin;
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/TestStandard.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/TestStandard.java
index 6c7aeff..ae598d0 100644
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/TestStandard.java
+++ b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/TestStandard.java
@@ -29,7 +29,7 @@
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature;
+import org.eclipse.jem.internal.beaninfo.core.BeaninfoNature;
 import org.eclipse.jem.internal.instantiation.InitStringAllocation;
 import org.eclipse.jem.internal.instantiation.InstantiationFactory;
 import org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance;
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ProxySuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ProxySuite.java
index 48af22d..892e545 100644
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ProxySuite.java
+++ b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ProxySuite.java
@@ -11,12 +11,11 @@
  *******************************************************************************/
 /*
  *  $RCSfile: ProxySuite.java,v $
- *  $Revision: 1.4 $  $Date: 2004/03/04 16:13:39 $ 
+ *  $Revision: 1.5 $  $Date: 2004/03/22 23:49:30 $ 
  */
 import junit.framework.TestSuite;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 
 import org.eclipse.jem.internal.proxy.core.*;
 import org.eclipse.jem.tests.JavaTestsPlugin;
@@ -78,15 +77,9 @@
 	 * @return A contributor for Proxy Suite tests
 	 */
 	public static IConfigurationContributor getProxySuiteContributor() {
-		return new IConfigurationContributor() {
+		return new ConfigurationContributorAdapter() {
 			public void contributeClasspaths(IConfigurationContributionController controller) throws CoreException {
-				controller.contributeClasspath(JavaTestsPlugin.getPlugin(), "vm/tests.jar", IConfigurationContributionController.APPEND_USER_CLASSPATH, false);
-			}
-
-			public void contributeToConfiguration(ILaunchConfigurationWorkingCopy config) {
-			}
-
-			public void contributeToRegistry(ProxyFactoryRegistry registry) {
+				controller.contributeClasspath(JavaTestsPlugin.getPlugin().getDescriptor(), "vm/tests.jar", IConfigurationContributionController.APPEND_USER_CLASSPATH, false);
 			}
 		};
 	}