tm4j-commits — Automatically generated CVS check-in notifications

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/memory TopicImpl.java, 1.77, 1.78

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

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

Modified Files:
	TopicImpl.java 
Log Message:
Spelling fix: s/ccurence/ccurrence/ part 3: non-TMDM-spelling-fixes (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

Index: TopicImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/memory/TopicImpl.java,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** TopicImpl.java	21 Jan 2008 08:45:09 -0000	1.77
--- TopicImpl.java	21 Jan 2008 20:12:40 -0000	1.78
***************
*** 770,774 ****
      }
  
!     // Get/Set/Add Occurence
      public Collection getOccurrences() {
          return getOccurrences(true);
--- 770,774 ----
      }
  
!     // Get/Set/Add Occurrence
      public Collection getOccurrences() {
          return getOccurrences(true);
***************
*** 1720,1725 ****
  /*
   * $Log$
!  * Revision 1.77  2008/01/21 08:45:09  mediumnet
!  * A little bit assertions for TopicImpl.
   *
   * Revision 1.76  2007/04/30 13:53:12  mediumnet
--- 1720,1728 ----
  /*
   * $Log$
!  * Revision 1.78  2008/01/21 20:12:40  mediumnet
!  * Spelling fix: s/ccurence/ccurrence/ part 3: non-TMDM-spelling-fixes (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)
!  *
!  * Revision 1.77  2008/01/21 08:45:09  mediumnet
!  * A little bit assertions for TopicImpl.
   *
   * Revision 1.76  2007/04/30 13:53:12  mediumnet

[Tm4j-commits] tmharvest/src/org/tm4j/harvest/digester OccurrenceRuleSet.java, 1.2, 1.3

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

Update of /cvsroot/tm4j/tmharvest/src/org/tm4j/harvest/digester
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2288/tmharvest/src/org/tm4j/harvest/digester

Modified Files:
	OccurrenceRuleSet.java 
Log Message:
Spelling fix: s/ccurence/ccurrence/ part 3: non-TMDM-spelling-fixes (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

Index: OccurrenceRuleSet.java
===================================================================
RCS file: /cvsroot/tm4j/tmharvest/src/org/tm4j/harvest/digester/OccurrenceRuleSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OccurrenceRuleSet.java	17 Oct 2003 21:39:29 -0000	1.2
--- OccurrenceRuleSet.java	21 Jan 2008 20:12:41 -0000	1.3
***************
*** 38,42 ****
  
          // Create a TopicElement
!         digester.addFactoryCreate(base, new OccurenceCreateFactory());
  
          // adding error-handling for topic
--- 38,42 ----
  
          // Create a TopicElement
!         digester.addFactoryCreate(base, new OccurrenceCreateFactory());
  
          // adding error-handling for topic
***************
*** 58,62 ****
       *  HarvestingContext
       */
!     class OccurenceCreateFactory extends AbstractObjectCreationFactory {
          public Object createObject(Attributes arg0) throws Exception {
              return new OccurrenceElement(ctx);
--- 58,62 ----
       *  HarvestingContext
       */
!     class OccurrenceCreateFactory extends AbstractObjectCreationFactory {
          public Object createObject(Attributes arg0) throws Exception {
              return new OccurrenceElement(ctx);

[Tm4j-commits] tm4web/velocity/docs/src userguide.xml,1.5,1.6

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

Update of /cvsroot/tm4j/tm4web/velocity/docs/src
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2288/tm4web/velocity/docs/src

Modified Files:
	userguide.xml 
Log Message:
Spelling fix: s/ccurence/ccurrence/ part 3: non-TMDM-spelling-fixes (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

Index: userguide.xml
===================================================================
RCS file: /cvsroot/tm4j/tm4web/velocity/docs/src/userguide.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** userguide.xml	17 Aug 2004 16:06:49 -0000	1.5
--- userguide.xml	21 Jan 2008 20:12:41 -0000	1.6
***************
*** 1069,1079 ****
  	    ## already be found/created earlier in the script.
  
! 	    $specialOccurenceTypesTest = $factory.create("org.tm4j.topicmap.utils.testers.TypeTester")
! 	    $specialOccurenceTypesTest.addAllowedType($allowedTypeTopic)
! 	    $specialOccurenceTypesTest.addAllowedType($allowedTypeSI)
  
  	    ## Now do some processing using the tester to find instance of either type
  	    
! 	    $specialOccurenceTypesTest.removeAllowedType($allowedTypeSI)
  
  	    ## Now do some processing using the tester to find only instances of $allowedTypeTopic
--- 1069,1079 ----
  	    ## already be found/created earlier in the script.
  
! 	    $specialOccurrenceTypesTest = $factory.create("org.tm4j.topicmap.utils.testers.TypeTester")
! 	    $specialOccurrenceTypesTest.addAllowedType($allowedTypeTopic)
! 	    $specialOccurrenceTypesTest.addAllowedType($allowedTypeSI)
  
  	    ## Now do some processing using the tester to find instance of either type
  	    
! 	    $specialOccurrenceTypesTest.removeAllowedType($allowedTypeSI)
  
  	    ## Now do some processing using the tester to find only instances of $allowedTypeTopic

[Tm4j-commits] tmnav/dev/doc/userdoc/src/en quick-rendererviews.xml, 1.1, 1.2

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

Update of /cvsroot/tm4j/tmnav/dev/doc/userdoc/src/en
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2288/tmnav/dev/doc/userdoc/src/en

Modified Files:
	quick-rendererviews.xml 
Log Message:
Spelling fix: s/ccurence/ccurrence/ part 3: non-TMDM-spelling-fixes (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

Index: quick-rendererviews.xml
===================================================================
RCS file: /cvsroot/tm4j/tmnav/dev/doc/userdoc/src/en/quick-rendererviews.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** quick-rendererviews.xml	13 Jan 2004 16:02:16 -0000	1.1
--- quick-rendererviews.xml	21 Jan 2008 20:12:41 -0000	1.2
***************
*** 31,35 ****
            <member><inlinemediaobject><imageobject><imagedata fileref="../img/icons/rolespec.gif"/></imageobject></inlinemediaobject> a Topic defing a role</member>
            <member><inlinemediaobject><imageobject><imagedata fileref="../img/icons/class.gif"/></imageobject></inlinemediaobject> a Topic used to define the type of an element (c stands for class)</member>
!           <member><inlinemediaobject><imageobject><imagedata fileref="../img/icons/occurrence.gif"/></imageobject></inlinemediaobject> an Occurence</member>
            <member><inlinemediaobject><imageobject><imagedata fileref="../img/icons/instance.gif"/></imageobject></inlinemediaobject> an instance-of relationship</member>
            
--- 31,35 ----
            <member><inlinemediaobject><imageobject><imagedata fileref="../img/icons/rolespec.gif"/></imageobject></inlinemediaobject> a Topic defing a role</member>
            <member><inlinemediaobject><imageobject><imagedata fileref="../img/icons/class.gif"/></imageobject></inlinemediaobject> a Topic used to define the type of an element (c stands for class)</member>
!           <member><inlinemediaobject><imageobject><imagedata fileref="../img/icons/occurrence.gif"/></imageobject></inlinemediaobject> an Occurrence</member>
            <member><inlinemediaobject><imageobject><imagedata fileref="../img/icons/instance.gif"/></imageobject></inlinemediaobject> an instance-of relationship</member>
            

[Tm4j-commits] tmharvest/src/org/tm4j/harvest/template OccurrenceElement.java, 1.10, 1.11

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

Update of /cvsroot/tm4j/tmharvest/src/org/tm4j/harvest/template
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2288/tmharvest/src/org/tm4j/harvest/template

Modified Files:
	OccurrenceElement.java 
Log Message:
Spelling fix: s/ccurence/ccurrence/ part 3: non-TMDM-spelling-fixes (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

Index: OccurrenceElement.java
===================================================================
RCS file: /cvsroot/tm4j/tmharvest/src/org/tm4j/harvest/template/OccurrenceElement.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** OccurrenceElement.java	8 Nov 2003 16:15:15 -0000	1.10
--- OccurrenceElement.java	21 Jan 2008 20:12:41 -0000	1.11
***************
*** 40,44 ****
      public OccurrenceElement(HarvestingContext ctx) {
          super(ctx);
!         log.debug("OccurenceElement created");
      }
  
--- 40,44 ----
      public OccurrenceElement(HarvestingContext ctx) {
          super(ctx);
!         log.debug("OccurrenceElement created");
      }
  

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/utils ATM.g, 1.1, 1.2 ATMParser.java, 1.1, 1.2

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

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

Modified Files:
	ATM.g ATMParser.java 
Log Message:
Spelling fix: s/ccurence/ccurrence/ part 3: non-TMDM-spelling-fixes (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

Index: ATM.g
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/utils/ATM.g,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ATM.g	28 Dec 2005 18:21:31 -0000	1.1
--- ATM.g	21 Jan 2008 20:12:40 -0000	1.2
***************
*** 69,73 ****
  
  	/**
!      * removes all occurences of a given character c from the input string
  	 * @param String input
  	 * @param String c
--- 69,73 ----
  
  	/**
!      * removes all occurrences of a given character c from the input string
  	 * @param String input
  	 * @param String c

Index: ATMParser.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/utils/ATMParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ATMParser.java	28 Dec 2005 18:21:31 -0000	1.1
--- ATMParser.java	21 Jan 2008 20:12:41 -0000	1.2
***************
*** 61,65 ****
  
  	/**
!      * removes all occurences of a given character c from the input string
  	 * @param String input
  	 * @param String c
--- 61,65 ----
  
  	/**
!      * removes all occurrences of a given character c from the input string
  	 * @param String input
  	 * @param String c

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/test TopicTest.java, 1.32, 1.33

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

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

Modified Files:
	TopicTest.java 
Log Message:
Spelling fix: s/ccurence/ccurrence/ part 3: non-TMDM-spelling-fixes (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

Index: TopicTest.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/test/TopicTest.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** TopicTest.java	8 Dec 2004 10:51:01 -0000	1.32
--- TopicTest.java	21 Jan 2008 20:12:40 -0000	1.33
***************
*** 293,297 ****
                  topic.getOccurrences().size());
  
!             //assertEquals("Occurrences collection is not null after reset", null, topic.getOccurences());
              assertTrue("Topic.getOccurrences() does not return a Collection",
                  topic.getOccurrences() instanceof Collection);
--- 293,297 ----
                  topic.getOccurrences().size());
  
!             //assertEquals("Occurrences collection is not null after reset", null, topic.getOccurrences());
              assertTrue("Topic.getOccurrences() does not return a Collection",
                  topic.getOccurrences() instanceof Collection);

[Tm4j-commits] tmnav/src/org/tm4j/tmnav/app/ix IndexPanel.java, 1.27, 1.28

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

Update of /cvsroot/tm4j/tmnav/src/org/tm4j/tmnav/app/ix
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2288/tmnav/src/org/tm4j/tmnav/app/ix

Modified Files:
	IndexPanel.java 
Log Message:
Spelling fix: s/ccurence/ccurrence/ part 3: non-TMDM-spelling-fixes (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

Index: IndexPanel.java
===================================================================
RCS file: /cvsroot/tm4j/tmnav/src/org/tm4j/tmnav/app/ix/IndexPanel.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** IndexPanel.java	2 Dec 2004 20:56:29 -0000	1.27
--- IndexPanel.java	21 Jan 2008 20:12:41 -0000	1.28
***************
*** 145,149 ****
  
      ix = new IndexProvider(mp, sm, OccurrenceTypesIndexAbstractor.class.getName(), r,
!         "Occurrence Types", "Topics, which are used to define the type of one or more Occurences");
      indexes.add(ix);
  
--- 145,149 ----
  
      ix = new IndexProvider(mp, sm, OccurrenceTypesIndexAbstractor.class.getName(), r,
!         "Occurrence Types", "Topics, which are used to define the type of one or more Occurrences");
      indexes.add(ix);
  

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/ozone OzoneOccurrence.java, 1.12, 1.13 OzoneTopicImpl.java, 1.63, 1.64

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

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

Modified Files:
	OzoneOccurrence.java OzoneTopicImpl.java 
Log Message:
Spelling fix: s/ccurence/ccurrence/ part 3: non-TMDM-spelling-fixes (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

Index: OzoneOccurrence.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/ozone/OzoneOccurrence.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** OzoneOccurrence.java	26 Feb 2004 21:33:47 -0000	1.12
--- OzoneOccurrence.java	21 Jan 2008 20:12:40 -0000	1.13
***************
*** 25,29 ****
  
  /**
!  * This interface defines a single occurence (<code>occurs</code>) construct in a Topic Map.
   *
   * An occurrence is defined by a string rolename and an optional type Topic.
--- 25,29 ----
  
  /**
!  * This interface defines a single occurrence (<code>occurs</code>) construct in a Topic Map.
   *
   * An occurrence is defined by a string rolename and an optional type Topic.

Index: OzoneTopicImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/ozone/OzoneTopicImpl.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** OzoneTopicImpl.java	30 Apr 2007 13:53:12 -0000	1.63
--- OzoneTopicImpl.java	21 Jan 2008 20:12:40 -0000	1.64
***************
*** 870,874 ****
      }
  
!     // Get/Set/Add Occurence
      public Collection getOccurrences() {
          return getOccurrences(true);
--- 870,874 ----
      }
  
!     // Get/Set/Add Occurrence
      public Collection getOccurrences() {
          return getOccurrences(true);

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/hibernate TopicImpl.java, 1.57, 1.58

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

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

Modified Files:
	TopicImpl.java 
Log Message:
Spelling fix: s/ccurence/ccurrence/ part 3: non-TMDM-spelling-fixes (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

Index: TopicImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/hibernate/TopicImpl.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** TopicImpl.java	30 Apr 2007 13:53:11 -0000	1.57
--- TopicImpl.java	21 Jan 2008 20:12:39 -0000	1.58
***************
*** 1065,1069 ****
      }
  
!     // Get/Set/Add Occurence
  
      /**
--- 1065,1069 ----
      }
  
!     // Get/Set/Add Occurrence
  
      /**
***************
*** 2428,2431 ****
--- 2428,2434 ----
  /*
   * $Log$
+  * Revision 1.58  2008/01/21 20:12:39  mediumnet
+  * Spelling fix: s/ccurence/ccurrence/ part 3: non-TMDM-spelling-fixes (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)
+  *
   * Revision 1.57  2007/04/30 13:53:11  mediumnet
   * Convert concrete ID comparisons to more abstracted call equalsByID().

[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;

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm/tm4j1 TopicImpl.java, 1.1, 1.2

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

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

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

Index: TopicImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1/TopicImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TopicImpl.java	21 Jan 2008 11:13:45 -0000	1.1
--- TopicImpl.java	21 Jan 2008 20:00:27 -0000	1.2
***************
*** 359,363 ****
  	}
  
! 	// Get/Set/Add Occurence
  
  	/**
--- 359,363 ----
  	}
  
! 	// Get/Set/Add Occurrence
  
  	/**
***************
*** 415,419 ****
  	 *                    all the existing occurrences of this topic
  	 *                    are removed.
! 	 * @deprecated Do not use this method (anymore). If you want to remove an occurence from its parent topic, use {Occurence#destroy} instead. Adding an occurence to a topic which is not its former parent is not properly supported and is to be removed. See <a href="https://sourceforge.net/tracker/?func=detail&atid=391879&aid=1704268&group_id=27895">Bug 1704268</a>.
  	 */
  	@Deprecated
--- 415,419 ----
  	 *                    all the existing occurrences of this topic
  	 *                    are removed.
! 	 * @deprecated Do not use this method (anymore). If you want to remove an occurrence from its parent topic, use {Occurrence#destroy} instead. Adding an occurrence to a topic which is not its former parent is not properly supported and is to be removed. See <a href="https://sourceforge.net/tracker/?func=detail&atid=391879&aid=1704268&group_id=27895">Bug 1704268</a>.
  	 */
  	@Deprecated
***************
*** 427,431 ****
  	 *
  	 * @param occurs The Occurrence to be added.
! 	 * @deprecated Do not use this method (anymore). Adding an occurence to a topic which is not its former parent is not properly supported and is to be removed. See <a href="https://sourceforge.net/tracker/?func=detail&atid=391879&aid=1704268&group_id=27895">Bug 1704268</a>.
  	 */
  	@Deprecated
--- 427,431 ----
  	 *
  	 * @param occurs The Occurrence to be added.
! 	 * @deprecated Do not use this method (anymore). Adding an occurrence to a topic which is not its former parent is not properly supported and is to be removed. See <a href="https://sourceforge.net/tracker/?func=detail&atid=391879&aid=1704268&group_id=27895">Bug 1704268</a>.
  	 */
  	@Deprecated

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm Occurrence.java, 1.1, 1.2 ReadableOccurrence.java, 1.1, 1.2 Topic.java, 1.1, 1.2 TopicMapEventAdapter.java, 1.1, 1.2 TopicMapEventListener.java, 1.1, 1.2 TopicMapEventListener.java.v0, 1.1, 1.2 TopicMapEventListenerUtil.java, 1.1, 1.2 package.jdo, 1.1, 1.2

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

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

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm/basic BasicOccurrence.java, 1.1, 1.2 BasicTopic.java, 1.2, 1.3 TopicMapItems.java.txt, 1.1, 1.2 package.jdo, 1.1, 1.2

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

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

Modified Files:
	BasicOccurrence.java BasicTopic.java TopicMapItems.java.txt 
	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/basic/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
***************
*** 9,13 ****
  		</class>
  		<class name="BasicAssociationRole" />
! 		<class name="BasicOccurence">
  			<field persistence-modifier="persistent" name="datatype" />
                  </class>
--- 9,13 ----
  		</class>
  		<class name="BasicAssociationRole" />
! 		<class name="BasicOccurrence">
  			<field persistence-modifier="persistent" name="datatype" />
                  </class>
***************
*** 26,30 ****
  				<extension vendor-name="jpox" key="is-second-class" value="false" />
  			</field>
! 			<field name="occurences">
  				<extension vendor-name="jpox" key="is-second-class" value="false" />
  			</field>
--- 26,30 ----
  				<extension vendor-name="jpox" key="is-second-class" value="false" />
  			</field>
! 			<field name="occurrences">
  				<extension vendor-name="jpox" key="is-second-class" value="false" />
  			</field>

Index: BasicTopic.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/basic/BasicTopic.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BasicTopic.java	21 Jan 2008 19:21:15 -0000	1.2
--- BasicTopic.java	21 Jan 2008 20:00:26 -0000	1.3
***************
*** 26,30 ****
  	Thus, the using application has to ensure that these constraints are met.
  
! 	We keep some sets (like {@link #subjectLocators}, {@link #subjectIdentifiers}, {@link #occurences}, {@link #rolesPlayed}, {@link #topicNames}) as null if the set to be represented is empty for memory optimization reasons.
  	(Thus, we can pack more topics in RAM and we are faster at disk accesses (and we should be faster even when only doing RAM accesses, as RAM is nowadays slower than CPUs).)
  	
--- 26,30 ----
  	Thus, the using application has to ensure that these constraints are met.
  
! 	We keep some sets (like {@link #subjectLocators}, {@link #subjectIdentifiers}, {@link #occurrences}, {@link #rolesPlayed}, {@link #topicNames}) as null if the set to be represented is empty for memory optimization reasons.
  	(Thus, we can pack more topics in RAM and we are faster at disk accesses (and we should be faster even when only doing RAM accesses, as RAM is nowadays slower than CPUs).)
  	
***************
*** 42,46 ****
  	Set<Locator>								subjectLocators;
  	Set<Locator>								subjectIdentifiers;
! 	Set<BasicOccurence>					occurences;
  	/**
  		While rolesPlayed is specified in TMDM, it is redundant from a data completeness point of view.
--- 42,46 ----
  	Set<Locator>								subjectLocators;
  	Set<Locator>								subjectIdentifiers;
! 	Set<BasicOccurrence>					occurrences;
  	/**
  		While rolesPlayed is specified in TMDM, it is redundant from a data completeness point of view.
***************
*** 178,218 ****
  	}
  	
! 	public BasicOccurence createOccurence(Topic type,Locator datatype,String value) {
! 		return createOccurence((BasicTopic) type,datatype,value);
  	}
  	
! 	public BasicOccurence createOccurence(BasicTopic type,Locator datatype,String value) {
  		assert type.getContainingTopicMap()==getContainingTopicMap();
  		
! 		BasicOccurence occurence = new BasicOccurence(this,type,datatype,value);
  		
! 		occurences.add(occurence);
  		
! 		getEventListener().notifyOccurenceCreated(getContainingTopicMap(),this,occurence);
  		
! 		return occurence;
  	}
  	
! 	protected void internalRemove(BasicOccurence occurence) {
! 		boolean success = occurences.remove(occurence);
  		
  		assert success;
  		
! 		getEventListener().notifyOccurenceRemoved(getContainingTopicMap(),this,occurence);
  	}
  	
! 	public void removeAllOccurences() {
! 		if (occurences!=null) {
! 			for (Iterator<BasicOccurence> i = occurences.iterator();i.hasNext();) {
! 				BasicOccurence occurence = i.next();
  				
! 				occurence.internalPreRemove();
  				
  				i.remove();
! 				getEventListener().notifyOccurenceRemoved(getContainingTopicMap(),this,occurence);
  				
! 				occurence.internalPostRemove();
  			}
! 			occurences = null;
  		}
  	}
--- 178,218 ----
  	}
  	
! 	public BasicOccurrence createOccurrence(Topic type,Locator datatype,String value) {
! 		return createOccurrence((BasicTopic) type,datatype,value);
  	}
  	
! 	public BasicOccurrence createOccurrence(BasicTopic type,Locator datatype,String value) {
  		assert type.getContainingTopicMap()==getContainingTopicMap();
  		
! 		BasicOccurrence occurrence = new BasicOccurrence(this,type,datatype,value);
  		
! 		occurrences.add(occurrence);
  		
! 		getEventListener().notifyOccurrenceCreated(getContainingTopicMap(),this,occurrence);
  		
! 		return occurrence;
  	}
  	
! 	protected void internalRemove(BasicOccurrence occurrence) {
! 		boolean success = occurrences.remove(occurrence);
  		
  		assert success;
  		
! 		getEventListener().notifyOccurrenceRemoved(getContainingTopicMap(),this,occurrence);
  	}
  	
! 	public void removeAllOccurrences() {
! 		if (occurrences!=null) {
! 			for (Iterator<BasicOccurrence> i = occurrences.iterator();i.hasNext();) {
! 				BasicOccurrence occurrence = i.next();
  				
! 				occurrence.internalPreRemove();
  				
  				i.remove();
! 				getEventListener().notifyOccurrenceRemoved(getContainingTopicMap(),this,occurrence);
  				
! 				occurrence.internalPostRemove();
  			}
! 			occurrences = null;
  		}
  	}
***************
*** 328,332 ****
  	
  	protected void internalPreRemove() {
! 		removeAllOccurences();
  		removeAllSubjectIdentifiers();
  		removeAllSubjectLocators();
--- 328,332 ----
  	
  	protected void internalPreRemove() {
! 		removeAllOccurrences();
  		removeAllSubjectIdentifiers();
  		removeAllSubjectLocators();

Index: BasicOccurrence.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/basic/BasicOccurrence.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BasicOccurrence.java	21 Jan 2008 19:58:24 -0000	1.1
--- BasicOccurrence.java	21 Jan 2008 20:00:26 -0000	1.2
***************
*** 12,16 ****
  	@author <a href="mailto:xua...@pu...">Xuân Baldauf</a>
  */
! public class BasicOccurence extends BasicScopeable implements Occurence {
  	BasicTopic									parent;
  	BasicTopic									type;
--- 12,16 ----
  	@author <a href="mailto:xua...@pu...">Xuân Baldauf</a>
  */
! public class BasicOccurrence extends BasicScopeable implements Occurrence {
  	BasicTopic									parent;
  	BasicTopic									type;
***************
*** 18,22 ****
  	String											value;
  	
! 	protected BasicOccurence(BasicTopic parent,BasicTopic type,Locator datatype,String value) {
  		this.parent		=	parent;
  		this.type			=	type;
--- 18,22 ----
  	String											value;
  	
! 	protected BasicOccurrence(BasicTopic parent,BasicTopic type,Locator datatype,String value) {
  		this.parent		=	parent;
  		this.type			=	type;
***************
*** 43,47 ****
  
  		// We do not treat cases where the old value equals the new value specially. 
! 		getEventListener().notifyOccurenceTypeChanged(getContainingTopicMap(),getParent(),this,oldType,type); 		
  	}
  	
--- 43,47 ----
  
  		// We do not treat cases where the old value equals the new value specially. 
! 		getEventListener().notifyOccurrenceTypeChanged(getContainingTopicMap(),getParent(),this,oldType,type); 		
  	}
  	
***************
*** 58,62 ****
  		
  		// We do not treat cases where the old value equals the new value specially.
! 		getEventListener().notifyOccurenceDatatypeChanged(getContainingTopicMap(),getParent(),this,oldDatatype,datatype);
  	}
  	
--- 58,62 ----
  		
  		// We do not treat cases where the old value equals the new value specially.
! 		getEventListener().notifyOccurrenceDatatypeChanged(getContainingTopicMap(),getParent(),this,oldDatatype,datatype);
  	}
  	
***************
*** 73,77 ****
  		
  		// We do not treat cases where the old value equals the new value specially.
! 		getEventListener().notifyOccurenceValueChanged(getContainingTopicMap(),getParent(),this,oldValue,value);
  	}
  	
--- 73,77 ----
  		
  		// We do not treat cases where the old value equals the new value specially.
! 		getEventListener().notifyOccurrenceValueChanged(getContainingTopicMap(),getParent(),this,oldValue,value);
  	}
  	

Index: TopicMapItems.java.txt
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/basic/TopicMapItems.java.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TopicMapItems.java.txt	21 Jan 2008 11:13:44 -0000	1.1
--- TopicMapItems.java.txt	21 Jan 2008 20:00:26 -0000	1.2
***************
*** 27,31 ****
  	Set<Locator>								subjectLocators;
  	Set<Locator>								subjectIdentifiers;
! 	Set<BasicOccurence>					BasicOccurences;
  	Set<BasicAssociationRole>		rolesPlayed;
  	Set<BasicTopicName>					BasicTopicNames;
--- 27,31 ----
  	Set<Locator>								subjectLocators;
  	Set<Locator>								subjectIdentifiers;
! 	Set<BasicOccurrence>					BasicOccurrences;
  	Set<BasicAssociationRole>		rolesPlayed;
  	Set<BasicTopicName>					BasicTopicNames;
***************
*** 58,62 ****
  }
  
! public class BasicOccurence	extends BasicScopeable {
  	BasicTopic									parent;
  	BasicTopic									type;
--- 58,62 ----
  }
  
! public class BasicOccurrence	extends BasicScopeable {
  	BasicTopic									parent;
  	BasicTopic									type;

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm/merged MergedOccurrence.java, NONE, 1.1 MergedOccurrenceKey.java, NONE, 1.1 MergedOccurence.java, 1.1, NONE MergedOccurenceKey.java, 1.2, NONE

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

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

Added Files:
	MergedOccurrence.java MergedOccurrenceKey.java 
Removed Files:
	MergedOccurence.java MergedOccurenceKey.java 
Log Message:
Spelling fix: s/ccurence/ccurrence/ part 1 (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

--- NEW FILE: MergedOccurrenceKey.java ---

package org.tm4j.topicmap.tmdm.merged;

import java.util.Set;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Collection;
import java.util.ArrayList;

import org.tm4j.net.Locator;

import org.tm4j.topicmap.tmdm.TopicMapEventListener;
import org.tm4j.topicmap.tmdm.*;

/**
	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;
	
	protected MergedTopic	type;
	
	protected String			value;
	
	// FIXME: variants missing
	// FIXME: scope missing
	
	protected MergedOccurenceKey(MergedTopic parent,MergedTopic type,String value,MergedScopeKey scope) {
		super(scope);
		this.parent	= parent;
		this.type		=	type;
		this.value	=	value;
		
		// FIXME: register at MergedTopics
//	parent.addUsedAsOccurenceParent(this);
	}
	
	protected MergedOccurenceKey changeScope(MergedScopeKey newScope) {
		throw new UnsupportedOperationException();
	}
	
	protected MergedTopic getParent() {
		return parent;
	}
	
	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);
	}
	
	public int hashCode() {
		return parent.hashCode()^type.hashCode()^value.hashCode()^super.hashCode();
	}
	
	protected void destroy() {
		assert parent!=null;
		
		if (parent!=null) {
//		parent.removeUsedAsOccurenceParent(this);
			parent = null;
		}
		// FIXME: type..
	}
	
	public String toString() {
		return "MergedOccurenceKey("+parent+","+type+",\""+value+"\")";
	}
}

/*
	Copyright (c) 2007-2008 Xuân Baldauf. 
	
	This software is licensed, under the terms of
	* Apache 2 License
	* GPL v2 License
	* GPL v3 License
	* LGPL v2.1 License
	* MPL v1.1 License
	as well as each later version of these licenses.
	
	This means:
	(1) If you are using this software, you can choose any subset of the licenses mentioned, and you can choose any version of each of these licenses (starting with the respective version indicated). (Note that, however, choosing the empty set of licenses means that you do not have any right granted by any license at all.)
	(2) If you are committing contributions to this software (i.e. this software as part of the official TM4J sourcecode), then you agree to each of these licenses for your contribution (such that each user of this software has still at least the same set of rights and licenses when using this software together with you contribution compared to when using this software without your contribution).   
*/
// :tabSize=2:indentSize=2:

--- MergedOccurence.java DELETED ---

--- NEW FILE: MergedOccurrence.java ---

package org.tm4j.topicmap.tmdm.merged;

import java.util.Set;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Collection;
import java.util.ArrayList;

import org.tm4j.net.Locator;

import org.tm4j.topicmap.tmdm.TopicMapEventListener;
import org.tm4j.topicmap.tmdm.*;

/**
	@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;
	}
	
	public MergedTopic getParent() {
		return parent;
	}
}

/*
	Copyright (c) 2007-2008 Xuân Baldauf. 
	
	This software is licensed, under the terms of
	* Apache 2 License
	* GPL v2 License
	* GPL v3 License
	* LGPL v2.1 License
	* MPL v1.1 License
	as well as each later version of these licenses.
	
	This means:
	(1) If you are using this software, you can choose any subset of the licenses mentioned, and you can choose any version of each of these licenses (starting with the respective version indicated). (Note that, however, choosing the empty set of licenses means that you do not have any right granted by any license at all.)
	(2) If you are committing contributions to this software (i.e. this software as part of the official TM4J sourcecode), then you agree to each of these licenses for your contribution (such that each user of this software has still at least the same set of rights and licenses when using this software together with you contribution compared to when using this software without your contribution).   
*/
// :tabSize=2:indentSize=2:

--- MergedOccurenceKey.java DELETED ---

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm/basic BasicOccurrence.java, NONE, 1.1 BasicOccurence.java, 1.1, NONE

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

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

Added Files:
	BasicOccurrence.java 
Removed Files:
	BasicOccurence.java 
Log Message:
Spelling fix: s/ccurence/ccurrence/ part 1 (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

--- BasicOccurence.java DELETED ---

--- NEW FILE: BasicOccurrence.java ---

package org.tm4j.topicmap.tmdm.basic;

import java.util.Set;
import java.util.Iterator;

import org.tm4j.net.Locator;

import org.tm4j.topicmap.tmdm.*;

/**
	@author <a href="mailto:xua...@pu...">Xuân Baldauf</a>
*/
public class BasicOccurence extends BasicScopeable implements Occurence {
	BasicTopic									parent;
	BasicTopic									type;
	Locator											datatype;
	String											value;
	
	protected BasicOccurence(BasicTopic parent,BasicTopic type,Locator datatype,String value) {
		this.parent		=	parent;
		this.type			=	type;
		this.datatype	=	datatype;
		this.value		=	value;
	}

	@TMDM
	public BasicTopic getParent() {
		return parent;
	}
	
	@TMDM
	@TMAPI
	public void setType(Topic type) {
		setType((BasicTopic) type);
	}
	
	public void setType(BasicTopic type) {
		assert type.getContainingTopicMap()==getContainingTopicMap();
		
		BasicTopic oldType = this.type;
		this.type = type;

		// We do not treat cases where the old value equals the new value specially. 
		getEventListener().notifyOccurenceTypeChanged(getContainingTopicMap(),getParent(),this,oldType,type); 		
	}
	
	@TMDM
	@TMAPI
	public BasicTopic getType() {
		return type;
	}
	
	@TMDM
	public void setDatatype(Locator datatype) {
		Locator oldDatatype = this.datatype;
		this.datatype = datatype;
		
		// We do not treat cases where the old value equals the new value specially.
		getEventListener().notifyOccurenceDatatypeChanged(getContainingTopicMap(),getParent(),this,oldDatatype,datatype);
	}
	
	@TMDM
	public Locator getDatatype() {
		return datatype;
	}
	
	@TMDM
	@TMAPI
	public void setValue(String value) {
		String oldValue = this.value;
		this.value = value;
		
		// We do not treat cases where the old value equals the new value specially.
		getEventListener().notifyOccurenceValueChanged(getContainingTopicMap(),getParent(),this,oldValue,value);
	}
	
	@TMAPI
	public String getValue() {
		return value;
	}
	
	protected BasicTopicMap getContainingTopicMap() {
		return getParent().getContainingTopicMap();
	}
	
	/**
		Remove as much as possible without conflicting with TMDM after this call. 
	*/
	protected void internalPreRemove() {
		super.internalPreRemove();
	}
	
	/**
		Remove everything else.
	*/
	protected void internalPostRemove() {
		super.internalPostRemove();
	}
	
	protected void removeAtParent() {
		getParent().internalRemove(this);
	}
}

/*
	Copyright (c) 2007-2008 Xuân Baldauf. 
	
	This software is licensed, under the terms of
	* Apache 2 License
	* GPL v2 License
	* GPL v3 License
	* LGPL v2.1 License
	* MPL v1.1 License
	as well as each later version of these licenses.
	
	This means:
	(1) If you are using this software, you can choose any subset of the licenses mentioned, and you can choose any version of each of these licenses (starting with the respective version indicated). (Note that, however, choosing the empty set of licenses means that you do not have any right granted by any license at all.)
	(2) If you are committing contributions to this software (i.e. this software as part of the official TM4J sourcecode), then you agree to each of these licenses for your contribution (such that each user of this software has still at least the same set of rights and licenses when using this software together with you contribution compared to when using this software without your contribution).   
*/
// :tabSize=2:indentSize=2:

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

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

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

Added Files:
	Occurrence.java ReadableOccurrence.java 
Removed Files:
	Occurence.java ReadableOccurence.java 
Log Message:
Spelling fix: s/ccurence/ccurrence/ part 1 (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

--- NEW FILE: ReadableOccurrence.java ---

package org.tm4j.topicmap.tmdm;

import java.util.Set;

import org.tm4j.net.Locator;

/**
	@author <a href="mailto:xua...@pu...">Xuân Baldauf</a>
*/
public interface ReadableOccurence extends ReadableScopeable {
	
	@TMDM
	@TMAPI
	public Topic getType();

	@TMDM
	public Locator getDatatype();
	
	@TMDM
	@TMAPI
	public String getValue();
	
	/**
		FIXME: it is unclear whether we should expose this method in this interface.
	*/
	@TMDM
	public ReadableTopic getParent();
}

/*
	Copyright (c) 2007-2008 Xuân Baldauf. 
	
	This software is licensed, under the terms of
	* Apache 2 License
	* GPL v2 License
	* GPL v3 License
	* LGPL v2.1 License
	* MPL v1.1 License
	as well as each later version of these licenses.
	
	This means:
	(1) If you are using this software, you can choose any subset of the licenses mentioned, and you can choose any version of each of these licenses (starting with the respective version indicated). (Note that, however, choosing the empty set of licenses means that you do not have any right granted by any license at all.)
	(2) If you are committing contributions to this software (i.e. this software as part of the official TM4J sourcecode), then you agree to each of these licenses for your contribution (such that each user of this software has still at least the same set of rights and licenses when using this software together with you contribution compared to when using this software without your contribution).   
*/
// :tabSize=2:indentSize=2:

--- ReadableOccurence.java DELETED ---

--- NEW FILE: Occurrence.java ---

package org.tm4j.topicmap.tmdm;

import java.util.Set;

import org.tm4j.net.Locator;

/**
	@author <a href="mailto:xua...@pu...">Xuân Baldauf</a>
*/
public interface Occurence extends ReadableOccurence,Scopeable {
	
	@TMDM
	@TMAPI
	public void setType(Topic type);
	
	@TMDM
	@TMAPI
	public Topic getType();
	
	@TMDM
	public void setDatatype(Locator datatype);

	@TMDM
	public Locator getDatatype();
	
	@TMDM
	@TMAPI
	public void setValue(String value);
	
	@TMDM
	@TMAPI
	public String getValue();
}

/*
	Copyright (c) 2007-2008 Xuân Baldauf. 
	
	This software is licensed, under the terms of
	* Apache 2 License
	* GPL v2 License
	* GPL v3 License
	* LGPL v2.1 License
	* MPL v1.1 License
	as well as each later version of these licenses.
	
	This means:
	(1) If you are using this software, you can choose any subset of the licenses mentioned, and you can choose any version of each of these licenses (starting with the respective version indicated). (Note that, however, choosing the empty set of licenses means that you do not have any right granted by any license at all.)
	(2) If you are committing contributions to this software (i.e. this software as part of the official TM4J sourcecode), then you agree to each of these licenses for your contribution (such that each user of this software has still at least the same set of rights and licenses when using this software together with you contribution compared to when using this software without your contribution).   
*/
// :tabSize=2:indentSize=2:

--- Occurence.java DELETED ---

[Tm4j-commits] tm4j README.txt,1.21,1.22

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

Update of /cvsroot/tm4j/tm4j
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23461

Modified Files:
	README.txt 
Log Message:
Update documentation regarding Java versions.

Index: README.txt
===================================================================
RCS file: /cvsroot/tm4j/tm4j/README.txt,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** README.txt	21 Jan 2008 19:04:36 -0000	1.21
--- README.txt	21 Jan 2008 19:47:14 -0000	1.22
***************
*** 68,74 ****
  JDK Version
  -----------
! The reference JDK for this version of TM4J is the Java 2 SDK, 
! Standard Edition 1.4.2. It's available from Sun Microsystems:
! http://java.sun.com/j2se/1.4.2/index.html
  
  TM4J is targetted for JDK 1.5 and later. If you have trouble
--- 68,75 ----
  JDK Version
  -----------
! The reference JDK for this version of TM4J is the
! Java SE Development Kit 6. 
! It is available from Sun Microsystems:
! http://java.sun.com/javase/downloads/
  
  TM4J is targetted for JDK 1.5 and later. If you have trouble

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm/merged MergedAssociationRoleKey.java, 1.1, 1.2 MergedOccurenceKey.java, 1.1, 1.2 MergedScopeableKey.java, 1.1, 1.2 MergedTopicMapView.java, 1.2, 1.3 MergedTopicNameKey.java, 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-serv21771/src/org/tm4j/topicmap/tmdm/merged

Modified Files:
	MergedAssociationRoleKey.java MergedOccurenceKey.java 
	MergedScopeableKey.java MergedTopicMapView.java 
	MergedTopicNameKey.java 
Log Message:
Bugfix: AssocationRole is actually not Scopeable: Fix the follow-up bugs triggered by type incompatibilities. Also found some more bugs regarding scope.

Index: MergedAssociationRoleKey.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedAssociationRoleKey.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MergedAssociationRoleKey.java	21 Jan 2008 11:13:45 -0000	1.1
--- MergedAssociationRoleKey.java	21 Jan 2008 19:43:57 -0000	1.2
***************
*** 18,22 ****
  	@author <a href="mailto:xua...@pu...">Xuân Baldauf</a>
  */
! public class MergedAssociationRoleKey extends MergedScopeableKey {
  	
  	protected MergedTopic	type;
--- 18,22 ----
  	@author <a href="mailto:xua...@pu...">Xuân Baldauf</a>
  */
! public class MergedAssociationRoleKey {
  	
  	protected MergedTopic	type;
***************
*** 24,29 ****
  	protected MergedTopic player;
  	
! 	protected MergedAssociationRoleKey(MergedTopic type,MergedTopic player,MergedScopeKey scope) {
! 		super(scope);
  		this.type		=	type;
  		this.player	= player;
--- 24,28 ----
  	protected MergedTopic player;
  	
! 	protected MergedAssociationRoleKey(MergedTopic type,MergedTopic player) {
  		this.type		=	type;
  		this.player	= player;
***************
*** 31,43 ****
  	
  	protected MergedAssociationRoleKey changeType(MergedTopic newType) {
! 		return new MergedAssociationRoleKey(newType,player,scope);
  	}
  	
  	protected MergedAssociationRoleKey changePlayer(MergedTopic newPlayer) {
! 		return new MergedAssociationRoleKey(type,newPlayer,scope);
! 	}
! 	
! 	protected MergedAssociationRoleKey changeScope(MergedScopeKey newScope) {
! 		return new MergedAssociationRoleKey(type,player,newScope);
  	}
  	
--- 30,38 ----
  	
  	protected MergedAssociationRoleKey changeType(MergedTopic newType) {
! 		return new MergedAssociationRoleKey(newType,player);
  	}
  	
  	protected MergedAssociationRoleKey changePlayer(MergedTopic newPlayer) {
! 		return new MergedAssociationRoleKey(type,newPlayer);
  	}
  	
***************
*** 55,67 ****
  	
  	public boolean equals(MergedAssociationRoleKey o) {
! 		return type.equals(o.type)&&player.equals(o.player)&&super.equals(o);
  	}
  	
  	public int hashCode() {
! 		return type.hashCode()^player.hashCode()^super.hashCode();
  	}
  	
  	public String toString() {
! 		return "MergedAssociationRoleKey[type="+type+",player="+player+",scope="+getScope()+"]";
  	}
  }
--- 50,62 ----
  	
  	public boolean equals(MergedAssociationRoleKey o) {
! 		return type.equals(o.type)&&player.equals(o.player);
  	}
  	
  	public int hashCode() {
! 		return type.hashCode()^player.hashCode();
  	}
  	
  	public String toString() {
! 		return "MergedAssociationRoleKey[type="+type+",player="+player+"]";
  	}
  }

Index: MergedTopicNameKey.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedTopicNameKey.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MergedTopicNameKey.java	21 Jan 2008 11:13:45 -0000	1.1
--- MergedTopicNameKey.java	21 Jan 2008 19:43:57 -0000	1.2
***************
*** 39,44 ****
  	}
  	
! 	protected MergedAssociationRoleKey changeScope(MergedScopeKey newScope) {
! 		return new MergedAssociationRoleKey(parent,type,newScope);
  	}
  	
--- 39,44 ----
  	}
  	
! 	protected MergedTopicNameKey changeScope(MergedScopeKey newScope) {
! 		return new MergedTopicNameKey(parent,type,value,newScope);
  	}
  	
***************
*** 52,60 ****
  	
  	public boolean equals(MergedTopicNameKey o) {
! 		return parent.equals(o.parent)&&type.equals(o.type)&&value.equals(o.value);
  	}
  	
  	public int hashCode() {
! 		return parent.hashCode()^type.hashCode()^value.hashCode();
  	}
  	
--- 52,60 ----
  	
  	public boolean equals(MergedTopicNameKey o) {
! 		return parent.equals(o.parent)&&type.equals(o.type)&&value.equals(o.value)&&super.equals(o);
  	}
  	
  	public int hashCode() {
! 		return parent.hashCode()^type.hashCode()^value.hashCode()^super.hashCode();
  	}
  	

Index: MergedTopicMapView.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedTopicMapView.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MergedTopicMapView.java	21 Jan 2008 19:21:15 -0000	1.2
--- MergedTopicMapView.java	21 Jan 2008 19:43:57 -0000	1.3
***************
*** 1115,1119 ****
  	
  	protected MergedAssociationRoleKey createAssociationRoleKey(ReadableAssociationRole source) {
! 		return new MergedAssociationRoleKey(getMergedTopic(source.getType()),getMergedTopic(source.getPlayer()),createScopeKey(source.getScope()));
  	}
  	
--- 1115,1119 ----
  	
  	protected MergedAssociationRoleKey createAssociationRoleKey(ReadableAssociationRole source) {
! 		return new MergedAssociationRoleKey(getMergedTopic(source.getType()),getMergedTopic(source.getPlayer()));
  	}
  	

Index: MergedScopeableKey.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedScopeableKey.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MergedScopeableKey.java	21 Jan 2008 11:13:45 -0000	1.1
--- MergedScopeableKey.java	21 Jan 2008 19:43:57 -0000	1.2
***************
*** 45,48 ****
--- 45,49 ----
  	
  	public int hashCode() {
+ 		// This should yield a NullPointerException, as scope can be null, shouldn't it?
  		return scope.hashCode();
  	}

Index: MergedOccurenceKey.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedOccurenceKey.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MergedOccurenceKey.java	21 Jan 2008 11:13:45 -0000	1.1
--- MergedOccurenceKey.java	21 Jan 2008 19:43:57 -0000	1.2
***************
*** 39,43 ****
  	}
  	
! 	protected MergedAssociationRoleKey changeScope(MergedScopeKey newScope) {
  		throw new UnsupportedOperationException();
  	}
--- 39,43 ----
  	}
  	
! 	protected MergedOccurenceKey changeScope(MergedScopeKey newScope) {
  		throw new UnsupportedOperationException();
  	}
***************
*** 52,60 ****
  	
  	public boolean equals(MergedOccurenceKey o) {
! 		return parent.equals(o.parent)&&type.equals(o.type)&&value.equals(o.value);
  	}
  	
  	public int hashCode() {
! 		return parent.hashCode()^type.hashCode()^value.hashCode();
  	}
  	
--- 52,60 ----
  	
  	public boolean equals(MergedOccurenceKey o) {
! 		return parent.equals(o.parent)&&type.equals(o.type)&&value.equals(o.value)&&super.equals(o);
  	}
  	
  	public int hashCode() {
! 		return parent.hashCode()^type.hashCode()^value.hashCode()^super.hashCode();
  	}
  	

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm/tm4j1 MemberImpl.java, 1.1, 1.2

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

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

Modified Files:
	MemberImpl.java 
Log Message:
Bugfix: AssocationRole is actually not Scopeable: Fix the follow-up bugs triggered by type incompatibilities. Also found some more bugs regarding scope.

Index: MemberImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1/MemberImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MemberImpl.java	21 Jan 2008 11:13:45 -0000	1.1
--- MemberImpl.java	21 Jan 2008 19:43:57 -0000	1.2
***************
*** 24,28 ****
  	@author <a href="mailto:xua...@pu...">Xuân Baldauf</a>
  */
! public class MemberImpl extends ScopedObjectImpl<org.tm4j.topicmap.tmdm.AssociationRole,org.tm4j.topicmap.tmdm.ReadableAssociationRole> implements org.tm4j.topicmap.Member {
  	
  	protected MemberImpl(org.tm4j.topicmap.tmdm.AssociationRole representedObject,TopicMapImpl container) {
--- 24,28 ----
  	@author <a href="mailto:xua...@pu...">Xuân Baldauf</a>
  */
! public class MemberImpl extends TopicMapObjectImpl<org.tm4j.topicmap.tmdm.AssociationRole,org.tm4j.topicmap.tmdm.ReadableAssociationRole> implements org.tm4j.topicmap.Member {
  	
  	protected MemberImpl(org.tm4j.topicmap.tmdm.AssociationRole representedObject,TopicMapImpl container) {

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm ReadableOccurence.java, 1.1, 1.2 ReadableTopicName.java, 1.2, 1.3

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

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

Modified Files:
	ReadableOccurence.java ReadableTopicName.java 
Log Message:
Let Occurence.getParent() exist. (due to a request triggered by a code-review by Benjamin Bock <bb-...@bo...>)

Index: ReadableTopicName.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/ReadableTopicName.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ReadableTopicName.java	21 Jan 2008 19:21:15 -0000	1.2
--- ReadableTopicName.java	21 Jan 2008 19:28:03 -0000	1.3
***************
*** 19,23 ****
  	public String getValue();
  
- 	
  	/**
  		FIXME: it is unclear whether we should expose this method in this interface.
--- 19,22 ----

Index: ReadableOccurence.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/ReadableOccurence.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReadableOccurence.java	21 Jan 2008 11:13:44 -0000	1.1
--- ReadableOccurence.java	21 Jan 2008 19:28:03 -0000	1.2
***************
*** 21,24 ****
--- 21,30 ----
  	@TMAPI
  	public String getValue();
+ 	
+ 	/**
+ 		FIXME: it is unclear whether we should expose this method in this interface.
+ 	*/
+ 	@TMDM
+ 	public ReadableTopic getParent();
  }
  

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm ReadableTopicName.java, 1.1, 1.2 TopicName.java, 1.1, 1.2

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

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

Modified Files:
	ReadableTopicName.java TopicName.java 
Log Message:
Spelling fix: s/wether/whether/ (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

Index: ReadableTopicName.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/ReadableTopicName.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReadableTopicName.java	21 Jan 2008 11:13:44 -0000	1.1
--- ReadableTopicName.java	21 Jan 2008 19:21:15 -0000	1.2
***************
*** 21,25 ****
  	
  	/**
! 		FIXME: it is unclear wether we should expose this method in this interface.
  	*/
  	@TMDM
--- 21,25 ----
  	
  	/**
! 		FIXME: it is unclear whether we should expose this method in this interface.
  	*/
  	@TMDM

Index: TopicName.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/TopicName.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TopicName.java	21 Jan 2008 11:13:44 -0000	1.1
--- TopicName.java	21 Jan 2008 19:21:15 -0000	1.2
***************
*** 28,32 ****
  	
  	/**
! 		FIXME: it is unclear wether we should expose this method in this interface.
  	*/
  	@TMDM
--- 28,32 ----
  	
  	/**
! 		FIXME: it is unclear whether we should expose this method in this interface.
  	*/
  	@TMDM

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm/merged MergedTopicMapView.java, 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-serv12342/src/org/tm4j/topicmap/tmdm/merged

Modified Files:
	MergedTopicMapView.java 
Log Message:
Spelling fix: s/wether/whether/ (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

Index: MergedTopicMapView.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedTopicMapView.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MergedTopicMapView.java	21 Jan 2008 11:13:45 -0000	1.1
--- MergedTopicMapView.java	21 Jan 2008 19:21:15 -0000	1.2
***************
*** 430,434 ****
  		Each such commonality link between two topics can be regarded as an edge of a graph where vertices are BasicTopics. The graph is connected.
  		Now this method may remove such a link and divide the graph in two connected subgraphs which are not connected which each other. In this case, and only in this case, the MergedTopic is to be split
! 		into two MergedTopics. But how to determine (1) wether the split into two connected components happened and (2) which member topics belong to which side?
  		
  		One can view the problem also indirectly by considering a bipartite graph, where one vertex partition are the BasicTopics and another vertex partition are the subjectLocators, and the edges are the
--- 430,434 ----
  		Each such commonality link between two topics can be regarded as an edge of a graph where vertices are BasicTopics. The graph is connected.
  		Now this method may remove such a link and divide the graph in two connected subgraphs which are not connected which each other. In this case, and only in this case, the MergedTopic is to be split
! 		into two MergedTopics. But how to determine (1) whether the split into two connected components happened and (2) which member topics belong to which side?
  		
  		One can view the problem also indirectly by considering a bipartite graph, where one vertex partition are the BasicTopics and another vertex partition are the subjectLocators, and the edges are the
***************
*** 629,633 ****
  	
  	/**
! 		Returns wether the given MergedTopic is now unknown, not indexed anywhere and basically not reachable from this TopicTopicMapView.
  		
  		This method is only used by assertions.
--- 629,633 ----
  	
  	/**
! 		Returns whether the given MergedTopic is now unknown, not indexed anywhere and basically not reachable from this TopicTopicMapView.
  		
  		This method is only used by assertions.
***************
*** 646,651 ****
  					if (!enablePartialSupport) {
  						// FIXME
! 						// check wether the topic is used as a reifier
! 						// check wether the topic is used as a name type, occurence type, association type, association role type, association role player
  						throw new UnsupportedOperationException();
  					}
--- 646,651 ----
  					if (!enablePartialSupport) {
  						// 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();
  					}
***************
*** 699,703 ****
  		
  		// normal unindex
! 		unindex(mergedTopic);	// normal unindex as last, as assertions check wether unindex is successful. 
  		
  		//=== atomicize ===//
--- 699,703 ----
  		
  		// normal unindex
! 		unindex(mergedTopic);	// normal unindex as last, as assertions check whether unindex is successful. 
  		
  		//=== atomicize ===//
***************
*** 782,787 ****
  				MergedAssociationKey	newKey								= oldKey.changeType(destination);
  				
! 				assert oldAssociation.getType()==source1;	// one should investigate wether this holds when nested mergings occur. Maybe the current destination topic will already be merged with another topic and thus should be replaced?
! 				assert oldKey.getType()==source1;					// one should investigate wether this holds when nested mergings occur. Maybe the current destination topic will already be merged with another topic and thus should be replaced?
  				
  				MergedAssociation			mergedAssociation			= mergedAssociationByKey.remove(oldKey);
--- 782,787 ----
  				MergedAssociationKey	newKey								= oldKey.changeType(destination);
  				
! 				assert oldAssociation.getType()==source1;	// one should investigate whether this holds when nested mergings occur. Maybe the current destination topic will already be merged with another topic and thus should be replaced?
! 				assert oldKey.getType()==source1;					// one should investigate whether this holds when nested mergings occur. Maybe the current destination topic will already be merged with another topic and thus should be replaced?
  				
  				MergedAssociation			mergedAssociation			= mergedAssociationByKey.remove(oldKey);
***************
*** 809,814 ****
  				MergedAssociationRoleKey	newKey								= oldKey.changeType(destination);
  				
! 				assert oldAssociationRole.getType()==source1;	// one should investigate wether this holds when nested mergings occur. Maybe the current destination topic will already be merged with another topic and thus should be replaced?
! 				assert oldKey.getType()==source1;					// one should investigate wether this holds when nested mergings occur. Maybe the current destination topic will already be merged with another topic and thus should be replaced?
  				
  				MergedAssociationRole			mergedAssociationRole			= oldAssociationRole.getParent().mergedAssociationRoleByKey.remove(oldKey);
--- 809,814 ----
  				MergedAssociationRoleKey	newKey								= oldKey.changeType(destination);
  				
! 				assert oldAssociationRole.getType()==source1;	// one should investigate whether this holds when nested mergings occur. Maybe the current destination topic will already be merged with another topic and thus should be replaced?
! 				assert oldKey.getType()==source1;					// one should investigate whether this holds when nested mergings occur. Maybe the current destination topic will already be merged with another topic and thus should be replaced?
  				
  				MergedAssociationRole			mergedAssociationRole			= oldAssociationRole.getParent().mergedAssociationRoleByKey.remove(oldKey);
***************
*** 836,841 ****
  				MergedAssociationRoleKey	newKey								= oldKey.changePlayer(destination);
  				
! 				assert oldAssociationRole.getPlayer()==source1;	// one should investigate wether this holds when nested mergings occur. Maybe the current destination topic will already be merged with another topic and thus should be replaced?
! 				assert oldKey.getPlayer()==source1;					// one should investigate wether this holds when nested mergings occur. Maybe the current destination topic will already be merged with another topic and thus should be replaced?
  				
  				MergedAssociationRole			mergedAssociationRole			= oldAssociationRole.getParent().mergedAssociationRoleByKey.remove(oldKey);
--- 836,841 ----
  				MergedAssociationRoleKey	newKey								= oldKey.changePlayer(destination);
  				
! 				assert oldAssociationRole.getPlayer()==source1;	// one should investigate whether this holds when nested mergings occur. Maybe the current destination topic will already be merged with another topic and thus should be replaced?
! 				assert oldKey.getPlayer()==source1;					// one should investigate whether this holds when nested mergings occur. Maybe the current destination topic will already be merged with another topic and thus should be replaced?
  				
  				MergedAssociationRole			mergedAssociationRole			= oldAssociationRole.getParent().mergedAssociationRoleByKey.remove(oldKey);
***************
*** 1068,1072 ****
  	
  	/**
! 		Returns wether we need to notify a listener that
  		<ul>
  			<li>a topic was split into two topics or</li>
--- 1068,1072 ----
  	
  	/**
! 		Returns whether we need to notify a listener that
  		<ul>
  			<li>a topic was split into two topics or</li>
***************
*** 1085,1089 ****
  	
  	/**
! 		Checks wether the given ReadableTopicMap is one of the topicmaps this MergedTopicMapView represents.
  	*/
  	protected boolean isRepresentedTopicMap(ReadableTopicMap topicMap) {
--- 1085,1089 ----
  	
  	/**
! 		Checks whether the given ReadableTopicMap is one of the topicmaps this MergedTopicMapView represents.
  	*/
  	protected boolean isRepresentedTopicMap(ReadableTopicMap topicMap) {

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm/basic BasicTopic.java, 1.1, 1.2

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

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

Modified Files:
	BasicTopic.java 
Log Message:
Spelling fix: s/wether/whether/ (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

Index: BasicTopic.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/basic/BasicTopic.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BasicTopic.java	21 Jan 2008 11:13:44 -0000	1.1
--- BasicTopic.java	21 Jan 2008 19:21:15 -0000	1.2
***************
*** 29,33 ****
  	(Thus, we can pack more topics in RAM and we are faster at disk accesses (and we should be faster even when only doing RAM accesses, as RAM is nowadays slower than CPUs).)
  	
! 	The methods for adding and removing items to these sets currently return wether they succeeded.
  	Possibly they should just always return void (or throw exceptions in case of failure), if reporting success makes other implementations inefficient or harder to implement. 
  
--- 29,33 ----
  	(Thus, we can pack more topics in RAM and we are faster at disk accesses (and we should be faster even when only doing RAM accesses, as RAM is nowadays slower than CPUs).)
  	
! 	The methods for adding and removing items to these sets currently return whether they succeeded.
  	Possibly they should just always return void (or throw exceptions in case of failure), if reporting success makes other implementations inefficient or harder to implement. 
  
***************
*** 45,49 ****
  	/**
  		While rolesPlayed is specified in TMDM, it is redundant from a data completeness point of view.
! 		Wethere a Topic plays an AssociationRole in a particular Association can be determined by looking at the AssociationRoles of that Association.
  		
  		Thus, as BasicTopic should only provide a backend (and should not provide indexing functionality), one may actually consider not implementing
--- 45,49 ----
  	/**
  		While rolesPlayed is specified in TMDM, it is redundant from a data completeness point of view.
! 		Whethere a Topic plays an AssociationRole in a particular Association can be determined by looking at the AssociationRoles of that Association.
  		
  		Thus, as BasicTopic should only provide a backend (and should not provide indexing functionality), one may actually consider not implementing

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm/tm4j1 TopicMapObjectImpl.java, 1.1, 1.2

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

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

Modified Files:
	TopicMapObjectImpl.java 
Log Message:
Spelling fix: s/wether/whether/ (found thanks to a code-review by Benjamin Bock <bb-...@bo...>)

Index: TopicMapObjectImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1/TopicMapObjectImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TopicMapObjectImpl.java	21 Jan 2008 11:13:45 -0000	1.1
--- TopicMapObjectImpl.java	21 Jan 2008 19:21:15 -0000	1.2
***************
*** 116,120 ****
  
  	/**
! 	 * Returns wether the ID of this TopicMapObject equals to the ID of the TopicMapObject provided.
  	 *
  	 * This method is to allow for implementations which do not have a notion of explicit ID strings or
--- 116,120 ----
  
  	/**
! 	 * Returns whether the ID of this TopicMapObject equals to the ID of the TopicMapObject provided.
  	 *
  	 * This method is to allow for implementations which do not have a notion of explicit ID strings or