[Tm4j-commits] tm4j/src/org/tm4j/topicmap/utils XTMBuilder.java, 1.76, 1.77

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

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

Modified Files:
	XTMBuilder.java 
Log Message:
Revert partial change of http://tm4j.cvs.sourceforge.net/tm4j/tm4j/src/org/tm4j/topicmap/utils/XTMBuilder.java?r1=1.72&r2=1.73 . Conal has complained about this for the partial change, and for the right reasons. He found that this change broke XTM1-support. It is actually also incorrect for XTM2-support, as http://www.isotopicmaps.org/sam/sam-xtm/#sect-proc-topicRef states that the locator is to be added to the "[item identifiers]" property, not to the "[subject identifiers]" property. This fixes testcase resource/tests/mergeOccurences0.xtm2 as well as resource/tests/mergeOccurences1.xtm2 .

Index: XTMBuilder.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/utils/XTMBuilder.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** XTMBuilder.java	21 Jan 2008 08:41:10 -0000	1.76
--- XTMBuilder.java	11 Jun 2008 05:33:51 -0000	1.77
***************
*** 1016,1024 ****
  
              case REFTYPE_TOPIC:
!                 if (purpose != SUBJECTIDENTITY) { // This has side-effects for XTM 1.0, but this is considered correct.
!                     refTopic = getTopicBySubjectIndicator(expandedRef.getAddress());
!                 } else {
!                     refTopic = getTopicBySourceLocator(expandedRef);
!                 }
  
                  break;
--- 1016,1020 ----
  
              case REFTYPE_TOPIC:
!                 refTopic = getTopicBySourceLocator(expandedRef);
  
                  break;
***************
*** 1780,1783 ****
--- 1776,1782 ----
  /*
   * $Log$
+  * Revision 1.77  2008/06/11 05:33:51  mediumnet
+  * Revert partial change of http://tm4j.cvs.sourceforge.net/tm4j/tm4j/src/org/tm4j/topicmap/utils/XTMBuilder.java?r1=1.72&r2=1.73 . Conal has complained about this for the partial change, and for the right reasons. He found that this change broke XTM1-support. It is actually also incorrect for XTM2-support, as http://www.isotopicmaps.org/sam/sam-xtm/#sect-proc-topicRef states that the locator is to be added to the "[item identifiers]" property, not to the "[subject identifiers]" property. This fixes testcase resource/tests/mergeOccurences0.xtm2 as well as resource/tests/mergeOccurences1.xtm2 .
+  *
   * Revision 1.76  2008/01/21 08:41:10  mediumnet
   * Refine transactions support for XTMBuilder.