woproject/projects/woenvironment/src/java/org/objectstyle/woenvironment/pb PBXProject.java,1.5,1.6

Update of /cvsroot/woproject/woproject/projects/woenvironment/src/java/org/objectstyle/woenvironment/pb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11828/projects/woenvironment/src/java/org/objectstyle/woenvironment/pb

Modified Files:
	PBXProject.java 
Log Message:
Fix for http://objectstyle.org/jira/browse/WOL-231
Patch submitted by Bob Schwarzmann




Index: PBXProject.java
===================================================================
RCS file: /cvsroot/woproject/woproject/projects/woenvironment/src/java/org/objectstyle/woenvironment/pb/PBXProject.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PBXProject.java	6 Apr 2006 21:22:35 -0000	1.5
+++ PBXProject.java	11 Apr 2006 17:02:34 -0000	1.6
@@ -84,9 +84,9 @@
 	}
 	
 	public void addResourceFolderReference( String path ) {
-		_resourceFolderRefs.add( path );
-	}
-	
+                _resourceFolderRefs.add( path );
+        }
+
 	public void addWSResourceFileReference( String path ) {
 		_wsresourceFileRefs.add( path );
 	}
@@ -147,15 +147,17 @@
                 
 		it = _resourceFileRefs.iterator();
 		while( it.hasNext() ) {
-		    path = (String) it.next();
-		    if(path.indexOf(projectPath) == 0) {
-		        path = path.substring(projectPath.length()+1);
-		    }
-		    File file = new File(path);
-		    Map reference = newFileReference(file.getName(), path);
+                    path = (String) it.next();
+                    if(path.indexOf(projectPath) == 0) {
+                        path = path.substring(projectPath.length()+1);
+                    }
+                    File file = new File(path);
+                    if( !_resourceFolderRefs.contains( projectPath + "/" + file.getParent() ) ){
+                        Map reference = newFileReference(file.getName(), path);
 			ObjectsTable.ID refID = objectsTable.insert(reference);
 			resourceFileIDs.add(refID);
 			resourceBuildFileIDs.add(objectsTable.insert(newBuildFile(refID)));
+                    }
 		}
 
 		it = _resourceFolderRefs.iterator();
@@ -179,10 +181,12 @@
 		        path = path.substring(projectPath.length()+1);
 		    }
 		    File file = new File(path);
-		    Map reference = newFileReference(file.getName(), path);
+                    if( !_wsresourceFolderRefs.contains( projectPath + "/" + file.getParent() ) ){
+                        Map reference = newFileReference(file.getName(), path);
 			ObjectsTable.ID refID = objectsTable.insert(reference);
 			wsresourceFileIDs.add(refID);
 			wsresourceBuildFileIDs.add(objectsTable.insert(newBuildFile(refID)));
+                    }
 		}
 
 		it = _wsresourceFolderRefs.iterator();



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