From: Xuan B. <med...@us...> - 2008-06-11 06:01:58
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/utils In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13436/src/org/tm4j/topicmap/utils Modified Files: XTMBuilder.java Log Message: Fix missing "break". Maybe the sourcecode should be reformatted (e.g. to Sun Java Code Conventions) to make spotting this more obvious. Index: XTMBuilder.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/utils/XTMBuilder.java,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** XTMBuilder.java 11 Jun 2008 05:33:51 -0000 1.77 --- XTMBuilder.java 11 Jun 2008 06:02:02 -0000 1.78 *************** *** 1115,1118 **** --- 1115,1119 ---- m_currScope.add(refTopic); + break; case 0: if (refType == REFTYPE_SUBJECTIDENTIFIER) { *************** *** 1776,1779 **** --- 1777,1783 ---- /* * $Log$ + * Revision 1.78 2008/06/11 06:02:02 mediumnet + * Fix missing "break". Maybe the sourcecode should be reformatted (e.g. to Sun Java Code Conventions) to make spotting this more obvious. + * * 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 . |