Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10686/src/org/tm4j/topicmap/tmdm/merged
Modified Files:
MergedTopicMapView.java
Log Message:
Activate considerably faster merging (speedups factors of more than 20 have been observed).
Index: MergedTopicMapView.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedTopicMapView.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MergedTopicMapView.java 19 Jun 2008 11:06:45 -0000 1.13
--- MergedTopicMapView.java 27 Jun 2008 07:32:26 -0000 1.14
***************
*** 528,532 ****
we iterate over all components to unindex and then we iterate over all components to reindex.
*/
! protected MergedTopic merge(MergedTopic mergedTopic0,MergedTopic mergedTopic1,boolean emitMergeTopicEventsToListeners) {
assert mergedTopic0!=mergedTopic1;
assert mergedTopic0.getParent()==mergedTopic1.getParent();
--- 528,532 ----
we iterate over all components to unindex and then we iterate over all components to reindex.
*/
! protected MergedTopic mergeOld(MergedTopic mergedTopic0,MergedTopic mergedTopic1,boolean emitMergeTopicEventsToListeners) {
assert mergedTopic0!=mergedTopic1;
assert mergedTopic0.getParent()==mergedTopic1.getParent();
***************
*** 582,586 ****
Faster implementation. We do not unindex (locators) which we would reindex anyways.
*/
! protected MergedTopic mergeNew(MergedTopic mergedTopic0,MergedTopic mergedTopic1,boolean emitMergeTopicEventsToListeners) {
assert mergedTopic0!=mergedTopic1;
assert mergedTopic0.getParent()==mergedTopic1.getParent();
--- 582,586 ----
Faster implementation. We do not unindex (locators) which we would reindex anyways.
*/
! protected MergedTopic merge(MergedTopic mergedTopic0,MergedTopic mergedTopic1,boolean emitMergeTopicEventsToListeners) {
assert mergedTopic0!=mergedTopic1;
assert mergedTopic0.getParent()==mergedTopic1.getParent();
|
