[tmapi-commit] SF.net SVN: tmapi:[86] trunk/src/main/java/org/tmapi/core

[<jos...@us...>]

Revision: 86
          http://tmapi.svn.sourceforge.net/tmapi/?rev=86&view=rev
Author:   joschmidt
Date:     2008-11-04 20:33:48 +0000 (Tue, 04 Nov 2008)

Log Message:
-----------
mergeIn(): Extended the comment section regarding the case this.equals(other)

Modified Paths:
--------------
    trunk/src/main/java/org/tmapi/core/Topic.java
    trunk/src/main/java/org/tmapi/core/TopicMap.java

Modified: trunk/src/main/java/org/tmapi/core/Topic.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/Topic.java	2008-11-03 15:04:55 UTC (rev 85)
+++ trunk/src/main/java/org/tmapi/core/Topic.java	2008-11-04 20:33:48 UTC (rev 86)
@@ -479,6 +479,9 @@
      * the {@link TopicMap}.
      * </p>
      * <p>
+     * If <tt>this.equals(other)</tt> no changes are made to the topic.
+     * </p>
+     * <p>
      * NOTE: The other topic MUST belong to the same {@link TopicMap} instance 
      * as this topic! 
      * </p>

Modified: trunk/src/main/java/org/tmapi/core/TopicMap.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/TopicMap.java	2008-11-03 15:04:55 UTC (rev 85)
+++ trunk/src/main/java/org/tmapi/core/TopicMap.java	2008-11-04 20:33:48 UTC (rev 86)
@@ -222,7 +222,7 @@
     public void close();
 
     /**
-     * Merges the topic map <code>other</code> into this topic map.
+     * Merges the topic map <tt>other</tt> into this topic map.
      * <p>
      * All {@link Topic}s and {@link Association}s and all of their contents in
      * <tt>other</tt> will be added to this topic map. 
@@ -232,7 +232,12 @@
      * topic map as defined by the
      * <a href="http://www.isotopicmaps.org/sam/sam-model/#d0e1862">Topic Maps - Data Model (TMDM) merging rules</a>. 
      * </p>
+     * <p>
      * The merge process will not modify <tt>other</tt> in any way.
+     * </p>
+     * <p>
+     * If <tt>this.equals(other)</tt> no changes are made to the topic map.
+     * </p>
      * 
      * @param other The topic map to be merged with this topic map instance.
      */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.