You can subscribe to this list here.
2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(9) |
Jun
(30) |
Jul
(74) |
Aug
(2) |
Sep
(91) |
Oct
(27) |
Nov
(77) |
Dec
(33) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2002 |
Jan
(175) |
Feb
(133) |
Mar
(94) |
Apr
(65) |
May
(108) |
Jun
(100) |
Jul
(46) |
Aug
(19) |
Sep
(145) |
Oct
(289) |
Nov
(134) |
Dec
(211) |
2003 |
Jan
(106) |
Feb
(269) |
Mar
(106) |
Apr
(202) |
May
(300) |
Jun
(83) |
Jul
(70) |
Aug
(217) |
Sep
(183) |
Oct
(292) |
Nov
(324) |
Dec
(117) |
2004 |
Jan
(318) |
Feb
(151) |
Mar
(64) |
Apr
(195) |
May
(279) |
Jun
(263) |
Jul
(280) |
Aug
(167) |
Sep
(91) |
Oct
(175) |
Nov
(34) |
Dec
(38) |
2005 |
Jan
|
Feb
|
Mar
(4) |
Apr
|
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(5) |
2006 |
Jan
|
Feb
|
Mar
(5) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(6) |
2007 |
Jan
(2) |
Feb
(11) |
Mar
(1) |
Apr
(33) |
May
(13) |
Jun
(1) |
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
2008 |
Jan
(191) |
Feb
|
Mar
(1) |
Apr
|
May
(1) |
Jun
(33) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(14) |
2009 |
Jan
(39) |
Feb
(6) |
Mar
(22) |
Apr
(31) |
May
(78) |
Jun
(74) |
Jul
(39) |
Aug
(22) |
Sep
(16) |
Oct
(32) |
Nov
(4) |
Dec
(5) |
2010 |
Jan
(1) |
Feb
|
Mar
(33) |
Apr
(45) |
May
(66) |
Jun
(63) |
Jul
(32) |
Aug
(56) |
Sep
(19) |
Oct
(1) |
Nov
|
Dec
|
2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
|
Dec
|
2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
(1) |
2016 |
Jan
(1) |
Feb
(1) |
Mar
(3) |
Apr
|
May
(1) |
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
|
From: Xuan B. <med...@us...> - 2008-06-11 06:16:20
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/utils In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20270/src/org/tm4j/topicmap/utils Modified Files: TopicMapHandler.java XTMBuilder.java XTMParser.java Log Message: Support for subjectLocator. Index: XTMBuilder.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/utils/XTMBuilder.java,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** XTMBuilder.java 11 Jun 2008 06:02:02 -0000 1.78 --- XTMBuilder.java 11 Jun 2008 06:16:21 -0000 1.79 *************** *** 1015,1018 **** --- 1015,1024 ---- break; + case REFTYPE_SUBJECTLOCATOR: + + refTopic = getTopicBySubject(expandedRef); + + break; + case REFTYPE_TOPIC: refTopic = getTopicBySourceLocator(expandedRef); *************** *** 1117,1123 **** break; case 0: ! if (refType == REFTYPE_SUBJECTIDENTIFIER) { ! m_currTopic.addSubjectIndicator(m_locatorFactory.createLocator("URI", expandedRef.getAddress())); ! } break; --- 1123,1134 ---- break; case 0: ! switch (refType) { ! case REFTYPE_SUBJECTIDENTIFIER: ! m_currTopic.addSubjectIndicator(m_locatorFactory.createLocator("URI", expandedRef.getAddress())); ! break; ! /* case REFTYPE_SUBJECTLOCATOR: ! m_currTopic.setSubjectIdentity(m_locatorFactory.createLocator("URI", expandedRef.getAddress())); ! break; ! */ } break; *************** *** 1777,1780 **** --- 1788,1794 ---- /* * $Log$ + * Revision 1.79 2008/06/11 06:16:21 mediumnet + * Support for subjectLocator. + * * 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. Index: XTMParser.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/utils/XTMParser.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** XTMParser.java 12 Apr 2007 13:58:12 -0000 1.21 --- XTMParser.java 11 Jun 2008 06:16:21 -0000 1.22 *************** *** 58,61 **** --- 58,62 ---- public static final String XTM2_NS_URI = "http://www.topicmaps.org/xtm/"; public static final String SUBJECTIDENTIFIER = "subjectIdentifier"; + public static final String SUBJECTLOCATOR = "subjectLocator"; public static final String NAME = "name"; public static final String VALUE = "value"; *************** *** 184,187 **** --- 185,190 ---- } else if (enableXTM2support&&xtmClass.equals(SUBJECTIDENTIFIER)) { parseSubjectIdentifier(atts); + } else if (enableXTM2support&&xtmClass.equals(SUBJECTLOCATOR)) { + parseSubjectLocator(atts); } else if (enableXTM2support&&xtmClass.equals(NAME)) { parseNameStart(atts); *************** *** 431,434 **** --- 434,449 ---- } + public void parseSubjectLocator(Attributes atts) + throws TopicMapProcessingException { + String id = getXTMAttribute(ID, atts); + String ref = getXTMAttribute(HREF, atts); + + if (ref != null) { + m_builder.ref(id, TopicMapHandler.REFTYPE_SUBJECTLOCATOR, ref, (String) m_xmlBaseStack.peek()); + } else { + warn("Encountered a subjectIdentifier element with no href attribute. This element will be ignored."); + } + } + public void parseNameStart(Attributes atts) throws TopicMapProcessingException { // FIXME: need to process type Index: TopicMapHandler.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/utils/TopicMapHandler.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TopicMapHandler.java 12 Apr 2007 12:57:48 -0000 1.10 --- TopicMapHandler.java 11 Jun 2008 06:16:21 -0000 1.11 *************** *** 17,20 **** --- 17,21 ---- public static final int REFTYPE_SUBJECTIDENTIFIER = 3; + public static final int REFTYPE_SUBJECTLOCATOR = 4; public void startTopicMap(String id, String xmlBase) |
From: Xuan B. <med...@us...> - 2008-06-11 06:16:19
|
Update of /cvsroot/tm4j/tm4j/resource/tests In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20270/resource/tests Modified Files: subjectLocators0.xtm2 Log Message: Support for subjectLocator. Index: subjectLocators0.xtm2 =================================================================== RCS file: /cvsroot/tm4j/tm4j/resource/tests/subjectLocators0.xtm2,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** subjectLocators0.xtm2 11 Jun 2008 05:51:34 -0000 1.1 --- subjectLocators0.xtm2 11 Jun 2008 06:16:21 -0000 1.2 *************** *** 3,11 **** <topic id="A0"> <subjectLocator href="http://test-cases.psi.tm4j.org/genericDummyTopics/A"/> - <itemIdentity href="#A0"/> </topic> <topic id="A1"> <subjectLocator href="http://test-cases.psi.tm4j.org/genericDummyTopics/A"/> - <itemIdentity href="#A1"/> </topic> </topicMap> --- 3,9 ---- |
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 . |
From: Xuan B. <med...@us...> - 2008-06-11 05:51:30
|
Update of /cvsroot/tm4j/tm4j/resource/tests In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8948/resource/tests Added Files: subjectLocators0.xtm2 Log Message: Add a testcase file. --- NEW FILE: subjectLocators0.xtm2 --- <?xml version="1.0" encoding="UTF-8"?> <topicMap version="2.0" xmlns="http://www.topicmaps.org/xtm/"> <topic id="A0"> <subjectLocator href="http://test-cases.psi.tm4j.org/genericDummyTopics/A"/> <itemIdentity href="#A0"/> </topic> <topic id="A1"> <subjectLocator href="http://test-cases.psi.tm4j.org/genericDummyTopics/A"/> <itemIdentity href="#A1"/> </topic> </topicMap> <!-- Author: Xuân Baldauf This tests the support for subject locators. The resulting topic map should have only one topic, not two. --> |
From: Xuan B. <med...@us...> - 2008-06-11 05:33:50
|
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. |
From: Xuan B. <med...@us...> - 2008-06-11 05:17:03
|
Update of /cvsroot/tm4j/tm4j/resource/tests In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27123/resource/tests Added Files: mergeOccurences1.xtm2 Log Message: Add a testcase file. --- NEW FILE: mergeOccurences1.xtm2 --- <?xml version="1.0" encoding="UTF-8"?> <topicMap version="2.0" xmlns="http://www.topicmaps.org/xtm/"> <topic id="B"> <occurrence><type><topicRef href="#A0"/></type><resourceData>test</resourceData></occurrence> </topic> <topic id="A0"> <subjectIdentifier href="http://test-cases.psi.tm4j.org/genericDummyTopics/A"/> </topic> </topicMap> <!-- Author: Xuân Baldauf The number of subject identifiers of the topic with subject identifier "http://test-cases.psi.tm4j.org/genericDummyTopics/A" should equal exactly one. In a historic implementation, an item identifier was leaked as subject identifier. The reason for the leak was that the initial <topicRef href="#A0"/> creates an internal topic, where the subject identifier is "#A0", and not the item identifier. --> |
From: Xuan B. <med...@us...> - 2008-06-11 04:59:01
|
Update of /cvsroot/tm4j/tm4j/resource/tests In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20807/resource/tests Added Files: mergeOccurences0.xtm2 Log Message: Add a testcase file. --- NEW FILE: mergeOccurences0.xtm2 --- <?xml version="1.0" encoding="UTF-8"?> <topicMap version="2.0" xmlns="http://www.topicmaps.org/xtm/"> <topic id="B"> <occurrence><type><topicRef href="#A0"/></type><resourceData>test</resourceData></occurrence> </topic> <topic id="A0"> <subjectIdentifier href="http://test-cases.psi.tm4j.org/genericDummyTopics/A"/> </topic> <topic id="A1"> <subjectIdentifier href="http://test-cases.psi.tm4j.org/genericDummyTopics/A"/> </topic> </topicMap> <!-- Author: Xuân Baldauf The number of subject identifiers of the topic with subject identifier "http://test-cases.psi.tm4j.org/genericDummyTopics/A" should equal exactly one. In a historic implementation, an item identifier was leaked as subject identifier. --> |
From: Xuan B. <med...@us...> - 2008-06-11 04:55:35
|
Update of /cvsroot/tm4j/tm4j/resource/tests In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19199/resource/tests Added Files: mergeAssociations1.xtm2 Log Message: Add a testcase file. --- NEW FILE: mergeAssociations1.xtm2 --- <?xml version="1.0" encoding="UTF-8"?> <topicMap version="2.0" xmlns="http://www.topicmaps.org/xtm/"> <topic id="A0"> <subjectIdentifier href="http://test-cases.psi.tm4j.org/genericDummyTopics/A"/> </topic> <topic id="B0"> <subjectIdentifier href="http://test-cases.psi.tm4j.org/genericDummyTopics/B"/> </topic> <topic id="C0"> <subjectIdentifier href="http://test-cases.psi.tm4j.org/genericDummyTopics/C"/> </topic> <association> <type><topicRef href="#A0"/></type> <role> <type><topicRef href="#B0"/></type> <topicRef href="#C0"/> </role> </association> <topic id="A1"> <subjectIdentifier href="http://test-cases.psi.tm4j.org/genericDummyTopics/A"/> </topic> <topic id="B1"> <subjectIdentifier href="http://test-cases.psi.tm4j.org/genericDummyTopics/B"/> </topic> <topic id="C1"> <subjectIdentifier href="http://test-cases.psi.tm4j.org/genericDummyTopics/C"/> </topic> <association> <type><topicRef href="#A1"/></type> <role> <type><topicRef href="#B1"/></type> <topicRef href="#C1"/> </role> </association> </topicMap> <!-- Author: Xuân Baldauf This testcase should yield in a topic map which whose number of associations is exactly one. --> |
From: Xuan B. <med...@us...> - 2008-06-11 04:38:21
|
Update of /cvsroot/tm4j/tm4j/resource/tests In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11174/resource/tests Modified Files: mergeAssociations0.xtm2 Log Message: Comment testcase resource/tests/mergeAssociations0.xtm . Index: mergeAssociations0.xtm2 =================================================================== RCS file: /cvsroot/tm4j/tm4j/resource/tests/mergeAssociations0.xtm2,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mergeAssociations0.xtm2 11 Jun 2008 04:00:20 -0000 1.1 --- mergeAssociations0.xtm2 11 Jun 2008 04:38:28 -0000 1.2 *************** *** 34,36 **** </association> </topicMap> ! <!-- Author: --> \ No newline at end of file --- 34,40 ---- </association> </topicMap> ! <!-- ! Author: Xuân Baldauf ! ! This testcase should yield in a topic map which whose number of associations is exactly one. ! --> |
From: Xuan B. <med...@us...> - 2008-06-11 04:36:25
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10349/src/org/tm4j/topicmap/tmdm/merged Modified Files: MergedAssociation.java Log Message: Fix TM4J2 for testcase resource/tests/mergeAssociations0.xtm (TM4J1 still fails this testcase.). Index: MergedAssociation.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedAssociation.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MergedAssociation.java 11 Jun 2008 02:20:56 -0000 1.2 --- MergedAssociation.java 11 Jun 2008 04:36:31 -0000 1.3 *************** *** 121,124 **** --- 121,126 ---- assert newMergedAssociation==mergedAssociationForNewKey; + getContainer().indexAssociationToMergedAssociation(associationRole.getParent(),newMergedAssociation); + // delete this MergedAssociation. invalidate(); // maybe invalidate later? *************** *** 134,139 **** */ } ! } } --- 136,155 ---- */ } + } + + protected void addComponent(ReadableAssociation component) { + super.addComponent(component); ! if (!hasOnlyExactlyOneComponent()) { // we have two or more components now ! indexAllIncomingAssociationRoles(component,true); // FIXME: check whether notifyListener==true is correct here, or whether notifyListener should be set as the same value of the notifyListener of the governing merging process (if there is any) ! } ! } ! ! protected void indexAllIncomingAssociationRoles(ReadableAssociation component,boolean notifyListener) { ! for (ReadableAssociationRole associationRole : component.getRoles()) { ! MergedAssociationRoleKey key = getContainer().createAssociationRoleKey(associationRole); ! ! internalIndexAssociationRole(associationRole,key,notifyListener); ! } } } |
From: Xuan B. <med...@us...> - 2008-06-11 04:00:20
|
Update of /cvsroot/tm4j/tm4j/resource/tests In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27259/resource/tests Added Files: mergeAssociations0.xtm2 Log Message: Add a testcase file. --- NEW FILE: mergeAssociations0.xtm2 --- <?xml version="1.0" encoding="UTF-8"?> <topicMap version="2.0" xmlns="http://www.topicmaps.org/xtm/"> <topic id="A0"> <subjectIdentifier href="http://test-cases.psi.tm4j.org/genericDummyTopics/A"/> </topic> <topic id="A1"> <subjectIdentifier href="http://test-cases.psi.tm4j.org/genericDummyTopics/A"/> </topic> <topic id="B0"> <subjectIdentifier href="http://test-cases.psi.tm4j.org/genericDummyTopics/B"/> </topic> <topic id="B1"> <subjectIdentifier href="http://test-cases.psi.tm4j.org/genericDummyTopics/B"/> </topic> <topic id="C0"> <subjectIdentifier href="http://test-cases.psi.tm4j.org/genericDummyTopics/C"/> </topic> <topic id="C1"> <subjectIdentifier href="http://test-cases.psi.tm4j.org/genericDummyTopics/C"/> </topic> <association> <type><topicRef href="#A0"/></type> <role> <type><topicRef href="#B0"/></type> <topicRef href="#C0"/> </role> </association> <association> <type><topicRef href="#A1"/></type> <role> <type><topicRef href="#B1"/></type> <topicRef href="#C1"/> </role> </association> </topicMap> <!-- Author: --> |
From: Xuan B. <med...@us...> - 2008-06-11 02:49:10
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/basic In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32429/src/org/tm4j/topicmap/tmdm/basic Modified Files: BasicAssociation.java BasicAssociationRole.java Log Message: Implement BasicAssociation.toString() Index: BasicAssociationRole.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/basic/BasicAssociationRole.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BasicAssociationRole.java 21 Jan 2008 19:11:20 -0000 1.2 --- BasicAssociationRole.java 11 Jun 2008 02:49:14 -0000 1.3 *************** *** 103,106 **** --- 103,110 ---- getParent().internalRemove(this); } + + public String toString() { + return "BasicAssociationRole[type="+type+",player="+player+"]"; + } } Index: BasicAssociation.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/basic/BasicAssociation.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BasicAssociation.java 21 Jan 2008 11:13:44 -0000 1.1 --- BasicAssociation.java 11 Jun 2008 02:49:14 -0000 1.2 *************** *** 139,142 **** --- 139,146 ---- getParent().internalRemove(this); } + + public String toString() { + return "BasicAssociation[type="+type+",roles="+roles+"]"; + } } |
From: Xuan B. <med...@us...> - 2008-06-11 02:41:30
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29125/src/org/tm4j/topicmap/tmdm/tm4j1 Modified Files: TopicImpl.java TopicMapImpl.java Log Message: Implement retrieving of occurrences in TM4J1 compatibility layer. Index: TopicImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1/TopicImpl.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TopicImpl.java 11 Jun 2008 02:20:15 -0000 1.11 --- TopicImpl.java 11 Jun 2008 02:41:37 -0000 1.12 *************** *** 389,393 **** // throw new UnsupportedOperationException(); // FIXME ! return Collections.emptyList(); } --- 389,394 ---- // throw new UnsupportedOperationException(); // FIXME ! // return Collections.emptyList(); ! return getContainer().mergedToExternalOccurrences(getMergedObject().getOccurrences()); } Index: TopicMapImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1/TopicMapImpl.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** TopicMapImpl.java 23 Jan 2008 20:54:15 -0000 1.18 --- TopicMapImpl.java 11 Jun 2008 02:41:37 -0000 1.19 *************** *** 24,27 **** --- 24,28 ---- import org.tm4j.topicmap.tmdm.merged.MergedTopicMap; import org.tm4j.topicmap.tmdm.merged.MergedTopicName; + import org.tm4j.topicmap.tmdm.merged.MergedOccurrence; import org.tm4j.topicmap.tmdm.merged.MergedAssociation; import org.tm4j.topicmap.tmdm.merged.MergedAssociationRole; *************** *** 203,206 **** --- 204,211 ---- } + protected org.tm4j.topicmap.tmdm.Occurrence mergedToUnmerged(MergedOccurrence merged) { + return (org.tm4j.topicmap.tmdm.Occurrence) merged.getRandomComponent(); + } + protected org.tm4j.topicmap.tmdm.Association mergedToUnmerged(MergedAssociation merged) { return (org.tm4j.topicmap.tmdm.Association) merged.getRandomComponent(); *************** *** 251,254 **** --- 256,267 ---- } + protected OccurrenceImpl mergedToExternal(MergedOccurrence merged) { + if (merged!=null) { + return unmergedToExternal(mergedToUnmerged(merged)); + } else { + return null; + } + } + protected Set<TopicImpl> mergedToExternalTopics(Set<? extends MergedTopic> merged) { return new MappedSet<MergedTopic,TopicImpl>(getMergedTopicMapView().getMergedTopics()) { *************** *** 293,296 **** --- 306,317 ---- } + protected Collection<OccurrenceImpl> mergedToExternalOccurrences(Collection<? extends MergedOccurrence> merged) { + return new MappedCollection<MergedOccurrence,OccurrenceImpl>(merged) { + protected OccurrenceImpl map(MergedOccurrence key) { + return mergedToExternal(key); + } + }; + } + protected TopicMapObjectImpl unmergedToExternal(org.tm4j.topicmap.tmdm.TopicMapConstruct unmerged) { if (unmerged instanceof org.tm4j.topicmap.tmdm.Topic) { |
From: Xuan B. <med...@us...> - 2008-06-11 02:40:27
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/utils In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28637/src/org/tm4j/topicmap/utils Modified Files: TopicMapWalker.java Log Message: Make walkTypeInstanceAssociations externally configurable. Index: TopicMapWalker.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/utils/TopicMapWalker.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** TopicMapWalker.java 21 Jan 2008 08:47:45 -0000 1.26 --- TopicMapWalker.java 11 Jun 2008 02:40:31 -0000 1.27 *************** *** 29,34 **** public class TopicMapWalker { WalkerHandler m_handler; ! boolean m_walkTypeInstanceAssociations = false; String m_idRefPrefix = "#"; Locator m_classInstancePSI = null; --- 29,37 ---- public class TopicMapWalker { + + static boolean defaultWalkTypeInstanceAssociations = Boolean.parseBoolean(System.getProperty("org.tm4j.topicmap.utils.TopicMapWalker.walkTypeInstanceAssociations","false")); + WalkerHandler m_handler; ! boolean m_walkTypeInstanceAssociations = defaultWalkTypeInstanceAssociations; String m_idRefPrefix = "#"; Locator m_classInstancePSI = null; |
From: Xuan B. <med...@us...> - 2008-06-11 02:27:11
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23409/src/org/tm4j/topicmap/tmdm/merged Modified Files: MergedTopic.java MergedTopicMapView.java Log Message: Index MergedOccurence objects properly. Index: MergedTopic.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedTopic.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MergedTopic.java 21 Jan 2008 11:13:45 -0000 1.1 --- MergedTopic.java 11 Jun 2008 02:27:17 -0000 1.2 *************** *** 30,33 **** --- 30,34 ---- protected Set<MergedAssociationRole> usedAsAssociationRolePlayer; protected Set<MergedTopicName> usedAsTopicNameParent; + protected Set<MergedOccurrence> usedAsOccurrenceParent; /** *************** *** 164,167 **** --- 165,208 ---- } + protected void addUsedAsOccurrenceParent(MergedOccurrence user) { + if (usedAsOccurrenceParent==null) { + usedAsOccurrenceParent = getContainer().createIdentitySet(); + } + + boolean success = usedAsOccurrenceParent.add(user); + + assert success : "Could not add "+user+" to "+this+".usedAsOccurrenceParent, usedAsOccurrenceParent already contains this user."; + } + + protected void removeUsedAsOccurrenceParent(MergedOccurrence user) { + assert usedAsOccurrenceParent!=null; + + boolean success = usedAsOccurrenceParent.remove(user); + + assert success; + } + + protected Set<MergedOccurrence> getUsedAsOccurrenceParent() { + return usedAsOccurrenceParent; + } + + + + @TMDM + public Set<MergedOccurrence> getOccurrences() { + if (usedAsOccurrenceParent==null) { + return Collections.emptySet(); + } else { + /* + return new MappedSet<MergedOccurrenceKey,MergedOccurrence>(getUsedAsOccurrenceParent()) { + public MergedOccurrence map(MergedOccurrenceKey key) { + return getContainer().getMergedOccurrenceByKey(key); + } + }; + */ + return usedAsOccurrenceParent; + } + } + @TMDM public Set<? extends MergedAssociationRole> getRolesPlayed() { Index: MergedTopicMapView.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedTopicMapView.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MergedTopicMapView.java 11 Jun 2008 02:23:39 -0000 1.10 --- MergedTopicMapView.java 11 Jun 2008 02:27:17 -0000 1.11 *************** *** 1020,1023 **** --- 1020,1026 ---- mergedOccurrenceByKey.put(key,mergedOccurrence); + mergedOccurrence.getParent().addUsedAsOccurrenceParent(mergedOccurrence); + // FIXME: need to handle occurrence types + if (notifyListener) { internalNotifyMergedOccurrenceCreated(mergedOccurrence); |
From: Xuan B. <med...@us...> - 2008-06-11 02:23:32
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21787/src/org/tm4j/topicmap/tmdm/merged Modified Files: MergedTopicMapView.java Log Message: Index MergedTopicName objects properly. Index: MergedTopicMapView.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedTopicMapView.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MergedTopicMapView.java 23 Jan 2008 22:38:26 -0000 1.9 --- MergedTopicMapView.java 11 Jun 2008 02:23:39 -0000 1.10 *************** *** 988,991 **** --- 988,994 ---- mergedTopicNameByKey.put(key,mergedTopicName); + mergedTopicName.getParent().addUsedAsTopicNameParent(mergedTopicName); + // FIXME: need to handle topic name types + if (notifyListener) { internalNotifyMergedTopicNameCreated(mergedTopicName); |
From: Xuan B. <med...@us...> - 2008-06-11 02:23:04
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/basic In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21744/src/org/tm4j/topicmap/tmdm/basic Modified Files: BasicTopicName.java Log Message: Extend BasicTopicName.toString(). Index: BasicTopicName.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/basic/BasicTopicName.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BasicTopicName.java 21 Jan 2008 11:13:44 -0000 1.1 --- BasicTopicName.java 11 Jun 2008 02:23:10 -0000 1.2 *************** *** 128,131 **** --- 128,135 ---- getParent().internalRemove(this); } + + public String toString() { + return "BasicTopicName[value=\""+getValue()+"\"]"; + } } |
From: Xuan B. <med...@us...> - 2008-06-11 02:21:57
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/basic In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20949/src/org/tm4j/topicmap/tmdm/basic Modified Files: BasicTopic.java Log Message: Extend BasicTopic.toString(). Index: BasicTopic.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/basic/BasicTopic.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** BasicTopic.java 23 Jan 2008 20:35:23 -0000 1.6 --- BasicTopic.java 11 Jun 2008 02:22:01 -0000 1.7 *************** *** 349,353 **** public String toString() { ! return "BasicTopic[subjectIdentifiers="+subjectIdentifiers+"]@"+Integer.toString(System.identityHashCode(this),16); } } --- 349,353 ---- public String toString() { ! return "BasicTopic[subjectIdentifiers="+subjectIdentifiers+",topicNames="+topicNames+"]@"+Integer.toString(System.identityHashCode(this),16); } } |
From: Xuan B. <med...@us...> - 2008-06-11 02:20:48
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20506/src/org/tm4j/topicmap/tmdm/merged Modified Files: MergedAssociation.java Log Message: Fix typo. Index: MergedAssociation.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedAssociation.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MergedAssociation.java 21 Jan 2008 11:13:45 -0000 1.1 --- MergedAssociation.java 11 Jun 2008 02:20:56 -0000 1.2 *************** *** 83,87 **** mergedAssociationRole.getType().addUsedAsAssociationRoleType(mergedAssociationRole); ! mergedAssociationRole.getType().addUsedAsAssociationRolePlayer(mergedAssociationRole); if (notifyListener) { --- 83,87 ---- mergedAssociationRole.getType().addUsedAsAssociationRoleType(mergedAssociationRole); ! mergedAssociationRole.getPlayer().addUsedAsAssociationRolePlayer(mergedAssociationRole); if (notifyListener) { |
From: Xuan B. <med...@us...> - 2008-06-11 02:20:20
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20394/src/org/tm4j/topicmap/tmdm/tm4j1 Modified Files: TopicImpl.java Log Message: Fix typo in TopicImpl.toString(). Index: TopicImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1/TopicImpl.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TopicImpl.java 23 Jan 2008 20:54:15 -0000 1.10 --- TopicImpl.java 11 Jun 2008 02:20:15 -0000 1.11 *************** *** 635,644 **** public String toDiagnosticsString() { ! return "TopicMap@"+Integer.toString(System.identityHashCode(this),16); } public String toString() { // return "TopicMap[getMergedObject()="+getMergedObject()+"]"; ! return "TopicMap[names="+getNames()+",subjectIndicators="+getSubjectIndicators()+",sourceLocators="+getSourceLocators()+"]@"+Integer.toString(System.identityHashCode(this),16); } } --- 635,644 ---- public String toDiagnosticsString() { ! return "Topic@"+Integer.toString(System.identityHashCode(this),16); } public String toString() { // return "TopicMap[getMergedObject()="+getMergedObject()+"]"; ! return "Topic[names="+getNames()+",subjectIndicators="+getSubjectIndicators()+",sourceLocators="+getSourceLocators()+"]@"+Integer.toString(System.identityHashCode(this),16); } } |
From: Lars H. <lh...@us...> - 2008-05-14 15:21:58
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/tmapi/core In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13407/src/org/tm4j/tmapi/core Modified Files: Tag: TM4J_1_x TMAPITopicImpl.java Log Message: Fixed bug [ 1963893 ] ([TMAPI] Subject locator is not removed from a topic) Index: TMAPITopicImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/tmapi/core/TMAPITopicImpl.java,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -C2 -d -r1.23 -r1.23.2.1 *** TMAPITopicImpl.java 7 Mar 2006 15:14:19 -0000 1.23 --- TMAPITopicImpl.java 14 May 2008 15:22:04 -0000 1.23.2.1 *************** *** 75,79 **** return Wrapper.wrap(bn, m_tm); } catch (Exception ex) { ! throw new RuntimeException(ex.toString()); } } --- 75,79 ---- return Wrapper.wrap(bn, m_tm); } catch (Exception ex) { ! throw new RuntimeException(ex); } } *************** *** 330,334 **** if (m_obj.getSubject() == null) return; Locator rawLoc = Wrapper.unwrap(loc); ! if (rawLoc.equals(m_obj.getSubject())) { return; } --- 330,334 ---- if (m_obj.getSubject() == null) return; Locator rawLoc = Wrapper.unwrap(loc); ! if (!rawLoc.equals(m_obj.getSubject())) { return; } |
From: Conal T. <con...@us...> - 2008-03-06 03:48:38
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/utils In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26704 Modified Files: XTMWriter.java Log Message: fixed bug in topic map serialisation (id attributes were given a namespace URI) Index: XTMWriter.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/utils/XTMWriter.java,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** XTMWriter.java 21 Jan 2008 08:42:34 -0000 1.49 --- XTMWriter.java 6 Mar 2008 03:48:30 -0000 1.50 *************** *** 319,323 **** if (id != null) { //id = makeRelative(id); ! atts.addAttribute(XTMParser.XTM_NS_URI, XTMParser.ID, XTMParser.ID, "ID", id); } --- 319,323 ---- if (id != null) { //id = makeRelative(id); ! atts.addAttribute("", XTMParser.ID, XTMParser.ID, "ID", id); } *************** *** 989,992 **** --- 989,995 ---- /* * $Log$ + * Revision 1.50 2008/03/06 03:48:30 conal_tuohy + * fixed bug in topic map serialisation (id attributes were given a namespace URI) + * * Revision 1.49 2008/01/21 08:42:34 mediumnet * Transactions support for XTMWriter. |
From: Xuan B. <med...@us...> - 2008-01-26 13:58:35
|
Update of /cvsroot/tm4j/tm4j In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5511 Modified Files: build.xml Log Message: test commit to trigger new sync to anonymous CVS repository Index: build.xml =================================================================== RCS file: /cvsroot/tm4j/tm4j/build.xml,v retrieving revision 1.146 retrieving revision 1.147 diff -C2 -d -r1.146 -r1.147 *** build.xml 25 Jan 2008 19:21:07 -0000 1.146 --- build.xml 26 Jan 2008 13:58:38 -0000 1.147 *************** *** 2167,2171 **** </junit> </target> ! <target name="tologx-jar" depends="tologx-build"> <description>Create tm4j-tologx JAR.</description> --- 2167,2171 ---- </junit> </target> ! <target name="tologx-jar" depends="tologx-build"> <description>Create tm4j-tologx JAR.</description> |
From: Xuan B. <med...@us...> - 2008-01-25 20:04:57
|
Update of /cvsroot/tm4j/tm4j/lib/ant/apache-ant-1.7.0/docs/manual/api/resources In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31673/lib/ant/apache-ant-1.7.0/docs/manual/api/resources Added Files: inherit.gif Log Message: Update 4 years old ant. --- NEW FILE: inherit.gif --- (This appears to be a binary file; contents omitted.) |
From: Xuan B. <med...@us...> - 2008-01-25 20:04:40
|
Update of /cvsroot/tm4j/tm4j/lib/ant/apache-ant-1.7.0/docs/manual/api/org/apache In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31658/lib/ant/apache-ant-1.7.0/docs/manual/api/org/apache Log Message: Directory /cvsroot/tm4j/tm4j/lib/ant/apache-ant-1.7.0/docs/manual/api/org/apache added to the repository |