[jboss-cvs] jbosside/core/plugins/org.jboss.ide.eclipse.core/src/main/org/jboss/ide/eclipse/core/util ...

[Robert Stryker]

  User: rawb    
  Date: 07/02/26 16:21:34

  Modified:    core/plugins/org.jboss.ide.eclipse.core/src/main/org/jboss/ide/eclipse/core/util 
                        ResourceUtil.java
  Log:
  ResourceUtil had errors when trying to determine the full path of an IPath when the assumption was incorrect
  
  Revision  Changes    Path
  1.8       +149 -144  jbosside/core/plugins/org.jboss.ide.eclipse.core/src/main/org/jboss/ide/eclipse/core/util/ResourceUtil.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ResourceUtil.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.core/src/main/org/jboss/ide/eclipse/core/util/ResourceUtil.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- ResourceUtil.java	26 Feb 2007 19:20:30 -0000	1.7
  +++ ResourceUtil.java	26 Feb 2007 21:21:34 -0000	1.8
  @@ -118,6 +118,8 @@
      public static IPath makeAbsolute(IPath path, boolean assumption) {
   	   boolean inWorkspace = isResourceInWorkspace(path);
   	   boolean fileExists = new File(path.toOSString()).exists();
  +	   
  +	   // if they follow the assumptions
   	   if( inWorkspace && assumption == WORKSPACE_DEFAULT) {
   		   return ResourcesPlugin.getWorkspace().getRoot().getLocation().append(path);
   	   }
  @@ -125,6 +127,9 @@
   		   return path;
   	   }
   	   
  +	   if( fileExists && !inWorkspace ) return path;
  +	   if( !fileExists && inWorkspace ) return ResourcesPlugin.getWorkspace().getRoot().getLocation().append(path);
  +	   
   	   if( assumption == GLOBAL_DEFAULT ) return path;
   	   return ResourcesPlugin.getWorkspace().getRoot().getLocation().append(path);
      }