*** ./woproject/projects/wolips/plugins/org.objectstyle.wolips.jdt/java/org/objectstyle/wolips/jdt/classpath/WOClasspathContainer.java	Sat Dec 11 16:29:36 2004
--- ./_woproject/projects/wolips/plugins/org.objectstyle.wolips.jdt/java/org/objectstyle/wolips/jdt/classpath/WOClasspathContainer.java	Thu Oct  7 18:46:31 2004
***************
*** 65,70 ****
--- 65,71 ----
  import org.eclipse.jdt.core.IClasspathContainer;
  import org.eclipse.jdt.core.IClasspathEntry;
  import org.eclipse.jdt.core.JavaCore;
+ import org.eclipse.jdt.launching.IRuntimeContainerComparator;
  import org.eclipse.jdt.ui.JavaUI;
  import org.objectstyle.wolips.variables.VariablesPlugin;
  /**
***************
*** 73,79 ****
   */
  public final class WOClasspathContainer
  		implements
! 			IClasspathContainer {
  	public static final String WOLIPS_CLASSPATH_CONTAINER_IDENTITY = "org.objectstyle.wolips.WO_CLASSPATH";
  	public static final String[] WOLIPS_CLASSPATH_STANDARD_FRAMEWORKS = new String[]{
  			"JavaWebObjects", "JavaFoundation", "JavaXML", "JavaWOExtensions",
--- 74,81 ----
   */
  public final class WOClasspathContainer
  		implements
! 			IClasspathContainer,
! 			IRuntimeContainerComparator {
  	public static final String WOLIPS_CLASSPATH_CONTAINER_IDENTITY = "org.objectstyle.wolips.WO_CLASSPATH";
  	public static final String[] WOLIPS_CLASSPATH_STANDARD_FRAMEWORKS = new String[]{
  			"JavaWebObjects", "JavaFoundation", "JavaXML", "JavaWOExtensions",
***************
*** 82,94 ****
  	private IClasspathEntry[] classpathEntries = null;
  	/**
  	 * Constructor for WOClassPathContainer.
- 	 *..aram id 
  	 */
  	public WOClasspathContainer(IPath id) {
  		super();
  		_id = id;
  		_initPath();
  	}
  	/**
  	 *..ee org.eclipse.jdt.core.IClasspathContainer#getClasspathEntries()
  	 */
--- 84,103 ----
  	private IClasspathEntry[] classpathEntries = null;
  	/**
  	 * Constructor for WOClassPathContainer.
  	 */
  	public WOClasspathContainer(IPath id) {
  		super();
  		_id = id;
  		_initPath();
  	}
+ 	/*
+ 	 * (non-Javadoc)
+ 	 * 
+ 	 *..ee org.eclipse.jdt.launching.IRuntimeContainerComparator#isDuplicate(org.eclipse.core.runtime.IPath)
+ 	 */
+ 	public boolean isDuplicate(IPath containerPath) {
+ 		return _id.equals(containerPath);
+ 	}
  	/**
  	 *..ee org.eclipse.jdt.core.IClasspathContainer#getClasspathEntries()
  	 */
***************
*** 146,153 ****
  								+ "/" + archives[j]);
  						//IClasspathEntry entry =
  						// JavaCore.newLibraryEntry(archivePath, null, null);
  						IClasspathEntry entry = JavaCore.newLibraryEntry(
! 								archivePath, null, null, false);
  						_path.add(entry);
  						if(framework.indexOf("Java") == 0) {
  						    try {
--- 155,172 ----
  								+ "/" + archives[j]);
  						//IClasspathEntry entry =
  						// JavaCore.newLibraryEntry(archivePath, null, null);
+ 						IPath source = new Path(System.getProperty("user.home")+ "/Roots/Sources/" + framework + "_src.jar");
+ 						if(!source.toFile().exists()) {
+ 						    source = null;
+ 						}
+ 						if(framework.indexOf("DAV") == 0) {
+ 						    source = new Path(System.getProperty("user.home")+ "/extras/webobjects/support/" + framework + "/Sources/");
+ 						}
+ 						if(framework.indexOf("Java") == 0) {
+ 						    source = new Path(System.getProperty("user.home")+ "/tmp/wo5.2");
+ 						}
  						IClasspathEntry entry = JavaCore.newLibraryEntry(
! 								archivePath, source, null, false);
  						_path.add(entry);
  						if(framework.indexOf("Java") == 0) {
  						    try {