[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm Occurrence.java, 1.1, 1.2 ReadableOccurrence.java, 1

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	Occurrence.java ReadableOccurrence.java Topic.java 
	TopicMapEventAdapter.java TopicMapEventListener.java 
	TopicMapEventListener.java.v0 TopicMapEventListenerUtil.java 
	package.jdo 
Log Message:
Spelling fix: s/ccurence/ccurrence/ part 2 (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

Index: TopicMapEventAdapter.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/TopicMapEventAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TopicMapEventAdapter.java	21 Jan 2008 11:13:44 -0000	1.1
--- TopicMapEventAdapter.java	21 Jan 2008 20:00:25 -0000	1.2
***************
*** 9,13 ****
  	@author <a href="mailto:xua...@pu...">XuÃ¢n Baldauf</a>
  */
! public abstract class TopicMapEventAdapter<TM extends ReadableTopicMap,T extends ReadableTopic,A extends ReadableAssociation,O extends ReadableOccurence,TMC extends ReadableTopicMapConstruct,TN extends ReadableTopicName,V extends ReadableVariant,AR extends AssociationRole> implements TopicMapEventListener<TM,T,A,O,TMC,TN,V,AR> {

  	/**
--- 9,13 ----
  	@author <a href="mailto:xua...@pu...">XuÃ¢n Baldauf</a>
  */
! public abstract class TopicMapEventAdapter<TM extends ReadableTopicMap,T extends ReadableTopic,A extends ReadableAssociation,O extends ReadableOccurrence,TMC extends ReadableTopicMapConstruct,TN extends ReadableTopicName,V extends ReadableVariant,AR extends AssociationRole> implements TopicMapEventListener<TM,T,A,O,TMC,TN,V,AR> {

  	/**
***************
*** 48,96 ****

  	/**
! 		Notifies this listener after an occurence has been created.
! 		Please note that, at the time of this call, this occurence has its properties, which are required to be set by TMDM, already set.
  		This also implies
  		<ul>
  			<li>
! 				that this call represents the establishment of the occurence,
  			</li>
  			<li>
! 				that this call represents the establishment of the link between the occurence and its parent,
  			</li>
  			<li>
! 				that this call represents the establishment of the link between the occurence and its type.
  			</li>
  		</ul>
  	*/
! 	public void notifyOccurenceCreated(TM topicMap,T topic,O occurence) {
  	}

  	/**
! 		Notifies this listener after an occurence has been removed from its topic.
! 		Please note that, at the time of this call, this occurence still has its properties, which are required to be set by TMDM, set.
  		This also implies
  		<ul>
  			<li>
! 				that this call represents the destruction of the link between the occurence and its type,
  			</li>
  			<li>
! 				that this call represents the destruction of the link between the occurence and its parent,
  			</li>
  			<li>
! 				that this call represents the destruction of the occurence
  			</li>
  		</ul>
  		even when parts of the destruction happen after this call.
  	*/
! 	public void notifyOccurenceRemoved(TM topicMap,T topic,O occurence) {
  	}

! 	public void notifyOccurenceTypeChanged(TM topicMap,T topic,O occurence,T oldType,T newType) {
  	}

! 	public void notifyOccurenceDatatypeChanged(TM topicMap,T topic,O occurence,Locator oldDatatype,Locator newDatatype) {
  	}

! 	public void notifyOccurenceValueChanged(TM topicMap,T topic,O occurence,String oldValue,String newValue) {
  	}

--- 48,96 ----

  	/**
! 		Notifies this listener after an occurrence has been created.
! 		Please note that, at the time of this call, this occurrence has its properties, which are required to be set by TMDM, already set.
  		This also implies
  		<ul>
  			<li>
! 				that this call represents the establishment of the occurrence,
  			</li>
  			<li>
! 				that this call represents the establishment of the link between the occurrence and its parent,
  			</li>
  			<li>
! 				that this call represents the establishment of the link between the occurrence and its type.
  			</li>
  		</ul>
  	*/
! 	public void notifyOccurrenceCreated(TM topicMap,T topic,O occurrence) {
  	}

  	/**
! 		Notifies this listener after an occurrence has been removed from its topic.
! 		Please note that, at the time of this call, this occurrence still has its properties, which are required to be set by TMDM, set.
  		This also implies
  		<ul>
  			<li>
! 				that this call represents the destruction of the link between the occurrence and its type,
  			</li>
  			<li>
! 				that this call represents the destruction of the link between the occurrence and its parent,
  			</li>
  			<li>
! 				that this call represents the destruction of the occurrence
  			</li>
  		</ul>
  		even when parts of the destruction happen after this call.
  	*/
! 	public void notifyOccurrenceRemoved(TM topicMap,T topic,O occurrence) {
  	}

! 	public void notifyOccurrenceTypeChanged(TM topicMap,T topic,O occurrence,T oldType,T newType) {
  	}

! 	public void notifyOccurrenceDatatypeChanged(TM topicMap,T topic,O occurrence,Locator oldDatatype,Locator newDatatype) {
  	}

! 	public void notifyOccurrenceValueChanged(TM topicMap,T topic,O occurrence,String oldValue,String newValue) {
  	}

***************
*** 126,131 ****

  	/**
! 		Notifies this listener after an occurence has been created.
! 		Please note that, at the time of this call, this occurence has its type already set.
  		This also implies
  		<ul>
--- 126,131 ----

  	/**
! 		Notifies this listener after an occurrence has been created.
! 		Please note that, at the time of this call, this occurrence has its type already set.
  		This also implies
  		<ul>
***************
*** 194,201 ****
  	}

! 	public void notifyOccurencesMerged(TM topicMap,O source0,O source1,O destination) {
  	}

! 	public void notifyOccurenceSplitted(TM topicMap,O source,O destination0,O destination1) {
  	}

--- 194,201 ----
  	}

! 	public void notifyOccurrencesMerged(TM topicMap,O source0,O source1,O destination) {
  	}

! 	public void notifyOccurrenceSplitted(TM topicMap,O source,O destination0,O destination1) {
  	}

Index: Occurrence.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/Occurrence.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Occurrence.java	21 Jan 2008 19:58:24 -0000	1.1
--- Occurrence.java	21 Jan 2008 20:00:25 -0000	1.2
***************
*** 9,13 ****
  	@author <a href="mailto:xua...@pu...">XuÃ¢n Baldauf</a>
  */
! public interface Occurence extends ReadableOccurence,Scopeable {

  	@TMDM
--- 9,13 ----
  	@author <a href="mailto:xua...@pu...">XuÃ¢n Baldauf</a>
  */
! public interface Occurrence extends ReadableOccurrence,Scopeable {

  	@TMDM

Index: package.jdo
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/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:44 -0000	1.1
--- package.jdo	21 Jan 2008 20:00:26 -0000	1.2
***************
*** 21,25 ****
  		<class name="Association" />
  		<class name="AssociationRole" />
! 		<class name="Occurence" />
  		<class name="Reifiable" />
  		<class name="Scopeable" />
--- 21,25 ----
  		<class name="Association" />
  		<class name="AssociationRole" />
! 		<class name="Occurrence" />
  		<class name="Reifiable" />
  		<class name="Scopeable" />
***************
*** 40,44 ****
  		<class name="ReadableAssociation" />
  		<class name="ReadableAssociationRole" />
! 		<class name="ReadableOccurence" />
  		<class name="ReadableReifiable" />
  		<class name="ReadableScopeable" />
--- 40,44 ----
  		<class name="ReadableAssociation" />
  		<class name="ReadableAssociationRole" />
! 		<class name="ReadableOccurrence" />
  		<class name="ReadableReifiable" />
  		<class name="ReadableScopeable" />

Index: TopicMapEventListenerUtil.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/TopicMapEventListenerUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TopicMapEventListenerUtil.java	21 Jan 2008 11:13:44 -0000	1.1
--- TopicMapEventListenerUtil.java	21 Jan 2008 20:00:26 -0000	1.2
***************
*** 24,28 ****

  	@SuppressWarnings("unchecked")
! 	public static <TM extends ReadableTopicMap,T extends ReadableTopic,A extends ReadableAssociation,O extends ReadableOccurence,TMC extends ReadableTopicMapConstruct,TN extends ReadableTopicName,V extends ReadableVariant,AR extends ReadableAssociationRole> TopicMapEventListener<TM,T,A,O,TMC,TN,V,AR> getNullTopicMapEventListener() {
  		return (TopicMapEventListener<TM,T,A,O,TMC,TN,V,AR>) nullTopicMapEventListener;
  	}
--- 24,28 ----

  	@SuppressWarnings("unchecked")
! 	public static <TM extends ReadableTopicMap,T extends ReadableTopic,A extends ReadableAssociation,O extends ReadableOccurrence,TMC extends ReadableTopicMapConstruct,TN extends ReadableTopicName,V extends ReadableVariant,AR extends ReadableAssociationRole> TopicMapEventListener<TM,T,A,O,TMC,TN,V,AR> getNullTopicMapEventListener() {
  		return (TopicMapEventListener<TM,T,A,O,TMC,TN,V,AR>) nullTopicMapEventListener;
  	}

Index: TopicMapEventListener.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/TopicMapEventListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TopicMapEventListener.java	21 Jan 2008 11:13:44 -0000	1.1
--- TopicMapEventListener.java	21 Jan 2008 20:00:25 -0000	1.2
***************
*** 9,13 ****
  	@author <a href="mailto:xua...@pu...">XuÃ¢n Baldauf</a>
  */
! public interface TopicMapEventListener<TM extends ReadableTopicMap,T extends ReadableTopic,A extends ReadableAssociation,O extends ReadableOccurence,TMC extends ReadableTopicMapConstruct,TN extends ReadableTopicName,V extends ReadableVariant,AR extends ReadableAssociationRole> {

  	/**
--- 9,13 ----
  	@author <a href="mailto:xua...@pu...">XuÃ¢n Baldauf</a>
  */
! public interface TopicMapEventListener<TM extends ReadableTopicMap,T extends ReadableTopic,A extends ReadableAssociation,O extends ReadableOccurrence,TMC extends ReadableTopicMapConstruct,TN extends ReadableTopicName,V extends ReadableVariant,AR extends ReadableAssociationRole> {

  	/**
***************
*** 38,82 ****

  	/**
! 		Notifies this listener after an occurence has been created.
! 		Please note that, at the time of this call, this occurence has its properties, which are required to be set by TMDM, already set.
  		This also implies
  		<ul>
  			<li>
! 				that this call represents the establishment of the occurence,
  			</li>
  			<li>
! 				that this call represents the establishment of the link between the occurence and its parent,
  			</li>
  			<li>
! 				that this call represents the establishment of the link between the occurence and its type.
  			</li>
  		</ul>
  	*/
! 	public void notifyOccurenceCreated(TM topicMap,T topic,O occurence);

  	/**
! 		Notifies this listener after an occurence has been removed from its topic.
! 		Please note that, at the time of this call, this occurence still has its properties, which are required to be set by TMDM, set.
  		This also implies
  		<ul>
  			<li>
! 				that this call represents the destruction of the link between the occurence and its type,
  			</li>
  			<li>
! 				that this call represents the destruction of the link between the occurence and its parent,
  			</li>
  			<li>
! 				that this call represents the destruction of the occurence
  			</li>
  		</ul>
  		even when parts of the destruction happen after this call.
  	*/
! 	public void notifyOccurenceRemoved(TM topicMap,T topic,O occurence);

! 	public void notifyOccurenceTypeChanged(TM topicMap,T topic,O occurence,T oldType,T newType);

! 	public void notifyOccurenceDatatypeChanged(TM topicMap,T topic,O occurence,Locator oldDatatype,Locator newDatatype);

! 	public void notifyOccurenceValueChanged(TM topicMap,T topic,O occurence,String oldValue,String newValue);

  	public void notifyVariantCreated(TM topicMap,T topic,TN topicName,V variant);
--- 38,82 ----

  	/**
! 		Notifies this listener after an occurrence has been created.
! 		Please note that, at the time of this call, this occurrence has its properties, which are required to be set by TMDM, already set.
  		This also implies
  		<ul>
  			<li>
! 				that this call represents the establishment of the occurrence,
  			</li>
  			<li>
! 				that this call represents the establishment of the link between the occurrence and its parent,
  			</li>
  			<li>
! 				that this call represents the establishment of the link between the occurrence and its type.
  			</li>
  		</ul>
  	*/
! 	public void notifyOccurrenceCreated(TM topicMap,T topic,O occurrence);

  	/**
! 		Notifies this listener after an occurrence has been removed from its topic.
! 		Please note that, at the time of this call, this occurrence still has its properties, which are required to be set by TMDM, set.
  		This also implies
  		<ul>
  			<li>
! 				that this call represents the destruction of the link between the occurrence and its type,
  			</li>
  			<li>
! 				that this call represents the destruction of the link between the occurrence and its parent,
  			</li>
  			<li>
! 				that this call represents the destruction of the occurrence
  			</li>
  		</ul>
  		even when parts of the destruction happen after this call.
  	*/
! 	public void notifyOccurrenceRemoved(TM topicMap,T topic,O occurrence);

! 	public void notifyOccurrenceTypeChanged(TM topicMap,T topic,O occurrence,T oldType,T newType);

! 	public void notifyOccurrenceDatatypeChanged(TM topicMap,T topic,O occurrence,Locator oldDatatype,Locator newDatatype);

! 	public void notifyOccurrenceValueChanged(TM topicMap,T topic,O occurrence,String oldValue,String newValue);

  	public void notifyVariantCreated(TM topicMap,T topic,TN topicName,V variant);
***************
*** 101,106 ****

  	/**
! 		Notifies this listener after an occurence has been created.
! 		Please note that, at the time of this call, this occurence has its type already set.
  		This also implies
  		<ul>
--- 101,106 ----

  	/**
! 		Notifies this listener after an occurrence has been created.
! 		Please note that, at the time of this call, this occurrence has its type already set.
  		This also implies
  		<ul>
***************
*** 158,164 ****
  	public void notifyAssociationRoleSplitted(TM topicMap,AR source,AR destination0,AR destination1);

! 	public void notifyOccurencesMerged(TM topicMap,O source0,O source1,O destination);

! 	public void notifyOccurenceSplitted(TM topicMap,O source,O destination0,O destination1);

  	public void notifyTopicNamesMerged(TM topicMap,TN source0,TN source1,TN destination);
--- 158,164 ----
  	public void notifyAssociationRoleSplitted(TM topicMap,AR source,AR destination0,AR destination1);

! 	public void notifyOccurrencesMerged(TM topicMap,O source0,O source1,O destination);

! 	public void notifyOccurrenceSplitted(TM topicMap,O source,O destination0,O destination1);

  	public void notifyTopicNamesMerged(TM topicMap,TN source0,TN source1,TN destination);

Index: TopicMapEventListener.java.v0
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/TopicMapEventListener.java.v0,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TopicMapEventListener.java.v0	21 Jan 2008 11:13:44 -0000	1.1
--- TopicMapEventListener.java.v0	21 Jan 2008 20:00:26 -0000	1.2
***************
*** 35,77 ****

  	/**
! 		Notifies this listener after an occurence has been created.
! 		Please note that, at the time of this call, this occurence has its properties, which are required to be set by TMDM, already set.
  		This also implies
  		<ul>
  			<li>
! 				that this call represents the establishment of the occurence,
  			</li>
  			<li>
! 				that this call represents the establishment of the link between the occurence and its parent,
  			</li>
  			<li>
! 				that this call represents the establishment of the link between the occurence and its type.
  			</li>
  		</ul>
  	*/
! 	public void notifyOccurenceCreated(TopicMap topicMap,Topic topic,Occurence occurence);

  	/**
! 		Notifies this listener after an occurence has been removed from its topic.
! 		Please note that, at the time of this call, this occurence still has its properties, which are required to be set by TMDM, set.
  		This also implies
  		<ul>
  			<li>
! 				that this call represents the destruction of the link between the occurence and its type,
  			</li>
  			<li>
! 				that this call represents the destruction of the link between the occurence and its parent,
  			</li>
  			<li>
! 				that this call represents the destruction of the occurence
  			</li>
  		</ul>
  		even when parts of the destruction happen after this call.
  	*/
! 	public void notifyOccurenceRemoved(TopicMap topicMap,Topic topic,Occurence occurence);

! 	public void notifyOccurenceTypeChanged(TopicMap topicMap,Topic topic,Occurence occurence,Topic oldType,Topic newType);

! 	public void notifyOccurenceValueChanged(TopicMap topicMap,Topic topic,Occurence occurence,String oldValue,String newValue);

  	public void notifyVariantCreated(TopicMap topicMap,Topic topic,TopicName topicName,Variant variant);
--- 35,77 ----

  	/**
! 		Notifies this listener after an occurrence has been created.
! 		Please note that, at the time of this call, this occurrence has its properties, which are required to be set by TMDM, already set.
  		This also implies
  		<ul>
  			<li>
! 				that this call represents the establishment of the occurrence,
  			</li>
  			<li>
! 				that this call represents the establishment of the link between the occurrence and its parent,
  			</li>
  			<li>
! 				that this call represents the establishment of the link between the occurrence and its type.
  			</li>
  		</ul>
  	*/
! 	public void notifyOccurrenceCreated(TopicMap topicMap,Topic topic,Occurrence occurrence);

  	/**
! 		Notifies this listener after an occurrence has been removed from its topic.
! 		Please note that, at the time of this call, this occurrence still has its properties, which are required to be set by TMDM, set.
  		This also implies
  		<ul>
  			<li>
! 				that this call represents the destruction of the link between the occurrence and its type,
  			</li>
  			<li>
! 				that this call represents the destruction of the link between the occurrence and its parent,
  			</li>
  			<li>
! 				that this call represents the destruction of the occurrence
  			</li>
  		</ul>
  		even when parts of the destruction happen after this call.
  	*/
! 	public void notifyOccurrenceRemoved(TopicMap topicMap,Topic topic,Occurrence occurrence);

! 	public void notifyOccurrenceTypeChanged(TopicMap topicMap,Topic topic,Occurrence occurrence,Topic oldType,Topic newType);

! 	public void notifyOccurrenceValueChanged(TopicMap topicMap,Topic topic,Occurrence occurrence,String oldValue,String newValue);

  	public void notifyVariantCreated(TopicMap topicMap,Topic topic,TopicName topicName,Variant variant);
***************
*** 96,101 ****

  	/**
! 		Notifies this listener after an occurence has been created.
! 		Please note that, at the time of this call, this occurence has its type already set.
  		This also implies
  		<ul>
--- 96,101 ----

  	/**
! 		Notifies this listener after an occurrence has been created.
! 		Please note that, at the time of this call, this occurrence has its type already set.
  		This also implies
  		<ul>
***************
*** 150,156 ****
  	public void notifyAssociationRoleSplitted(TopicMap topicMap,AssociationRole source,AssociationRole destination0,AssociationRole destination1);

! 	public void notifyOccurencesMerged(TopicMap topicMap,Occurence source0,Occurence source1,Occurence destination);

! 	public void notifyOccurenceSplitted(TopicMap topicMap,Occurence source,Occurence destination0,Occurence destination1);

  	public void notifyTopicNamesMerged(TopicMap topicMap,TopicName source0,TopicName source1,TopicName destination);
--- 150,156 ----
  	public void notifyAssociationRoleSplitted(TopicMap topicMap,AssociationRole source,AssociationRole destination0,AssociationRole destination1);

! 	public void notifyOccurrencesMerged(TopicMap topicMap,Occurrence source0,Occurrence source1,Occurrence destination);

! 	public void notifyOccurrenceSplitted(TopicMap topicMap,Occurrence source,Occurrence destination0,Occurrence destination1);

  	public void notifyTopicNamesMerged(TopicMap topicMap,TopicName source0,TopicName source1,TopicName destination);

Index: Topic.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/Topic.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Topic.java	21 Jan 2008 11:13:44 -0000	1.1
--- Topic.java	21 Jan 2008 20:00:25 -0000	1.2
***************
*** 44,48 ****

  	@TMDM
! 	public Occurence createOccurence(Topic type,Locator datatype,String value);

  	@TMDM
--- 44,48 ----

  	@TMDM
! 	public Occurrence createOccurrence(Topic type,Locator datatype,String value);

  	@TMDM

Index: ReadableOccurrence.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/ReadableOccurrence.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReadableOccurrence.java	21 Jan 2008 19:58:24 -0000	1.1
--- ReadableOccurrence.java	21 Jan 2008 20:00:25 -0000	1.2
***************
*** 9,13 ****
  	@author <a href="mailto:xua...@pu...">XuÃ¢n Baldauf</a>
  */
! public interface ReadableOccurence extends ReadableScopeable {

  	@TMDM
--- 9,13 ----
  	@author <a href="mailto:xua...@pu...">XuÃ¢n Baldauf</a>
  */
! public interface ReadableOccurrence extends ReadableScopeable {

  	@TMDM