Index: ContentMemberList.java
===================================================================
RCS file: /cvs/jarpackager/src/org/netbeans/modules/jarpackager/ContentMemberList.java,v
--- ContentMemberList.java		1.14
+++ ContentMemberList.java	
@@ -375,2 +375,1 @@ 
-		    addEntry(member,
-			     member.dataObject, 
---
+		    addEntry(member.dataObject, 
@@ -496,1 +495,1 @@ 
-		if (addEntry(dataObj, dataObj, filter, targetDirectory, targetName)) {
---
+		if (addEntry(dataObj, filter, targetDirectory, targetName)) {
@@ -518,1 +517,1 @@ 
-		if (entries.remove(child) != null) {
---
+		if (entries.remove(child.dataObject) != null) {
@@ -571,1 +570,0 @@ 
-				 Object mapKey,
@@ -574,2 +572,2 @@ 
-	    if (entries.get(mapKey) == null) {
-		entries.put(mapKey, 
---
+	    if (entries.get(dataObj) == null) {
+		entries.put(dataObj, 
@@ -590,1 +588,1 @@ 
-		entries.put(member, member);
---
+		entries.put(member.dataObject, member);
Index: JarContentChildren.java
===================================================================
RCS file: /cvs/jarpackager/src/org/netbeans/modules/jarpackager/JarContentChildren.java,v
--- JarContentChildren.java		1.12
+++ JarContentChildren.java	
@@ -104,9 +104,1 @@ 
-	if (key instanceof ContentMember) {
-	    return new Node[] {new ContentMemberNode(recipe, 
-						     (ContentMember) key)};
-	} else {
-	    ContentMemberList cml = recipe.getJarContent().getContentList();
-	    int memberIndex = cml.findDataObject((DataObject) key);
-	    return new Node[] {new ContentMemberNode(recipe, 
-						     (ContentMember)recipe.getJarContent().getContentList().get(memberIndex))};
-	}
---
+        return new Node[] {new ContentMemberNode(recipe,(ContentMember) key)};