[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm/tm4j1 AssociationImpl.java, 1.3, 1.4

[Xuan B. <med...@us...>]

Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5616/src/org/tm4j/topicmap/tmdm/tm4j1

Modified Files:
	AssociationImpl.java 
Log Message:
Use infrastructure for adding item identifiers by resource locators easily if these resource locators are supplied.

Index: AssociationImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1/AssociationImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AssociationImpl.java	22 Jan 2008 21:47:20 -0000	1.3
--- AssociationImpl.java	23 Jan 2008 20:40:25 -0000	1.4
***************
*** 108,113 ****
  	@SuppressWarnings("unchecked") 
  	public Member createMember(String id, Locator resourceLoc, Topic roleSpec,Collection players)	throws DuplicateObjectIDException,PropertyVetoException,DuplicateResourceLocatorException {
- 		assert resourceLoc==null; // not implemented 
- 		
  		org.tm4j.topicmap.tmdm.Topic roleType;
  		
--- 108,111 ----
***************
*** 128,132 ****
  		}
  		
! 		return getContainer().unmergedToExternal(result);
  	}
  
--- 126,130 ----
  		}
  		
! 		return getContainer().unmergedToExternal(maybeAddID(id,resourceLoc,result));
  	}