[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm/tm4j1 TopicMapImpl.java, 1.14, 1.15

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

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

Modified Files:
	TopicMapImpl.java 
Log Message:
Provide support for Occurrence proxying.

Index: TopicMapImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1/TopicMapImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** TopicMapImpl.java	23 Jan 2008 16:08:48 -0000	1.14
--- TopicMapImpl.java	23 Jan 2008 19:35:38 -0000	1.15
***************
*** 280,283 ****
--- 280,289 ----
  		} else if (unmerged instanceof org.tm4j.topicmap.tmdm.Association) {
  			return unmergedToExternal((org.tm4j.topicmap.tmdm.Association) unmerged);
+ 		} else if (unmerged instanceof org.tm4j.topicmap.tmdm.AssociationRole) {
+ 			return unmergedToExternal((org.tm4j.topicmap.tmdm.AssociationRole) unmerged);
+ 		} else if (unmerged instanceof org.tm4j.topicmap.tmdm.TopicName) {
+ 			return unmergedToExternal((org.tm4j.topicmap.tmdm.TopicName) unmerged);
+ 		} else if (unmerged instanceof org.tm4j.topicmap.tmdm.Occurrence) {
+ 			return unmergedToExternal((org.tm4j.topicmap.tmdm.Occurrence) unmerged);
  		} else if (unmerged instanceof org.tm4j.topicmap.tmdm.TopicMap) {
  			return unmergedToExternal((org.tm4j.topicmap.tmdm.TopicMap) unmerged);
***************
*** 321,324 ****
--- 327,338 ----
  	}
  	
+ 	protected OccurrenceImpl unmergedToExternal(org.tm4j.topicmap.tmdm.Occurrence unmerged) {
+ 		if (unmerged!=null) {
+ 			return new OccurrenceImpl(unmerged,getContainer());
+ 		} else {
+ 			return null;
+ 		}
+ 	}
+ 	
  	protected TopicMapImpl unmergedToExternal(org.tm4j.topicmap.tmdm.TopicMap unmerged) {
  		assert unmerged!=null;