Menu
▾
▴
[Tmapi-utils-commits] tmapi-utils/src/org/tmapiutils/query/tolog/predicates AssociationPredicate.java,1.2,1.3 InstanceOfPredicate.java,1.3,1.4 PredicateBase.java,1.2,1.3 ReifiesPredicate.java,1.6,1.7 ScopePredicate.java,1.3,1.4 TopicMapPredicate.java,1.3,1.4 TypePredicate.java,1.4,1.5 ValuePredicate.java,1.4,1.5
|
From: Lars H. <lh...@us...> - 2005-03-09 12:40:29
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2232/src/org/tmapiutils/query/tolog/predicates Modified Files: AssociationPredicate.java InstanceOfPredicate.java PredicateBase.java ReifiesPredicate.java ScopePredicate.java TopicMapPredicate.java TypePredicate.java ValuePredicate.java Log Message: - All predicates and predicate tests now compile - TMAPI compatible enhancements in /parser directory - Updated ToDo Index: PredicateBase.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/PredicateBase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PredicateBase.java 8 Mar 2005 12:33:57 -0000 1.2 --- PredicateBase.java 9 Mar 2005 12:40:19 -0000 1.3 *************** *** 31,34 **** --- 31,35 ---- import org.tmapiutils.query.tolog.utils.TologContext; import org.tmapiutils.query.tolog.utils.VariableSet; + // TMAPI import org.tmapi.core.Topic; import org.tmapi.core.TopicMap; Index: AssociationPredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/AssociationPredicate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AssociationPredicate.java 8 Mar 2005 12:33:56 -0000 1.2 --- AssociationPredicate.java 9 Mar 2005 12:40:19 -0000 1.3 *************** *** 24,27 **** --- 24,28 ---- import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; + // TMAPI import org.tmapi.core.Association; Index: TopicMapPredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/TopicMapPredicate.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TopicMapPredicate.java 8 Mar 2005 12:33:57 -0000 1.3 --- TopicMapPredicate.java 9 Mar 2005 12:40:19 -0000 1.4 *************** *** 23,26 **** --- 23,27 ---- import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; + // TMAPI import org.tmapi.core.TopicMap; Index: TypePredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/TypePredicate.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TypePredicate.java 8 Mar 2005 12:33:57 -0000 1.4 --- TypePredicate.java 9 Mar 2005 12:40:19 -0000 1.5 *************** *** 26,30 **** import org.tmapiutils.query.tolog.utils.VariableSet; - import org.tmapiutils.utils.IndexUtils; // TMAPI import org.tmapi.core.TopicMapObject; --- 26,29 ---- Index: ValuePredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/ValuePredicate.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ValuePredicate.java 8 Mar 2005 12:33:57 -0000 1.4 --- ValuePredicate.java 9 Mar 2005 12:40:19 -0000 1.5 *************** *** 26,30 **** import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; - // TMAPI import org.tmapi.core.TopicMapObject; --- 26,29 ---- Index: ScopePredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/ScopePredicate.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ScopePredicate.java 8 Mar 2005 12:33:57 -0000 1.3 --- ScopePredicate.java 9 Mar 2005 12:40:19 -0000 1.4 *************** *** 27,31 **** import org.tmapiutils.utils.IndexUtils; - // TMAPI import org.tmapi.core.TopicMap; --- 27,30 ---- Index: ReifiesPredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/ReifiesPredicate.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ReifiesPredicate.java 8 Mar 2005 12:33:57 -0000 1.6 --- ReifiesPredicate.java 9 Mar 2005 12:40:19 -0000 1.7 *************** *** 94,108 **** addResultsRow(ret, new Object[] {topic, object}); } - // Locator l = topic.getSubjectLocators(); - // if (l == null) { - // return; - // } - // Iterator it = object.getSourceLocators().iterator(); - // while (it.hasNext()) { - // if (it.next().equals(l)) { - // addResultsRow(ret, new Object[] {topic, object}); - // return; - // } - // } } --- 94,97 ---- *************** *** 118,136 **** } } - // // TODO Add an accessor method to TopicMap to allow access to all topics with a subject locator - // Iterator it = getTopicMap().getTopics().iterator(); - // while (it.hasNext()) { - // Topic t = (Topic)it.next(); - // Iterator si = t.getSubjectIdentifiers().iterator(); - // while (si.hasNext()) { - // Locator l = (Locator)si.next(); - // if (l != null) { - // TopicMapObject reified = getTopicMap().getObjectBySourceLocator(l); - // if (reified != null) { - // addResultsRow(ret, new Object[] {t, reified}); - // } - // } - // } - // } } --- 107,110 ---- *************** *** 163,173 **** addResultsRow(ret, new Object[] {reifier, object}); } - // Iterator it = object.getSourceLocators().iterator(); - // while (it.hasNext()) { - // Topic t = getTopicMap().getTopicBySubjectIndicator((Locator)it.next()); - // if (t != null) { - // addResultsRow(ret, new Object[] {t, object}); - // } - // } } --- 137,140 ---- *************** *** 176,186 **** addResultsRow(ret, new Object[] { reifier, iter.next()}); } - // Iterator it = reifier.getSubjectIdentifiers().iterator(); - // while (it.hasNext()) { - // TopicMapObject tmo = getTopicMap().getObjectBySourceLocator((Locator)it.next()); - // if (tmo != null) { - // addResultsRow(ret, new Object[] { reifier, tmo }); - // } - // } } --- 143,146 ---- Index: InstanceOfPredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/InstanceOfPredicate.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** InstanceOfPredicate.java 8 Mar 2005 14:49:16 -0000 1.3 --- InstanceOfPredicate.java 9 Mar 2005 12:40:19 -0000 1.4 *************** *** 135,141 **** IndexUtils.updateIndex(_topicIdx); for (Iterator iter = _topicIdx.getTopicsByType(cls).iterator(); iter.hasNext();) { ! addResultsRow(ret, new Object[] {it.next(), cls}); } ! for (Iterator iter = m_utils.getSubClasses(cls).iterator(); iter.hasNext()) { Topic sub = (Topic) iter.next(); for (Iterator insts = _topicIdx.getTopicsByType(sub).iterator(); insts.hasNext();) { --- 135,141 ---- IndexUtils.updateIndex(_topicIdx); for (Iterator iter = _topicIdx.getTopicsByType(cls).iterator(); iter.hasNext();) { ! addResultsRow(ret, new Object[] {iter.next(), cls}); } ! for (Iterator iter = m_utils.getSubClasses(cls).iterator(); iter.hasNext();) { Topic sub = (Topic) iter.next(); for (Iterator insts = _topicIdx.getTopicsByType(sub).iterator(); insts.hasNext();) { *************** *** 172,176 **** m_utils = new SuperSubClassUtils(); try { ! _topicIdx = (TopicsIndex) tm.getHelperObject(TopicsIndex); } catch (TMAPIException ex) { throw new TologParserException("Error initialising topic types index for instance-of predicate."); --- 172,176 ---- m_utils = new SuperSubClassUtils(); try { ! _topicIdx = (TopicsIndex) tm.getHelperObject(TopicsIndex.class); } catch (TMAPIException ex) { throw new TologParserException("Error initialising topic types index for instance-of predicate."); |
