[Tm4j-commits] CVS: tm4j/src/org/tm4j/topicmap/cmd Merge.java,1.2,1.3

[Kal A. <kal...@us...>]

Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/cmd
In directory usw-pr-cvs1:/tmp/cvs-serv10542/org/tm4j/topicmap/cmd

Modified Files:
	Merge.java 
Log Message:
Changed subject and subjectIndicator properties of Topic to Locator. Added LocatorDataObject infrastructure for persisting Locators.