Add some accessors so SWT can contribute more easily
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IClasspathContributionController.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IClasspathContributionController.java
index 9075a52..1c1379d 100644
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IClasspathContributionController.java
+++ b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IClasspathContributionController.java
@@ -11,13 +11,15 @@
*******************************************************************************/
/*
* $RCSfile: IClasspathContributionController.java,v $
- * $Revision: 1.1 $ $Date: 2003/10/27 17:22:23 $
+ * $Revision: 1.2 $ $Date: 2004/02/14 18:37:14 $
*/
import java.net.URL;
import java.util.List;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IJavaProject;
+;
/**
* Controls contribution to the class paths. This allows the classpath
* to be modified in an acceptable manner, so that duplicates aren't in
@@ -33,6 +35,15 @@
public interface IClasspathContributionController {
/**
+ * Get the java project that we are contributing for.
+ *
+ * @return javaproject, may be <code>null</code>
+ *
+ * @since 1.0.0
+ */
+ public IJavaProject getJavaProject();
+
+ /**
* Contribute a project to the classpath at the specified index.
* The classpath list will be passed in. If index is -1, then add at the end.
*/
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRegistration.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRegistration.java
index 25ea3df..f8c3bc9 100644
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRegistration.java
+++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRegistration.java
@@ -8,7 +8,7 @@
* Contributors: IBM Corporation - initial API and implementation
**************************************************************************************************/
/*
- * $RCSfile: ProxyRegistration.java,v $ $Revision: 1.4 $ $Date: 2004/02/11 16:03:41 $
+ * $RCSfile: ProxyRegistration.java,v $ $Revision: 1.5 $ $Date: 2004/02/14 18:37:14 $
*/
import java.io.IOException;
@@ -68,11 +68,15 @@
// too difficult to determine if build would affect us or not, so just wait.
handleBuild(new SubProgressMonitor(pm, 100));
- IJavaProject javaProject = JavaCore.create(project);
+ final IJavaProject javaProject = JavaCore.create(project);
// Add in the paths for the project
final ArrayList classPaths = new ArrayList(Arrays.asList(JavaRuntime.computeDefaultRuntimeClassPath(javaProject)));
final IClasspathContributionController controller = new IClasspathContributionController() {
+ public IJavaProject getJavaProject() {
+ return javaProject;
+ }
+
public void contributeProject(IProject project, List classpaths, int insertBeforeIndex) throws CoreException {
List projectPaths = new ArrayList(Arrays.asList(JavaRuntime.computeDefaultRuntimeClassPath(JavaCore.create(project))));
// Now we need to add to the list of paths, but we don't want to add dups.
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDERegistration.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDERegistration.java
index 6e61a63..a91f4cb 100644
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDERegistration.java
+++ b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDERegistration.java
@@ -11,7 +11,7 @@
*******************************************************************************/
/*
* $RCSfile: IDERegistration.java,v $
- * $Revision: 1.1 $ $Date: 2003/10/27 17:22:23 $
+ * $Revision: 1.2 $ $Date: 2004/02/14 18:37:14 $
*/
import java.net.MalformedURLException;
@@ -70,14 +70,21 @@
throws CoreException {
ArrayList classPaths = null;
+ IJavaProject javaProject = null;
if (project != null) {
- IJavaProject javaProject = JavaCore.create(project);
+ javaProject = JavaCore.create(project);
// Add in the paths for the project
classPaths = new ArrayList(Arrays.asList(JavaRuntime.computeDefaultRuntimeClassPath(javaProject)));
} else
classPaths = new ArrayList();
+ final IJavaProject jp = javaProject;
IClasspathContributionController controller = new IClasspathContributionController() {
+
+ public IJavaProject getJavaProject() {
+ return jp;
+ }
+
public void contributeProject(IProject project, List classpaths, int insertBeforeIndex) throws CoreException {
List projectPaths = new ArrayList(Arrays.asList(JavaRuntime.computeDefaultRuntimeClassPath(JavaCore.create(project))));
// Now we need to add to the list of paths, but we don't want to add dups.
