woproject/projects/wolips/plugins/org.objectstyle.wolips.datasets/java/org/objectstyle/wolips/datasets/adaptable ProjectPatternsets.java,1.5,1.6

Update of /cvsroot/woproject/woproject/projects/wolips/plugins/org.objectstyle.wolips.datasets/java/org/objectstyle/wolips/datasets/adaptable
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24447/wolips/plugins/org.objectstyle.wolips.datasets/java/org/objectstyle/wolips/datasets/adaptable

Modified Files:
	ProjectPatternsets.java 
Log Message:
fixed http://objectstyle.org/jira/browse/WOL-224
Wrong exclude match on single resource files.





Index: ProjectPatternsets.java
===================================================================
RCS file: /cvsroot/woproject/woproject/projects/wolips/plugins/org.objectstyle.wolips.datasets/java/org/objectstyle/wolips/datasets/adaptable/ProjectPatternsets.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ProjectPatternsets.java	15 Dec 2005 08:31:08 -0000	1.5
+++ ProjectPatternsets.java	5 Apr 2006 07:08:05 -0000	1.6
@@ -57,6 +57,7 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -314,37 +315,32 @@
 		return this.woappResourcesIncludeMatcher;
 	}
 
-	private String[] toProjectRelativePaths(IResource resource) {
-		String[] returnValue = null;
-		if (resource.getParent().getType() != IResource.ROOT
-		/* && resource.getParent().getType() != IResource.PROJECT */) {
-			returnValue = new String[2];
-			String string = null;
-			if (resource.getType() != IResource.FOLDER) {
-				IPath path = resource.getParent().getProjectRelativePath();
-				/*
-				 * String string = resource.getProject().getName() + "/" +
-				 * path.toString() + "/";
-				 */
-				string = path.toString() + "/";
-			} else {
-				string = "/" + resource.getName() + "/";
-			}
-			returnValue[0] = string;
-		} else {
-			returnValue = new String[1];
-		}
-		IPath path = resource.getProjectRelativePath();
-		//String string = resource.getProject().getName() + "/" +
-		// path.toString();
-		String string = path.toString();
-		if (returnValue.length == 2) {
-			returnValue[1] = string;
-		} else {
-			returnValue[0] = string;
-		}
-		return returnValue;
-	}
+	  private String[] toProjectRelativePaths(IResource resource) {
+		    String[] returnValue = null;
+		    if (resource.getParent().getType() != IResource.ROOT ) {
+		      
+		      String string = null;
+		      if (resource.getType() != IResource.FOLDER) {
+		    	  returnValue = new String[1];
+		      } else {
+		    	  returnValue = new String[2];
+		    	  string = "/" + resource.getName() + "/";
+		    	  returnValue[0] = string;
+		      }
+		      
+		    } else {
+		      returnValue = new String[1];
+		    }
+		    IPath path = resource.getProjectRelativePath();
+		    String string = path.toString();
+		    if (returnValue.length == 2) {
+		      returnValue[1] = string;
+		    }
+		    else {
+		      returnValue[0] = string;
+		    }
+		    return returnValue;
+		  }
 
 	/**
 	 * @param resource



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642