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
|
