[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm/tm4j1 TopicImpl.java, 1.11, 1.12 TopicMapImpl.java, 1.18, 1.19

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

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

Modified Files:
	TopicImpl.java TopicMapImpl.java 
Log Message:
Implement retrieving of occurrences in TM4J1 compatibility layer.

Index: TopicImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1/TopicImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TopicImpl.java	11 Jun 2008 02:20:15 -0000	1.11
--- TopicImpl.java	11 Jun 2008 02:41:37 -0000	1.12
***************
*** 389,393 ****
  //	throw new UnsupportedOperationException();
  		// FIXME
! 		return Collections.emptyList();
  	}
  
--- 389,394 ----
  //	throw new UnsupportedOperationException();
  		// FIXME
! //	return Collections.emptyList();
! 		return getContainer().mergedToExternalOccurrences(getMergedObject().getOccurrences());
  	}
  

Index: TopicMapImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1/TopicMapImpl.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** TopicMapImpl.java	23 Jan 2008 20:54:15 -0000	1.18
--- TopicMapImpl.java	11 Jun 2008 02:41:37 -0000	1.19
***************
*** 24,27 ****
--- 24,28 ----
  import org.tm4j.topicmap.tmdm.merged.MergedTopicMap;
  import org.tm4j.topicmap.tmdm.merged.MergedTopicName;
+ import org.tm4j.topicmap.tmdm.merged.MergedOccurrence;
  import org.tm4j.topicmap.tmdm.merged.MergedAssociation;
  import org.tm4j.topicmap.tmdm.merged.MergedAssociationRole;
***************
*** 203,206 ****
--- 204,211 ----
  	}
  	
+ 	protected org.tm4j.topicmap.tmdm.Occurrence mergedToUnmerged(MergedOccurrence merged) {
+ 		return (org.tm4j.topicmap.tmdm.Occurrence) merged.getRandomComponent();
+ 	}
+ 	
  	protected org.tm4j.topicmap.tmdm.Association mergedToUnmerged(MergedAssociation merged) {
  		return (org.tm4j.topicmap.tmdm.Association) merged.getRandomComponent();
***************
*** 251,254 ****
--- 256,267 ----
  	}
  	
+ 	protected OccurrenceImpl mergedToExternal(MergedOccurrence merged) {
+ 		if (merged!=null) {
+ 			return unmergedToExternal(mergedToUnmerged(merged));
+ 		} else {
+ 			return null;
+ 		}
+ 	}
+ 	
  	protected Set<TopicImpl> mergedToExternalTopics(Set<? extends MergedTopic> merged) {
  		return new MappedSet<MergedTopic,TopicImpl>(getMergedTopicMapView().getMergedTopics()) {
***************
*** 293,296 ****
--- 306,317 ----
  	}
  	
+ 	protected Collection<OccurrenceImpl> mergedToExternalOccurrences(Collection<? extends MergedOccurrence> merged) {
+ 		return new MappedCollection<MergedOccurrence,OccurrenceImpl>(merged) {
+ 			protected OccurrenceImpl map(MergedOccurrence key) {
+ 				return mergedToExternal(key);
+ 			}
+ 		};
+ 	}
+ 	
  	protected TopicMapObjectImpl unmergedToExternal(org.tm4j.topicmap.tmdm.TopicMapConstruct unmerged) {
  		if (unmerged instanceof org.tm4j.topicmap.tmdm.Topic) {