[Tm4j-commits] tm4j/src/org/tm4j/topicmap/hibernate TopicMapImpl.java, 1.45, 1.46

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

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

Modified Files:
	TopicMapImpl.java 
Log Message:
Fix a bug. Thanks to Lars Heuer for spotting it. Finding this bug in the first place was masked by another bug in the build.xml file: 'ant clean' does not properly clean up.

Index: TopicMapImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/hibernate/TopicMapImpl.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** TopicMapImpl.java	21 Jun 2004 18:40:23 -0000	1.45
--- TopicMapImpl.java	8 May 2007 15:52:24 -0000	1.46
***************
*** 433,437 ****
              ret = find(txn,
                  "select tm from tm in class org.tm4j.topicmap.hibernate.TopicMapDataObject," +
!                 "  loc in tm.sourceLocators.elements where " +
                "  loc = ? and tm = ?", new Object[] { ldo, tmdo},
                  new Type[] {
                      Hibernate.entity(LocatorDataObject.class),
--- 433,438 ----
              ret = find(txn,
                  "select tm from tm in class org.tm4j.topicmap.hibernate.TopicMapDataObject," +
!                 "  loc in tm.sourceLocators.elements where " +
!                 "  loc = ? and tm = ?", new Object[] { ldo, tmdo},
                  new Type[] {
                      Hibernate.entity(LocatorDataObject.class),
***************
*** 1254,1257 ****
--- 1255,1270 ----
  
      /**
+      * Returns wether the ID of this TopicMapObject equals to the ID of the TopicMapObject provided.
+      *
+      * This method is to allow for implementations which do not have a notion of explicit ID strings or
+      * where such a creation of ID strings is expensive, where IDs are not strings or where otherwise undue. 
+      *
+      * The implementation can safely assume that the TopicMapObject provided is from the same TopicMap. 
+      */
+     public boolean equalsByID(TopicMapObject o) {
+ 	return getID().equals(o.getID());
+     }
+      
+     /**
       * Returns the Locator of the XML or other resource which
       * caused the creation of this topic map object.
***************
*** 1785,1788 ****
--- 1798,1804 ----
  /*
   * $Log$
+  * Revision 1.46  2007/05/08 15:52:24  mediumnet
+  * Fix a bug. Thanks to Lars Heuer for spotting it. Finding this bug in the first place was masked by another bug in the build.xml file: 'ant clean' does not properly clean up.
+  *
   * Revision 1.45  2004/06/21 18:40:23  kal_ahmed
   * Fixed query bug in destroy() code.