tm4j-commits — Automatically generated CVS check-in notifications

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/utils XTMWriter.java, 1.43, 1.44

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

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

Modified Files:
	XTMWriter.java 
Log Message:
An assertion.

Index: XTMWriter.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/utils/XTMWriter.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** XTMWriter.java	12 Apr 2007 13:58:12 -0000	1.43
--- XTMWriter.java	3 May 2007 14:45:18 -0000	1.44
***************
*** 602,605 ****
--- 602,607 ----
  
      public void onType(Topic type) throws TopicMapProcessingException {
+         assert type!=null;
+ 		
          startInstanceOf(null);
          topicRef(type);
***************
*** 947,950 ****
--- 949,955 ----
  /*
   * $Log$
+  * Revision 1.44  2007/05/03 14:45:18  mediumnet
+  * An assertion.
+  *
   * Revision 1.43  2007/04/12 13:58:12  mediumnet
   * Tabs->Spaces for some files. Also make indentation rules explicit (at least to jEdit).

[Tm4j-commits] panckoucke/src/org/tm4j/panckoucke/impl/abstraction/extended ExtendedAbstractionUtil.java, 1.8, 1.9 ExtendedAssocContributor.java, 1.6, 1.7

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

Update of /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/impl/abstraction/extended
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30162/src/org/tm4j/panckoucke/impl/abstraction/extended

Modified Files:
	ExtendedAbstractionUtil.java ExtendedAssocContributor.java 
Log Message:
Some backends do not Topic.equals(null).

Index: ExtendedAssocContributor.java
===================================================================
RCS file: /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/impl/abstraction/extended/ExtendedAssocContributor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ExtendedAssocContributor.java	14 Jul 2004 13:14:44 -0000	1.6
--- ExtendedAssocContributor.java	2 May 2007 12:51:09 -0000	1.7
***************
*** 171,172 ****
--- 171,174 ----
  	}
  }
+ 
+ // :indentSize=4:tabSize=4:
\ No newline at end of file

Index: ExtendedAbstractionUtil.java
===================================================================
RCS file: /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/impl/abstraction/extended/ExtendedAbstractionUtil.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ExtendedAbstractionUtil.java	2 May 2007 12:46:38 -0000	1.8
--- ExtendedAbstractionUtil.java	2 May 2007 12:51:09 -0000	1.9
***************
*** 108,113 ****
      AMGestalt gestaltRole = AMGestaltRegistry.GESTALT_ROLE;
      
-     assert t0!=null;
- 
      // processing all members of that association
      Iterator members = assoc.getMembers().iterator();
--- 108,111 ----
***************
*** 130,134 ****
  	assert player!=null;
  	
!         if (player.equals(t0)) {
            endnode = n0;
          } else {
--- 128,132 ----
  	assert player!=null;
  	
!         if ((t0!=null)&&player.equals(t0)) {
            endnode = n0;
          } else {

[Tm4j-commits] panckoucke/src/org/tm4j/panckoucke/impl/abstraction/extended ExtendedAbstractionUtil.java, 1.7, 1.8

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

Update of /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/impl/abstraction/extended
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28094/src/org/tm4j/panckoucke/impl/abstraction/extended

Modified Files:
	ExtendedAbstractionUtil.java 
Log Message:
Add some assertions.

Index: ExtendedAbstractionUtil.java
===================================================================
RCS file: /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/impl/abstraction/extended/ExtendedAbstractionUtil.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ExtendedAbstractionUtil.java	10 Nov 2004 15:43:43 -0000	1.7
--- ExtendedAbstractionUtil.java	2 May 2007 12:46:38 -0000	1.8
***************
*** 107,110 ****
--- 107,112 ----
      AMGestalt gestaltPlayer = AMGestaltRegistry.GESTALT_PLAYER;
      AMGestalt gestaltRole = AMGestaltRegistry.GESTALT_ROLE;
+     
+     assert t0!=null;
  
      // processing all members of that association
***************
*** 126,129 ****
--- 128,133 ----
          player = (Topic) players.next();
  
+ 	assert player!=null;
+ 	
          if (player.equals(t0)) {
            endnode = n0;

[Tm4j-commits] panckoucke/src/org/tm4j/panckoucke/util NameUtil.java, 1.14, 1.15

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

Update of /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/util
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9097/src/org/tm4j/panckoucke/util

Modified Files:
	NameUtil.java 
Log Message:
A little optimization for labelForBaseTopic().

Index: NameUtil.java
===================================================================
RCS file: /cvsroot/tm4j/panckoucke/src/org/tm4j/panckoucke/util/NameUtil.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** NameUtil.java	11 Nov 2004 08:57:19 -0000	1.14
--- NameUtil.java	2 May 2007 12:02:35 -0000	1.15
***************
*** 181,192 ****
      }
  
!     // basename from merged Topics?
!     Iterator it = t.getMergedTopics().iterator();
! 
!     while (it.hasNext()) {
!       name = basenameOfTopic((Topic) it.next(), includeScope);
! 
!       if (name != null) {
!         return name;
        }
      }
--- 181,195 ----
      }
  
!     // there is no need to check for the basename of the merged topics, as the basenameOfTopic() call above already considers all basenames of all merged topics. 
!     if (false) {
!       // basename from merged Topics?
!       Iterator it = t.getMergedTopics().iterator();
!   
!       while (it.hasNext()) {
!         name = basenameOfTopic((Topic) it.next(), includeScope);
!   
!         if (name != null) {
!           return name;
!         }
        }
      }
***************
*** 409,410 ****
--- 412,415 ----
    }
  }
+ 
+ // :indentSize=2:tabSize=2:

[Tm4j-commits] tmnav build.xml,1.37,1.38

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

Update of /cvsroot/tm4j/tmnav
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15958

Modified Files:
	build.xml 
Log Message:
Include needed file resources in build tree.

Index: build.xml
===================================================================
RCS file: /cvsroot/tm4j/tmnav/build.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** build.xml	10 Sep 2004 10:05:42 -0000	1.37
--- build.xml	2 May 2007 11:02:22 -0000	1.38
***************
*** 75,78 ****
--- 75,83 ----
        <fileset dir="${imgdir}"/>
      </copy>
+     <copy toDir="${classdir}/org/tm4j/tmnav/app/edit/ui">
+       <fileset dir="${srcdir}/org/tm4j/tmnav/app/edit/ui">
+         <include name="*.gif"/>
+       </fileset>
+     </copy>
    </target>
    

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/utils TopicMapWalker.java, 1.24, 1.25

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

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

Modified Files:
	TopicMapWalker.java 
Log Message:
Convert concrete ID comparisons to more abstracted call equalsByID().

Index: TopicMapWalker.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/utils/TopicMapWalker.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** TopicMapWalker.java	30 Jun 2004 06:46:57 -0000	1.24
--- TopicMapWalker.java	30 Apr 2007 13:53:13 -0000	1.25
***************
*** 83,87 ****
          while (topics.hasNext()) {
              Topic t = (Topic) topics.next();
!             if (t.getID().equals(t.getBaseTopic().getID())) {
                  walk(t);
              }
--- 83,87 ----
          while (topics.hasNext()) {
              Topic t = (Topic) topics.next();
!             if (t.equalsByID(t.getBaseTopic())) {
                  walk(t);
              }

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/ozone OzoneTopicImpl.java, 1.62, 1.63 OzoneTopicMapImpl.java, 1.58, 1.59 OzoneTopicMapObjectImpl.java, 1.35, 1.36

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

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

Modified Files:
	OzoneTopicImpl.java OzoneTopicMapImpl.java 
	OzoneTopicMapObjectImpl.java 
Log Message:
Convert concrete ID comparisons to more abstracted call equalsByID().

Index: OzoneTopicMapImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/ozone/OzoneTopicMapImpl.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** OzoneTopicMapImpl.java	7 Oct 2004 09:35:47 -0000	1.58
--- OzoneTopicMapImpl.java	30 Apr 2007 13:53:12 -0000	1.59
***************
*** 254,258 ****
                  Topic t = ((Topic)o).getBaseTopic();
  
!                 if (!t.getID().equals(ret.getID()) &&
                          !t.getMergedTopics().contains(ret)) {
                      t.addMergedTopic(ret);
--- 254,258 ----
                  Topic t = ((Topic)o).getBaseTopic();
  
!                 if (!t.equalsByID(ret) &&
                          !t.getMergedTopics().contains(ret)) {
                      t.addMergedTopic(ret);
***************
*** 289,293 ****
                      // which cause merges. To avoid merging the topic with itself, check the returned
                      // topic id.
!                     if (t.getID().equals(ret.getID())) {
                          continue;
                      }
--- 289,293 ----
                      // which cause merges. To avoid merging the topic with itself, check the returned
                      // topic id.
!                     if (t.equalsByID(ret)) {
                          continue;
                      }
***************
*** 311,315 ****
                  Topic t = (Topic) m_topicsByScopedName.get(scName);
                  t = t.getBaseTopic();
!                 if (t.getID().equals(topic.getBaseTopic().getID())) {
                      continue;
                  }
--- 311,315 ----
                  Topic t = (Topic) m_topicsByScopedName.get(scName);
                  t = t.getBaseTopic();
!                 if (t.equalsByID(topic.getBaseTopic())) {
                      continue;
                  }
***************
*** 614,618 ****
                  m_topicsBySubject.containsKey(oldSubject.getAddress())) {
              Topic t = (Topic) m_topicsBySubject.get(oldSubject.getAddress());
!             if (t.getID() == topic.getID()) {
                  m_topicsBySubject.remove(oldSubject.getAddress());
              }
--- 614,618 ----
                  m_topicsBySubject.containsKey(oldSubject.getAddress())) {
              Topic t = (Topic) m_topicsBySubject.get(oldSubject.getAddress());
!             if (t.getID() == topic.getID()) { // REVIEW: What's that? We do not compare by value, we compare by pointer?
                  m_topicsBySubject.remove(oldSubject.getAddress());
              }
***************
*** 636,640 ****
              Topic t = (Topic) m_topicsByScopedName.get(scopedName);
  
!             if ((t != null) && (t.getID().equals(topic.getID()))) {
                  m_topicsByScopedName.remove(scopedName);
              }
--- 636,640 ----
              Topic t = (Topic) m_topicsByScopedName.get(scopedName);
  
!             if ((t != null) && (t.equalsByID(topic))) {
                  m_topicsByScopedName.remove(scopedName);
              }
***************
*** 653,657 ****
              Topic t = (Topic) m_topicsBySubjectIndicator.get(indicator.getAddress());
  
!             if ((t != null) && t.getID().equals(topic.getID())) {
                  m_topicsBySubjectIndicator.remove(indicator.getAddress());
              }
--- 653,657 ----
              Topic t = (Topic) m_topicsBySubjectIndicator.get(indicator.getAddress());
  
!             if ((t != null) && t.equalsByID(topic)) {
                  m_topicsBySubjectIndicator.remove(indicator.getAddress());
              }

Index: OzoneTopicImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/ozone/OzoneTopicImpl.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** OzoneTopicImpl.java	8 Dec 2004 10:50:59 -0000	1.62
--- OzoneTopicImpl.java	30 Apr 2007 13:53:12 -0000	1.63
***************
*** 136,140 ****
          if (getTopicMap().getBaseLocator() == null) {
              if (other.getTopicMap().getBaseLocator() == null) {
!                 return (getID().compareTo(other.getID()) == 0);
              } else {
                  return false;
--- 136,141 ----
          if (getTopicMap().getBaseLocator() == null) {
              if (other.getTopicMap().getBaseLocator() == null) {
! //              return (getID().compareTo(other.getID()) == 0);
!                 return (equalsByID(other));
              } else {
                  return false;
***************
*** 149,153 ****
  
                  if (comp == 0) {
!                     return (getID().compareTo(other.getID()) == 0);
                  } else {
                      return false;
--- 150,155 ----
  
                  if (comp == 0) {
! //                  return (getID().compareTo(other.getID()) == 0);
!                     return (equalsByID(other));
                  } else {
                      return false;
***************
*** 1251,1255 ****
                  return;
              }
!             if (mergedTopic.getID().equals(getID())) {
                  m_log.error("Detected an attempt to merge the topic:  " +
                      getID() + " with itself.");
--- 1253,1257 ----
                  return;
              }
!             if (mergedTopic.equalsByID(this)) {
                  m_log.error("Detected an attempt to merge the topic:  " +
                      getID() + " with itself.");
***************
*** 1303,1307 ****
          }
  
!         if (merged.getID().equals(getID())) {
              return;
          }
--- 1305,1309 ----
          }
  
!         if (merged.equalsByID(this)) {
              return;
          }

Index: OzoneTopicMapObjectImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/ozone/OzoneTopicMapObjectImpl.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** OzoneTopicMapObjectImpl.java	30 Apr 2007 13:35:22 -0000	1.35
--- OzoneTopicMapObjectImpl.java	30 Apr 2007 13:53:13 -0000	1.36
***************
*** 132,136 ****
  
      /** */
!     public boolean equalsByID(TopicMapObject o) {
  	return getID().equals(o.getID());
      }
--- 132,136 ----
  
      /** */
!     public boolean equalsByID(org.tm4j.topicmap.TopicMapObject o) {
  	return getID().equals(o.getID());
      }

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/unified UnifiedTopicMap.java, 1.25, 1.26 UnifiedTopicMapObject.java, 1.13, 1.14

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

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

Modified Files:
	UnifiedTopicMap.java UnifiedTopicMapObject.java 
Log Message:
Convert concrete ID comparisons to more abstracted call equalsByID().

Index: UnifiedTopicMapObject.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/unified/UnifiedTopicMapObject.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** UnifiedTopicMapObject.java	21 May 2004 08:30:06 -0000	1.13
--- UnifiedTopicMapObject.java	30 Apr 2007 13:53:13 -0000	1.14
***************
*** 60,63 ****
--- 60,67 ----
          return m_baseObjectID;
      }
+     
+     public boolean equalsByID(TopicMapObject o) {
+ 	return getID().equals(o.getID());
+     }
  
      /**

Index: UnifiedTopicMap.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/unified/UnifiedTopicMap.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** UnifiedTopicMap.java	21 May 2004 08:30:06 -0000	1.25
--- UnifiedTopicMap.java	30 Apr 2007 13:53:13 -0000	1.26
***************
*** 560,563 ****
--- 560,567 ----
      }
  
+     public boolean equalsByID(TopicMapObject o) {
+ 	return getID().equals(o.getID());
+     }
+     
      /**
       * @deprecated use {@link #getSourceLocators() }

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/memory TopicImpl.java, 1.75, 1.76 TopicMapImpl.java, 1.73, 1.74 TopicMapUtilsImpl.java, 1.28, 1.29

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

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

Modified Files:
	TopicImpl.java TopicMapImpl.java TopicMapUtilsImpl.java 
Log Message:
Convert concrete ID comparisons to more abstracted call equalsByID().

Index: TopicImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/memory/TopicImpl.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** TopicImpl.java	20 Apr 2007 12:23:12 -0000	1.75
--- TopicImpl.java	30 Apr 2007 13:53:12 -0000	1.76
***************
*** 129,133 ****
          if (getTopicMap().getBaseLocator() == null) {
              if (other.getTopicMap().getBaseLocator() == null) {
!                 return (getID().compareTo(other.getID()) == 0);
              } else {
                  return false;
--- 129,134 ----
          if (getTopicMap().getBaseLocator() == null) {
              if (other.getTopicMap().getBaseLocator() == null) {
! //              return (getID().compareTo(other.getID()) == 0);
!                 return (equalsByID(other));
              } else {
                  return false;
***************
*** 142,146 ****
  
                  if (comp == 0) {
!                     return (getID().compareTo(other.getID()) == 0);
                  } else {
                      return false;
--- 143,148 ----
  
                  if (comp == 0) {
! //                  return (getID().compareTo(other.getID()) == 0);
!                     return (equalsByID(other));
                  } else {
                      return false;
***************
*** 1083,1087 ****
                  return;
              }
!             if (mergedTopic.getID().equals(getID())) {
                  java.io.StringWriter strWriter = new java.io.StringWriter();
                  TopicMapRuntimeException ex = new TopicMapRuntimeException(
--- 1085,1089 ----
                  return;
              }
!             if (mergedTopic.equalsByID(this)) {
                  java.io.StringWriter strWriter = new java.io.StringWriter();
                  TopicMapRuntimeException ex = new TopicMapRuntimeException(
***************
*** 1147,1151 ****
          }
  
!         if (merged.getID().equals(getID())) {
              return;
          }
--- 1149,1153 ----
          }
  
!         if (merged.equalsByID(this)) {
              return;
          }
***************
*** 1715,1720 ****
  /*
   * $Log$
!  * Revision 1.75  2007/04/20 12:23:12  mediumnet
!  * Preparing the memory backend to live without to be removed interfaces. See bug https://sourceforge.net/tracker/?func=detail&atid=391879&aid=1704268&group_id=27895 for more.
   *
   * Revision 1.74  2007/04/17 06:42:39  mediumnet
--- 1717,1725 ----
  /*
   * $Log$
!  * Revision 1.76  2007/04/30 13:53:12  mediumnet
!  * Convert concrete ID comparisons to more abstracted call equalsByID().
!  *
!  * Revision 1.75  2007/04/20 12:23:12  mediumnet
!  * Preparing the memory backend to live without to be removed interfaces. See bug https://sourceforge.net/tracker/?func=detail&atid=391879&aid=1704268&group_id=27895 for more.
   *
   * Revision 1.74  2007/04/17 06:42:39  mediumnet

Index: TopicMapImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/memory/TopicMapImpl.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** TopicMapImpl.java	17 Apr 2007 05:04:33 -0000	1.73
--- TopicMapImpl.java	30 Apr 2007 13:53:12 -0000	1.74
***************
*** 227,231 ****
                  TopicImpl t = (TopicImpl) ((Topic)o).getBaseTopic();
  
!                 if (!t.getID().equals(ret.getID()) &&
                          !t.getMergedTopics().contains(ret)) {
                      t.addMergedTopic(ret);
--- 227,231 ----
                  TopicImpl t = (TopicImpl) ((Topic)o).getBaseTopic();
  
!                 if (!t.equalsByID(ret) &&
                          !t.getMergedTopics().contains(ret)) {
                      t.addMergedTopic(ret);
***************
*** 267,271 ****
                      // which cause merges. To avoid merging the topic with itself, check the returned
                      // topic id.
!                     if (t.getID().equals(ret.getID())) {
                          continue;
                      }
--- 267,271 ----
                      // which cause merges. To avoid merging the topic with itself, check the returned
                      // topic id.
!                     if (t.equalsByID(ret)) {
                          continue;
                      }
***************
*** 290,294 ****
                  TopicImpl t = (TopicImpl) m_topicsByScopedName.get(scName);
                  t = (TopicImpl)t.getBaseTopic();
!                 if (t.getID().equals(ret.getBaseTopic().getID())) {
                      continue;
                  }
--- 290,294 ----
                  TopicImpl t = (TopicImpl) m_topicsByScopedName.get(scName);
                  t = (TopicImpl)t.getBaseTopic();
!                 if (t.equalsByID(ret.getBaseTopic())) {
                      continue;
                  }
***************
*** 652,656 ****
              Topic t = (Topic) m_topicsByScopedName.get(scopedName);
  
!             if ((t != null) && (t.getID().equals(topic.getID()))) {
                  m_topicsByScopedName.remove(scopedName);
              }
--- 652,656 ----
              Topic t = (Topic) m_topicsByScopedName.get(scopedName);
  
!             if ((t != null) && (t.equalsByID(topic))) {
                  m_topicsByScopedName.remove(scopedName);
              }
***************
*** 669,673 ****
              Topic t = (Topic) m_topicsBySubjectIdentifier.get(indicator);
  
!             if ((t != null) && (t.getID().equals(topic.getID()))) {
                  m_topicsBySubjectIdentifier.remove(indicator);
              }
--- 669,673 ----
              Topic t = (Topic) m_topicsBySubjectIdentifier.get(indicator);
  
!             if ((t != null) && (t.equalsByID(topic))) {
                  m_topicsBySubjectIdentifier.remove(indicator);
              }
***************
*** 1391,1396 ****
  /*
   * $Log$
!  * Revision 1.73  2007/04/17 05:04:33  mediumnet
!  * Support for removing a topic from a merged topic in response to bug https://sourceforge.net/tracker/index.php?func=detail&aid=1698885&group_id=27895&atid=391879 . Also adds some diagnostics support.
   *
   * Revision 1.72  2006/03/07 15:36:35  lheuer
--- 1391,1399 ----
  /*
   * $Log$
!  * Revision 1.74  2007/04/30 13:53:12  mediumnet
!  * Convert concrete ID comparisons to more abstracted call equalsByID().
!  *
!  * Revision 1.73  2007/04/17 05:04:33  mediumnet
!  * Support for removing a topic from a merged topic in response to bug https://sourceforge.net/tracker/index.php?func=detail&aid=1698885&group_id=27895&atid=391879 . Also adds some diagnostics support.
   *
   * Revision 1.72  2006/03/07 15:36:35  lheuer

Index: TopicMapUtilsImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/memory/TopicMapUtilsImpl.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** TopicMapUtilsImpl.java	15 Dec 2004 08:33:35 -0000	1.28
--- TopicMapUtilsImpl.java	30 Apr 2007 13:53:12 -0000	1.29
***************
*** 217,221 ****
          ArrayList ret = new ArrayList();
          Iterator it = null;
!         String typeid = type.getBaseTopic().getID();
  
          if (objects == null) {
--- 217,222 ----
          ArrayList ret = new ArrayList();
          Iterator it = null;
! //      String typeid = type.getBaseTopic().getID();
!         Topic typeBase = type.getBaseTopic();
  
          if (objects == null) {
***************
*** 229,233 ****
  
              if (tmo instanceof Association) {
!                 if (((Association) tmo).getType().getBaseTopic().getID().equals(typeid)) {
                      ret.add(tmo);
                  }
--- 230,235 ----
  
              if (tmo instanceof Association) {
! //              if (((Association) tmo).getType().getBaseTopic().getID().equals(typeid)) {
!                 if (((Association) tmo).getType().getBaseTopic().equalsByID(typeBase)) {
                      ret.add(tmo);
                  }
***************
*** 236,240 ****
  
                  while (typesIt.hasNext()) {
!                     if (((Topic) typesIt.next()).getBaseTopic().getID().equals(typeid)) {
                          ret.add(tmo);
  
--- 238,243 ----
  
                  while (typesIt.hasNext()) {
! //                  if (((Topic) typesIt.next()).getBaseTopic().getID().equals(typeid)) {
!                     if (((Topic) typesIt.next()).getBaseTopic().equalsByID(typeBase)) {
                          ret.add(tmo);
  
***************
*** 862,865 ****
--- 865,871 ----
  /*
   * $Log$
+  * Revision 1.29  2007/04/30 13:53:12  mediumnet
+  * Convert concrete ID comparisons to more abstracted call equalsByID().
+  *
   * Revision 1.28  2004/12/15 08:33:35  kal_ahmed
   * Fixed getScopedVariantName to traverse nested variants. Fixed getSubClasses and getSuperClasses to avoid duplicates in the returned list.

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/hibernate TopicImpl.java, 1.56, 1.57

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

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

Modified Files:
	TopicImpl.java 
Log Message:
Convert concrete ID comparisons to more abstracted call equalsByID().

Index: TopicImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/hibernate/TopicImpl.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** TopicImpl.java	11 Oct 2004 19:49:48 -0000	1.56
--- TopicImpl.java	30 Apr 2007 13:53:11 -0000	1.57
***************
*** 699,703 ****
              Topic top = (Topic) iter.next();
  
!             if (top.getID().equals(type.getID())) {
                  return true;
              }
--- 699,703 ----
              Topic top = (Topic) iter.next();
  
!             if (top.equalsByID(type)) {
                  return true;
              }
***************
*** 2428,2431 ****
--- 2428,2434 ----
  /*
   * $Log$
+  * Revision 1.57  2007/04/30 13:53:11  mediumnet
+  * Convert concrete ID comparisons to more abstracted call equalsByID().
+  *
   * Revision 1.56  2004/10/11 19:49:48  kal_ahmed
   * Removed obsolete implementation of setOccurrences(). Added implementation of getScopedNames().

[Tm4j-commits] tm4j/src/org/tm4j/topicmap TopicMapObject.java, 1.25, 1.26

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

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

Modified Files:
	TopicMapObject.java 
Log Message:
Start for support for non-String-IDs.

Index: TopicMapObject.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/TopicMapObject.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** TopicMapObject.java	22 Apr 2004 20:45:39 -0000	1.25
--- TopicMapObject.java	30 Apr 2007 13:35:22 -0000	1.26
***************
*** 71,74 ****
--- 71,84 ----
  
      /**
+      * 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);
+ 
+     /**
       * Returns the Locator of the XML or other resource which
       * caused the creation of this topic map object.

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/memory TopicMapObjectImpl.java, 1.39, 1.40

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

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

Modified Files:
	TopicMapObjectImpl.java 
Log Message:
Start for support for non-String-IDs.

Index: TopicMapObjectImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/memory/TopicMapObjectImpl.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** TopicMapObjectImpl.java	20 Apr 2007 12:23:12 -0000	1.39
--- TopicMapObjectImpl.java	30 Apr 2007 13:35:22 -0000	1.40
***************
*** 126,129 ****
--- 126,141 ----
  
      /**
+      * 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());
+     }
+      
+     /**
       * @deprecated from 0.9.0 use {@link #addSourceLocator(Locator)} instead
       */
***************
*** 530,535 ****
  /*
   * $Log$
!  * Revision 1.39  2007/04/20 12:23:12  mediumnet
!  * Preparing the memory backend to live without to be removed interfaces. See bug https://sourceforge.net/tracker/?func=detail&atid=391879&aid=1704268&group_id=27895 for more.
   *
   * Revision 1.38  2007/04/17 05:04:33  mediumnet
--- 542,550 ----
  /*
   * $Log$
!  * Revision 1.40  2007/04/30 13:35:22  mediumnet
!  * Start for support for non-String-IDs.
!  *
!  * Revision 1.39  2007/04/20 12:23:12  mediumnet
!  * Preparing the memory backend to live without to be removed interfaces. See bug https://sourceforge.net/tracker/?func=detail&atid=391879&aid=1704268&group_id=27895 for more.
   *
   * Revision 1.38  2007/04/17 05:04:33  mediumnet

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/ozone OzoneTopicMapObjectImpl.java, 1.34, 1.35

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

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

Modified Files:
	OzoneTopicMapObjectImpl.java 
Log Message:
Start for support for non-String-IDs.

Index: OzoneTopicMapObjectImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/ozone/OzoneTopicMapObjectImpl.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** OzoneTopicMapObjectImpl.java	22 Apr 2004 20:45:57 -0000	1.34
--- OzoneTopicMapObjectImpl.java	30 Apr 2007 13:35:22 -0000	1.35
***************
*** 132,135 ****
--- 132,140 ----
  
      /** */
+     public boolean equalsByID(TopicMapObject o) {
+ 	return getID().equals(o.getID());
+     }
+      
+     /** */
      public void addPropertyChangeListener(PropertyChangeListener listener) {
          addPropertyChangeListener(ALL_PROPERTIES, listener);

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/hibernate TopicMapObjectImpl.java, 1.23, 1.24

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

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

Modified Files:
	TopicMapObjectImpl.java 
Log Message:
Start for support for non-String-IDs.

Index: TopicMapObjectImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/hibernate/TopicMapObjectImpl.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** TopicMapObjectImpl.java	24 Aug 2004 20:42:15 -0000	1.23
--- TopicMapObjectImpl.java	30 Apr 2007 13:35:22 -0000	1.24
***************
*** 94,97 ****
--- 94,102 ----
      }
  
+     /** */
+     public boolean equalsByID(TopicMapObject o) {
+ 	return getID().equals(o.getID());
+     }
+     
      private String getID(ProviderTransaction txn) {
          TopicMapObjectDataObject tdo = (TopicMapObjectDataObject) load(txn);
***************
*** 488,491 ****
--- 493,499 ----
  /*
   * $Log$
+  * Revision 1.24  2007/04/30 13:35:22  mediumnet
+  * Start for support for non-String-IDs.
+  *
   * Revision 1.23  2004/08/24 20:42:15  kal_ahmed
   * Tidied up declaration of destroy() method and cascading delete of variant names.

[Tm4j-commits] Printable

[Gunjan D. <Gun...@am...>]

sky

WATCH OJU.F TRADE LIKE CRAZY ON FRIDAY!
THIS FRANKFURT STOCK IS GOING THROUGH THE ROOF!

COMPANY: ORAMED PHARMA
SYMBOL: OJU.F
PRICE: 0.65
TARGET: 2.15
WKN : A0J3FG
ISIN : US68403P1049


WE ARE PREDICTING AMAZING GAINS ON THIS ONE!
BE PART OF IT! ADD IT TO YOUR PORTFOLIO!
WATCH OJU.F ON FRIDAY APRIL 27TH!
Someone Rate Printable Version Browse

[Tm4j-commits] Holzschlag

[Salmaan k. <ka...@as...>]

tough

[Tm4j-commits] tm4j/lib commons-logging-1.1.jar, NONE, 1.1 commons-logging.jar, 1.3, NONE

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

Update of /cvsroot/tm4j/tm4j/lib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6406/lib

Added Files:
	commons-logging-1.1.jar 
Removed Files:
	commons-logging.jar 
Log Message:
Updating commons-logging to version 1.1

--- commons-logging.jar DELETED ---

--- NEW FILE: commons-logging-1.1.jar ---
(This appears to be a binary file; contents omitted.)

[Tm4j-commits] tm4j/src/org/tm4j/topicmap TopicMapFactoryBase.java, 1.32, 1.32.2.1

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

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

Modified Files:
      Tag: TM4J_1_x
	TopicMapFactoryBase.java 
Log Message:
Applying patch from Peri's post on tm4...@li... (Message-ID: <d9c...@ma...>). Unfortunately, SourceForge's mailarchive is currently not available, so I cannot add the link to his post directly.

Index: TopicMapFactoryBase.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/TopicMapFactoryBase.java,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -C2 -d -r1.32 -r1.32.2.1
*** TopicMapFactoryBase.java	11 May 2004 20:43:59 -0000	1.32
--- TopicMapFactoryBase.java	20 Apr 2007 12:53:58 -0000	1.32.2.1
***************
*** 734,743 ****
              Set srcScope = src.getScope();
              Topic[] cpScope = null;
! 
              if (!srcScope.isEmpty()) {
                  cpScope = (Topic[]) srcScope.toArray(new Topic[srcScope.size()]);
              }
  
!             dest.setScope(cpScope);
          }
  
--- 734,751 ----
              Set srcScope = src.getScope();
              Topic[] cpScope = null;
!             Topic[] cpScope_d = new Topic[srcScope.size()];
              if (!srcScope.isEmpty()) {
                  cpScope = (Topic[]) srcScope.toArray(new Topic[srcScope.size()]);
+                 for(int index=0;index<cpScope.length;index++){
+                 	Topic t = dest.getTopicMap().getTopicByID(cpScope[index].getID());
+             		if(t==null){
+             			copy(cpScope[index], deep, idPrefix, idSuffix, copied);
+             		}
+             		cpScope_d[index] = dest.getTopicMap().getTopicByID(cpScope[index].getID());
+ 
+             	}
              }
  
!             dest.setScope(cpScope_d);
          }
  

[Tm4j-commits] tm4j/src/org/tm4j/topicmap TopicMapFactoryBase.java, 1.32, 1.33

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

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

Modified Files:
	TopicMapFactoryBase.java 
Log Message:
Applying patch from Peri's post on tm4...@li... (Message-ID: <d9c...@ma...>). Unfortunately, SourceForge's mailarchive is currently not available, so I cannot add the link to his post directly.

Index: TopicMapFactoryBase.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/TopicMapFactoryBase.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** TopicMapFactoryBase.java	11 May 2004 20:43:59 -0000	1.32
--- TopicMapFactoryBase.java	20 Apr 2007 12:52:20 -0000	1.33
***************
*** 734,743 ****
              Set srcScope = src.getScope();
              Topic[] cpScope = null;
! 
              if (!srcScope.isEmpty()) {
                  cpScope = (Topic[]) srcScope.toArray(new Topic[srcScope.size()]);
              }
  
!             dest.setScope(cpScope);
          }
  
--- 734,751 ----
              Set srcScope = src.getScope();
              Topic[] cpScope = null;
!             Topic[] cpScope_d = new Topic[srcScope.size()];
              if (!srcScope.isEmpty()) {
                  cpScope = (Topic[]) srcScope.toArray(new Topic[srcScope.size()]);
+                 for(int index=0;index<cpScope.length;index++){
+                 	Topic t = dest.getTopicMap().getTopicByID(cpScope[index].getID());
+             		if(t==null){
+             			copy(cpScope[index], deep, idPrefix, idSuffix, copied);
+             		}
+             		cpScope_d[index] = dest.getTopicMap().getTopicByID(cpScope[index].getID());
+ 
+             	}
              }
  
!             dest.setScope(cpScope_d);
          }
  

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/memory TopicImpl.java, 1.74, 1.75 TopicMapObjectImpl.java, 1.38, 1.39

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

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

Modified Files:
	TopicImpl.java TopicMapObjectImpl.java 
Log Message:
Preparing the memory backend to live without to be removed interfaces. See bug https://sourceforge.net/tracker/?func=detail&atid=391879&aid=1704268&group_id=27895 for more.

Index: TopicImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/memory/TopicImpl.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** TopicImpl.java	17 Apr 2007 06:42:39 -0000	1.74
--- TopicImpl.java	20 Apr 2007 12:23:12 -0000	1.75
***************
*** 79,83 ****
      protected Set m_rolesPlayed; // Member*
      protected ArrayList m_mergedTopics; // Topic*
!     protected Topic m_baseTopic;
  
      /**
--- 79,84 ----
      protected Set m_rolesPlayed; // Member*
      protected ArrayList m_mergedTopics; // Topic*
! //  protected Topic m_baseTopic;
!     protected TopicImpl m_baseTopic; // We do not support mixing of different backends in the same topic map, do we? Thus, we can safely assume that our base topic is also of type TopicImpl.
  
      /**
***************
*** 846,849 ****
--- 847,851 ----
       * @param occ The Occurrence to be added.
       */
+     // should be protected, not public
      public void addOccurrence(Occurrence occ) throws PropertyVetoException {
          if (staticallyMerged()) {
***************
*** 1263,1267 ****
  
          Topic oldTopic = m_baseTopic;
!         m_baseTopic = baseTopic;
  
          if (getTopicMap().getProperty(TopicMapProvider.OPT_STATIC_MERGE)
--- 1265,1270 ----
  
          Topic oldTopic = m_baseTopic;
!         m_baseTopic = (TopicImpl) baseTopic;	// We do not support mixing of different backends in the same topic map, do we? Thus, we can safely assume that our base topic is also of type TopicImpl.
! 		
  
          if (getTopicMap().getProperty(TopicMapProvider.OPT_STATIC_MERGE)
***************
*** 1712,1717 ****
  /*
   * $Log$
!  * Revision 1.74  2007/04/17 06:42:39  mediumnet
!  * Fix a bug, where org.tm4j.topicmap.memory.TopicImpl.getScopedNames() throws an exception within an ordinary usage of org.tm4j.topicmap.cmd.Merge .
   *
   * Revision 1.73  2007/04/17 05:04:33  mediumnet
--- 1715,1723 ----
  /*
   * $Log$
!  * Revision 1.75  2007/04/20 12:23:12  mediumnet
!  * Preparing the memory backend to live without to be removed interfaces. See bug https://sourceforge.net/tracker/?func=detail&atid=391879&aid=1704268&group_id=27895 for more.
!  *
!  * Revision 1.74  2007/04/17 06:42:39  mediumnet
!  * Fix a bug, where org.tm4j.topicmap.memory.TopicImpl.getScopedNames() throws an exception within an ordinary usage of org.tm4j.topicmap.cmd.Merge .
   *
   * Revision 1.73  2007/04/17 05:04:33  mediumnet

Index: TopicMapObjectImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/memory/TopicMapObjectImpl.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** TopicMapObjectImpl.java	17 Apr 2007 05:04:33 -0000	1.38
--- TopicMapObjectImpl.java	20 Apr 2007 12:23:12 -0000	1.39
***************
*** 530,535 ****
  /*
   * $Log$
!  * Revision 1.38  2007/04/17 05:04:33  mediumnet
!  * Support for removing a topic from a merged topic in response to bug https://sourceforge.net/tracker/index.php?func=detail&aid=1698885&group_id=27895&atid=391879 . Also adds some diagnostics support.
   *
   * Revision 1.37  2006/03/07 15:36:35  lheuer
--- 530,538 ----
  /*
   * $Log$
!  * Revision 1.39  2007/04/20 12:23:12  mediumnet
!  * Preparing the memory backend to live without to be removed interfaces. See bug https://sourceforge.net/tracker/?func=detail&atid=391879&aid=1704268&group_id=27895 for more.
!  *
!  * Revision 1.38  2007/04/17 05:04:33  mediumnet
!  * Support for removing a topic from a merged topic in response to bug https://sourceforge.net/tracker/index.php?func=detail&aid=1698885&group_id=27895&atid=391879 . Also adds some diagnostics support.
   *
   * Revision 1.37  2006/03/07 15:36:35  lheuer

[Tm4j-commits] tm4j/docs TMDM-support.html,1.3,1.4

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

Update of /cvsroot/tm4j/tm4j/docs
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30825/docs

Modified Files:
	TMDM-support.html 
Log Message:
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.

Index: TMDM-support.html
===================================================================
RCS file: /cvsroot/tm4j/tm4j/docs/TMDM-support.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TMDM-support.html	17 Apr 2007 14:57:21 -0000	1.3
--- TMDM-support.html	20 Apr 2007 12:20:20 -0000	1.4
***************
*** 8,11 ****
--- 8,12 ----
  <body>
  <h2>Current plans on how to support TMDM</h2>
+ <h3>TM4J and TMDM</h3>
  The basic idea is to implement a superset of the current TM4J (0.9.x)
  and the TMDM. Following issues need to be addressed:<br>
***************
*** 59,66 ****
      <li>TopicMapFlavour.TMDM: behave as TMDM expects (for example,
  throw exceptions if there will be multiple players per role introduced
! by using the old API)<br>
!     </li>
    </ul>
  </ul>
  <h3>Need for test-suite</h3>
  There is a need for a test-suite.<br>
--- 60,81 ----
      <li>TopicMapFlavour.TMDM: behave as TMDM expects (for example,
  throw exceptions if there will be multiple players per role introduced
! by using the old API)</li>
    </ul>
  </ul>
+ <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>
+   </li>
+ </ul>
+ <br>
  <h3>Need for test-suite</h3>
  There is a need for a test-suite.<br>

[Tm4j-commits] tm4j/src/org/tm4j/topicmap Topic.java,1.30,1.31

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

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

Modified Files:
	Topic.java 
Log Message:
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.

Index: Topic.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/Topic.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Topic.java	17 Apr 2007 05:04:33 -0000	1.30
--- Topic.java	20 Apr 2007 12:20:21 -0000	1.31
***************
*** 332,336 ****
--- 332,338 ----
       *                    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
      public void setOccurrences(Occurrence[] occurs)
          throws PropertyVetoException;
***************
*** 340,344 ****
--- 342,348 ----
       *
       * @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
      public void addOccurrence(Occurrence occurs) throws PropertyVetoException;
  
***************
*** 465,468 ****
--- 469,475 ----
  /*
   * $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
   * Support for removing a topic from a merged topic in response to bug https://sourceforge.net/tracker/index.php?func=detail&aid=1698885&group_id=27895&atid=391879 . Also adds some diagnostics support.

[Tm4j-commits] tm4j/docs TMDM-support.html,1.2,1.3

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

Update of /cvsroot/tm4j/tm4j/docs
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11348/docs

Modified Files:
	TMDM-support.html 
Log Message:
More thoughts on a future design of TM4J

Index: TMDM-support.html
===================================================================
RCS file: /cvsroot/tm4j/tm4j/docs/TMDM-support.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TMDM-support.html	13 Apr 2007 15:06:53 -0000	1.2
--- TMDM-support.html	17 Apr 2007 14:57:21 -0000	1.3
***************
*** 63,66 ****
--- 63,134 ----
    </ul>
  </ul>
+ <h3>Need for test-suite</h3>
+ There is a need for a test-suite.<br>
+ <ul>
+   <li>It should test different backends and functionality in general
+ with predefined or deterministically autogenerated topic maps.</li>
+   <li>The test-suite should also test for compatibility with the
+ TM4J_1_x branch.</li>
+   <li>The test-suite should also contain a part for evaluating speed.
+ Simple tests of the current backends (memory, ozone, hibernate over
+ mysql) using a 350MB XTM file showed that the current TM4J is either
+ memory-constrained (memory backend) or horribly slow (ozone backend as
+ well as hibernate over mysql).</li>
+   <ul>
+     <li>The ozone backend seems to be very slow because some very large
+ index objects (a whole persistent hashtable?) are serialized and
+ deserialized the whole time, seemingly one time per index access. The
+ hashtables should be split into smaller parts, each loadable and
+ savable separately.</li>
+   </ul>
+ </ul>
+ Lars Marius Garshol and H. Holger Rath have wished a general topic maps
+ testsuite already in the year 2002 (see <a
+  href="http://www.infoloom.com/pipermail/topicmapmail/2002q1/003604.html">this
+ e-mail message</a>).<br>
+ <h3>Separation of Control and View</h3>
+ By peeking into Robert Barta's Perl-TM implementation, following idea
+ emerged (or was merely copied from Robert):<br>
+ <br>
+ A topic map engine like TM4J does not only support read-only-operations
+ on topic maps but also changing operations. This means that it may be
+ inappropriate to implement certain aspects of the topic map standard as
+ a heavy operation (like duplicate removal at topicmap merging), as this
+ heavy operation may be invoked many times on each changing operation.
+ Thus, operations being a consequence of a changing operation should be
+ thin (i.e. do have small and roughly constant runtime). As (in the case
+ of merging) these operations change how a topic map is viewed, we
+ probably should see more clearly that there is a distinction of control
+ and view. All changing operations are at the control side, (nearly) all
+ querying operations are at the view side. Inbetween are operations
+ which align the view to what the control side says (according to the
+ TMDM merging rules). This leads to following design:<br>
+ <ul>
+   <li>TopicMapEventSource: The TopicMapEventSource emits events
+ whenever it changes. It may be stored in main memory, or persisently in
+ a topic map database, or it may be a wrapper around another
+ (dynamically changing but event emitting) data source.</li>
+   <li>TopicMapEventListener: The TopicMapEventListener receives events
+ whenever a source where it is registered changes. It may be simply a
+ copy or - together with other TopicMapEventSources - represent a
+ dynamically merged view of a TopicMapEventSource.</li>
+   <li>TopicMapEvent: The baseclass of all events passed between
+ TopicMapEventSource and TopicMapEventListener.</li>
+ </ul>
+ This way, we can separate the storage (a TopicMapEventSource) from the
+ (merged) view (a TopicMapEventSource). This should make storage much
+ more simpler. The merged view might be implemented in main memory or
+ persistently as well, however, it would not be limited to topic maps of
+ its same backing storage type (as it is now to either memory, ozoneDB
+ or hibernate). The merged view could also get input from remote
+ TopicMapEventSources. Also, it would be possible to create different
+ merged views of different (dynamic) topic maps in parallel. Also,
+ having a clearer distinction betwen the control side and the view side
+ avoids some of the current fuzziness, where one TopicImpl repesents
+ only itself and another TopicImpls represents not only itsself but also
+ the other topics merged with it (it is a "base topic" then). Hopefully
+ clearing this up makes also merging of non-topics (i.e. associations,
+ names, ...) possible, which is still on the TODO-list of TM4J.<br>
+ <br>
  <br>
  Author: <a

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/memory TopicImpl.java, 1.73, 1.74

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

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

Modified Files:
	TopicImpl.java 
Log Message:
Fix a bug, where org.tm4j.topicmap.memory.TopicImpl.getScopedNames() throws an exception within an ordinary usage of org.tm4j.topicmap.cmd.Merge .

Index: TopicImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/memory/TopicImpl.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** TopicImpl.java	17 Apr 2007 05:04:33 -0000	1.73
--- TopicImpl.java	17 Apr 2007 06:42:39 -0000	1.74
***************
*** 1,3 ****
! /*
  Copyright (c) 2000-2004 The TM4J Project. All rights reserved.
  
--- 1,3 ----
! /*  :indentSize=4:tabSize=4:
  Copyright (c) 2000-2004 The TM4J Project. All rights reserved.
  
***************
*** 1355,1361 ****
      public Collection getScopedNames(boolean includeMergedTopics) {
          if (m_baseTopic != null) {
!             RuntimeException ex = new RuntimeException("getScopedNames called on non-base topic.");
!             ex.printStackTrace();
!             throw ex;
          }
          ArrayList ret = new ArrayList(m_scopedNames != null ? m_scopedNames : Collections.EMPTY_LIST);
--- 1355,1365 ----
      public Collection getScopedNames(boolean includeMergedTopics) {
          if (m_baseTopic != null) {
! 			if (!includeMergedTopics) { // Why can getScopedNames only be called on base-topic?
! 				RuntimeException ex = new RuntimeException("getScopedNames called on non-base topic.");
! 				ex.printStackTrace();
! 				throw ex;
! 			} else {
! 				return m_baseTopic.getScopedNames(includeMergedTopics);
! 			}
          }
          ArrayList ret = new ArrayList(m_scopedNames != null ? m_scopedNames : Collections.EMPTY_LIST);
***************
*** 1708,1713 ****
  /*
   * $Log$
!  * Revision 1.73  2007/04/17 05:04:33  mediumnet
!  * Support for removing a topic from a merged topic in response to bug https://sourceforge.net/tracker/index.php?func=detail&aid=1698885&group_id=27895&atid=391879 . Also adds some diagnostics support.
   *
   * Revision 1.72  2006/03/07 15:36:35  lheuer
--- 1712,1720 ----
  /*
   * $Log$
!  * Revision 1.74  2007/04/17 06:42:39  mediumnet
!  * Fix a bug, where org.tm4j.topicmap.memory.TopicImpl.getScopedNames() throws an exception within an ordinary usage of org.tm4j.topicmap.cmd.Merge .
!  *
!  * Revision 1.73  2007/04/17 05:04:33  mediumnet
!  * Support for removing a topic from a merged topic in response to bug https://sourceforge.net/tracker/index.php?func=detail&aid=1698885&group_id=27895&atid=391879 . Also adds some diagnostics support.
   *
   * Revision 1.72  2006/03/07 15:36:35  lheuer

[Tm4j-commits] tm4j/src/org/tm4j/topicmap/source SerializedTopicMapSource.java, 1.19, 1.20 TopicMapSourceSupport.java, 1.8, 1.9

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

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

Modified Files:
	SerializedTopicMapSource.java TopicMapSourceSupport.java 
Log Message:
Add some diagnostics.

Index: SerializedTopicMapSource.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/source/SerializedTopicMapSource.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** SerializedTopicMapSource.java	25 Aug 2004 08:15:01 -0000	1.19
--- SerializedTopicMapSource.java	17 Apr 2007 06:32:35 -0000	1.20
***************
*** 1,3 ****
! /*
  Copyright (c) 2000-2004 The TM4J Project. All rights reserved.
  
--- 1,3 ----
! /*  :indentSize=4:tabSize=4:
  Copyright (c) 2000-2004 The TM4J Project. All rights reserved.
  
***************
*** 332,338 ****
--- 332,349 ----
          }
      }
+     
+     public String toString() {
+ 		if (locatorString!=null) {
+ 			return "SerializedTopicMapSource[locatorString=\""+locatorString+"\",base="+base+",stream="+stream+"]";
+ 		} else {
+ 			return "SerializedTopicMapSource[base="+base+",stream="+stream+"]";
+ 		}
+     }
  
      /*
       * $Log$
+      * Revision 1.20  2007/04/17 06:32:35  mediumnet
+      * Add some diagnostics.
+      *
       * Revision 1.19  2004/08/25 08:15:01  kal_ahmed
       * Added code to clean up transactions on a failure.

Index: TopicMapSourceSupport.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/source/TopicMapSourceSupport.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TopicMapSourceSupport.java	6 Mar 2004 14:30:49 -0000	1.8
--- TopicMapSourceSupport.java	17 Apr 2007 06:32:35 -0000	1.9
***************
*** 1,3 ****
! /*
  Copyright (c) 2000-2004 The TM4J Project. All rights reserved.
  
--- 1,3 ----
! /*  :indentSize=4:tabSize=4:
  Copyright (c) 2000-2004 The TM4J Project. All rights reserved.
  
***************
*** 35,39 ****
              source.populateTopicMap(existing);
          } catch (TopicMapProcessingException e) {
!             throw new TopicMapProviderException(e);
          }
  
--- 35,39 ----
              source.populateTopicMap(existing);
          } catch (TopicMapProcessingException e) {
! 			throw new TopicMapProviderException("While adding topic map "+source+" to "+existing+": ",e);
          }
  
***************
*** 125,128 ****
--- 125,131 ----
  /*
   * $Log$
+  * Revision 1.9  2007/04/17 06:32:35  mediumnet
+  * Add some diagnostics.
+  *
   * Revision 1.8  2004/03/06 14:30:49  kal_ahmed
   * Added provider options to automatically resolve external merge references and make the imported topic maps consistent.