[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm/merged MergedOccurrence.java, 1.1, 1.2 MergedOccurrenceKey.java, 1.1, 1.2 MergedTopicMapView.java, 1.3, 1.4 package.jdo, 1.1, 1.2

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

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

Modified Files:
	MergedOccurrence.java MergedOccurrenceKey.java 
	MergedTopicMapView.java package.jdo 
Log Message:
Spelling fix: s/ccurence/ccurrence/ part 2 (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

Index: package.jdo
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/package.jdo,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** package.jdo	21 Jan 2008 11:13:45 -0000	1.1
--- package.jdo	21 Jan 2008 20:00:27 -0000	1.2
***************
*** 18,22 ****
  		<class name="MergedAssociationRole" />
  		<class name="MergedAssociationRoleKey" />
! 		<class name="MergedOccurence" />
  		<class name="MergedReifiable">
                          <field persistence-modifier="persistent" name="key" />
--- 18,22 ----
  		<class name="MergedAssociationRole" />
  		<class name="MergedAssociationRoleKey" />
! 		<class name="MergedOccurrence" />
  		<class name="MergedReifiable">
                          <field persistence-modifier="persistent" name="key" />
***************
*** 76,80 ****
  				<extension vendor-name="jpox" key="is-second-class" value="false" />
  			</field>
! 			<field name="occurenceToMergedOccurence">
  				<extension vendor-name="jpox" key="is-second-class" value="false" />
  			</field>
--- 76,80 ----
  				<extension vendor-name="jpox" key="is-second-class" value="false" />
  			</field>
! 			<field name="occurrenceToMergedOccurrence">
  				<extension vendor-name="jpox" key="is-second-class" value="false" />
  			</field>

Index: MergedOccurrenceKey.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedOccurrenceKey.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MergedOccurrenceKey.java	21 Jan 2008 19:58:24 -0000	1.1
--- MergedOccurrenceKey.java	21 Jan 2008 20:00:27 -0000	1.2
***************
*** 14,22 ****
  
  /**
! 	An Occurence in context of one MergedTopic.
  
  	@author <a href="mailto:xua...@pu...">Xuân Baldauf</a>
  */
! public class MergedOccurenceKey extends MergedScopeableKey {
  	
  	protected MergedTopic parent;
--- 14,22 ----
  
  /**
! 	An Occurrence in context of one MergedTopic.
  
  	@author <a href="mailto:xua...@pu...">Xuân Baldauf</a>
  */
! public class MergedOccurrenceKey extends MergedScopeableKey {
  	
  	protected MergedTopic parent;
***************
*** 29,33 ****
  	// FIXME: scope missing
  	
! 	protected MergedOccurenceKey(MergedTopic parent,MergedTopic type,String value,MergedScopeKey scope) {
  		super(scope);
  		this.parent	= parent;
--- 29,33 ----
  	// FIXME: scope missing
  	
! 	protected MergedOccurrenceKey(MergedTopic parent,MergedTopic type,String value,MergedScopeKey scope) {
  		super(scope);
  		this.parent	= parent;
***************
*** 36,43 ****
  		
  		// FIXME: register at MergedTopics
! //	parent.addUsedAsOccurenceParent(this);
  	}
  	
! 	protected MergedOccurenceKey changeScope(MergedScopeKey newScope) {
  		throw new UnsupportedOperationException();
  	}
--- 36,43 ----
  		
  		// FIXME: register at MergedTopics
! //	parent.addUsedAsOccurrenceParent(this);
  	}
  	
! 	protected MergedOccurrenceKey changeScope(MergedScopeKey newScope) {
  		throw new UnsupportedOperationException();
  	}
***************
*** 48,55 ****
  	
  	public boolean equals(Object o) {
! 		return equals((MergedOccurenceKey) o);
  	}
  	
! 	public boolean equals(MergedOccurenceKey o) {
  		return parent.equals(o.parent)&&type.equals(o.type)&&value.equals(o.value)&&super.equals(o);
  	}
--- 48,55 ----
  	
  	public boolean equals(Object o) {
! 		return equals((MergedOccurrenceKey) o);
  	}
  	
! 	public boolean equals(MergedOccurrenceKey o) {
  		return parent.equals(o.parent)&&type.equals(o.type)&&value.equals(o.value)&&super.equals(o);
  	}
***************
*** 63,67 ****
  		
  		if (parent!=null) {
! //		parent.removeUsedAsOccurenceParent(this);
  			parent = null;
  		}
--- 63,67 ----
  		
  		if (parent!=null) {
! //		parent.removeUsedAsOccurrenceParent(this);
  			parent = null;
  		}
***************
*** 70,74 ****
  	
  	public String toString() {
! 		return "MergedOccurenceKey("+parent+","+type+",\""+value+"\")";
  	}
  }
--- 70,74 ----
  	
  	public String toString() {
! 		return "MergedOccurrenceKey("+parent+","+type+",\""+value+"\")";
  	}
  }

Index: MergedTopicMapView.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedTopicMapView.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MergedTopicMapView.java	21 Jan 2008 19:43:57 -0000	1.3
--- MergedTopicMapView.java	21 Jan 2008 20:00:27 -0000	1.4
***************
*** 83,87 ****
  	protected Map<ReadableTopicName,MergedTopicName>							topicNameToMergedTopicName;
  	protected Map<ReadableVariant,MergedVariant>									variantToMergedVariant;
! 	protected Map<ReadableOccurence,MergedOccurence>							occurenceToMergedOccurence;
  	
  	protected Map<MergedAssociationKey,MergedAssociation>					mergedAssociationByKey;
--- 83,87 ----
  	protected Map<ReadableTopicName,MergedTopicName>							topicNameToMergedTopicName;
  	protected Map<ReadableVariant,MergedVariant>									variantToMergedVariant;
! 	protected Map<ReadableOccurrence,MergedOccurrence>							occurrenceToMergedOccurrence;
  	
  	protected Map<MergedAssociationKey,MergedAssociation>					mergedAssociationByKey;
***************
*** 94,98 ****
  	protected Set<MergedTopic>																		mergedTopics;
  	
! 	protected TopicMapEventListener<ReadableTopicMap,ReadableTopic,ReadableAssociation,ReadableOccurence,ReadableTopicMapConstruct,ReadableTopicName,ReadableVariant,ReadableAssociationRole>	eventListener;
  	
  	public MergedTopicMapView(CollectionsFactory collectionsFactory) {
--- 94,98 ----
  	protected Set<MergedTopic>																		mergedTopics;
  	
! 	protected TopicMapEventListener<ReadableTopicMap,ReadableTopic,ReadableAssociation,ReadableOccurrence,ReadableTopicMapConstruct,ReadableTopicName,ReadableVariant,ReadableAssociationRole>	eventListener;
  	
  	public MergedTopicMapView(CollectionsFactory collectionsFactory) {
***************
*** 106,110 ****
  		topicNameToMergedTopicName																	= createMap();
  		variantToMergedVariant																			= createMap();
! 		occurenceToMergedOccurence																	= createMap();
  		
  		mergedAssociationByKey																			=	createMap();
--- 106,110 ----
  		topicNameToMergedTopicName																	= createMap();
  		variantToMergedVariant																			= createMap();
! 		occurrenceToMergedOccurrence																	= createMap();
  		
  		mergedAssociationByKey																			=	createMap();
***************
*** 122,126 ****
  	}
  	
! 	protected TopicMapEventListener<ReadableTopicMap,ReadableTopic,ReadableAssociation,ReadableOccurence,ReadableTopicMapConstruct,ReadableTopicName,ReadableVariant,ReadableAssociationRole> getEventListener() {
  		return eventListener;
  	}
--- 122,126 ----
  	}
  	
! 	protected TopicMapEventListener<ReadableTopicMap,ReadableTopic,ReadableAssociation,ReadableOccurrence,ReadableTopicMapConstruct,ReadableTopicName,ReadableVariant,ReadableAssociationRole> getEventListener() {
  		return eventListener;
  	}
***************
*** 175,180 ****
  	}
  	
! 	public MergedOccurence getMergedOccurence(ReadableOccurence basicOccurence) {
! 		MergedOccurence result = occurenceToMergedOccurence.get(basicOccurence);
  		
  		assert result!=null;
--- 175,180 ----
  	}
  	
! 	public MergedOccurrence getMergedOccurrence(ReadableOccurrence basicOccurrence) {
! 		MergedOccurrence result = occurrenceToMergedOccurrence.get(basicOccurrence);
  		
  		assert result!=null;
***************
*** 217,222 ****
  		}
  		
! 		if (basicTopicMapConstruct instanceof ReadableOccurence) {
! 			return getMergedOccurence((ReadableOccurence) basicTopicMapConstruct); 
  		}
  		
--- 217,222 ----
  		}
  		
! 		if (basicTopicMapConstruct instanceof ReadableOccurrence) {
! 			return getMergedOccurrence((ReadableOccurrence) basicTopicMapConstruct); 
  		}
  		
***************
*** 647,651 ****
  						// FIXME
  						// check whether the topic is used as a reifier
! 						// check whether the topic is used as a name type, occurence type, association type, association role type, association role player
  						throw new UnsupportedOperationException();
  					}
--- 647,651 ----
  						// FIXME
  						// check whether the topic is used as a reifier
! 						// check whether the topic is used as a name type, occurrence type, association type, association role type, association role player
  						throw new UnsupportedOperationException();
  					}

Index: MergedOccurrence.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedOccurrence.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MergedOccurrence.java	21 Jan 2008 19:58:24 -0000	1.1
--- MergedOccurrence.java	21 Jan 2008 20:00:27 -0000	1.2
***************
*** 16,24 ****
  	@author <a href="mailto:xua...@pu...">Xuân Baldauf</a>
  */
! public class MergedOccurence extends MergedReifiable<ReadableOccurence,MergedOccurenceKey> /*implements ReadableOccurence*/ {
  	
  	protected MergedTopic parent;
  	
! 	protected MergedOccurence(MergedTopic parent,MergedOccurenceKey key,Occurence firstComponent) {
  		super(parent.getContainer(),key,firstComponent);
  		this.parent = parent;
--- 16,24 ----
  	@author <a href="mailto:xua...@pu...">Xuân Baldauf</a>
  */
! public class MergedOccurrence extends MergedReifiable<ReadableOccurrence,MergedOccurrenceKey> /*implements ReadableOccurrence*/ {
  	
  	protected MergedTopic parent;
  	
! 	protected MergedOccurrence(MergedTopic parent,MergedOccurrenceKey key,Occurrence firstComponent) {
  		super(parent.getContainer(),key,firstComponent);
  		this.parent = parent;