[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm/merged MergedOccurrence.java, 1.2, 1.3

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

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

Modified Files:
	MergedOccurrence.java 
Log Message:
Implement MergedOccurence better

Index: MergedOccurrence.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedOccurrence.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MergedOccurrence.java	21 Jan 2008 20:00:27 -0000	1.2
--- MergedOccurrence.java	23 Jan 2008 00:07:53 -0000	1.3
***************
*** 16,20 ****
  	@author <a href="mailto:xua...@pu...">Xuân Baldauf</a>
  */
! public class MergedOccurrence extends MergedReifiable<ReadableOccurrence,MergedOccurrenceKey> /*implements ReadableOccurrence*/ {
  	
  	protected MergedTopic parent;
--- 16,20 ----
  	@author <a href="mailto:xua...@pu...">Xuân Baldauf</a>
  */
! public class MergedOccurrence extends MergedScopeable<ReadableOccurrence,MergedOccurrenceKey> implements ReadableOccurrence {
  	
  	protected MergedTopic parent;
***************
*** 25,28 ****
--- 25,46 ----
  	}
  	
+ 	@TMDM
+ 	@TMAPI
+ 	public ReadableTopic getType() {
+ 		return getContainer().getMergedTopic(getRandomComponent().getType());
+ 	}
+ 	
+ 	@TMDM
+ 	public Locator getDatatype() {
+ 		return getRandomComponent().getDatatype();
+ 	}
+ 	
+ 	@TMDM
+ 	@TMAPI
+ 	public String getValue() {
+ 		return getRandomComponent().getValue();
+ 	}
+ 	
+ 	@TMDM
  	public MergedTopic getParent() {
  		return parent;