woproject/projects/wolips/plugins/org.objectstyle.wolips/java/org/objectstyle/wolips/core/resources/internal/build AbstractBuildVisitor.java,1.3,1.4

[email protected] Wed, 5 Apr 2006 00:09:09 -0700 (PDT)
Newsgroups gmane.comp.web.webobjects.woproject.cvs
Message-ID <[email protected]>
Update of /cvsroot/woproject/woproject/projects/wolips/plugins/org.objectstyle.wolips/java/org/objectstyle/wolips/core/resources/internal/build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24447/wolips/plugins/org.objectstyle.wolips/java/org/objectstyle/wolips/core/resources/internal/build

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





Index: AbstractBuildVisitor.java
===================================================================
RCS file: /cvsroot/woproject/woproject/projects/wolips/plugins/org.objectstyle.wolips/java/org/objectstyle/wolips/core/resources/internal/build/AbstractBuildVisitor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- AbstractBuildVisitor.java	25 Mar 2006 11:30:50 -0000	1.3
+++ AbstractBuildVisitor.java	5 Apr 2006 07:08:06 -0000	1.4
@@ -153,29 +153,21 @@
 
   private String[] toProjectRelativePaths(IResource resource) {
     String[] returnValue = null;
-    if (resource.getParent().getType() != IResource.ROOT
-    /* && resource.getParent().getType() != IResource.PROJECT */) {
-      returnValue = new String[2];
+    if (resource.getParent().getType() != IResource.ROOT ) {
+      
       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 = new String[1];
+      } else {
+    	  returnValue = new String[2];
+    	  string = "/" + resource.getName() + "/";
+    	  returnValue[0] = string;
       }
-      returnValue[0] = string;
-    }
-    else {
+      
+    } 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;



-------------------------------------------------------
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