Menu
▾
▴
tm4j-commits — Automatically generated CVS check-in notifications
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-01-22 20:38:33
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7632/src/org/tm4j/topicmap/tmdm/merged Modified Files: MergedTopicMapConstruct.java Log Message: Implement TopicImpl.getMergedTopics() legacy method. Index: MergedTopicMapConstruct.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedTopicMapConstruct.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MergedTopicMapConstruct.java 21 Jan 2008 11:13:45 -0000 1.1 --- MergedTopicMapConstruct.java 22 Jan 2008 20:38:31 -0000 1.2 *************** *** 69,73 **** } ! protected Collection<I> getComponents() { return components; } --- 69,76 ---- } ! /** ! Use the result of this method wisely and only as read-only. ! */ ! public Collection<I> getComponents() { return components; } |
|
From: Xuan B. <med...@us...> - 2008-01-22 20:26:47
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2338/src/org/tm4j/topicmap/tmdm/tm4j1 Modified Files: TopicMapImpl.java Log Message: Implement TopicMapImpl.getProperty() a little bit. Index: TopicMapImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1/TopicMapImpl.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TopicMapImpl.java 22 Jan 2008 20:22:04 -0000 1.4 --- TopicMapImpl.java 22 Jan 2008 20:26:50 -0000 1.5 *************** *** 6,9 **** --- 6,10 ---- import java.util.Iterator; import java.util.Collections; + import java.util.HashMap; import java.beans.PropertyVetoException; *************** *** 56,59 **** --- 57,66 ---- protected org.tm4j.topicmap.tmdm.Topic nullAssociationType; + protected static HashMap<String,Boolean> defaultProperties = new HashMap<String,Boolean>(); + + static { + defaultProperties.put(TopicMapProvider.OPT_STATIC_MERGE,false); + } + /** *************** *** 829,833 **** */ public Boolean getProperty(String propertyName) { ! throw new UnsupportedOperationException(); } --- 836,840 ---- */ public Boolean getProperty(String propertyName) { ! return defaultProperties.get(propertyName); } |
|
From: Xuan B. <med...@us...> - 2008-01-22 20:22:00
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32468/src/org/tm4j/topicmap/tmdm/tm4j1 Modified Files: TopicMapImpl.java Log Message: Implement TopicMapImpl.getTopicBySubject(). Index: TopicMapImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1/TopicMapImpl.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TopicMapImpl.java 22 Jan 2008 20:04:55 -0000 1.3 --- TopicMapImpl.java 22 Jan 2008 20:22:04 -0000 1.4 *************** *** 583,587 **** */ public Topic getTopicBySubject(org.tm4j.net.Locator subjectLocator) { ! throw new UnsupportedOperationException(); } --- 583,587 ---- */ public Topic getTopicBySubject(org.tm4j.net.Locator subjectLocator) { ! return mergedToExternal(getMergedTopicMapView().getMergedTopicForSubjectLocator(subjectLocator)); } |
|
From: Xuan B. <med...@us...> - 2008-01-22 20:22:00
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32468/src/org/tm4j/topicmap/tmdm/merged Modified Files: MergedTopicMapView.java Log Message: Implement TopicMapImpl.getTopicBySubject(). Index: MergedTopicMapView.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedTopicMapView.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MergedTopicMapView.java 22 Jan 2008 20:17:51 -0000 1.7 --- MergedTopicMapView.java 22 Jan 2008 20:22:03 -0000 1.8 *************** *** 138,142 **** MergedTopicMapConstruct mergedTopicMapConstruct = getMergedTopicMapConstructForItemIdentifierOrSubjectIdentifier(subjectIdentifier); ! if (mergedTopicMapConstruct instanceof MergedTopic) { /* FIXME: In theory, it may be that this topic has subjectIdentifier as itemIdentifier, not as subjectIdentifier. --- 138,142 ---- MergedTopicMapConstruct mergedTopicMapConstruct = getMergedTopicMapConstructForItemIdentifierOrSubjectIdentifier(subjectIdentifier); ! if (mergedTopicMapConstruct instanceof MergedTopic) { // It is expected that this succeeds almost always. Maybe we just assume the cast to succeed and catch a ClassCastException if it fails? /* FIXME: In theory, it may be that this topic has subjectIdentifier as itemIdentifier, not as subjectIdentifier. *************** *** 149,152 **** --- 149,156 ---- } + public MergedTopic getMergedTopicForSubjectLocator(Locator subjectLocator) { + return subjectLocatorToMergedTopic.get(subjectLocator); + } + public MergedTopic getMergedTopic(ReadableTopic basicTopic) { MergedTopic result = topicToMergedTopic.get(basicTopic); |
|
From: Xuan B. <med...@us...> - 2008-01-22 20:17:48
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30355/src/org/tm4j/topicmap/tmdm/merged Modified Files: MergedTopicMapView.java Log Message: Fix indendation. Index: MergedTopicMapView.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedTopicMapView.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MergedTopicMapView.java 22 Jan 2008 20:16:27 -0000 1.6 --- MergedTopicMapView.java 22 Jan 2008 20:17:51 -0000 1.7 *************** *** 83,87 **** protected Map<ReadableTopicName,MergedTopicName> topicNameToMergedTopicName; protected Map<ReadableVariant,MergedVariant> variantToMergedVariant; ! protected Map<ReadableOccurrence,MergedOccurrence> occurrenceToMergedOccurrence; 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; |
|
From: Xuan B. <med...@us...> - 2008-01-22 20:16:25
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29887/src/org/tm4j/topicmap/tmdm/merged Modified Files: MergedTopicMapView.java Log Message: Fix getTopicCount(). Index: MergedTopicMapView.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedTopicMapView.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MergedTopicMapView.java 22 Jan 2008 20:04:55 -0000 1.5 --- MergedTopicMapView.java 22 Jan 2008 20:16:27 -0000 1.6 *************** *** 124,128 **** // Maybe "int" is to small, as we may have topicmaps exceeding 2^31-1 topics, do we? public int getTopicCount() { ! return subjectLocatorToMergedTopic.size(); } --- 124,128 ---- // Maybe "int" is to small, as we may have topicmaps exceeding 2^31-1 topics, do we? public int getTopicCount() { ! return mergedTopics.size(); } |
|
From: Xuan B. <med...@us...> - 2008-01-22 20:12:13
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28159/src/org/tm4j/topicmap/tmdm/tm4j1 Modified Files: TopicMapObjectImpl.java Log Message: Implement TopicMapObjectImpl.destroy() legacy method. Index: TopicMapObjectImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1/TopicMapObjectImpl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TopicMapObjectImpl.java 21 Jan 2008 19:21:15 -0000 1.2 --- TopicMapObjectImpl.java 22 Jan 2008 20:12:15 -0000 1.3 *************** *** 365,371 **** * used, the object or its children may or may not have been modified. */ ! public void destroy() ! throws IntegrityViolationException, PropertyVetoException { ! throw new UnsupportedOperationException(); } --- 365,370 ---- * used, the object or its children may or may not have been modified. */ ! public void destroy() throws IntegrityViolationException, PropertyVetoException { ! getRepresentedObject().remove(); } |
|
From: Xuan B. <med...@us...> - 2008-01-22 20:04:52
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24673/src/org/tm4j/topicmap/tmdm/merged Modified Files: MergedTopicMapView.java Log Message: Implement TopicMapImpl.getTopicCount() legacy method. Index: MergedTopicMapView.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedTopicMapView.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MergedTopicMapView.java 21 Jan 2008 20:00:27 -0000 1.4 --- MergedTopicMapView.java 22 Jan 2008 20:04:55 -0000 1.5 *************** *** 122,125 **** --- 122,130 ---- } + // Maybe "int" is to small, as we may have topicmaps exceeding 2^31-1 topics, do we? + public int getTopicCount() { + return subjectLocatorToMergedTopic.size(); + } + protected TopicMapEventListener<ReadableTopicMap,ReadableTopic,ReadableAssociation,ReadableOccurrence,ReadableTopicMapConstruct,ReadableTopicName,ReadableVariant,ReadableAssociationRole> getEventListener() { return eventListener; |
|
From: Xuan B. <med...@us...> - 2008-01-22 20:04:52
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24673/src/org/tm4j/topicmap/tmdm/tm4j1 Modified Files: TopicMapImpl.java Log Message: Implement TopicMapImpl.getTopicCount() legacy method. Index: TopicMapImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1/TopicMapImpl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TopicMapImpl.java 22 Jan 2008 19:58:22 -0000 1.2 --- TopicMapImpl.java 22 Jan 2008 20:04:55 -0000 1.3 *************** *** 524,528 **** */ public int getTopicCount() { ! throw new UnsupportedOperationException(); } --- 524,528 ---- */ public int getTopicCount() { ! return getMergedTopicMapView().getTopicCount(); } |
|
From: Xuan B. <med...@us...> - 2008-01-22 19:58:18
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21783/src/org/tm4j/topicmap/tmdm/tm4j1 Modified Files: TopicMapImpl.java Log Message: Implement TopicMapImpl.getTopicByID() legacy method. Index: TopicMapImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1/TopicMapImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TopicMapImpl.java 21 Jan 2008 11:13:45 -0000 1.1 --- TopicMapImpl.java 22 Jan 2008 19:58:22 -0000 1.2 *************** *** 533,537 **** */ public Topic getTopicByID(String id) { ! throw new UnsupportedOperationException(); } --- 533,549 ---- */ public Topic getTopicByID(String id) { ! try { ! Locator itemIdentifier = idToItemIdentifier(id); ! ! TopicMapObject o = mergedToExternal(getMergedTopicMapView().getMergedTopicMapConstructForItemIdentifierOrSubjectIdentifier(itemIdentifier)); ! ! try { ! return (Topic) o; ! } catch (ClassCastException e) { ! throw new IllegalArgumentException("The id \""+id+"\" does not identify a topic, but it identifies this object: "+o,e); ! } ! } catch (LocatorFactoryException e) { ! throw new RuntimeException("This should not happen.",e); ! } } |
|
From: Xuan B. <med...@us...> - 2008-01-22 19:44:59
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/test In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15795/src/org/tm4j/topicmap/test Modified Files: TopicMapTest.java Log Message: Do not obscure the original stack trace of an exception. Index: TopicMapTest.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/test/TopicMapTest.java,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** TopicMapTest.java 21 Jun 2004 18:42:29 -0000 1.47 --- TopicMapTest.java 22 Jan 2008 19:45:03 -0000 1.48 *************** *** 122,126 **** // Expected error } catch (Exception ex) { ! ex.fillInStackTrace(); ex.printStackTrace(); fail("Caught unexpected exception: " + ex.toString()); --- 122,126 ---- // Expected error } catch (Exception ex) { ! // ex.fillInStackTrace(); ex.printStackTrace(); fail("Caught unexpected exception: " + ex.toString()); |
|
From: Xuan B. <med...@us...> - 2008-01-22 19:40:02
|
Update of /cvsroot/tm4j/tm4j In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13545 Modified Files: build.xml Log Message: Do a more-proper cleaning when cleaning. Index: build.xml =================================================================== RCS file: /cvsroot/tm4j/tm4j/build.xml,v retrieving revision 1.143 retrieving revision 1.144 diff -C2 -d -r1.143 -r1.144 *** build.xml 21 Jan 2008 11:13:44 -0000 1.143 --- build.xml 22 Jan 2008 19:40:01 -0000 1.144 *************** *** 845,849 **** </target> ! <target name="tm4j-clean" depends="init"> <description> Clean up intermediate build files for tm4j.jar --- 845,849 ---- </target> ! <target name="tm4j-clean" depends="init,tm4j-net-clean"> <description> Clean up intermediate build files for tm4j.jar *************** *** 853,856 **** --- 853,859 ---- <patternset refid="tm4j.classes"/> <patternset refid="tm4j.resources"/> + <!-- + FIXME: Still, "find -iname "*.class"" yields some class files which should be deleted after "ant tm4j-clean", "ant clean" or "ant clean-all" has been called. + --> </fileset> </delete> |
|
From: Xuan B. <med...@us...> - 2008-01-22 19:28:24
|
Update of /cvsroot/tm4j/tm4j/resource/tests In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8934/resource/tests Modified Files: test.properties Log Message: Integrate TMDM TMDJ 1 compatibility backend into testing. Index: test.properties =================================================================== RCS file: /cvsroot/tm4j/tm4j/resource/tests/test.properties,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** test.properties 15 Dec 2004 08:24:33 -0000 1.33 --- test.properties 22 Jan 2008 19:28:27 -0000 1.34 *************** *** 112,113 **** --- 112,116 ---- static.hibernate.properties.file=static-hibernate.test.properties + ; TMDM compatibility in-memory default + tmdm.compatibility.memory.class=org.tm4j.topicmap.tmdm.tm4j1.TopicMapProviderFactoryImpl + |
|
From: Xuan B. <med...@us...> - 2008-01-22 19:08:14
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1701/src/org/tm4j/topicmap/tmdm Modified Files: TopicMapEventListener.java.v0 Log Message: Reason why TopicMapEventListener.java.v0 still exists (upon a suggestion during a code-review by Benjamin Bock <bb-...@bo...>) Index: TopicMapEventListener.java.v0 =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/TopicMapEventListener.java.v0,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TopicMapEventListener.java.v0 21 Jan 2008 20:00:26 -0000 1.2 --- TopicMapEventListener.java.v0 22 Jan 2008 19:08:17 -0000 1.3 *************** *** 6,9 **** --- 6,12 ---- import org.tm4j.net.Locator; + /** + We are still undecided on whether we want to use a parametrized TopicMapEventListener or a non-parametrized TopicMapEventListener. + */ public interface TopicMapEventListener { |
|
From: Xuan B. <med...@us...> - 2008-01-22 19:06:34
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv842/src/org/tm4j/topicmap/tmdm Modified Files: ReadableOccurrence.java ReadableReifiable.java ReadableTopic.java ReadableTopicName.java TopicName.java Log Message: Some cleanups. (upon a suggestion during 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.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ReadableTopicName.java 21 Jan 2008 19:28:03 -0000 1.3 --- ReadableTopicName.java 22 Jan 2008 19:06:31 -0000 1.4 *************** *** 25,35 **** public ReadableTopic getParent(); - /* - @TMDM - public Variant createVariant(Locator datatype,String value); - - @TMDM - public Set<? extends Variant> getVariants(); - */ } --- 25,28 ---- Index: ReadableOccurrence.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/ReadableOccurrence.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ReadableOccurrence.java 21 Jan 2008 20:00:25 -0000 1.2 --- ReadableOccurrence.java 22 Jan 2008 19:06:31 -0000 1.3 *************** *** 13,17 **** @TMDM @TMAPI ! public Topic getType(); @TMDM --- 13,17 ---- @TMDM @TMAPI ! public ReadableTopic getType(); @TMDM Index: TopicName.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/TopicName.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TopicName.java 21 Jan 2008 19:21:15 -0000 1.2 --- TopicName.java 22 Jan 2008 19:06:31 -0000 1.3 *************** *** 35,39 **** /* @TMDM ! public Variant createVariant(Locator datatype,String value); @TMDM --- 35,39 ---- /* @TMDM ! public Variant createVariant(String value,Locator datatype,Collection<Topic> scope); // Should we use "Collection<Topic> scope" or should we use "Scope scope"? @TMDM Index: ReadableReifiable.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/ReadableReifiable.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ReadableReifiable.java 21 Jan 2008 20:34:12 -0000 1.2 --- ReadableReifiable.java 22 Jan 2008 19:06:31 -0000 1.3 *************** *** 13,17 **** @TMDM @TMAPI ! public Topic getReifier(); } --- 13,17 ---- @TMDM @TMAPI ! public ReadableTopic getReifier(); } Index: ReadableTopic.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/ReadableTopic.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ReadableTopic.java 21 Jan 2008 11:13:44 -0000 1.1 --- ReadableTopic.java 22 Jan 2008 19:06:31 -0000 1.2 *************** *** 35,39 **** */ @TMDM ! public Reifiable getReified(); } --- 35,39 ---- */ @TMDM ! public ReadableReifiable getReified(); } |
|
From: Conal T. <con...@us...> - 2008-01-22 01:07:44
|
Update of /cvsroot/tm4j/tm4web/cocoon/src/java/org/tm4j/tm4web/cocoon In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30323 Modified Files: TM4WebTransformer.java Log Message: changed default radius for tolog queries to 0, which seems a more obvious default than 1, since it then returns the exact result of the tolog query without addition Index: TM4WebTransformer.java =================================================================== RCS file: /cvsroot/tm4j/tm4web/cocoon/src/java/org/tm4j/tm4web/cocoon/TM4WebTransformer.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TM4WebTransformer.java 18 Jan 2008 05:09:32 -0000 1.11 --- TM4WebTransformer.java 22 Jan 2008 01:07:34 -0000 1.12 *************** *** 147,151 **** m_radius = Integer.parseInt(attr.getValue("radius")); } else { ! m_radius = 1; } } else { --- 147,153 ---- m_radius = Integer.parseInt(attr.getValue("radius")); } else { ! // if not specified, radius is 0, which means that the results of the tolog query ! // are returned without any addition ! m_radius = 0; } } else { *************** *** 716,719 **** --- 718,724 ---- /* * $Log$ + * Revision 1.12 2008/01/22 01:07:34 conal_tuohy + * changed default radius for tolog queries to 0, which seems a more obvious default than 1, since it then returns the exact result of the tolog query without addition + * * Revision 1.11 2008/01/18 05:09:32 conal_tuohy * fixed error reporting when no nested exception |
|
From: Xuan B. <med...@us...> - 2008-01-21 20:34:25
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12019/src/org/tm4j/topicmap/tmdm Modified Files: ReadableReifiable.java Reifiable.java Log Message: Provide hints for which standard is represented by which method in Reifiable, ReadableReifiable. (upon a suggestion during a code-review by Benjamin Bock <bb-...@bo...>) Index: Reifiable.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/Reifiable.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Reifiable.java 21 Jan 2008 20:26:24 -0000 1.2 --- Reifiable.java 21 Jan 2008 20:34:12 -0000 1.3 *************** *** 11,18 **** --- 11,21 ---- public interface Reifiable extends ReadableReifiable,TopicMapConstruct { + @TMDM + @TMAPI public Topic getReifier(); // not yet implemented. /* + @TMDM public void setReifier(Topic reifier); */ Index: ReadableReifiable.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/ReadableReifiable.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ReadableReifiable.java 21 Jan 2008 11:13:44 -0000 1.1 --- ReadableReifiable.java 21 Jan 2008 20:34:12 -0000 1.2 *************** *** 11,14 **** --- 11,16 ---- public interface ReadableReifiable extends ReadableTopicMapConstruct { + @TMDM + @TMAPI public Topic getReifier(); } |
|
From: Xuan B. <med...@us...> - 2008-01-21 20:26:35
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8457/src/org/tm4j/topicmap/tmdm Modified Files: Reifiable.java Log Message: Introduce Rifiable.setReifier() (but comment it out until there exists an implementation) (found thanks to a code-review by Benjamin Bock <bb-...@bo...>) Index: Reifiable.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/Reifiable.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Reifiable.java 21 Jan 2008 11:13:44 -0000 1.1 --- Reifiable.java 21 Jan 2008 20:26:24 -0000 1.2 *************** *** 12,15 **** --- 12,20 ---- public Topic getReifier(); + + // not yet implemented. + /* + public void setReifier(Topic reifier); + */ } |
|
From: Xuan B. <med...@us...> - 2008-01-21 20:13:11
|
Update of /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/util In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2288/panckoucke/src/org/tm4j/panckoucke/util Modified Files: InstanceExtractor.java NameUtil.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: NameUtil.java =================================================================== RCS file: /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/util/NameUtil.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** NameUtil.java 2 May 2007 12:02:35 -0000 1.15 --- NameUtil.java 21 Jan 2008 20:12:39 -0000 1.16 *************** *** 315,319 **** /** ! * @return label for an Occurence */ public static String labelFor(Occurrence occ) { --- 315,319 ---- /** ! * @return label for an Occurrence */ public static String labelFor(Occurrence occ) { Index: InstanceExtractor.java =================================================================== RCS file: /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/util/InstanceExtractor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** InstanceExtractor.java 15 Sep 2004 17:32:50 -0000 1.3 --- InstanceExtractor.java 21 Jan 2008 20:12:39 -0000 1.4 *************** *** 112,116 **** } ! // Occurence-Instances if (oInstances != null) { while (oInstances.hasNext()) { --- 112,116 ---- } ! // Occurrence-Instances if (oInstances != null) { while (oInstances.hasNext()) { |
|
From: Xuan B. <med...@us...> - 2008-01-21 20:13:11
|
Update of /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/test/abstraction/section In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2288/panckoucke/src/org/tm4j/panckoucke/test/abstraction/section Modified Files: MetaSectionGroupTest.java OccurrenceSectionTest.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: MetaSectionGroupTest.java =================================================================== RCS file: /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/test/abstraction/section/MetaSectionGroupTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MetaSectionGroupTest.java 24 Jul 2004 19:10:33 -0000 1.6 --- MetaSectionGroupTest.java 21 Jan 2008 20:12:39 -0000 1.7 *************** *** 244,248 **** ! // TODO reification of an occurence // TODO reification of an association --- 244,248 ---- ! // TODO reification of an occurrence // TODO reification of an association Index: OccurrenceSectionTest.java =================================================================== RCS file: /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/test/abstraction/section/OccurrenceSectionTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** OccurrenceSectionTest.java 24 Jul 2004 19:10:33 -0000 1.5 --- OccurrenceSectionTest.java 21 Jan 2008 20:12:39 -0000 1.6 *************** *** 67,71 **** assertEquals("Type", mn.getColumn(1).getLabel()); ! // The song has 3 occurences assertEquals(3, mn.getRowCount()); --- 67,71 ---- assertEquals("Type", mn.getColumn(1).getLabel()); ! // The song has 3 occurrences assertEquals(3, mn.getRowCount()); |
|
From: Xuan B. <med...@us...> - 2008-01-21 20:13:11
|
Update of /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/test/abstraction/spatial In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2288/panckoucke/src/org/tm4j/panckoucke/test/abstraction/spatial Modified Files: SimpleCoordinateExtractorTest.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: SimpleCoordinateExtractorTest.java =================================================================== RCS file: /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/test/abstraction/spatial/SimpleCoordinateExtractorTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SimpleCoordinateExtractorTest.java 13 Oct 2004 05:11:27 -0000 1.1 --- SimpleCoordinateExtractorTest.java 21 Jan 2008 20:12:39 -0000 1.2 *************** *** 53,57 **** sce = new SimpleCoordinateExtractor(); sce.setExtractionPattern(COORDINATE_REGEX); ! sce.setOccurenceType(occtype); --- 53,57 ---- sce = new SimpleCoordinateExtractor(); sce.setExtractionPattern(COORDINATE_REGEX); ! sce.setOccurrenceType(occtype); *************** *** 87,91 **** // set the occ-type that topic2 uses // and see if we now get the coordinate ! sce.setOccurenceType(tm.getTopicByID("ot-altCoordinateType")); point = sce.getCoordinateFor(t); assertEquals(22.06, point.getX(),0.01); --- 87,91 ---- // set the occ-type that topic2 uses // and see if we now get the coordinate ! sce.setOccurrenceType(tm.getTopicByID("ot-altCoordinateType")); point = sce.getCoordinateFor(t); assertEquals(22.06, point.getX(),0.01); |
|
From: Xuan B. <med...@us...> - 2008-01-21 20:13:11
|
Update of /cvsroot/tm4j/tm4j/docs In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2288/tm4j/docs Modified Files: TMDM-support.html 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: TMDM-support.html =================================================================== RCS file: /cvsroot/tm4j/tm4j/docs/TMDM-support.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TMDM-support.html 20 Apr 2007 12:20:20 -0000 1.4 --- TMDM-support.html 21 Jan 2008 20:12:39 -0000 1.5 *************** *** 13,18 **** <ul> <li>multiple role players per role (removed in TMDM)</li> ! <li>occurence type mandatory (added in TMDM, can be simulated by a ! "default" occurence type)</li> <li>association type mandatory (added in TMDM, can be simulated by a "default" association type)</li> --- 13,18 ---- <ul> <li>multiple role players per role (removed in TMDM)</li> ! <li>occurrence type mandatory (added in TMDM, can be simulated by a ! "default" occurrence type)</li> <li>association type mandatory (added in TMDM, can be simulated by a "default" association type)</li> *************** *** 38,42 **** <li>topic name items</li> <li>variant items</li> ! <li>occurence items</li> <li>association items</li> <li>association role items<br> --- 38,42 ---- <li>topic name items</li> <li>variant items</li> ! <li>occurrence items</li> <li>association items</li> <li>association role items<br> *************** *** 65,76 **** <h3>TM4J and TMAPI</h3> <ul> ! <li>In TM4J 0.9.x, you can create an occurence for a topic and then ! orphan it by removing it from the set of Occurences from its parent by ! calling Topic.setOccurrences(). This orphaned occurence can later be ! added to a different Topic. However, orphaned occurences (that is: ! occurences without a parent), are not allowed in TMDM. Thus (and ! because indexing of these occurences would be more difficult), TM4J 2 ! should not support orphaned occurences. Thus, the corresponding API ! which allows orphaning occurences and readding occurences to different topics (maybe even without properly removing them from their previous parents) should be depreciated and later removed.<br> --- 65,76 ---- <h3>TM4J and TMAPI</h3> <ul> ! <li>In TM4J 0.9.x, you can create an occurrence for a topic and then ! orphan it by removing it from the set of Occurrences from its parent by ! calling Topic.setOccurrences(). This orphaned occurrence can later be ! added to a different Topic. However, orphaned occurrences (that is: ! occurrences without a parent), are not allowed in TMDM. Thus (and ! because indexing of these occurrences would be more difficult), TM4J 2 ! should not support orphaned occurrences. Thus, the corresponding API ! which allows orphaning occurrences and readding occurrences to different topics (maybe even without properly removing them from their previous parents) should be depreciated and later removed.<br> |
|
From: Xuan B. <med...@us...> - 2008-01-21 20:13:11
|
Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2288/tm4j/src/org/tm4j/topicmap Modified Files: Topic.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: Topic.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/Topic.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** Topic.java 20 Apr 2007 12:20:21 -0000 1.31 --- Topic.java 21 Jan 2008 20:12:39 -0000 1.32 *************** *** 290,294 **** throws DuplicateObjectIDException, PropertyVetoException; ! // Get/Set/Add Occurence /** --- 290,294 ---- throws DuplicateObjectIDException, PropertyVetoException; ! // Get/Set/Add Occurrence /** *************** *** 332,336 **** * 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 --- 332,336 ---- * 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 *************** *** 342,346 **** * * @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 --- 342,346 ---- * * @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 *************** *** 469,474 **** /* * $Log$ * Revision 1.31 2007/04/20 12:20:21 mediumnet ! * Deprecate methods which allow moving occurences between different parents. See bug https://sourceforge.net/tracker/?func=detail&atid=391879&aid=1704268&group_id=27895 for more. * * Revision 1.30 2007/04/17 05:04:33 mediumnet --- 469,477 ---- /* * $Log$ + * Revision 1.32 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.31 2007/04/20 12:20:21 mediumnet ! * Deprecate methods which allow moving occurrences between different parents. See bug https://sourceforge.net/tracker/?func=detail&atid=391879&aid=1704268&group_id=27895 for more. * * Revision 1.30 2007/04/17 05:04:33 mediumnet |
|
From: Xuan B. <med...@us...> - 2008-01-21 20:13:06
|
Update of /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/impl/abstraction/spatial In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2288/panckoucke/src/org/tm4j/panckoucke/impl/abstraction/spatial Modified Files: SimpleCoordinateExtractor.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: SimpleCoordinateExtractor.java =================================================================== RCS file: /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/impl/abstraction/spatial/SimpleCoordinateExtractor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SimpleCoordinateExtractor.java 12 Oct 2004 19:56:03 -0000 1.1 --- SimpleCoordinateExtractor.java 21 Jan 2008 20:12:39 -0000 1.2 *************** *** 120,124 **** * be queried for a coordinate */ ! public void setOccurenceType(Topic type){ occType = type; } --- 120,124 ---- * be queried for a coordinate */ ! public void setOccurrenceType(Topic type){ occType = type; } |
|
From: Xuan B. <med...@us...> - 2008-01-21 20:13:06
|
Update of /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/impl/abstraction/compact In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2288/panckoucke/src/org/tm4j/panckoucke/impl/abstraction/compact Modified Files: InstanceContributor.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: InstanceContributor.java =================================================================== RCS file: /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/impl/abstraction/compact/InstanceContributor.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** InstanceContributor.java 20 Jul 2004 12:51:59 -0000 1.6 --- InstanceContributor.java 21 Jan 2008 20:12:38 -0000 1.7 *************** *** 160,164 **** } ! // Occurence-Instances while (oInstances.hasNext()) { n1 = AMUtil.addNode(model, (Occurrence) oInstances.next()); --- 160,164 ---- } ! // Occurrence-Instances while (oInstances.hasNext()) { n1 = AMUtil.addNode(model, (Occurrence) oInstances.next()); |
720 messages has been excluded from this view by a project administrator.
